v19.0.OS (#35)

* Updates from pro v19

* Update travis

* Update db script

* Update docs

* change build script

.travis.yml

@@ -10,4 +10,4 @@ php:
   - '5.6'
   - '7.0'
   - nightly
-after_failure: "cat /tmp/icehrm.test.log"
+#after_failure: "cat /tmp/icehrm.test.log"

build.xml

@@ -12,14 +12,18 @@
 <property name="installLocalpath" value="/Applications/XAMPP/xamppfiles/htdocs/icehrm-open-core"/>
 
 	
- <target name="build"
+<target name="build"
      depends="prepare,lint,copyapp,phpunit,release,install"
      description=""/>
 
- <target name="buildlocal"
+<target name="buildlocal"
      depends="prepare,copyapp"
      description=""/>
 
+<target name="releaseapp"
+        depends="prepare,lint,copyapp,phpunit,release"
+        description=""/>
+
 <target name="ice"
         depends="copyapp_quick"
         description=""/>

core-ext/admin/dashboard/index.php

@@ -0,0 +1,90 @@
+<?php
+/*
+This file is part of iCE Hrm.
+
+iCE Hrm 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 3 of the License, or
+(at your option) any later version.
+
+iCE Hrm 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.
+
+You should have received a copy of the GNU General Public License
+along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
+
+------------------------------------------------------------------
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+$moduleName = 'dashboard';
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+include APP_BASE_PATH.'modulejslibs.inc.php';
+
+?><div class="span9">
+    <div class="row">
+        <?php
+        $moduleManagers = BaseService::getInstance()->getModuleManagers();
+        $dashBoardList = array();
+        foreach($moduleManagers as $moduleManagerObj){
+
+            //Check if this is not an admin module
+            if($moduleManagerObj->getModuleType() != 'admin'){
+                continue;
+            }
+
+            $allowed = BaseService::getInstance()->isModuleAllowedForUser($moduleManagerObj);
+
+            if(!$allowed){
+                continue;
+            }
+
+            $item = $moduleManagerObj->getDashboardItem();
+            if(!empty($item)) {
+                $index = $moduleManagerObj->getDashboardItemIndex();
+                $dashBoardList[$index] = $item;
+            }
+        }
+
+        ksort($dashBoardList);
+
+        foreach($dashBoardList as $k=>$v){
+            echo LanguageManager::translateTnrText($v);
+        }
+        ?>
+    </div>
+    <?php 
+    if(class_exists("ProVersion")) {
+        $proVersion = new ProVersion();
+        if (strtotime($proVersion->licenseExpire) < time()) {
+        ?>
+        <div class="callout callout-danger lead" style="font-size: 14px;">
+            <h4>Your IceHrm Pro License is Expired</h4>
+            <p style="font-weight: bold;">
+                Your IceHrm Pro license is expired. Even though you can continue to use the software you won't receive
+                software upgrades or security patches. Please renew your license.
+                <br/>
+                <br/>
+                <a href="https://icehrm.com/renew_icehrmpro.php" class="btn btn-success btm-xs"><i
+                        class="fa fa-checkout"></i> Renew License</a>
+            </p>
+        </div>
+        <?php
+        }
+    }
+    ?>
+</div>
+<script>
+    var modJsList = new Array();
+
+    modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard');
+
+    var modJs = modJsList['tabDashboard'];
+
+</script>
+<?php include APP_BASE_PATH.'footer.php';?>

core-ext/app/data/icehrm.log

@@ -0,0 +1 @@
+init log

core-ext/config.base.php

@@ -5,13 +5,16 @@ if(!defined('APP_NAME')){define('APP_NAME','ICE Hrm');}
 if(!defined('FB_URL')){define('FB_URL', 'https://www.facebook.com/icehrm');};
 if(!defined('TWITTER_URL')){define('TWITTER_URL', 'https://twitter.com/icehrmapp');};
 
-define('HOME_LINK_ADMIN', CLIENT_BASE_URL."?g=admin&n=dashboard&m=admin_Admin");
+if(defined('CLIENT_BASE_URL')) {
-define('HOME_LINK_OTHERS', CLIENT_BASE_URL."?g=modules&n=dashboard&m=module_Personal_Information");
+    define('HOME_LINK_ADMIN', CLIENT_BASE_URL . "?g=admin&n=dashboard&m=admin_Admin");
+    define('HOME_LINK_OTHERS', CLIENT_BASE_URL . "?g=modules&n=dashboard&m=module_Personal_Information");
+}
 
 //Version
-define('VERSION', '18.0.OS');
+define('VERSION', '19.0.OS');
-define('CACHE_VALUE', '18.0.OS');
+define('CACHE_VALUE', '19.0.OS');
-define('VERSION_DATE', '04/08/2016');
+define('VERSION_NUMBER', '190');
+define('VERSION_DATE', '19/11/2016');
 
 if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');}
 if(!defined('KEY_PREFIX')){define('KEY_PREFIX','IceHrm');}
@@ -26,3 +29,5 @@ define('MEMCACHE_PORT', '11211');
 if(!defined('WK_HTML_PATH')){
     define('WK_HTML_PATH', '/usr/bin/wkhtmltopdf');
 }
+
+define('ALL_CLIENT_BASE_PATH', '/vagrant/deployment/clients/');

core-ext/doc/ldap-config.txt

@@ -1,27 +0,0 @@
-Before using please install php5-ldap module
-sudo apt-get install php5-ldap
-
-For using php ldap on windows please refer
-http://stackoverflow.com/questions/16864306/fatal-error-call-to-undefined-function-ldap-connect
-
-
-The user "admin" will always login with local db username and password (even LDAP is enabled)
-
-Use following config to test LDAP connection with following test LDAP server
-http://www.forumsys.com/tutorials/integration-how-to/ldap/online-ldap-test-server/
-
-Change configs as follows under System->Settings
-
-LDAP: Enabled = Yes
-LDAP: Server = ldap.forumsys.com
-LDAP: Port = 389
-LDAP: Root DN = dc=example,dc=com
-LDAP: Manager DN = cn=read-only-admin,dc=example,dc=com
-LDAP: Manager Password = password
-LDAP: Version 3 = Yes
-LDAP: User Filter = uid={}
-
-Then create a user with username "riemann" under System->Users
-
-Logout and try login with riemann/password
-

core-ext/lang/de-ext.po

@@ -0,0 +1,10 @@
+msgid ""
+msgstr ""
+"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Language: English\n"
+"Language-Team: IceHrm\n"
+"Last-Translator: Thilina Hasantha\n"
+"MIME-Version: 1.0\n"
+"Project-Id-Version: 18.0\n"
+"Report-Msgid-Bugs-To: https://icehrm.com\n"

core-ext/lang/en-ext.po

@@ -0,0 +1,10 @@
+msgid ""
+msgstr ""
+"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Language: English\n"
+"Language-Team: IceHrm\n"
+"Last-Translator: Thilina Hasantha\n"
+"MIME-Version: 1.0\n"
+"Project-Id-Version: 18.0\n"
+"Report-Msgid-Bugs-To: https://icehrm.com\n"

core-ext/popups.php

@@ -1,7 +1,7 @@
 <!-- Delete Modal -->
 <div class="modal fade" id="deleteModel" tabindex="-1" role="dialog" aria-labelledby="deleteModelLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">	
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
 		<h3 id="deleteModelLabel" style="font-size: 17px;"></h3>
@@ -13,15 +13,15 @@
  		<button class="btn" onclick="modJs.cancelDelete();">Cancel</button>
 		<button class="btn btn-primary" onclick="modJs.confirmDelete();">Delete</button>
 	</div>
-        </div>
+</div>
-    </div>
+</div>
 </div>
 <!-- Delete Modal -->
 
 <!-- Message Modal -->
 <div class="modal fade" id="messageModel" tabindex="-1" role="dialog" aria-labelledby="messageModelLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">	
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
 		<h3 id="messageModelLabel" style="font-size: 17px;"></h3>
@@ -32,23 +32,23 @@
 	<div class="modal-footer">
  		<button class="btn" onclick="modJs.closeMessage();">Ok</button>
 	</div>
-        </div>
+</div>
-    </div>
+</div>
 </div>
 <!-- Message Modal -->
 
 <!-- Plain Message Modal -->
 <div class="modal fade" id="plainMessageModel" tabindex="-1" role="dialog" aria-labelledby="plainMessageModelLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">	
 	<div class="modal-header" style="border-bottom:none;/*background-color: #3c8dbc;*/">
 		<button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="margin-top:-10px;"><li class="fa fa-times"/></button>
 	</div>
 	<div class="modal-body">
 		<p id="plainMessageModelBody"></p>
 	</div>
-        </div>
+</div>
-    </div>
+</div>
 </div>
 <!-- Plain Message Modal -->
 
@@ -89,8 +89,8 @@
 
 <!-- Upload Modal -->
 <div class="modal fade" id="uploadModel" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
 		<h3 id="uploadModelLabel" style="font-size: 17px;"></h3>
@@ -101,15 +101,15 @@
 	<div class="modal-footer">
  		<button class="btn" onclick="$('#uploadModel').modal('hide');">Cancel</button>
 	</div>
-        </div>
+</div>
-    </div>
+</div>
 </div>
 <!-- Upload Modal -->
 
 <!-- Message Modal -->
 <div class="modal fade" id="verifyModel" tabindex="-1" role="dialog" aria-labelledby="verifyModelLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal-dialog">
-        <div class="modal-content">
+<div class="modal-content">	
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><li class="fa fa-times"/></button>
 		<h3 id="verifyModelLabel" style="font-size: 17px;"></h3>
@@ -144,7 +144,7 @@
 	</form>
 		</p>
 	</div>
-    </div>
+</div>
 </div>
 </div>
 <!-- Message Modal -->

core-ext/raml/api.raml

@@ -0,0 +1,61 @@
+#%RAML 0.8
+---
+title: IceHrm
+baseUri: http://icehrm-hosted.gamonoid.com/api
+version: 1
+documentation:
+  - title: Authentication
+    content: !include documentation/authentication.md
+  - title: Responses
+    content: !include documentation/responses.md
+
+/employee:
+  displayName: Employee
+  /list:
+      get:
+        is: [ paginated ]
+        description: Get a list of employees
+        responses:
+          200:
+            body:
+              application/json:
+                schema: !include schemas/employees.json
+                example: !include examples/employees.json
+  /{id}:
+    get:
+      description: Get an employee by id
+      responses:
+        200:
+          body:
+            application/json:
+              schema: !include schemas/employee.json
+              example: !include examples/employee.json
+        404:
+          description: Employee does not exist
+          body:
+            application/json:
+              schema: !include schemas/error.json
+    uriParameters:
+      id:
+        description: Employee id
+        type: integer
+/candidate:
+  displayName: Candidate
+  /{id}:
+    get:
+      description: Get an employee by id
+      responses:
+        200:
+          body:
+            application/json:
+              schema: !include schemas/candidate.json
+              example: !include examples/candidate.json
+        404:
+          description: Candidate does not exist
+          body:
+            application/json:
+              schema: !include schemas/error.json
+    uriParameters:
+      id:
+        description: Candidate id
+        type: integer

core-ext/raml/documentation/authentication.md

@@ -0,0 +1 @@
+Admin users of icehrm can find the access token under System->Settings

core-ext/raml/documentation/responses.md

@@ -0,0 +1,9 @@
+| Code | Description        |
+|------|--------------------|
+| 200  | Ok                 |
+| 201  | Created            |
+| 400  | Bad request        |
+| 401  | Not authorized     |
+| 403  | Forbidden          |
+| 404  | Resource not found |
+| 500  | Server error       |

core-ext/raml/examples/candidate.json

@@ -0,0 +1,53 @@
+{
+  "id": "1",
+  "first_name": "Jhon",
+  "last_name": "Doe",
+  "nationality": "4",
+  "birthday": null,
+  "gender": "Male",
+  "marital_status": null,
+  "address1": null,
+  "address2": null,
+  "city": "New York",
+  "country": "US",
+  "province": null,
+  "postal_code": null,
+  "email": "icehrm+jhon@web-stalk.com",
+  "home_phone": "+1 455565656",
+  "mobile_phone": null,
+  "cv_title": "Software Engineer",
+  "cv": "cv_rYwHphV7xD5dOe1444302569136",
+  "cvtext": null,
+  "industry": null,
+  "profileImage": null,
+  "head_line": "",
+  "objective": "",
+  "work_history": "",
+  "education": "",
+  "skills": "",
+  "referees": "",
+  "linkedInUrl": null,
+  "linkedInData": null,
+  "totalYearsOfExperience": null,
+  "totalMonthsOfExperience": null,
+  "generatedCVFile": null,
+  "created": "2015-10-08 16:59:20",
+  "updated": "2015-10-08 16:59:20",
+  "expectedSalary": "0",
+  "preferedPositions": null,
+  "preferedJobtype": null,
+  "preferedCountries": null,
+  "tags": null,
+  "notes": null,
+  "calls": null,
+  "age": null,
+  "hash": "663fd20d1859344585f678a0f87b23522b8f9fce8c67c5290a609ce342b81442",
+  "linkedInProfileLink": null,
+  "linkedInProfileId": null,
+  "facebookProfileLink": null,
+  "facebookProfileId": null,
+  "twitterProfileLink": null,
+  "twitterProfileId": null,
+  "googleProfileLink": null,
+  "googleProfileId": null
+}

core-ext/raml/examples/employee.json

@@ -0,0 +1,75 @@
+{
+  "id": "2",
+  "employee_id": "EMP002",
+  "first_name": "Lala",
+  "middle_name": "Nadila ",
+  "last_name": "Lamees",
+  "nationality": "175",
+  "birthday": "1984-03-12",
+  "gender": "Female",
+  "marital_status": "Single",
+  "ssn_num": "",
+  "nic_num": "4594567WE3",
+  "other_id": "4595567WE3",
+  "driving_license": "349-066-YUO",
+  "driving_license_exp_date": "2012-03-01",
+  "employment_status": "1",
+  "job_title": "8",
+  "pay_grade": "2",
+  "work_station_id": "W001",
+  "address1": "Green War Rd, 00123",
+  "address2": "",
+  "city": "Istanbul",
+  "country": "TR",
+  "province": null,
+  "postal_code": "909066",
+  "home_phone": "+960112345",
+  "mobile_phone": "+960112345",
+  "work_phone": "+960112345",
+  "work_email": "icehrm+manager@web-stalk.com",
+  "private_email": "icehrm+manager@web-stalk.com",
+  "joined_date": "2011-03-07",
+  "confirmation_date": "2012-02-14",
+  "supervisor": "1",
+  "indirect_supervisors": "[3,4]",
+  "department": "2",
+  "custom1": null,
+  "custom2": null,
+  "custom3": null,
+  "custom4": null,
+  "custom5": null,
+  "custom6": null,
+  "custom7": null,
+  "custom8": null,
+  "custom9": null,
+  "custom10": null,
+  "termination_date": "0000-00-00",
+  "notes": null,
+  "status": "Active",
+  "ethnicity": null,
+  "immigration_status": null,
+  "approver1": "5",
+  "approver2": "6",
+  "approver3": null,
+  "nationality_Name_id": [],
+  "nationality_Name": "Tajik",
+  "ethnicity_Name_id": [],
+  "ethnicity_Name": null,
+  "immigration_status_Name_id": [],
+  "immigration_status_Name": null,
+  "employment_status_Name_id": [],
+  "employment_status_Name": "Full Time Contract",
+  "job_title_Name_id": [],
+  "job_title_Name": "Pre-Sales Executive",
+  "pay_grade_Name_id": [],
+  "pay_grade_Name": "Executive",
+  "country_Name_id": [],
+  "country_Name": "Turkey",
+  "province_Name_id": [],
+  "province_Name": null,
+  "department_Name_id": [],
+  "department_Name": "Head Office",
+  "supervisor_Name_id": [],
+  "supervisor_Name": "IceHrm Employee",
+  "image": "http:\/\/app.app.dev\/images\/user_female.png"
+}

core-ext/raml/examples/employees.json

@@ -0,0 +1,23 @@
+[
+  {
+    "id": "1",
+    "employee_id": "EMP001",
+    "first_name": "IceHrm",
+    "middle_name": "Sample",
+    "last_name": "Employee"
+  },
+  {
+    "id": "2",
+    "employee_id": "EMP002",
+    "first_name": "Lala",
+    "middle_name": "Nadila ",
+    "last_name": "Lamees"
+  },
+  {
+    "id": "3",
+    "employee_id": "EMP003",
+    "first_name": "Sofia",
+    "middle_name": "",
+    "last_name": "O'Sullivan"
+  }
+]

core-ext/raml/schemas/candidate.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "integer"
+    },
+    "email": {
+      "type": "string"
+    },
+    "first_name": {
+      "type": "string"
+    },
+    "last_name": {
+      "type": "string"
+    },
+    "cv_title": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "id",
+    "employee_id",
+    "first_name",
+    "last_name"
+  ]
+}

core-ext/raml/schemas/employee.json

@@ -0,0 +1,27 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "integer"
+    },
+    "employee_id": {
+      "type": "string"
+    },
+    "first_name": {
+      "type": "string"
+    },
+    "middle_name": {
+      "type": "string"
+    },
+    "last_name": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "id",
+    "employee_id",
+    "first_name",
+    "last_name"
+  ]
+}

core-ext/raml/schemas/employees.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "array",
+  "items": {
+    "type": "object",
+    "properties": {
+      "id": {
+        "type": "integer"
+      },
+      "employee_id": {
+        "type": "string"
+      },
+      "first_name": {
+        "type": "string"
+      },
+      "middle_name": {
+        "type": "string"
+      },
+      "last_name": {
+        "type": "string"
+      }
+    },
+    "required": [
+      "id",
+      "employee_id",
+      "first_name",
+      "last_name"
+    ]
+  }
+}

core-ext/raml/schemas/error.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "error": {
+      "type": "object",
+      "properties": {
+        "messages": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "code": {
+                "type": "string"
+              },
+              "message": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "code",
+              "message"
+            ]
+          }
+        },
+        "description": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "messages",
+        "description"
+      ]
+    }
+  },
+  "required": [
+    "error"
+  ]
+}

core-ext/scripts/icehrm_sample_data.sql

@@ -40,7 +40,26 @@ INSERT INTO `Employees` (`id`, `employee_id`, `first_name`, `middle_name`, `last
   (12, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
   (13, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
   (14, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (15, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  (15, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (16, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (17, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (18, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (19, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (20, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (21, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (22, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (23, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (24, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (25, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (26, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (27, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (28, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (29, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (30, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (31, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (32, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (33, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (34, CONCAT('EMP', RAND()), generate_fname(), '', generate_fname(), 10, '1979-07-15 18:30:00', 'Female', 'Single', '158-06-2292', '158-06-2292', '', '', NULL, 1, 5, 2, '', '1164', 'Walnut Avenue', 'Rochelle Park', 'US', 35, '7662', '201-474-8048', '201-474-8048', '201-474-8048', 'icehrm+user2@web-stalk.com', 'icehrm+user2@web-stalk.com', '2006-07-12 18:30:00', '0000-00-00 00:00:00', 2, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 
 UPDATE `Employees` set supervisor = 2, indirect_supervisors = '[3,4]', approver1 = 5, approver2 = 6, approver3 = 7 where id = 1;
@@ -150,7 +169,7 @@ INSERT INTO `Candidates` VALUES
   (1,'Jhon','Doe',4,NULL,'Male',NULL,NULL,NULL,'New York','US',NULL,NULL,'icehrm+jhon@web-stalk.com','+1 455565656',NULL,'Software Engineer','cv_rYwHphV7xD5dOe1444302569136',NULL,NULL,NULL,'','','','','','',NULL,NULL,NULL,NULL,NULL,NULL,'2015-10-08 16:59:20','2015-10-08 16:59:20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'663fd20d1859344585f678a0f87b23522b8f9fce8c67c5290a609ce342b81442',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 
 INSERT INTO `Files` VALUES
-  (6,'attachment_BI5XQCYFxZO12W1447383181684','attachment_BI5XQCYFxZO12W1447383181684.png',1,'Job');
+  (6,'attachment_BI5XQCYFxZO12W1447383181684','attachment_BI5XQCYFxZO12W1447383181684.png',1,'Job',2000,'2MB');
 
 
 INSERT INTO `EmployeeDocuments` (`id`,`employee`, `document`, `date_added`, `valid_until`, `status`, `details`, `attachment`, `expire_notification_last`) VALUES
@@ -201,39 +220,8 @@ INSERT INTO `Attendance` (`employee`,`in_time`,`out_time`,`note`) VALUES
 (3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 23 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 23 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), ''),
 (3, FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 22 DAY))) + FLOOR(28800 + (RAND() * 3600)),'%Y-%m-%d %T'), FROM_UNIXTIME((UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 22 DAY))) + FLOOR(57600 + (RAND() * 21600)),'%Y-%m-%d %T'), '');
 
-INSERT INTO `PayslipTemplates` (`id`, `name`, `data`, `status`, `created`, `updated`) VALUES
-  (1, 'Basic', '[{"type":"Company Logo","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"#000000","status":"Show","id":"data_1"},{"type":"Company Name","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_2"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_8"},{"type":"Payroll Column","payrollColumn":"5","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_3"},{"type":"Payroll Column","payrollColumn":"6","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_4"},{"type":"Payroll Column","payrollColumn":"17","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_5"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_9"},{"type":"Payroll Column","payrollColumn":"18","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_6"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_10"},{"type":"Text","payrollColumn":"NULL","label":"","text":"Big Company Ltd. is a limited company registered in England and Wales. Registered number: 1234567. Registered office: 123 Some Street, Somewhere, Someshire.","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_7"}]', NULL, '2016-06-30 03:37:12', '2016-06-30 03:37:12');
 
 
-INSERT INTO `Payroll` VALUES
-  (1,'2016-03',4,1,1,'[\"5\",\"8\",\"9\",\"10\",\"6\",\"7\",\"4\",\"3\",\"2\",\"1\",\"11\",\"12\",\"13\",\"14\",\"15\",\"16\"]','2016-03-01','2016-03-31','Draft', 1),
-  (2,'2016-03-Weekly',2,1,2,'[\"1\",\"2\",\"3\"]','2016-03-01','2016-03-31','Draft', 1);
-
-INSERT INTO `PayrollColumns` VALUES
-  (5,'Basic Salary',NULL,'[\"1\"]','[]','[]','[]',5,'No','Yes','0.00',NULL,NULL),
-  (6,'Fixed Allowance',NULL,'[\"2\"]','[]','[]','[]',6,'No','Yes','0.00',NULL,NULL),
-  (7,'Gross Pay',NULL,'[]','[]','[\"5\",\"6\"]','[]',7,'No','Yes','0.00',NULL,NULL),
-  (8,'EPF Employee Contribution',NULL,'[]','[\"1\"]','[]','[]',8,'No','Yes','0.00',NULL,NULL),
-  (9,'EPF Employer Contribution',NULL,'[]','[\"2\"]','[]','[]',9,'No','Yes','0.00',NULL,NULL),
-  (10,'ETF Employee Contribution',NULL,'[]','[\"3\"]','[]','[]',10,'No','Yes','0.00',NULL,NULL),
-  (11,'Total EPF 20%',NULL,'[]','[]','[\"8\",\"9\"]','[]',11,'No','Yes','0.00',NULL,NULL),
-  (12,'Total for PAYE',NULL,'[]','[]','[\"7\"]','[]',12,'No','Yes','0.00',NULL,NULL),
-  (13,'PAYE Tax',NULL,'[]','[\"4\"]','[]','[]',13,'No','Yes','0.00',NULL,NULL),
-  (14,'Stamp Duty',NULL,'[]','[\"5\"]','[]','[]',14,'No','Yes','0.00',NULL,NULL),
-  (15,'Total Deductions',NULL,'[]','[]','[\"8\",\"13\",\"14\"]','[]',15,'No','Yes','0.00',NULL,NULL),
-  (16,'Salary to Bank',NULL,'[]','[]','[\"7\"]','[\"15\"]',16,'No','Yes','0.00',NULL,NULL);
-
-
-INSERT INTO `DeductionGroup` VALUES
-  (1,'Sri Lanka Payroll Calculation',''),
-  (2,'Singapore Payroll Calculation','');
-
-INSERT INTO `Deductions` VALUES
-  (1,'EPF Employee Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.08\",\"id\":\"rangeAmounts_1\"}]',1),
-  (2,'EPF Employer Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.12\",\"id\":\"rangeAmounts_1\"}]',1),
-  (3,'ETF Employee Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.03\",\"id\":\"rangeAmounts_1\"}]',1),
-  (4,'PAYE Tax','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"62500\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"62500\",\"upperCondition\":\"lte\",\"upperLimit\":\"104167\",\"amount\":\"X*0.04 - 2500\",\"id\":\"rangeAmounts_2\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"104167\",\"upperCondition\":\"lte\",\"upperLimit\":\"145833\",\"amount\":\"X*0.08 - 6667\",\"id\":\"rangeAmounts_3\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"145833\",\"upperCondition\":\"lte\",\"upperLimit\":\"187500\",\"amount\":\"X*0.12-12500\",\"id\":\"rangeAmounts_4\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"187500\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.16 - 20000\",\"id\":\"rangeAmounts_5\"}]',1),
-  (5,'Stamp Duty','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"25000\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"25000\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"25\",\"id\":\"rangeAmounts_2\"}]',1);
 
 INSERT INTO `PayrollEmployees` VALUES
   (1,1,4,151,'[]','[]',1),

core-ext/scripts/icehrmdb.sql

@@ -443,6 +443,8 @@ create table `Files` (
 	`filename` varchar(100) NOT NULL,
 	`employee` bigint(20) NULL,
 	`file_group` varchar(100) NOT NULL,
+	`size` bigint(20) NULL,
+	`size_text` varchar(20) NULL,
 	primary key  (`id`),
 	unique key `filename` (`filename`)
 ) engine=innodb default charset=utf8;
@@ -557,10 +559,13 @@ create table `CompanyDocuments` (
 	`id` bigint(20) NOT NULL AUTO_INCREMENT,
 	`name` varchar(100) NOT NULL,
 	`details` text default null,
-  `valid_until` date NOT NULL,
+	`valid_until` date NULL,
 	`status` enum('Active','Inactive','Draft') default 'Active',
 	`notify_employees` enum('Yes','No') default 'Yes',
 	`attachment` varchar(100) NULL,
+	`share_departments` varchar(100) NULL,
+	`share_employees` varchar(100) NULL,
+	`share_userlevel` varchar(100) NULL,
 	primary key  (`id`)
 ) engine=innodb default charset=utf8;
 
@@ -688,6 +693,7 @@ create table `Notifications` (
 	`action` text default null,
 	`type` varchar(100) NULL,
 	`status` enum('Unread','Read') default 'Unread',
+	`employee` bigint(20) NULL,
 	CONSTRAINT `Fk_Notifications_Users` FOREIGN KEY (`touser`) REFERENCES `Users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
 	primary key  (`id`),
 	KEY `toUser_time` (`toUser`,`time`),
@@ -1422,3 +1428,40 @@ create table `EmployeeOvertime` (
 	CONSTRAINT `Fk_EmployeeOvertime_Category` FOREIGN KEY (`category`) REFERENCES `OvertimeCategories` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
 	primary key  (`id`)
 ) engine=innodb default charset=utf8;
+
+create table `Forms` (
+	`id` bigint(20) NOT NULL AUTO_INCREMENT,
+	`name` varchar(50) NOT NULL,
+	`description` varchar(500) NULL,
+	`items` text NULL,
+	`created` timestamp NULL default '0000-00-00 00:00:00',
+	`updated` timestamp NULL default '0000-00-00 00:00:00',
+	primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeForms` (
+	`id` bigint(20) NOT NULL AUTO_INCREMENT,
+	`employee` bigint(20) NOT NULL,
+	`form` bigint(20) NOT NULL,
+	`status` enum('Pending','Completed') default 'Pending',
+	`created` timestamp NULL default '0000-00-00 00:00:00',
+	`updated` timestamp NULL default '0000-00-00 00:00:00',
+	CONSTRAINT `Fk_EmployeeForms_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+	CONSTRAINT `Fk_EmployeeForms_Forms` FOREIGN KEY (`form`) REFERENCES `Forms` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+	primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+
+create table `Migrations` (
+	`id` bigint(20) NOT NULL AUTO_INCREMENT,
+	`file` varchar(50) NOT NULL,
+	`version` int(11) NOT NULL,
+	`created` DATETIME default '0000-00-00 00:00:00',
+	`updated` DATETIME default '0000-00-00 00:00:00',
+	`status` enum('Pending','Up','Down','UpError','DownError') default 'Pending',
+	`last_error` varchar(500) NULL,
+	primary key  (`id`),
+	unique key `KEY_Migrations_file` (`file`),
+	index `KEY_Migrations_status` (`status`),
+	index `KEY_Migrations_version` (`version`)
+) engine=innodb default charset=utf8;

core-ext/scripts/upgrade_v18.0.OS_v19.0.OS.sql

@@ -0,0 +1,194 @@
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\r\n[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeSummaryReport', '["employee","date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `Reports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Request Report',
+     'This report list employee overtime requests by employee, date range, overtime category and project',
+     '[[ "employee", {"label":"Employee","type":"select2multi","allow-null":true,"null-label":"All Employees","remote-source":["Employee","id","first_name+last_name"]}],[ "date_start", {"label":"Start Date","type":"date"}],[ "date_end", {"label":"End Date","type":"date"}],[ "category", {"label":"Category","type":"select2","allow-null":true,"remote-source":["OvertimeCategory","id","name"]}],[ "project", {"label":"Project","type":"select2","allow-null":true,"remote-source":["Project","id","name"]}],[ "status", {"label":"Status","type":"select","source":[["NULL","All Statuses"],["Approved","Approved"],["Pending","Pending"],["Rejected","Rejected"],["Cancellation Requested","Cancellation Requested"],["Cancelled","Cancelled"],["Processing","Processing"]]}]]', 'OvertimeRequestReport', '["employee","date_start","date_end","category","project"]', 'Class','Time Management','CSV');
+
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('Overtime: Allow Indirect Admins to Approve', '0', 'Allow indirect admins to approve overtime requests','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('Travel: Enable Multi Level Approvals', '0', 'Allow multi level approvals in travel module','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('Overtime: Enable Multi Level Approvals', '0', 'Allow multi level approvals in overtime module','["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('System: Company Structure Managers Enabled', '0', 'Allow Managers to View Employees in Their Company Structure, if They are Assigned as a Head of the Company Structure',
+     '["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+
+REPLACE INTO `Settings` (`name`, `value`, `description`, `meta`) VALUES
+    ('System: Child Company Structure Managers Enabled', '0', 'Allow Managers to View Employees in Their Company Structure and all Child Company Structures, if They are Assigned as a Head of the Company Structure',
+     '["value", {"label":"Value","type":"select","source":[["1","Yes"],["0","No"]]}]');
+
+
+
+delete from PayrollColumns;
+
+
+INSERT INTO `PayrollColumns` (`id`,`name`,`calculation_hook`,`salary_components`,`deductions`,`add_columns`,`sub_columns`,`editable`,`enabled`,`default_value`,`calculation_columns`,`calculation_function`) VALUES
+    (1,'Total Hours','AttendanceUtil_getTimeWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
+    (2,'Regular Hours','AttendanceUtil_getRegularWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
+    (3,'Overtime Hours','AttendanceUtil_getOverTimeWorkedHours','','','','','No','Yes','0.00',NULL,NULL),
+    (4,'Leave Hours','LeaveUtil_getLeaveHours','','','','','No','Yes','0.00',NULL,NULL);
+
+
+delete from DataImport where name = 'Sage50 Import - Employee Data';
+
+INSERT INTO `DataImport` (`name`, `dataType`, `details`, `columns`, `updated`, `created`) VALUES
+    ('Employee Data Import', 'EmployeeDataImporter', '', '[{"name":"employee_id","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"Yes","id":"columns_7"},{"name":"first_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_3"},{"name":"middle_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_5"},{"name":"last_name","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_6"},{"name":"address1","title":"Address1","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_8"},{"name":"address2","title":"Address2","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_9"},{"name":"home_phone","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_14"},{"name":"mobile_phone","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_15"},{"name":"work_email","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_16"},{"name":"gender","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_17"},{"name":"marital_status","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_18"},{"name":"birthday","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_20"},{"name":"nationality","title":"Nationality","type":"Reference","dependOn":"Nationality","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_22"},{"name":"ethnicity","title":"Ethnicity","type":"Normal","dependOn":"Ethnicity","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_23"},{"name":"EmergencyContact/name","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_24"},{"name":"EmergencyContact/relationship","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"relationship","isKeyField":"No","idField":"No","id":"columns_25"},{"name":"EmergencyContact/home_phone","title":"","type":"Attached","dependOn":"EmergencyContact","dependOnField":"home_phone","isKeyField":"No","idField":"No","id":"columns_26"},{"name":"ssn_num","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_31"},{"name":"job_title","title":"","type":"Reference","dependOn":"JobTitle","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_32"},{"name":"employment_status","title":"","type":"Reference","dependOn":"EmploymentStatus","dependOnField":"name","isKeyField":"Yes","idField":"No","id":"columns_33"},{"name":"joined_date","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_36"},{"name":"department","title":"","type":"Reference","dependOn":"CompanyStructure","dependOnField":"title","isKeyField":"Yes","idField":"No","id":"columns_38"}]', '2016-06-02 18:56:32', '2016-06-02 18:56:32'),
+    ('Attendance Data Import', 'AttendanceDataImporter', '', '[{"name":"employee","title":"","type":"Reference","dependOn":"Employee","dependOnField":"employee_id","isKeyField":"Yes","idField":"No","id":"columns_1"},{"name":"in_time","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_2"},{"name":"out_time","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_3"},{"name":"note","title":"","type":"Normal","dependOn":"NULL","dependOnField":"","isKeyField":"No","idField":"No","id":"columns_4"}]', '2016-08-14 02:51:56', '2016-08-14 02:51:56');
+
+
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Report', 'This report list all employee attendance entries by employee with overtime calculations', '[\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeReport', '["employee","date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Overtime Summary Report', 'This report list all employee attendance entries by employee with overtime calculation summary', '[\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]', 'OvertimeSummaryReport', '["date_start","date_end"]', 'Class','Time Management','CSV');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Client Project Time Report', 'View your time entries for projects under a given client',
+     '[\r\n[ "client", {"label":"Select Client","type":"select","allow-null":false,"remote-source":["Client","id","name"]}],\r\n[ "date_start", {"label":"Start Date","type":"date"}],\r\n[ "date_end", {"label":"End Date","type":"date"}]\r\n]',
+     'ClientProjectTimeReport', '["client","date_start","date_end","status"]', 'Class','Time Management','PDF');
+
+REPLACE INTO `UserReports` (`name`, `details`, `parameters`, `query`, `paramOrder`, `type`,`report_group`,`output`) VALUES
+    ('Download Payslips', 'Download your payslips',
+     '[\r\n[ "payroll", {"label":"Select Payroll","type":"select","allow-null":false,"remote-source":["Payroll","id","name","getEmployeePayrolls"]}]]',
+     'PayslipReport', '["payroll"]', 'Class','Finance','PDF');
+
+
+
+
+
+INSERT INTO `DeductionGroup` VALUES
+    (1,'Sri Lanka Payroll Calculation','');
+
+
+
+
+
+INSERT INTO `PayslipTemplates` (`id`, `name`, `data`, `status`, `created`, `updated`) VALUES
+    (1, 'Sri Lanka - Default Payslip', '[{"type":"Company Logo","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"#000000","status":"Show","id":"data_1"},{"type":"Company Name","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_2"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_8"},{"type":"Payroll Column","payrollColumn":"5","label":"Basic Salary","text":"","status":"Show","id":"data_3"},{"type":"Payroll Column","payrollColumn":"6","label":"Fixed Allowance","text":"","status":"Show","id":"data_4"},{"type":"Payroll Column","payrollColumn":"7","label":"Gross Pay","text":"","status":"Show","id":"data_11"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","fontSize":"Normal","fontStyle":"Normal","fontColor":"","status":"Show","id":"data_9"},{"type":"Text","payrollColumn":"NULL","label":"","text":"Deductions","status":"Show","id":"data_13"},{"type":"Payroll Column","payrollColumn":"8","label":"EPF Employee Contribution","text":"","status":"Show","id":"data_6"},{"type":"Payroll Column","payrollColumn":"13","label":"PAYE Tax","text":"","status":"Show","id":"data_14"},{"type":"Payroll Column","payrollColumn":"14","label":"Stamp Duty","text":"","status":"Show","id":"data_15"},{"type":"Payroll Column","payrollColumn":"15","label":"Total Deductions","text":"","status":"Show","id":"data_16"},{"type":"Separators","payrollColumn":"NULL","label":"","text":"","status":"Show","id":"data_17"},{"type":"Text","payrollColumn":"NULL","label":"","text":"Employer Contributions","status":"Show","id":"data_18"},{"type":"Payroll Column","payrollColumn":"9","label":"EPF Employer Contribution","text":"","status":"Show","id":"data_19"},{"type":"Payroll Column","payrollColumn":"7","label":"ETF Employer Contribution","text":"","status":"Show","id":"data_20"},{"type":"Separators","payrollColumn":"7","label":"","text":"","status":"Show","id":"data_21"},{"type":"Text","payrollColumn":"7","label":"","text":"Totals","status":"Show","id":"data_22"},{"type":"Payroll Column","payrollColumn":"11","label":"Total EPF 20%","text":"","status":"Show","id":"data_23"},{"type":"Payroll Column","payrollColumn":"12","label":"Total for PAYE","text":"","status":"Show","id":"data_24"},{"type":"Payroll Column","payrollColumn":"16","label":"Net Salary","text":"","status":"Show","id":"data_25"}]', NULL, '2016-06-29 22:07:12', '2016-06-29 22:07:12');
+
+INSERT INTO `Payroll` VALUES
+    (1,'Sri Lanka Payroll Sample',4,1,NULL,'[\"5\",\"8\",\"9\",\"10\",\"6\",\"7\",\"11\",\"12\",\"13\",\"14\",\"15\",\"16\"]','2016-03-01','2016-03-31','Draft', 1);
+
+INSERT INTO `PayrollColumns` VALUES
+    (5,'LK - Basic Salary',NULL,'[\"1\"]','[]','[]','[]',5,'No','Yes','0.00',NULL,NULL),
+    (6,'LK - Fixed Allowance',NULL,'[\"2\"]','[]','[]','[]',6,'No','Yes','0.00',NULL,NULL),
+    (7,'LK - Gross Pay',NULL,'[]','[]','[\"5\",\"6\"]','[]',7,'No','Yes','0.00',NULL,NULL),
+    (8,'LK - EPF Employee Contribution',NULL,'[]','[\"1\"]','[]','[]',8,'No','Yes','0.00',NULL,NULL),
+    (9,'LK - EPF Employer Contribution',NULL,'[]','[\"2\"]','[]','[]',9,'No','Yes','0.00',NULL,NULL),
+    (10,'LK - ETF Employer Contribution',NULL,'[]','[\"3\"]','[]','[]',10,'No','Yes','0.00',NULL,NULL),
+    (11,'LK - Total EPF 20%',NULL,'[]','[]','[\"8\",\"9\"]','[]',11,'No','Yes','0.00',NULL,NULL),
+    (12,'LK - Total for PAYE',NULL,'[]','[]','[\"7\"]','[]',12,'No','Yes','0.00',NULL,NULL),
+    (13,'LK - PAYE Tax',NULL,'[]','[\"4\"]','[]','[]',13,'No','Yes','0.00',NULL,NULL),
+    (14,'LK - Stamp Duty',NULL,'[]','[\"5\"]','[]','[]',14,'No','Yes','0.00',NULL,NULL),
+    (15,'LK - Total Deductions',NULL,'[]','[]','[\"8\",\"13\",\"14\"]','[]',15,'No','Yes','0.00',NULL,NULL),
+    (16,'LK - Salary to Bank',NULL,'[]','[]','[\"7\"]','[\"15\"]',16,'No','Yes','0.00',NULL,NULL);
+
+INSERT INTO `Deductions` VALUES
+    (1,'EPF Employee Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.08\",\"id\":\"rangeAmounts_1\"}]',1),
+    (2,'EPF Employer Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.12\",\"id\":\"rangeAmounts_1\"}]',1),
+    (3,'ETF Employer Contribution','[]','[]',7,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.03\",\"id\":\"rangeAmounts_1\"}]',1),
+    (4,'PAYE Tax','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"62500\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"62500\",\"upperCondition\":\"lte\",\"upperLimit\":\"104167\",\"amount\":\"X*0.04 - 2500\",\"id\":\"rangeAmounts_2\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"104167\",\"upperCondition\":\"lte\",\"upperLimit\":\"145833\",\"amount\":\"X*0.08 - 6667\",\"id\":\"rangeAmounts_3\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"145833\",\"upperCondition\":\"lte\",\"upperLimit\":\"187500\",\"amount\":\"X*0.12-12500\",\"id\":\"rangeAmounts_4\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"187500\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"X*0.16 - 20000\",\"id\":\"rangeAmounts_5\"}]',1),
+    (5,'Stamp Duty','[]','[]',12,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":\"0\",\"upperCondition\":\"lte\",\"upperLimit\":\"25000\",\"amount\":\"0\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gt\",\"lowerLimit\":\"25000\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":\"0\",\"amount\":\"25\",\"id\":\"rangeAmounts_2\"}]',1);
+
+
+INSERT INTO `DeductionGroup` VALUES
+    (2,'Ghana Payroll Calculation','');
+
+INSERT INTO `PayslipTemplates` VALUES
+    (2,'Ghana Default','[{\"type\":\"Company Name\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_1\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_3\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"105\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_4\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"106\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_5\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"107\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_6\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"112\",\"label\":\"Total\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_7\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_8\"},{\"type\":\"Text\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"Deductions \",\"status\":\"Show\",\"id\":\"data_9\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"109\",\"label\":\"SSNIT (5.5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_10\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"113\",\"label\":\"Tax (1st Level 5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_11\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"114\",\"label\":\"Tax (2nd Level 10%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_12\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"115\",\"label\":\"Tax (3rd Level 17.5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_13\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"120\",\"label\":\"Tax (4th Level 25%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_14\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"121\",\"label\":\"Overtime Allow. Tax (5%)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_15\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"122\",\"label\":\"Total (PAYE Tax)\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_16\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_17\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"123\",\"label\":\"Sub Total\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_18\"},{\"type\":\"Separators\",\"payrollColumn\":\"NULL\",\"label\":\"\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_19\"},{\"type\":\"Payroll Column\",\"payrollColumn\":\"125\",\"label\":\"Netto Monthly Salary\",\"text\":\"\",\"status\":\"Show\",\"id\":\"data_20\"}]',NULL,'2016-08-30 21:53:13','2016-08-30 21:53:13');
+
+
+INSERT INTO `Payroll` VALUES
+    (6,'Ghana Payroll Sample',4,1,NULL,'[\"123\",\"125\",\"106\",\"124\",\"113\",\"114\",\"115\",\"121\",\"107\",\"120\",\"109\",\"105\",\"112\",\"108\",\"122\"]','2016-08-01','2016-08-31','Draft',2);
+
+
+INSERT INTO `PayrollColumns` VALUES
+    (105,'GH - Salary (Basic)',NULL,'[\"1\"]','[]','[]','[]',1,'No','Yes','0.00','',''),
+    (106,'GH - Housing Allowance',NULL,'[]','[\"101\"]','[]','[]',2,'No','Yes','0.00','',''),
+    (107,'GH - Overtime Allowance',NULL,'[]','[\"102\"]','[]','[]',3,'No','Yes','0.00','',''),
+    (108,'GH - Total',NULL,'[]','[]','[\"106\",\"107\",\"105\"]','[]',4,'No','Yes','0.00','',''),
+    (109,'GH - SSNIT',NULL,'[]','[\"103\"]','[]','[]',5,'No','Yes','0.00','',''),
+    (112,'GH - Taxable Income',NULL,'[]','[]','[\"106\",\"105\"]','[\"109\"]',7,'No','Yes','0.00','',''),
+    (113,'GH - Next 108 GHC',NULL,'[]','[\"106\"]','[]','[]',9,'No','Yes','0.00','',''),
+    (114,'GH - Next 151 GHC',NULL,'[]','[\"107\"]','[]','[]',10,'No','Yes','0.00','',''),
+    (115,'GH - Next 2765 GHC',NULL,'[]','[\"108\"]','[]','[]',11,'No','Yes','0.00','',''),
+    (120,'GH - Remaining after 3240 GHC',NULL,'[]','[\"111\"]','[]','[]',12,'No','Yes','0.00','',''),
+    (121,'GH - Overtime Allow. Tax',NULL,'[]','[]','[]','[]',13,'No','Yes','0.00','[{\"name\":\"O\",\"column\":\"107\",\"id\":\"calculation_columns_1\"}]','O*0.05'),
+    (122,'GH - Total (PAYE Tax)',NULL,'[]','[]','[\"113\",\"114\",\"115\",\"120\",\"121\"]','[]',14,'No','Yes','0.00','',''),
+    (123,'GH - Deductions - Sub Total',NULL,'[]','[]','[\"109\",\"122\"]','[]',15,'No','Yes','0.00','',''),
+    (125,'GH - Final Total',NULL,'[]','[]','[\"108\"]','[\"123\"]',16,'No','Yes','0.00','','');
+
+
+INSERT INTO `Deductions` VALUES
+    (101,'Housing Allowance (10%)','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.1\",\"id\":\"rangeAmounts_1\"}]',2),
+    (102,'Overtime Allowance (10%)','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.1\",\"id\":\"rangeAmounts_1\"}]',2),
+    (103,'SSNIT','[]','[\"1\"]',NULL,'[{\"lowerCondition\":\"No Lower Limit\",\"lowerLimit\":0,\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"X*0.055\",\"id\":\"rangeAmounts_1\"}]',2),
+    (104,'Tax - Ghana','[]','[]',NULL,'',2),
+    (106,'Next 108 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"216\",\"upperCondition\":\"lt\",\"upperLimit\":\"324\",\"amount\":\"X*0.05\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"324\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"5.4\",\"id\":\"rangeAmounts_2\"}]',2),
+    (107,'Next 151 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"324\",\"upperCondition\":\"lt\",\"upperLimit\":\"475\",\"amount\":\"(X-324) * 0.1\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"259\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"15.10\",\"id\":\"rangeAmounts_2\"}]',2),
+    (108,'Next 2765 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"475\",\"upperCondition\":\"lt\",\"upperLimit\":\"3240\",\"amount\":\"(X - 475) * 0.175\",\"id\":\"rangeAmounts_1\"},{\"lowerCondition\":\"gte\",\"lowerLimit\":\"3240\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"483.88\",\"id\":\"rangeAmounts_2\"}]',2),
+    (111,'Remaining after 3240 GHC','[]','[]',112,'[{\"lowerCondition\":\"gte\",\"lowerLimit\":\"3240\",\"upperCondition\":\"No Upper Limit\",\"upperLimit\":0,\"amount\":\"(X-3240)*0.25\",\"id\":\"rangeAmounts_1\"}]',2);
+
+
+
+
+ALTER table `Files` add column `size` bigint(20) NULL;
+
+ALTER table `Files` add column `size_text` varchar(20) NULL;
+
+ALTER table `CompanyDocuments` add column `share_departments` varchar(100) NULL;
+ALTER table `CompanyDocuments` add column `share_employees` varchar(100) NULL;
+ALTER table `CompanyDocuments` add column `share_userlevel` varchar(100) NULL;
+ALTER table `CompanyDocuments` modify column `share_userlevel` varchar(100) NULL;
+
+ALTER table `Notifications` add column `employee` bigint(20) NULL;
+
+create table `Forms` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL,
+  `description` varchar(500) NULL,
+  `items` text NULL,
+  `created` timestamp NULL default '0000-00-00 00:00:00',
+  `updated` timestamp NULL default '0000-00-00 00:00:00',
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `EmployeeForms` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `employee` bigint(20) NOT NULL,
+  `form` bigint(20) NOT NULL,
+  `status` enum('Pending','Completed') default 'Pending',
+  `created` timestamp NULL default '0000-00-00 00:00:00',
+  `updated` timestamp NULL default '0000-00-00 00:00:00',
+  CONSTRAINT `Fk_EmployeeForms_Employee` FOREIGN KEY (`employee`) REFERENCES `Employees` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Fk_EmployeeForms_Forms` FOREIGN KEY (`form`) REFERENCES `Forms` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  primary key  (`id`)
+) engine=innodb default charset=utf8;
+
+create table `Migrations` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `file` varchar(50) NOT NULL,
+  `version` int(11) NOT NULL,
+  `created` DATETIME default '0000-00-00 00:00:00',
+  `updated` DATETIME default '0000-00-00 00:00:00',
+  `status` enum('Pending','Up','Down','UpError','DownError') default 'Pending',
+  `last_error` varchar(500) NULL,
+primary key  (`id`),
+unique key `KEY_Migrations_file` (`file`),
+index `KEY_Migrations_status` (`status`),
+index `KEY_Migrations_version` (`version`)
+) engine=innodb default charset=utf8;
+

ext/admin/dashboard/index.php

@@ -26,8 +26,60 @@ define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
 
+
+if (!class_exists('BillingActionManager')) {
+    include APP_BASE_PATH.'admin/billing/api/BillingActionManager.php';
+}
+$billingActionManager = new BillingActionManager();
+
+$invoices = $billingActionManager->getInvoices(null)->getData();
+if(!empty($invoices)){
+    $invoices = json_decode(json_encode($invoices));
+}
+$numOfUnpaidInvoices = 0;
+foreach($invoices as $inv){
+    if($inv->status == "Sent"){
+        $numOfUnpaidInvoices++;
+    }
+}
+
 ?><div class="span9">
-    <div class="row">
+<div class="row">
+    <?php if($numOfUnpaidInvoices == 1){?>
+    <div class="callout callout-warning lead" style="font-size: 14px;">
+        <h4>You have a pending invoice</h4>
+        <p style="font-weight: bold;">
+            You have a pending invoice. Please make you complete the payment so we can provide a better service.
+            <br/>
+            <br/>
+            <a href="<?=CLIENT_BASE_URL?>?g=admin&n=billing&m=admin_System#tabInvoice" class="btn btn-success btm-xs"><i class="fa fa-checkout"></i> Make a Payment</a>
+        </p>
+    </div>
+    <?php }else if($numOfUnpaidInvoices > 1){?>
+    <div class="callout callout-danger lead" style="font-size: 14px;">
+        <h4>You have <?=$numOfUnpaidInvoices?> pending invoices</h4>
+        <p style="font-weight: bold;">
+            You have <?=$numOfUnpaidInvoices?> pending invoice. None of your employees are currently allowed to login. Please make sure you complete payments to all the invoices to restore your service.
+            Please logout and login after completing the payment to get your service restored.
+            <br/>
+            <br/>
+            <a href="<?=CLIENT_BASE_URL?>?g=admin&n=billing&m=admin_System#tabInvoice" class="btn btn-success btm-xs"><i class="fa fa-checkout"></i> Make a Payment</a>
+        </p>
+    </div>
+    <?php }?>
+
+    <?php if(SessionUtils::getSessionObject('account_locked') == "1"){?>
+        <div class="callout callout-danger lead" style="font-size: 14px;">
+            <h4>Your Trial Has Expired</h4>
+            <p style="font-weight: bold;">
+                Your Icehrm Trial has expired. Please upgrade subscription to continue. If not upgraded your account will be deleted with in few days.
+                <br/>
+                <br/>
+                <a href="<?=CLIENT_BASE_URL?>?g=admin&n=billing&m=admin_System" class="btn btn-success btm-xs"><i class="fa fa-checkout"></i> Upgrade Subscription</a>
+            </p>
+        </div>
+    <?php }?>
+
     <?php
     $moduleManagers = BaseService::getInstance()->getModuleManagers();
     $dashBoardList = array();
@@ -57,42 +109,37 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
         echo LanguageManager::translateTnrText($v);
     }
     ?>
-    </div>
+</div>
-    <div id="iceannon">
-        <div class="callout callout-danger lead" style="font-size: 14px;font-weight: bold;">
-            <h4>Why not upgrade to IceHrm Pro Version</h4>
-            <p>
-                IceHrm Pro is the feature rich upgrade to IceHrm open source version. It comes with improved modules for
-                employee management, leave management and number of other features over open source version.
-                Hit this <a href="http://icehrm.com/#compare" class="btn btn-primary btn-xs target="_blank">link</a> to do a full one to one comparison.
 	
-                Also you can learn more about IceHrm Pro <a href="http://blog.icehrm.com/docs/icehrm-pro/" class="btn btn-primary btn-xs" target="_blank">here</a>
-                <br/>
-                <br/>
-                <a href="http://icehrm.com/modules.php" class="btn btn-success btm-xs" target="_blank"><i class="fa fa-checkout"></i> Buy IceHrm Pro</a>
-            </p>
-        </div>
-    </div>
 
 </div>
 <script>
-    var modJsList = new Array();
+var modJsList = new Array();
 
-    modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard');
+modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard');
 
-    var modJs = modJsList['tabDashboard'];
+var modJs = modJsList['tabDashboard'];
 
-    $(document).ready(function() {
+/*
-        try {
+$("#employeeLink").attr("href",modJs.getCustomUrl('?g=admin&n=employees&m=admin_Admin'));
-            $.ajax({
+$("#companyLink").attr("href",modJs.getCustomUrl('?g=admin&n=company_structure&m=admin_Admin'));
-                url: "https://icehrm-public.s3.amazonaws.com/icehrmnews.html",
+$("#usersLink").attr("href",modJs.getCustomUrl('?g=admin&n=users&m=admin_System'));
-                success: function (result) {
+$("#projectsLink").attr("href",modJs.getCustomUrl('?g=admin&n=projects&m=admin_Admin'));
-                    $('#iceannon').html(result);
+$("#attendanceLink").attr("href",modJs.getCustomUrl('?g=admin&n=attendance&m=admin_Admin'));
-                }
+$("#leaveLink").attr("href",modJs.getCustomUrl('?g=admin&n=leaves&m=admin_Admin'));
-            });
+$("#reportsLink").attr("href",modJs.getCustomUrl('?g=admin&n=reports&m=admin_Reports'));
-        } catch (e) {
+$("#settingsLink").attr("href",modJs.getCustomUrl('?g=admin&n=settings&m=admin_System'));
-        }
+$("#jobsLink").attr("href",modJs.getCustomUrl('?g=admin&n=jobpositions&m=admin_Recruitment'));
+$("#candidatesLink").attr("href",modJs.getCustomUrl('?g=admin&n=candidates&m=admin_Recruitment'));
+$("#trainingLink").attr("href",modJs.getCustomUrl('?g=admin&n=training&m=admin_Admin'));
+$("#travelLink").attr("href",modJs.getCustomUrl('?g=admin&n=travel&m=admin_Employees'));
+$("#documentLink").attr("href",modJs.getCustomUrl('?g=admin&n=documents&m=admin_Employees'));
+$("#expenseLink").attr("href",modJs.getCustomUrl('?g=admin&n=expenses&m=admin_Employees'));
+$("#permissionLink").attr("href",modJs.getCustomUrl('?g=admin&n=permissions&m=admin_System'));
+$("#upgradeLink").attr("href",modJs.getCustomUrl('?g=admin&n=billing&m=admin_System'));
+
+modJs.getInitData();
+*/
 
-    });
 </script>
 <?php include APP_BASE_PATH.'footer.php';?>      

ext/admin/employees/api/EmployeesActionManager.php

@@ -102,12 +102,13 @@ class EmployeesActionManager extends SubActionManager{
 
         $ok = $archived->Save();
         if(!$ok){
-            return new IceResponse(IceResponse::ERROR, "Error occured while archiving employee");
+            return new IceResponse(IceResponse::ERROR, "Error occurred while archiving employee");
         }
 
+
         $ok = $employee->Delete();
         if(!$ok){
-            return new IceResponse(IceResponse::ERROR, "Error occured while deleting employee");
+            return new IceResponse(IceResponse::ERROR, "Error occurred while deleting employee");
         }
 
         return new IceResponse(IceResponse::SUCCESS, $archived);

ext/admin/employees/api/EmployeesAdminManager.php

@@ -16,10 +16,6 @@ if (!class_exists('EmployeesAdminManager')) {
                 $empRestEndPoint->process('get',$pathParams);
             });
 
-            \NoahBuscher\Macaw\Macaw::get(REST_API_PATH.'employees', function() {
-                $empRestEndPoint = new EmployeesRestEndPoint();
-                $empRestEndPoint->process('get',NULL);
-            });
         }
 
 		public function initializeDatabaseErrorMappings(){
@@ -231,11 +227,11 @@ if (!class_exists('Employee')) {
         }
 
         public static function cleanEmployeeData($obj){
+            unset($obj->keysToIgnore);
             unset($obj->historyFieldsToTrack);
             unset($obj->historyUpdateList);
             unset($obj->oldObjOrig);
             unset($obj->oldObj);
-            unset($obj->oldObj);
             return $obj;
         }
 
@@ -312,48 +308,39 @@ if (!class_exists('EmployeeApproval')) {
 if (!class_exists('EmployeeRestEndPoint')) {
     class EmployeeRestEndPoint extends RestEndPoint{
         public function get($parameter){
+
             if(empty($parameter)){
                 return new IceResponse(IceResponse::ERROR, "Employee ID not provided");
             }
 
-            $accessTokenValidation = $this->validateAccessToken();
+            if($parameter === 'list'){
-            if($accessTokenValidation->getStatus() == IceResponse::ERROR){
-                return $accessTokenValidation;
-            }
-
-            $mapping = '{"nationality":["Nationality","id","name"],"ethnicity":["Ethnicity","id","name"],"immigration_status":["ImmigrationStatus","id","name"],"employment_status":["EmploymentStatus","id","name"],"job_title":["JobTitle","id","name"],"pay_grade":["PayGrade","id","name"],"country":["Country","code","name"],"province":["Province","id","name"],"department":["CompanyStructure","id","title"],"supervisor":["Employee","id","first_name+last_name"]}';
-            $employeeResp = BaseService::getInstance()->getElement('Employee',$parameter,$mapping,true);
-            if($employeeResp->getStatus() == IceResponse::SUCCESS){
-                $emp = $employeeResp->getObject();
-                $emp = Employee::cleanEmployeeData($emp);
-                return new IceResponse(IceResponse::SUCCESS,$emp);
-            }
-            return $employeeResp;
-        }
-
-
-    }
-}
-
-if (!class_exists('EmployeesRestEndPoint')) {
-    class EmployeesRestEndPoint extends RestEndPoint{
-        public function get($parameter){
-
-            $accessTokenValidation = $this->validateAccessToken();
-            if($accessTokenValidation->getStatus() == IceResponse::ERROR){
-                return $accessTokenValidation;
-            }
-
                 $emp = new Employee();
                 $emps = $emp->Find("1=1");
                 $newEmps = array();
                 foreach($emps as $emp){
-                $newEmps[] = Employee::cleanEmployeeData($emp);
+                    $employee = new stdClass();
+                    $employee->id = $emp->id;
+                    $employee->employee_id = $emp->employee_id;
+                    $employee->first_name = $emp->first_name;
+                    $employee->middle_name = $emp->middle_name;
+                    $employee->last_name = $emp->last_name;
+                    $newEmps[] = $employee;
+
                 }
                 return new IceResponse(IceResponse::SUCCESS, $newEmps);
+            }else{
+                $mapping = '{"nationality":["Nationality","id","name"],"ethnicity":["Ethnicity","id","name"],"immigration_status":["ImmigrationStatus","id","name"],"employment_status":["EmploymentStatus","id","name"],"job_title":["JobTitle","id","name"],"pay_grade":["PayGrade","id","name"],"country":["Country","code","name"],"province":["Province","id","name"],"department":["CompanyStructure","id","title"],"supervisor":["Employee","id","first_name+last_name"]}';
+                $emp = BaseService::getInstance()->getElement('Employee',$parameter,$mapping,true);
+                if(!empty($emp)){
+                    $emp = Employee::cleanEmployeeData($emp);
+                    return new IceResponse(IceResponse::SUCCESS,$emp);
+                }
+                return new IceResponse(IceResponse::ERROR, "Employee not found" ,404);
+            }
+
+
         }
 
 
     }
 }
-

ext/admin/employees/customTemplates/myDetails.html

@@ -48,11 +48,12 @@
 <ul class="nav nav-tabs" id="subModTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
 	<li class="active"><a id="tabBasic" href="#tabPageBasic">Basic Information</a></li>
 	<li class=""><a id="tabQualifications" href="#tabPageQualifications">Qualifications</a></li>
+	<li class=""><a id="tabFamily" href="#tabPageFamily">Family</a></li>
 	<li class=""><a id="tabDocuments" href="#tabPageDocuments">Documents</a></li>
 </ul>
 
 <div class="tab-content">
-	<div class="tab-pane active" id="tabPageBasic" style="border:1px solid #DDD;">
+	<div class="tab-pane sub-tab active" id="tabPageBasic">
 		<div class="row" style="margin-left:10px;margin-top:20px;">
 			<div class="panel panel-default" style="width:97.5%;">
 				<div class="panel-heading"><h4>Personal Information</h4></div>
@@ -202,31 +203,45 @@
 			</div>
 		</div>
 	</div><!-- End tabPageBasic -->
-	<div class="tab-pane" id="tabPageQualifications" style="border:1px solid #DDD;">
+	<div class="tab-pane sub-tab" id="tabPageQualifications">
 		<div class="row" style="margin-top:20px;">
-			<div class="col-md-3">
+			<div class="col-md-3 sub-column">
 				<div id="EmployeeSkillSubTab" class="" data-content="List" style="padding-left:5px;">
 
 				</div>
 			</div>
-			<div class="col-md-3">
+			<div class="col-md-3 sub-column">
 				<div id="EmployeeEducationSubTab" class="" data-content="List" style="padding-left:5px;">
 
 				</div>
 			</div>
-			<div class="col-md-3">
+			<div class="col-md-3 sub-column">
 				<div id="EmployeeCertificationSubTab" class="" data-content="List" style="padding-left:5px;">
 
 				</div>
 			</div>
-			<div class="col-md-3">
+			<div class="col-md-3 sub-column">
 				<div id="EmployeeLanguageSubTab" class="" data-content="List" style="padding-left:5px;">
 
 				</div>
 			</div>
 		</div><!-- End tabPageQualifications -->
 	</div>
-    <div class="tab-pane" id="tabPageDocuments" style="border:1px solid #DDD;">
+	<div class="tab-pane sub-tab" id="tabPageFamily">
+		<div class="row" style="margin-top:20px;">
+			<div class="col-md-6 sub-column">
+				<div id="EmployeeEmergencyContactSubTab" class="" data-content="List" style="padding-left:5px;">
+
+				</div>
+			</div>
+			<div class="col-md-6 sub-column">
+				<div id="EmployeeDependentSubTab" class="" data-content="List" style="padding-left:5px;">
+
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="tab-pane sub-tab" id="tabPageDocuments">
 		<div class="row" style="margin-top:20px;">
 			<div class="col-md-12">
 				<div id="EmployeeDocumentSubTab" class="" data-content="List" style="padding-left:5px;">

ext/admin/employees/lib.js

@@ -197,6 +197,9 @@ EmployeeAdapter.method('getFormFields', function() {
         [ "department", {"label":"Department","type":"select2","remote-source":["CompanyStructure","id","title"]}],
         [ "supervisor", {"label":"Direct Supervisor","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
         [ "indirect_supervisors", {"label":"Indirect Supervisors","type":"select2multi","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
+        [ "approver1", {"label":"First Level Approver","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
+        [ "approver2", {"label":"Second Level Approver","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
+        [ "approver3", {"label":"Third Level Approver","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
         [ "notes", {"label":"Notes","type":"datagroup",
             "form":[
                 [ "note", {"label":"Note","type":"textarea","validation":""}]
@@ -413,7 +416,7 @@ EmployeeAdapter.method('renderEmployee', function(data) {
         }
     }
 
-    html = html.replace(/#_.+_#/i,"");
+    html = html.replace(/#_.+_#/gi,"");
     html = html.replace(/_id_/g,data.id);
 
     $("#"+this.getTableName()).html(html);
@@ -506,6 +509,12 @@ EmployeeAdapter.method('renderEmployee', function(data) {
     modJs.subModJsList['tabEmployeeLanguageSubTab'] = new EmployeeSubLanguageAdapter('EmployeeLanguage','EmployeeLanguageSubTab',{"employee":data.id});
     modJs.subModJsList['tabEmployeeLanguageSubTab'].parent = this;
 
+    modJs.subModJsList['tabEmployeeDependentSubTab'] = new EmployeeSubDependentAdapter('EmployeeDependent','EmployeeDependentSubTab',{"employee":data.id});
+    modJs.subModJsList['tabEmployeeDependentSubTab'].parent = this;
+
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'] = new EmployeeSubEmergencyContactAdapter('EmergencyContact','EmployeeEmergencyContactSubTab',{"employee":data.id});
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].parent = this;
+
     if(this.isModuleInstalled("admin","documents")) {
         modJs.subModJsList['tabEmployeeDocumentSubTab'] = new EmployeeSubDocumentAdapter('EmployeeDocument', 'EmployeeDocumentSubTab', {"employee": data.id});
         modJs.subModJsList['tabEmployeeDocumentSubTab'].parent = this;
@@ -547,6 +556,16 @@ EmployeeAdapter.method('renderEmployee', function(data) {
     modJs.subModJsList['tabEmployeeLanguageSubTab'].setShowCancel(false);
     modJs.subModJsList['tabEmployeeLanguageSubTab'].get([]);
 
+    modJs.subModJsList['tabEmployeeDependentSubTab'].setShowFormOnPopup(true);
+    modJs.subModJsList['tabEmployeeDependentSubTab'].setShowAddNew(false);
+    modJs.subModJsList['tabEmployeeDependentSubTab'].setShowCancel(false);
+    modJs.subModJsList['tabEmployeeDependentSubTab'].get([]);
+
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].setShowFormOnPopup(true);
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].setShowAddNew(false);
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].setShowCancel(false);
+    modJs.subModJsList['tabEmployeeEmergencyContactSubTab'].get([]);
+
     if(this.isModuleInstalled("admin","documents")) {
         modJs.subModJsList['tabEmployeeDocumentSubTab'].setShowFormOnPopup(true);
         modJs.subModJsList['tabEmployeeDocumentSubTab'].setShowAddNew(false);
@@ -1372,7 +1391,7 @@ EmployeeSubSkillsAdapter.method('getSubHeaderTitle', function() {
 });
 
 EmployeeSubSkillsAdapter.method('getSubItemHtml', function(item, itemDelete, itemEdit) {
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p></a>');
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p></div>');
     return itemHtml;
 });
 
@@ -1451,8 +1470,8 @@ EmployeeSubEducationAdapter.method('getSubItemHtml', function(item, itemDelete,
     try{
         end = Date.parse(item[5]).toString('MMM d, yyyy');
     }catch(e){}
-    //var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p></a>');
+    //var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p></div>');
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-calendar"></i> Start: <b>'+start+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Completed: <b>'+end+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-building-o"></i> Institute: <b>'+item[3]+'</b></p></a>');
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-calendar"></i> Start: <b>'+start+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Completed: <b>'+end+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-building-o"></i> Institute: <b>'+item[3]+'</b></p></div>');
     return itemHtml;
 });
 
@@ -1529,7 +1548,7 @@ EmployeeSubCertificationAdapter.method('getSubItemHtml', function(item, itemDele
     try{
         end = Date.parse(item[5]).toString('MMM d, yyyy');
     }catch(e){}
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-calendar"></i> Granted On: <b>'+start+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Valid Thru: <b>'+end+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-building-o"></i> Institute: <b>'+item[3]+'</b></p></a>');
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-calendar"></i> Granted On: <b>'+start+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Valid Thru: <b>'+end+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-building-o"></i> Institute: <b>'+item[3]+'</b></p></div>');
     return itemHtml;
 });
 
@@ -1607,7 +1626,7 @@ EmployeeSubLanguageAdapter.method('getSubHeaderTitle', function() {
 });
 
 EmployeeSubLanguageAdapter.method('getSubItemHtml', function(item, itemDelete, itemEdit) {
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-asterisk"></i> Reading: <b>'+item[3]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Speaking: <b>'+ item[4] +'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Writing: <b>'+item[5]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Understanding: <b>'+item[6]+'</b></p></a>');
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-asterisk"></i> Reading: <b>'+item[3]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Speaking: <b>'+ item[4] +'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Writing: <b>'+item[5]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-asterisk"></i> Understanding: <b>'+item[6]+'</b></p></div>');
     return itemHtml;
 });
 
@@ -1619,6 +1638,154 @@ EmployeeSubLanguageAdapter.method('isSubProfileTable', function() {
     }
 });
 
+/**
+ * @class EmployeeSubDependentAdapter
+ * @param endPoint
+ * @param tab
+ * @param filter
+ * @param orderBy
+ * @returns
+ */
+
+function EmployeeSubDependentAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+}
+
+EmployeeSubDependentAdapter.inherits(SubAdapterBase);
+
+
+
+EmployeeSubDependentAdapter.method('getDataMapping', function() {
+    return [
+        "id",
+        "employee",
+        "name",
+        "relationship",
+        "dob",
+        "id_number"
+    ];
+});
+
+
+EmployeeSubDependentAdapter.method('getHeaders', function() {
+    return [
+        { "sTitle": "ID" ,"bVisible":false},
+        { "sTitle": "Employee" },
+        { "sTitle": "Name" },
+        { "sTitle": "Relationship"},
+        { "sTitle": "Date of Birth"},
+        { "sTitle": "Id Number"}
+    ];
+});
+
+EmployeeSubDependentAdapter.method('getFormFields', function() {
+    return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "employee", {"label":"Employee","type":"hidden"}],
+        [ "name", {"label":"Name","type":"text","validation":""}],
+        [ "relationship", {"label":"Relationship","type":"select","source":[["Child","Child"],["Spouse","Spouse"],["Parent","Parent"],["Other","Other"]]}],
+        [ "dob", {"label":"Date of Birth","type":"date","validation":""}],
+        [ "id_number", {"label":"Id Number","type":"text","validation":"none"}]
+    ];
+});
+
+
+EmployeeSubDependentAdapter.method('forceInjectValuesBeforeSave', function(params) {
+    params['employee'] = this.parent.currentId;
+    return params;
+});
+
+EmployeeSubDependentAdapter.method('getSubHeaderTitle', function() {
+    var addBtn = '<button class="btn btn-small btn-success" onclick="modJs.subModJsList[\'tab'+this.tab+'\'].renderForm();" style="margin-right:10px;"><i class="fa fa-plus"></i></button>';
+    return addBtn + "Dependents";
+});
+
+EmployeeSubDependentAdapter.method('getSubItemHtml', function(item, itemDelete, itemEdit) {
+
+
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-users"></i> Relationship: <b>'+item[3]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-user"></i> Name: <b>'+item[2]+'</b></p></div>');
+    return itemHtml;
+});
+
+
+
+/**
+ * @class EmployeeSubEmergencyContactAdapter
+ * @param endPoint
+ * @param tab
+ * @param filter
+ * @param orderBy
+ * @returns
+ */
+
+function EmployeeSubEmergencyContactAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+}
+
+EmployeeSubEmergencyContactAdapter.inherits(SubAdapterBase);
+
+
+
+EmployeeSubEmergencyContactAdapter.method('getDataMapping', function() {
+    return [
+        "id",
+        "employee",
+        "name",
+        "relationship",
+        "home_phone",
+        "work_phone",
+        "mobile_phone"
+    ];
+});
+
+
+EmployeeSubEmergencyContactAdapter.method('getHeaders', function() {
+    return [
+        { "sTitle": "ID" ,"bVisible":false},
+        { "sTitle": "Employee" },
+        { "sTitle": "Name" },
+        { "sTitle": "Relationship"},
+        { "sTitle": "Home Phone"},
+        { "sTitle": "Work Phone"},
+        { "sTitle": "Mobile Phone"}
+    ];
+});
+
+EmployeeSubEmergencyContactAdapter.method('getFormFields', function() {
+    return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "employee", {"label":"Employee","type":"hidden"}],
+        [ "name", {"label":"Name","type":"text","validation":""}],
+        [ "relationship", {"label":"Relationship","type":"text","validation":"none"}],
+        [ "home_phone", {"label":"Home Phone","type":"text","validation":"none"}],
+        [ "work_phone", {"label":"Work Phone","type":"text","validation":"none"}],
+        [ "mobile_phone", {"label":"Mobile Phone","type":"text","validation":"none"}]
+    ];
+});
+
+
+EmployeeSubEmergencyContactAdapter.method('forceInjectValuesBeforeSave', function(params) {
+    params['employee'] = this.parent.currentId;
+    return params;
+});
+
+EmployeeSubEmergencyContactAdapter.method('getSubHeaderTitle', function() {
+    var addBtn = '<button class="btn btn-small btn-success" onclick="modJs.subModJsList[\'tab'+this.tab+'\'].renderForm();" style="margin-right:10px;"><i class="fa fa-plus"></i></button>';
+    return addBtn + "Emergency Contacts";
+});
+
+EmployeeSubEmergencyContactAdapter.method('getSubItemHtml', function(item, itemDelete, itemEdit) {
+
+
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text"><i class="fa fa-users"></i> Relationship: <b>'+item[3]+'</b></p><p class="list-group-item-text">'+'<i class="fa fa-user"></i> Name: <b>'+item[2]+'</b></p><p class="list-group-item-text"><i class="fa fa-phone"></i> Home Phone: <b>'+item[4]+'</b></p><p class="list-group-item-text"><i class="fa fa-phone"></i> Mobile Phone: <b>'+item[6]+'</b></p></div>');
+    return itemHtml;
+});
+
+
+
+
+
+
 
 /**
  * @class EmployeeSubDocumentAdapter
@@ -1692,10 +1859,15 @@ EmployeeSubDocumentAdapter.method('getSubItemHtml', function(item, itemDelete, i
     try{
         expire = Date.parse(item[5]).toString('MMM d, yyyy');
     }catch(e){}
-    var itemHtml = $('<a href="#" class="list-group-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Expire On: <b>'+expire+'</b></p></a>');
+
+    var downloadButton = '<button id="#_id_#_download" onclick="download(\''+item[7]+'\');return false;" type="button" style="position: absolute;bottom: 5px;right: 70px;font-size: 13px;" tooltip="Download"><li class="fa fa-cloud-download"></li></button>';
+
+    var itemHtml = $('<div class="list-group-item sub-tab-item"><h5 class="list-group-item-heading" style="font-weight:bold;">'+item[2]+downloadButton+itemDelete+itemEdit+'</h5><p class="list-group-item-text">'+nl2br(item[3])+'</p><p class="list-group-item-text">'+'<i class="fa fa-calendar"></i> Expire On: <b>'+expire+'</b></p></div>');
     return itemHtml;
 });
 
+
+
 EmployeeSubDocumentAdapter.method('isSubProfileTable', function() {
     if(this.user.user_level == "Admin"){
         return false;

ext/admin/meta.json

@@ -3,5 +3,6 @@
 "Employees":"fa-users",
 "Admin Reports":"fa-file-text",
 "System":"fa-cogs",
+"Insights":"fa-bar-chart-o",
 "Payroll":"fa-money"
 }

ext/admin/overtime/api/OvertimeActionManager.php

@@ -0,0 +1,27 @@
+<?php
+class OvertimeActionManager extends ApproveAdminActionManager{
+
+    public function getModelClass(){
+        return "EmployeeOvertime";
+    }
+
+    public function getItemName(){
+        return "Overtime Request";
+    }
+
+    public function getModuleName(){
+        return "Overtime Management";
+    }
+
+    public function getModuleTabUrl(){
+        return "g=modules&n=overtime&m=module_Time_Management#tabEmployeeOvertime";
+    }
+
+    public function getModuleSubordinateTabUrl(){
+        return "g=modules&n=overtime&m=module_Time_Management#tabSubordinateEmployeeOvertime";
+    }
+
+    public function getModuleApprovalTabUrl(){
+        return "g=modules&n=overtime&m=module_Time_Management#tabEmployeeOvertimeApproval";
+    }
+}

ext/admin/overtime/api/OvertimeAdminManager.php

@@ -0,0 +1,123 @@
+<?php
+if (!class_exists('OvertimeAdminManager')) {
+	
+	class OvertimeAdminManager extends AbstractModuleManager{
+
+		public function initializeUserClasses(){
+			if(defined('MODULE_TYPE') && MODULE_TYPE != 'admin'){
+				$this->addUserClass("EmployeeOvertime");
+			}
+		}
+
+		public function initializeFieldMappings(){
+
+		}
+
+		public function initializeDatabaseErrorMappings(){
+
+		}
+
+		public function setupModuleClassDefinitions(){
+			
+			$this->addModelClass('OvertimeCategory');
+			$this->addModelClass('EmployeeOvertime');
+			$this->addModelClass('EmployeeOvertimeApproval');
+			
+		}
+
+	}
+}
+
+
+if (!class_exists('OvertimeCategory')) {
+	class OvertimeCategory extends ICEHRM_Record {
+		var $_table = 'OvertimeCategories';
+
+		public function getAdminAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getManagerAccess(){
+			return array("get","element","save","delete");
+		}
+
+		public function getUserAccess(){
+			return array("get");
+		}
+
+		public function getUserOnlyMeAccess(){
+			return array("get","element");
+		}
+	}
+}
+
+
+
+if (!class_exists('EmployeeOvertime')) {
+	class EmployeeOvertime extends ApproveModel
+    {
+        var $_table = 'EmployeeOvertime';
+
+        var $notificationModuleName = "Overtime Management";
+        var $notificationUnitName = "OvertimeRequest";
+        var $notificationUnitPrefix = "An";
+        var $notificationUnitAdminUrl = "g=modules&n=overtime&m=module_Time_Management#tabSubordinateEmployeeOvertime";
+        var $preApproveSettingName = "Attendance: Pre-Approve Overtime Request";
+
+		public function isMultiLevelApprovalsEnabled(){
+			return (SettingsManager::getInstance()->getSetting('Overtime: Enable Multi Level Approvals') == '1');
+		}
+
+        public function getAdminAccess()
+        {
+            return array("get", "element", "save", "delete");
+        }
+
+        public function getManagerAccess()
+        {
+            return array("get", "element", "save", "delete");
+        }
+
+        public function getUserAccess()
+        {
+            return array("get");
+        }
+
+        public function getUserOnlyMeAccess()
+        {
+            return array("element", "save", "delete");
+        }
+
+        public function fieldsNeedToBeApproved()
+        {
+            return array(
+                "start_time",
+                "end_time"
+            );
+        }
+
+		public function getType(){
+			return 'EmployeeOvertime';
+		}
+
+		public function allowIndirectMapping(){
+			if(SettingsManager::getInstance()->getSetting('Overtime: Allow Indirect Admins to Approve') == '1'){
+				return true;
+			}
+			return false;
+		}
+
+    }
+}
+
+
+if (!class_exists('EmployeeOvertimeApproval')) {
+
+	class EmployeeOvertimeApproval extends EmployeeOvertime
+	{
+
+		public function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()){
+			return $this->findApprovals(new EmployeeOvertime(), $whereOrderBy,$bindarr,$pkeysArr,$extra);
+		}
+	}
+}

ext/admin/overtime/index.php

@@ -0,0 +1,42 @@
+<?php 
+/*
+This file is part of iCE Hrm.
+
+iCE Hrm 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 3 of the License, or
+(at your option) any later version.
+
+iCE Hrm 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.
+
+You should have received a copy of the GNU General Public License
+along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
+
+------------------------------------------------------------------
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+$moduleName = 'travel';
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+include APP_BASE_PATH.'modulejslibs.inc.php';
+
+$options = array();
+$options['setRemoteTable'] = 'true';
+
+$moduleBuilder = new ModuleBuilder();
+$moduleBuilder->addModuleOrGroup(new ModuleTab('OvertimeCategory','OvertimeCategory','Overtime Categories','OvertimeCategoryAdapter','','',true,$options));
+$moduleBuilder->addModuleOrGroup(new ModuleTab('EmployeeOvertime','EmployeeOvertime','Overtime Requests','EmployeeOvertimeAdminAdapter','','',false,$options));
+echo UIManager::getInstance()->renderModule($moduleBuilder);
+
+
+$itemName = 'OvertimeRequest';
+$moduleName = 'Time Management';
+$itemNameLower = strtolower($itemName);
+
+include APP_BASE_PATH.'footer.php';

ext/admin/overtime/lib.js

@@ -0,0 +1,99 @@
+/**
+ * Author: Thilina Hasantha
+ */
+
+
+/**
+ * OvertimeCategoryAdapter
+ */
+
+function OvertimeCategoryAdapter(endPoint) {
+	this.initAdapter(endPoint);
+}
+
+OvertimeCategoryAdapter.inherits(AdapterBase);
+
+
+
+OvertimeCategoryAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "name"
+	];
+});
+
+OvertimeCategoryAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Name" }
+	];
+});
+
+OvertimeCategoryAdapter.method('getFormFields', function() {
+	return [
+	        [ "id", {"label":"ID","type":"hidden"}],
+	        [ "name", {"label":"Name","type":"text","validation":""}]
+	];
+});
+
+
+
+
+/**
+ * EmployeeOvertimeAdminAdapter
+ */
+
+
+function EmployeeOvertimeAdminAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+    this.itemName = 'OvertimeRequest';
+    this.itemNameLower = 'overtimerequest';
+    this.modulePathName = 'overtime';
+}
+
+EmployeeOvertimeAdminAdapter.inherits(ApproveAdminAdapter);
+
+
+
+EmployeeOvertimeAdminAdapter.method('getDataMapping', function() {
+	return [
+	        "id",
+	        "employee",
+	        "category",
+	        "start_time",
+	        "end_time",
+	        "project",
+            "status"
+	];
+});
+
+EmployeeOvertimeAdminAdapter.method('getHeaders', function() {
+	return [
+			{ "sTitle": "ID" ,"bVisible":false},
+			{ "sTitle": "Employee" },
+			{ "sTitle": "Category" },
+			{ "sTitle": "Start Time" },
+			{ "sTitle": "End Time"},
+			{ "sTitle": "Project"},
+			{ "sTitle": "Status"}
+	];
+});
+
+EmployeeOvertimeAdminAdapter.method('getFormFields', function() {
+    return [
+        ["id", {"label": "ID", "type": "hidden"}],
+        ["employee", {
+            "label": "Employee",
+            "type": "select2",
+            "sort": "none",
+            "allow-null": false,
+            "remote-source": ["Employee", "id", "first_name+last_name", "getActiveSubordinateEmployees"]
+        }],
+		["category", {"label": "Category", "type": "select2", "allow-null":false, "remote-source": ["OvertimeCategory", "id", "name"]}],
+		["start_time", {"label": "Start Time", "type": "datetime", "validation": ""}],
+		["end_time", {"label": "End Time", "type": "datetime", "validation": ""}],
+		["project", {"label": "Project", "type": "select2", "allow-null":true,"null=label":"none","remote-source": ["Project", "id", "name"]}],
+		["notes", {"label": "Notes", "type": "textarea", "validation": "none"}]
+    ];
+});
+

ext/admin/overtime/meta.json

@@ -0,0 +1,12 @@
+{
+  "label":"Overtime Administration",
+  "menu":"Employees",
+  "order":"94",
+  "icon":"fa-align-center",
+  "user_levels":["Admin","Manager"],
+  "dashboardPosition":13,
+
+  "permissions":
+      {
+      }
+}

ext/admin/reports/reportClasses/OvertimeRequestReport.php

@@ -0,0 +1,66 @@
+<?php
+
+if(!class_exists('ReportBuilder')){
+    include_once APP_BASE_PATH.'admin/reports/reportClasses/ReportBuilder.php';
+}
+class OvertimeRequestReport extends CSVReportBuilder implements CSVReportBuilderInterface{
+
+    public function getMainQuery(){
+        $query = "SELECT 
+(SELECT `employee_id` from Employees where id = at.employee) as 'Employee',
+(SELECT concat(`first_name`,' ',`middle_name`,' ', `last_name`) from Employees where id = at.employee) as 'Employee',
+(SELECT `name` from OvertimeCategories where id = at.category) as 'Category',
+(SELECT `name` from Projects where id = at.project) as 'Project',
+start_time as 'Start Time',
+end_time as 'End Time',
+notes as 'Notes',
+status as 'Status'
+FROM EmployeeOvertime at";
+
+        return $query;
+
+    }
+
+    public function getWhereQuery($request){
+
+        $employeeList = array();
+        if(!empty($request['employee'])){
+            $employeeList = json_decode($request['employee'],true);
+        }
+
+        if(in_array("NULL", $employeeList) ){
+            $employeeList = array();
+        }
+
+        if(!empty($employeeList)){
+            $query = "where employee in (".implode(",", $employeeList).") and start_time >= ? and end_time <= ?";
+            $params = array(
+                $request['date_start']." 00:00:00",
+                $request['date_end']." 23:59:59",
+            );
+        }else{
+            $query = "where start_time >= ? and end_time <= ?";
+            $params = array(
+                $request['date_start']." 00:00:00",
+                $request['date_end']." 23:59:59",
+            );
+        }
+
+        if(!empty($request['category']) && $request['category'] != "NULL"){
+            $query.= " and category = ?";
+            $params[] = $request['category'];
+        }
+
+        if(!empty($request['project']) && $request['project'] != "NULL"){
+            $query.= " and project = ?";
+            $params[] = $request['project'];
+        }
+
+        $query.="  order by start_time desc;";
+
+        LogManager::getInstance()->info("Query:".$query);
+        LogManager::getInstance()->info("Params:".json_encode($params));
+
+        return array($query, $params);
+    }
+}

ext/admin/settings/api/SettingsInitialize.php

@@ -37,6 +37,8 @@ class SettingsInitialize extends AbstractInitialize{
 			}
 		}
 		
+		BaseService::getInstance()->getMigrationManager()->ensureMigrations();
+		
 	}
 	
 }

ext/admin/settings/index.php

@@ -34,7 +34,10 @@ $options1['setShowAddNew'] = 'false';
 $moduleBuilder->addModuleOrGroup(new ModuleTab('CompanySetting','Setting','Company','SettingAdapter','{"name":["Company:"]}','name',true,$options1));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('SystemSetting','Setting','System','SettingAdapter','{"name":["System:"]}','name',false,$options1));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('EmailSetting','Setting','Email','SettingAdapter','{"name":["Email:"]}','name',false,$options1));
-$moduleBuilder->addModuleOrGroup(new ModuleTab('LDAPSetting','Setting','LDAP','SettingAdapter','{"name":["LDAP:"]}','name',false,$options1));
+$moduleBuilder->addModuleOrGroup(new ModuleTab('LeaveSetting','Setting','Leave / PTO','SettingAdapter','{"name":["Leave:"]}','name',false,$options1));
+if(!defined('LDAP_ENABLED') || LDAP_ENABLED == true){
+    $moduleBuilder->addModuleOrGroup(new ModuleTab('LDAPSetting','Setting','LDAP','SettingAdapter','{"name":["LDAP:"]}','name',false,$options1));
+}
 $moduleBuilder->addModuleOrGroup(new ModuleTab('AttendanceSetting','Setting','Attendance','SettingAdapter','{"name":["Attendance:"]}','name',false,$options1));
 $moduleBuilder->addModuleOrGroup(new ModuleTab('OtherSetting','Setting','Other','SettingAdapter','{"name":["Projects:","Recruitment:","Notifications:","Expense:","Travel:","Api:","Overtime:"]}','name',false,$options1));
 echo UIManager::getInstance()->renderModule($moduleBuilder);

ext/modules/employees/customTemplates/myDetails.html

@@ -167,7 +167,14 @@
 
 
 <div class="row" id="customFieldsCont" style="margin-left:10px;margin-top:20px;">
+	<div class="panel panel-default" style="width:97.5%;">
+		<div class="panel-heading"><h4>Other Details</h4></div>
+		<div class="panel-body">
+			<div class="row-fluid" id="customFields">
 
+			</div>
+		</div>
+	</div>
 </div>
 
 

ext/modules/employees/lib.js

@@ -263,7 +263,7 @@ EmployeeAdapter.method('modEmployeeGetSuccessCallBack' , function(data) {
         }
     }
 
-    html = html.replace(/#_.+_#/i,"");
+    html = html.replace(/#_.+_#/gi,"");
 
 	html = html.replace(/_id_/g,data.id);
 	

ext/modules/overtime/api/OvertimeActionManager.php

@@ -0,0 +1,19 @@
+<?php
+class OvertimeActionManager extends ApproveModuleActionManager{
+
+    public function getModelClass(){
+        return "EmployeeOvertime";
+    }
+
+    public function getItemName(){
+        return "Overtime Request";
+    }
+
+    public function getModuleName(){
+        return "Overtime Management";
+    }
+
+    public function getModuleTabUrl(){
+        return "g=modules&n=overtime&m=module_Time_Management#SubordinateEmployeeOvertime";
+    }
+}

ext/modules/overtime/api/OvertimeModulesManager.php

@@ -0,0 +1,24 @@
+<?php
+if (!class_exists('OvertimeModulesManager')) {
+	
+	class OvertimeModulesManager extends AbstractModuleManager{
+
+		public function initializeUserClasses(){
+			
+		}
+
+		public function initializeFieldMappings(){
+				
+		}
+
+		public function initializeDatabaseErrorMappings(){
+
+		}
+
+		public function setupModuleClassDefinitions(){
+			
+			
+		}
+
+	}
+}

ext/modules/overtime/index.php

@@ -0,0 +1,94 @@
+<?php
+/*
+This file is part of iCE Hrm.
+
+iCE Hrm 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 3 of the License, or
+(at your option) any later version.
+
+iCE Hrm 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.
+
+You should have received a copy of the GNU General Public License
+along with iCE Hrm. If not, see <http://www.gnu.org/licenses/>.
+
+------------------------------------------------------------------
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+$moduleName = 'overtime';
+$moduleMainName = "EmployeeOvertime"; // for creating module js lib
+$subModuleMainName = "SubordinateEmployeeOvertime";
+$moduleItemName = "Overtime Request"; // For permissions
+
+$itemName = $moduleItemName; // for status change popup
+$itemNameLower = strtolower($moduleMainName);  // for status change popup
+$appModName = $moduleMainName.'Approval';
+
+define('MODULE_PATH',dirname(__FILE__));
+include APP_BASE_PATH.'header.php';
+$additionalJs = array();
+$additionalJs[] = BASE_URL.'admin/overtime/lib.js?v='.$jsVersion;
+include APP_BASE_PATH.'modulejslibs.inc.php';
+?><div class="span9">
+
+    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
+        <li class="active"><a id="tab<?=$moduleMainName?>" href="#tabPage<?=$moduleMainName?>"><?=LanguageManager::tran('Overtime Requests')?></a></li>
+        <li class=""><a id="tab<?=$subModuleMainName?>" href="#tabPage<?=$subModuleMainName?>"><?=LanguageManager::tran('Subordinate Overtime Requests')?></a></li>
+        <li class=""><a id="tab<?=$appModName?>" href="#tabPage<?=$appModName?>"><?=LanguageManager::tran('Overtime Request Approval')?></a></li>
+    </ul>
+
+    <div class="tab-content">
+        <div class="tab-pane active" id="tabPage<?=$moduleMainName?>">
+            <div id="<?=$moduleMainName?>" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+            </div>
+            <div id="<?=$moduleMainName?>Form" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+            </div>
+        </div>
+        <div class="tab-pane" id="tabPage<?=$subModuleMainName?>">
+            <div id="<?=$subModuleMainName?>" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+            </div>
+            <div id="<?=$subModuleMainName?>Form" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+            </div>
+        </div>
+        <div class="tab-pane" id="tabPage<?=$appModName?>">
+            <div id="<?=$appModName?>" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+            </div>
+            <div id="<?=$appModName?>Form" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+            </div>
+        </div>
+    </div>
+
+</div>
+<script>
+    var modJsList = new Array();
+
+    modJsList['tab<?=$moduleMainName?>'] = new <?=$moduleMainName?>Adapter('<?=$moduleMainName?>','<?=$moduleMainName?>');
+    
+
+    modJsList['tab<?=$appModName?>'] = new <?=$moduleMainName?>ApproverAdapter('<?=$appModName?>', '<?=$appModName?>');
+    modJsList['tab<?=$appModName?>'].setShowAddNew(false);
+    modJsList['tab<?=$appModName?>'].setShowDelete(false);
+    modJsList['tab<?=$appModName?>'].setShowEdit(false);
+
+    modJsList['tab<?=$subModuleMainName?>'] = new <?=$subModuleMainName?>Adapter('<?=$moduleMainName?>','<?=$subModuleMainName?>');
+    modJsList['tab<?=$subModuleMainName?>'].setRemoteTable(true);
+    modJsList['tab<?=$subModuleMainName?>'].setShowAddNew(false);
+    modJsList['tab<?=$subModuleMainName?>'].setShowDelete(false);
+    modJsList['tab<?=$subModuleMainName?>'].setShowEdit(true);
+
+    var modJs = modJsList['tab<?=$moduleMainName?>'];
+
+</script>
+<?php include APP_BASE_PATH.'footer.php';?>      

ext/modules/overtime/lib.js

@@ -0,0 +1,120 @@
+/*
+This file is part of iCE Hrm.
+
+Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]  
+Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
+ */
+
+
+function EmployeeOvertimeAdapter(endPoint) {
+	this.initAdapter(endPoint);
+	this.itemName = 'Overtime';
+	this.itemNameLower = 'employeeovertime';
+	this.modulePathName = 'overtime';
+}
+
+EmployeeOvertimeAdapter.inherits(ApproveModuleAdapter);
+
+
+
+EmployeeOvertimeAdapter.method('getDataMapping', function() {
+	return [
+		"id",
+		"category",
+		"start_time",
+		"end_time",
+		"project",
+		"status"
+	];
+});
+
+EmployeeOvertimeAdapter.method('getHeaders', function() {
+	return [
+		{ "sTitle": "ID" ,"bVisible":false},
+		{ "sTitle": "Category" },
+		{ "sTitle": "Start Time" },
+		{ "sTitle": "End Time"},
+		{ "sTitle": "Project"},
+		{ "sTitle": "Status"}
+	];
+});
+
+EmployeeOvertimeAdapter.method('getFormFields', function() {
+	return [
+		["id", {"label": "ID", "type": "hidden"}],
+		["category", {"label": "Category", "type": "select2", "allow-null":false, "remote-source": ["OvertimeCategory", "id", "name"]}],
+		["start_time", {"label": "Start Time", "type": "datetime", "validation": ""}],
+		["end_time", {"label": "End Time", "type": "datetime", "validation": ""}],
+		["project", {"label": "Project", "type": "select2", "allow-null":true,"null=label":"none","remote-source": ["Project", "id", "name"]}],
+		["notes", {"label": "Notes", "type": "textarea", "validation": "none"}]
+	];
+});
+
+
+/*
+ EmployeeOvertimeApproverAdapter
+ */
+
+function EmployeeOvertimeApproverAdapter(endPoint) {
+	this.initAdapter(endPoint);
+	this.itemName = 'Overtime';
+	this.itemNameLower = 'employeeovertime';
+	this.modulePathName = 'overtime';
+}
+
+EmployeeOvertimeApproverAdapter.inherits(EmployeeOvertimeAdminAdapter);
+
+EmployeeOvertimeApproverAdapter.method('getActionButtonsHtml', function(id,data) {
+	var statusChangeButton = '<img class="tableActionButton" src="_BASE_images/run.png" style="cursor:pointer;" rel="tooltip" title="Change Status" onclick="modJs.openStatus(_id_, \'_cstatus_\');return false;"></img>';
+	var viewLogsButton = '<img class="tableActionButton" src="_BASE_images/log.png" style="margin-left:15px;cursor:pointer;" rel="tooltip" title="View Logs" onclick="modJs.getLogs(_id_);return false;"></img>';
+
+	var html = '<div style="width:80px;">_status__logs_</div>';
+
+
+	html = html.replace('_logs_',viewLogsButton);
+
+
+	if(data[this.getStatusFieldPosition()] == 'Processing'){
+		html = html.replace('_status_',statusChangeButton);
+
+	}else{
+		html = html.replace('_status_','');
+	}
+
+	html = html.replace(/_id_/g,id);
+	html = html.replace(/_BASE_/g,this.baseUrl);
+	html = html.replace(/_cstatus_/g,data[this.getStatusFieldPosition()]);
+	return html;
+});
+
+EmployeeOvertimeApproverAdapter.method('getStatusOptionsData', function(currentStatus) {
+	var data = {};
+	if(currentStatus != 'Processing'){
+
+	}else{
+		data["Approved"] = "Approved";
+		data["Rejected"] = "Rejected";
+
+	}
+
+	return data;
+});
+
+EmployeeOvertimeApproverAdapter.method('getStatusOptions', function(currentStatus) {
+	return this.generateOptions(this.getStatusOptionsData(currentStatus));
+});
+
+
+/*
+ EmployeeOvertimeAdapter
+ */
+
+function SubordinateEmployeeOvertimeAdapter(endPoint,tab,filter,orderBy) {
+	this.initAdapter(endPoint,tab,filter,orderBy);
+	this.itemName = 'Overtime';
+	this.itemNameLower = 'employeeovertime';
+	this.modulePathName = 'overtime';
+}
+
+SubordinateEmployeeOvertimeAdapter.inherits(EmployeeOvertimeAdminAdapter);
+

ext/modules/overtime/meta.json

@@ -0,0 +1,12 @@
+{
+	"label":"Overtime Requests",
+	"menu":"Time Management",
+	"order":"5",
+	"icon":"fa-align-center",
+	"user_levels":["Admin","Manager","Employee"],
+	"dashboardPosition":106,
+
+	"permissions":
+	{
+	}
+}

features.md

@@ -0,0 +1,84 @@
+Following is a list of features supported in each edition of icehrm
+-------------------------------------------------------------------
+
+### IceHrm Open Source Edition
+
+![Employee Module](https://icehrm.s3.amazonaws.com/images/blog-images/advanced-employee-module.png)
+
+#### Employee Management
+
+ - Basic [Employee Management](https://icehrm.com) - Store, manage and retrieve employee information when required
+ - Update all employee information without having to switch employees.
+ - Search employee skills, qualifications and other information<br/>easily across whole company.
+ - Terminate employees while keeping data in system.
+ - Re-enable temporarily terminated employees with one click.
+ - Employee archive feature to archive data of terminated employee
+
+#### Other Features
+
+ * [Company Information Management](https://icehrm.com) - Store and manage details about how companies, departments and branches of the organisation are connected
+ * Time sheets - IceHrm is a [timesheet app](https://icehrm.com) / [Open source timesheet management](https://icehrm.com) application to track time spent by employees on various projects
+ * [Attendance Management](https://icehrm.com) - IceHrm can be used as a [attendance management system](https://icehrm.com) effectively for any size a company.
+ * [LDAP Login](https://icehrm.com) - Users can share login with company LDAP server
+ * [Travel Management](https://icehrm.com) - Module for managing travel requests
+
+ 
+### IceHrm Pro Edition | [IceHrm.com](https://icehrm.com/modules.php)
+
+IceHrm Profession version (in short IceHrmPro) is the feature rich commercial alternative for icehrm
+open source version.  IceHrm Pro supports following features
+    
+#### Leave Management
+
+IceHrm [Leave management system](https://icehrm.com) is only available in IceHrm Pro or Enterprise versions. IceHrm leave module is a complete [leave management system](https://icehrm.com) for any type of a company
+
+To learn more about leave management in icehrm refer:
+- [Leave Admin Guide](http://blog.icehrm.com/docs/leave-admin)
+- [Configuring Leave Module](http://blog.icehrm.com/docs/leave-setup)
+- [Leave Rules](http://blog.icehrm.com/docs/leave-rules)
+
+#### Audit Trial
+
+Sometimes you need to access audit trail for your HRM system. Audit module records all the write actions (which alters your HRM system) 
+of your employees in a quickly accessible and understandable manor. This help you to identify potential issues with the way employees
+are using the system.
+
+#### Expense Tracking
+
+[Track Employee Expenses](https://icehrm.com) with expense management module.
+
+You can learn more about [IceHrm Pro here](http://blog.icehrm.com/docs/icehrm-pro/)
+
+To purchase IceHrmPro please visit [https://icehrm.com/modules.php](https://icehrm.com/modules.php)
+
+#### Training Management
+
+Icehrm [training management system](https://icehrm.com) is for Module for managing courses, training sessions and employee attendance to training sessions.
+ 
+
+### IceHrm Enterprise Edition
+
+In addition to pro version features IceHrm enterprise cloud edition includes following features
+
+#### [Employee History Management](https://icehrm.com)
+
+#### [Payroll](https://icehrm.com)
+
+IceHrm Enterprise has a full featured payroll module including [PDF salary slip generation](https://icehrm.com)
+
+#### Candidate / Recruitment Management
+
+Recruitment module can be used as a [applicant tracking system](https://icehrm.com) or a [recruiting software](https://icehrm.com). IceHrm recruitment management system offers
+following features
+
+![Recruitment Job Position Sharing](https://icehrm.s3.amazonaws.com/images/blog-images/recruitment-share.png)
+ 
+- Post jobs
+- Let candidates apply for these jobs
+- Schedule interviews
+- Track candidate progress with notes
+- Share job links with linkedIn, facebook, twitter and google+ directly from icehrm
+
+![Candidate Details](https://icehrm.s3.amazonaws.com/images/blog-images/candidates.png)
+
+More about [recruitment module](http://blog.icehrm.com/docs/recruitment/)

readme.md

@@ -5,7 +5,56 @@ IceHrm
 IceHrm is a [HRM software](https://icehrm.com) which enable companies of all sizes to [manage HR activities](https://icehrm.com)
 properly. 
 
-Note: IceHrm is now fully compatible with PHP 7
+Setup IceHrm Development Environment
+------------------------------------
+
+IceHrm development environment is packaged as a Vagrant box. I includes php7, nginx, phpunit and other
+software required for runing icehrm
+
+Preparing development VM
+------------------------
+
+- Clone icehrm from https://github.com/gamonoid/icehrm.git or download the source
+
+- Install Vagrant [https://www.vagrantup.com/downloads.html](https://www.vagrantup.com/downloads.html)
+
+- Install Vagrant host updater plugin [https://github.com/cogitatio/vagrant-hostsupdater](https://github.com/cogitatio/vagrant-hostsupdater)
+
+
+- Run vagrant up in icehrm root directory (this will download icehrm vagrant image which is  ~1 GB)
+
+```
+~ $ vagrant up
+```
+
+- Run vagrant ssh to login to the Virtual machine
+
+```
+~ $ vagrant ssh
+```
+
+- Install ant build in your VM
+
+```
+~ $ sudo apt-get install ant
+```
+
+- Build Icehrm (your icehrm root directory is mapped to /vagrant/ directory in VM)
+
+```
+~ $ cd /vagrant
+~ $ ant buildlocal
+```
+
+- Navigate to [](http://clients.app.dev/dev) to load icehrm from VM. (user:admin/pass:admin)
+
+- Runing unit test
+
+```
+~ $ cd /vagrant
+~ $ phpunit
+```
+
 
 Useful Links
 -------------
@@ -39,438 +88,3 @@ Upgrade from Previous Versions to Latest Version
 ------------------------------------------------
 
 Refer: [http://blog.icehrm.com/docs/upgrade/](http://blog.icehrm.com/docs/upgrade/)
-
-Following is a list of features supported in each edition of icehrm
--------------------------------------------------------------------
-
-### IceHrm Open Source Edition
-
-![Employee Module](https://icehrm.s3.amazonaws.com/images/blog-images/advanced-employee-module.png)
-
-#### Employee Management
-
- - Basic [Employee Management](https://icehrm.com) - Store, manage and retrieve employee information when required
- - Update all employee information without having to switch employees.
- - Search employee skills, qualifications and other information<br/>easily across whole company.
- - Terminate employees while keeping data in system.
- - Re-enable temporarily terminated employees with one click.
- - Employee archive feature to archive data of terminated employee
-
-#### Other Features
-
- * [Company Information Management](https://icehrm.com) - Store and manage details about how companies, departments and branches of the organisation are connected
- * Time sheets - IceHrm is a [timesheet app](https://icehrm.com) / [Open source timesheet management](https://icehrm.com) application to track time spent by employees on various projects
- * [Attendance Management](https://icehrm.com) - IceHrm can be used as a [attendance management system](https://icehrm.com) effectively for any size a company.
- * [LDAP Login](https://icehrm.com) - Users can share login with company LDAP server
- * [Travel Management](https://icehrm.com) - Module for managing travel requests
-
- 
-### IceHrm Pro Edition | [IceHrm.com](https://icehrm.com/modules.php)
-
-IceHrm Profession version (in short IceHrmPro) is the feature rich commercial alternative for icehrm
-open source version.  IceHrm Pro supports following features
-    
-#### Leave Management
-
-IceHrm [Leave management system](https://icehrm.com) is only available in IceHrm Pro or Enterprise versions. IceHrm leave module is a complete [leave management system](https://icehrm.com) for any type of a company
-
-To learn more about leave management in icehrm refer:
-- [Leave Admin Guide](http://blog.icehrm.com/docs/leave-admin)
-- [Configuring Leave Module](http://blog.icehrm.com/docs/leave-setup)
-- [Leave Rules](http://blog.icehrm.com/docs/leave-rules)
-
-#### Audit Trial
-
-Sometimes you need to access audit trail for your HRM system. Audit module records all the write actions (which alters your HRM system) 
-of your employees in a quickly accessible and understandable manor. This help you to identify potential issues with the way employees
-are using the system.
-
-#### Expense Tracking
-
-[Track Employee Expenses](https://icehrm.com) with expense management module.
-
-You can learn more about [IceHrm Pro here](http://blog.icehrm.com/docs/icehrm-pro/)
-
-To purchase IceHrmPro please visit [https://icehrm.com/modules.php](https://icehrm.com/modules.php)
-
-#### Training Management
-
-Icehrm [training management system](https://icehrm.com) is for Module for managing courses, training sessions and employee attendance to training sessions.
- 
-
-### IceHrm Enterprise Edition
-
-In addition to pro version features IceHrm enterprise cloud edition includes following features
-
-#### [Employee History Management](https://icehrm.com)
-
-#### [Payroll](https://icehrm.com)
-
-IceHrm Enterprise has a full featured payroll module including [PDF salary slip generation](https://icehrm.com)
-
-#### Candidate / Recruitment Management
-
-Recruitment module can be used as a [applicant tracking system](https://icehrm.com) or a [recruiting software](https://icehrm.com). IceHrm recruitment management system offers
-following features
-
-![Recruitment Job Position Sharing](https://icehrm.s3.amazonaws.com/images/blog-images/recruitment-share.png)
- 
-- Post jobs
-- Let candidates apply for these jobs
-- Schedule interviews
-- Track candidate progress with notes
-- Share job links with linkedIn, facebook, twitter and google+ directly from icehrm
-
-![Candidate Details](https://icehrm.s3.amazonaws.com/images/blog-images/candidates.png)
-
-More about [recruitment module](http://blog.icehrm.com/docs/recruitment/)
-
-
-Release note v18.0
-------------------
-### Features
- * Translations (beta) for German, French, Polish, Italian, Sinhala, Chinese, Japanese, Hindi and Spanish
- * PDF Reports
- * Ability to specify department heads
- * Add advanced custom fields to employees via UI
- * Allow indirect admins to approve travel requests
- * Adding more languages to Language meta data table
- * Improvements to report module
- * Ability to select sections for placing custom fields on employee detail view screen
- * Introducing clone button
- * Unlimited custom fields for employees
- * PDF report for monitoring time employee spent on projects
- * Report files module - Allow downloading all previously generated reports
-
-### Fixes
- * Fix: subordinates are not showing beyond first page issue.
-
-
-Release note v16.1
-------------------
- 
-### Fixes
- * Fix LDAP user login issue
- * Allow creating users with username having dot and dash
-
-Release note v16.0
-------------------
-### Features
- * Advanced Employee Management Module is now included in IceHrm Open Source Edition
- * LDAP Module which was only available in IceHrm Enterprise is now included in open source also
- * Initial implementation of icehrm REST Api for reading employee details
- * Improvements to data filtering
- * Multiple tabs for settings module
- * Overtime reports - now its possible to calculate overtime for employees.compatible with US overtime rules
- * Logout the user if tried accessing an unauthorized module
- * Setting for updating module names
- 
-### Fixes
- * Fix issue: classes should be loaded even the module is disabled
- * Deleting the only Admin user is not allowed
- * Fixes for handling non UTF-8
- * Fix for non-mandatory select boxes are shown as mandatory
-
-Release note v15.2
-------------------
-
-### Features
- * Overtime Reports
- * Overtime calculation for california
- 
-### Fixes
- * Fix issue: uncaught error when placeholder value is empty
- * Log email sending success status
- * Fix broken longer company name issue
- * Make the application accessible when client on an intranet with no internet connection
- * Fix issue: when a module is disabled other modules depend on it stops working
-
-
-Release note v15.0
-------------------
-
-### Features
- * Clear HTML5 local storage when logging in and switching users
- * Showing a loading message while getting data from server
- * Adding a new field to show total time of each time sheet
- * New report added for listing Employee Time Sheets
- * Company logo uploaded via settings will be used for all email headers
- 
-### Fixes
- * Fix issue: default module URL is incorrect for Employees
- * Fix date parsing issue in time sheets
- * AWS phar is included only when required
-
-Release note v14.1
-------------------
-
-### Features
- * Add Quick access menu
-
-### Fixes
- * Fix issue: salary module not loading
- * Add travel report
-
-Release note v14.0
-------------------
-
-### Features
- * IceHrm is now fully compatible with PHP 7
- * Improvements to travel management module to change the process of applying for travel requests
- * New report add for getting travel requests
- * Improvements to user interface
- * Bunch of UI improvements including changing menu order and font sizes
- * Add a setting to use server time for time zone defined on department that a user is attached to create new attendance records
- * Improvements to admin/manager and user dashboard
- * Managers allowed to view/add/edit employee documents
- * New reports added for employee expenses and travel
- 
-### Fixes
- * Fix unavailable help links
-
-
-Release note v13.4
------------------
-
-### Features
- 
-### Fixes
- * Fix employee leave report leave type field
-
-Release note v13.0
------------------
-
-### Features
- * Recruitment module
- * Allow managers to edit attendance of direct report employees
- 
-### Fixes
- * Employee switching issue fixed 
- * Fix terminated employee labels
- * Fix issue with punch-in
-
-Release note v12.6
------------------
-
-### Features
- * Charts module
- * Code level security improvements
- 
-### Fixes
- * Employee switching issue fixed 
-
-
-Release note v11.1
------------------
-
-### Features
- * Add/Edit or remove employee fields
-
-
-Release note v11.0
------------------
-
-### Features
- * Employee data archiving
- * Leave cancellation requests
- * Adding view employee feature
-
-### Fixes
- * Improvements to date time pickers 
-
-
-Release note v10.1
------------------
-
-### Features
- * Integration with ice-framework (http://githun.com/thilinah/ice-framework)
- * Option for only allow users to add an entry to a timesheet only if they have marked atteandance for the selected period
- * Restricting availability of leave types to employees using leave groups
- * Admins and add notes to employees
-
-Release note v9.1
------------------
-
-### Fixes
- * Add missing S3FileSystem class
- * Fix issue: passing result of a method call directly into empty method is not supported in php v5.3
-
-
-Release note v9.0
------------------
-
-### Features
- * New user interface
- * Decimal leave counts supported
- 
-Update icehrm v8.4 to v9.0
---------------------------
-
- * Make a backup of your icehrm db
- * Run db script "icehrmdb_update_v8.4_to_v9.0.sql" which can be found inside script folder of icehrm_v9.0
- * remove all folders except app folder in icehrm root folder
- * copy all folders except app folder from new installation to icehrm root folder
- 
- 
-Release note v8.4
------------------
-
-### Fixes
- * Fix leave carry forward rounding issues
- * Fix issue: select2 default value not getting set for select2
- * Fix issue: email not sent when admin changing leave status
-
-Release note v8.3
------------------
-
-### Fixes
- * Fix user table issue on windows, this will resolve errors such as: (Note that this fix has no effect on unix based installations)
- * Admin not able to view user uploaded documents
- * Admin not able to upload documants for users
- * Admin can not view employee attendance records
- * Employee projects can not be added
-
-
-Release note v8.2
------------------
-
-### Features
-* Instance verification added
-
-Release note v8.1
------------------
-
-### Fixes
-* Fixed bug that caused a fatal error in php v5.4
-* aws2.7.11 phar file replaced by a aws2.7.11 extracted files
-* old aws sdk removed
-
-Release note v8.0
------------------
-
-### Features
-* Admin dashbord module
-* If the employee joined in current leave period, his leave entitlement is calculated proportional to joined date
-* Improvements to reporting module
-* Adding new employee time tracking report
-* Join date for employees made mandatory
-* Sending welcome email when a user is added
-* Let users directly reply to admin user from any email sent out from icehrm
-* All the users who are not admins must have an employee object attached
-* Upgrade aws sdk to v2.7.11
-* Allow employees to change password
-* Use only the email address defined under user for sending mails
-* Making work_email and private_email fields optional
-
-
-### Fixes
-* Upload dialog close button issue fixed
-
-Release note v7.2
------------------
-
-### Fixes
-* Some critical vulnerabilities are fixed as recommend by http://zeroscience.mk/en/
-
-Release note v7.1
------------------
-
-### Features
-* Improved company structure graph
-* Leave notes implementation <20> Supervisor can add a note when approving or rejecting leaves
-* Filtering support
-* Select boxes with long lists are now searchable
-* Add/Edit/Delete company structure permissions added for managers
-* Add ability to disable employee information editing
-
-### Fixes
-* Make loans editable only by admin
-* Fix: permissions not getting applied to employee documents
-* Fix error adding employee documents when no user assigned to the admin
-
-### Code Quality
-* Moving all module related code and data into module folders
-
-Release note v6.1
------------------
-
-Leave carry forwared related isue fixed
-
-Release note v6.0
------------------
-
-* Features
-* Notifications for leaves and timesheets
-* Leave module accrue and leave carry forward
-* Employee leave entitlement sub module
-* Ability to put system on debug mode
-* Allow admins to see documents of all the employees at one place
-* Backup data when deleting an employee
-* Employee attendance report added
-* Changes to time entry form in timesheet module to make time entry process faster
-* Admin can make all projects available to employees or just the set of prjects assigned to them using Setting "Projects: Make All Projects Available to Employees"
-* Employee document, date added field can not be changed by the employee anymore
-* About dialog added for admins
-
-* Fixes
-* Fix default employee delete issue (when the default employee is deleted the admin user attached to it also get deleted)
-* Fix user duplicate email issue
-* Fix manager can not logout from switched employee
-* Remove admin guide from non admin users
-
-Release note v5.3
------------------
-
-* Fixes
-* Fix missing employee name in employee details report
-
-Release note v5.2
------------------
-
-* Fixes
-* Remove unwanted error logs
-* Fix attendance module employee permission issue
-* Resolve warnings
-* Remove add new button from subordinates module
-* Adding administrators' guide
-
-Release note v5.1
------------------
-
-* Fixes
-* Fixing for non updating null fields
-* https://bitbucket.org/thilina/icehrm-opensource/commits/df57308b53484a2e43ef5c72967ed1cd0dc756cc
-
-Release note v5.0
------------------
-
-* Features
-* New user permission implementation
-* Adding new user level - Manager
-
-* Fixes
-* Fixing remote table loading issue
-
-Release note v4.2
------------------
-
-### Fixes
-* https://bitbucket.org/thilina/icehrm-opensource/issue/23/subordinate-leaves-pagination-not-working
-* https://bitbucket.org/thilina/icehrm-opensource/issue/20/error-occured-while-time-punch
-
-
-Release note v4.1
------------------
-
-### Features
-* Better email format for notifications
-* Convert upload dialog to a bootstrp model
-
-* Fixes
-* Fix error sending emails with amazon SES
-* Fix errors related to XAMPP and WAMPP servers
-* Fix php warnings and notifications
-* Fix company structure graph issues
-* Allow icehrm client to work without an internet connection
-* Fix installer incorrect base url issue
-* Fix empty user creation issue

release.md

@@ -0,0 +1,357 @@
+Release note v19.0
+------------------
+### Features
+ * Payroll Module
+ * Development environment
+ * Overtime module
+ * Department heads who can manage all employees attached to a company structure
+
+
+Release note v18.0
+------------------
+### Features
+ * Translations (beta) for German, French, Polish, Italian, Sinhala, Chinese, Japanese, Hindi and Spanish
+ * PDF Reports
+ * Ability to specify department heads
+ * Add advanced custom fields to employees via UI
+ * Allow indirect admins to approve travel requests
+ * Adding more languages to Language meta data table
+ * Improvements to report module
+ * Ability to select sections for placing custom fields on employee detail view screen
+ * Introducing clone button
+ * Unlimited custom fields for employees
+ * PDF report for monitoring time employee spent on projects
+ * Report files module - Allow downloading all previously generated reports
+
+### Fixes
+ * Fix: subordinates are not showing beyond first page issue.
+
+
+Release note v16.1
+------------------
+ 
+### Fixes
+ * Fix LDAP user login issue
+ * Allow creating users with username having dot and dash
+
+Release note v16.0
+------------------
+### Features
+ * Advanced Employee Management Module is now included in IceHrm Open Source Edition
+ * LDAP Module which was only available in IceHrm Enterprise is now included in open source also
+ * Initial implementation of icehrm REST Api for reading employee details
+ * Improvements to data filtering
+ * Multiple tabs for settings module
+ * Overtime reports - now its possible to calculate overtime for employees.compatible with US overtime rules
+ * Logout the user if tried accessing an unauthorized module
+ * Setting for updating module names
+ 
+### Fixes
+ * Fix issue: classes should be loaded even the module is disabled
+ * Deleting the only Admin user is not allowed
+ * Fixes for handling non UTF-8
+ * Fix for non-mandatory select boxes are shown as mandatory
+
+Release note v15.2
+------------------
+
+### Features
+ * Overtime Reports
+ * Overtime calculation for california
+ 
+### Fixes
+ * Fix issue: uncaught error when placeholder value is empty
+ * Log email sending success status
+ * Fix broken longer company name issue
+ * Make the application accessible when client on an intranet with no internet connection
+ * Fix issue: when a module is disabled other modules depend on it stops working
+
+
+Release note v15.0
+------------------
+
+### Features
+ * Clear HTML5 local storage when logging in and switching users
+ * Showing a loading message while getting data from server
+ * Adding a new field to show total time of each time sheet
+ * New report added for listing Employee Time Sheets
+ * Company logo uploaded via settings will be used for all email headers
+ 
+### Fixes
+ * Fix issue: default module URL is incorrect for Employees
+ * Fix date parsing issue in time sheets
+ * AWS phar is included only when required
+
+Release note v14.1
+------------------
+
+### Features
+ * Add Quick access menu
+
+### Fixes
+ * Fix issue: salary module not loading
+ * Add travel report
+
+Release note v14.0
+------------------
+
+### Features
+ * IceHrm is now fully compatible with PHP 7
+ * Improvements to travel management module to change the process of applying for travel requests
+ * New report add for getting travel requests
+ * Improvements to user interface
+ * Bunch of UI improvements including changing menu order and font sizes
+ * Add a setting to use server time for time zone defined on department that a user is attached to create new attendance records
+ * Improvements to admin/manager and user dashboard
+ * Managers allowed to view/add/edit employee documents
+ * New reports added for employee expenses and travel
+ 
+### Fixes
+ * Fix unavailable help links
+
+
+Release note v13.4
+-----------------
+
+### Features
+ 
+### Fixes
+ * Fix employee leave report leave type field
+
+Release note v13.0
+-----------------
+
+### Features
+ * Recruitment module
+ * Allow managers to edit attendance of direct report employees
+ 
+### Fixes
+ * Employee switching issue fixed 
+ * Fix terminated employee labels
+ * Fix issue with punch-in
+
+Release note v12.6
+-----------------
+
+### Features
+ * Charts module
+ * Code level security improvements
+ 
+### Fixes
+ * Employee switching issue fixed 
+
+
+Release note v11.1
+-----------------
+
+### Features
+ * Add/Edit or remove employee fields
+
+
+Release note v11.0
+-----------------
+
+### Features
+ * Employee data archiving
+ * Leave cancellation requests
+ * Adding view employee feature
+
+### Fixes
+ * Improvements to date time pickers 
+
+
+Release note v10.1
+-----------------
+
+### Features
+ * Integration with ice-framework (http://githun.com/thilinah/ice-framework)
+ * Option for only allow users to add an entry to a timesheet only if they have marked atteandance for the selected period
+ * Restricting availability of leave types to employees using leave groups
+ * Admins and add notes to employees
+
+Release note v9.1
+-----------------
+
+### Fixes
+ * Add missing S3FileSystem class
+ * Fix issue: passing result of a method call directly into empty method is not supported in php v5.3
+
+
+Release note v9.0
+-----------------
+
+### Features
+ * New user interface
+ * Decimal leave counts supported
+ 
+Update icehrm v8.4 to v9.0
+--------------------------
+
+ * Make a backup of your icehrm db
+ * Run db script "icehrmdb_update_v8.4_to_v9.0.sql" which can be found inside script folder of icehrm_v9.0
+ * remove all folders except app folder in icehrm root folder
+ * copy all folders except app folder from new installation to icehrm root folder
+ 
+ 
+Release note v8.4
+-----------------
+
+### Fixes
+ * Fix leave carry forward rounding issues
+ * Fix issue: select2 default value not getting set for select2
+ * Fix issue: email not sent when admin changing leave status
+
+Release note v8.3
+-----------------
+
+### Fixes
+ * Fix user table issue on windows, this will resolve errors such as: (Note that this fix has no effect on unix based installations)
+ * Admin not able to view user uploaded documents
+ * Admin not able to upload documants for users
+ * Admin can not view employee attendance records
+ * Employee projects can not be added
+
+
+Release note v8.2
+-----------------
+
+### Features
+* Instance verification added
+
+Release note v8.1
+-----------------
+
+### Fixes
+* Fixed bug that caused a fatal error in php v5.4
+* aws2.7.11 phar file replaced by a aws2.7.11 extracted files
+* old aws sdk removed
+
+Release note v8.0
+-----------------
+
+### Features
+* Admin dashbord module
+* If the employee joined in current leave period, his leave entitlement is calculated proportional to joined date
+* Improvements to reporting module
+* Adding new employee time tracking report
+* Join date for employees made mandatory
+* Sending welcome email when a user is added
+* Let users directly reply to admin user from any email sent out from icehrm
+* All the users who are not admins must have an employee object attached
+* Upgrade aws sdk to v2.7.11
+* Allow employees to change password
+* Use only the email address defined under user for sending mails
+* Making work_email and private_email fields optional
+
+
+### Fixes
+* Upload dialog close button issue fixed
+
+Release note v7.2
+-----------------
+
+### Fixes
+* Some critical vulnerabilities are fixed as recommend by http://zeroscience.mk/en/
+
+Release note v7.1
+-----------------
+
+### Features
+* Improved company structure graph
+* Leave notes implementation <20> Supervisor can add a note when approving or rejecting leaves
+* Filtering support
+* Select boxes with long lists are now searchable
+* Add/Edit/Delete company structure permissions added for managers
+* Add ability to disable employee information editing
+
+### Fixes
+* Make loans editable only by admin
+* Fix: permissions not getting applied to employee documents
+* Fix error adding employee documents when no user assigned to the admin
+
+### Code Quality
+* Moving all module related code and data into module folders
+
+Release note v6.1
+-----------------
+
+Leave carry forwared related isue fixed
+
+Release note v6.0
+-----------------
+
+* Features
+* Notifications for leaves and timesheets
+* Leave module accrue and leave carry forward
+* Employee leave entitlement sub module
+* Ability to put system on debug mode
+* Allow admins to see documents of all the employees at one place
+* Backup data when deleting an employee
+* Employee attendance report added
+* Changes to time entry form in timesheet module to make time entry process faster
+* Admin can make all projects available to employees or just the set of prjects assigned to them using Setting "Projects: Make All Projects Available to Employees"
+* Employee document, date added field can not be changed by the employee anymore
+* About dialog added for admins
+
+* Fixes
+* Fix default employee delete issue (when the default employee is deleted the admin user attached to it also get deleted)
+* Fix user duplicate email issue
+* Fix manager can not logout from switched employee
+* Remove admin guide from non admin users
+
+Release note v5.3
+-----------------
+
+* Fixes
+* Fix missing employee name in employee details report
+
+Release note v5.2
+-----------------
+
+* Fixes
+* Remove unwanted error logs
+* Fix attendance module employee permission issue
+* Resolve warnings
+* Remove add new button from subordinates module
+* Adding administrators' guide
+
+Release note v5.1
+-----------------
+
+* Fixes
+* Fixing for non updating null fields
+* https://bitbucket.org/thilina/icehrm-opensource/commits/df57308b53484a2e43ef5c72967ed1cd0dc756cc
+
+Release note v5.0
+-----------------
+
+* Features
+* New user permission implementation
+* Adding new user level - Manager
+
+* Fixes
+* Fixing remote table loading issue
+
+Release note v4.2
+-----------------
+
+### Fixes
+* https://bitbucket.org/thilina/icehrm-opensource/issue/23/subordinate-leaves-pagination-not-working
+* https://bitbucket.org/thilina/icehrm-opensource/issue/20/error-occured-while-time-punch
+
+
+Release note v4.1
+-----------------
+
+### Features
+* Better email format for notifications
+* Convert upload dialog to a bootstrp model
+
+* Fixes
+* Fix error sending emails with amazon SES
+* Fix errors related to XAMPP and WAMPP servers
+* Fix php warnings and notifications
+* Fix company structure graph issues
+* Allow icehrm client to work without an internet connection
+* Fix installer incorrect base url issue
+* Fix empty user creation issue

test/classes/ApprovalStatusTest.php

@@ -0,0 +1,93 @@
+<?php
+
+if(!class_exists("TestTemplate")) {
+    include dirname(__FILE__).'/../TestTemplate.php';
+}
+
+
+class ApprovalStatusTest extends TestTemplate{
+
+    var $travelRec = null;
+
+    protected function setUp(){
+
+        parent::setUp();
+        $emp = new Employee();
+        $emp->Load("id = ?",array(1));
+        $emp->supervisor = 2;
+        $emp->indirect_supervisors = json_encode(array(3,4));
+        $emp->approver1 = 5;
+        $emp->approver2 = 6;
+        $emp->approver3 = 7;
+        $emp->Save();
+
+
+
+        $this->travelRec = new EmployeeTravelRecord();
+
+        $this->travelRec->DB()->execute("delete from EmployeeTravelRecords");
+
+        $this->travelRec->employee = 1;
+        $this->travelRec->type = 'International';
+        $this->travelRec->purpose = 'Testing';
+        $this->travelRec->travel_from = 'Colombo';
+        $this->travelRec->travel_to = 'Germany';
+        $this->travelRec->travel_date = date("Y-m-d H:i:s");
+        $this->travelRec->return_date = date("Y-m-d H:i:s");
+        $this->travelRec->status = 'Pending';
+        $this->travelRec->Save();
+    }
+    
+    protected function tearDown(){
+        parent::tearDown();
+    }
+
+
+    public function testInitializeApprovalChain(){
+        $id = $this->travelRec->id;
+        $this->initializeObjects();
+        $as = ApprovalStatus::getInstance();
+        $as->initializeApprovalChain('EmployeeTravelRecord',$id);
+        $status = $as->getAllStatuses('EmployeeTravelRecord',$id);
+        $this->assertEquals(3, count($status));
+    }
+
+
+    public function testUpdateApprovalStatus(){
+        $id = $this->travelRec->id;
+        $this->initializeObjects();
+        $as = ApprovalStatus::getInstance();
+
+        $as->initializeApprovalChain('EmployeeTravelRecord',$id);
+        $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,2,1);
+
+        $this->assertNull($resp->getObject()[0]);
+        $this->assertEquals(1, $resp->getObject()[1]->active);
+        $this->assertEquals(1, $resp->getObject()[1]->level);
+
+
+        $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,3,1);
+        $this->assertEquals(IceResponse::ERROR, $resp->getStatus());
+
+        $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,5,1);
+        $this->assertEquals(0, $resp->getObject()[0]->active);
+        $this->assertEquals(1, $resp->getObject()[0]->level);
+        $this->assertEquals(1, $resp->getObject()[1]->active);
+        $this->assertEquals(2, $resp->getObject()[1]->level);
+
+        $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,6,1);
+        $this->assertEquals(0, $resp->getObject()[0]->active);
+        $this->assertEquals(2, $resp->getObject()[0]->level);
+        $this->assertEquals(1, $resp->getObject()[1]->active);
+        $this->assertEquals(3, $resp->getObject()[1]->level);
+
+        $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,7,1);
+        $this->assertEquals(1, $resp->getObject()[0]->active);
+        $this->assertEquals(3, $resp->getObject()[0]->level);
+        $this->assertNull($resp->getObject()[1]);
+
+
+        fwrite(STDOUT, __METHOD__ . " End\n");
+    }
+
+}

tp/adodb512/adodb-csvlib.inc.php

@@ -1,318 +0,0 @@
-<?php
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-global $ADODB_INCLUDED_CSV;
-$ADODB_INCLUDED_CSV = 1;
-
-/* 
-
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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->timeCreated = $rs->timeCreated; # memcache fix
-		$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
-	* Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked)
-	*/
-	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,'w'))) return false;
-			if (fwrite($fd,$contents)) $ok = true;
-			else $ok = false;
-			fclose($fd);
-			
-			if ($ok) {
-				@chmod($tmpname,0644);
-				// the tricky moment
-				@unlink($filename);
-				if (!@rename($tmpname,$filename)) {
-					unlink($tmpname);
-					$ok = 0;
-				}
-				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)) {
-			if (fwrite( $fd, $contents )) $ok = true;
-			else $ok = false;
-			fclose($fd);
-			@chmod($filename,0644);
-		}else {
-			fclose($fd);
-			if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename<br>\n");
-			$ok = false;
-		}
-	
-		return $ok;
-	}
-?>

tp/adodb512/adodb-error.inc.php

@@ -1,258 +0,0 @@
-<?php
-/** 
- * @version V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com). 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)$/i' => DB_ERROR_NOSUCHTABLE,
-            '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/i'      => DB_ERROR_ALREADY_EXISTS,
-            '/divide by zero$/i'                     => DB_ERROR_DIVZERO,
-            '/pg_atoi: error in .*: can\'t parse /i' => DB_ERROR_INVALID_NUMBER,
-            '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/i' => DB_ERROR_NOSUCHFIELD,
-            '/parser: parse error at or near \"/i'   => DB_ERROR_SYNTAX,
-            '/referential integrity violation/i'     => DB_ERROR_CONSTRAINT,
-			'/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key.*violates unique constraint/i'     
-			 	 => 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;
-}
-?>

tp/adodb512/adodb-errorhandler.inc.php

@@ -1,79 +0,0 @@
-<?php
-/**
- * @version V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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); 
-}
-?>

tp/adodb512/adodb-errorpear.inc.php

@@ -1,88 +0,0 @@
-<?php
-/** 
- * @version V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com). 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;
-}
-		
-?>

tp/adodb512/adodb-exceptions.inc.php

@@ -1,82 +0,0 @@
-<?php
-
-/**
- * @version V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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);
-}
-
-
-?>

tp/adodb512/adodb-iterator.inc.php

@@ -1,30 +0,0 @@
-<?php
-
-/*
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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
-	
-	
-	Moved to adodb.inc.php to improve performance.
- */
- 
-
-
-
-
-?>

tp/adodb512/adodb-memcache.lib.inc.php

@@ -1,190 +0,0 @@
-<?php
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-global $ADODB_INCLUDED_MEMCACHE;
-$ADODB_INCLUDED_MEMCACHE = 1;
-
-global $ADODB_INCLUDED_CSV;
-if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
-
-/* 
-
-  V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com). 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
-
-Usage:
-  
-$db = NewADOConnection($driver);
-$db->memCache = true; /// should we use memCache instead of caching in files
-$db->memCacheHost = array($ip1, $ip2, $ip3);
-$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);
-  
-  Note the memcache class is shared by all connections, is created during the first call to Connect/PConnect.
-  
-  Class instance is stored in $ADODB_CACHE
-*/
-
-	class ADODB_Cache_MemCache {
-		var $createdir = false; // create caching directory structure?
-		
-		//-----------------------------
-		// memcache specific variables
-		
-		var $hosts;	// array of hosts
-		var $port = 11211;
-		var $compress = false; // memcache compression with zlib
-		
-		var $_connected = false;
-		var $_memcache = false;
-		
-		function ADODB_Cache_MemCache(&$obj)
-		{
-			$this->hosts = $obj->memCacheHost;
-			$this->port = $obj->memCachePort;
-			$this->compress = $obj->memCacheCompress;
-		}
-		
-		// implement as lazy connection. The connection only occurs on CacheExecute call
-		function connect(&$err)
-		{
-			if (!function_exists('memcache_pconnect')) {
-				$err = 'Memcache module PECL extension not found!';
-				return false;
-			}
-
-			$memcache = new MemCache;
-			
-			if (!is_array($this->hosts)) $this->hosts = array($this->hosts);
-		
-			$failcnt = 0;
-			foreach($this->hosts as $host) {
-				if (!@$memcache->addServer($host,$this->port,true)) {
-					$failcnt += 1;
-				}
-			}
-			if ($failcnt == sizeof($this->hosts)) {
-				$err = 'Can\'t connect to any memcache server';
-				return false;
-			}
-			$this->_connected = true;
-			$this->_memcache = $memcache;
-			return true;
-		}
-		
-		// returns true or false. true if successful save
-		function writecache($filename, $contents, $debug, $secs2cache)
-		{
-			if (!$this->_connected) {
-				$err = '';
-				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
-			}
-			if (!$this->_memcache) return false;
-			
-			if (!$this->_memcache->set($filename, $contents, $this->compress, $secs2cache)) {
-				if ($debug) ADOConnection::outp(" Failed to save data at the memcached server!<br>\n");
-				return false;
-			}
-			
-			return true;
-		}
-		
-		// returns a recordset
-		function readcache($filename, &$err, $secs2cache, $rsClass)
-		{
-			$false = false;
-			if (!$this->_connected) $this->connect($err);
-			if (!$this->_memcache) return $false;
-			
-			$rs = $this->_memcache->get($filename);
-			if (!$rs) {
-				$err = 'Item with such key doesn\'t exists on the memcached server.';
-				return $false;
-			}
-			
-			// hack, should actually use _csv2rs
-			$rs = explode("\n", $rs);
-            unset($rs[0]);
-            $rs = join("\n", $rs);
- 			$rs = unserialize($rs);
-			if (! is_object($rs)) {
-				$err = 'Unable to unserialize $rs';		
-				return $false;
-			}
-			if ($rs->timeCreated == 0) return $rs; // apparently have been reports that timeCreated was set to 0 somewhere
-			
-			$tdiff = intval($rs->timeCreated+$secs2cache - 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 flushall($debug=false)
-		{
-			if (!$this->_connected) {
-				$err = '';
-				if (!$this->connect($err) && $debug) ADOConnection::outp($err);
-			}
-			if (!$this->_memcache) return false;
-			
-			$del = $this->_memcache->flush();
-			
-			if ($debug) 
-				if (!$del) ADOConnection::outp("flushall: failed!<br>\n");
-				else ADOConnection::outp("flushall: succeeded!<br>\n");
-				
-			return $del;
-		}
-		
-		function flushcache($filename, $debug=false)
-		{
-			if (!$this->_connected) {
-  				$err = '';
-  				if (!$this->connect($err) && $debug) ADOConnection::outp($err); 
-			} 
-			if (!$this->_memcache) return false;
-  
-			$del = $this->_memcache->delete($filename);
-			
-			if ($debug) 
-				if (!$del) ADOConnection::outp("flushcache: $key entry doesn't exist on memcached server!<br>\n");
-				else ADOConnection::outp("flushcache: $key entry flushed from memcached server!<br>\n");
-				
-			return $del;
-		}
-		
-		// not used for memcache
-		function createdir($dir, $hash) 
-		{
-			return true;
-		}
-	}
-
-?>

tp/adodb512/adodb-pager.inc.php

@@ -1,290 +0,0 @@
-<?php
-
-/*
-	V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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>";
-	}
-}
-
-
-?>

tp/adodb512/adodb-pear.inc.php

@@ -1,374 +0,0 @@
-<?php
-/** 
- * @version V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com). 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 = strtolower(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;
-	}
-}
-
-?>

tp/adodb512/adodb-php4.inc.php

@@ -1,16 +0,0 @@
-<?php
-
-/*
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 {
-}
-
-?>

tp/adodb512/contrib/toxmlrpc.inc.php

@@ -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;
-
-    }
-
-?>

tp/adodb512/datadict/datadict-access.inc.php

@@ -1,96 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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,$funsigned)
-	{
-		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();
-	}
-	
-}
-
-
-?>

tp/adodb512/datadict/datadict-db2.inc.php

@@ -1,144 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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,$funsigned)
-	{	
-		$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;
-	}
-	
-}
-
-
-?>

tp/adodb512/datadict/datadict-firebird.inc.php

@@ -1,152 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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;
-	}
-
-}
-
-
-?>

tp/adodb512/datadict/datadict-generic.inc.php

@@ -1,126 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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;
-		}
-	}
-*/
-?>

tp/adodb512/datadict/datadict-ibase.inc.php

@@ -1,68 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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();
-	}
-	
-}
-
-
-?>

tp/adodb512/datadict/datadict-informix.inc.php

@@ -1,81 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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,$funsigned)
-	{
-		if ($fautoinc) {
-			$ftype = 'SERIAL';
-			return '';
-		}
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-}
-
-?>

tp/adodb512/datadict/datadict-mssql.inc.php

@@ -1,284 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'SMALLDATETIME': return 'T';
-		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 'TS':
-		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,$funsigned)
-	{	
-		$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);    
-
-	}
-}
-?>

tp/adodb512/datadict/datadict-mssqlnative.inc.php

@@ -1,282 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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_mssqlnative extends ADODB_DataDict {
-	var $databaseType = 'mssqlnative';
-	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,$funsigned)
-	{	
-		$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);    
-
-	}
-}
-?>

tp/adodb512/datadict/datadict-mysql.inc.php

@@ -1,182 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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;
-	}
-}
-?>

tp/adodb512/datadict/datadict-oci8.inc.php

@@ -1,297 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TIMESTAMP':
-			return 'TS';
-			
-		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 'TS':
-				return 'TIMESTAMP';
-				
-		case 'D': 
-		case 'T': return 'DATE';
-		case 'L': return 'NUMBER(1)';
-		case 'I1': return 'NUMBER(3)';
-		case 'I2': return 'NUMBER(5)';
-		case 'I':
-		case 'I4': return 'NUMBER(10)';
-		
-		case 'I8': return 'NUMBER(20)';
-		case 'F': return 'NUMBER';
-		case 'N': return 'NUMBER';
-		case 'R': return 'NUMBER(20)';
-		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";
-	}
-}
-?>

tp/adodb512/datadict/datadict-postgres.inc.php

@@ -1,448 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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;
-	}
-
-
-	function DropIndexSQL ($idxname, $tabname = NULL)
-	{
-	   return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname)));
-	}
-	
-	/**
-	 * 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);
-	}*/
-	
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-	   // Check if alter single column datatype available - works with 8.0+
-	   $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
-	
-	   if ($has_alter_column) {
-	      $tabname = $this->TableName($tabname);
-	      $sql = array();
-	      list($lines,$pkey) = $this->_GenFields($flds);
-	      $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-	      foreach($lines as $v) {
-	         if ($not_null = preg_match('/NOT NULL/i',$v)) {
-	            $v = preg_replace('/NOT NULL/i','',$v);
-	         }
-	         // this next block doesn't work - there is no way that I can see to 
-	         // explicitly ask a column to be null using $flds
-	         else if ($set_null = preg_match('/NULL/i',$v)) {
-	            // if they didn't specify not null, see if they explicitely asked for null
-	            $v = preg_replace('/\sNULL/i','',$v);
-	         }
-	         
-	         if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
-	            list(,$colname,$default) = $matches;
-	            $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
-	            $sql[] = $alter . $colname . ' TYPE ' . str_replace('DEFAULT '.$default,'',$v);
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
-	         } 
-	         else {
-	            // drop default?
-	            preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
-	            list (,$colname,$rest) = $matches;
-	            $sql[] = $alter . $colname . ' TYPE ' . $rest;
-	         }
-	
-	         list($colname) = explode(' ',$v);
-	         if ($not_null) {
-	            // this does not error out if the column is already not null
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
-	         }
-	         if ($set_null) {
-	            // this does not error out if the column is already null
-	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' DROP NOT NULL';
-	         }
-	      }
-	      return $sql;
-	   }
-	
-	   // does not have alter column
-	   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,$funsigned)
-	{
-		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;
-	}
-	
-	function RenameTableSQL($tabname,$newname)
-	{
-		if (!empty($this->schema)) {
-			$rename_from = $this->TableName($tabname);
-			$schema_save = $this->schema;
-			$this->schema = false;
-			$rename_to = $this->TableName($newname);
-			$this->schema = $schema_save;
-			return array (sprintf($this->renameTable, $rename_from, $rename_to));
-		}
-
-		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
-	}
-	
-	/*
-	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;
-	}
-}
-?>

tp/adodb512/datadict/datadict-sapdb.inc.php

@@ -1,122 +0,0 @@
-<?php
-
-/**
-  V4.50 6 July 2004  (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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) . ')' );
-	}	
-}
-
-?>

tp/adodb512/datadict/datadict-sqlite.inc.php

@@ -1,89 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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.
- 
-	SQLite datadict Andrei Besleaga
- 
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-class ADODB2_sqlite extends ADODB_DataDict {
-	var $databaseType = 'sqlite';
-	var $seqField = false;
-	var $addCol=' ADD COLUMN';
-	var $dropTable = 'DROP TABLE IF EXISTS %s';
-	var $dropIndex = 'DROP INDEX IF EXISTS %s';
-	var $renameTable = 'ALTER TABLE %s RENAME TO %s';
-	
-	
-
-	function ActualType($meta)
-	{
-		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR'; //  TEXT , TEXT affinity
-		case 'XL':return 'LONGTEXT'; //  TEXT , TEXT affinity
-		case 'X': return 'TEXT'; //  TEXT , TEXT affinity
-		
-		case 'C2': return 'VARCHAR'; //  TEXT , TEXT affinity
-		case 'X2': return 'LONGTEXT'; //  TEXT , TEXT affinity
-		
-		case 'B': return 'LONGBLOB'; //  TEXT , NONE affinity , BLOB
-			
-		case 'D': return 'DATE'; // NUMERIC , NUMERIC affinity
-		case 'T': return 'DATETIME'; // NUMERIC , NUMERIC affinity
-		case 'L': return 'TINYINT'; // NUMERIC , INTEGER affinity
-		
-		case 'R': 
-		case 'I4':
-		case 'I': return 'INTEGER'; // NUMERIC , INTEGER affinity
-		case 'I1': return 'TINYINT'; // NUMERIC , INTEGER affinity
-		case 'I2': return 'SMALLINT'; // NUMERIC , INTEGER affinity
-		case 'I8': return 'BIGINT'; // NUMERIC , INTEGER affinity
-		
-		case 'F': return 'DOUBLE'; // NUMERIC , REAL affinity
-		case 'N': return 'NUMERIC'; // NUMERIC , NUMERIC affinity
-		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 .= ' AUTOINCREMENT';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	function AlterColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported natively by SQLite");
-		return array();
-	}
-	
-	function DropColumnSQL($tabname, $flds)
-	{
-		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported natively by SQLite");
-		return array();
-	}
-	
-	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
-	{
-		if ($this->debug) ADOConnection::outp("RenameColumnSQL not supported natively by SQLite");
-		return array();	
-	}
-	
-}
-?>

tp/adodb512/datadict/datadict-sybase.inc.php

@@ -1,229 +0,0 @@
-<?php
-
-/**
-  V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 'TS':
-		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,$funsigned)
-	{	
-		$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;
-	}
-}
-?>

tp/adodb512/docs/docs-datadict.htm

@@ -1,330 +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>V5.06 16 Oct 2008  (c) 2000-2010 John Lim (<a
- href="mailto:jlim#natsoft.com">jlim#natsoft.com</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, SQLite.<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 accurate to the second.<br>  TS: Datetime or Timestamp supporting Sub-second accuracy.<br>       Supported by Oracle, PostgreSQL and SQL Server currently. <br>       Otherwise equivalent to T.<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, $tableOptions=false, $dropOldFlds=false)</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>
-<p>Old fields not defined in $flds are not dropped by default. To drop old fields, set $dropOldFlds to true.
-<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 MetaTables()</h4>
-<h4>function MetaColumns($tab, $upper=true, $schema=false)</h4>
-<h4>function MetaPrimaryKeys($tab,$owner=false,$intkey=false)</h4>
-<h4>function 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>

tp/adodb512/docs/docs-oracle.htm

@@ -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>

tp/adodb512/docs/docs-perf.htm

@@ -1,965 +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>V5.06 16 Oct 2008  (c) 2000-2010 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>
-<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>$ADODB_PERF_MIN</h3>
-<p>New in adodb 4.97/5.03 is this global variable, which controls whether sql timings which are too small are not saved. Currently it defaults 
-to 0.05 (seconds). This means that all sql's which are faster than 0.05 seconds to execute are not saved.
-<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>

tp/adodb512/docs/docs-session.htm

@@ -1,342 +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>
-V5.11 5 May 2010  (c) 2000-2010 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>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> 
-
-# or, using DSN support so you can set other options such as port (since 5.11)
-include_once("adodb/session/adodb-session2.php");
-$dsn = 'mysql://root:pwd@localhost/mydb?persist=1&port=5654';
-ADOdb_Session::config($dsn, '', '', '');
-session_start();
-</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,
-	  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
-$EXPIREREF holding the user id 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>

tp/adodb512/docs/docs-session.old.htm

@@ -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>
-V5.06 16 Oct 2008  (c) 2000-2010 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>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>

tp/adodb512/docs/old-changelog.htm

@@ -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>

tp/adodb512/docs/readme.htm

@@ -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>

tp/adodb512/docs/tips_portable_sql.htm

@@ -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 = 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>

tp/adodb512/docs/tute.htm

@@ -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 profiles&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 profiles&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 profiles&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 = 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>

tp/adodb512/drivers/adodb-access.inc.php

@@ -1,87 +0,0 @@
-<?php
-/* 
-V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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
-} 
-?>

tp/adodb512/drivers/adodb-ado.inc.php

@@ -1,660 +0,0 @@
-<?php
-/* 
-V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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, $normalize=true)
-	{
-		$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;
-
-      // Map by http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ado270/htm/mdmthcreateparam.asp
-      // Check issue http://bugs.php.net/bug.php?id=40664 !!!
-			while(list(, $val) = each($inputarr)) {
-				$type = gettype($val);
-				$len=strlen($val);
-				if ($type == 'boolean')
-					$this->adoParameterType = 11;
-				else if ($type == 'integer')
-					$this->adoParameterType = 3;
-				else if ($type == 'double')
-					$this->adoParameterType = 5;
-				elseif ($type == 'string')
-					$this->adoParameterType = 202;
-				else if (($val === null) || (!defined($val)))
-					$len=1;
-				else
-					$this->adoParameterType = 130;
-				
-				// name, type, direction 1 = input, len,
-        		$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
-
-				$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;
-			case 11: //BIT;
-				$val = "";
-				if(is_bool($f->value))	{
-					if($f->value==true) $val = 1;
-					else $val = 0;
-				}
-				if(is_null($f->value)) $val = null;
-				
-				$this->fields[] = $val;
-				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;	
-	}
-
-}
-
-?>

tp/adodb512/drivers/adodb-ado5.inc.php

@@ -1,708 +0,0 @@
-<?php
-/* 
-V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */ 
-				$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 ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
-		
-
-		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) {
-			if ($this->debug) echo "<pre>",$argHostname,"\n",$e,"</pre>\n";
-		}
-		
-		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, $normalize=true)
-	{
-		$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;
-
-			while(list(, $val) = each($inputarr)) {
-				$type = gettype($val);
-				$len=strlen($val);
-				if ($type == 'boolean')
-					$this->adoParameterType = 11;
-				else if ($type == 'integer')
-					$this->adoParameterType = 3;
-				else if ($type == 'double')
-					$this->adoParameterType = 5;
-				elseif ($type == 'string')
-					$this->adoParameterType = 202;
-				else if (($val === null) || (!defined($val)))
-					$len=1;
-				else
-					$this->adoParameterType = 130;
-				
-				// name, type, direction 1 = input, len,
-        		$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
-
-				$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;
-		if (!$rs) return false;
-		
-		$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;
-		
-		try {
-			$this->_numOfRows = $rs->RecordCount;
-		} catch (Exception $e) {
-			$this->_numOfRows = -1;
-		}
-		$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 20:
-			case 21: // bigint (64 bit)
-    			$this->fields[] = (float) $f->value; // if 64 bit PHP, could use (int)
-    			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;
-			case 11: //BIT;
-				$val = "";
-				if(is_bool($f->value))	{
-					if($f->value==true) $val = 1;
-					else $val = 0;
-				}
-				if(is_null($f->value)) $val = null;
-				
-				$this->fields[] = $val;
-				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;
-		try {
-		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
-		} catch (Exception $e) {
-		}
-		$this->_queryID = false;	
-	}
-
-}
-
-?>

tp/adodb512/drivers/adodb-ado_access.inc.php

@@ -1,54 +0,0 @@
-<?php
-/* 
-V5.11 5 May 2010   (c) 2000-2010 John Lim (jlim#natsoft.com). 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 $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);
-	}
-}
-?>