Initial mess

to previous implementation otherwise.

CHANGELOG.md

@@ -1,139 +0,0 @@
-# GNU social - Log of Changes
-
-## 2.0.0 - THIS. IS. GNU SOCIAL!!! [WIP]
-
-Release name chosen after 300 by Frank Miller where the main protagonist Leonidas, King of Sparta, declines peace with the
-Persians, after being disrespected, by shouting at the Persian Messenger "This is Sparta!" and kicking him into a large well
-proceeded by the killing of the other Persian messengers.
-
-### Major changes from previous release:
-
-Load and Storage:
-- New media handling system
-- GS is now structurely divided in includes and public
-- OEmbed upgraded to Embed plugin (Now we provide Open Graph information too)
-
-General:
-- Composer was integrated
-
-Modules:
-- Restored built-in plugins
-- New modules system: core plugins and plugins physically separated
-- Refactor of Plugin API to better illustrate the idea of modules
-- Bug fixes of core modules logic
-
-#### TODO before alpha:
-
-Load and Storage:
-- Upgrade STOMP queue
-- Add Redis based caching and queues
-- Review memcached based cache
-- Port PEAR DB to PDO_DataObject
-- Support PostgreSQL
-
-Network:
-- Port PEAR HTTP to Guzzle
-- Port PEAR Mail to PHPSendMail
-- Add OAuth2 support (deprecate OAuth1)
-- Add shinny new Plugins management interface for sysadmins together with a new doc for devs
-
-Federation:
-- Add ActivityPub support
-  - Fix audience targeting
-  - Add Group Actor Type
-- OstatusSub: Remote follow OS and AP profiles via OStatusSub
-- ActorLists: Allow to create collections of Actors and to interact with them - supports both OS and AP
-- The Free Network: Automagically migrate internal remote profiles between Free Network protocols (check Nodeinfo)
-- Enable the search box to import remote notices and profiles
-
-General:
-- Fix failling unit tests
-- Improve Cronish
-  - Run session garbage collection
-  - Cleanup Email Registration
-- Refactoring of confirmation codes
-- Refactoring of Exceptions
-
-Modules:
-- Document conversion of older plugins to the new GS 2
-- Create installer for v2 plugins
-- Introduce new metadata for plugins (category and thumb)
-- Improve plugin management tool (add install form and better UI that makes use of new metadata)
-- Add plugin management tool as a install step
-- Allow to install remote plugins and suggest popular trusted ones
-
-## v1.20.9release - The Invicta Crusade
-
-Release name chosen after Porto city. Porto is one of the oldest cities in Europe and thanks to its fierce resistance
-during two battles and sieges in history, it has earned the epithet of ‘Cidade Invicta’ (Invincible City). The dev team
-behind this release studies in Porto, Portugal.
-
-Dropped Support for PHP5.6.x. Minimum PHP version now is 7.0.0.
-
-Major changes from previous release:
-
-- Various patches on PEAR related components
-- Various database related improvements
-- Improved XMPP support
-- Added Nodeinfo support
-- Various i18n and l10n bug fixes
-- Improvements on Internal Session Handler
-- Improvements on OpenID support
-- Improved Media handling and safer upload
-- Redirect to previous page after login
-- Initial work on full conversion to PHP7
-- Initial work on a better documentation
-- Allow login with email
-- Various bug fixes
-
-## v1.2.0beta4 - The good reign of PHP5
-
-Dropped support for PHP5.4.
-
-New this version
-
-This is the development branch for the 1.2.x version of GNU social. All daring 1.1.x admins should upgrade to this version.
-
-So far it includes the following changes:
-
-- Backing up a user's account is more and more complete.
-- Emojis 😸 (utf8mb4 support)
-
-The last release, 1.1.3, gave us these improvements:
-
-- XSS security fix (thanks Simon Waters, https://www.surevine.com/)
-- Many improvements to ease adoption of the Qvitter front-end https://github.com/hannesmannerheim/qvitter
-- Protocol adaptions for improved performance and stability
-
-Upgrades from StatusNet 1.1.1 will also experience these improvements:
-
-- Fixes for SQL injection errors in profile lists.
-- Improved ActivityStreams JSON representation of activities and objects.
-- Upgrade to the Twitter 1.1 API.
-- More robust handling of errors in distribution.
-- Fix error in OStatus subscription for remote groups.
-- Fix error in XMPP distribution.
-- Tracking of conversation URI metadata (more coherent convos)
-
-## v1.1.3release - The Spanish Invasion
-
-New this version
-
-This is a security fix and bug fix release since 1.1.3-beta2. All 1.1.x sites should upgrade to this version.
-
-So far it includes the following changes:
-
-- XSS security fix (thanks Simon Waters, https://www.surevine.com/)
-- Many improvements to ease adoption of the Qvitter front-end https://github.com/hannesmannerheim/qvitter
-- Protocol adaptions for improved performance and stability
-- Backing up a user's account now appears to work as it should
-
-Upgrades from StatusNet 1.1.1 will also experience these improvements:
-
-- Fixes for SQL injection errors in profile lists.
-- Improved ActivityStreams JSON representation of activities and objects.
-- Upgrade to the Twitter 1.1 API.
-- More robust handling of errors in distribution.
-- Fix error in OStatus subscription for remote groups.
-- Fix error in XMPP distribution.
-- Tracking of conversation URI metadata (more coherent convos)

CONTRIBUTING.md

@@ -1 +1,112 @@
-GNU social's contributing resources and instructions are made available at [DOCUMENTATION/DEVELOPERS](https://notabug.org/diogo/gnu-social/src/nightly/DOCUMENTATION/DEVELOPERS).
+# Contributing to GNU social
+
+First of all, if you're reading this intending to contribute to GNU social,
+thanks! Free software development only happens when people like you take an
+interest in giving back to the software they themselves use, and their
+community.
+
+When contributing to this repository, please first discuss the change you wish to
+make via issue, email, or any other method with the owners of this repository before
+making a change.
+
+There's a few files you should read before going forward with a merge request
+or a patch submission.  They detail what this file touches on in brief.  They
+are:
+
+* `DOCUMENTATION/DEVELOPERS/CONTRIBUTING/coding_standards.md`: How your code should be structured and formatted to be
+  accepted into the GNU social codebase.
+* `/DOCUMENTATION/DEVELOPERS/CONTRIBUTING/merge_request_checklist.md`: A quick checklist to review before submission.
+
+
+## Merge Request Process
+
+1. Ensure you strip any trailing spaces off and checked the file with php-cs-fixer
+2. Increase the version numbers in any examples files and the README.md to the new version that this
+   Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
+3. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
+   do not have permission to do that, you may request the second reviewer to merge it for you.
+
+
+## Coding Standards
+
+Since we will be expected to maintain your code once it's submitted, we ask you
+to adhere to certain coding standards that make it easier for us to do so. If
+code doesn't follow them, it will be rejected, so please read up on these.
+
+
+## Bug Reports
+
+Please report bugs to the issue tracker at
+<https://notabug.org/diogo/gnu-social/issues> Avoid assigning the labels
+yourself, as these are for the development team to assign priority and area of
+coverage to a subject. Please only submit something here if you are certain it
+is a bug or represents a feature enhancement that we do not presently have. If
+you are uncertain whether it's a bug, please feel free to ask
+at #social IRC channel on freenode.net https://www.freenode.net/.
+
+When reporting a bug, please try to include as much information as possible,
+including the environment being run on (if it's a common LAMP stack just give
+us version numbers of the main stack components, that's fine), and the specific
+error you get. If you do not get a client-facing error, please check the PHP
+error_log and ensure there isn't something silently reported there, as well as
+the GNU social log. Try to include steps to reproduce the error as well, as if
+we cannot reproduce the error, we can't fix it!
+
+It is perfectly acceptable to reference the archive page of a discussion on the
+mailing list for the bug report, by the way, as long as it includes all the
+information we need for a bug report.
+
+
+## Submitting Feature Requests / Enhancement Requests
+
+Social media is constantly evolving, and we welcome ideas about how we can
+change and evolve GNU social to keep it the excellent piece of software that it
+is. However, there are a few things we ask you do when submitting feature
+requests:
+
+1. Understand that since we have a limited amount of developers and these people
+contribute in their free time, we may prioritize things differently than you
+value them. Oftentimes this is because certain requests involve less changes
+to the existing codebase than others, and therefore this makes them easier
+to add.
+2. Please search the existing feature requests and enhancements to see if a
+similar request exists. If one does but you have different ideas about how
+to do it or what it should entail, please add a comment to the existing idea
+rather than create a new one for your "version" of it. Duplicate submissions
+mean we spend more time maintaining the tracker and less time actually
+working on the codebase!
+3. When outlining the way that you see something working, don't be afraid to be
+as detailed as possible! We may not implement it exactly as you describe for
+any variety of reasons, but the more concrete and fleshed out an idea is, the
+easier it is for us to know what you want and be able to implement it in a
+sane and secure fashion.
+4. When describing a possible new idea and its mechanisms of operation, the key
+words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
+"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in the issue submission
+are to be interpreted as described in RFC 2119.
+<https://tools.ietf.org/html/rfc2119>
+
+Finally, and just as a call back to the first point, realize just because we
+might not rush to implement something, doesn't mean that we don't want to
+implement it! We would rather take the time to do something right the first
+time, then hurriedly apply a new idea, or a fix, only to have to patch it later.
+
+
+## Branch of Code Submissions
+
+Unless you've been specifically directed otherwise, all submissions of code
+should be against the `nightly` branch, so make sure any modifications are based
+on Nightly.
+
+
+## Copyright / Licensing
+
+You acknowledge that by submitting code to GNU social, you are licensing it under
+the GNU AGPLv3 unless there is an extenuating circumstance where it would be
+licensed differently (such as modifications to an external library we include
+such as Stomp).
+
+You also acknowledge that unless you assign a copyright explicitly, it will be
+assumed to be assigned to GNU social.
+
+Thanks for considering submission, and happy hacking!

DOCUMENTATION/DEVELOPERS/CONTRIBUTING/boilerplate.php

@@ -27,7 +27,7 @@ namespace samples;
 
 defined('GNUSOCIAL') || die();
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'SampleHandler.php';
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'SampleHandler.php');
 
 /**
  * Description of this class.
@@ -43,7 +43,7 @@ class MySampleClass
      * @param string $dummy_word just because.
      * @param int $result another just because.
      */
-    public function __construct(string $dummy_word = '', ?int $result = null)
+    public function __construct(string $dummy_word = '', int $result = null)
     {
         global $demo;
         $this->niceWorld();
@@ -54,7 +54,7 @@ class MySampleClass
      *
      * @return string
      */
-    public function niceWorld(): string
+    public function niceWorld() : string
     {
         return 'hello, world.';
     }

DOCUMENTATION/DEVELOPERS/CONTRIBUTING/merge_request_checklist.md

@@ -1,7 +1,7 @@
 Submission Checklist
 ================================================================================
 This document serves as a handy checklist for submitted merges and patches to
-the GNU social project. Following it isn't a gaurantee a patch will be accepted,
+the postActiv project.  Following it isn't a gaurantee a patch will be accepted,
 but it will help you avoid common problems.
 
 1. Ensure all code control paths in all functions return a value.

DOCUMENTATION/DEVELOPERS/README.md

@@ -1,112 +0,0 @@
-# Contributing to GNU social
-
-First of all, if you're reading this intending to contribute to GNU social,
-thanks! Free software development only happens when people like you take an
-interest in giving back to the software they themselves use, and their
-community.
-
-When contributing to this repository, please first discuss the change you wish to
-make via issue, email, or any other method with the owners of this repository before
-making a change.
-
-There's a few files you should read before going forward with a merge request
-or a patch submission.  They detail what this file touches on in brief.  They
-are:
-
-* `DOCUMENTATION/DEVELOPERS/CONTRIBUTING/coding_standards.md`: How your code should be structured and formatted to be
-  accepted into the GNU social codebase.
-* `/DOCUMENTATION/DEVELOPERS/CONTRIBUTING/merge_request_checklist.md`: A quick checklist to review before submission.
-
-
-## Merge Request Process
-
-1. Run php-cs-fixer. We also recommend you to use tools like phpstan, phpactor, phpcs and phpmd
-2. Run our unit tests (`./vendor/bin/phpunit --testsuite Core`)
-3. Respect our [VERSIONING](https://notabug.org/diogo/gnu-social/src/nightly/DOCUMENTATION/VERSIONING.md) system
-4. You may merge the Merge Request in once you have the sign-off of two other developers, or if you
-   do not have permission to do that, you may request the second reviewer to merge it for you
-
-
-## Coding Standards
-
-Since we will be expected to maintain your code once it's submitted, we ask you
-to adhere to certain coding standards that make it easier for us to do so. If
-code doesn't follow them, it will be rejected, so please read up on these.
-
-
-## Bug Reports
-
-Please report bugs to the issue tracker at
-<https://notabug.org/diogo/gnu-social/issues> Avoid assigning the labels
-yourself, as these are for the development team to assign priority and area of
-coverage to a subject. Please only submit something here if you are certain it
-is a bug or represents a feature enhancement that we do not presently have. If
-you are uncertain whether it's a bug, please feel free to ask
-at #social IRC channel on freenode.net https://www.freenode.net/.
-
-When reporting a bug, please try to include as much information as possible,
-including the environment being run on (if it's a common LAMP stack just give
-us version numbers of the main stack components, that's fine), and the specific
-error you get. If you do not get a client-facing error, please check the PHP
-error_log and ensure there isn't something silently reported there, as well as
-the GNU social log. Try to include steps to reproduce the error as well, as if
-we cannot reproduce the error, we can't fix it!
-
-It is perfectly acceptable to reference the archive page of a discussion on the
-mailing list for the bug report, by the way, as long as it includes all the
-information we need for a bug report.
-
-
-## Submitting Feature Requests / Enhancement Requests
-
-Social media is constantly evolving, and we welcome ideas about how we can
-change and evolve GNU social to keep it the excellent piece of software that it
-is. However, there are a few things we ask you do when submitting feature
-requests:
-
-1. Understand that since we have a limited amount of developers and these people
-contribute in their free time, we may prioritize things differently than you
-value them. Oftentimes this is because certain requests involve less changes
-to the existing codebase than others, and therefore this makes them easier
-to add.
-2. Please search the existing feature requests and enhancements to see if a
-similar request exists. If one does but you have different ideas about how
-to do it or what it should entail, please add a comment to the existing idea
-rather than create a new one for your "version" of it. Duplicate submissions
-mean we spend more time maintaining the tracker and less time actually
-working on the codebase!
-3. When outlining the way that you see something working, don't be afraid to be
-as detailed as possible! We may not implement it exactly as you describe for
-any variety of reasons, but the more concrete and fleshed out an idea is, the
-easier it is for us to know what you want and be able to implement it in a
-sane and secure fashion.
-4. When describing a possible new idea and its mechanisms of operation, the key
-words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
-"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in the issue submission
-are to be interpreted as described in RFC 2119.
-<https://tools.ietf.org/html/rfc2119>
-
-Finally, and just as a call back to the first point, realize just because we
-might not rush to implement something, doesn't mean that we don't want to
-implement it! We would rather take the time to do something right the first
-time, then hurriedly apply a new idea, or a fix, only to have to patch it later.
-
-
-## Branch of Code Submissions
-
-Unless you've been specifically directed otherwise, all submissions of code
-should be against the `nightly` branch, so make sure any modifications are based
-on Nightly.
-
-
-## Copyright / Licensing
-
-You acknowledge that by submitting code to GNU social, you are licensing it under
-the GNU AGPLv3 unless there is an extenuating circumstance where it would be
-licensed differently (such as modifications to an external library we include
-such as Stomp).
-
-You also acknowledge that unless you assign a copyright explicitly, it will be
-assumed to be assigned to GNU social.
-
-Thanks for considering submission, and happy hacking!

DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md

@@ -148,12 +148,6 @@ This section is a catch-all for site-wide variables.
 
 * favicon: the path to a custom favicon, eg: favicon.png
 
-* `x-static-delivery` (string, default null): when a string, use this
-    as the header with wich to serve static files. Possible values are
-    'X-Sendfile' (for Apache and others) and 'X-Accel-Redirect' (for
-    nginx).
-
-
 db
 -------------------------------------------------------------------------------
 
@@ -207,6 +201,10 @@ The ones that you may want to set are listed below for clarity.
     run scripts/checkschema.php whenever you install or upgrade a
     plugin.
 
+* `x-static-delivery` (string, default null): when a string, use this
+    as the header with wich to serve static files. Possible values are
+    'X-Sendfile' (for Apache and others) and 'X-Accel-Redirect' (for
+    nginx).
 
 syslog
 -------------------------------------------------------------------------------
@@ -614,10 +612,10 @@ Profile management.
 * `biolimit`: max character length of bio; 0 means no limit; null means to use
     the site text limit default.
 
-* `backup`: whether users can backup their own profiles. Defaults to false.
+* `backup`: whether users can backup their own profiles. Defaults to true.
 
 * `restore`: whether users can restore their profiles from backup files. Defaults
-	 to false.
+	 to true.
 
 * `delete`: whether users can delete their own accounts. Defaults to false.
 
@@ -677,10 +675,9 @@ set too low (it's optional, so it may not be there at all).
 
 * `extblacklist`: associative array to either deny certain extensions or
     change them to a different one. For example:
-
-        $config['attachments']['extblacklist']['php'] = 'phps';  // this turns .php into .phps
-        $config['attachments']['extblacklist']['exe'] = false;   // this would deny any uploads
-                                                                 // of files with the "exe" extension
+    $config['attachments']['extblacklist']['php'] = 'phps';  // this turns .php into .phps
+    $config['attachments']['extblacklist']['exe'] = false;   // this would deny any uploads
+                                                             // of files with the "exe" extension
 
 * `process_links`: follow redirects and save all available file information
     (mimetype, date, size, oembed, etc.). Defaults to true.

DOCUMENTATION/SYSTEM_ADMINISTRATORS/socialfy-another-domain/dot-well-known/webfinger/index.php

@@ -8,7 +8,6 @@ define('MY_GNUSOCIAL', 'https://www.example.org/gnusocial/index.php');
  * socialfy from another domain.
  */
 
-// From https://www.php.net/manual/en/function.getallheaders.php#84262 (joyview at gmail dot com)
 if (!function_exists('getallheaders')) {
     function getallheaders()
     {
@@ -25,32 +24,12 @@ $ch = curl_init();
 curl_setopt($ch, CURLOPT_HTTPHEADER, getallheaders());
 curl_setopt($ch, CURLOPT_URL, MY_GNUSOCIAL . str_replace('webfinger/', 'webfinger', $_SERVER['REQUEST_URI']));
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+curl_setopt($ch, CURLOPT_VERBOSE, true);
 curl_setopt($ch, CURLOPT_HEADER, true);
 $response = curl_exec($ch);
 $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+$header = substr($response, 0, $header_size);
 $body = substr($response, $header_size);
-// From https://stackoverflow.com/a/10590242 (c.hill)
-function get_headers_from_curl_response($response)
-{
-    $headers = array();
-
-    $header_text = substr($response, 0, strpos($response, "\r\n\r\n"));
-
-    foreach (explode("\r\n", $header_text) as $i => $line) {
-        if ($i === 0) {
-            $headers['http_code'] = $line;
-        } else {
-            list($key, $value) = explode(': ', $line);
-
-            $headers[$key] = $value;
-        }
-    }
-
-    return $headers;
-}
-$headers = get_headers_from_curl_response($response);
-foreach ($headers as $name => $value) {
-    header("{$name}: $value");
-}
+header($header);
 echo $body;
-curl_close($ch);
+curl_close($ch);

DOCUMENTATION/SYSTEM_ADMINISTRATORS/webserver_conf/htaccess.sample

@@ -44,11 +44,6 @@
   # RewriteRule (.*) index.php/$1 [L,QSA]
 </IfModule>
 
-# Enable X-Sendfile if available. Still needs to be enabled in the config
-<IfModule mod_xsendfile.c>
-  XSendFile On
-</IfModule>
-
 <FilesMatch "\.(ini)">
     <IfVersion < 2.3>
         Order allow,deny

DOCUMENTATION/SYSTEM_ADMINISTRATORS/webserver_conf/nginx.conf.sample

@@ -16,8 +16,8 @@ server {
     listen 443 ssl http2;
 
 # Root
-# FIXME: Change the path below to where you installed GNU social (GNU social's root + /public)
-    root /var/www/gnusocial/public;
+# FIXME: Change the path below to where you installed GNU social
+    root /path/to/gnusocial/root;
 
 # Server name
 # FIXME: Change "social.example.org" to your site's domain name
@@ -31,17 +31,8 @@ server {
 # Index
     index index.php;
 
-# X-Accel/X-Sendfile. Still needs to be enabled in the config
-    location /file {
-        internal;
-        # FIXME: Change "/path/to/gnusocial/root/" to the folder where
-        # attachments are stored (normally the same as the site root)
-        root /path/to/gnusocial/root/;
-    }
-
 # PHP
-    location ~ ^/(index|install)\.php(/.*)?$ {
-    #location ^~ /index.php {
+    location ^~ /index.php {
         include fastcgi_params;
         include snippets/fastcgi-php.conf;
 

DOCUMENTATION/VERSIONING.md

@@ -1,17 +0,0 @@
-# Versioning
-
-## Release cycle
-We follow Semantic Versioning as defined on [https://semver.org/](https://semver.org).
-
-The GNU social platform has a monthly release cycle. That  is, we only increment the version number on day 1 of each month.
-
-For GNU social plugins, we increment version number by commit. Plugins update have a propagation of the same type in the
-GNU social's monthly version bump.
-
-If we have various patch type updates in a month, we only bump it by one in the end of the month. If in the same month
-we have a minor too, we will only bump the minor value.
-
-# Lifecycle
-
-GNU social has 'dev', 'alpha', 'beta', 'rc' and 'release' cycles. We usually are in `dev` during summer. When we finish a `dev` cycle we release an `alpha` (`dev`s aren't tagged as releases). From `alpha` to `release` it depends on how perfect GNU social is after the end of the `dev` cycle. But we use the number after `alpha` instead of `patch` number for small bug fixes when in this cycle. When we finally go from a `r`elease `c`andidate to a `release`, we party... and we use semver for all the small changes until we start working in another `dev` cycle (usually on another summer).
-

actions/confirmaddress.php

@@ -140,7 +140,6 @@ class ConfirmaddressAction extends ManagedAction
                 $user_im_prefs->screenname = $confirm->address;
                 $user_im_prefs->transport = $confirm->address_type;
                 $user_im_prefs->user_id = $cur->id;
-                $user_im_prefs->created = common_sql_now();
                 $result = $user_im_prefs->insert();
 
                 if ($result === false) {

actions/deletenotice.php

@@ -39,10 +39,9 @@ class DeletenoticeAction extends FormAction
     {
         $this->notice = Notice::getByID($this->trimmed('notice'));
 
-        if ($this->notice->isVerb([ActivityVerb::DELETE]) ||
-            (!$this->scoped->sameAs($this->notice->getProfile()) &&
-              !$this->scoped->hasRight(Right::DELETEOTHERSNOTICE))) {
-            // TRANS: Error message displayed when trying to delete a notice that was not made by the current user.
+        if (!$this->scoped->sameAs($this->notice->getProfile()) &&
+                   !$this->scoped->hasRight(Right::DELETEOTHERSNOTICE)) {
+            // TRANS: Error message displayed trying to delete a notice that was not made by the current user.
             $this->clientError(_('Cannot delete this notice.'));
         }
 

classes/Attention.php

@@ -23,8 +23,8 @@ class Attention extends Managed_DataObject
     public $notice_id;              // int(4) primary_key not_null
     public $profile_id;             // int(4) primary_key not_null
     public $reason;                 // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;               // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                // datetime()   not_null
+    public $modified;               // timestamp   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -34,8 +34,8 @@ class Attention extends Managed_DataObject
                 'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice_id to give attention'),
                 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile_id for feed receiver'),
                 'reason' => array('type' => 'varchar', 'length' => 191, 'description' => 'Optional reason why this was brought to the attention of profile_id'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('notice_id', 'profile_id'),
             'foreign keys' => array(

classes/Avatar.php

@@ -15,8 +15,8 @@ class Avatar extends Managed_DataObject
     public $height;                          // int(4)  primary_key not_null
     public $mediatype;                       // varchar(32)   not_null
     public $filename;                        // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 	
     public static function schemaDef()
     {
@@ -28,8 +28,8 @@ class Avatar extends Managed_DataObject
                 'height' => array('type' => 'int', 'not null' => true, 'description' => 'image height'),
                 'mediatype' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'file type'),
                 'filename' => array('type' => 'varchar', 'length' => 191, 'description' => 'local filename, if local'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('profile_id', 'width', 'height'),
             'unique keys' => array(

classes/Confirm_address.php

@@ -13,7 +13,7 @@ class Confirm_address extends Managed_DataObject
     public $address_type;                    // varchar(8)   not_null
     public $claimed;                         // datetime()
     public $sent;                            // datetime()
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -26,7 +26,7 @@ class Confirm_address extends Managed_DataObject
                 'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
                 'claimed' => array('type' => 'datetime', 'description' => 'date this was claimed for queueing'),
                 'sent' => array('type' => 'datetime', 'description' => 'date this was sent for queueing'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('code'),
             'foreign keys' => array(

classes/Consumer.php

@@ -13,8 +13,8 @@ class Consumer extends Managed_DataObject
     public $consumer_key;                    // varchar(191)  primary_key not_null   not 255 because utf8mb4 takes more space
     public $consumer_secret;                 // varchar(191)   not_null   not 255 because utf8mb4 takes more space
     public $seed;                            // char(32)   not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -27,8 +27,9 @@ class Consumer extends Managed_DataObject
                 'consumer_key' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'unique identifier, root URL'),
                 'consumer_secret' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'secret value'),
                 'seed' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'seed for new tokens by this consumer'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('consumer_key'),
         );

classes/Conversation.php

@@ -37,8 +37,8 @@ class Conversation extends Managed_DataObject
     public $id;                              // int(4)  primary_key not_null auto_increment
     public $uri;                             // varchar(191)  unique_key   not 255 because utf8mb4 takes more space
     public $url;                             // varchar(191)  unique_key   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -47,8 +47,8 @@ class Conversation extends Managed_DataObject
                 'id' => array('type' => 'serial', 'not null' => true, 'description' => 'Unique identifier, (again) unrelated to notice id since 2016-01-06'),
                 'uri' => array('type' => 'varchar', 'not null'=>true, 'length' => 191, 'description' => 'URI of the conversation'),
                 'url' => array('type' => 'varchar', 'length' => 191, 'description' => 'Resolvable URL, preferrably remote (local can be generated on the fly)'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id'),
             'unique keys' => array(

classes/File.php

@@ -46,7 +46,7 @@ class File extends Managed_DataObject
     public $filename;                        // text()
     public $width;                           // int(4)
     public $height;                          // int(4)
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     const URLHASH_ALG = 'sha256';
     const FILEHASH_ALG = 'sha256';
@@ -67,7 +67,8 @@ class File extends Managed_DataObject
                 'filename' => array('type' => 'text', 'description' => 'if file is stored locally (too) this is the filename'),
                 'width' => array('type' => 'int', 'description' => 'width in pixels, if it can be described as such and data is available'),
                 'height' => array('type' => 'int', 'description' => 'height in pixels, if it can be described as such and data is available'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id'),
             'unique keys' => array(
@@ -342,6 +343,7 @@ class File extends Managed_DataObject
     public static function getSafeExtension(string $filename) {
         if (preg_match('/^.+?\.([A-Za-z0-9]+)$/', $filename, $matches) === 1) {
             // we matched on a file extension, so let's see if it means something.
+            common_debug("MATCHES EXT: " . print_r($matches, true));
             $ext = mb_strtolower($matches[1]);
             $blacklist = common_config('attachments', 'extblacklist');
             // If we got an extension from $filename we want to check if it's in a blacklist

classes/File_redirection.php

@@ -34,7 +34,7 @@ class File_redirection extends Managed_DataObject
     public $file_id;                         // int(4)
     public $redirections;                    // int(4)
     public $httpcode;                        // int(4)
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -50,7 +50,7 @@ class File_redirection extends Managed_DataObject
                 'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
                 'redirections' => array('type' => 'int', 'description' => 'redirect count'),
                 'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('urlhash'),
             'foreign keys' => array(

classes/File_thumbnail.php

@@ -32,7 +32,7 @@ class File_thumbnail extends Managed_DataObject
     public $filename;                        // text
     public $width;                           // int(4)  primary_key
     public $height;                          // int(4)  primary_key
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     const URLHASH_ALG = 'sha256';
 
@@ -46,7 +46,7 @@ class File_thumbnail extends Managed_DataObject
                 'filename' => array('type' => 'text', 'description' => 'if stored locally, filename is put here'),
                 'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
                 'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('file_id', 'width', 'height'),
             'indexes' => array(

classes/File_to_post.php

@@ -31,7 +31,7 @@ class File_to_post extends Managed_DataObject
     public $__table = 'file_to_post';                    // table name
     public $file_id;                         // int(4)  primary_key not_null
     public $post_id;                         // int(4)  primary_key not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -42,7 +42,7 @@ class File_to_post extends Managed_DataObject
             'fields' => array(
                 'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of URL/file'),
                 'post_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the notice it belongs to'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('file_id', 'post_id'),
             'foreign keys' => array(

classes/Foreign_link.php

@@ -19,8 +19,8 @@ class Foreign_link extends Managed_DataObject
     public $profilesync;                     // tinyint(1)   not_null default_1
     public $last_noticesync;                 // datetime()
     public $last_friendsync;                 // datetime()
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -38,8 +38,8 @@ class Foreign_link extends Managed_DataObject
                 'profilesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
                 'last_noticesync' => array('type' => 'datetime', 'description' => 'last time notices were imported'),
                 'last_friendsync' => array('type' => 'datetime', 'description' => 'last time friends were imported'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('user_id', 'foreign_id', 'service'),
             'foreign keys' => array(

classes/Foreign_service.php

@@ -13,8 +13,8 @@ class Foreign_service extends Managed_DataObject
     public $id;                              // int(4)  primary_key not_null
     public $name;                            // varchar(32)  unique_key not_null
     public $description;                     // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -26,8 +26,8 @@ class Foreign_service extends Managed_DataObject
                 'id' => array('type' => 'int', 'not null' => true, 'description' => 'numeric key for service'),
                 'name' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'name of the service'),
                 'description' => array('type' => 'varchar', 'length' => 191, 'description' => 'description'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id'),
             'unique keys' => array(

classes/Foreign_subscription.php

@@ -13,7 +13,7 @@ class Foreign_subscription extends Managed_DataObject
     public $service;                         // int(4)  primary_key not_null
     public $subscriber;                      // int(4)  primary_key not_null
     public $subscribed;                      // int(4)  primary_key not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;                         // datetime()   not_null
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -26,7 +26,7 @@ class Foreign_subscription extends Managed_DataObject
                 'service' => array('type' => 'int', 'not null' => true, 'description' => 'service where relationship happens'),
                 'subscriber' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'subscriber on foreign service'),
                 'subscribed' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'subscribed user'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
             ),
             'primary key' => array('service', 'subscriber', 'subscribed'),
             'foreign keys' => array(

classes/Foreign_user.php

@@ -14,8 +14,8 @@ class Foreign_user extends Managed_DataObject
     public $service;                         // int(4)  primary_key not_null
     public $uri;                             // varchar(191)  unique_key not_null   not 255 because utf8mb4 takes more space
     public $nickname;                        // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -28,8 +28,8 @@ class Foreign_user extends Managed_DataObject
                 'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
                 'uri' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'identifying URI'),
                 'nickname' => array('type' => 'varchar', 'length' => 191, 'description' => 'nickname on foreign service'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id', 'service'),
             'foreign keys' => array(

classes/Group_alias.php

@@ -31,7 +31,7 @@ class Group_alias extends Managed_DataObject
     public $__table = 'group_alias';                     // table name
     public $alias;                           // varchar(64)  primary_key not_null
     public $group_id;                        // int(4)   not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -42,7 +42,7 @@ class Group_alias extends Managed_DataObject
             'fields' => array(
                 'alias' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'additional nickname for the group'),
                 'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date alias was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date alias was created'),
             ),
             'primary key' => array('alias'),
             'foreign keys' => array(

classes/Group_block.php

@@ -32,7 +32,7 @@ class Group_block extends Managed_DataObject
     public $group_id;                        // int(4)  primary_key not_null
     public $blocked;                         // int(4)  primary_key not_null
     public $blocker;                         // int(4)   not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -44,7 +44,7 @@ class Group_block extends Managed_DataObject
                 'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
                 'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
                 'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date of blocking'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
             ),
             'primary key' => array('group_id', 'blocked'),
             'foreign keys' => array(

classes/Group_inbox.php

@@ -11,7 +11,7 @@ class Group_inbox extends Managed_DataObject
     public $__table = 'group_inbox';                     // table name
     public $group_id;                        // int(4)  primary_key not_null
     public $notice_id;                       // int(4)  primary_key not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;                         // datetime()   not_null
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -23,7 +23,7 @@ class Group_inbox extends Managed_DataObject
             'fields' => array(
                 'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group receiving the message'),
                 'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date the notice was created'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
             ),
             'primary key' => array('group_id', 'notice_id'),
             'foreign keys' => array(

classes/Group_join_queue.php

@@ -24,7 +24,7 @@ class Group_join_queue extends Managed_DataObject
             'fields' => array(
                 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'remote or local profile making the request'),
                 'group_id' => array('type' => 'int', 'description' => 'remote or local group to join, if any'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
             ),
             'primary key' => array('profile_id', 'group_id'),
             'indexes' => array(

classes/Group_member.php

@@ -13,8 +13,8 @@ class Group_member extends Managed_DataObject
     public $profile_id;                      // int(4)  primary_key not_null
     public $is_admin;                        // tinyint(1)
     public $uri;                             // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -27,8 +27,8 @@ class Group_member extends Managed_DataObject
                 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
                 'is_admin' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this user an admin?'),
                 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universal identifier'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('group_id', 'profile_id'),
             'unique keys' => array(

classes/Invitation.php

@@ -15,7 +15,7 @@ class Invitation extends Managed_DataObject
     public $address;                         // varchar(191)  multiple_key not_null   not 255 because utf8mb4 takes more space
     public $address_type;                    // varchar(8)  multiple_key not_null
     public $registered_user_id;              // int(4)   not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;                         // datetime()   not_null
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -36,7 +36,7 @@ class Invitation extends Managed_DataObject
                 'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'who sent the invitation'),
                 'address' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'invitation sent to'),
                 'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
                 'registered_user_id' => array('type' => 'int', 'not null' => false, 'description' => 'if the invitation is converted, who the new user is'),
             ),
             'primary key' => array('code'),

classes/Local_group.php

@@ -11,8 +11,8 @@ class Local_group extends Managed_DataObject
     public $__table = 'local_group';                     // table name
     public $group_id;                        // int(4)  primary_key not_null
     public $nickname;                        // varchar(64)  unique_key
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -24,8 +24,9 @@ class Local_group extends Managed_DataObject
             'fields' => array(
                 'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group represented'),
                 'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'group represented'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('group_id'),
             'foreign keys' => array(

classes/Location_namespace.php

@@ -33,8 +33,8 @@ class Location_namespace extends Managed_DataObject
     public $__table = 'location_namespace';              // table name
     public $id;                              // int(4)  primary_key not_null
     public $description;                     // varchar(191)
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -45,8 +45,8 @@ class Location_namespace extends Managed_DataObject
             'fields' => array(
                 'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity for this namespace'),
                 'description' => array('type' => 'varchar', 'length' => 191, 'description' => 'description of the namespace'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date the record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id'),
         );

classes/Login_token.php

@@ -31,8 +31,8 @@ class Login_token extends Managed_DataObject
     public $__table = 'login_token';         // table name
     public $user_id;                         // int(4)  primary_key not_null
     public $token;                           // char(32)  not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -43,8 +43,8 @@ class Login_token extends Managed_DataObject
             'fields' => array(
                 'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user owning this token'),
                 'token' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'token useable for logging in'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('user_id'),
             'foreign keys' => array(

classes/Nonce.php

@@ -14,8 +14,8 @@ class Nonce extends Managed_DataObject
     public $tok;                             // char(32)
     public $nonce;                           // char(32)  primary_key not_null
     public $ts;                              // datetime()  primary_key not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -43,8 +43,9 @@ class Nonce extends Managed_DataObject
                 'tok' => array('type' => 'char', 'length' => 32, 'description' => 'buggy old value, ignored'),
                 'nonce' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'nonce'),
                 'ts' => array('type' => 'datetime', 'not null' => true, 'description' => 'timestamp sent'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('consumer_key', 'ts', 'nonce'),
         );

classes/Notice.php

@@ -59,8 +59,8 @@ class Notice extends Managed_DataObject
     public $content;                         // text
     public $rendered;                        // text
     public $url;                             // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()  multiple_key not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime  multiple_key not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
     public $reply_to;                        // int(4)
     public $is_local;                        // int(4)
     public $source;                          // varchar(32)
@@ -83,8 +83,8 @@ class Notice extends Managed_DataObject
                 'content' => array('type' => 'text', 'description' => 'update content', 'collate' => 'utf8mb4_general_ci'),
                 'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
                 'url' => array('type' => 'varchar', 'length' => 191, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
                 'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
                 'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'),
                 'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),

classes/Notice_location.php

@@ -11,7 +11,7 @@ class Notice_location extends Managed_DataObject
     public $lon;                             // decimal(10,7)
     public $location_id;                     // int(4)
     public $location_ns;                     // int(4)
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -22,7 +22,7 @@ class Notice_location extends Managed_DataObject
                 'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
                 'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
                 'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('notice_id'),
             'foreign keys' => array(

classes/Notice_prefs.php

@@ -34,8 +34,8 @@ class Notice_prefs extends Managed_DataObject
     public $namespace;                       // varchar(191)  not_null
     public $topic;                           // varchar(191)  not_null
     public $data;                            // text
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -45,8 +45,8 @@ class Notice_prefs extends Managed_DataObject
                 'namespace' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'namespace, like pluginname or category'),
                 'topic' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'preference key, i.e. description, age...'),
                 'data' => array('type' => 'blob', 'description' => 'topic data, may be anything'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('notice_id', 'namespace', 'topic'),
             'foreign keys' => array(

classes/Notice_source.php

@@ -13,8 +13,8 @@ class Notice_source extends Managed_DataObject
     public $code;                            // varchar(32)  primary_key not_null
     public $name;                            // varchar(191)   not_null   not 255 because utf8mb4 takes more space
     public $url;                             // varchar(191)   not_null   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -27,8 +27,8 @@ class Notice_source extends Managed_DataObject
                 'name' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'name of the source'),
                 'url' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'url to link to'),
                 'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'date this record was created'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('code'),
         );

classes/Notice_tag.php

@@ -27,7 +27,7 @@ class Notice_tag extends Managed_DataObject
     public $__table = 'notice_tag';                      // table name
     public $tag;                             // varchar(64)  primary_key not_null
     public $notice_id;                       // int(4)  primary_key not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;                         // datetime()   not_null
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -39,7 +39,7 @@ class Notice_tag extends Managed_DataObject
             'fields' => array(
                 'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
                 'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice tagged'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
             ),
             'primary key' => array('tag', 'notice_id'),
             'foreign keys' => array(

classes/Oauth_application.php

@@ -22,8 +22,8 @@ class Oauth_application extends Managed_DataObject
     public $callback_url;                    // varchar(191)   not_null   not 255 because utf8mb4 takes more space
     public $type;                            // tinyint(1)
     public $access_type;                     // tinyint(1)
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -173,8 +173,8 @@ class Oauth_application extends Managed_DataObject
                 'callback_url' => array('type' => 'varchar', 'length' => 191, 'description' => 'url to redirect to after authentication'),
                 'type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
                 'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id'),
             'unique keys' => array(

classes/Oauth_application_user.php

@@ -14,8 +14,8 @@ class Oauth_application_user extends Managed_DataObject
     public $application_id;                  // int(4)  primary_key not_null
     public $access_type;                     // tinyint(1)
     public $token;                           // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -28,8 +28,8 @@ class Oauth_application_user extends Managed_DataObject
                 'application_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the application'),
                 'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'access type, bit 1 = read, bit 2 = write'),
                 'token' => array('type' => 'varchar', 'length' => 191, 'description' => 'request or access token'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('profile_id', 'application_id'),
             'foreign keys' => array(

classes/Oauth_token_association.php

@@ -13,8 +13,8 @@ class Oauth_token_association extends Managed_DataObject
     public $profile_id;                      // int(4)  primary_key not_null
     public $application_id;                  // int(4)  primary_key not_null
     public $token;                           // varchar(191) primary key not null   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -44,8 +44,8 @@ class Oauth_token_association extends Managed_DataObject
                 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'associated user'),
                 'application_id' => array('type' => 'int', 'not null' => true, 'description' => 'the application'),
                 'token' => array('type' => 'varchar', 'length' => '191', 'not null' => true, 'description' => 'token used for this association'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('profile_id', 'application_id', 'token'),
             'foreign keys' => array(

classes/Old_school_prefs.php

@@ -72,8 +72,8 @@ class Old_school_prefs extends Managed_DataObject
                                             'size' => 'tiny', 
                                             'default' => 1, 
                                             'description' => 'Show nicknames for authors and addressees in streams'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('user_id'),
             'foreign keys' => array(

classes/Profile.php

@@ -36,8 +36,8 @@ class Profile extends Managed_DataObject
     public $lon;                             // decimal(10,7)
     public $location_id;                     // int(4)
     public $location_ns;                     // int(4)
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -55,8 +55,9 @@ class Profile extends Managed_DataObject
                 'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
                 'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
                 'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id'),
             'indexes' => array(
@@ -793,7 +794,7 @@ class Profile extends Managed_DataObject
         return is_null($other) ? false : $other->isSubscribed($this);
     }
 
-    function requiresSubscriptionApproval(Profile $other=null): bool
+    function requiresSubscriptionApproval(Profile $other=null)
     {
         if (!$this->isLocal()) {
             // We don't know for remote users, and we'll always be able to send
@@ -809,7 +810,7 @@ class Profile extends Managed_DataObject
 
         // If the local user either has a private stream (implies the following)
         // or  user has a moderation policy for new subscriptions, return true.
-        return $this->isPrivateStream() || $this->getUser()->subscribe_policy === User::SUBSCRIBE_POLICY_MODERATE;
+        return $this->getUser()->private_stream || $this->getUser()->subscribe_policy === User::SUBSCRIBE_POLICY_MODERATE;
     }
 
     /**
@@ -1792,14 +1793,13 @@ class Profile extends Managed_DataObject
         return $this->getUser()->shortenLinks($text, $always);
     }
 
-    public function isPrivateStream(): bool
+    public function isPrivateStream()
     {
         // We only know of public remote users as of yet...
         if (!$this->isLocal()) {
             return false;
         }
-        $private_stream = $this->getUser()->private_stream;
-        return !is_null($private_stream) && $private_stream;
+        return $this->getUser()->private_stream ? true : false;
     }
 
     public function delPref($namespace, $topic) {

classes/Profile_block.php

@@ -33,7 +33,7 @@ class Profile_block extends Managed_DataObject
     public $__table = 'profile_block';                   // table name
     public $blocker;                         // int(4)  primary_key not_null
     public $blocked;                         // int(4)  primary_key not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -44,7 +44,7 @@ class Profile_block extends Managed_DataObject
             'fields' => array(
                 'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
                 'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date of blocking'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
             ),
             'foreign keys' => array(
                 'profile_block_blocker_fkey' => array('user', array('blocker' => 'id')),

classes/Profile_list.php

@@ -31,8 +31,8 @@ class Profile_list extends Managed_DataObject
     public $tag;                             // varchar(64)
     public $description;                     // text
     public $private;                         // tinyint(1)
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
     public $uri;                             // varchar(191)  unique_key   not 255 because utf8mb4 takes more space
     public $mainpage;                        // varchar(191)   not 255 because utf8mb4 takes more space
     public $tagged_count;                    // smallint
@@ -48,8 +48,8 @@ class Profile_list extends Managed_DataObject
                 'description' => array('type' => 'text', 'description' => 'description of the people tag'),
                 'private' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this tag private'),
 
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date the tag was added'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date the tag was modified'),
+                'created' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date the tag was modified'),
 
                 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universal identifier'),
                 'mainpage' => array('type' => 'varchar', 'length' => 191, 'description' => 'page to link to'),

classes/Profile_prefs.php

@@ -34,8 +34,8 @@ class Profile_prefs extends Managed_DataObject
     public $namespace;                       // varchar(191)  not_null
     public $topic;                           // varchar(191)  not_null
     public $data;                            // text
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -45,8 +45,8 @@ class Profile_prefs extends Managed_DataObject
                 'namespace' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'namespace, like pluginname or category'),
                 'topic' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'preference key, i.e. description, age...'),
                 'data' => array('type' => 'blob', 'description' => 'topic data, may be anything'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('profile_id', 'namespace', 'topic'),
             'foreign keys' => array(

classes/Profile_role.php

@@ -35,7 +35,7 @@ class Profile_role extends Managed_DataObject
     public $__table = 'profile_role';                    // table name
     public $profile_id;                      // int(4)  primary_key not_null
     public $role;                            // varchar(32)  primary_key not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -46,7 +46,7 @@ class Profile_role extends Managed_DataObject
             'fields' => array(
                 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'account having the role'),
                 'role' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'string representing the role'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date the role was granted'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the role was granted'),
             ),
             'primary key' => array('profile_id', 'role'),
             'foreign keys' => array(

classes/Profile_tag.php

@@ -9,7 +9,7 @@ class Profile_tag extends Managed_DataObject
     public $tagger;                          // int(4)  primary_key not_null
     public $tagged;                          // int(4)  primary_key not_null
     public $tag;                             // varchar(64)  primary_key not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -19,7 +19,7 @@ class Profile_tag extends Managed_DataObject
                 'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag'),
                 'tagged' => array('type' => 'int', 'not null' => true, 'description' => 'profile tagged'),
                 'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date the tag was added'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
             ),
             'primary key' => array('tagger', 'tagged', 'tag'),
             'foreign keys' => array(

classes/Profile_tag_subscription.php

@@ -12,8 +12,8 @@ class Profile_tag_subscription extends Managed_DataObject
     public $__table = 'profile_tag_subscription';                     // table name
     public $profile_tag_id;                         // int(4)  not_null
     public $profile_id;                             // int(4)  not_null
-    public $created;                                // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                               // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                                // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                               // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -25,8 +25,8 @@ class Profile_tag_subscription extends Managed_DataObject
                 'profile_tag_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile_tag'),
                 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
 
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('profile_tag_id', 'profile_id'),
             'foreign keys' => array(

classes/Queue_item.php

@@ -13,7 +13,7 @@ class Queue_item extends Managed_DataObject
     public $id;                              // int(4)  primary_key not_null
     public $frame;                           // blob not_null
     public $transport;                       // varchar(32)
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;                         // datetime()   not_null
     public $claimed;                         // datetime()
 
     /* the code above is auto generated do not remove the tag below */
@@ -26,7 +26,7 @@ class Queue_item extends Managed_DataObject
                 'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
                 'frame' => array('type' => 'blob', 'not null' => true, 'description' => 'data: object reference or opaque string'),
                 'transport' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
                 'claimed' => array('type' => 'datetime', 'description' => 'date this item was claimed'),
             ),
             'primary key' => array('id'),

classes/Related_group.php

@@ -11,7 +11,7 @@ class Related_group extends Managed_DataObject
     public $__table = 'related_group';                   // table name
     public $group_id;                        // int(4)  primary_key not_null
     public $related_group_id;                // int(4)  primary_key not_null
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;                         // datetime()   not_null
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -23,7 +23,8 @@ class Related_group extends Managed_DataObject
             'fields' => array(
                 'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
                 'related_group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
             ),
             'primary key' => array('group_id', 'related_group_id'),
             'foreign keys' => array(

classes/Remember_me.php

@@ -12,7 +12,7 @@ class Remember_me extends Managed_DataObject
     public $__table = 'remember_me';                     // table name
     public $code;                            // varchar(32)  primary_key not_null
     public $user_id;                         // int(4)   not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -23,7 +23,7 @@ class Remember_me extends Managed_DataObject
             'fields' => array(
                 'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
                 'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who is logged in'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('code'),
             'foreign keys' => array(

classes/Reply.php

@@ -12,7 +12,7 @@ class Reply extends Managed_DataObject
     public $__table = 'reply';                           // table name
     public $notice_id;                       // int(4)  primary_key not_null
     public $profile_id;                      // int(4)  primary_key not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
     public $replied_id;                      // int(4)
 
     /* the code above is auto generated do not remove the tag below */
@@ -24,7 +24,7 @@ class Reply extends Managed_DataObject
             'fields' => array(
                 'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the reply'),
                 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile replied to'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
                 'replied_id' => array('type' => 'int', 'description' => 'notice replied to (not used, see notice.reply_to)'),
             ),
             'primary key' => array('notice_id', 'profile_id'),

classes/Schema_version.php

@@ -11,7 +11,7 @@ class Schema_version extends Managed_DataObject
     public $__table = 'schema_version';      // table name
     public $table_name;                      // varchar(64)  primary_key not_null
     public $checksum;                        // varchar(64)  not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // datetime()   not_null
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -23,7 +23,7 @@ class Schema_version extends Managed_DataObject
             'fields' => array(
                 'table_name' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Table name'),
                 'checksum' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Checksum of schema array; a mismatch indicates we should check the table more thoroughly.'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('table_name'),
         );

classes/Session.php

@@ -45,8 +45,8 @@ class Session extends Managed_DataObject
     public $__table = 'session';             // table name
     public $id;                              // varchar(32)  primary_key not_null
     public $session_data;                    // text()
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()  not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()  not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -62,8 +62,8 @@ class Session extends Managed_DataObject
             'fields' => [
                 'id' => ['type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'session ID'],
                 'session_data' => ['type' => 'text', 'description' => 'session data'],
-                'created' => ['type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'],
-                'modified' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
+                'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'],
+                'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'],
             ],
             'primary key' => ['id'],
             'indexes' => [

classes/Sms_carrier.php

@@ -13,8 +13,8 @@ class Sms_carrier extends Managed_DataObject
     public $id;                              // int(4)  primary_key not_null
     public $name;                            // varchar(64)  unique_key
     public $email_pattern;                   // varchar(191)   not_null   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -31,8 +31,8 @@ class Sms_carrier extends Managed_DataObject
                 'id' => array('type' => 'int', 'not null' => true, 'description' => 'primary key for SMS carrier'),
                 'name' => array('type' => 'varchar', 'length' => 64, 'description' => 'name of the carrier'),
                 'email_pattern' => array('type' => 'varchar', 'length' => 191, 'not null' => true, 'description' => 'sprintf pattern for making an email address from a phone number'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id'),
             'unique keys' => array(

classes/Status_network.php

@@ -39,12 +39,12 @@ class Status_network extends Safe_DataObject
     public $theme;                           // varchar(191)               not 255 because utf8mb4 takes more space
     public $logo;                            // varchar(191)               not 255 because utf8mb4 takes more space
     public $created;                         // datetime()   not_null
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    static function getKV($k,$v=NULL) {
+    static function getKV($k, $v=NULL) {
         // TODO: This must probably be turned into a non-static call
-        $i = DB_DataObject::staticGet('Status_network',$k,$v);
+        $i = GS_DataObject::staticGet('Status_network',$k,$v);
 
         // Don't use local process cache; if we're fetching multiple
         // times it's because we're reloading it in a long-running
@@ -64,17 +64,24 @@ class Status_network extends Safe_DataObject
     static $wildcard = null;
 
     /**
+     * @param string $dbscheme
      * @param string $dbhost
      * @param string $dbuser
      * @param string $dbpass
      * @param string $dbname
      * @param array $servers memcached servers to use for caching config info
      */
-    static function setupDB($dbhost, $dbuser, $dbpass, $dbname, array $servers)
+    static function setupDB(string $dbscheme, string $dbhost, string $dbuser, string $dbpass, string $dbname, array $servers)
     {
         global $config;
 
-        $config['db']['database_'.$dbname] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
+        if (empty($dbpass)) {
+            $auth = '';
+        } else {
+            $auth = ":$dbpass";
+        }
+
+        $config['db']['database_'.$dbname] = "{$dbscheme}://{$dbuser}{$auth}@{$dbhost}/{$dbname}";
         $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/status_network.ini';
 
         foreach (array('status_network', 'status_network_tag', 'unavailable_status_network') as $table) {

classes/Status_network_tag.php

@@ -27,7 +27,7 @@ class Status_network_tag extends Safe_DataObject
     public $__table = 'status_network_tag';                      // table name
     public $site_id;                  // int(4)  primary_key not_null
     public $tag;                      // varchar(64)  primary_key not_null
-    public $created;                 // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;                 // datetime()   not_null
 
 
     function __construct()

classes/Subscription.php

@@ -35,8 +35,8 @@ class Subscription extends Managed_DataObject
     public $token;                           // varchar(191)   not 255 because utf8mb4 takes more space
     public $secret;                          // varchar(191)   not 255 because utf8mb4 takes more space
     public $uri;                             // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     public static function schemaDef()
     {
@@ -49,8 +49,8 @@ class Subscription extends Managed_DataObject
                 'token' => array('type' => 'varchar', 'length' => 191, 'description' => 'authorization token'),
                 'secret' => array('type' => 'varchar', 'length' => 191, 'description' => 'token secret'),
                 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universally unique identifier'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('subscriber', 'subscribed'),
             'unique keys' => array(

classes/Subscription_queue.php

@@ -20,7 +20,7 @@ class Subscription_queue extends Managed_DataObject
             'fields' => array(
                 'subscriber' => array('type' => 'int', 'not null' => true, 'description' => 'remote or local profile making the request'),
                 'subscribed' => array('type' => 'int', 'not null' => true, 'description' => 'remote or local profile being subscribed to'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
             ),
             'primary key' => array('subscriber', 'subscribed'),
             'indexes' => array(

classes/Token.php

@@ -17,8 +17,8 @@ class Token extends Managed_DataObject
     public $state;                           // tinyint(1)
     public $verifier;                        // varchar(191)   not 255 because utf8mb4 takes more space
     public $verified_callback;               // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -34,8 +34,9 @@ class Token extends Managed_DataObject
                 'state' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'for requests, 0 = initial, 1 = authorized, 2 = used'),
                 'verifier' => array('type' => 'varchar', 'length' => 191, 'description' => 'verifier string for OAuth 1.0a'),
                 'verified_callback' => array('type' => 'varchar', 'length' => 191, 'description' => 'verified callback URL for OAuth 1.0a'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('consumer_key', 'tok'),
             'foreign keys' => array(

classes/Unavailable_status_network.php

@@ -48,7 +48,7 @@ class Unavailable_status_network extends Managed_DataObject
     public $__table = 'unavailable_status_network'; // table name
 
     public $nickname;              // varchar(64) UUID
-    public $created;               // datetime()   not_null default_0000-00-00%2000%3A00%3A00
+    public $created;               // datetime
 
     /**
      * The One True Thingy that must be defined and declared.
@@ -62,7 +62,7 @@ class Unavailable_status_network extends Managed_DataObject
                                     'length' => 64,
                                     'not null' => true, 'description' => 'nickname not to use'),
                 'created' => array('type' => 'datetime',
-                                   'not null' => true, 'default' => '0000-00-00 00:00:00'),
+                                   'not null' => true),
             ),
             'primary key' => array('nickname'),
         );

classes/User.php

@@ -55,8 +55,8 @@ class User extends Managed_DataObject
     public $subscribe_policy;                // tinyint(1)
     public $urlshorteningservice;            // varchar(50)   default_ur1.ca
     public $private_stream;                  // tinyint(1)   default_0
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -89,8 +89,9 @@ class User extends Managed_DataObject
                 'subscribe_policy' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => '0 = anybody can subscribe; 1 = require approval'),
                 'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
                 'private_stream' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to limit all notices to followers only'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('id'),
             'unique keys' => array(

classes/User_group.php

@@ -24,8 +24,8 @@ class User_group extends Managed_DataObject
     public $homepage_logo;                   // varchar(191)   not 255 because utf8mb4 takes more space
     public $stream_logo;                     // varchar(191)   not 255 because utf8mb4 takes more space
     public $mini_logo;                       // varchar(191)   not 255 because utf8mb4 takes more space
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
     public $uri;                             // varchar(191)  unique_key   not 255 because utf8mb4 takes more space
     public $mainpage;                        // varchar(191)   not 255 because utf8mb4 takes more space
     public $join_policy;                     // tinyint
@@ -58,8 +58,8 @@ class User_group extends Managed_DataObject
                 'stream_logo' => array('type' => 'varchar', 'length' => 191, 'description' => 'stream-sized logo'),
                 'mini_logo' => array('type' => 'varchar', 'length' => 191, 'description' => 'mini logo'),
 
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
 
                 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universal identifier'),
                 'mainpage' => array('type' => 'varchar', 'length' => 191, 'description' => 'page for group info to link to'),

classes/User_im_prefs.php

@@ -41,8 +41,8 @@ class User_im_prefs extends Managed_DataObject
     public $notify;                          // tinyint(1)
     public $replies;                         // tinyint(1)
     public $updatefrompresence;              // tinyint(1)
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -57,8 +57,8 @@ class User_im_prefs extends Managed_DataObject
                 'notify' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
                 'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
                 'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
             ),
             'primary key' => array('user_id', 'transport'),
             'unique keys' => array(

classes/User_location_prefs.php

@@ -37,8 +37,8 @@ class User_location_prefs extends Managed_DataObject
     public $__table = 'user_location_prefs';             // table name
     public $user_id;                         // int(4)  primary_key not_null
     public $share_location;                  // tinyint(1)   default_1
-    public $created;                         // datetime()   not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -49,8 +49,8 @@ class User_location_prefs extends Managed_DataObject
             'fields' => array(
                 'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
                 'share_location' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Whether to share location data'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('user_id'),
             'foreign keys' => array(

classes/User_urlshortener_prefs.php

@@ -31,8 +31,8 @@ class User_urlshortener_prefs extends Managed_DataObject
     public $urlshorteningservice;            // varchar(50)   default_ur1.ca
     public $maxurllength;                    // int(4)   not_null
     public $maxnoticelength;                 // int(4)   not_null
-    public $created;                         // datetime()  not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                        // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -45,8 +45,9 @@ class User_urlshortener_prefs extends Managed_DataObject
                 'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
                 'maxurllength' => array('type' => 'int', 'not null' => true, 'description' => 'urls greater than this length will be shortened, 0 = always, null = never'),
                 'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, -1 = only if notice text is longer than max allowed'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+        
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('user_id'),
             'foreign keys' => array(

classes/User_username.php

@@ -13,8 +13,8 @@ class User_username extends Managed_DataObject
     public $user_id;                        // int(4)  not_null
     public $provider_name;                  // varchar(191)  primary_key not_null   not 255 because utf8mb4 takes more space
     public $username;                       // varchar(191)  primary_key not_null   not 255 because utf8mb4 takes more space
-    public $created;                        // datetime()  not_null default_0000-00-00%2000%3A00%3A00
-    public $modified;                       // datetime()   not_null default_CURRENT_TIMESTAMP
+    public $created;                        // datetime()   not_null
+    public $modified;                       // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -26,8 +26,8 @@ class User_username extends Managed_DataObject
                 'provider_name' => array('type' => 'varchar', 'length' => 191, 'description' => 'provider name'),
                 'username' => array('type' => 'varchar', 'length' => 191, 'description' => 'username'),
                 'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice id this title relates to'),
-                'created' => array('type' => 'datetime', 'not null' => true, 'default' => '0000-00-00 00:00:00', 'description' => 'date this record was created'),
-                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
             ),
             'primary key' => array('provider_name', 'username'),
             'indexes' => array(

composer.json

@@ -4,7 +4,7 @@
     "type": "project",
     "license": "AGPL-3.0-only",
     "require": {
-        "php": "^7.3.0",
+        "php": "^7.0.0",
         "ext-bcmath": "*",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -19,9 +19,9 @@
         "apereo/phpcas": "^1.3",
         "diogocomposer/xmpphp": "^3.0",
         "embed/embed": "^3.4",
+        "doctrine/dbal": "^2.5",
         "ezyang/htmlpurifier": "^4.10",
         "hoa/consistency": "^1.17.05.02",
-        "intervention/image": "^2.5",
         "masterminds/html5": "^2.6",
         "mf2/mf2": "^0.4.6",
         "michelf/php-markdown": "^1.8.0",
@@ -33,7 +33,7 @@
     },
     "require-dev": {
         "phpdocumentor/phpdocumentor": "^2.9",
-        "phpunit/phpunit": "^8.2",
+        "phpunit/phpunit": "^6.5",
         "psy/psysh": "^0.9.9"
     },
     "suggest": {
@@ -70,7 +70,10 @@
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "platform": {
+            "php": "7.0.0"
+        }
     },
     "scripts": {
         "post-update-cmd": [

extlib/AcceptHeader.php

@@ -1,116 +0,0 @@
-<?php
-/**
- * Note : Code is released under the GNU LGPL
- *
- * Please do not change the header of this file
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU
- * Lesser General Public License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License for more details.
- */
-
-/**
- * The AcceptHeader page will parse and sort the different
- * allowed types for the content negociations
- *
- * @author Pierrick Charron <pierrick@webstart.fr>
- */
-class AcceptHeader extends \ArrayObject
-{
-    /**
-     * Constructor
-     *
-     * @param string $header Value of the Accept header
-     * @return void
-     */
-    public function __construct($header)
-    {
-        $acceptedTypes = $this->_parse($header);
-        usort($acceptedTypes, [$this, '_compare']);
-        parent::__construct($acceptedTypes);
-    }
-
-    /**
-     * Parse the accept header and return an array containing
-     * all the informations about the Accepted types
-     *
-     * @param string $data Value of the Accept header
-     * @return array
-     */
-    private function _parse($data)
-    {
-        $array = [];
-        $items = explode(',', $data);
-        foreach ($items as $item) {
-            $elems = explode(';', $item);
-
-            $acceptElement = [];
-            $mime = current($elems);
-            list($type, $subtype) = explode('/', $mime);
-            $acceptElement['type'] = trim($type);
-            $acceptElement['subtype'] = trim($subtype);
-            $acceptElement['raw'] = $mime;
-
-            $acceptElement['params'] = [];
-            while (next($elems)) {
-                list($name, $value) = explode('=', current($elems));
-                $acceptElement['params'][trim($name)] = trim($value);
-            }
-
-            $array[] = $acceptElement;
-        }
-        return $array;
-    }
-
-    /**
-     * Compare two Accepted types with their parameters to know
-     * if one media type should be used instead of an other
-     *
-     * @param array $a The first media type and its parameters
-     * @param array $b The second media type and its parameters
-     * @return int
-     */
-    private function _compare($a, $b)
-    {
-        $a_q = isset($a['params']['q']) ? floatval($a['params']['q']) : 1.0;
-        $b_q = isset($b['params']['q']) ? floatval($b['params']['q']) : 1.0;
-        if ($a_q === $b_q) {
-            $a_count = count($a['params']);
-            $b_count = count($b['params']);
-            if ($a_count === $b_count) {
-                if ($r = $this->_compareSubType($a['subtype'], $b['subtype'])) {
-                    return $r;
-                } else {
-                    return $this->_compareSubType($a['type'], $b['type']);
-                }
-            } else {
-                return $a_count < $b_count;
-            }
-        } else {
-            return $a_q < $b_q;
-        }
-    }
-
-    /**
-     * Compare two subtypes
-     *
-     * @param string $a First subtype to compare
-     * @param string $b Second subtype to compare
-     * @return int
-     */
-    private function _compareSubType($a, $b)
-    {
-        if ($a === '*' && $b !== '*') {
-            return 1;
-        } elseif ($b === '*' && $a !== '*') {
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-}

extlib/DB/DataObject/Cast.php

@@ -1,550 +0,0 @@
-<?php
-/**
- * Prototype Castable Object.. for DataObject queries
- *
- * Storage for Data that may be cast into a variety of formats.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB_DataObject
- * @author     Alan Knowles <alan@akbkhome.com>
- * @copyright  1997-2008 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version    CVS: $Id: Cast.php 287158 2009-08-12 13:58:31Z alan_k $
- * @link       http://pear.php.net/package/DB_DataObject
- */
-
-/**
- *
- * Common usages:
- *   // blobs
- *   $data = DB_DataObject_Cast::blob($somefile);
- *   $data = DB_DataObject_Cast::string($somefile);
- *   $dataObject->someblobfield = $data
- *
- *   // dates?
- *   $d1 = new DB_DataObject_Cast::date('12/12/2000');
- *   $d2 = new DB_DataObject_Cast::date(2000,12,30);
- *   $d3 = new DB_DataObject_Cast::date($d1->year, $d1->month+30, $d1->day+30);
- *
- *   // time, datetime.. ?????????
- *
- *   // raw sql????
- *    $data = DB_DataObject_Cast::sql('cast("123123",datetime)');
- *    $data = DB_DataObject_Cast::sql('NULL');
- *
- *   // int's/string etc. are proably pretty pointless..!!!!
- *
- *
- *   inside DB_DataObject,
- *   if (is_a($v,'db_dataobject_class')) {
- *           $value .= $v->toString(DB_DATAOBJECT_INT,'mysql');
- *   }
- *
- *
- *
- *
-
- */
-class DB_DataObject_Cast
-{
-
-    /**
-     * Type of data Stored in the object..
-     *
-     * @var string       (date|blob|.....?)
-     * @access public
-     */
-    public $type;
-
-    /**
-     * Data For date representation
-     *
-     * @var int  day/month/year
-     * @access public
-     */
-    public $day;
-    public $month;
-    public $year;
-
-
-    /**
-     * Generic Data..
-     *
-     * @var string
-     * @access public
-     */
-
-    public $value;
-    /**
-     * Data For time representation ** does not handle timezones!!
-     *
-     * @var int  hour/minute/second
-     * @access public
-     */
-    public $hour;
-    public $minute;
-    public $second;
-
-    /**
-     * Blob consructor
-     *
-     * create a Cast object from some raw data.. (binary)
-     *
-     *
-     * @param string (with binary data!)
-     *
-     * @return   object DB_DataObject_Cast
-     * @access   public
-     */
-
-    public function blob($value)
-    {
-        $r = new DB_DataObject_Cast;
-        $r->type = 'blob';
-        $r->value = $value;
-        return $r;
-    }
-
-    /**
-     * String consructor (actually use if for ints and everything else!!!
-     *
-     * create a Cast object from some string (not binary)
-     *
-     *
-     * @param string (with binary data!)
-     *
-     * @return   object DB_DataObject_Cast
-     * @access   public
-     */
-
-    public function string($value)
-    {
-        $r = new DB_DataObject_Cast;
-        $r->type = 'string';
-        $r->value = $value;
-        return $r;
-    }
-
-    /**
-     * SQL constructor (for raw SQL insert)
-     *
-     * create a Cast object from some sql
-     *
-     * @param string (with binary data!)
-     *
-     * @return   object DB_DataObject_Cast
-     * @access   public
-     */
-
-    public function sql($value)
-    {
-        $r = new DB_DataObject_Cast;
-        $r->type = 'sql';
-        $r->value = $value;
-        return $r;
-    }
-
-    /**
-     * DateTime Constructor
-     *
-     * create a Cast object from a Date/Time
-     * Maybe should accept a Date object.!
-     * NO VALIDATION DONE, although some crappy re-calcing done!
-     *
-     * @param vargs... accepts
-     *              noargs (now)
-     *              yyyy-mm-dd HH:MM:SS (Iso)
-     *              array(yyyy,mm,dd,HH,MM,SS)
-     *
-     *
-     * @return bool|object
-     * @access   public
-     * @author   therion 5 at hotmail
-     */
-
-    public function dateTime()
-    {
-        $args = func_get_args();
-        switch (count($args)) {
-            case 0: // no args = now!
-                $datetime = date('Y-m-d G:i:s', mktime());
-
-            // no break
-            case 1:
-                // continue on from 0 args.
-                if (!isset($datetime)) {
-                    $datetime = $args[0];
-                }
-
-                $parts = explode(' ', $datetime);
-                $bits = explode('-', $parts[0]);
-                $bits = array_merge($bits, explode(':', $parts[1]));
-                break;
-
-            default: // 2 or more..
-                $bits = $args;
-
-        }
-
-        if (count($bits) != 6) {
-            // PEAR ERROR?
-            return false;
-        }
-
-        $r = DB_DataObject_Cast::date($bits[0], $bits[1], $bits[2]);
-        if (!$r) {
-            return $r; // pass thru error (False) - doesnt happen at present!
-        }
-        // change the type!
-        $r->type = 'datetime';
-
-        // should we mathematically sort this out..
-        // (or just assume that no-one's dumb enough to enter 26:90:90 as a time!
-        $r->hour = $bits[3];
-        $r->minute = $bits[4];
-        $r->second = $bits[5];
-        return $r;
-    }
-
-    /**
-     * Date Constructor
-     *
-     * create a Cast object from some string (not binary)
-     * NO VALIDATION DONE, although some crappy re-calcing done!
-     *
-     * @param vargs... accepts
-     *       dd/mm
-     *       dd/mm/yyyy
-     *       yyyy-mm
-     *       yyyy-mm-dd
-     *       array(yyyy,dd)
-     *       array(yyyy,dd,mm)
-     *
-     *
-     *
-     * @return   object DB_DataObject_Cast
-     * @access   public
-     */
-
-    public function date()
-    {
-        $args = func_get_args();
-        switch (count($args)) {
-            case 0: // no args = today!
-                $bits = explode('-', date('Y-m-d'));
-                break;
-            case 1: // one arg = a string
-
-                if (strpos($args[0], '/') !== false) {
-                    $bits = array_reverse(explode('/', $args[0]));
-                } else {
-                    $bits = explode('-', $args[0]);
-                }
-                break;
-            default: // 2 or more..
-                $bits = $args;
-        }
-        if (count($bits) == 1) { // if YYYY set day = 1st..
-            $bits[] = 1;
-        }
-
-        if (count($bits) == 2) { // if YYYY-DD set day = 1st..
-            $bits[] = 1;
-        }
-
-        // if year < 1970 we cant use system tools to check it...
-        // so we make a few best gueses....
-        // basically do date calculations for the year 2000!!!
-        // fix me if anyone has more time...
-        if (($bits[0] < 1975) || ($bits[0] > 2030)) {
-            $oldyear = $bits[0];
-            $bits = explode('-', date('Y-m-d', mktime(1, 1, 1, $bits[1], $bits[2], 2000)));
-            $bits[0] = ($bits[0] - 2000) + $oldyear;
-        } else {
-            // now mktime
-            $bits = explode('-', date('Y-m-d', mktime(1, 1, 1, $bits[1], $bits[2], $bits[0])));
-        }
-        $r = new DB_DataObject_Cast;
-        $r->type = 'date';
-        list($r->year, $r->month, $r->day) = $bits;
-        return $r;
-    }
-
-    /**
-     * time Constructor
-     *
-     * create a Cast object from a Date/Time
-     * Maybe should accept a Date object.!
-     * NO VALIDATION DONE, and no-recalcing done!
-     *
-     * @param vargs... accepts
-     *              noargs (now)
-     *              HH:MM:SS (Iso)
-     *              array(HH,MM,SS)
-     *
-     *
-     * @return bool|object
-     * @access   public
-     * @author   therion 5 at hotmail
-     */
-    public function time()
-    {
-        $args = func_get_args();
-        switch (count($args)) {
-            case 0: // no args = now!
-                $time = date('G:i:s', mktime());
-
-            // no break
-            case 1:
-                // continue on from 0 args.
-                if (!isset($time)) {
-                    $time = $args[0];
-                }
-                $bits = explode(':', $time);
-                break;
-
-            default: // 2 or more..
-                $bits = $args;
-
-        }
-
-        if (count($bits) != 3) {
-            return false;
-        }
-
-        // now take data from bits into object fields
-        $r = new DB_DataObject_Cast;
-        $r->type = 'time';
-        $r->hour = $bits[0];
-        $r->minute = $bits[1];
-        $r->second = $bits[2];
-        return $r;
-    }
-
-
-    /**
-     * get the string to use in the SQL statement for this...
-     *
-     *
-     * @param bool $to Type (DB_DATAOBJECT_*
-     * @param object $db DB Connection Object
-     *
-     *
-     * @return   string
-     * @access   public
-     */
-
-    public function toString($to = false, $db)
-    {
-        // if $this->type is not set, we are in serious trouble!!!!
-        // values for to:
-        $method = 'toStringFrom' . $this->type;
-        return $this->$method($to, $db);
-    }
-
-    /**
-     * get the string to use in the SQL statement from a blob of binary data
-     *   ** Suppots only blob->postgres::bytea
-     *
-     * @param int $to Type (DB_DATAOBJECT_*
-     * @param object $db DB Connection Object
-     *
-     *
-     * @return   string
-     * @access   public
-     */
-    public function toStringFromBlob($to, $db)
-    {
-        // first weed out invalid casts..
-        // in blobs can only be cast to blobs.!
-
-        // perhaps we should support TEXT fields???
-
-        if (!($to & DB_DATAOBJECT_BLOB)) {
-            return (new PEAR)->raiseError('Invalid Cast from a DB_DataObject_Cast::blob to something other than a blob!');
-        }
-
-        switch ($db->dsn["phptype"]) {
-            case 'pgsql':
-                return "'" . pg_escape_bytea($this->value) . "'::bytea";
-
-            case 'mysql':
-                return "'" . mysql_real_escape_string($this->value, $db->connection) . "'";
-
-            case 'mysqli':
-                // this is funny - the parameter order is reversed ;)
-                return "'" . mysqli_real_escape_string($db->connection, $this->value) . "'";
-
-            case 'sqlite':
-                // this is funny - the parameter order is reversed ;)
-                return "'" . sqlite_escape_string($this->value) . "'";
-
-            case 'mssql':
-
-                if (is_numeric($this->value)) {
-                    return $this->value;
-                }
-                $unpacked = unpack('H*hex', $this->value);
-                return '0x' . $unpacked['hex'];
-
-
-            default:
-                return (new PEAR)->raiseError("DB_DataObject_Cast cant handle blobs for Database:{$db->dsn['phptype']} Yet");
-        }
-    }
-
-    /**
-     * get the string to use in the SQL statement for a blob from a string!
-     *   ** Suppots only string->postgres::bytea
-     *
-     *
-     * @param int $to Type (DB_DATAOBJECT_*
-     * @param object $db DB Connection Object
-     *
-     *
-     * @return   string
-     * @access   public
-     */
-    public function toStringFromString($to, $db)
-    {
-        // first weed out invalid casts..
-        // in blobs can only be cast to blobs.!
-
-        // perhaps we should support TEXT fields???
-        //
-
-        // $to == a string field which is the default type (0)
-        // so we do not test it here. - we assume that number fields
-        // will accept a string?? - which is stretching it a bit ...
-        // should probaly add that test as some point.
-
-        switch ($db->dsn['phptype']) {
-            case 'pgsql':
-                return "'" . pg_escape_string($this->value) . "'::bytea";
-
-            case 'mysql':
-                return "'" . mysql_real_escape_string($this->value, $db->connection) . "'";
-
-
-            case 'mysqli':
-                return "'" . mysqli_real_escape_string($db->connection, $this->value) . "'";
-
-            case 'mssql':
-                // copied from the old DB mssql code...?? not sure how safe this is.
-                return "'" . str_replace(
-                        array("'", "\\\r\n", "\\\n"),
-                        array("''", "\\\\\r\n\r\n", "\\\\\n\n"),
-                        $this->value
-                    ) . "'";
-
-
-            default:
-                return (new PEAR)->raiseError("DB_DataObject_Cast cant handle blobs for Database:{$db->dsn['phptype']} Yet");
-        }
-    }
-
-
-    /**
-     * get the string to use in the SQL statement for a date
-     *
-     *
-     *
-     * @param int $to Type (DB_DATAOBJECT_*
-     * @param object $db DB Connection Object
-     *
-     *
-     * @return   string
-     * @access   public
-     */
-    public function toStringFromDate($to, $db)
-    {
-        // first weed out invalid casts..
-        // in blobs can only be cast to blobs.!
-        // perhaps we should support TEXT fields???
-        //
-
-        if (($to !== false) && !($to & DB_DATAOBJECT_DATE)) {
-            return (new PEAR)->raiseError('Invalid Cast from a DB_DataObject_Cast::string to something other than a date!' .
-                ' (why not just use native features)');
-        }
-        return "'{$this->year}-{$this->month}-{$this->day}'";
-    }
-
-    /**
-     * get the string to use in the SQL statement for a datetime
-     *
-     *
-     *
-     * @param int $to Type (DB_DATAOBJECT_*
-     * @param object $db DB Connection Object
-     *
-     *
-     * @return   string
-     * @access   public
-     * @author   therion 5 at hotmail
-     */
-
-    public function toStringFromDateTime($to, $db)
-    {
-        // first weed out invalid casts..
-        // in blobs can only be cast to blobs.!
-        // perhaps we should support TEXT fields???
-        if (($to !== false) &&
-            !($to & (DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME))) {
-            return (new PEAR)->raiseError('Invalid Cast from a ' .
-                ' DB_DataObject_Cast::dateTime to something other than a datetime!' .
-                ' (try using native features)');
-        }
-        return "'{$this->year}-{$this->month}-{$this->day} {$this->hour}:{$this->minute}:{$this->second}'";
-    }
-
-    /**
-     * get the string to use in the SQL statement for a time
-     *
-     *
-     *
-     * @param int $to Type (DB_DATAOBJECT_*
-     * @param object $db DB Connection Object
-     *
-     *
-     * @return   string
-     * @access   public
-     * @author   therion 5 at hotmail
-     */
-
-    public function toStringFromTime($to, $db)
-    {
-        // first weed out invalid casts..
-        // in blobs can only be cast to blobs.!
-        // perhaps we should support TEXT fields???
-        if (($to !== false) && !($to & DB_DATAOBJECT_TIME)) {
-            return (new PEAR)->raiseError('Invalid Cast from a' .
-                ' DB_DataObject_Cast::time to something other than a time!' .
-                ' (try using native features)');
-        }
-        return "'{$this->hour}:{$this->minute}:{$this->second}'";
-    }
-
-    /**
-     * get the string to use in the SQL statement for a raw sql statement.
-     *
-     * @param int $to Type (DB_DATAOBJECT_*
-     * @param object $db DB Connection Object
-     *
-     *
-     * @return   string
-     * @access   public
-     */
-    public function toStringFromSql($to, $db)
-    {
-        return $this->value;
-    }
-}

extlib/DB/DataObject/Error.php

@@ -1,52 +0,0 @@
-<?php
-/**
- * DataObjects error handler, loaded on demand...
- *
- * DB_DataObject_Error is a quick wrapper around pear error, so you can distinguish the
- * error code source.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB_DataObject
- * @author     Alan Knowles <alan@akbkhome.com>
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version    CVS: $Id: Error.php 287158 2009-08-12 13:58:31Z alan_k $
- * @link       http://pear.php.net/package/DB_DataObject
- */
-
-
-class DB_DataObject_Error extends PEAR_Error
-{
-
-    /**
-     * DB_DataObject_Error constructor.
-     *
-     * @param string $message
-     * @param mixed $code DB error code, or string with error message.
-     * @param integer $mode what "error mode" to operate in
-     * @param integer $level what error level to use for $mode & PEAR_ERROR_TRIGGER
-     * @access public
-     *
-     * @see PEAR_Error
-     */
-    public function __construct(
-        $message = '',
-        $code = DB_ERROR,
-        $mode = PEAR_ERROR_RETURN,
-        $level = E_USER_NOTICE
-    )
-    {
-        $this->PEAR_Error('DB_DataObject Error: ' . $message, $code, $mode, $level);
-    }
-
-
-    // todo : - support code -> message handling, and translated error messages...
-}

extlib/DB/DataObject/Links.php

@@ -1,450 +0,0 @@
-<?php
-/**
- * Link tool for DB_DataObject
- *
- * PHP versions 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB_DataObject
- * @author     Alan Knowles <alan@akbkhome.com>
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version    : FIXME
- * @link       http://pear.php.net/package/DB_DataObject
- */
-
-
-/**
- *
- * Example of how this could be used..
- *
- * The lind method are now in here.
- *
- * Currenly only supports existing methods, and new 'link()' method
- *
- */
-
-
-/**
- * Links class
- *
- * @package DB_DataObject
- */
-class DB_DataObject_Links
-{
-    /**
-     * @property {DB_DataObject}      do   DataObject to apply this to.
-     */
-    public $do = false;
-
-
-    /**
-     * @property {Array|String} load    What to load, 'all' or an array of properties. (default all)
-     */
-    public $load = 'all';
-    /**
-     * @property {String|Boolean}       scanf   use part of column name as resulting
-     *                                          property name. (default false)
-     */
-    public $scanf = false;
-    /**
-     * @property {String|Boolean}       printf  use column name as sprintf for resulting property name..
-     *                                     (default %s_link if apply is true, otherwise it is %s)
-     */
-    public $printf = false;
-    /**
-     * @property {Boolean}      cached  cache the result, so future queries will use cache rather
-     *                                  than running the expensive sql query.
-     */
-    public $cached = false;
-    /**
-     * @property {Boolean}      apply   apply the result to this object, (default true)
-     */
-    public $apply = true;
-
-
-    //------------------------- RETURN ------------------------------------
-    /**
-     * @property {Array}      links    key value associative array of links.
-     */
-    public $links;
-
-
-    /**
-     * Constructor
-     *   -- good ole style..
-     * @param {DB_DataObject}           do  DataObject to apply to.
-     * @param array $cfg
-     */
-
-    public function __construct($do, $cfg = array())
-    {
-        // check if do is set!!!?
-        $this->do = $do;
-
-        foreach ($cfg as $k => $v) {
-            $this->$k = $v;
-        }
-    }
-
-    /**
-     *  a generic geter/setter provider..
-     *
-     *  provides a generic getter setter for the referenced object
-     *  eg.
-     *  $link->link('company_id') returns getLink for the object
-     *  if nothing is linked (it will return an empty dataObject)
-     *  $link->link('company_id', array(1)) - just sets the
-     *
-     *  also array as the field speck supports
-     *      $link->link(array('company_id', 'company:id'))
-     *
-     *
-     * @param string|array $field the field to fetch or link spec.
-     * @param array $args
-     * @return mixed true of false on set, the object on getter.
-     * @params array          $args    the arguments sent to the getter setter
-     */
-    public function link($field, $args = array())
-    {
-        $info = $this->linkInfo($field);
-
-        if (!$info) {
-            $this->do->raiseError(
-                "getLink:Could not find link for row $field",
-                DB_DATAOBJECT_ERROR_INVALIDCONFIG
-            );
-            return false;
-        }
-        $field = $info[2];
-
-
-        if (empty($args)) { // either an empty array or really empty....
-
-            if (!isset($this->do->$field)) {
-                return $info[0]; // empty dataobject.
-            }
-
-            $ret = $this->getLink($field);
-            // nothing linked -- return new object..
-            return ($ret === 0) ? $info[0] : $ret;
-        }
-        $assign = is_array($args) ? $args[0] : $args;
-
-        // otherwise it's a set call..
-        if (!is_a($assign, 'DB_DataObject')) {
-            if (is_numeric($assign) && is_integer($assign * 1)) {
-                if ($assign > 0) {
-                    if (!$info) {
-                        return false;
-                    }
-                    // check that record exists..
-                    if (!$info[0]->get($info[1], $assign)) {
-                        return false;
-                    }
-                }
-
-                $this->do->$field = $assign;
-                return true;
-            }
-
-            return false;
-        }
-
-        // otherwise we are assigning it ...
-
-        $this->do->$field = $assign->{$info[1]};
-        return true;
-    }
-
-    /**
-     * get link information for a field or field specification
-     *
-     * alll link (and join methods accept the 'link' info ) in various ways
-     * string : 'field' = which field to get (uses ???.links.ini to work out what)
-     * array(2) : 'field', 'table:remote_col' << just like the links.ini def.
-     * array(3) : 'field', $dataobject, 'remote_col'  (handy for joinAdd to do nested joins.)
-     *
-     * @param string|array $field or link spec to use.
-     * @return array|bool (false|array) array of dataobject and linked field or false.
-     *
-     */
-
-    public function linkInfo($field)
-    {
-        if (is_array($field)) {
-            if (count($field) == 3) {
-                // array with 3 args:
-                // local_col , dataobject, remote_col
-                return array(
-                    $field[1],
-                    $field[2],
-                    $field[0]
-                );
-            }
-            list($table, $link) = explode(':', $field[1]);
-
-            return array(
-                $this->do->factory($table),
-                $link,
-                $field[0]
-            );
-        }
-        // work out the link.. (classic way)
-
-        $links = $this->do->links();
-
-        if (empty($links) || !is_array($links)) {
-            return false;
-        }
-
-
-        if (!isset($links[$field])) {
-            return false;
-        }
-        list($table, $link) = explode(':', $links[$field]);
-
-
-        //??? needed???
-        if ($p = strpos($field, ".")) {
-            $field = substr($field, 0, $p);
-        }
-
-        return array(
-            $this->do->factory($table),
-            $link,
-            $field
-        );
-    }
-
-    /**
-     * return name from related object
-     *
-     * The relies on  a <dbname>.links.ini file, unless you specify the arguments.
-     *
-     * you can also use $this->getLink('thisColumnName','otherTable','otherTableColumnName')
-     *
-     *
-     * @param string $field |array    either row or row.xxxxx or links spec.
-     * @param bool $table (optional) name of table to look up value in
-     * @param string $link (optional)  name of column in other table to match
-     * @return mixed object on success false on failure or '0' when not linked
-     * @author Tim White <tim@cyface.com>
-     * @access public
-     */
-    public function getLink($field, $table = false, $link = '')
-    {
-        static $cache = array();
-
-        // GUESS THE LINKED TABLE.. (if found - recursevly call self)
-
-        if ($table == false) {
-            $info = $this->linkInfo($field);
-
-            if ($info) {
-                return $this->getLink($field, $info[0], $link === false ? $info[1] : $link);
-            }
-
-            // no links defined.. - use borked BC method...
-            // use the old _ method - this shouldnt happen if called via getLinks()
-            if (!($p = strpos($field, '_'))) {
-                return false;
-            }
-            $table = substr($field, 0, $p);
-            return $this->getLink($field, $table);
-        }
-
-        $tn = is_string($table) ? $table : $table->tableName();
-
-
-        if (!isset($this->do->$field)) {
-            $this->do->raiseError("getLink: row not set $field", DB_DATAOBJECT_ERROR_NODATA);
-            return false;
-        }
-
-        // check to see if we know anything about this table..
-
-
-        if (empty($this->do->$field) || $this->do->$field < 0) {
-            return 0; // no record.
-        }
-
-        if ($this->cached && isset($cache[$tn . ':' . $link . ':' . $this->do->$field])) {
-            return $cache[$tn . ':' . $link . ':' . $this->do->$field];
-        }
-
-        $obj = is_string($table) ? $this->do->factory($tn) : $table;;
-
-        if (!is_a($obj, 'DB_DataObject')) {
-            $this->do->raiseError(
-                "getLink:Could not find class for row $field, table $tn",
-                DB_DATAOBJECT_ERROR_INVALIDCONFIG
-            );
-            return false;
-        }
-        // -1 or 0 -- no referenced record..
-
-        $ret = false;
-        if ($link) {
-            if ($obj->get($link, $this->do->$field)) {
-                $ret = $obj;
-            }
-
-
-            // this really only happens when no link config is set (old BC stuff)
-        } elseif ($obj->get($this->do->$field)) {
-            $ret = $obj;
-        }
-        if ($this->cached) {
-            $cache[$tn . ':' . $link . ':' . $this->do->$field] = $ret;
-        }
-        return $ret;
-    }
-
-    /**
-     * load related objects
-     *
-     * Generally not recommended to use this.
-     * The generator should support creating getter_setter methods which are better suited.
-     *
-     * Relies on  <dbname>.links.ini
-     *
-     * Sets properties on the calling dataobject  you can change what
-     * object vars the links are stored in by  changeing the format parameter
-     *
-     *
-     * @param string format (default _%s) where %s is the table name.
-     * @return boolean , true on success
-     * @author Tim White <tim@cyface.com>
-     * @access public
-     */
-
-    public function applyLinks($format = '_%s')
-    {
-
-        // get table will load the options.
-        if ($this->do->_link_loaded) {
-            return true;
-        }
-
-        $this->do->_link_loaded = false;
-        $cols = $this->do->table();
-        $links = $this->do->links();
-
-        $loaded = array();
-
-        if ($links) {
-            foreach ($links as $key => $match) {
-                list($table, $link) = explode(':', $match);
-                $k = sprintf($format, str_replace('.', '_', $key));
-                // makes sure that '.' is the end of the key;
-                if ($p = strpos($key, '.')) {
-                    $key = substr($key, 0, $p);
-                }
-
-                $this->do->$k = $this->getLink($key, $table, $link);
-
-                if (is_object($this->do->$k)) {
-                    $loaded[] = $k;
-                }
-            }
-            $this->do->_link_loaded = $loaded;
-            return true;
-        }
-        // this is the autonaming stuff..
-        // it sends the column name down to getLink and lets that sort it out..
-        // if there is a links file then it is not used!
-        // IT IS DEPRECATED!!!! - DO NOT USE
-        if (!is_null($links)) {
-            return false;
-        }
-
-
-        foreach (array_keys($cols) as $key) {
-            if (!($p = strpos($key, '_'))) {
-                continue;
-            }
-            // does the table exist.
-            $k = sprintf($format, $key);
-            $this->do->$k = $this->getLink($key);
-            if (is_object($this->do->$k)) {
-                $loaded[] = $k;
-            }
-        }
-        $this->do->_link_loaded = $loaded;
-        return true;
-    }
-
-    /**
-     * getLinkArray
-     * Fetch an array of related objects. This should be used in conjunction with a
-     * <dbname>.links.ini file configuration (see the introduction on linking for details on this).
-     *
-     * You may also use this with all parameters to specify, the column and related table.
-     *
-     * @access public
-     * @param string $field - either column or column.xxxxx
-     * @param string $table (optional) name of table to look up value in
-     * @param bool $fkey (optional) fetchall key see DB_DataObject::fetchAll()
-     * @param bool $fval (optional) fetchall method DB_DataObject::fetchAll()
-     * @param bool $fmethod
-     * @return array - array of results (empty array on failure)
-     *
-     * Example - Getting the related objects
-     *
-     * $person = new DataObjects_Person;
-     * $person->get(12);
-     * $children = $person->getLinkArray('children');
-     *
-     * echo 'There are ', count($children), ' descendant(s):<br />';
-     * foreach ($children as $child) {
-     *     echo $child->name, '<br />';
-     * }
-     */
-    public function getLinkArray($field, $table = null, $fkey = false, $fval = false, $fmethod = false)
-    {
-        $ret = array();
-        if (!$table) {
-            $links = $this->do->links();
-
-            if (is_array($links)) {
-                if (!isset($links[$field])) {
-                    // failed..
-                    return $ret;
-                }
-                list($table, $link) = explode(':', $links[$field]);
-                return $this->getLinkArray($field, $table);
-            }
-            if (!($p = strpos($field, '_'))) {
-                return $ret;
-            }
-            return $this->getLinkArray($field, substr($field, 0, $p));
-        }
-
-        $c = $this->do->factory($table);
-
-        if (!is_object($c) || !is_a($c, 'DB_DataObject')) {
-            $this->do->raiseError(
-                "getLinkArray:Could not find class for row $field, table $table",
-                DB_DATAOBJECT_ERROR_INVALIDCONFIG
-            );
-            return $ret;
-        }
-
-        // if the user defined method list exists - use it...
-        if (method_exists($c, 'listFind')) {
-            $c->listFind($this->id);
-            while ($c->fetch()) {
-                $ret[] = clone($c);
-            }
-            return $ret;
-        }
-        return $c->fetchAll($fkey, $fval, $fmethod);
-    }
-}

extlib/DB/DataObject/createTables.php

@@ -1,62 +0,0 @@
-#!/usr/bin/php -q
-<?php
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author:  Alan Knowles <alan@akbkhome.com>
-// +----------------------------------------------------------------------+
-//
-// $Id: createTables.php 277015 2009-03-12 05:51:03Z alan_k $
-//
-
-// since this version doesnt use overload,
-// and I assume anyone using custom generators should add this..
-
-define('DB_DATAOBJECT_NO_OVERLOAD', 1);
-
-//require_once 'DB/DataObject/Generator.php';
-require_once 'Generator.php';
-
-if (php_sapi_name() != 'cli') {
-    (new PEAR)->raiseError("\nERROR: You must turn use the cli sapi to run this", null, PEAR_ERROR_DIE);
-}
-
-if (!ini_get('register_argc_argv')) {
-    (new PEAR)->raiseError("\nERROR: You must turn register_argc_argv On in you php.ini file for this to work\neg.\n\nregister_argc_argv = On\n\n", null, PEAR_ERROR_DIE);
-    exit;
-}
-
-if (!@$_SERVER['argv'][1]) {
-    (new PEAR)->raiseError("\nERROR: createTable.php usage:\n\n" . $_SERVER['argv'][0] . " example.ini\n\n", null, PEAR_ERROR_DIE);
-    exit;
-}
-
-$config = parse_ini_file($_SERVER['argv'][1], true);
-foreach ($config as $class => $values) {
-    $options = &(new PEAR)->getStaticProperty($class, 'options');
-    $options = $values;
-}
-
-
-$options = &(new PEAR)->getStaticProperty('DB_DataObject', 'options');
-if (empty($options)) {
-    (new PEAR)->raiseError("\nERROR: could not read ini file\n\n", null, PEAR_ERROR_DIE);
-    exit;
-}
-set_time_limit(0);
-
-// use debug level from file if set..
-DB_DataObject::debugLevel(isset($options['debug']) ? $options['debug'] : 1);
-
-$generator = new DB_DataObject_Generator;
-$generator->start();

extlib/DB/dbase.php

@@ -1,531 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's dbase extension
- * for interacting with dBase databases
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-//require_once 'DB/common.php';
-require_once 'common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's dbase extension
- * for interacting with dBase databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- */
-class DB_dbase extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    public $phptype = 'dbase';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    public $dbsyntax = 'dbase';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    public $features = array(
-        'limit' => false,
-        'new_link' => false,
-        'numrows' => true,
-        'pconnect' => false,
-        'prepare' => false,
-        'ssl' => false,
-        'transactions' => false,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    public $errorcode_map = array();
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    public $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    public $dsn = array();
-
-
-    /**
-     * A means of emulating result resources
-     * @var array
-     */
-    public $res_row = array();
-
-    /**
-     * The quantity of results so far
-     *
-     * For emulating result resources.
-     *
-     * @var integer
-     */
-    public $result = 0;
-
-    /**
-     * Maps dbase data type id's to human readable strings
-     *
-     * The human readable values are based on the output of PHP's
-     * dbase_get_header_info() function.
-     *
-     * @var array
-     * @since Property available since Release 1.7.0
-     */
-    public $types = array(
-        'C' => 'character',
-        'D' => 'date',
-        'L' => 'boolean',
-        'M' => 'memo',
-        'N' => 'number',
-    );
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>parent::__construct()</kbd>
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database and create it if it doesn't exist
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's dbase driver supports the following extra DSN options:
-     *   + mode    An integer specifying the read/write mode to use
-     *              (0 = read only, 1 = write only, 2 = read/write).
-     *              Available since PEAR DB 1.7.0.
-     *   + fields  An array of arrays that PHP's dbase_create() function needs
-     *              to create a new database.  This information is used if the
-     *              dBase file specified in the "database" segment of the DSN
-     *              does not exist.  For more info, see the PHP manual's
-     *              {@link http://php.net/dbase_create dbase_create()} page.
-     *              Available since PEAR DB 1.7.0.
-     *
-     * Example of how to connect and establish a new dBase file if necessary:
-     * <code>
-     * require_once 'DB.php';
-     *
-     * $dsn = array(
-     *     'phptype'  => 'dbase',
-     *     'database' => '/path/and/name/of/dbase/file',
-     *     'mode'     => 2,
-     *     'fields'   => array(
-     *         array('a', 'N', 5, 0),
-     *         array('b', 'C', 40),
-     *         array('c', 'C', 255),
-     *         array('d', 'C', 20),
-     *     ),
-     * );
-     * $options = array(
-     *     'debug'       => 2,
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     *
-     * $db = DB::connect($dsn, $options);
-     * if ((new PEAR)->isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param array $dsn the data source name
-     * @param bool $persistent should the connection be persistent?
-     *
-     * @return int|object
-     */
-    public function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('dbase')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        /*
-         * Turn track_errors on for entire script since $php_errormsg
-         * is the only way to find errors from the dbase extension.
-         */
-        @ini_set('track_errors', 1);
-        $php_errormsg = '';
-
-        if (!file_exists($dsn['database'])) {
-            $this->dsn['mode'] = 2;
-            if (empty($dsn['fields']) || !is_array($dsn['fields'])) {
-                return $this->raiseError(
-                    DB_ERROR_CONNECT_FAILED,
-                    null,
-                    null,
-                    null,
-                    'the dbase file does not exist and '
-                    . 'it could not be created because '
-                    . 'the "fields" element of the DSN '
-                    . 'is not properly set'
-                );
-            }
-            $this->connection = @dbase_create(
-                $dsn['database'],
-                $dsn['fields']
-            );
-            if (!$this->connection) {
-                return $this->raiseError(
-                    DB_ERROR_CONNECT_FAILED,
-                    null,
-                    null,
-                    null,
-                    'the dbase file does not exist and '
-                    . 'the attempt to create it failed: '
-                    . $php_errormsg
-                );
-            }
-        } else {
-            if (!isset($this->dsn['mode'])) {
-                $this->dsn['mode'] = 0;
-            }
-            $this->connection = @dbase_open(
-                $dsn['database'],
-                $this->dsn['mode']
-            );
-            if (!$this->connection) {
-                return $this->raiseError(
-                    DB_ERROR_CONNECT_FAILED,
-                    null,
-                    null,
-                    null,
-                    $php_errormsg
-                );
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    public function disconnect()
-    {
-        $ret = @dbase_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ &query()
-
-    public function &query($query = null)
-    {
-        // emulate result resources
-        $this->res_row[(int)$this->result] = 0;
-        $tmp = new DB_result($this, $this->result++);
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result the query result resource
-     * @param array $arr the referenced array to put the data in
-     * @param int $fetchmode how the resulting array should be indexed
-     * @param int $rownum the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    public function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum === null) {
-            $rownum = $this->res_row[(int)$result]++;
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @dbase_get_record_with_names($this->connection, $rownum);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @dbase_get_record($this->connection, $rownum);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set.
-     *
-     * This method is a no-op for dbase, as there aren't result resources in
-     * the same sense as most other database backends.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    public function freeResult($result)
-    {
-        return true;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param $foo
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    public function numCols($foo)
-    {
-        return @dbase_numfields($this->connection);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param $foo
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    public function numRows($foo)
-    {
-        return @dbase_numrecords($this->connection);
-    }
-
-    // }}}
-    // {{{ quoteBoolean()
-
-    /**
-     * Formats a boolean value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param boolean the boolean value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    public function quoteBoolean($boolean)
-    {
-        return $boolean ? 'T' : 'F';
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about the current database
-     *
-     * @param mixed $result THIS IS UNUSED IN DBASE.  The current database
-     *                       is examined regardless of what is provided here.
-     * @param int $mode a valid tableInfo mode
-     *
-     * @return array|object
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.7.0
-     */
-    public function tableInfo($result = null, $mode = null)
-    {
-        if (function_exists('dbase_get_header_info')) {
-            $id = @dbase_get_header_info($this->connection);
-            if (!$id && $php_errormsg) {
-                return $this->raiseError(
-                    DB_ERROR,
-                    null,
-                    null,
-                    null,
-                    $php_errormsg
-                );
-            }
-        } else {
-            /*
-             * This segment for PHP 4 is loosely based on code by
-             * Hadi Rusiah <deegos@yahoo.com> in the comments on
-             * the dBase reference page in the PHP manual.
-             */
-            $db = @fopen($this->dsn['database'], 'r');
-            if (!$db) {
-                return $this->raiseError(
-                    DB_ERROR_CONNECT_FAILED,
-                    null,
-                    null,
-                    null,
-                    $php_errormsg
-                );
-            }
-
-            $id = array();
-            $i = 0;
-
-            $line = fread($db, 32);
-            while (!feof($db)) {
-                $line = fread($db, 32);
-                if (substr($line, 0, 1) == chr(13)) {
-                    break;
-                } else {
-                    $pos = strpos(substr($line, 0, 10), chr(0));
-                    $pos = ($pos == 0 ? 10 : $pos);
-                    $id[$i] = array(
-                        'name' => substr($line, 0, $pos),
-                        'type' => $this->types[substr($line, 11, 1)],
-                        'length' => ord(substr($line, 16, 1)),
-                        'precision' => ord(substr($line, 17, 1)),
-                    );
-                }
-                $i++;
-            }
-
-            fclose($db);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $res = array();
-        $count = count($id);
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $this->dsn['database'],
-                'name' => $case_func($id[$i]['name']),
-                'type' => $id[$i]['type'],
-                'len' => $id[$i]['length'],
-                'flags' => ''
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        return $res;
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/DB/fbsql.php

@@ -1,795 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's fbsql extension
- * for interacting with FrontBase databases
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Frank M. Kromann <frank@frontbase.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-//require_once 'DB/common.php';
-require_once 'common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's fbsql extension
- * for interacting with FrontBase databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Frank M. Kromann <frank@frontbase.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- * @since      Class functional since Release 1.7.0
- */
-class DB_fbsql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    public $phptype = 'fbsql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    public $dbsyntax = 'fbsql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    public $features = array(
-        'limit' => 'alter',
-        'new_link' => false,
-        'numrows' => true,
-        'pconnect' => true,
-        'prepare' => false,
-        'ssl' => false,
-        'transactions' => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    public $errorcode_map = array(
-        22 => DB_ERROR_SYNTAX,
-        85 => DB_ERROR_ALREADY_EXISTS,
-        108 => DB_ERROR_SYNTAX,
-        116 => DB_ERROR_NOSUCHTABLE,
-        124 => DB_ERROR_VALUE_COUNT_ON_ROW,
-        215 => DB_ERROR_NOSUCHFIELD,
-        217 => DB_ERROR_INVALID_NUMBER,
-        226 => DB_ERROR_NOSUCHFIELD,
-        231 => DB_ERROR_INVALID,
-        239 => DB_ERROR_TRUNCATED,
-        251 => DB_ERROR_SYNTAX,
-        266 => DB_ERROR_NOT_FOUND,
-        357 => DB_ERROR_CONSTRAINT_NOT_NULL,
-        358 => DB_ERROR_CONSTRAINT,
-        360 => DB_ERROR_CONSTRAINT,
-        361 => DB_ERROR_CONSTRAINT,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    public $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    public $dsn = array();
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>parent::__construct()</kbd>
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * @param array $dsn the data source name
-     * @param bool $persistent should the connection be persistent?
-     *
-     * @return int|object
-     */
-    public function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('fbsql')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $params = array(
-            $dsn['hostspec'] ? $dsn['hostspec'] : 'localhost',
-            $dsn['username'] ? $dsn['username'] : null,
-            $dsn['password'] ? $dsn['password'] : null,
-        );
-
-        $connect_function = $persistent ? 'fbsql_pconnect' : 'fbsql_connect';
-
-        $ini = ini_get('track_errors');
-        $php_errormsg = '';
-        if ($ini) {
-            $this->connection = @call_user_func_array(
-                $connect_function,
-                $params
-            );
-        } else {
-            @ini_set('track_errors', 1);
-            $this->connection = @call_user_func_array(
-                $connect_function,
-                $params
-            );
-            @ini_set('track_errors', $ini);
-        }
-
-        if (!$this->connection) {
-            return $this->raiseError(
-                DB_ERROR_CONNECT_FAILED,
-                null,
-                null,
-                null,
-                $php_errormsg
-            );
-        }
-
-        if ($dsn['database']) {
-            if (!@fbsql_select_db($dsn['database'], $this->connection)) {
-                return $this->fbsqlRaiseError();
-            }
-        }
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_fbsql::errorNative(), DB_common::errorCode()
-     */
-    public function fbsqlRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            $errno = $this->errorCode(fbsql_errno($this->connection));
-        }
-        return $this->raiseError(
-            $errno,
-            null,
-            null,
-            null,
-            @fbsql_error($this->connection)
-        );
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    public function disconnect()
-    {
-        $ret = @fbsql_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    public function simpleQuery($query)
-    {
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        $result = @fbsql_query("$query;", $this->connection);
-        if (!$result) {
-            return $this->fbsqlRaiseError();
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        if ($this->_checkManip($query)) {
-            return DB_OK;
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Move the internal fbsql result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    public function nextResult($result)
-    {
-        return @fbsql_next_result($result);
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result the query result resource
-     * @param array $arr the referenced array to put the data in
-     * @param int $fetchmode how the resulting array should be indexed
-     * @param int $rownum the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    public function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@fbsql_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @fbsql_fetch_array($result, FBSQL_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @fbsql_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    public function freeResult($result)
-    {
-        return is_resource($result) ? fbsql_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    public function autoCommit($onoff = false)
-    {
-        if ($onoff) {
-            $this->query("SET COMMIT TRUE");
-        } else {
-            $this->query("SET COMMIT FALSE");
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    public function commit()
-    {
-        @fbsql_commit($this->connection);
-        return 0;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    public function rollback()
-    {
-        @fbsql_rollback($this->connection);
-        return 0;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numCols()
-     */
-    public function numCols($result)
-    {
-        $cols = @fbsql_num_fields($result);
-        if (!$cols) {
-            return $this->fbsqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numRows()
-     */
-    public function numRows($result)
-    {
-        $rows = @fbsql_num_rows($result);
-        if ($rows === null) {
-            return $this->fbsqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    public function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            $result = @fbsql_affected_rows($this->connection);
-        } else {
-            $result = 0;
-        }
-        return $result;
-    }
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int|object
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_fbsql::createSequence(), DB_fbsql::dropSequence()
-     */
-    public function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        do {
-            $repeat = 0;
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query('SELECT UNIQUE FROM ' . $seqname);
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = 1;
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $result;
-                }
-            } else {
-                $repeat = 0;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->fbsqlRaiseError();
-        }
-        $result->fetchInto($tmp, DB_FETCHMODE_ORDERED);
-        return $tmp[0];
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_fbsql::nextID(), DB_fbsql::dropSequence()
-     */
-    public function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $res = $this->query('CREATE TABLE ' . $seqname
-            . ' (id INTEGER NOT NULL,'
-            . ' PRIMARY KEY(id))');
-        if ($res) {
-            $res = $this->query('SET UNIQUE = 0 FOR ' . $seqname);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_fbsql::nextID(), DB_fbsql::createSequence()
-     */
-    public function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name)
-            . ' RESTRICT');
-    }
-
-    // }}}
-    // {{{ quoteBoolean()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query the query to modify
-     * @param int $from the row to start to fetching (0 = the first row)
-     * @param int $count the numbers of rows to fetch
-     * @param mixed $params array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    public function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        if (DB::isManip($query) || $this->_next_query_manip) {
-            return preg_replace(
-                '/^([\s(])*SELECT/i',
-                "\\1SELECT TOP($count)",
-                $query
-            );
-        } else {
-            return preg_replace(
-                '/([\s(])*SELECT/i',
-                "\\1SELECT TOP($from, $count)",
-                $query
-            );
-        }
-    }
-
-    // }}}
-    // {{{ quoteFloat()
-
-    /**
-     * Formats a boolean value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param boolean the boolean value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    public function quoteBoolean($boolean)
-    {
-        return $boolean ? 'TRUE' : 'FALSE';
-    }
-
-    // }}}
-    // {{{ fbsqlRaiseError()
-
-    /**
-     * Formats a float value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param float the float value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    public function quoteFloat($float)
-    {
-        return $this->escapeSimple(str_replace(',', '.', strval(floatval($float))));
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code
-     */
-    public function errorNative()
-    {
-        return @fbsql_errno($this->connection);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string $result DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int $mode a valid tableInfo mode
-     *
-     * @return array|object
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    public function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @fbsql_list_fields(
-                $this->dsn['database'],
-                $result,
-                $this->connection
-            );
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->fbsqlRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @fbsql_num_fields($id);
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $case_func(@fbsql_field_table($id, $i)),
-                'name' => $case_func(@fbsql_field_name($id, $i)),
-                'type' => @fbsql_field_type($id, $i),
-                'len' => @fbsql_field_len($id, $i),
-                'flags' => @fbsql_field_flags($id, $i),
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @fbsql_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    public function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SELECT "table_name" FROM information_schema.tables'
-                    . ' t0, information_schema.schemata t1'
-                    . ' WHERE t0.schema_pk=t1.schema_pk AND'
-                    . ' "table_type" = \'BASE TABLE\''
-                    . ' AND "schema_name" = current_schema';
-            case 'views':
-                return 'SELECT "table_name" FROM information_schema.tables'
-                    . ' t0, information_schema.schemata t1'
-                    . ' WHERE t0.schema_pk=t1.schema_pk AND'
-                    . ' "table_type" = \'VIEW\''
-                    . ' AND "schema_name" = current_schema';
-            case 'users':
-                return 'SELECT "user_name" from information_schema.users';
-            case 'functions':
-                return 'SELECT "routine_name" FROM'
-                    . ' information_schema.psm_routines'
-                    . ' t0, information_schema.schemata t1'
-                    . ' WHERE t0.schema_pk=t1.schema_pk'
-                    . ' AND "routine_kind"=\'FUNCTION\''
-                    . ' AND "schema_name" = current_schema';
-            case 'procedures':
-                return 'SELECT "routine_name" FROM'
-                    . ' information_schema.psm_routines'
-                    . ' t0, information_schema.schemata t1'
-                    . ' WHERE t0.schema_pk=t1.schema_pk'
-                    . ' AND "routine_kind"=\'PROCEDURE\''
-                    . ' AND "schema_name" = current_schema';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/DB/ifx.php

@@ -1,686 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's ifx extension
- * for interacting with Informix databases
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-//require_once 'DB/common.php';
-require_once 'common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's ifx extension
- * for interacting with Informix databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * More info on Informix errors can be found at:
- * http://www.informix.com/answers/english/ierrors.htm
- *
- * TODO:
- *   - set needed env Informix vars on connect
- *   - implement native prepare/execute
- *
- * @category   Database
- * @package    DB
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- */
-class DB_ifx extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    public $phptype = 'ifx';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    public $dbsyntax = 'ifx';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    public $features = array(
-        'limit' => 'emulate',
-        'new_link' => false,
-        'numrows' => 'emulate',
-        'pconnect' => true,
-        'prepare' => false,
-        'ssl' => false,
-        'transactions' => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    public $errorcode_map = array(
-        '-201' => DB_ERROR_SYNTAX,
-        '-206' => DB_ERROR_NOSUCHTABLE,
-        '-217' => DB_ERROR_NOSUCHFIELD,
-        '-236' => DB_ERROR_VALUE_COUNT_ON_ROW,
-        '-239' => DB_ERROR_CONSTRAINT,
-        '-253' => DB_ERROR_SYNTAX,
-        '-268' => DB_ERROR_CONSTRAINT,
-        '-292' => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '-310' => DB_ERROR_ALREADY_EXISTS,
-        '-316' => DB_ERROR_ALREADY_EXISTS,
-        '-319' => DB_ERROR_NOT_FOUND,
-        '-329' => DB_ERROR_NODBSELECTED,
-        '-346' => DB_ERROR_CONSTRAINT,
-        '-386' => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '-391' => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '-554' => DB_ERROR_SYNTAX,
-        '-691' => DB_ERROR_CONSTRAINT,
-        '-692' => DB_ERROR_CONSTRAINT,
-        '-703' => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '-1202' => DB_ERROR_DIVZERO,
-        '-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,
-        '-1213' => DB_ERROR_INVALID_NUMBER,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    public $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    public $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    public $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    public $transaction_opcount = 0;
-
-    /**
-     * The number of rows affected by a data manipulation query
-     * @var integer
-     * @access private
-     */
-    public $affected = 0;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>parent::__construct()</kbd>
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * @param array $dsn the data source name
-     * @param bool $persistent should the connection be persistent?
-     *
-     * @return int|object
-     */
-    public function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('informix') &&
-            !PEAR::loadExtension('Informix')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $dbhost = $dsn['hostspec'] ? '@' . $dsn['hostspec'] : '';
-        $dbname = $dsn['database'] ? $dsn['database'] . $dbhost : '';
-        $user = $dsn['username'] ? $dsn['username'] : '';
-        $pw = $dsn['password'] ? $dsn['password'] : '';
-
-        $connect_function = $persistent ? 'ifx_pconnect' : 'ifx_connect';
-
-        $this->connection = @$connect_function($dbname, $user, $pw);
-        if (!is_resource($this->connection)) {
-            return $this->ifxRaiseError(DB_ERROR_CONNECT_FAILED);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_ifx::errorNative(), DB_ifx::errorCode()
-     */
-    public function ifxRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            $errno = $this->errorCode(ifx_error());
-        }
-        return $this->raiseError(
-            $errno,
-            null,
-            null,
-            null,
-            $this->errorNative()
-        );
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Maps native error codes to DB's portable ones.
-     *
-     * Requires that the DB implementation's constructor fills
-     * in the <var>$errorcode_map</var> property.
-     *
-     * @param string $nativecode error code returned by the database
-     * @return int a portable DB error code, or DB_ERROR if this DB
-     * implementation has no mapping for the given error code.
-     */
-    public function errorCode($nativecode)
-    {
-        if (preg_match('/SQLCODE=(.*)]/', $nativecode, $match)) {
-            $code = $match[1];
-            if (isset($this->errorcode_map[$code])) {
-                return $this->errorcode_map[$code];
-            }
-        }
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Gets the DBMS' native error code and message produced by the last query
-     *
-     * @return string  the DBMS' error code and message
-     */
-    public function errorNative()
-    {
-        return @ifx_error() . ' ' . @ifx_errormsg();
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    public function disconnect()
-    {
-        $ret = @ifx_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    public function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        $this->affected = null;
-        if (preg_match('/(SELECT|EXECUTE)/i', $query)) {    //TESTME: Use !DB::isManip()?
-            // the scroll is needed for fetching absolute row numbers
-            // in a select query result
-            $result = @ifx_query($query, $this->connection, IFX_SCROLL);
-        } else {
-            if (!$this->autocommit && $ismanip) {
-                if ($this->transaction_opcount == 0) {
-                    $result = @ifx_query('BEGIN WORK', $this->connection);
-                    if (!$result) {
-                        return $this->ifxRaiseError();
-                    }
-                }
-                $this->transaction_opcount++;
-            }
-            $result = @ifx_query($query, $this->connection);
-        }
-        if (!$result) {
-            return $this->ifxRaiseError();
-        }
-        $this->affected = @ifx_affected_rows($result);
-        // Determine which queries should return data, and which
-        // should return an error code only.
-        if (preg_match('/(SELECT|EXECUTE)/i', $query)) {
-            return $result;
-        }
-        // XXX Testme: free results inside a transaction
-        // may cause to stop it and commit the work?
-
-        // Result has to be freed even with a insert or update
-        @ifx_free_result($result);
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Move the internal ifx result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    public function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    public function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            return $this->affected;
-        } else {
-            return 0;
-        }
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result the query result resource
-     * @param array $arr the referenced array to put the data in
-     * @param int $fetchmode how the resulting array should be indexed
-     * @param int $rownum the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    public function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if (($rownum !== null) && ($rownum < 0)) {
-            return null;
-        }
-        if ($rownum === null) {
-            /*
-             * Even though fetch_row() should return the next row  if
-             * $rownum is null, it doesn't in all cases.  Bug 598.
-             */
-            $rownum = 'NEXT';
-        } else {
-            // Index starts at row 1, unlike most DBMS's starting at 0.
-            $rownum++;
-        }
-        if (!$arr = @ifx_fetch_row($result, $rownum)) {
-            return null;
-        }
-        if ($fetchmode !== DB_FETCHMODE_ASSOC) {
-            $i = 0;
-            $order = array();
-            foreach ($arr as $val) {
-                $order[$i++] = $val;
-            }
-            $arr = $order;
-        } elseif ($fetchmode == DB_FETCHMODE_ASSOC &&
-            $this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $arr = array_change_key_case($arr, CASE_LOWER);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numCols()
-     */
-    public function numCols($result)
-    {
-        if (!$cols = @ifx_num_fields($result)) {
-            return $this->ifxRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    public function freeResult($result)
-    {
-        return is_resource($result) ? ifx_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ ifxRaiseError()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    public function autoCommit($onoff = true)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int|object
-     */
-    public function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            $result = @ifx_query('COMMIT WORK', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->ifxRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int|object
-     */
-    public function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            $result = @ifx_query('ROLLBACK WORK', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->ifxRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' if <var>$result</var> is a table name.
-     *
-     * If analyzing a query result and the result has duplicate field names,
-     * an error will be raised saying
-     * <samp>can't distinguish duplicate field names</samp>.
-     *
-     * @param object|string $result DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int $mode a valid tableInfo mode
-     *
-     * @return array|object
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.6.0
-     */
-    public function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @ifx_query(
-                "SELECT * FROM $result WHERE 1=0",
-                $this->connection
-            );
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->ifxRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        $flds = @ifx_fieldproperties($id);
-        $count = @ifx_num_fields($id);
-
-        if (count($flds) != $count) {
-            return $this->raiseError("can't distinguish duplicate field names");
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $i = 0;
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        foreach ($flds as $key => $value) {
-            $props = explode(';', $value);
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name' => $case_func($key),
-                'type' => $props[0],
-                'len' => $props[1],
-                'flags' => $props[4] == 'N' ? 'not_null' : '',
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-            $i++;
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @ifx_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    public function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SELECT tabname FROM systables WHERE tabid >= 100';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/DB/msql.php

@@ -1,845 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's msql extension
- * for interacting with Mini SQL databases
- *
- * PHP's mSQL extension did weird things with NULL values prior to PHP
- * 4.3.11 and 5.0.4.  Make sure your version of PHP meets or exceeds
- * those versions.
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-//require_once 'DB/common.php';
-require_once 'common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's msql extension
- * for interacting with Mini SQL databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * PHP's mSQL extension did weird things with NULL values prior to PHP
- * 4.3.11 and 5.0.4.  Make sure your version of PHP meets or exceeds
- * those versions.
- *
- * @category   Database
- * @package    DB
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- * @since      Class not functional until Release 1.7.0
- */
-class DB_msql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    public $phptype = 'msql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    public $dbsyntax = 'msql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    public $features = array(
-        'limit' => 'emulate',
-        'new_link' => false,
-        'numrows' => true,
-        'pconnect' => true,
-        'prepare' => false,
-        'ssl' => false,
-        'transactions' => false,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    public $errorcode_map = array();
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    public $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    public $dsn = array();
-
-
-    /**
-     * The query result resource created by PHP
-     *
-     * Used to make affectedRows() work.  Only contains the result for
-     * data manipulation queries.  Contains false for other queries.
-     *
-     * @var resource
-     * @access private
-     */
-    public $_result;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>parent::__construct()</kbd>
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * Example of how to connect:
-     * <code>
-     * require_once 'DB.php';
-     *
-     * // $dsn = 'msql://hostname/dbname';  // use a TCP connection
-     * $dsn = 'msql:///dbname';             // use a socket
-     * $options = array(
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     *
-     * $db = DB::connect($dsn, $options);
-     * if ((new PEAR)->isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param array $dsn the data source name
-     * @param bool $persistent should the connection be persistent?
-     *
-     * @return int|object
-     */
-    public function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('msql')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $params = array();
-        if ($dsn['hostspec']) {
-            $params[] = $dsn['port']
-                ? $dsn['hostspec'] . ',' . $dsn['port']
-                : $dsn['hostspec'];
-        }
-
-        $connect_function = $persistent ? 'msql_pconnect' : 'msql_connect';
-
-        $ini = ini_get('track_errors');
-        $php_errormsg = '';
-        if ($ini) {
-            $this->connection = @call_user_func_array(
-                $connect_function,
-                $params
-            );
-        } else {
-            @ini_set('track_errors', 1);
-            $this->connection = @call_user_func_array(
-                $connect_function,
-                $params
-            );
-            @ini_set('track_errors', $ini);
-        }
-
-        if (!$this->connection) {
-            if (($err = @msql_error()) != '') {
-                return $this->raiseError(
-                    DB_ERROR_CONNECT_FAILED,
-                    null,
-                    null,
-                    null,
-                    $err
-                );
-            } else {
-                return $this->raiseError(
-                    DB_ERROR_CONNECT_FAILED,
-                    null,
-                    null,
-                    null,
-                    $php_errormsg
-                );
-            }
-        }
-
-        if (!@msql_select_db($dsn['database'], $this->connection)) {
-            return $this->msqlRaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_msql::errorNative(), DB_msql::errorCode()
-     */
-    public function msqlRaiseError($errno = null)
-    {
-        $native = $this->errorNative();
-        if ($errno === null) {
-            $errno = $this->errorCode($native);
-        }
-        return $this->raiseError($errno, null, null, null, $native);
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Gets the DBMS' native error message produced by the last query
-     *
-     * @return string  the DBMS' error message
-     */
-    public function errorNative()
-    {
-        return @msql_error();
-    }
-
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Determines PEAR::DB error code from the database's text error message
-     *
-     * @param string $errormsg the error message returned from the database
-     *
-     * @return integer  the error number from a DB_ERROR* constant
-     */
-    public function errorCode($errormsg)
-    {
-        static $error_regexps;
-
-        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
-        // this hack to work around it, per bug #9599.
-        $errormsg = preg_replace('/^msql[a-z_]+\(\): /', '', $errormsg);
-
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/^Access to database denied/i'
-                => DB_ERROR_ACCESS_VIOLATION,
-                '/^Bad index name/i'
-                => DB_ERROR_ALREADY_EXISTS,
-                '/^Bad order field/i'
-                => DB_ERROR_SYNTAX,
-                '/^Bad type for comparison/i'
-                => DB_ERROR_SYNTAX,
-                '/^Can\'t perform LIKE on/i'
-                => DB_ERROR_SYNTAX,
-                '/^Can\'t use TEXT fields in LIKE comparison/i'
-                => DB_ERROR_SYNTAX,
-                '/^Couldn\'t create temporary table/i'
-                => DB_ERROR_CANNOT_CREATE,
-                '/^Error creating table file/i'
-                => DB_ERROR_CANNOT_CREATE,
-                '/^Field .* cannot be null$/i'
-                => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/^Index (field|condition) .* cannot be null$/i'
-                => DB_ERROR_SYNTAX,
-                '/^Invalid date format/i'
-                => DB_ERROR_INVALID_DATE,
-                '/^Invalid time format/i'
-                => DB_ERROR_INVALID,
-                '/^Literal value for .* is wrong type$/i'
-                => DB_ERROR_INVALID_NUMBER,
-                '/^No Database Selected/i'
-                => DB_ERROR_NODBSELECTED,
-                '/^No value specified for field/i'
-                => DB_ERROR_VALUE_COUNT_ON_ROW,
-                '/^Non unique value for unique index/i'
-                => DB_ERROR_CONSTRAINT,
-                '/^Out of memory for temporary table/i'
-                => DB_ERROR_CANNOT_CREATE,
-                '/^Permission denied/i'
-                => DB_ERROR_ACCESS_VIOLATION,
-                '/^Reference to un-selected table/i'
-                => DB_ERROR_SYNTAX,
-                '/^syntax error/i'
-                => DB_ERROR_SYNTAX,
-                '/^Table .* exists$/i'
-                => DB_ERROR_ALREADY_EXISTS,
-                '/^Unknown database/i'
-                => DB_ERROR_NOSUCHDB,
-                '/^Unknown field/i'
-                => DB_ERROR_NOSUCHFIELD,
-                '/^Unknown (index|system variable)/i'
-                => DB_ERROR_NOT_FOUND,
-                '/^Unknown table/i'
-                => DB_ERROR_NOSUCHTABLE,
-                '/^Unqualified field/i'
-                => DB_ERROR_SYNTAX,
-            );
-        }
-
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    public function disconnect()
-    {
-        $ret = @msql_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    public function simpleQuery($query)
-    {
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        $result = @msql_query($query, $this->connection);
-        if (!$result) {
-            return $this->msqlRaiseError();
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        if ($this->_checkManip($query)) {
-            $this->_result = $result;
-            return DB_OK;
-        } else {
-            $this->_result = false;
-            return $result;
-        }
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Move the internal msql result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    public function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * PHP's mSQL extension did weird things with NULL values prior to PHP
-     * 4.3.11 and 5.0.4.  Make sure your version of PHP meets or exceeds
-     * those versions.
-     *
-     * @param resource $result the query result resource
-     * @param array $arr the referenced array to put the data in
-     * @param int $fetchmode how the resulting array should be indexed
-     * @param int $rownum the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    public function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@msql_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @msql_fetch_array($result, MSQL_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @msql_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affected()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    public function freeResult($result)
-    {
-        return is_resource($result) ? msql_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numCols()
-     */
-    public function numCols($result)
-    {
-        $cols = @msql_num_fields($result);
-        if (!$cols) {
-            return $this->msqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numRows()
-     */
-    public function numRows($result)
-    {
-        $rows = @msql_num_rows($result);
-        if ($rows === false) {
-            return $this->msqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    public function affectedRows()
-    {
-        if (!$this->_result) {
-            return 0;
-        }
-        return msql_affected_rows($this->_result);
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int|object
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_msql::createSequence(), DB_msql::dropSequence()
-     */
-    public function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $repeat = false;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("SELECT _seq FROM ${seqname}");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = true;
-                $this->pushErrorHandling(PEAR_ERROR_RETURN);
-                $result = $this->createSequence($seq_name);
-                $this->popErrorHandling();
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } else {
-                $repeat = false;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $arr = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        $result->free();
-        return $arr[0];
-    }
-
-    // }}}
-    // {{{ quoteFloat()
-
-    /**
-     * Creates a new sequence
-     *
-     * Also creates a new table to associate the sequence with.  Uses
-     * a separate table to ensure portability with other drivers.
-     *
-     * @param string $seq_name name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_msql::nextID(), DB_msql::dropSequence()
-     */
-    public function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $res = $this->query('CREATE TABLE ' . $seqname
-            . ' (id INTEGER NOT NULL)');
-        if (DB::isError($res)) {
-            return $res;
-        }
-        $res = $this->query("CREATE SEQUENCE ON ${seqname}");
-        return $res;
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_msql::nextID(), DB_msql::createSequence()
-     */
-    public function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ msqlRaiseError()
-
-    /**
-     * mSQL does not support delimited identifiers
-     *
-     * @param string $str the identifier name to be quoted
-     *
-     * @return object  a DB_Error object
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.7.0
-     */
-    public function quoteIdentifier($str)
-    {
-        return $this->raiseError(DB_ERROR_UNSUPPORTED);
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Formats a float value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param float the float value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    public function quoteFloat($float)
-    {
-        return $this->escapeSimple(str_replace(',', '.', strval(floatval($float))));
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * @param string $str the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.7.0
-     */
-    public function escapeSimple($str)
-    {
-        return addslashes($str);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string $result DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int $mode a valid tableInfo mode
-     *
-     * @return array|object
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::setOption()
-     */
-    public function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @msql_query(
-                "SELECT * FROM $result",
-                $this->connection
-            );
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->raiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @msql_num_fields($id);
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $tmp = @msql_fetch_field($id);
-
-            $flags = '';
-            if ($tmp->not_null) {
-                $flags .= 'not_null ';
-            }
-            if ($tmp->unique) {
-                $flags .= 'unique_key ';
-            }
-            $flags = trim($flags);
-
-            $res[$i] = array(
-                'table' => $case_func($tmp->table),
-                'name' => $case_func($tmp->name),
-                'type' => $tmp->type,
-                'len' => msql_field_len($id, $i),
-                'flags' => $flags,
-            );
-
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @msql_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtain a list of a given type of objects
-     *
-     * @param string $type the kind of objects you want to retrieve
-     *
-     * @return array|object
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    public function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'databases':
-                $id = @msql_list_dbs($this->connection);
-                break;
-            case 'tables':
-                $id = @msql_list_tables(
-                    $this->dsn['database'],
-                    $this->connection
-                );
-                break;
-            default:
-                return null;
-        }
-        if (!$id) {
-            return $this->msqlRaiseError();
-        }
-        $out = array();
-        while ($row = @msql_fetch_row($id)) {
-            $out[] = $row[0];
-        }
-        return $out;
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/DB/mssql.php

@@ -1,994 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's mssql extension
- * for interacting with Microsoft SQL Server databases
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-//require_once 'DB/common.php';
-require_once 'common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's mssql extension
- * for interacting with Microsoft SQL Server databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * DB's mssql driver is only for Microsfoft SQL Server databases.
- *
- * If you're connecting to a Sybase database, you MUST specify "sybase"
- * as the "phptype" in the DSN.
- *
- * This class only works correctly if you have compiled PHP using
- * --with-mssql=[dir_to_FreeTDS].
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- */
-class DB_mssql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    public $phptype = 'mssql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    public $dbsyntax = 'mssql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    public $features = array(
-        'limit' => 'emulate',
-        'new_link' => false,
-        'numrows' => true,
-        'pconnect' => true,
-        'prepare' => false,
-        'ssl' => false,
-        'transactions' => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    // XXX Add here error codes ie: 'S100E' => DB_ERROR_SYNTAX
-    public $errorcode_map = array(
-        102 => DB_ERROR_SYNTAX,
-        110 => DB_ERROR_VALUE_COUNT_ON_ROW,
-        155 => DB_ERROR_NOSUCHFIELD,
-        156 => DB_ERROR_SYNTAX,
-        170 => DB_ERROR_SYNTAX,
-        207 => DB_ERROR_NOSUCHFIELD,
-        208 => DB_ERROR_NOSUCHTABLE,
-        245 => DB_ERROR_INVALID_NUMBER,
-        319 => DB_ERROR_SYNTAX,
-        321 => DB_ERROR_NOSUCHFIELD,
-        325 => DB_ERROR_SYNTAX,
-        336 => DB_ERROR_SYNTAX,
-        515 => DB_ERROR_CONSTRAINT_NOT_NULL,
-        547 => DB_ERROR_CONSTRAINT,
-        1018 => DB_ERROR_SYNTAX,
-        1035 => DB_ERROR_SYNTAX,
-        1913 => DB_ERROR_ALREADY_EXISTS,
-        2209 => DB_ERROR_SYNTAX,
-        2223 => DB_ERROR_SYNTAX,
-        2248 => DB_ERROR_SYNTAX,
-        2256 => DB_ERROR_SYNTAX,
-        2257 => DB_ERROR_SYNTAX,
-        2627 => DB_ERROR_CONSTRAINT,
-        2714 => DB_ERROR_ALREADY_EXISTS,
-        3607 => DB_ERROR_DIVZERO,
-        3701 => DB_ERROR_NOSUCHTABLE,
-        7630 => DB_ERROR_SYNTAX,
-        8134 => DB_ERROR_DIVZERO,
-        9303 => DB_ERROR_SYNTAX,
-        9317 => DB_ERROR_SYNTAX,
-        9318 => DB_ERROR_SYNTAX,
-        9331 => DB_ERROR_SYNTAX,
-        9332 => DB_ERROR_SYNTAX,
-        15253 => DB_ERROR_SYNTAX,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    public $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    public $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    public $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    public $transaction_opcount = 0;
-
-    /**
-     * The database specified in the DSN
-     *
-     * It's a fix to allow calls to different databases in the same script.
-     *
-     * @var string
-     * @access private
-     */
-    public $_db = null;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>parent::__construct()</kbd>
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * @param array $dsn the data source name
-     * @param bool $persistent should the connection be persistent?
-     *
-     * @return int|object
-     */
-    public function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('mssql') && !PEAR::loadExtension('sybase')
-            && !PEAR::loadExtension('sybase_ct')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $params = array(
-            $dsn['hostspec'] ? $dsn['hostspec'] : 'localhost',
-            $dsn['username'] ? $dsn['username'] : null,
-            $dsn['password'] ? $dsn['password'] : null,
-        );
-        if ($dsn['port']) {
-            $params[0] .= ((substr(PHP_OS, 0, 3) == 'WIN') ? ',' : ':')
-                . $dsn['port'];
-        }
-
-        $connect_function = $persistent ? 'mssql_pconnect' : 'mssql_connect';
-
-        $this->connection = @call_user_func_array($connect_function, $params);
-
-        if (!$this->connection) {
-            return $this->raiseError(
-                DB_ERROR_CONNECT_FAILED,
-                null,
-                null,
-                null,
-                @mssql_get_last_message()
-            );
-        }
-        if ($dsn['database']) {
-            if (!@mssql_select_db($dsn['database'], $this->connection)) {
-                return $this->raiseError(
-                    DB_ERROR_NODBSELECTED,
-                    null,
-                    null,
-                    null,
-                    @mssql_get_last_message()
-                );
-            }
-            $this->_db = $dsn['database'];
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    public function disconnect()
-    {
-        $ret = @mssql_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    public function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        if (!@mssql_select_db($this->_db, $this->connection)) {
-            return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-        }
-        $query = $this->modifyQuery($query);
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @mssql_query('BEGIN TRAN', $this->connection);
-                if (!$result) {
-                    return $this->mssqlRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        $result = @mssql_query($query, $this->connection);
-        if (!$result) {
-            return $this->mssqlRaiseError();
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        return $ismanip ? DB_OK : $result;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param null $code
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_mssql::errorNative(), DB_mssql::errorCode()
-     */
-    public function mssqlRaiseError($code = null)
-    {
-        $message = @mssql_get_last_message();
-        if (!$code) {
-            $code = $this->errorNative();
-        }
-        return $this->raiseError(
-            $this->errorCode($code, $message),
-            null,
-            null,
-            null,
-            "$code - $message"
-        );
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code
-     */
-    public function errorNative()
-    {
-        $res = @mssql_query('select @@ERROR as ErrorCode', $this->connection);
-        if (!$res) {
-            return DB_ERROR;
-        }
-        $row = @mssql_fetch_row($res);
-        return $row[0];
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Determines PEAR::DB error code from mssql's native codes.
-     *
-     * If <var>$nativecode</var> isn't known yet, it will be looked up.
-     *
-     * @param mixed $nativecode mssql error code, if known
-     * @param string $msg
-     * @return integer  an error number from a DB error constant
-     * @see errorNative()
-     */
-    public function errorCode($nativecode = null, $msg = '')
-    {
-        if (!$nativecode) {
-            $nativecode = $this->errorNative();
-        }
-        if (isset($this->errorcode_map[$nativecode])) {
-            if ($nativecode == 3701
-                && preg_match('/Cannot drop the index/i', $msg)) {
-                return DB_ERROR_NOT_FOUND;
-            }
-            return $this->errorcode_map[$nativecode];
-        } else {
-            return DB_ERROR;
-        }
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Move the internal mssql result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    public function nextResult($result)
-    {
-        return @mssql_next_result($result);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result the query result resource
-     * @param array $arr the referenced array to put the data in
-     * @param int $fetchmode how the resulting array should be indexed
-     * @param int $rownum the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    public function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@mssql_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @mssql_fetch_assoc($result);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @mssql_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    public function freeResult($result)
-    {
-        return is_resource($result) ? mssql_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numCols()
-     */
-    public function numCols($result)
-    {
-        $cols = @mssql_num_fields($result);
-        if (!$cols) {
-            return $this->mssqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numRows()
-     */
-    public function numRows($result)
-    {
-        $rows = @mssql_num_rows($result);
-        if ($rows === false) {
-            return $this->mssqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    public function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int|object
-     */
-    public function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            if (!@mssql_select_db($this->_db, $this->connection)) {
-                return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $result = @mssql_query('COMMIT TRAN', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mssqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int|object
-     */
-    public function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            if (!@mssql_select_db($this->_db, $this->connection)) {
-                return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $result = @mssql_query('ROLLBACK TRAN', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mssqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int|object
-     */
-    public function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            $res = @mssql_query('select @@rowcount', $this->connection);
-            if (!$res) {
-                return $this->mssqlRaiseError();
-            }
-            $ar = @mssql_fetch_row($res);
-            if (!$ar) {
-                $result = 0;
-            } else {
-                @mssql_free_result($res);
-                $result = $ar[0];
-            }
-        } else {
-            $result = 0;
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int|object
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_mssql::createSequence(), DB_mssql::dropSequence()
-     */
-    public function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        if (!@mssql_select_db($this->_db, $this->connection)) {
-            return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-        }
-        $repeat = 0;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("INSERT INTO $seqname (vapor) VALUES (0)");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                ($result->getCode() == DB_ERROR || $result->getCode() == DB_ERROR_NOSUCHTABLE)) {
-                $repeat = 1;
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } elseif (!DB::isError($result)) {
-                $result = $this->query("SELECT IDENT_CURRENT('$seqname')");
-                if (DB::isError($result)) {
-                    /* Fallback code for MS SQL Server 7.0, which doesn't have
-                     * IDENT_CURRENT. This is *not* safe for concurrent
-                     * requests, and really, if you're using it, you're in a
-                     * world of hurt. Nevertheless, it's here to ensure BC. See
-                     * bug #181 for the gory details.*/
-                    $result = $this->query("SELECT @@IDENTITY FROM $seqname");
-                }
-                $repeat = 0;
-            } else {
-                $repeat = false;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $result = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        return $result[0];
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_mssql::nextID(), DB_mssql::dropSequence()
-     */
-    public function createSequence($seq_name)
-    {
-        return $this->query('CREATE TABLE '
-            . $this->getSequenceName($seq_name)
-            . ' ([id] [int] IDENTITY (1, 1) NOT NULL,'
-            . ' [vapor] [int] NULL)');
-    }
-
-    // }}}
-    // {{{ mssqlRaiseError()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_mssql::nextID(), DB_mssql::createSequence()
-     */
-    public function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Escapes a string in a manner suitable for SQL Server.
-     *
-     * @param string $str the string to be escaped
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    public function escapeSimple($str)
-    {
-        return str_replace(
-            array("'", "\\\r\n", "\\\n"),
-            array("''", "\\\\\r\n\r\n", "\\\\\n\n"),
-            $str
-        );
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * @param string $str identifier name to be quoted
-     *
-     * @return string  quoted identifier string
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.6.0
-     */
-    public function quoteIdentifier($str)
-    {
-        return '[' . str_replace(']', ']]', $str) . ']';
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
-     * is a table name.
-     *
-     * @param object|string $result DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int $mode a valid tableInfo mode
-     *
-     * @return array|object
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    public function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            if (!@mssql_select_db($this->_db, $this->connection)) {
-                return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $id = @mssql_query(
-                "SELECT * FROM $result WHERE 1=0",
-                $this->connection
-            );
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->mssqlRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @mssql_num_fields($id);
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            if ($got_string) {
-                $flags = $this->_mssql_field_flags(
-                    $result,
-                    @mssql_field_name($id, $i)
-                );
-                if (DB::isError($flags)) {
-                    return $flags;
-                }
-            } else {
-                $flags = '';
-            }
-
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name' => $case_func(@mssql_field_name($id, $i)),
-                'type' => @mssql_field_type($id, $i),
-                'len' => @mssql_field_length($id, $i),
-                'flags' => $flags,
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @mssql_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ _mssql_field_flags()
-
-    /**
-     * Get a column's flags
-     *
-     * Supports "not_null", "primary_key",
-     * "auto_increment" (mssql identity), "timestamp" (mssql timestamp),
-     * "unique_key" (mssql unique index, unique check or primary_key) and
-     * "multiple_key" (multikey index)
-     *
-     * mssql timestamp is NOT similar to the mysql timestamp so this is maybe
-     * not useful at all - is the behaviour of mysql_field_flags that primary
-     * keys are alway unique? is the interpretation of multiple_key correct?
-     *
-     * @param string $table the table name
-     * @param string $column the field name
-     *
-     * @return array|string
-     *
-     * @access private
-     * @author Joern Barthel <j_barthel@web.de>
-     */
-    public function _mssql_field_flags($table, $column)
-    {
-        static $tableName = null;
-        static $flags = array();
-
-        if ($table != $tableName) {
-            $flags = array();
-            $tableName = $table;
-
-            // get unique and primary keys
-            $res = $this->getAll("EXEC SP_HELPINDEX $table", DB_FETCHMODE_ASSOC);
-            if (DB::isError($res)) {
-                return $res;
-            }
-
-            foreach ($res as $val) {
-                $keys = explode(', ', $val['index_keys']);
-
-                if (sizeof($keys) > 1) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'multiple_key');
-                    }
-                }
-
-                if (strpos($val['index_description'], 'primary key')) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'primary_key');
-                    }
-                } elseif (strpos($val['index_description'], 'unique')) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'unique_key');
-                    }
-                }
-            }
-
-            // get auto_increment, not_null and timestamp
-            $res = $this->getAll("EXEC SP_COLUMNS $table", DB_FETCHMODE_ASSOC);
-            if (DB::isError($res)) {
-                return $res;
-            }
-
-            foreach ($res as $val) {
-                $val = array_change_key_case($val, CASE_LOWER);
-                if ($val['nullable'] == '0') {
-                    $this->_add_flag($flags[$val['column_name']], 'not_null');
-                }
-                if (strpos($val['type_name'], 'identity')) {
-                    $this->_add_flag($flags[$val['column_name']], 'auto_increment');
-                }
-                if (strpos($val['type_name'], 'timestamp')) {
-                    $this->_add_flag($flags[$val['column_name']], 'timestamp');
-                }
-            }
-        }
-
-        if (array_key_exists($column, $flags)) {
-            return (implode(' ', $flags[$column]));
-        }
-        return '';
-    }
-
-    // }}}
-    // {{{ _add_flag()
-
-    /**
-     * Adds a string to the flags array if the flag is not yet in there
-     * - if there is no flag present the array is created
-     *
-     * @param array  &$array the reference to the flag-array
-     * @param string $value the flag value
-     *
-     * @return void
-     *
-     * @access private
-     * @author Joern Barthel <j_barthel@web.de>
-     */
-    public function _add_flag(&$array, $value)
-    {
-        if (!is_array($array)) {
-            $array = array($value);
-        } elseif (!in_array($value, $array)) {
-            array_push($array, $value);
-        }
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    public function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return "SELECT name FROM sysobjects WHERE type = 'U'"
-                    . ' ORDER BY name';
-            case 'views':
-                return "SELECT name FROM sysobjects WHERE type = 'V'";
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/DB/odbc.php

@@ -1,889 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's odbc extension
- * for interacting with databases via ODBC connections
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-//require_once 'DB/common.php';
-require_once 'common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's odbc extension
- * for interacting with databases via ODBC connections
- *
- * These methods overload the ones declared in DB_common.
- *
- * More info on ODBC errors could be found here:
- * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/trblsql/tr_err_odbc_5stz.asp
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- */
-class DB_odbc extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    public $phptype = 'odbc';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    public $dbsyntax = 'sql92';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * NOTE: The feature set of the following drivers are different than
-     * the default:
-     *   + solid: 'transactions' = true
-     *   + navision: 'limit' = false
-     *
-     * @var array
-     */
-    public $features = array(
-        'limit' => 'emulate',
-        'new_link' => false,
-        'numrows' => true,
-        'pconnect' => true,
-        'prepare' => false,
-        'ssl' => false,
-        'transactions' => false,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    public $errorcode_map = array(
-        '01004' => DB_ERROR_TRUNCATED,
-        '07001' => DB_ERROR_MISMATCH,
-        '21S01' => DB_ERROR_VALUE_COUNT_ON_ROW,
-        '21S02' => DB_ERROR_MISMATCH,
-        '22001' => DB_ERROR_INVALID,
-        '22003' => DB_ERROR_INVALID_NUMBER,
-        '22005' => DB_ERROR_INVALID_NUMBER,
-        '22008' => DB_ERROR_INVALID_DATE,
-        '22012' => DB_ERROR_DIVZERO,
-        '23000' => DB_ERROR_CONSTRAINT,
-        '23502' => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '23503' => DB_ERROR_CONSTRAINT,
-        '23504' => DB_ERROR_CONSTRAINT,
-        '23505' => DB_ERROR_CONSTRAINT,
-        '24000' => DB_ERROR_INVALID,
-        '34000' => DB_ERROR_INVALID,
-        '37000' => DB_ERROR_SYNTAX,
-        '42000' => DB_ERROR_SYNTAX,
-        '42601' => DB_ERROR_SYNTAX,
-        'IM001' => DB_ERROR_UNSUPPORTED,
-        'S0000' => DB_ERROR_NOSUCHTABLE,
-        'S0001' => DB_ERROR_ALREADY_EXISTS,
-        'S0002' => DB_ERROR_NOSUCHTABLE,
-        'S0011' => DB_ERROR_ALREADY_EXISTS,
-        'S0012' => DB_ERROR_NOT_FOUND,
-        'S0021' => DB_ERROR_ALREADY_EXISTS,
-        'S0022' => DB_ERROR_NOSUCHFIELD,
-        'S1009' => DB_ERROR_INVALID,
-        'S1090' => DB_ERROR_INVALID,
-        'S1C00' => DB_ERROR_NOT_CAPABLE,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    public $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    public $dsn = array();
-
-
-    /**
-     * The number of rows affected by a data manipulation query
-     * @var integer
-     * @access private
-     */
-    public $affected = 0;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>parent::__construct()</kbd>
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's odbc driver supports the following extra DSN options:
-     *   + cursor  The type of cursor to be used for this connection.
-     *
-     * @param array $dsn the data source name
-     * @param bool $persistent should the connection be persistent?
-     *
-     * @return int|object
-     */
-    public function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('odbc')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-        switch ($this->dbsyntax) {
-            case 'access':
-            case 'db2':
-            case 'solid':
-                $this->features['transactions'] = true;
-                break;
-            case 'navision':
-                $this->features['limit'] = false;
-        }
-
-        /*
-         * This is hear for backwards compatibility. Should have been using
-         * 'database' all along, but prior to 1.6.0RC3 'hostspec' was used.
-         */
-        if ($dsn['database']) {
-            $odbcdsn = $dsn['database'];
-        } elseif ($dsn['hostspec']) {
-            $odbcdsn = $dsn['hostspec'];
-        } else {
-            $odbcdsn = 'localhost';
-        }
-
-        $connect_function = $persistent ? 'odbc_pconnect' : 'odbc_connect';
-
-        if (empty($dsn['cursor'])) {
-            $this->connection = @$connect_function(
-                $odbcdsn,
-                $dsn['username'],
-                $dsn['password']
-            );
-        } else {
-            $this->connection = @$connect_function(
-                $odbcdsn,
-                $dsn['username'],
-                $dsn['password'],
-                $dsn['cursor']
-            );
-        }
-
-        if (!is_resource($this->connection)) {
-            return $this->raiseError(
-                DB_ERROR_CONNECT_FAILED,
-                null,
-                null,
-                null,
-                $this->errorNative()
-            );
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Gets the DBMS' native error code and message produced by the last query
-     *
-     * @return string  the DBMS' error code and message
-     */
-    public function errorNative()
-    {
-        if (!is_resource($this->connection)) {
-            return @odbc_error() . ' ' . @odbc_errormsg();
-        }
-        return @odbc_error($this->connection) . ' ' . @odbc_errormsg($this->connection);
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool|void
-     */
-    public function disconnect()
-    {
-        $err = @odbc_close($this->connection);
-        $this->connection = null;
-        return $err;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    public function simpleQuery($query)
-    {
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        $result = @odbc_exec($this->connection, $query);
-        if (!$result) {
-            return $this->odbcRaiseError(); // XXX ERRORMSG
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        if ($this->_checkManip($query)) {
-            $this->affected = $result; // For affectedRows()
-            return DB_OK;
-        }
-        $this->affected = 0;
-        return $result;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_odbc::errorNative(), DB_common::errorCode()
-     */
-    public function odbcRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            switch ($this->dbsyntax) {
-                case 'access':
-                    if ($this->options['portability'] & DB_PORTABILITY_ERRORS) {
-                        $this->errorcode_map['07001'] = DB_ERROR_NOSUCHFIELD;
-                    } else {
-                        // Doing this in case mode changes during runtime.
-                        $this->errorcode_map['07001'] = DB_ERROR_MISMATCH;
-                    }
-
-                    $native_code = odbc_error($this->connection);
-
-                    // S1000 is for "General Error."  Let's be more specific.
-                    if ($native_code == 'S1000') {
-                        $errormsg = odbc_errormsg($this->connection);
-                        static $error_regexps;
-                        if (!isset($error_regexps)) {
-                            $error_regexps = array(
-                                '/includes related records.$/i' => DB_ERROR_CONSTRAINT,
-                                '/cannot contain a Null value/i' => DB_ERROR_CONSTRAINT_NOT_NULL,
-                            );
-                        }
-                        foreach ($error_regexps as $regexp => $code) {
-                            if (preg_match($regexp, $errormsg)) {
-                                return $this->raiseError(
-                                    $code,
-                                    null,
-                                    null,
-                                    null,
-                                    $native_code . ' ' . $errormsg
-                                );
-                            }
-                        }
-                        $errno = DB_ERROR;
-                    } else {
-                        $errno = $this->errorCode($native_code);
-                    }
-                    break;
-                default:
-                    $errno = $this->errorCode(odbc_error($this->connection));
-            }
-        }
-        return $this->raiseError(
-            $errno,
-            null,
-            null,
-            null,
-            $this->errorNative()
-        );
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Move the internal odbc result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    public function nextResult($result)
-    {
-        return @odbc_next_result($result);
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result the query result resource
-     * @param array $arr the referenced array to put the data in
-     * @param int $fetchmode how the resulting array should be indexed
-     * @param int $rownum the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    public function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        $arr = array();
-        if ($rownum !== null) {
-            $rownum++; // ODBC first row is 1
-            if (version_compare(phpversion(), '4.2.0', 'ge')) {
-                $cols = @odbc_fetch_into($result, $arr, $rownum);
-            } else {
-                $cols = @odbc_fetch_into($result, $rownum, $arr);
-            }
-        } else {
-            $cols = @odbc_fetch_into($result, $arr);
-        }
-        if (!$cols) {
-            return null;
-        }
-        if ($fetchmode !== DB_FETCHMODE_ORDERED) {
-            for ($i = 0; $i < count($arr); $i++) {
-                $colName = @odbc_field_name($result, $i + 1);
-                $a[$colName] = $arr[$i];
-            }
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-                $a = array_change_key_case($a, CASE_LOWER);
-            }
-            $arr = $a;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    public function freeResult($result)
-    {
-        return is_resource($result) ? odbc_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numCols()
-     */
-    public function numCols($result)
-    {
-        $cols = @odbc_num_fields($result);
-        if (!$cols) {
-            return $this->odbcRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int|object
-     */
-    public function affectedRows()
-    {
-        if (empty($this->affected)) {  // In case of SELECT stms
-            return 0;
-        }
-        $nrows = @odbc_num_rows($this->affected);
-        if ($nrows == -1) {
-            return $this->odbcRaiseError();
-        }
-        return $nrows;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * Not all ODBC drivers support this functionality.  If they don't
-     * a DB_Error object for DB_ERROR_UNSUPPORTED is returned.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numRows()
-     */
-    public function numRows($result)
-    {
-        $nrows = @odbc_num_rows($result);
-        if ($nrows == -1) {
-            return $this->odbcRaiseError(DB_ERROR_UNSUPPORTED);
-        }
-        if ($nrows === false) {
-            return $this->odbcRaiseError();
-        }
-        return $nrows;
-    }
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * Use 'mssql' as the dbsyntax in the DB DSN only if you've unchecked
-     * "Use ANSI quoted identifiers" when setting up the ODBC data source.
-     *
-     * @param string $str identifier name to be quoted
-     *
-     * @return string  quoted identifier string
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.6.0
-     */
-    public function quoteIdentifier($str)
-    {
-        switch ($this->dsn['dbsyntax']) {
-            case 'access':
-                return '[' . $str . ']';
-            case 'mssql':
-            case 'sybase':
-                return '[' . str_replace(']', ']]', $str) . ']';
-            case 'mysql':
-            case 'mysqli':
-                return '`' . $str . '`';
-            default:
-                return '"' . str_replace('"', '""', $str) . '"';
-        }
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int|object
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_odbc::createSequence(), DB_odbc::dropSequence()
-     */
-    public function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $repeat = 0;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("update ${seqname} set id = id + 1");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = 1;
-                $this->pushErrorHandling(PEAR_ERROR_RETURN);
-                $result = $this->createSequence($seq_name);
-                $this->popErrorHandling();
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                $result = $this->query("insert into ${seqname} (id) values(0)");
-            } else {
-                $repeat = 0;
-            }
-        } while ($repeat);
-
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-
-        $result = $this->query("select id from ${seqname}");
-        if (DB::isError($result)) {
-            return $result;
-        }
-
-        $row = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        if (DB::isError($row || !$row)) {
-            return $row;
-        }
-
-        return $row[0];
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_odbc::nextID(), DB_odbc::dropSequence()
-     */
-    public function createSequence($seq_name)
-    {
-        return $this->query('CREATE TABLE '
-            . $this->getSequenceName($seq_name)
-            . ' (id integer NOT NULL,'
-            . ' PRIMARY KEY(id))');
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_odbc::nextID(), DB_odbc::createSequence()
-     */
-    public function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff true turns it on, false turns it off
-     *
-     * @return int|object
-     *               doesn't support auto-committing transactions.
-     */
-    public function autoCommit($onoff = false)
-    {
-        if (!@odbc_autocommit($this->connection, $onoff)) {
-            return $this->odbcRaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ odbcRaiseError()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int|object
-     */
-    public function commit()
-    {
-        if (!@odbc_commit($this->connection)) {
-            return $this->odbcRaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int|object
-     */
-    public function rollback()
-    {
-        if (!@odbc_rollback($this->connection)) {
-            return $this->odbcRaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string $result DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int $mode a valid tableInfo mode
-     *
-     * @return array|object
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.7.0
-     */
-    public function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @odbc_exec($this->connection, "SELECT * FROM $result");
-            if (!$id) {
-                return $this->odbcRaiseError();
-            }
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->odbcRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @odbc_num_fields($id);
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $col = $i + 1;
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name' => $case_func(@odbc_field_name($id, $col)),
-                'type' => @odbc_field_type($id, $col),
-                'len' => @odbc_field_len($id, $col),
-                'flags' => '',
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @odbc_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * Thanks to symbol1@gmail.com and Philippe.Jausions@11abacus.com.
-     *
-     * @param string $type the kind of objects you want to retrieve
-     *
-     * @return array|string
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     * @since Method available since Release 1.7.0
-     */
-    public function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'databases':
-                if (!function_exists('odbc_data_source')) {
-                    return null;
-                }
-                $res = @odbc_data_source($this->connection, SQL_FETCH_FIRST);
-                if (is_array($res)) {
-                    $out = array($res['server']);
-                    while ($res = @odbc_data_source(
-                        $this->connection,
-                        SQL_FETCH_NEXT
-                    )) {
-                        $out[] = $res['server'];
-                    }
-                    return $out;
-                } else {
-                    return $this->odbcRaiseError();
-                }
-                break;
-            case 'tables':
-            case 'schema.tables':
-                $keep = 'TABLE';
-                break;
-            case 'views':
-                $keep = 'VIEW';
-                break;
-            default:
-                return null;
-        }
-
-        /*
-         * Removing non-conforming items in the while loop rather than
-         * in the odbc_tables() call because some backends choke on this:
-         *     odbc_tables($this->connection, '', '', '', 'TABLE')
-         */
-        $res = @odbc_tables($this->connection);
-        if (!$res) {
-            return $this->odbcRaiseError();
-        }
-        $out = array();
-        while ($row = odbc_fetch_array($res)) {
-            if ($row['TABLE_TYPE'] != $keep) {
-                continue;
-            }
-            if ($type == 'schema.tables') {
-                $out[] = $row['TABLE_SCHEM'] . '.' . $row['TABLE_NAME'];
-            } else {
-                $out[] = $row['TABLE_NAME'];
-            }
-        }
-        return $out;
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/DB/sqlite.php

@@ -1,978 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's sqlite extension
- * for interacting with SQLite databases
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Urs Gehrig <urs@circle.ch>
- * @author     Mika Tuupola <tuupola@appelsiini.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-//require_once 'DB/common.php';
-require_once 'common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's sqlite extension
- * for interacting with SQLite databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * NOTICE:  This driver needs PHP's track_errors ini setting to be on.
- * It is automatically turned on when connecting to the database.
- * Make sure your scripts don't turn it off.
- *
- * @category   Database
- * @package    DB
- * @author     Urs Gehrig <urs@circle.ch>
- * @author     Mika Tuupola <tuupola@appelsiini.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- */
-class DB_sqlite extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    public $phptype = 'sqlite';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    public $dbsyntax = 'sqlite';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    public $features = array(
-        'limit' => 'alter',
-        'new_link' => false,
-        'numrows' => true,
-        'pconnect' => true,
-        'prepare' => false,
-        'ssl' => false,
-        'transactions' => false,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     *
-     * {@internal  Error codes according to sqlite_exec.  See the online
-     * manual at http://sqlite.org/c_interface.html for info.
-     * This error handling based on sqlite_exec is not yet implemented.}}
-     *
-     * @var array
-     */
-    public $errorcode_map = array();
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    public $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    public $dsn = array();
-
-
-    /**
-     * SQLite data types
-     *
-     * @link http://www.sqlite.org/datatypes.html
-     *
-     * @var array
-     */
-    public $keywords = array(
-        'BLOB' => '',
-        'BOOLEAN' => '',
-        'CHARACTER' => '',
-        'CLOB' => '',
-        'FLOAT' => '',
-        'INTEGER' => '',
-        'KEY' => '',
-        'NATIONAL' => '',
-        'NUMERIC' => '',
-        'NVARCHAR' => '',
-        'PRIMARY' => '',
-        'TEXT' => '',
-        'TIMESTAMP' => '',
-        'UNIQUE' => '',
-        'VARCHAR' => '',
-        'VARYING' => '',
-    );
-
-    /**
-     * The most recent error message from $php_errormsg
-     * @var string
-     * @access private
-     */
-    public $_lasterror = '';
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>parent::__construct()</kbd>
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's sqlite driver supports the following extra DSN options:
-     *   + mode  The permissions for the database file, in four digit
-     *            chmod octal format (eg "0600").
-     *
-     * Example of connecting to a database in read-only mode:
-     * <code>
-     * require_once 'DB.php';
-     *
-     * $dsn = 'sqlite:///path/and/name/of/db/file?mode=0400';
-     * $options = array(
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     *
-     * $db = DB::connect($dsn, $options);
-     * if ((new PEAR)->isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param array $dsn the data source name
-     * @param bool $persistent should the connection be persistent?
-     *
-     * @return int|object
-     */
-    public function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('sqlite')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        if (!$dsn['database']) {
-            return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
-        }
-
-        if ($dsn['database'] !== ':memory:') {
-            if (!file_exists($dsn['database'])) {
-                if (!touch($dsn['database'])) {
-                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
-                }
-                if (!isset($dsn['mode']) ||
-                    !is_numeric($dsn['mode'])) {
-                    $mode = 0644;
-                } else {
-                    $mode = octdec($dsn['mode']);
-                }
-                if (!chmod($dsn['database'], $mode)) {
-                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
-                }
-                if (!file_exists($dsn['database'])) {
-                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
-                }
-            }
-            if (!is_file($dsn['database'])) {
-                return $this->sqliteRaiseError(DB_ERROR_INVALID);
-            }
-            if (!is_readable($dsn['database'])) {
-                return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
-            }
-        }
-
-        $connect_function = $persistent ? 'sqlite_popen' : 'sqlite_open';
-
-        // track_errors must remain on for simpleQuery()
-        @ini_set('track_errors', 1);
-        $php_errormsg = '';
-
-        if (!$this->connection = @$connect_function($dsn['database'])) {
-            return $this->raiseError(
-                DB_ERROR_NODBSELECTED,
-                null,
-                null,
-                null,
-                $php_errormsg
-            );
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_sqlite::errorNative(), DB_sqlite::errorCode()
-     */
-    public function sqliteRaiseError($errno = null)
-    {
-        $native = $this->errorNative();
-        if ($errno === null) {
-            $errno = $this->errorCode($native);
-        }
-
-        $errorcode = @sqlite_last_error($this->connection);
-        $userinfo = "$errorcode ** $this->last_query";
-
-        return $this->raiseError($errno, null, null, $userinfo, $native);
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Gets the DBMS' native error message produced by the last query
-     *
-     * {@internal This is used to retrieve more meaningfull error messages
-     * because sqlite_last_error() does not provide adequate info.}}
-     *
-     * @return string  the DBMS' error message
-     */
-    public function errorNative()
-    {
-        return $this->_lasterror;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Determines PEAR::DB error code from the database's text error message
-     *
-     * @param string $errormsg the error message returned from the database
-     *
-     * @return integer  the DB error number
-     */
-    public function errorCode($errormsg)
-    {
-        static $error_regexps;
-
-        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
-        // this hack to work around it, per bug #9599.
-        $errormsg = preg_replace('/^sqlite[a-z_]+\(\): /', '', $errormsg);
-
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/^no such table:/' => DB_ERROR_NOSUCHTABLE,
-                '/^no such index:/' => DB_ERROR_NOT_FOUND,
-                '/^(table|index) .* already exists$/' => DB_ERROR_ALREADY_EXISTS,
-                '/PRIMARY KEY must be unique/i' => DB_ERROR_CONSTRAINT,
-                '/is not unique/' => DB_ERROR_CONSTRAINT,
-                '/columns .* are not unique/i' => DB_ERROR_CONSTRAINT,
-                '/uniqueness constraint failed/' => DB_ERROR_CONSTRAINT,
-                '/may not be NULL/' => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/^no such column:/' => DB_ERROR_NOSUCHFIELD,
-                '/no column named/' => DB_ERROR_NOSUCHFIELD,
-                '/column not present in both tables/i' => DB_ERROR_NOSUCHFIELD,
-                '/^near ".*": syntax error$/' => DB_ERROR_SYNTAX,
-                '/[0-9]+ values for [0-9]+ columns/i' => DB_ERROR_VALUE_COUNT_ON_ROW,
-            );
-        }
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        // Fall back to DB_ERROR if there was no mapping.
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool|void
-     */
-    public function disconnect()
-    {
-        $ret = @sqlite_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Sends a query to the database server
-     *
-     * NOTICE:  This method needs PHP's track_errors ini setting to be on.
-     * It is automatically turned on when connecting to the database.
-     * Make sure your scripts don't turn it off.
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    public function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-
-        $php_errormsg = '';
-
-        $result = @sqlite_query($query, $this->connection);
-        $this->_lasterror = $php_errormsg ? $php_errormsg : '';
-
-        $this->result = $result;
-        if (!$this->result) {
-            return $this->sqliteRaiseError(null);
-        }
-
-        // sqlite_query() seems to allways return a resource
-        // so cant use that. Using $ismanip instead
-        if (!$ismanip) {
-            $numRows = $this->numRows($result);
-            if (is_object($numRows)) {
-                // we've got PEAR_Error
-                return $numRows;
-            }
-            return $result;
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * This little hack lets you know how many rows were deleted
-     * when running a "DELETE FROM table" query.  Only implemented
-     * if the DB_PORTABILITY_DELETE_COUNT portability option is on.
-     *
-     * @param string $query the query string to modify
-     *
-     * @return string  the modified query string
-     *
-     * @access protected
-     * @see DB_common::setOption()
-     */
-    public function modifyQuery($query)
-    {
-        if ($this->options['portability'] & DB_PORTABILITY_DELETE_COUNT) {
-            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
-                $query = preg_replace(
-                    '/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
-                    'DELETE FROM \1 WHERE 1=1',
-                    $query
-                );
-            }
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numRows()
-     */
-    public function numRows($result)
-    {
-        $rows = @sqlite_num_rows($result);
-        if ($rows === null) {
-            return $this->sqliteRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ affected()
-
-    /**
-     * Move the internal sqlite result pointer to the next available result
-     *
-     * @param resource $result the valid sqlite result resource
-     *
-     * @return bool  true if a result is available otherwise return false
-     */
-    public function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result the query result resource
-     * @param array $arr the referenced array to put the data in
-     * @param int $fetchmode how the resulting array should be indexed
-     * @param int $rownum the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    public function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@sqlite_seek($this->result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @sqlite_fetch_array($result, SQLITE_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-
-            /* Remove extraneous " characters from the fields in the result.
-             * Fixes bug #11716. */
-            if (is_array($arr) && count($arr) > 0) {
-                $strippedArr = array();
-                foreach ($arr as $field => $value) {
-                    $strippedArr[trim($field, '"')] = $value;
-                }
-                $arr = $strippedArr;
-            }
-        } else {
-            $arr = @sqlite_fetch_array($result, SQLITE_NUM);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            /*
-             * Even though this DBMS already trims output, we do this because
-             * a field might have intentional whitespace at the end that
-             * gets removed by DB_PORTABILITY_RTRIM under another driver.
-             */
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    public function freeResult(&$result)
-    {
-        // XXX No native free?
-        if (!is_resource($result)) {
-            return false;
-        }
-        $result = null;
-        return true;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numCols()
-     */
-    public function numCols($result)
-    {
-        $cols = @sqlite_num_fields($result);
-        if (!$cols) {
-            return $this->sqliteRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ getDbFileStats()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    public function affectedRows()
-    {
-        return @sqlite_changes($this->connection);
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_sqlite::nextID(), DB_sqlite::createSequence()
-     */
-    public function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int|object
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_sqlite::createSequence(), DB_sqlite::dropSequence()
-     */
-    public function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-
-        do {
-            $repeat = 0;
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("INSERT INTO $seqname (id) VALUES (NULL)");
-            $this->popErrorHandling();
-            if ($result === DB_OK) {
-                $id = @sqlite_last_insert_rowid($this->connection);
-                if ($id != 0) {
-                    return $id;
-                }
-            } elseif ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                } else {
-                    $repeat = 1;
-                }
-            }
-        } while ($repeat);
-
-        return $this->raiseError($result);
-    }
-
-    // }}}
-    // {{{ modifyQuery()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_sqlite::nextID(), DB_sqlite::dropSequence()
-     */
-    public function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $query = 'CREATE TABLE ' . $seqname .
-            ' (id INTEGER UNSIGNED PRIMARY KEY) ';
-        $result = $this->query($query);
-        if (DB::isError($result)) {
-            return ($result);
-        }
-        $query = "CREATE TRIGGER ${seqname}_cleanup AFTER INSERT ON $seqname
-                    BEGIN
-                        DELETE FROM $seqname WHERE id<LAST_INSERT_ROWID();
-                    END ";
-        $result = $this->query($query);
-        //if (DB::isError($result)) {
-            return ($result);
-        //}
-    }
-
-    // }}}
-    // {{{ sqliteRaiseError()
-
-    /**
-     * Get the file stats for the current database
-     *
-     * Possible arguments are dev, ino, mode, nlink, uid, gid, rdev, size,
-     * atime, mtime, ctime, blksize, blocks or a numeric key between
-     * 0 and 12.
-     *
-     * @param string $arg the array key for stats()
-     *
-     * @return mixed  an array on an unspecified key, integer on a passed
-     *                arg and false at a stats error
-     */
-    public function getDbFileStats($arg = '')
-    {
-        $stats = stat($this->dsn['database']);
-        if ($stats == false) {
-            return false;
-        }
-        if (is_array($stats)) {
-            if (is_numeric($arg)) {
-                if (((int)$arg <= 12) & ((int)$arg >= 0)) {
-                    return false;
-                }
-                return $stats[$arg];
-            }
-            if (array_key_exists(trim($arg), $stats)) {
-                return $stats[$arg];
-            }
-        }
-        return $stats;
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * In SQLite, this makes things safe for inserts/updates, but may
-     * cause problems when performing text comparisons against columns
-     * containing binary data. See the
-     * {@link http://php.net/sqlite_escape_string PHP manual} for more info.
-     *
-     * @param string $str the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @since Method available since Release 1.6.1
-     * @see DB_common::escapeSimple()
-     */
-    public function escapeSimple($str)
-    {
-        return @sqlite_escape_string($str);
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query the query to modify
-     * @param int $from the row to start to fetching (0 = the first row)
-     * @param int $count the numbers of rows to fetch
-     * @param mixed $params array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    public function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        return "$query LIMIT $count OFFSET $from";
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table
-     *
-     * @param string $result a string containing the name of a table
-     * @param int $mode a valid tableInfo mode
-     *
-     * @return array|object
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.7.0
-     */
-    public function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @sqlite_array_query(
-                $this->connection,
-                "PRAGMA table_info('$result');",
-                SQLITE_ASSOC
-            );
-            $got_string = true;
-        } else {
-            $this->last_query = '';
-            return $this->raiseError(
-                DB_ERROR_NOT_CAPABLE,
-                null,
-                null,
-                null,
-                'This DBMS can not obtain tableInfo' .
-                ' from result sets'
-            );
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = count($id);
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            if (strpos($id[$i]['type'], '(') !== false) {
-                $bits = explode('(', $id[$i]['type']);
-                $type = $bits[0];
-                $len = rtrim($bits[1], ')');
-            } else {
-                $type = $id[$i]['type'];
-                $len = 0;
-            }
-
-            $flags = '';
-            if ($id[$i]['pk']) {
-                $flags .= 'primary_key ';
-                if (strtoupper($type) == 'INTEGER') {
-                    $flags .= 'auto_increment ';
-                }
-            }
-            if ($id[$i]['notnull']) {
-                $flags .= 'not_null ';
-            }
-            if ($id[$i]['dflt_value'] !== null) {
-                $flags .= 'default_' . rawurlencode($id[$i]['dflt_value']);
-            }
-            $flags = trim($flags);
-
-            $res[$i] = array(
-                'table' => $case_func($result),
-                'name' => $case_func($id[$i]['name']),
-                'type' => $type,
-                'len' => $len,
-                'flags' => $flags,
-            );
-
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type the kind of objects you want to retrieve
-     * @param array $args SQLITE DRIVER ONLY: a private array of arguments
-     *                       used by the getSpecialQuery().  Do not use
-     *                       this directly.
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    public function getSpecialQuery($type, $args = array())
-    {
-        if (!is_array($args)) {
-            return $this->raiseError(
-                'no key specified',
-                null,
-                null,
-                null,
-                'Argument has to be an array.'
-            );
-        }
-
-        switch ($type) {
-            case 'master':
-                return 'SELECT * FROM sqlite_master;';
-            case 'tables':
-                return "SELECT name FROM sqlite_master WHERE type='table' "
-                    . 'UNION ALL SELECT name FROM sqlite_temp_master '
-                    . "WHERE type='table' ORDER BY name;";
-            case 'schema':
-                return 'SELECT sql FROM (SELECT * FROM sqlite_master '
-                    . 'UNION ALL SELECT * FROM sqlite_temp_master) '
-                    . "WHERE type!='meta' "
-                    . 'ORDER BY tbl_name, type DESC, name;';
-            case 'schemax':
-            case 'schema_x':
-                /*
-                 * Use like:
-                 * $res = $db->query($db->getSpecialQuery('schema_x',
-                 *                   array('table' => 'table3')));
-                 */
-                return 'SELECT sql FROM (SELECT * FROM sqlite_master '
-                    . 'UNION ALL SELECT * FROM sqlite_temp_master) '
-                    . "WHERE tbl_name LIKE '{$args['table']}' "
-                    . "AND type!='meta' "
-                    . 'ORDER BY type DESC, name;';
-            case 'alter':
-                /*
-                 * SQLite does not support ALTER TABLE; this is a helper query
-                 * to handle this. 'table' represents the table name, 'rows'
-                 * the news rows to create, 'save' the row(s) to keep _with_
-                 * the data.
-                 *
-                 * Use like:
-                 * $args = array(
-                 *     'table' => $table,
-                 *     'rows'  => "id INTEGER PRIMARY KEY, firstname TEXT, surname TEXT, datetime TEXT",
-                 *     'save'  => "NULL, titel, content, datetime"
-                 * );
-                 * $res = $db->query( $db->getSpecialQuery('alter', $args));
-                 */
-                $rows = strtr($args['rows'], $this->keywords);
-
-                $q = array(
-                    'BEGIN TRANSACTION',
-                    "CREATE TEMPORARY TABLE {$args['table']}_backup ({$args['rows']})",
-                    "INSERT INTO {$args['table']}_backup SELECT {$args['save']} FROM {$args['table']}",
-                    "DROP TABLE {$args['table']}",
-                    "CREATE TABLE {$args['table']} ({$args['rows']})",
-                    "INSERT INTO {$args['table']} SELECT {$rows} FROM {$args['table']}_backup",
-                    "DROP TABLE {$args['table']}_backup",
-                    'COMMIT',
-                );
-
-                /*
-                 * This is a dirty hack, since the above query will not get
-                 * executed with a single query call so here the query method
-                 * will be called directly and return a select instead.
-                 */
-                foreach ($q as $query) {
-                    $this->query($query);
-                }
-                return "SELECT * FROM {$args['table']};";
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/DB/storage.php

@@ -1,548 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Provides an object interface to a table row
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <stig@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB class so it can be extended from
- */
-require_once 'DB.php';
-
-/**
- * Provides an object interface to a table row
- *
- * It lets you add, delete and change rows using objects rather than SQL
- * statements.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <stig@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- */
-class DB_storage extends PEAR
-{
-    // {{{ properties
-
-    /** the name of the table (or view, if the backend database supports
-     * updates in views) we hold data from */
-    public $_table = null;
-
-    /** which column(s) in the table contains primary keys, can be a
-     * string for single-column primary keys, or an array of strings
-     * for multiple-column primary keys */
-    public $_keycolumn = null;
-
-    /** DB connection handle used for all transactions */
-    public $_dbh = null;
-
-    /** an assoc with the names of database fields stored as properties
-     * in this object */
-    public $_properties = array();
-
-    /** an assoc with the names of the properties in this object that
-     * have been changed since they were fetched from the database */
-    public $_changes = array();
-
-    /** flag that decides if data in this object can be changed.
-     * objects that don't have their table's key column in their
-     * property lists will be flagged as read-only. */
-    public $_readonly = false;
-
-    /** function or method that implements a validator for fields that
-     * are set, this validator function returns true if the field is
-     * valid, false if not */
-    public $_validator = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Constructor
-     *
-     * @param $table string the name of the database table
-     *
-     * @param $keycolumn mixed string with name of key column, or array of
-     * strings if the table has a primary key of more than one column
-     *
-     * @param $dbh object database connection object
-     *
-     * @param $validator mixed function or method used to validate
-     * each new value, called with three parameters: the name of the
-     * field/column that is changing, a reference to the new value and
-     * a reference to this object
-     *
-     */
-    public function __construct($table, $keycolumn, &$dbh, $validator = null)
-    {
-        $this->PEAR('DB_Error');
-        $this->_table = $table;
-        $this->_keycolumn = $keycolumn;
-        $this->_dbh = $dbh;
-        $this->_readonly = false;
-        $this->_validator = $validator;
-    }
-
-    // }}}
-    // {{{ _makeWhere()
-
-    /**
-     * Create a new (empty) row in the configured table for this
-     * object.
-     * @param $newpk
-     * @return |null
-     */
-    public function insert($newpk)
-    {
-        if (is_array($this->_keycolumn)) {
-            $primarykey = $this->_keycolumn;
-        } else {
-            $primarykey = array($this->_keycolumn);
-        }
-        settype($newpk, "array");
-        for ($i = 0; $i < sizeof($primarykey); $i++) {
-            $pkvals[] = $this->_dbh->quote($newpk[$i]);
-        }
-
-        $sth = $this->_dbh->query("INSERT INTO $this->_table (" .
-            implode(",", $primarykey) . ") VALUES(" .
-            implode(",", $pkvals) . ")");
-        if (DB::isError($sth)) {
-            return $sth;
-        }
-        if (sizeof($newpk) == 1) {
-            $newpk = $newpk[0];
-        }
-        $this->setup($newpk);
-        return null;
-    }
-
-    // }}}
-    // {{{ setup()
-
-    /**
-     * Method used to initialize a DB_storage object from the
-     * configured table.
-     *
-     * @param $keyval mixed the key[s] of the row to fetch (string or array)
-     *
-     * @return int|object
-     */
-    public function setup($keyval)
-    {
-        $whereclause = $this->_makeWhere($keyval);
-        $query = 'SELECT * FROM ' . $this->_table . ' WHERE ' . $whereclause;
-        $sth = $this->_dbh->query($query);
-        if (DB::isError($sth)) {
-            return $sth;
-        }
-        $row = $sth->fetchRow(DB_FETCHMODE_ASSOC);
-        if (DB::isError($row)) {
-            return $row;
-        }
-        if (!$row) {
-            return $this->raiseError(
-                null,
-                DB_ERROR_NOT_FOUND,
-                null,
-                null,
-                $query,
-                null,
-                true
-            );
-        }
-        foreach ($row as $key => $value) {
-            $this->_properties[$key] = true;
-            $this->$key = $value;
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ insert()
-
-    /**
-     * Utility method to build a "WHERE" clause to locate ourselves in
-     * the table.
-     *
-     * XXX future improvement: use rowids?
-     *
-     * @access private
-     * @param null $keyval
-     * @return mixed|string|null
-     */
-    public function _makeWhere($keyval = null)
-    {
-        if (is_array($this->_keycolumn)) {
-            if ($keyval === null) {
-                for ($i = 0; $i < sizeof($this->_keycolumn); $i++) {
-                    $keyval[] = $this->{$this->_keycolumn[$i]};
-                }
-            }
-            $whereclause = '';
-            for ($i = 0; $i < sizeof($this->_keycolumn); $i++) {
-                if ($i > 0) {
-                    $whereclause .= ' AND ';
-                }
-                $whereclause .= $this->_keycolumn[$i];
-                if (is_null($keyval[$i])) {
-                    // there's not much point in having a NULL key,
-                    // but we support it anyway
-                    $whereclause .= ' IS NULL';
-                } else {
-                    $whereclause .= ' = ' . $this->_dbh->quote($keyval[$i]);
-                }
-            }
-        } else {
-            if ($keyval === null) {
-                $keyval = @$this->{$this->_keycolumn};
-            }
-            $whereclause = $this->_keycolumn;
-            if (is_null($keyval)) {
-                // there's not much point in having a NULL key,
-                // but we support it anyway
-                $whereclause .= ' IS NULL';
-            } else {
-                $whereclause .= ' = ' . $this->_dbh->quote($keyval);
-            }
-        }
-        return $whereclause;
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Output a simple description of this DB_storage object.
-     * @return string object description
-     */
-    public function toString()
-    {
-        $info = strtolower(get_class($this));
-        $info .= " (table=";
-        $info .= $this->_table;
-        $info .= ", keycolumn=";
-        if (is_array($this->_keycolumn)) {
-            $info .= "(" . implode(",", $this->_keycolumn) . ")";
-        } else {
-            $info .= $this->_keycolumn;
-        }
-        $info .= ", dbh=";
-        if (is_object($this->_dbh)) {
-            $info .= $this->_dbh->toString();
-        } else {
-            $info .= "null";
-        }
-        $info .= ")";
-        if (sizeof($this->_properties)) {
-            $info .= " [loaded, key=";
-            $keyname = $this->_keycolumn;
-            if (is_array($keyname)) {
-                $info .= "(";
-                for ($i = 0; $i < sizeof($keyname); $i++) {
-                    if ($i > 0) {
-                        $info .= ",";
-                    }
-                    $info .= $this->$keyname[$i];
-                }
-                $info .= ")";
-            } else {
-                $info .= $this->$keyname;
-            }
-            $info .= "]";
-        }
-        if (sizeof($this->_changes)) {
-            $info .= " [modified]";
-        }
-        return $info;
-    }
-
-    // }}}
-    // {{{ dump()
-
-    /**
-     * Dump the contents of this object to "standard output".
-     */
-    public function dump()
-    {
-        foreach ($this->_properties as $prop => $foo) {
-            print "$prop = ";
-            print htmlentities($this->$prop);
-            print "<br />\n";
-        }
-    }
-
-    // }}}
-    // {{{ &create()
-
-    /**
-     * Static method used to create new DB storage objects.
-     * @param $table
-     * @param $data assoc. array where the keys are the names
-     *              of properties/columns
-     * @return object a new instance of DB_storage or a subclass of it
-     */
-    public function &create($table, &$data)
-    {
-        $classname = strtolower(get_class($this));
-        $obj = new $classname($table);
-        foreach ($data as $name => $value) {
-            $obj->_properties[$name] = true;
-            $obj->$name = &$value;
-        }
-        return $obj;
-    }
-
-    // }}}
-    // {{{ loadFromQuery()
-
-    /**
-     * Loads data into this object from the given query.  If this
-     * object already contains table data, changes will be saved and
-     * the object re-initialized first.
-     *
-     * @param $query SQL query
-     *
-     * @param $params parameter list in case you want to use
-     * prepare/execute mode
-     *
-     * @return int DB_OK on success, DB_WARNING_READ_ONLY if the
-     * returned object is read-only (because the object's specified
-     * key column was not found among the columns returned by $query),
-     * or another DB error code in case of errors.
-     */
-    // XXX commented out for now
-    /*
-        function loadFromQuery($query, $params = null)
-        {
-            if (sizeof($this->_properties)) {
-                if (sizeof($this->_changes)) {
-                    $this->store();
-                    $this->_changes = array();
-                }
-                $this->_properties = array();
-            }
-            $rowdata = $this->_dbh->getRow($query, DB_FETCHMODE_ASSOC, $params);
-            if (DB::isError($rowdata)) {
-                return $rowdata;
-            }
-            reset($rowdata);
-            $found_keycolumn = false;
-            while (list($key, $value) = each($rowdata)) {
-                if ($key == $this->_keycolumn) {
-                    $found_keycolumn = true;
-                }
-                $this->_properties[$key] = true;
-                $this->$key = &$value;
-                unset($value); // have to unset, or all properties will
-                               // refer to the same value
-            }
-            if (!$found_keycolumn) {
-                $this->_readonly = true;
-                return DB_WARNING_READ_ONLY;
-            }
-            return DB_OK;
-        }
-     */
-
-    // }}}
-    // {{{ set()
-
-    /**
-     * Modify an attriute value.
-     * @param $property
-     * @param $newvalue
-     * @return bool|object
-     */
-    public function set($property, $newvalue)
-    {
-        // only change if $property is known and object is not
-        // read-only
-        if ($this->_readonly) {
-            return $this->raiseError(
-                null,
-                DB_WARNING_READ_ONLY,
-                null,
-                null,
-                null,
-                null,
-                true
-            );
-        }
-        if (@isset($this->_properties[$property])) {
-            if (empty($this->_validator)) {
-                $valid = true;
-            } else {
-                $valid = @call_user_func(
-                    $this->_validator,
-                    $this->_table,
-                    $property,
-                    $newvalue,
-                    $this->$property,
-                    $this
-                );
-            }
-            if ($valid) {
-                $this->$property = $newvalue;
-                if (empty($this->_changes[$property])) {
-                    $this->_changes[$property] = 0;
-                } else {
-                    $this->_changes[$property]++;
-                }
-            } else {
-                return $this->raiseError(
-                    null,
-                    DB_ERROR_INVALID,
-                    null,
-                    null,
-                    "invalid field: $property",
-                    null,
-                    true
-                );
-            }
-            return true;
-        }
-        return $this->raiseError(
-            null,
-            DB_ERROR_NOSUCHFIELD,
-            null,
-            null,
-            "unknown field: $property",
-            null,
-            true
-        );
-    }
-
-    // }}}
-    // {{{ &get()
-
-    /**
-     * Fetch an attribute value.
-     *
-     * @param string attribute name
-     *
-     * @return attribute contents, or null if the attribute name is
-     * unknown
-     */
-    public function &get($property)
-    {
-        // only return if $property is known
-        if (isset($this->_properties[$property])) {
-            return $this->$property;
-        }
-        $tmp = null;
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ _DB_storage()
-
-    /**
-     * Destructor, calls DB_storage::store() if there are changes
-     * that are to be kept.
-     */
-    public function _DB_storage()
-    {
-        if (sizeof($this->_changes)) {
-            $this->store();
-        }
-        $this->_properties = array();
-        $this->_changes = array();
-        $this->_table = null;
-    }
-
-    // }}}
-    // {{{ store()
-
-    /**
-     * Stores changes to this object in the database.
-     *
-     * @return DB_OK|int
-     */
-    public function store()
-    {
-        $params = array();
-        $vars = array();
-        foreach ($this->_changes as $name => $foo) {
-            $params[] = &$this->$name;
-            $vars[] = $name . ' = ?';
-        }
-        if ($vars) {
-            $query = 'UPDATE ' . $this->_table . ' SET ' .
-                implode(', ', $vars) . ' WHERE ' .
-                $this->_makeWhere();
-            $stmt = $this->_dbh->prepare($query);
-            $res = $this->_dbh->execute($stmt, $params);
-            if (DB::isError($res)) {
-                return $res;
-            }
-            $this->_changes = array();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ remove()
-
-    /**
-     * Remove the row represented by this object from the database.
-     *
-     * @return mixed DB_OK or a DB error
-     */
-    public function remove()
-    {
-        if ($this->_readonly) {
-            return $this->raiseError(
-                null,
-                DB_WARNING_READ_ONLY,
-                null,
-                null,
-                null,
-                null,
-                true
-            );
-        }
-        $query = 'DELETE FROM ' . $this->_table . ' WHERE ' .
-            $this->_makeWhere();
-        $res = $this->_dbh->query($query);
-        if (DB::isError($res)) {
-            return $res;
-        }
-        foreach ($this->_properties as $prop => $foo) {
-            unset($this->$prop);
-        }
-        $this->_properties = array();
-        $this->_changes = array();
-        return DB_OK;
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/DB/sybase.php

@@ -1,955 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's sybase extension
- * for interacting with Sybase databases
- *
- * PHP version 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Ant�nio Carlos Ven�ncio J�nior <floripa@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-//require_once 'DB/common.php';
-require_once 'common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's sybase extension
- * for interacting with Sybase databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * WARNING:  This driver may fail with multiple connections under the
- * same user/pass/host and different databases.
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Ant�nio Carlos Ven�ncio J�nior <floripa@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.9.2
- * @link       http://pear.php.net/package/DB
- */
-class DB_sybase extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    public $phptype = 'sybase';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    public $dbsyntax = 'sybase';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    public $features = array(
-        'limit' => 'emulate',
-        'new_link' => false,
-        'numrows' => true,
-        'pconnect' => true,
-        'prepare' => false,
-        'ssl' => false,
-        'transactions' => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    public $errorcode_map = array();
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    public $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    public $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    public $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    public $transaction_opcount = 0;
-
-    /**
-     * The database specified in the DSN
-     *
-     * It's a fix to allow calls to different databases in the same script.
-     *
-     * @var string
-     * @access private
-     */
-    public $_db = '';
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>parent::__construct()</kbd>
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's sybase driver supports the following extra DSN options:
-     *   + appname       The application name to use on this connection.
-     *                   Available since PEAR DB 1.7.0.
-     *   + charset       The character set to use on this connection.
-     *                   Available since PEAR DB 1.7.0.
-     *
-     * @param array $dsn the data source name
-     * @param bool $persistent should the connection be persistent?
-     *
-     * @return int|object
-     */
-    public function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('sybase') &&
-            !PEAR::loadExtension('sybase_ct')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $dsn['hostspec'] = $dsn['hostspec'] ? $dsn['hostspec'] : 'localhost';
-        $dsn['password'] = !empty($dsn['password']) ? $dsn['password'] : false;
-        $dsn['charset'] = isset($dsn['charset']) ? $dsn['charset'] : false;
-        $dsn['appname'] = isset($dsn['appname']) ? $dsn['appname'] : false;
-
-        $connect_function = $persistent ? 'sybase_pconnect' : 'sybase_connect';
-
-        if ($dsn['username']) {
-            $this->connection = @$connect_function(
-                $dsn['hostspec'],
-                $dsn['username'],
-                $dsn['password'],
-                $dsn['charset'],
-                $dsn['appname']
-            );
-        } else {
-            return $this->raiseError(
-                DB_ERROR_CONNECT_FAILED,
-                null,
-                null,
-                null,
-                'The DSN did not contain a username.'
-            );
-        }
-
-        if (!$this->connection) {
-            return $this->raiseError(
-                DB_ERROR_CONNECT_FAILED,
-                null,
-                null,
-                null,
-                @sybase_get_last_message()
-            );
-        }
-
-        if ($dsn['database']) {
-            if (!@sybase_select_db($dsn['database'], $this->connection)) {
-                return $this->raiseError(
-                    DB_ERROR_NODBSELECTED,
-                    null,
-                    null,
-                    null,
-                    @sybase_get_last_message()
-                );
-            }
-            $this->_db = $dsn['database'];
-        }
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    public function disconnect()
-    {
-        $ret = @sybase_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    public function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-            return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-        }
-        $query = $this->modifyQuery($query);
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @sybase_query('BEGIN TRANSACTION', $this->connection);
-                if (!$result) {
-                    return $this->sybaseRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        $result = @sybase_query($query, $this->connection);
-        if (!$result) {
-            return $this->sybaseRaiseError();
-        }
-        if (is_resource($result)) {
-            return $result;
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        return $ismanip ? DB_OK : $result;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_sybase::errorNative(), DB_sybase::errorCode()
-     */
-    public function sybaseRaiseError($errno = null)
-    {
-        $native = $this->errorNative();
-        if ($errno === null) {
-            $errno = $this->errorCode($native);
-        }
-        return $this->raiseError($errno, null, null, null, $native);
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Gets the DBMS' native error message produced by the last query
-     *
-     * @return string  the DBMS' error message
-     */
-    public function errorNative()
-    {
-        return @sybase_get_last_message();
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Determines PEAR::DB error code from the database's text error message.
-     *
-     * @param string $errormsg error message returned from the database
-     * @return integer  an error number from a DB error constant
-     */
-    public function errorCode($errormsg)
-    {
-        static $error_regexps;
-
-        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
-        // this hack to work around it, per bug #9599.
-        $errormsg = preg_replace('/^sybase[a-z_]+\(\): /', '', $errormsg);
-
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/Incorrect syntax near/'
-                => DB_ERROR_SYNTAX,
-                '/^Unclosed quote before the character string [\"\'].*[\"\']\./'
-                => DB_ERROR_SYNTAX,
-                '/Implicit conversion (from datatype|of NUMERIC value)/i'
-                => DB_ERROR_INVALID_NUMBER,
-                '/Cannot drop the table [\"\'].+[\"\'], because it doesn\'t exist in the system catalogs\./'
-                => DB_ERROR_NOSUCHTABLE,
-                '/Only the owner of object [\"\'].+[\"\'] or a user with System Administrator \(SA\) role can run this command\./'
-                => DB_ERROR_ACCESS_VIOLATION,
-                '/^.+ permission denied on object .+, database .+, owner .+/'
-                => DB_ERROR_ACCESS_VIOLATION,
-                '/^.* permission denied, database .+, owner .+/'
-                => DB_ERROR_ACCESS_VIOLATION,
-                '/[^.*] not found\./'
-                => DB_ERROR_NOSUCHTABLE,
-                '/There is already an object named/'
-                => DB_ERROR_ALREADY_EXISTS,
-                '/Invalid column name/'
-                => DB_ERROR_NOSUCHFIELD,
-                '/does not allow null values/'
-                => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/Command has been aborted/'
-                => DB_ERROR_CONSTRAINT,
-                '/^Cannot drop the index .* because it doesn\'t exist/i'
-                => DB_ERROR_NOT_FOUND,
-                '/^There is already an index/i'
-                => DB_ERROR_ALREADY_EXISTS,
-                '/^There are fewer columns in the INSERT statement than values specified/i'
-                => DB_ERROR_VALUE_COUNT_ON_ROW,
-                '/Divide by zero/i'
-                => DB_ERROR_DIVZERO,
-            );
-        }
-
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Move the internal sybase result pointer to the next available result
-     *
-     * @param a valid sybase result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    public function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result the query result resource
-     * @param array $arr the referenced array to put the data in
-     * @param int $fetchmode how the resulting array should be indexed
-     * @param int $rownum the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    public function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@sybase_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            if (function_exists('sybase_fetch_assoc')) {
-                $arr = @sybase_fetch_assoc($result);
-            } else {
-                if ($arr = @sybase_fetch_array($result)) {
-                    foreach ($arr as $key => $value) {
-                        if (is_int($key)) {
-                            unset($arr[$key]);
-                        }
-                    }
-                }
-            }
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @sybase_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    public function freeResult($result)
-    {
-        return is_resource($result) ? sybase_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numCols()
-     */
-    public function numCols($result)
-    {
-        $cols = @sybase_num_fields($result);
-        if (!$cols) {
-            return $this->sybaseRaiseError();
-        }
-        return $cols;
-    }
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result PHP's query result resource
-     *
-     * @return int|object
-     *
-     * @see DB_result::numRows()
-     */
-    public function numRows($result)
-    {
-        $rows = @sybase_num_rows($result);
-        if ($rows === false) {
-            return $this->sybaseRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    public function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            $result = @sybase_affected_rows($this->connection);
-        } else {
-            $result = 0;
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ quoteFloat()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int|object
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_sybase::createSequence(), DB_sybase::dropSequence()
-     */
-    public function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-            return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-        }
-        $repeat = 0;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("INSERT INTO $seqname (vapor) VALUES (0)");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                ($result->getCode() == DB_ERROR || $result->getCode() == DB_ERROR_NOSUCHTABLE)) {
-                $repeat = 1;
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } elseif (!DB::isError($result)) {
-                $result = $this->query("SELECT @@IDENTITY FROM $seqname");
-                $repeat = 0;
-            } else {
-                $repeat = false;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $result = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        return $result[0];
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_sybase::nextID(), DB_sybase::dropSequence()
-     */
-    public function createSequence($seq_name)
-    {
-        return $this->query('CREATE TABLE '
-            . $this->getSequenceName($seq_name)
-            . ' (id numeric(10, 0) IDENTITY NOT NULL,'
-            . ' vapor int NULL)');
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_sybase::nextID(), DB_sybase::createSequence()
-     */
-    public function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Formats a float value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param float the float value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    public function quoteFloat($float)
-    {
-        return $this->escapeSimple(str_replace(',', '.', strval(floatval($float))));
-    }
-
-    // }}}
-    // {{{ sybaseRaiseError()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    public function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int|object
-     */
-    public function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-                return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $result = @sybase_query('COMMIT', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->sybaseRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int|object
-     */
-    public function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-                return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $result = @sybase_query('ROLLBACK', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->sybaseRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
-     * is a table name.
-     *
-     * @param object|string $result DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int $mode a valid tableInfo mode
-     *
-     * @return array|object
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.6.0
-     */
-    public function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-                return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $id = @sybase_query(
-                "SELECT * FROM $result WHERE 1=0",
-                $this->connection
-            );
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->sybaseRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @sybase_num_fields($id);
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $f = @sybase_fetch_field($id, $i);
-            // column_source is often blank
-            $res[$i] = array(
-                'table' => $got_string
-                    ? $case_func($result)
-                    : $case_func($f->column_source),
-                'name' => $case_func($f->name),
-                'type' => $f->type,
-                'len' => $f->max_length,
-                'flags' => '',
-            );
-            if ($res[$i]['table']) {
-                $res[$i]['flags'] = $this->_sybase_field_flags(
-                    $res[$i]['table'],
-                    $res[$i]['name']
-                );
-            }
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @sybase_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ _sybase_field_flags()
-
-    /**
-     * Get the flags for a field
-     *
-     * Currently supports:
-     *  + <samp>unique_key</samp>    (unique index, unique check or primary_key)
-     *  + <samp>multiple_key</samp>  (multi-key index)
-     *
-     * @param string $table the table name
-     * @param string $column the field name
-     *
-     * @return string  space delimited string of flags.  Empty string if none.
-     *
-     * @access private
-     */
-    public function _sybase_field_flags($table, $column)
-    {
-        static $tableName = null;
-        static $flags = array();
-
-        if ($table != $tableName) {
-            $flags = array();
-            $tableName = $table;
-
-            /* We're running sp_helpindex directly because it doesn't exist in
-             * older versions of ASE -- unfortunately, we can't just use
-             * DB::isError() because the user may be using callback error
-             * handling. */
-            $res = @sybase_query("sp_helpindex $table", $this->connection);
-
-            if ($res === false || $res === true) {
-                // Fake a valid response for BC reasons.
-                return '';
-            }
-
-            while (($val = sybase_fetch_assoc($res)) !== false) {
-                if (!isset($val['index_keys'])) {
-                    /* No useful information returned. Break and be done with
-                     * it, which preserves the pre-1.7.9 behaviour. */
-                    break;
-                }
-
-                $keys = explode(', ', trim($val['index_keys']));
-
-                if (sizeof($keys) > 1) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'multiple_key');
-                    }
-                }
-
-                if (strpos($val['index_description'], 'unique')) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'unique_key');
-                    }
-                }
-            }
-
-            sybase_free_result($res);
-        }
-
-        if (array_key_exists($column, $flags)) {
-            return (implode(' ', $flags[$column]));
-        }
-
-        return '';
-    }
-
-    // }}}
-    // {{{ _add_flag()
-
-    /**
-     * Adds a string to the flags array if the flag is not yet in there
-     * - if there is no flag present the array is created
-     *
-     * @param array $array reference of flags array to add a value to
-     * @param mixed $value value to add to the flag array
-     *
-     * @return void
-     *
-     * @access private
-     */
-    public function _add_flag(&$array, $value)
-    {
-        if (!is_array($array)) {
-            $array = array($value);
-        } elseif (!in_array($value, $array)) {
-            array_push($array, $value);
-        }
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    public function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return "SELECT name FROM sysobjects WHERE type = 'U'"
-                    . ' ORDER BY name';
-            case 'views':
-                return "SELECT name FROM sysobjects WHERE type = 'V'";
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

extlib/Net/IDNA2.php

@@ -1,6 +1,6 @@
 <?php
 
-// {{{ license{{{{{{{{{
+// {{{ license{{{{{{
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
 //
@@ -22,7 +22,7 @@
 // +----------------------------------------------------------------------+
 //
 
-// }}}}}}}}}}}}
+// }}}}}}}}}
 require_once 'Net/IDNA2/Exception.php';
 require_once 'Net/IDNA2/Exception/Nameprep.php';
 
@@ -3304,7 +3304,7 @@ class Net_IDNA2
      * @static
      * @access private
      */
-    private static function _showHex(array $input, bool $include_bit = false): void
+    private static function _showHex(array $input, bool $include_bit = false) //: void  XXX PHP: Upgrade to PHP 7.1
     {
         foreach ($input as $k => $v) {
             echo '[', $k, '] => ', sprintf('%X', $v);

extlib/Validate.php

@@ -508,7 +508,7 @@ class Validate
      * Validate an email
      *
      * @param string $email email to validate
-     * @param mixed bool (BC) $check_domain Check or not if the domain exists
+     * @param mixed  boolean (BC) $check_domain Check or not if the domain exists
      *              array $options associative array of options
      *              'check_domain' boolean Check or not if the domain exists
      *              'use_rfc822' boolean Apply the full RFC822 grammar
@@ -528,7 +528,7 @@ class Validate
      * @access public
      * @throws Exception
      */
-    public function email(string $email, $options = null): bool
+    public function email(string $email, array $options = null): bool
     {
         $check_domain = false;
         $use_rfc822 = false;
@@ -683,7 +683,7 @@ class Validate
      * @access public
      * @throws Exception
      */
-    public function uri(string $url, ?array $options = null): bool
+    public function uri(string $url, $options = null): bool
     {
         $strict = ';/?:@$,';
         $domain_check = false;

lib/accountmover.php

@@ -51,7 +51,7 @@ class AccountMover extends QueueHandler
         return 'acctmove';
     }
 
-    function handle($object) : bool
+    function handle($object)
     {
         list($user, $remote, $password) = $object;
 

lib/activityimporter.php

@@ -51,7 +51,7 @@ class ActivityImporter extends QueueHandler
      *
      * @return
      */
-    function handle($data) : bool
+    function handle($data)
     {
         list($user, $author, $activity, $trusted) = $data;