From 3d6148c81953ab3278f0b79cc25d86f271d55d78 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 00:48:19 +0200 Subject: [PATCH 001/129] Start OpenSondage project --- README | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..e69de29 From 475556c0e35aa14f7d85188b6fcb03a6879befad Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 01:32:47 +0200 Subject: [PATCH 002/129] STUdS fork --- CHANGELOG | 63 + INSTALL | 186 + LICENCE | 519 ++ LICENSE | 515 ++ README | 169 + TODO | 8 + admin/.htaccess | 7 + admin/index.php | 151 + admin/logs_studs.txt | 2 + adminstuds.php | 1050 ++++ apropos.php | 120 + bandeaux.php | 115 + block_enter.js | 14 + choix_autre.php | 219 + choix_date.php | 594 ++ contacts.php | 152 + creation_sondage.php | 101 + errors/error-forbidden.php | 67 + exportcsv.php | 103 + exportics.php | 105 + exportpdf.php | 86 + favicon.ico | Bin 0 -> 1150 bytes fonctions.php | 127 + i18n.php | 31 + iCalcreator/iCalUtilityFunctions.class.php | 1340 ++++ iCalcreator/iCalcreator.class.php | 6490 ++++++++++++++++++++ iCalcreator/lgpl.txt | 504 ++ iCalcreator/releaseNotes-2.8.txt | 100 + iCalcreator/samples.php | 275 + iCalcreator/summary.html | 263 + images/accept-24.png | Bin 0 -> 1696 bytes images/accept-32.png | Bin 0 -> 2449 bytes images/accept.png | Bin 0 -> 901 bytes images/add-16.png | Bin 0 -> 845 bytes images/add-24.png | Bin 0 -> 1393 bytes images/add.png | Bin 0 -> 2017 bytes images/back-32.png | Bin 0 -> 2026 bytes images/calendar-32.png | Bin 0 -> 2155 bytes images/cancel.png | Bin 0 -> 587 bytes images/chart-32.png | Bin 0 -> 2059 bytes images/csv.png | Bin 0 -> 804 bytes images/fforward.png | Bin 0 -> 1359 bytes images/ical.png | Bin 0 -> 829 bytes images/info.png | Bin 0 -> 777 bytes images/logo_uds_bandeau.gif | Bin 0 -> 3391 bytes images/logo_uds_lettre.jpg | Bin 0 -> 23051 bytes images/medaille.png | Bin 0 -> 753 bytes images/next-32.png | Bin 0 -> 2017 bytes images/next.png | Bin 0 -> 1349 bytes images/previous.png | Bin 0 -> 1388 bytes images/reload.png | Bin 0 -> 1544 bytes images/rewind.png | Bin 0 -> 1364 bytes index.php | 90 + infos_sondage.php | 201 + install.mysql.sql | 89 + install.sql | 147 + locale/de_DE/LC_MESSAGES/Studs.mo | Bin 0 -> 16852 bytes locale/de_DE/LC_MESSAGES/Studs.po | 754 +++ locale/en_GB/LC_MESSAGES/Studs.mo | Bin 0 -> 12736 bytes locale/en_GB/LC_MESSAGES/Studs.po | 751 +++ locale/es_ES/LC_MESSAGES/Studs.mo | Bin 0 -> 16845 bytes locale/es_ES/LC_MESSAGES/Studs.po | 755 +++ locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 0 -> 18901 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 859 +++ maintenance.php | 65 + php2pdf/font/courier.php | 7 + php2pdf/font/helvetica.php | 15 + php2pdf/font/helveticab.php | 15 + php2pdf/font/helveticabi.php | 15 + php2pdf/font/helveticai.php | 15 + php2pdf/font/makefont/cp1250.map | 251 + php2pdf/font/makefont/cp1251.map | 255 + php2pdf/font/makefont/cp1252.map | 251 + php2pdf/font/makefont/cp1253.map | 239 + php2pdf/font/makefont/cp1254.map | 249 + php2pdf/font/makefont/cp1255.map | 233 + php2pdf/font/makefont/cp1257.map | 244 + php2pdf/font/makefont/cp1258.map | 247 + php2pdf/font/makefont/cp874.map | 225 + php2pdf/font/makefont/iso-8859-1.map | 256 + php2pdf/font/makefont/iso-8859-11.map | 248 + php2pdf/font/makefont/iso-8859-15.map | 256 + php2pdf/font/makefont/iso-8859-16.map | 256 + php2pdf/font/makefont/iso-8859-2.map | 256 + php2pdf/font/makefont/iso-8859-4.map | 256 + php2pdf/font/makefont/iso-8859-5.map | 256 + php2pdf/font/makefont/iso-8859-7.map | 250 + php2pdf/font/makefont/iso-8859-9.map | 256 + php2pdf/font/makefont/koi8-r.map | 256 + php2pdf/font/makefont/koi8-u.map | 256 + php2pdf/font/makefont/makefont.php | 416 ++ php2pdf/font/symbol.php | 15 + php2pdf/font/times.php | 15 + php2pdf/font/timesb.php | 15 + php2pdf/font/timesbi.php | 15 + php2pdf/font/timesi.php | 15 + php2pdf/font/zapfdingbats.php | 15 + php2pdf/fpdf.php | 1647 +++++ php2pdf/phpToPDF.php | 1394 +++++ php2pdf/phpToPDF.zip | Bin 0 -> 71560 bytes scripts/migration_date.php | 90 + scripts/nettoyage_sondage.php | 64 + scripts/phpVar2getText.php | 129 + scripts/recherche_adresse.pl | 53 + scripts/recherche_adresse_admin.php | 57 + sources/sources.php | 66 + studs.php | 604 ++ style.css | 433 ++ variables.php.template | 91 + 109 files changed, 27384 insertions(+) create mode 100644 CHANGELOG create mode 100644 INSTALL create mode 100644 LICENCE create mode 100644 LICENSE create mode 100644 TODO create mode 100644 admin/.htaccess create mode 100644 admin/index.php create mode 100644 admin/logs_studs.txt create mode 100644 adminstuds.php create mode 100644 apropos.php create mode 100644 bandeaux.php create mode 100644 block_enter.js create mode 100644 choix_autre.php create mode 100644 choix_date.php create mode 100644 contacts.php create mode 100644 creation_sondage.php create mode 100644 errors/error-forbidden.php create mode 100644 exportcsv.php create mode 100644 exportics.php create mode 100644 exportpdf.php create mode 100644 favicon.ico create mode 100644 fonctions.php create mode 100644 i18n.php create mode 100644 iCalcreator/iCalUtilityFunctions.class.php create mode 100644 iCalcreator/iCalcreator.class.php create mode 100644 iCalcreator/lgpl.txt create mode 100644 iCalcreator/releaseNotes-2.8.txt create mode 100644 iCalcreator/samples.php create mode 100644 iCalcreator/summary.html create mode 100644 images/accept-24.png create mode 100644 images/accept-32.png create mode 100644 images/accept.png create mode 100644 images/add-16.png create mode 100644 images/add-24.png create mode 100644 images/add.png create mode 100644 images/back-32.png create mode 100644 images/calendar-32.png create mode 100644 images/cancel.png create mode 100644 images/chart-32.png create mode 100644 images/csv.png create mode 100644 images/fforward.png create mode 100644 images/ical.png create mode 100644 images/info.png create mode 100644 images/logo_uds_bandeau.gif create mode 100644 images/logo_uds_lettre.jpg create mode 100644 images/medaille.png create mode 100644 images/next-32.png create mode 100644 images/next.png create mode 100644 images/previous.png create mode 100644 images/reload.png create mode 100644 images/rewind.png create mode 100644 index.php create mode 100644 infos_sondage.php create mode 100644 install.mysql.sql create mode 100644 install.sql create mode 100644 locale/de_DE/LC_MESSAGES/Studs.mo create mode 100644 locale/de_DE/LC_MESSAGES/Studs.po create mode 100644 locale/en_GB/LC_MESSAGES/Studs.mo create mode 100644 locale/en_GB/LC_MESSAGES/Studs.po create mode 100644 locale/es_ES/LC_MESSAGES/Studs.mo create mode 100644 locale/es_ES/LC_MESSAGES/Studs.po create mode 100644 locale/fr_FR/LC_MESSAGES/Studs.mo create mode 100644 locale/fr_FR/LC_MESSAGES/Studs.po create mode 100644 maintenance.php create mode 100644 php2pdf/font/courier.php create mode 100644 php2pdf/font/helvetica.php create mode 100644 php2pdf/font/helveticab.php create mode 100644 php2pdf/font/helveticabi.php create mode 100644 php2pdf/font/helveticai.php create mode 100644 php2pdf/font/makefont/cp1250.map create mode 100644 php2pdf/font/makefont/cp1251.map create mode 100644 php2pdf/font/makefont/cp1252.map create mode 100644 php2pdf/font/makefont/cp1253.map create mode 100644 php2pdf/font/makefont/cp1254.map create mode 100644 php2pdf/font/makefont/cp1255.map create mode 100644 php2pdf/font/makefont/cp1257.map create mode 100644 php2pdf/font/makefont/cp1258.map create mode 100644 php2pdf/font/makefont/cp874.map create mode 100644 php2pdf/font/makefont/iso-8859-1.map create mode 100644 php2pdf/font/makefont/iso-8859-11.map create mode 100644 php2pdf/font/makefont/iso-8859-15.map create mode 100644 php2pdf/font/makefont/iso-8859-16.map create mode 100644 php2pdf/font/makefont/iso-8859-2.map create mode 100644 php2pdf/font/makefont/iso-8859-4.map create mode 100644 php2pdf/font/makefont/iso-8859-5.map create mode 100644 php2pdf/font/makefont/iso-8859-7.map create mode 100644 php2pdf/font/makefont/iso-8859-9.map create mode 100644 php2pdf/font/makefont/koi8-r.map create mode 100644 php2pdf/font/makefont/koi8-u.map create mode 100644 php2pdf/font/makefont/makefont.php create mode 100644 php2pdf/font/symbol.php create mode 100644 php2pdf/font/times.php create mode 100644 php2pdf/font/timesb.php create mode 100644 php2pdf/font/timesbi.php create mode 100644 php2pdf/font/timesi.php create mode 100644 php2pdf/font/zapfdingbats.php create mode 100644 php2pdf/fpdf.php create mode 100644 php2pdf/phpToPDF.php create mode 100644 php2pdf/phpToPDF.zip create mode 100644 scripts/migration_date.php create mode 100644 scripts/nettoyage_sondage.php create mode 100644 scripts/phpVar2getText.php create mode 100644 scripts/recherche_adresse.pl create mode 100644 scripts/recherche_adresse_admin.php create mode 100644 sources/sources.php create mode 100644 studs.php create mode 100644 style.css create mode 100644 variables.php.template diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..4ec11ed --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,63 @@ +Les dernières améliorations de STUdS + Changelog version 0.6.7 (mai 2011) + - fork du projet STUdS (https://sourcesup.cru.fr/projects/studs/) de la version trunk du 15 mai 2011) + Changelog version 0.6.6 (XXX 2011) : + - internationalisation avec gettext + - abstraction de la base de données avec ADOdb + - support de mysql (fichier d'initialisation disponible) + - meilleure compatibilité avec le mode strict de PHP + - factorisation de code et de CSS + - moins de boutons de formulaire, plus de liens + + Changelog version 0.6.5 (juin 2010) : + - Changement de deux icones dans la creation d'un sondage. + + Changelog version 0.6.4 (mars 2010) : + - Corrections de bug + + Changelog version 0.6.3 (janvier 2010) : + - Corrections de bug + + Changelog version 0.6.2 (novembre 2009) : + - Correction dans l'affichage des bandeaux, + - Modification de la partie "A propos", + - Préparation à l'authentification, + - De UdSification de l'application dans certains fichiers. + + Changelog version 0.6.1 (octobre 2009) : + - Corrections d'erreurs dans les traductions et d'oublis de traduction dans certaines pages. + + Changelog version 0.6 (août 2009) : + - Mise sous la licence CeCILL-B du code source de STUdS, + - Passage de STUdS en encodage UTF8, + - Ajout des icones des menus dans toutes les pages et non pas seulement sur la page d'accueil, + - Correction d'un bug lors du rajout d'une colonne dans l'interface d'administration des sondages. + + Changelog version 0.5 (février 2009) : + - Traduction de STUdS en anglais, allemand et espagnol, + - Changement de la CSS avec ajout du logo de l'Université de Strasbourg, + - Possibilité d'ajouter un commentaire pour les sondés. + + Changelog version 0.4 (janvier 2009) : + - Possibilité de faire un export PDF pour envoyer la lettre de convocation à la date de réunion, + - Possibilité de rajouter des colonnes dans la partie administration de sondage, + - Correction de bugs d'affichage avec les caractères ' et " . + + Changelog version 0.3 (novembre 2008) : + - Possibilité de faire un export CSV pour exploiter le sondage dans un tableur, + - Mise en place d'un repository Subversion pour partager les nouvelles versions de STUdS, + - Amélioration de la CSS pour un meilleur affichage, + - Modification du code source pour le rendre portable vers une autre machine. + + Changelog version 0.2 (novembre 2008) : + - Lors de la création d'un sondage DATE, classement des dates par ordre croissant, + - Lors de la création d'un sondage DATE, accepter les horaires au format "8h" ou "8H", + - Lors de la création d'un sondage DATE, possibilité de copier des horaires entre les dates, + - Lors d'une modification de ligne, cocher les cases initialement choisies et non pas des cases vides, + - Changement du format d'affichage des dates pour un formatage type : "Mardi 13/06", + - Meilleure visualisation des choix les plus votés, + - Possibilité pour l'administrateur du sondage de choisir de recevoir un mail d'alerte à chaque participation d'un sondé, + - Remplacement des boutons de formulaire par des images moins austères, + - Correction de quelques petits bugs d'affichage, + - Possibilité de rajouter des cases supplémentaires lors de la création d'un sondage AUTRE, + - Possibilité de rajouter des cases supplémentaires lors de la création d'un sondage DATE. diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..d207a6f --- /dev/null +++ b/INSTALL @@ -0,0 +1,186 @@ +========================================================================== + +Université de Strasbourg - Direction Informatique +Auteur : Guilhem BORGHESI +Création : Février 2008 + +borghesi@unistra.fr + +Ce logiciel est régi par la licence CeCILL-B soumise au droit français et +respectant les principes de diffusion des logiciels libres. Vous pouvez +utiliser, modifier et/ou redistribuer ce programme sous les conditions +de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +sur le site "http://www.cecill.info". + +Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +pris connaissance de la licence CeCILL-B, et que vous en avez accepté les +termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. + +========================================================================== + +Université de Strasbourg - Direction Informatique +Author : Guilhem BORGHESI +Creation : Feb 2008 + +borghesi@unistra.fr + +This software is governed by the CeCILL-B license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL-B +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL-B license and that you accept its terms. You can +find a copy of this license in the file LICENSE. + +========================================================================== + + +Paramètres +========== + +Le fichier variables.php.template contient le paramétrage par défaut de +l'application STUdS. Pour personnaliser votre installation, copiez +ce fichier sous le nom variables.php et modifiez ce dernier. + +Configuration du fichier php.ini +================================ + +Pour que les quotes simples soient acceptées dans la partie "Création de sondage", il faut que la variable magic_quotes_gpc soit activée ("On") dans le fichier php.ini. + + +Base de données +=============== + +STUdS fonctionne indépendemment de la base SQL utilisée, sous réserve que +le serveur dispose de l'extension ADOdb (http://sourceforge.net/projects/adodb) + +Cependant la base de donnée doit être créée au préalable. +Deux scripts le faisant sont fournis : +install.sql: pour postgresql +install.mysql.sql: pour mysql + +Pour postgresql : +Après avoir renseigné les paramètres de la base de données, créez la +base et pré-chargez les données par défaut. Ceci ressemble à : + +% su - pgsql +% createdb studs +% psql -d studs -f install.sql + +Attention : Si vous créez la base de données avec l'utilisateur "pgsql", il vous faudra faire un "grant all on to studs" pour donner les droits à l'utilisateur studs de lire et modifier la base. Les tables de l'applications sont décrites plus loin dans ce fichier dans la partie "Tables de la base de données". + + +Accès à la page administrateur +============================== + +Le répertoire admin/ contient un fichier .htaccess pour Apache, qui restreint l'accès +à la page d'administration de l'application. +Modifiez le contenu de ce fichier .htaccess pour l'adapter au chemin du fichier .htpasswd +sur votre serveur. +Le fichier .htpasswd à besoin d'être créé par vos soins en utilisant par exemple la commande +suivante : +htpasswd -mnb + +Un fichier admin/logs_studs.txt doit être créé et accessible en écriture +par votre serveur Web. Quelque chose comme : + +% touch admin/logs_studs.txt +% chmod 700 admin/logs_studs.txt +% chown www-data admin/logs_studs.txt + +devrait convenir. + +Maintenance +=========== +Studs dispose d'une possibilité de mise en maintenance par le biais +d'un fichier .htaccess. +La section relative à Studs, dans la configuration d'Apache +doit au moins contenir : +AllowOverride AuthConfig Options +Le fichier .htaccess correspondant doit être modifier pour y configurer +l'adresse IP depuis laquelle s'effectue la maintenance. +N'oubliez pas de le recommenter en intégralité une fois la maintenance effectuée. + +Tables de la base de données +============================ + +Voici la structure des tables de l'application. La base se compose de trois tables : + +- sondage : Le contenu de chacun des sondages, +- sujet_studs : les sujets ou dates de tous les sondages, +- user_studs : les identifiants des sondés de tous les sondages. + +Chacune des tables contient les champs suivants : + +SONDAGE + + Nom du champ format description + + id_sondage (clé primaire) alpha-numérique numéro du sondage aléatoire + commentaires text commentaires liés au sondage + mail_admin text adresse de l'auteur du sondage + nom_admin text nom de l'auteur du sondage + titre text titre du sondage + id_sondage_admin alpha-numérique numéro du sondage pour le lien d'administration + date_fin alpha-numérique date de fin su sondage au format SQL + format text format du sondage : D/D+ pour Date, A/A+ pour Autre + mailsonde text envoi de mail a l'auteur du sondage a chaque participation ("yes" ou vide) + +SUJET_STUDS + + Nom du champ format description + + id_sondage (clé primaire) alpha-numérique numéro du sondage aléatoire + sujet text tous les sujets du sondage + +USER_STUDS + + Nom du champ format description + + user text nom du participant + id_sondage (clé primaire) alpha-numérique numéro du sondage aléatoire + reponses text reponses a chacun des sujets proposés au vote (0 pour non, 1 pour OK) + id_users alpha-numérique numéro d'utilisateur par ordre croissant de participation pour garder l'ordre de participation + +COMMENTS + Nom du champ format description + + id_sondage (clé primaire) alpha-numérique numéro du sondage aléatoire + comment text commentaires d'un participant + usercomment text nom de l'utilisateur qui laisse le commentaire + id_comment alpha-numérique numéro de commentaire par ordre croissant de participation pour garder l'ordre de remplissage + + +Traductions +=========== + +Pour pouvoir bénéficier de toutes les traductions en FR, EN, DE et ES +il faut avoir installé les locales fr_FR, de_DE, en_US et es_ES sur le +serveur qui héberge l'application ainsi que disposer de l'extension PHP Gettext. + +Export +====== + +Pour pouvoir bénéficier de l'export au format PDF, l'extension PHP PEAR +FPDF (php-fpdf) doit être installée. + +Synthèses des librairies utilisées +================================== + +ADOdb +http://sourceforge.net/projects/adodb +paquet: php5-adodb + +fpdf +http://www.fpdf.org +paquet: php-fpdf + +gettext +https://launchpad.net/php-gettext +paquet: php-gettext + +Sous GNU/Linux, +disposer des locales utf-8 suivantes pour la glibc: +FR, EN, ES, DE (/etc/locales.gen) diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..e313d19 --- /dev/null +++ b/LICENCE @@ -0,0 +1,519 @@ +CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL-B + + + Avertissement + +Ce contrat est une licence de logiciel libre issue d'une concertation +entre ses auteurs afin que le respect de deux grands principes préside à +sa rédaction: + + * d'une part, le respect des principes de diffusion des logiciels + libres: accès au code source, droits étendus conférés aux + utilisateurs, + * d'autre part, la désignation d'un droit applicable, le droit + français, auquel elle est conforme, tant au regard du droit de la + responsabilité civile que du droit de la propriété intellectuelle + et de la protection qu'il offre aux auteurs et titulaires des + droits patrimoniaux sur un logiciel. + +Les auteurs de la licence CeCILL-B (pour Ce[a] C[nrs] I[nria] L[ogiciel] +L[ibre]) sont: + +Commissariat à l'Energie Atomique - CEA, établissement public de +recherche à caractère scientifique, technique et industriel, dont le +siège est situé 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris. + +Centre National de la Recherche Scientifique - CNRS, établissement +public à caractère scientifique et technologique, dont le siège est +situé 3 rue Michel-Ange, 75794 Paris cedex 16. + +Institut National de Recherche en Informatique et en Automatique - +INRIA, établissement public à caractère scientifique et technologique, +dont le siège est situé Domaine de Voluceau, Rocquencourt, BP 105, 78153 +Le Chesnay cedex. + + + Préambule + +Ce contrat est une licence de logiciel libre dont l'objectif est de +conférer aux utilisateurs une très large liberté de modification et de +redistribution du logiciel régi par cette licence. + +L'exercice de cette liberté est assorti d'une obligation forte de +citation à la charge de ceux qui distribueraient un logiciel incorporant +un logiciel régi par la présente licence afin d'assurer que les +contributions de tous soient correctement identifiées et reconnues. + +L'accessibilité au code source et les droits de copie, de modification +et de redistribution qui découlent de ce contrat ont pour contrepartie +de n'offrir aux utilisateurs qu'une garantie limitée et de ne faire +peser sur l'auteur du logiciel, le titulaire des droits patrimoniaux et +les concédants successifs qu'une responsabilité restreinte. + +A cet égard l'attention de l'utilisateur est attirée sur les risques +associés au chargement, à l'utilisation, à la modification et/ou au +développement et à la reproduction du logiciel par l'utilisateur étant +donné sa spécificité de logiciel libre, qui peut le rendre complexe à +manipuler et qui le réserve donc à des développeurs ou des +professionnels avertis possédant des connaissances informatiques +approfondies. Les utilisateurs sont donc invités à charger et tester +l'adéquation du logiciel à leurs besoins dans des conditions permettant +d'assurer la sécurité de leurs systèmes et/ou de leurs données et, plus +généralement, à l'utiliser et l'exploiter dans les mêmes conditions de +sécurité. Ce contrat peut être reproduit et diffusé librement, sous +réserve de le conserver en l'état, sans ajout ni suppression de clauses. + +Ce contrat est susceptible de s'appliquer à tout logiciel dont le +titulaire des droits patrimoniaux décide de soumettre l'exploitation aux +dispositions qu'il contient. + + + Article 1 - DEFINITIONS + +Dans ce contrat, les termes suivants, lorsqu'ils seront écrits avec une +lettre capitale, auront la signification suivante: + +Contrat: désigne le présent contrat de licence, ses éventuelles versions +postérieures et annexes. + +Logiciel: désigne le logiciel sous sa forme de Code Objet et/ou de Code +Source et le cas échéant sa documentation, dans leur état au moment de +l'acceptation du Contrat par le Licencié. + +Logiciel Initial: désigne le Logiciel sous sa forme de Code Source et +éventuellement de Code Objet et le cas échéant sa documentation, dans +leur état au moment de leur première diffusion sous les termes du Contrat. + +Logiciel Modifié: désigne le Logiciel modifié par au moins une +Contribution. + +Code Source: désigne l'ensemble des instructions et des lignes de +programme du Logiciel et auquel l'accès est nécessaire en vue de +modifier le Logiciel. + +Code Objet: désigne les fichiers binaires issus de la compilation du +Code Source. + +Titulaire: désigne le ou les détenteurs des droits patrimoniaux d'auteur +sur le Logiciel Initial. + +Licencié: désigne le ou les utilisateurs du Logiciel ayant accepté le +Contrat. + +Contributeur: désigne le Licencié auteur d'au moins une Contribution. + +Concédant: désigne le Titulaire ou toute personne physique ou morale +distribuant le Logiciel sous le Contrat. + +Contribution: désigne l'ensemble des modifications, corrections, +traductions, adaptations et/ou nouvelles fonctionnalités intégrées dans +le Logiciel par tout Contributeur, ainsi que tout Module Interne. + +Module: désigne un ensemble de fichiers sources y compris leur +documentation qui permet de réaliser des fonctionnalités ou services +supplémentaires à ceux fournis par le Logiciel. + +Module Externe: désigne tout Module, non dérivé du Logiciel, tel que ce +Module et le Logiciel s'exécutent dans des espaces d'adressage +différents, l'un appelant l'autre au moment de leur exécution. + +Module Interne: désigne tout Module lié au Logiciel de telle sorte +qu'ils s'exécutent dans le même espace d'adressage. + +Parties: désigne collectivement le Licencié et le Concédant. + +Ces termes s'entendent au singulier comme au pluriel. + + + Article 2 - OBJET + +Le Contrat a pour objet la concession par le Concédant au Licencié d'une +licence non exclusive, cessible et mondiale du Logiciel telle que +définie ci-après à l'article 5 pour toute la durée de protection des droits +portant sur ce Logiciel. + + + Article 3 - ACCEPTATION + +3.1 L'acceptation par le Licencié des termes du Contrat est réputée +acquise du fait du premier des faits suivants: + + * (i) le chargement du Logiciel par tout moyen notamment par + téléchargement à partir d'un serveur distant ou par chargement à + partir d'un support physique; + * (ii) le premier exercice par le Licencié de l'un quelconque des + droits concédés par le Contrat. + +3.2 Un exemplaire du Contrat, contenant notamment un avertissement +relatif aux spécificités du Logiciel, à la restriction de garantie et à +la limitation à un usage par des utilisateurs expérimentés a été mis à +disposition du Licencié préalablement à son acceptation telle que +définie à l'article 3.1 ci dessus et le Licencié reconnaît en avoir pris +connaissance. + + + Article 4 - ENTREE EN VIGUEUR ET DUREE + + + 4.1 ENTREE EN VIGUEUR + +Le Contrat entre en vigueur à la date de son acceptation par le Licencié +telle que définie en 3.1. + + + 4.2 DUREE + +Le Contrat produira ses effets pendant toute la durée légale de +protection des droits patrimoniaux portant sur le Logiciel. + + + Article 5 - ETENDUE DES DROITS CONCEDES + +Le Concédant concède au Licencié, qui accepte, les droits suivants sur +le Logiciel pour toutes destinations et pour la durée du Contrat dans +les conditions ci-après détaillées. + +Par ailleurs, si le Concédant détient ou venait à détenir un ou +plusieurs brevets d'invention protégeant tout ou partie des +fonctionnalités du Logiciel ou de ses composants, il s'engage à ne pas +opposer les éventuels droits conférés par ces brevets aux Licenciés +successifs qui utiliseraient, exploiteraient ou modifieraient le +Logiciel. En cas de cession de ces brevets, le Concédant s'engage à +faire reprendre les obligations du présent alinéa aux cessionnaires. + + + 5.1 DROIT D'UTILISATION + +Le Licencié est autorisé à utiliser le Logiciel, sans restriction quant +aux domaines d'application, étant ci-après précisé que cela comporte: + + 1. la reproduction permanente ou provisoire du Logiciel en tout ou + partie par tout moyen et sous toute forme. + + 2. le chargement, l'affichage, l'exécution, ou le stockage du + Logiciel sur tout support. + + 3. la possibilité d'en observer, d'en étudier, ou d'en tester le + fonctionnement afin de déterminer les idées et principes qui sont + à la base de n'importe quel élément de ce Logiciel; et ceci, + lorsque le Licencié effectue toute opération de chargement, + d'affichage, d'exécution, de transmission ou de stockage du + Logiciel qu'il est en droit d'effectuer en vertu du Contrat. + + + 5.2 DROIT D'APPORTER DES CONTRIBUTIONS + +Le droit d'apporter des Contributions comporte le droit de traduire, +d'adapter, d'arranger ou d'apporter toute autre modification au Logiciel +et le droit de reproduire le logiciel en résultant. + +Le Licencié est autorisé à apporter toute Contribution au Logiciel sous +réserve de mentionner, de façon explicite, son nom en tant qu'auteur de +cette Contribution et la date de création de celle-ci. + + + 5.3 DROIT DE DISTRIBUTION + +Le droit de distribution comporte notamment le droit de diffuser, de +transmettre et de communiquer le Logiciel au public sur tout support et +par tout moyen ainsi que le droit de mettre sur le marché à titre +onéreux ou gratuit, un ou des exemplaires du Logiciel par tout procédé. + +Le Licencié est autorisé à distribuer des copies du Logiciel, modifié ou +non, à des tiers dans les conditions ci-après détaillées. + + + 5.3.1 DISTRIBUTION DU LOGICIEL SANS MODIFICATION + +Le Licencié est autorisé à distribuer des copies conformes du Logiciel, +sous forme de Code Source ou de Code Objet, à condition que cette +distribution respecte les dispositions du Contrat dans leur totalité et +soit accompagnée: + + 1. d'un exemplaire du Contrat, + + 2. d'un avertissement relatif à la restriction de garantie et de + responsabilité du Concédant telle que prévue aux articles 8 + et 9, + +et que, dans le cas où seul le Code Objet du Logiciel est redistribué, +le Licencié permette un accès effectif au Code Source complet du +Logiciel pendant au moins toute la durée de sa distribution du Logiciel, +étant entendu que le coût additionnel d'acquisition du Code Source ne +devra pas excéder le simple coût de transfert des données. + + + 5.3.2 DISTRIBUTION DU LOGICIEL MODIFIE + +Lorsque le Licencié apporte une Contribution au Logiciel, le Logiciel +Modifié peut être distribué sous un contrat de licence autre que le +présent Contrat sous réserve du respect des dispositions de l'article +5.3.4. + + + 5.3.3 DISTRIBUTION DES MODULES EXTERNES + +Lorsque le Licencié a développé un Module Externe les conditions du +Contrat ne s'appliquent pas à ce Module Externe, qui peut être distribué +sous un contrat de licence différent. + + + 5.3.4 CITATIONS + +Le Licencié qui distribue un Logiciel Modifié s'engage expressément: + + 1. à indiquer dans sa documentation qu'il a été réalisé à partir du + Logiciel régi par le Contrat, en reproduisant les mentions de + propriété intellectuelle du Logiciel, + + 2. à faire en sorte que l'utilisation du Logiciel, ses mentions de + propriété intellectuelle et le fait qu'il est régi par le Contrat + soient indiqués dans un texte facilement accessible depuis + l'interface du Logiciel Modifié, + + 3. à mentionner, sur un site Web librement accessible décrivant le + Logiciel Modifié, et pendant au moins toute la durée de sa + distribution, qu'il a été réalisé à partir du Logiciel régi par le + Contrat, en reproduisant les mentions de propriété intellectuelle + du Logiciel, + + 4. lorsqu'il le distribue à un tiers susceptible de distribuer + lui-même un Logiciel Modifié, sans avoir à en distribuer le code + source, à faire ses meilleurs efforts pour que les obligations du + présent article 5.3.4 soient reprises par le dit tiers. + +Lorsque le Logiciel modifié ou non est distribué avec un Module Externe +qui a été conçu pour l'utiliser, le Licencié doit soumettre le dit +Module Externe aux obligations précédentes. + + + 5.3.5 COMPATIBILITE AVEC LES LICENCES CeCILL et CeCILL-C + +Lorsqu'un Logiciel Modifié contient une Contribution soumise au contrat +de licence CeCILL, les stipulations prévues à l'article 5.3.4 sont +facultatives. + +Un Logiciel Modifié peut être distribué sous le contrat de licence +CeCILL-C. Les stipulations prévues à l'article 5.3.4 sont alors +facultatives. + + + Article 6 - PROPRIETE INTELLECTUELLE + + + 6.1 SUR LE LOGICIEL INITIAL + +Le Titulaire est détenteur des droits patrimoniaux sur le Logiciel +Initial. Toute utilisation du Logiciel Initial est soumise au respect +des conditions dans lesquelles le Titulaire a choisi de diffuser son +oeuvre et nul autre n'a la faculté de modifier les conditions de +diffusion de ce Logiciel Initial. + +Le Titulaire s'engage à ce que le Logiciel Initial reste au moins régi +par le Contrat et ce, pour la durée visée à l'article 4.2. + + + 6.2 SUR LES CONTRIBUTIONS + +Le Licencié qui a développé une Contribution est titulaire sur celle-ci +des droits de propriété intellectuelle dans les conditions définies par +la législation applicable. + + + 6.3 SUR LES MODULES EXTERNES + +Le Licencié qui a développé un Module Externe est titulaire sur celui-ci +des droits de propriété intellectuelle dans les conditions définies par +la législation applicable et reste libre du choix du contrat régissant +sa diffusion. + + + 6.4 DISPOSITIONS COMMUNES + +Le Licencié s'engage expressément: + + 1. à ne pas supprimer ou modifier de quelque manière que ce soit les + mentions de propriété intellectuelle apposées sur le Logiciel; + + 2. à reproduire à l'identique lesdites mentions de propriété + intellectuelle sur les copies du Logiciel modifié ou non. + +Le Licencié s'engage à ne pas porter atteinte, directement ou +indirectement, aux droits de propriété intellectuelle du Titulaire et/ou +des Contributeurs sur le Logiciel et à prendre, le cas échéant, à +l'égard de son personnel toutes les mesures nécessaires pour assurer le +respect des dits droits de propriété intellectuelle du Titulaire et/ou +des Contributeurs. + + + Article 7 - SERVICES ASSOCIES + +7.1 Le Contrat n'oblige en aucun cas le Concédant à la réalisation de +prestations d'assistance technique ou de maintenance du Logiciel. + +Cependant le Concédant reste libre de proposer ce type de services. Les +termes et conditions d'une telle assistance technique et/ou d'une telle +maintenance seront alors déterminés dans un acte séparé. Ces actes de +maintenance et/ou assistance technique n'engageront que la seule +responsabilité du Concédant qui les propose. + +7.2 De même, tout Concédant est libre de proposer, sous sa seule +responsabilité, à ses licenciés une garantie, qui n'engagera que lui, +lors de la redistribution du Logiciel et/ou du Logiciel Modifié et ce, +dans les conditions qu'il souhaite. Cette garantie et les modalités +financières de son application feront l'objet d'un acte séparé entre le +Concédant et le Licencié. + + + Article 8 - RESPONSABILITE + +8.1 Sous réserve des dispositions de l'article 8.2, le Licencié a la +faculté, sous réserve de prouver la faute du Concédant concerné, de +solliciter la réparation du préjudice direct qu'il subirait du fait du +Logiciel et dont il apportera la preuve. + +8.2 La responsabilité du Concédant est limitée aux engagements pris en +application du Contrat et ne saurait être engagée en raison notamment: +(i) des dommages dus à l'inexécution, totale ou partielle, de ses +obligations par le Licencié, (ii) des dommages directs ou indirects +découlant de l'utilisation ou des performances du Logiciel subis par le +Licencié et (iii) plus généralement d'un quelconque dommage indirect. En +particulier, les Parties conviennent expressément que tout préjudice +financier ou commercial (par exemple perte de données, perte de +bénéfices, perte d'exploitation, perte de clientèle ou de commandes, +manque à gagner, trouble commercial quelconque) ou toute action dirigée +contre le Licencié par un tiers, constitue un dommage indirect et +n'ouvre pas droit à réparation par le Concédant. + + + Article 9 - GARANTIE + +9.1 Le Licencié reconnaît que l'état actuel des connaissances +scientifiques et techniques au moment de la mise en circulation du +Logiciel ne permet pas d'en tester et d'en vérifier toutes les +utilisations ni de détecter l'existence d'éventuels défauts. L'attention +du Licencié a été attirée sur ce point sur les risques associés au +chargement, à l'utilisation, la modification et/ou au développement et à +la reproduction du Logiciel qui sont réservés à des utilisateurs avertis. + +Il relève de la responsabilité du Licencié de contrôler, par tous +moyens, l'adéquation du produit à ses besoins, son bon fonctionnement et +de s'assurer qu'il ne causera pas de dommages aux personnes et aux biens. + +9.2 Le Concédant déclare de bonne foi être en droit de concéder +l'ensemble des droits attachés au Logiciel (comprenant notamment les +droits visés à l'article 5). + +9.3 Le Licencié reconnaît que le Logiciel est fourni "en l'état" par le +Concédant sans autre garantie, expresse ou tacite, que celle prévue à +l'article 9.2 et notamment sans aucune garantie sur sa valeur commerciale, +son caractère sécurisé, innovant ou pertinent. + +En particulier, le Concédant ne garantit pas que le Logiciel est exempt +d'erreur, qu'il fonctionnera sans interruption, qu'il sera compatible +avec l'équipement du Licencié et sa configuration logicielle ni qu'il +remplira les besoins du Licencié. + +9.4 Le Concédant ne garantit pas, de manière expresse ou tacite, que le +Logiciel ne porte pas atteinte à un quelconque droit de propriété +intellectuelle d'un tiers portant sur un brevet, un logiciel ou sur tout +autre droit de propriété. Ainsi, le Concédant exclut toute garantie au +profit du Licencié contre les actions en contrefaçon qui pourraient être +diligentées au titre de l'utilisation, de la modification, et de la +redistribution du Logiciel. Néanmoins, si de telles actions sont +exercées contre le Licencié, le Concédant lui apportera son aide +technique et juridique pour sa défense. Cette aide technique et +juridique est déterminée au cas par cas entre le Concédant concerné et +le Licencié dans le cadre d'un protocole d'accord. Le Concédant dégage +toute responsabilité quant à l'utilisation de la dénomination du +Logiciel par le Licencié. Aucune garantie n'est apportée quant à +l'existence de droits antérieurs sur le nom du Logiciel et sur +l'existence d'une marque. + + + Article 10 - RESILIATION + +10.1 En cas de manquement par le Licencié aux obligations mises à sa +charge par le Contrat, le Concédant pourra résilier de plein droit le +Contrat trente (30) jours après notification adressée au Licencié et +restée sans effet. + +10.2 Le Licencié dont le Contrat est résilié n'est plus autorisé à +utiliser, modifier ou distribuer le Logiciel. Cependant, toutes les +licences qu'il aura concédées antérieurement à la résiliation du Contrat +resteront valides sous réserve qu'elles aient été effectuées en +conformité avec le Contrat. + + + Article 11 - DISPOSITIONS DIVERSES + + + 11.1 CAUSE EXTERIEURE + +Aucune des Parties ne sera responsable d'un retard ou d'une défaillance +d'exécution du Contrat qui serait dû à un cas de force majeure, un cas +fortuit ou une cause extérieure, telle que, notamment, le mauvais +fonctionnement ou les interruptions du réseau électrique ou de +télécommunication, la paralysie du réseau liée à une attaque +informatique, l'intervention des autorités gouvernementales, les +catastrophes naturelles, les dégâts des eaux, les tremblements de terre, +le feu, les explosions, les grèves et les conflits sociaux, l'état de +guerre... + +11.2 Le fait, par l'une ou l'autre des Parties, d'omettre en une ou +plusieurs occasions de se prévaloir d'une ou plusieurs dispositions du +Contrat, ne pourra en aucun cas impliquer renonciation par la Partie +intéressée à s'en prévaloir ultérieurement. + +11.3 Le Contrat annule et remplace toute convention antérieure, écrite +ou orale, entre les Parties sur le même objet et constitue l'accord +entier entre les Parties sur cet objet. Aucune addition ou modification +aux termes du Contrat n'aura d'effet à l'égard des Parties à moins +d'être faite par écrit et signée par leurs représentants dûment habilités. + +11.4 Dans l'hypothèse où une ou plusieurs des dispositions du Contrat +s'avèrerait contraire à une loi ou à un texte applicable, existants ou +futurs, cette loi ou ce texte prévaudrait, et les Parties feraient les +amendements nécessaires pour se conformer à cette loi ou à ce texte. +Toutes les autres dispositions resteront en vigueur. De même, la +nullité, pour quelque raison que ce soit, d'une des dispositions du +Contrat ne saurait entraîner la nullité de l'ensemble du Contrat. + + + 11.5 LANGUE + +Le Contrat est rédigé en langue française et en langue anglaise, ces +deux versions faisant également foi. + + + Article 12 - NOUVELLES VERSIONS DU CONTRAT + +12.1 Toute personne est autorisée à copier et distribuer des copies de +ce Contrat. + +12.2 Afin d'en préserver la cohérence, le texte du Contrat est protégé +et ne peut être modifié que par les auteurs de la licence, lesquels se +réservent le droit de publier périodiquement des mises à jour ou de +nouvelles versions du Contrat, qui posséderont chacune un numéro +distinct. Ces versions ultérieures seront susceptibles de prendre en +compte de nouvelles problématiques rencontrées par les logiciels libres. + +12.3 Tout Logiciel diffusé sous une version donnée du Contrat ne pourra +faire l'objet d'une diffusion ultérieure que sous la même version du +Contrat ou une version postérieure. + + + Article 13 - LOI APPLICABLE ET COMPETENCE TERRITORIALE + +13.1 Le Contrat est régi par la loi française. Les Parties conviennent +de tenter de régler à l'amiable les différends ou litiges qui +viendraient à se produire par suite ou à l'occasion du Contrat. + +13.2 A défaut d'accord amiable dans un délai de deux (2) mois à compter +de leur survenance et sauf situation relevant d'une procédure d'urgence, +les différends ou litiges seront portés par la Partie la plus diligente +devant les Tribunaux compétents de Paris. + + +Version 1.0 du 2006-09-05. + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0a20a7b --- /dev/null +++ b/LICENSE @@ -0,0 +1,515 @@ +CeCILL-B FREE SOFTWARE LICENSE AGREEMENT + + + Notice + +This Agreement is a Free Software license agreement that is the result +of discussions between its authors in order to ensure compliance with +the two main principles guiding its drafting: + + * firstly, compliance with the principles governing the distribution + of Free Software: access to source code, broad rights granted to + users, + * secondly, the election of a governing law, French law, with which + it is conformant, both as regards the law of torts and + intellectual property law, and the protection that it offers to + both authors and holders of the economic rights over software. + +The authors of the CeCILL-B (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre]) +license are: + +Commissariat à l'Energie Atomique - CEA, a public scientific, technical +and industrial research establishment, having its principal place of +business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France. + +Centre National de la Recherche Scientifique - CNRS, a public scientific +and technological establishment, having its principal place of business +at 3 rue Michel-Ange, 75794 Paris cedex 16, France. + +Institut National de Recherche en Informatique et en Automatique - +INRIA, a public scientific and technological establishment, having its +principal place of business at Domaine de Voluceau, Rocquencourt, BP +105, 78153 Le Chesnay cedex, France. + + + Preamble + +This Agreement is an open source software license intended to give users +significant freedom to modify and redistribute the software licensed +hereunder. + +The exercising of this freedom is conditional upon a strong obligation +of giving credits for everybody that distributes a software +incorporating a software ruled by the current license so as all +contributions to be properly identified and acknowledged. + +In consideration of access to the source code and the rights to copy, +modify and redistribute granted by the license, users are provided only +with a limited warranty and the software's author, the holder of the +economic rights, and the successive licensors only have limited liability. + +In this respect, the risks associated with loading, using, modifying +and/or developing or reproducing the software by the user are brought to +the user's attention, given its Free Software status, which may make it +complicated to use, with the result that its use is reserved for +developers and experienced professionals having in-depth computer +knowledge. Users are therefore encouraged to load and test the +suitability of the software as regards their requirements in conditions +enabling the security of their systems and/or data to be ensured and, +more generally, to use and operate it in the same conditions of +security. This Agreement may be freely reproduced and published, +provided it is not altered, and that no provisions are either added or +removed herefrom. + +This Agreement may apply to any or all software for which the holder of +the economic rights decides to submit the use thereof to its provisions. + + + Article 1 - DEFINITIONS + +For the purpose of this Agreement, when the following expressions +commence with a capital letter, they shall have the following meaning: + +Agreement: means this license agreement, and its possible subsequent +versions and annexes. + +Software: means the software in its Object Code and/or Source Code form +and, where applicable, its documentation, "as is" when the Licensee +accepts the Agreement. + +Initial Software: means the Software in its Source Code and possibly its +Object Code form and, where applicable, its documentation, "as is" when +it is first distributed under the terms and conditions of the Agreement. + +Modified Software: means the Software modified by at least one +Contribution. + +Source Code: means all the Software's instructions and program lines to +which access is required so as to modify the Software. + +Object Code: means the binary files originating from the compilation of +the Source Code. + +Holder: means the holder(s) of the economic rights over the Initial +Software. + +Licensee: means the Software user(s) having accepted the Agreement. + +Contributor: means a Licensee having made at least one Contribution. + +Licensor: means the Holder, or any other individual or legal entity, who +distributes the Software under the Agreement. + +Contribution: means any or all modifications, corrections, translations, +adaptations and/or new functions integrated into the Software by any or +all Contributors, as well as any or all Internal Modules. + +Module: means a set of sources files including their documentation that +enables supplementary functions or services in addition to those offered +by the Software. + +External Module: means any or all Modules, not derived from the +Software, so that this Module and the Software run in separate address +spaces, with one calling the other when they are run. + +Internal Module: means any or all Module, connected to the Software so +that they both execute in the same address space. + +Parties: mean both the Licensee and the Licensor. + +These expressions may be used both in singular and plural form. + + + Article 2 - PURPOSE + +The purpose of the Agreement is the grant by the Licensor to the +Licensee of a non-exclusive, transferable and worldwide license for the +Software as set forth in Article 5 hereinafter for the whole term of the +protection granted by the rights over said Software. + + + Article 3 - ACCEPTANCE + +3.1 The Licensee shall be deemed as having accepted the terms and +conditions of this Agreement upon the occurrence of the first of the +following events: + + * (i) loading the Software by any or all means, notably, by + downloading from a remote server, or by loading from a physical + medium; + * (ii) the first time the Licensee exercises any of the rights + granted hereunder. + +3.2 One copy of the Agreement, containing a notice relating to the +characteristics of the Software, to the limited warranty, and to the +fact that its use is restricted to experienced users has been provided +to the Licensee prior to its acceptance as set forth in Article 3.1 +hereinabove, and the Licensee hereby acknowledges that it has read and +understood it. + + + Article 4 - EFFECTIVE DATE AND TERM + + + 4.1 EFFECTIVE DATE + +The Agreement shall become effective on the date when it is accepted by +the Licensee as set forth in Article 3.1. + + + 4.2 TERM + +The Agreement shall remain in force for the entire legal term of +protection of the economic rights over the Software. + + + Article 5 - SCOPE OF RIGHTS GRANTED + +The Licensor hereby grants to the Licensee, who accepts, the following +rights over the Software for any or all use, and for the term of the +Agreement, on the basis of the terms and conditions set forth hereinafter. + +Besides, if the Licensor owns or comes to own one or more patents +protecting all or part of the functions of the Software or of its +components, the Licensor undertakes not to enforce the rights granted by +these patents against successive Licensees using, exploiting or +modifying the Software. If these patents are transferred, the Licensor +undertakes to have the transferees subscribe to the obligations set +forth in this paragraph. + + + 5.1 RIGHT OF USE + +The Licensee is authorized to use the Software, without any limitation +as to its fields of application, with it being hereinafter specified +that this comprises: + + 1. permanent or temporary reproduction of all or part of the Software + by any or all means and in any or all form. + + 2. loading, displaying, running, or storing the Software on any or + all medium. + + 3. entitlement to observe, study or test its operation so as to + determine the ideas and principles behind any or all constituent + elements of said Software. This shall apply when the Licensee + carries out any or all loading, displaying, running, transmission + or storage operation as regards the Software, that it is entitled + to carry out hereunder. + + + 5.2 ENTITLEMENT TO MAKE CONTRIBUTIONS + +The right to make Contributions includes the right to translate, adapt, +arrange, or make any or all modifications to the Software, and the right +to reproduce the resulting software. + +The Licensee is authorized to make any or all Contributions to the +Software provided that it includes an explicit notice that it is the +author of said Contribution and indicates the date of the creation thereof. + + + 5.3 RIGHT OF DISTRIBUTION + +In particular, the right of distribution includes the right to publish, +transmit and communicate the Software to the general public on any or +all medium, and by any or all means, and the right to market, either in +consideration of a fee, or free of charge, one or more copies of the +Software by any means. + +The Licensee is further authorized to distribute copies of the modified +or unmodified Software to third parties according to the terms and +conditions set forth hereinafter. + + + 5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION + +The Licensee is authorized to distribute true copies of the Software in +Source Code or Object Code form, provided that said distribution +complies with all the provisions of the Agreement and is accompanied by: + + 1. a copy of the Agreement, + + 2. a notice relating to the limitation of both the Licensor's + warranty and liability as set forth in Articles 8 and 9, + +and that, in the event that only the Object Code of the Software is +redistributed, the Licensee allows effective access to the full Source +Code of the Software at a minimum during the entire period of its +distribution of the Software, it being understood that the additional +cost of acquiring the Source Code shall not exceed the cost of +transferring the data. + + + 5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE + +If the Licensee makes any Contribution to the Software, the resulting +Modified Software may be distributed under a license agreement other +than this Agreement subject to compliance with the provisions of Article +5.3.4. + + + 5.3.3 DISTRIBUTION OF EXTERNAL MODULES + +When the Licensee has developed an External Module, the terms and +conditions of this Agreement do not apply to said External Module, that +may be distributed under a separate license agreement. + + + 5.3.4 CREDITS + +Any Licensee who may distribute a Modified Software hereby expressly +agrees to: + + 1. indicate in the related documentation that it is based on the + Software licensed hereunder, and reproduce the intellectual + property notice for the Software, + + 2. ensure that written indications of the Software intended use, + intellectual property notice and license hereunder are included in + easily accessible format from the Modified Software interface, + + 3. mention, on a freely accessible website describing the Modified + Software, at least throughout the distribution term thereof, that + it is based on the Software licensed hereunder, and reproduce the + Software intellectual property notice, + + 4. where it is distributed to a third party that may distribute a + Modified Software without having to make its source code + available, make its best efforts to ensure that said third party + agrees to comply with the obligations set forth in this Article . + +If the Software, whether or not modified, is distributed with an +External Module designed for use in connection with the Software, the +Licensee shall submit said External Module to the foregoing obligations. + + + 5.3.5 COMPATIBILITY WITH THE CeCILL AND CeCILL-C LICENSES + +Where a Modified Software contains a Contribution subject to the CeCILL +license, the provisions set forth in Article 5.3.4 shall be optional. + +A Modified Software may be distributed under the CeCILL-C license. In +such a case the provisions set forth in Article 5.3.4 shall be optional. + + + Article 6 - INTELLECTUAL PROPERTY + + + 6.1 OVER THE INITIAL SOFTWARE + +The Holder owns the economic rights over the Initial Software. Any or +all use of the Initial Software is subject to compliance with the terms +and conditions under which the Holder has elected to distribute its work +and no one shall be entitled to modify the terms and conditions for the +distribution of said Initial Software. + +The Holder undertakes that the Initial Software will remain ruled at +least by this Agreement, for the duration set forth in Article 4.2. + + + 6.2 OVER THE CONTRIBUTIONS + +The Licensee who develops a Contribution is the owner of the +intellectual property rights over this Contribution as defined by +applicable law. + + + 6.3 OVER THE EXTERNAL MODULES + +The Licensee who develops an External Module is the owner of the +intellectual property rights over this External Module as defined by +applicable law and is free to choose the type of agreement that shall +govern its distribution. + + + 6.4 JOINT PROVISIONS + +The Licensee expressly undertakes: + + 1. not to remove, or modify, in any manner, the intellectual property + notices attached to the Software; + + 2. to reproduce said notices, in an identical manner, in the copies + of the Software modified or not. + +The Licensee undertakes not to directly or indirectly infringe the +intellectual property rights of the Holder and/or Contributors on the +Software and to take, where applicable, vis-à-vis its staff, any and all +measures required to ensure respect of said intellectual property rights +of the Holder and/or Contributors. + + + Article 7 - RELATED SERVICES + +7.1 Under no circumstances shall the Agreement oblige the Licensor to +provide technical assistance or maintenance services for the Software. + +However, the Licensor is entitled to offer this type of services. The +terms and conditions of such technical assistance, and/or such +maintenance, shall be set forth in a separate instrument. Only the +Licensor offering said maintenance and/or technical assistance services +shall incur liability therefor. + +7.2 Similarly, any Licensor is entitled to offer to its licensees, under +its sole responsibility, a warranty, that shall only be binding upon +itself, for the redistribution of the Software and/or the Modified +Software, under terms and conditions that it is free to decide. Said +warranty, and the financial terms and conditions of its application, +shall be subject of a separate instrument executed between the Licensor +and the Licensee. + + + Article 8 - LIABILITY + +8.1 Subject to the provisions of Article 8.2, the Licensee shall be +entitled to claim compensation for any direct loss it may have suffered +from the Software as a result of a fault on the part of the relevant +Licensor, subject to providing evidence thereof. + +8.2 The Licensor's liability is limited to the commitments made under +this Agreement and shall not be incurred as a result of in particular: +(i) loss due the Licensee's total or partial failure to fulfill its +obligations, (ii) direct or consequential loss that is suffered by the +Licensee due to the use or performance of the Software, and (iii) more +generally, any consequential loss. In particular the Parties expressly +agree that any or all pecuniary or business loss (i.e. loss of data, +loss of profits, operating loss, loss of customers or orders, +opportunity cost, any disturbance to business activities) or any or all +legal proceedings instituted against the Licensee by a third party, +shall constitute consequential loss and shall not provide entitlement to +any or all compensation from the Licensor. + + + Article 9 - WARRANTY + +9.1 The Licensee acknowledges that the scientific and technical +state-of-the-art when the Software was distributed did not enable all +possible uses to be tested and verified, nor for the presence of +possible defects to be detected. In this respect, the Licensee's +attention has been drawn to the risks associated with loading, using, +modifying and/or developing and reproducing the Software which are +reserved for experienced users. + +The Licensee shall be responsible for verifying, by any or all means, +the suitability of the product for its requirements, its good working +order, and for ensuring that it shall not cause damage to either persons +or properties. + +9.2 The Licensor hereby represents, in good faith, that it is entitled +to grant all the rights over the Software (including in particular the +rights set forth in Article 5). + +9.3 The Licensee acknowledges that the Software is supplied "as is" by +the Licensor without any other express or tacit warranty, other than +that provided for in Article 9.2 and, in particular, without any warranty +as to its commercial value, its secured, safe, innovative or relevant +nature. + +Specifically, the Licensor does not warrant that the Software is free +from any error, that it will operate without interruption, that it will +be compatible with the Licensee's own equipment and software +configuration, nor that it will meet the Licensee's requirements. + +9.4 The Licensor does not either expressly or tacitly warrant that the +Software does not infringe any third party intellectual property right +relating to a patent, software or any other property right. Therefore, +the Licensor disclaims any and all liability towards the Licensee +arising out of any or all proceedings for infringement that may be +instituted in respect of the use, modification and redistribution of the +Software. Nevertheless, should such proceedings be instituted against +the Licensee, the Licensor shall provide it with technical and legal +assistance for its defense. Such technical and legal assistance shall be +decided on a case-by-case basis between the relevant Licensor and the +Licensee pursuant to a memorandum of understanding. The Licensor +disclaims any and all liability as regards the Licensee's use of the +name of the Software. No warranty is given as regards the existence of +prior rights over the name of the Software or as regards the existence +of a trademark. + + + Article 10 - TERMINATION + +10.1 In the event of a breach by the Licensee of its obligations +hereunder, the Licensor may automatically terminate this Agreement +thirty (30) days after notice has been sent to the Licensee and has +remained ineffective. + +10.2 A Licensee whose Agreement is terminated shall no longer be +authorized to use, modify or distribute the Software. However, any +licenses that it may have granted prior to termination of the Agreement +shall remain valid subject to their having been granted in compliance +with the terms and conditions hereof. + + + Article 11 - MISCELLANEOUS + + + 11.1 EXCUSABLE EVENTS + +Neither Party shall be liable for any or all delay, or failure to +perform the Agreement, that may be attributable to an event of force +majeure, an act of God or an outside cause, such as defective +functioning or interruptions of the electricity or telecommunications +networks, network paralysis following a virus attack, intervention by +government authorities, natural disasters, water damage, earthquakes, +fire, explosions, strikes and labor unrest, war, etc. + +11.2 Any failure by either Party, on one or more occasions, to invoke +one or more of the provisions hereof, shall under no circumstances be +interpreted as being a waiver by the interested Party of its right to +invoke said provision(s) subsequently. + +11.3 The Agreement cancels and replaces any or all previous agreements, +whether written or oral, between the Parties and having the same +purpose, and constitutes the entirety of the agreement between said +Parties concerning said purpose. No supplement or modification to the +terms and conditions hereof shall be effective as between the Parties +unless it is made in writing and signed by their duly authorized +representatives. + +11.4 In the event that one or more of the provisions hereof were to +conflict with a current or future applicable act or legislative text, +said act or legislative text shall prevail, and the Parties shall make +the necessary amendments so as to comply with said act or legislative +text. All other provisions shall remain effective. Similarly, invalidity +of a provision of the Agreement, for any reason whatsoever, shall not +cause the Agreement as a whole to be invalid. + + + 11.5 LANGUAGE + +The Agreement is drafted in both French and English and both versions +are deemed authentic. + + + Article 12 - NEW VERSIONS OF THE AGREEMENT + +12.1 Any person is authorized to duplicate and distribute copies of this +Agreement. + +12.2 So as to ensure coherence, the wording of this Agreement is +protected and may only be modified by the authors of the License, who +reserve the right to periodically publish updates or new versions of the +Agreement, each with a separate number. These subsequent versions may +address new issues encountered by Free Software. + +12.3 Any Software distributed under a given version of the Agreement may +only be subsequently distributed under the same version of the Agreement +or a subsequent version. + + + Article 13 - GOVERNING LAW AND JURISDICTION + +13.1 The Agreement is governed by French law. The Parties agree to +endeavor to seek an amicable solution to any disagreements or disputes +that may arise during the performance of the Agreement. + +13.2 Failing an amicable solution within two (2) months as from their +occurrence, and unless emergency proceedings are necessary, the +disagreements or disputes shall be referred to the Paris Courts having +jurisdiction, by the more diligent Party. + + +Version 1.0 dated 2006-09-05. + diff --git a/README b/README index e69de29..cd9c2b2 100644 --- a/README +++ b/README @@ -0,0 +1,169 @@ +OpenSondage est un fork du projet STUdS : https://sourcesup.cru.fr/projects/studs/ + +Les auteurs principaux du projet STUdS sont : +- Guilhem BORGHESI +- Raphaël DROZ + + +========================================================================== + +Université de Strasbourg - Direction Informatique +Auteur : Guilhem BORGHESI +Création : Février 2008 + +borghesi@unistra.fr + +Ce logiciel est régi par la licence CeCILL-B soumise au droit français et +respectant les principes de diffusion des logiciels libres. Vous pouvez +utiliser, modifier et/ou redistribuer ce programme sous les conditions +de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +sur le site "http://www.cecill.info". + +Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +pris connaissance de la licence CeCILL-B, et que vous en avez accepté les +termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. + +========================================================================== + +Université de Strasbourg - Direction Informatique +Author : Guilhem BORGHESI +Creation : Feb 2008 + +borghesi@unistra.fr + +This software is governed by the CeCILL-B license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL-B +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL-B license and that you accept its terms. You can +find a copy of this license in the file LICENSE. + +========================================================================== + +============================================================================= +Fichiers de l'application +============================================================================= + +index.php + La page d'accueil de STUdS +studs.php + La page de présentation de sondage +adminstuds.php + La page d'administration réservée à l'auteur du sondage +infos_sondage.php + La page (1/2) de création de sondage récupérant les informations générales +choix_date.php + La page de création (2/2) pour un sondage pour déterminer une date +choix_autre.php + La page de création (2/2) pour un sondage sur un sujet quelconque +creation_sondage.php + Le fichier qui récupérent les informations des pages précédentes pour procéder à l'insertion du nouveau sondage dans la base PostgreSQL +style.css + Le fichier CSS de style pour toute l'application +variables.php + Le fichier contenant les variables à changer en fonction de la machine locale +fonctions.php + Le fichier contenant quelques fonctions récurrentes de l'application +i18n.php + Le fichier contenant quelques fonctions récurrentes de l'application relatives à l'internationalisation +README + Ce fichier +INSTALL + Le fichier contenant les informations d'installation sur l'application +CHANGELOG + Le fichier contenant toutes les modifications de l'application entre les différentes versions +contacts.php + La page permettant aux usagers de poser une question à l'administrateur de l'application +apropos.php + La page expliquant les détails techniques relatifs à l'application et les dernieres modifications et celles à venir sur l'application +bandeaux.php + Le fichier contenant tous les bandeaux des pages PHP de l'application +favicon.ico + L'icone de favoris de l'application +sources.php + La page qui propose les sources de l'application +exportics.php + Le fichier d'export de la meilleure date au format iCAL (fichier .ICS) +exportcsv.php + Le fichier d'export de tous le tableau des participants avec leurs réponses dans un tableur (format .CSV) +exportpdf.php + Le fichier d'export de la lettre de convocation que le créateur du sondage pourra envoyer aux participants (format .PDF) + +admin/ + Le répertoire réservé à l'administrateur de l'application +admin/.htaccess + Le fichier gérant les droits restreints du répertoire ADMIN +admin/.htpasswd + Le fichier contenant les passwd des logins ayant accès au répertoire ADMIN +admin/index.php + La page présentant tous les sondages actuellement dans la base à l'administrateur +admin/log_studs.txt + Le fichier contenant un historique de toutes les creations/suppressions de sondage dans la base + +errors/ + Le répertoire contenant toutes les pages d'erreurs +errors/error-forbidden.php + La page qui indique dans la charte graphique de l'application l'erreur "501 forbidden" +errors/maintenance.php + La page qui indique que l'application est en maintenance temporaire + +export/ + Le répertoire qui contient tous les exports ICS + +iCalcreator/ + Le répertoire qui contient les librairies d'export en iCal + +php2pdf/ + Le répertoire qui contient les librairies d'export en PDF + +scripts/ + Le répertoire qui contient tous les scripts de l'application + +sources/ + Le répertoire qui contient les sources de l'application disponible sur la page sources.php + +locale/ + Le répertoire qui contient les fichiers de traduction modifiables (.po) et compilés (.mo) + au format gettext + +============================================================================= + Validations des pages +============================================================================= + +Toutes les pages de STUdS sont validées HTML 4.01 Strict. +La CSS de STUdS est validée CSS 2.1. + +============================================================================= +Technologies utilisées +============================================================================= + +- PHP, php-fpdf, php-adodb, php-gettext +- PostgreSQL, mysql +- Apache +- Subversion +- iCalcreator +- POedit +- Icônes : Deleket (http://deleket.deviantart.com/) et DryIcons (http://dryicons.com) + +============================================================================= +Compatibilités des navigateurs +============================================================================= + +- Firefox +- Opera +- Konqueror +- Links +- Safari +- IE + +----------------- +Janvier 2008 +Guilhem BORGHESI +Université de Strasbourg + +Mai 2010 +Raphaël DROZ, raphael.droz@gmail.com + diff --git a/TODO b/TODO new file mode 100644 index 0000000..8aaf261 --- /dev/null +++ b/TODO @@ -0,0 +1,8 @@ +- case "Tout cocher" +- nom modifiable +- taille de colonne fixe lorsqu'un sondage ne spécifie pas les heures + (ou sondage à choix multiples "autre") +- vérifier la duplication de commentaires +- gestion auth intranet +- ajout de colonne de date graphique dans l'administration + diff --git a/admin/.htaccess b/admin/.htaccess new file mode 100644 index 0000000..c6b0600 --- /dev/null +++ b/admin/.htaccess @@ -0,0 +1,7 @@ +AuthType basic +AuthName "Administration de STUDS" +# replace with your server path here +# added content to the .htpasswd file with +# htpasswd -mnb +AuthUserFile /var/www/studs/admin/.htpasswd +Require valid-user diff --git a/admin/index.php b/admin/index.php new file mode 100644 index 0000000..9ce186e --- /dev/null +++ b/admin/index.php @@ -0,0 +1,151 @@ +'."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +echo 'ADMINISTRATEUR de la base '.NOMAPPLICATION.''."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; + +//Affichage des bandeaux et début du formulaire +logo(); +bandeau_tete(); +bandeau_titre(_("Polls administrator")); +sous_bandeau_admin(); + +$sondage=$connect->Execute("select * from sondage"); + +echo'
'."\n"; +echo '
'."\n"; +// Test et affichage du bouton de confirmation en cas de suppression de sondage +$i=0; +while($dsondage = $sondage->FetchNextObject(false)) { + if ($_POST["supprimersondage$i"]){ + echo ''."\n"; + echo ''."\n"; + echo '
'. _("Confirm removal of the poll ") .'"'.$dsondage->id_sondage.'" : '."\n"; + echo '
'."\n"; + echo '
'."\n"; + } + // Traitement de la confirmation de suppression + + if ($_POST["confirmesuppression$i"]){ + + $date=date('H:i:s d/m/Y'); + + // requetes SQL qui font le ménage dans la base + $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . + 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . + "WHERE id_sondage = '$dsondage->id_sondage' "); + + // ecriture des traces dans le fichier de logs + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 'logs_studs.txt'); + + } + $i++; +} + + +$sondage=$connect->Execute("select * from sondage"); +$nbsondages=$sondage->RecordCount(); + +echo $nbsondages.' '. _("polls in the database at this time") .'

'."\n"; + +// tableau qui affiche tous les sondages de la base +echo ''."\n"; + +echo ''."\n"; + + +$i = 0; +while($dsondage = $sondage->FetchNextObject(false)) { + /* possible en 1 bonne requête dans $sondage */ + $sujets=$connect->Execute( "select * from sujet_studs where id_sondage='$dsondage->id_sondage'"); + $dsujets=$sujets->FetchObject(false); + + $user_studs=$connect->Execute( "select * from user_studs where id_sondage='$dsondage->id_sondage'"); + $nbuser=$user_studs->RecordCount(); + + echo ''; + + if (strtotime($dsondage->date_fin) > time()){ + echo ''; + } + else{ + echo ''; + } + + echo''."\n"; + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + echo ''."\n"; + $i++; +} + +echo '
'. _("Poll ID") .''. _("Format") .''. _("Title") .''. _("Author") .''. _("Expiration's date") .''. _("Users") .''. _("Actions") .'
'.$dsondage->id_sondage.''.$dsondage->format.''.$dsondage->titre.''.$dsondage->nom_admin.''.date("d/m/y",strtotime($dsondage->date_fin)).''.date("d/m/y",strtotime($dsondage->date_fin)).''.$nbuser.''. _("See the poll") .''. _("Change the poll") .'
'."\n"; +echo'
'."\n"; +// fin du formulaire et de la page web +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; + +// si on annule la suppression, rafraichissement de la page +if ($_POST["annulesuppression"]){ +} + +?> diff --git a/admin/logs_studs.txt b/admin/logs_studs.txt new file mode 100644 index 0000000..d8abac4 --- /dev/null +++ b/admin/logs_studs.txt @@ -0,0 +1,2 @@ + +16:34:47 06/06/2010: SUPPRESSION: u5rbpzr2aja7eajb D+ Raph raph@aze.com 3 17:02:51 06/06/2010: CREATION: pii9tzo2dku973qa A+ azeazeaz zezerer@azedqs.com bloup,plop,foo,bar,pz,wx diff --git a/adminstuds.php b/adminstuds.php new file mode 100644 index 0000000..924fd6c --- /dev/null +++ b/adminstuds.php @@ -0,0 +1,1050 @@ +Execute("SELECT * FROM sondage WHERE id_sondage_admin = '$numsondageadmin'"); + $sujets=$connect->Execute("SELECT * FROM sujet_studs WHERE id_sondage='$numsondage'"); + $user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' order by id_users"); + +} + +//verification de l'existence du sondage, s'il n'existe pas on met une page d'erreur +if (!$sondage || $sondage->RecordCount() != 1){ + print_header(false); + echo ''."\n"; + + logo(); + bandeau_tete(); + bandeau_titre(_("Error!")); + echo '
'."\n"; + print "

" . _("This poll doesn't exist !") . "



"."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; + echo '



'."\n"; + echo '
'."\n"; +# sur_bandeau_pied(); + bandeau_pied(); + + echo''."\n"; + echo ''."\n"; + die(); +} + +$dsujet=$sujets->FetchObject(false); +$dsondage=$sondage->FetchObject(false); + + +//si la valeur du nouveau titre est valide et que le bouton est activé +$adresseadmin = $dsondage->mail_admin; +$headers_str = << +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +EOF; +$header = sprintf($headers_str, NOMAPPLICATION, ADRESSEMAILADMIN ); + + +if (isset($_POST["boutonnouveautitre"])) { + if(! isset($_POST["nouveautitre"]) || empty($_POST["nouveautitre"])) + $err |= TITLE_EMPTY; + else { + //envoi du mail pour prevenir l'admin de sondage + mail ($adresseadmin, + _("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION, + _("You have changed the title of your poll. \nYou can modify this poll with this link") . + " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin\n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); + + //modification de la base SQL avec le nouveau titre + $connect->Execute("UPDATE sondage SET titre = '" . $connect->qstr(strip_tags($_POST['nouveautitre'])) . "' WHERE id_sondage = '" . $numsondage . "'"); + } +} + +// si le bouton est activé, quelque soit la valeur du champ textarea +if (isset($_POST["boutonnouveauxcommentaires"])) { + if(! isset($_POST["nouveautitre"]) || empty($_POST["nouveautitre"])) + $err |= COMMENT_EMPTY; + else { + //envoi du mail pour prevenir l'admin de sondage + mail ($adresseadmin, + _("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION, + _("You have changed the comments of your poll. \nYou can modify this poll with this link") . + " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin \n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); + + //modification de la base SQL avec les nouveaux commentaires + $connect->Execute("UPDATE sondage SET commentaires = '" . $connect->qstr(strip_tags($nouveauxcommentaires)) . "' WHERE id_sondage = '" . $numsondage . "'"); + } +} + +//si la valeur de la nouvelle adresse est valide et que le bouton est activé +if (isset($_POST["boutonnouvelleadresse"])){ + if(! isset($_POST["nouvelleadresse"]) || empty($_POST["nouvelleadresse"]) || + ! filter_var($_POST["nouvelleadresse"], FILTER_VALIDATE_EMAIL) || strpos($_POST["nouvelleadresse"], '@') === false) + $err |= INVALID_EMAIL; + else { + //envoi du mail pour prevenir l'admin de sondage + mail ($_POST['nouvelleadresse'], + _("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION, + _("You have changed your email address in your poll. \nYou can modify this poll with this link") . + " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin\n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); + //modification de la base SQL avec la nouvelle adresse + $connect->Execute("UPDATE sondage SET mail_admin = '" . $_POST['nouvelleadresse'] . "' WHERE id_sondage = '" . $numsondage . "'"); + } +} + +// reload +$dsujet=$sujets->FetchObject(false); +$dsondage=$sondage->FetchObject(false); + +if ($_POST["ajoutsujet_x"]){ + + print_header(true); + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Make your polls")); + sous_bandeau(); + + //on recupere les données et les sujets du sondage + echo '
'."\n"; + + echo '
'."\n"; + print "

" . _("Column's adding") . "



"."\n"; + + if ($dsondage->format=="A"||$dsondage->format=="A+"){ + echo _("Add a new column") .' :


'."\n"; + } + else{ +//ajout d'une date avec creneau horaire + echo _("You can add a new scheduling date to your poll.
If you just want to add a new hour to an existant date, put the same date and choose a new hour.") .'

'."\n"; + echo _("Add a date") .' :

'."\n"; + echo ''."\n"; + + echo ''."\n"; + + + echo ''."\n"; + echo '

'. _("Add a start hour (optional)") .' :

'."\n"; + echo ''."\n"; + echo ''."\n"; + echo '

'. _("Add a end hour (optional)") .' :

'."\n"; + echo ''."\n"; + echo ''."\n"; + + + echo '

'."\n"; + echo' '."\n"; + + } + + echo ''."\n"; + echo '



'."\n"; + echo '
'."\n"; + + bandeau_pied(); + + echo''."\n"; + echo ''."\n"; + die(); +} + +//action si bouton confirmation de suppression est activé +if ($_POST["confirmesuppression"]){ + $nbuser=$user_studs->RecordCount(); + $date=date('H:i:s d/m/Y:'); + + // on ecrit dans le fichier de logs la suppression du sondage + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 3, 'admin/logs_studs.txt'); + + //envoi du mail a l'administrateur du sondage + mail ($adresseadmin, + _("[ADMINISTRATOR] Removing of your poll") . ' ' . NOMAPPLICATION, + _("You have removed your poll. \nYou can make new polls with this link") . + " :\n\n".get_server_name()."index.php \n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); + + //destruction des données dans la base SQL + $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . + 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . + "WHERE id_sondage = '$numsondage' "); + + //affichage de l'ecran de confirmation de suppression de sondage + print_header(); + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Make your polls")); + + echo '
'."\n"; + print "

" . _("Your poll has been removed!") . "



"; + print _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; + echo '


'."\n"; + echo '
'."\n"; + sur_bandeau_pied(); + bandeau_pied(); + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + die(); +} + +// quand on ajoute un commentaire utilisateur +if(isset($_POST['ajoutcomment'])) { + if(!isset($_POST["commentuser"]) || empty($_POST["commentuser"])) + $err |= COMMENT_USER_EMPTY; + else + $comment_user = $connect->qstr(strip_tags($_POST["commentuser"])); + if(empty($_POST["comment"])) + $err |= COMMENT_EMPTY; + + if (isset($_POST["comment"]) && + ! is_error(COMMENT_EMPTY) && ! is_error(NO_POLL) && + ! is_error(COMMENT_USER_EMPTY)) { + if( ! $connect->Execute('INSERT INTO comments ' . + '(id_sondage, comment, usercomment) VALUES ("'. + $numsondage . '","'. + $connect->qstr(strip_tags($_POST['comment'])). + '","' . + $comment_user .'")') ); + $err |= COMMENT_INSERT_FAILED; + } +} + + +//s'il existe on affiche la page normale +// DEBUT DE L'AFFICHAGE DE LA PAGE HTML +print_header(true); +echo ''."\n"; +logo(); +bandeau_tete(); +bandeau_titre(_("Make your polls")); +sous_bandeau(); + +echo '
'."\n"; + +//affichage du titre du sondage +$titre=str_replace("\\","",$dsondage->titre); +echo '

'.$titre.'

'."\n"; + +//affichage du nom de l'auteur du sondage +echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'
'."\n"; + +//affichage des commentaires du sondage +if ($dsondage->commentaires){ + echo '
'. _("Comments") .' :
'."\n"; + $commentaires=$dsondage->commentaires; + $commentaires=str_replace("\\","",$commentaires); + echo $commentaires; + echo '
'."\n"; +} +echo '
'."\n"; +echo '
'."\n"; + + +$nbcolonnes=substr_count($dsujet->sujet,',')+1; +$nblignes=$user_studs->RecordCount(); + +//si il n'y a pas suppression alors on peut afficher normalement le tableau + + //action si le bouton participer est cliqué + if ($_POST["boutonp"]||$_POST["boutonp_x"]){ + //si on a un nom dans la case texte + if ($_POST["nom"]){ + + for ($i=0;$i<$nbcolonnes;$i++){ + //si la checkbox est cochée alors valeur est egale à 1 + if (isset($_POST["choix$i"])){ + $nouveauchoix.="1"; + } + //sinon 0 + else { + $nouveauchoix.="0"; + } + } + + while( $user=$user_studs->FetchNextObject(false)) { + if ($_POST["nom"]==$user->nom){ + $erreur_prenom="yes"; + } + } + + if (preg_match(';<|>|"|\';i', $_POST["nom"])){ + $erreur_injection="yes"; + } + + + // Ecriture des choix de l'utilisateur dans la base + if (!$erreur_prenom&&!$erreur_injection){ + $nom=str_replace("'","°",$_POST["nom"]); + $connect->Execute("INSERT INTO user_studs VALUES ('$nom', '$numsondage', '$nouveauchoix')"); + } + } + + } + + + //action quand on ajoute une colonne au format AUTRE + if ($_POST["ajoutercolonne_x"] && $_POST["nouvellecolonne"]!=""&&($dsondage->format=="A"||$dsondage->format=="A+")){ + + $nouveauxsujets=$dsujet->sujet; + + //on rajoute la valeur a la fin de tous les sujets deja entrés + $nouveauxsujets.=","; + $nouveauxsujets.=str_replace(","," ",$_POST["nouvellecolonne"]); + $nouveauxsujets=str_replace("'","°",$nouveauxsujets); + + //mise a jour avec les nouveaux sujets dans la base + $connect->Execute("UPDATE sujet_studs SET sujet = '$nouveauxsujets' WHERE id_sondage = '$numsondage' "); + + //envoi d'un mail pour prévenir l'administrateur du changement + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + + } + + //action quand on ajoute une colonne au format DATE + if ($_POST["ajoutercolonne_x"] &&($dsondage->format=="D"||$dsondage->format=="D+")){ + + $nouveauxsujets=$dsujet->sujet; + + if ($_POST["nouveaujour"]!="vide"&&$_POST["nouveaumois"]!="vide"&&$_POST["nouvelleannee"]!="vide"){ + + $nouvelledate=mktime(0,0,0,$_POST["nouveaumois"],$_POST["nouveaujour"],$_POST["nouvelleannee"]); + + if ($_POST["nouvelleheuredebut"]!="vide"){ + + $nouvelledate.="@"; + $nouvelledate.=$_POST["nouvelleheuredebut"]; + $nouvelledate.="h"; + + if ($_POST["nouvelleminutedebut"]!="vide"){ + $nouvelledate.=$_POST["nouvelleminutedebut"]; + } + } + if ($_POST["nouvelleheurefin"]!="vide"){ + $nouvelledate.="-"; + $nouvelledate.=$_POST["nouvelleheurefin"]; + $nouvelledate.="h"; + + if ($_POST["nouvelleminutefin"]!="vide"){ + $nouvelledate.=$_POST["nouvelleminutefin"]; + } + } + if($_POST["nouvelleheuredebut"]=="vide"||($_POST["nouvelleheuredebut"]&&$_POST["nouvelleheurefin"]&&(($_POST["nouvelleheuredebut"]<$_POST["nouvelleheurefin"])||(($_POST["nouvelleheuredebut"]==$_POST["nouvelleheurefin"])&&($_POST["nouvelleminutedebut"]<$_POST["nouvelleminutefin"]))))){ + + } + else {$erreur_ajout_date="yes";} + + //on rajoute la valeur dans les valeurs + $datesbase=explode(",",$dsujet->sujet); + $taillebase=sizeof($datesbase); + + //recherche de l'endroit de l'insertion de la nouvelle date dans les dates deja entrées dans le tableau + + if ($nouvelledate<$datesbase[0]){ + $cleinsertion=0; + } + elseif ($nouvelledate>$datesbase[$taillebase-1]){ + $cleinsertion=count($datesbase); + } + else{ + for ($i=0;$i$datesbase[$i]&&$nouvelledate<$datesbase[$j]){ + $cleinsertion=$j; + } + } + } + + + array_splice($datesbase,$cleinsertion,0,$nouvelledate); + + $cle=array_search ($nouvelledate,$datesbase); + + for ($i=0;$iExecute("UPDATE sujet_studs SET sujet = '$dateinsertion' WHERE id_sondage = '$numsondage' "); + if ($nouvelledate > strtotime($dsondage->date_fin)){ + $date_fin=$nouvelledate+200000; + $connect->Execute("UPDATE sondage SET date_fin = '$date_fin' WHERE id_sondage = '$numsondage' "); + } + } + + //mise a jour des reponses actuelles correspondant au sujet ajouté + while ( $data=$user_studs->FetchNextObject(false)) { + $ensemblereponses=$data->reponses; + + //parcours de toutes les réponses actuelles + for ($j=0;$j<$nbcolonnes;$j++){ + $car=substr($ensemblereponses,$j,1); + + //si les reponses ne concerne pas la colonne ajoutée, on concatene + if ($j==$cle){ + $newcar.="0"; + } + $newcar.=$car; + } + //mise a jour des reponses utilisateurs dans la base + if (!$erreur_ajout_date){ + $connect->Execute("update user_studs set reponses='$newcar' where nom='$data->nom' and id_users=$data->id_users"); + } + $newcar=""; + } + + //envoi d'un mail pour prévenir l'administrateur du changement + $adresseadmin=$dsondage->mail_admin; + + mail ($adresseadmin, + _("[ADMINISTRATOR] New column for your poll"), + _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, + $headers); + + } + else {$erreur_ajout_date="yes";} + } + + //suppression de ligne dans la base + for ($i=0;$i<$nblignes;$i++){ + if ($_POST["effaceligne$i"]||$_POST['effaceligne'.$i.'_x']){ + $compteur=0; + while ($data=$user_studs->FetchNextObject(false)) { + + if ($compteur==$i){ + $connect->Execute("delete from user_studs where nom = '$data->nom' and id_users = '$data->id_users'"); + } + $compteur++; + } + } + } + + //suppression d'un commentaire utilisateur + + $comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); + $i = 0; + while ($dcomment = $comment_user->FetchNextObject(false)) { + if ($_POST['suppressioncomment'.$i.'_x']){ + $connect->Execute("delete from comments where id_comment = '$dcomment->id_comment'"); + } + $i++; + } + + //on teste pour voir si une ligne doit etre modifiée + for ($i=0;$i<$nblignes;$i++){ + if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])){ + $ligneamodifier=$i; + $testligneamodifier="true"; + } + //test pour voir si une ligne est a modifier + if (isset($_POST["validermodifier$i"])){ + $modifier=$i; + $testmodifier="true"; + } + } + + //si le test est valide alors on affiche des checkbox pour entrer de nouvelles valeurs + if ($testmodifier){ + + for ($i=0;$i<$nbcolonnes;$i++){ + //recuperation des nouveaux choix de l'utilisateur + if (isset($_POST["choix$i"])){ + $nouveauchoix.="1"; + } + else { + $nouveauchoix.="0"; + } + } + + $compteur=0; + while ( $data=$user_studs->FetchNextObject(false)) { + //mise a jour des données de l'utilisateur dans la base SQL + if ($compteur==$modifier){ + $connect->Execute("update user_studs set reponses='$nouveauchoix' where nom='$data->nom' and id_users='$data->id_users'"); + } + $compteur++; + } + } + + //suppression de colonnes dans la base + for ($i=0;$i<$nbcolonnes;$i++){ + if ((isset($_POST["effacecolonne$i"])||isset($_POST['effacecolonne'.$i.'_x']))&&$nbcolonnes>1){ + + $toutsujet=explode(",",$dsujet->sujet); + $j=0; + + //parcours de tous les sujets actuels + while ($toutsujet[$j]){ + //si le sujet n'est pas celui qui a été effacé alors on concatene + if ($i!=$j){ + $nouveauxsujets.=','; + $nouveauxsujets.=$toutsujet[$j]; + } + $j++; + } + //on enleve la virgule au début + $nouveauxsujets=substr("$nouveauxsujets",1); + + //nettoyage des reponses actuelles correspondant au sujet effacé + $compteur = 0; + while ($data=$user_studs->FetchNextObject(false)) { + + $ensemblereponses=$data->reponses; + + //parcours de toutes les réponses actuelles + for ($j=0;$j<$nbcolonnes;$j++){ + $car=substr($ensemblereponses,$j,1); + //si les reponses ne concerne pas la colonne effacée, on concatene + if ($i!=$j){ + $newcar.=$car; + } + } + + $compteur++; + + //mise a jour des reponses utilisateurs dans la base + $connect->Execute("update user_studs set reponses='$newcar' where nom='$data->nom' and id_users=$data->id_users"); + $newcar=""; + } + //mise a jour des sujets dans la base + $connect->Execute("update sujet_studs set sujet = '$nouveauxsujets' where id_sondage = '$numsondage' "); + + } + + } + + //recuperation des donnes de la base + $sondage=$connect->Execute("select * from sondage where id_sondage_admin = '$numsondageadmin'"); + $sujets=$connect->Execute("select * from sujet_studs where id_sondage='$numsondage'"); + $user_studs=$connect->Execute("select * from user_studs where id_sondage='$numsondage' order by id_users"); + //on recupere les données et les sujets du sondage + $dsujet=$sujets->FetchObject(false); + $dsondage=$sondage->FetchObject(false); + + $toutsujet=explode(",",$dsujet->sujet); + $toutsujet=str_replace("@","
",$toutsujet); + $toutsujet=str_replace("°","'",$toutsujet); + $nbcolonnes=substr_count($dsujet->sujet,',')+1; + + echo '
'."\n"; + echo '
'."\n"; + echo _('As poll administrator, you can change all the lines of this poll with infos.
You can, as well, remove a column or a line with Cancel.
You can also add a new column with Add column.
Finally, you can change the informations of this poll like the title, the comments or your email address.') ."\n"; + + echo '

'."\n"; + + //debut de l'affichage de résultats + echo ''."\n"; + + //reformatage des données des sujets du sondage + $toutsujet=explode(",",$dsujet->sujet); + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //boucle pour l'affichage des boutons de suppression de colonne + for ($i=0;$toutsujet[$i];$i++){ + echo ''."\n"; + } + echo ''."\n"; + +//si le sondage est un sondage de date +if ($dsondage->format=="D"||$dsondage->format=="D+"){ + +//affichage des sujets du sondage + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //affichage des années + $colspan=1; + for ($i=0;$i'.strftime("%Y",$toutsujet[$i]).''."\n"; + $colspan=1; + } + } + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + //affichage des mois + $colspan=1; + for ($i=0;$i'.date("F",$toutsujet[$i]).''."\n"; + else + echo ''."\n"; + $colspan=1; + } + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + //affichage des jours + $colspan=1; + for ($i=0;$i'.date("D jS",$toutsujet[$i]).''."\n"; + else + echo ''."\n"; + $colspan=1; + } + } + echo ''."\n"; + echo ''."\n"; + //affichage des horaires + if (strpos($dsujet->sujet,'@') !== false){ + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$toutsujet[$i];$i++){ + $heures=explode("@",$toutsujet[$i]); + echo ''."\n"; + } + echo ''."\n"; + echo ''."\n"; + } + +} + +else { + $toutsujet=str_replace("°","'",$toutsujet); + +//affichage des sujets du sondage + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$toutsujet[$i];$i++){ + + echo ''."\n"; + } + echo ''."\n"; + echo ''."\n"; + +} + + + //affichage des resultats + $somme[]=0; + $compteur = 0; + while ( $data=$user_studs->FetchNextObject(false)) { + $ensemblereponses=$data->reponses; + + echo ''."\n"; + + echo ''."\n"; + + + //affichage du nom + $nombase=str_replace("°","'",$data->nom); + + echo ''."\n"; + + //si la ligne n'est pas a changer, on affiche les données + if (!$testligneamodifier){ + for ($k=0;$k<$nbcolonnes;$k++){ + $car=substr($ensemblereponses,$k,1); + if ($car=="1"){ + echo ''."\n"; + $somme[$k]++; + } + else { + echo ''."\n"; + } + } + } + //sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs + else { + //si c'est bien la ligne a modifier on met les checkbox + if ($compteur=="$ligneamodifier"){ + for ($j=0;$j<$nbcolonnes;$j++){ + + $car=substr($ensemblereponses,$j,1); + if ($car=="1"){ + echo ''."\n"; + } + else { + echo ''."\n"; + } + } + } + //sinon on affiche les lignes normales + else { + for ($k=0;$k<$nbcolonnes;$k++){ + $car=substr($ensemblereponses,$k,1); + if ($car=="1"){ + echo ''."\n"; + $somme[$k]++; + } + else { + echo ''."\n"; + } + } + } + + } + + //a la fin de chaque ligne se trouve les boutons modifier + if (!$testligneamodifier=="true"){ + echo ''."\n"; + } + + //demande de confirmation pour modification de ligne + for ($i=0;$i<$nblignes;$i++){ + if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])){ + if ($compteur==$i){ + echo ''."\n"; + } + } + } + + + + $compteur++; + echo ''."\n"; + + } + + //affichage de la case vide de texte pour un nouvel utilisateur + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //une ligne de checkbox pour le choix du nouvel utilisateur + for ($i=0;$i<$nbcolonnes;$i++){ + echo ''."\n"; + } + // Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base + echo ''."\n"; + + echo ''."\n"; + + //determination du meilleur choix + for ($i=0;$i<$nbcolonnes+1;$i++){ + if ($i=="0"){ + $meilleurecolonne=$somme[$i]; + } + if ($somme[$i]>$meilleurecolonne){ + $meilleurecolonne=$somme[$i]; + } + } + + //affichage de la ligne contenant les sommes de chaque colonne + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$i<$nbcolonnes;$i++){ + $affichesomme=$somme[$i]; + if ($affichesomme==""){$affichesomme="0";} + if ($somme[$i]==$meilleurecolonne){ + echo ''."\n"; + } + else { + echo ''."\n"; + } + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + for ($i=0;$i<$nbcolonnes;$i++){ + if ($somme[$i]==$meilleurecolonne&&$somme[$i]){ + echo ''."\n"; + } + else { + echo ''."\n"; + } + } + echo ''."\n"; + + + // S'il a oublié de remplir un nom + if (($_POST["boutonp"]||$_POST["boutonp_x"])&&$_POST["nom"]=="") { + echo ''."\n"; + print "'."\n"; + } + if ($erreur_prenom){ + echo ''."\n"; + print "\n"; + echo ''."\n"; + } + if ($erreur_injection){ + echo ''."\n"; + print "\n"; + echo ''."\n"; + } + if ($erreur_ajout_date){ + echo ''."\n"; + print "\n"; + echo ''."\n"; + } + //fin du tableau + echo '
'.strftime("%B",$toutsujet[$i]).'
'.strftime("%a %e",$toutsujet[$i]).'
'.$heures[1].'
'.$toutsujet[$i].'
'.$nombase.'OKOK
'."\n"; + echo '
'."\n"; + echo '
'. _("Addition") .''.$affichesomme.''.$affichesomme.'
Meilleur resultat
" . _("Enter a name !") . "\n"; + echo '
" . _("The name you've chosen already exist in this poll!") . "
" . _("Characters \" ' < et > are not permitted") . "
" . _("The date is not correct !") . "
'."\n"; + echo '
'."\n"; + + //focus en javascript sur le champ texte pour le nom d'utilisateur + echo ''."\n"; + + //recuperation des valeurs des sujets et adaptation pour affichage + $toutsujet=explode(",",$dsujet->sujet); + + //recuperation des sujets des meilleures colonnes + $compteursujet=0; + for ($i=0;$i<$nbcolonnes;$i++){ + if ($somme[$i]==$meilleurecolonne){ + $meilleursujet.=", "; + if ($dsondage->format=="D"||$dsondage->format=="D+"){ + $meilleursujetexport=$toutsujet[$i]; + if (strpos($toutsujet[$i],'@') !== false){ + $toutsujetdate=explode("@",$toutsujet[$i]); + if ($_SESSION["langue"]=="EN") + $meilleursujet.=date("l, F jS Y",$toutsujetdate[0])." " . _("for") ." ".$toutsujetdate[1]; + else + $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujetdate[0]). ' ' . _("for") . ' ' . $toutsujetdate[1]; + } + else{ + if ($_SESSION["langue"]=="EN") + $meilleursujet.=date("l, F jS Y",$toutsujet[$i]); + else + $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujet[$i]); + } + } + else{ + $meilleursujet.=$toutsujet[$i]; + } + $compteursujet++; + } + } + + //adaptation pour affichage des valeurs + $meilleursujet=substr("$meilleursujet",1); + $meilleursujet=str_replace("°","'",$meilleursujet); + + //ajout du S si plusieurs votes + $vote_str = _('vote'); + if ($meilleurecolonne!="1") + $vote_str = _('votes'); + echo '

'."\n"; + //affichage de la phrase annoncant le meilleur sujet + if ($compteursujet=="1"&&$meilleurecolonne){ + print "\"Meilleur" . _("The best choice at this time is") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
\n"; + } + elseif ($meilleurecolonne){ + print "\"Meilleur " . _("The bests choices at this time are") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
\n"; + } + + echo '

'."\n"; + echo '

'."\n"; + echo '
'."\n"; + echo '
'."\n"; + //Gestion du sondage + echo '
'. _("Poll's management") .' :
'."\n"; + echo '

'."\n"; + echo '
'."\n"; + //Changer le titre du sondage + $adresseadmin=$dsondage->mail_admin; + echo _("Change the title") .' :
' . + ''. + '

'."\n"; + echo '

'."\n"; + + if ($dsondage->format=="D"||$dsondage->format=="D+"){ + echo '
'."\n"; + echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
'; + echo ''; + echo ''; + echo ''; + echo '

'; + echo '
'."\n"; + // ''. _("Enter a meeting place!") .'

'."\n"; + } + + // TODO + if ($_POST["exportpdf_x"]&&!$_POST["lieureunion"]){ + echo ''. _("Enter a meeting place!") .'

'."\n"; + } + + //si la valeur du nouveau titre est invalide : message d'erreur + if (($_POST["boutonnouveautitre"]||$_POST["boutonnouveautitre_x"]) && $_POST["nouveautitre"]==""){ + echo ''. _("Enter a new title!") .'

'."\n"; + } + + //Changer les commentaires du sondage + echo _("Change the comments") .' :



'."\n"; + + + //Changer l'adresse de l'administrateur + echo _("Change your email address") .' :

'."\n"; + + //si l'adresse est invalide ou le champ vide : message d'erreur + if (($_POST["boutonnouvelleadresse"]||$_POST["boutonnouvelleadresse_x"]) && $_POST["nouvelleadresse"]==""){ + echo ''. _("Enter a new email address!") .'

'."\n"; + + } + + //affichage des commentaires des utilisateurs existants + $comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); + if ($comment_user->RecordCount() != 0){ + + print "
" . _("Comments") . " :
\n"; + $i = 0; + while ( $dcomment=$comment_user->FetchNextObject(false)) { + print " $dcomment->usercomment : $dcomment->comment
"; + $i++; + } + echo '
'; + } + + if ($erreur_commentaire_vide=="yes"){ + print "" . _("Enter a name and a comment!") . ""; + } + + //affichage de la case permettant de rajouter un commentaire par les utilisateurs + print "
" . _("Add a comment in the poll") . " :
\n"; + echo _("Name") .' :
'."\n"; + echo ''."\n"; + echo '
'."\n"; + + //suppression du sondage + echo '
'."\n"; + echo _("Remove your poll") .' :

'."\n"; + if ($_POST["suppressionsondage"]){ + + echo _("Confirm removal of your poll") .' : '."\n"; + echo '

'."\n"; + } + echo ''."\n"; + echo '

'."\n"; + //fin de la partie GESTION et beandeau de pied + echo '

'."\n"; + bandeau_pied_mobile(); + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + + +?> + diff --git a/apropos.php b/apropos.php new file mode 100644 index 0000000..425abc7 --- /dev/null +++ b/apropos.php @@ -0,0 +1,120 @@ +'."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //debut du formulaire + echo '
'."\n"; + + //bandeaux de tete + logo(); + bandeau_tete(); +bandeau_titre(_("About")); + sous_bandeau(); + + //blablabla + echo '
'."\n"; + + if (NOMAPPLICATION!="STUdS !"){ + echo 'Application d\'origine

'."\n"; + echo 'L\'application '.NOMAPPLICATION.' est une instance du logiciel STUdS ! développé à l\'Université de Strasbourg depuis 2008.

'."\n"; + } + + echo 'Licence Logicielle de '.NOMAPPLICATION.'

'."\n"; + echo NOMAPPLICATION.' est placé sous la licence logicielle libre CeCILL-B.

'."\n"; + + echo 'Technologies utilisées

'."\n"; + echo '- PHP
'."\n"; + echo '- PostgreSQL
'."\n"; + echo '- Apache
'."\n"; + echo '- Subversion
'."\n"; + echo '- iCalcreator
'."\n"; + echo '- FPDF
'."\n"; + echo '- Icônes : Deleket, PixelMixer et DryIcons

'."\n"; + + echo 'Compatibilités des navigateurs

'."\n"; + echo '- Firefox
'."\n"; + echo '- Opéra
'."\n"; + echo '- Konqueror
'."\n"; + echo '- Links
'."\n"; + echo '- Safari
'."\n"; + echo '- IE

'."\n"; + + echo 'Validations des pages

'."\n"; + echo '- Toutes les pages disposent de la validation HTML 4.01 Strict du W3C.
- La CSS dispose de la validation CSS 2.1 du W3C.'."\n"; + echo '

'."\n"; + echo 'Valid HTML 4.01 StrictCSS Valide !'."\n"; + echo'

'."\n"; + + echo 'Propositions améliorations de '.NOMAPPLICATION.'

'."\n"; + + echo 'Si quelquechose venait à vous manquer, vous pouvez nous en faire part via le formulaire en ligne.
'."\n"; + + echo 'Les dernières améliorations de '.NOMAPPLICATION.' sont visibles dans le fichier CHANGELOG.

'."\n"; + + echo 'Remerciements

'."\n"; + echo 'Pour leurs contributions techniques ou ergonomiques : Guy, Christophe, Julien, Pierre, Romaric, Matthieu, Catherine, Christine, Olivier, Emmanuel et Florence

'."\n"; + + + + echo '
'."\n"; + + bandeau_pied_mobile(); + echo '
'."\n"; + echo ''."\n"; + echo ''."\n"; + +?> diff --git a/bandeaux.php b/bandeaux.php new file mode 100644 index 0000000..2824125 --- /dev/null +++ b/bandeaux.php @@ -0,0 +1,115 @@ +logo'."\n"; +} + +#le bandeau principal +function bandeau_tete(){ + echo '
'.NOMAPPLICATION.'
'."\n"; +} + +// bandeaux de titre +function bandeau_titre($titre){ + echo '
'. $titre .'
'."\n"; +} + +function liste_lang() { + global $ALLOWED_LANGUAGES; + $str = ''; + foreach ($ALLOWED_LANGUAGES as $k => $v ) + $str .= '' . $v . '' . "\n" ; + return $str; +} + +#Les sous-bandeaux contenant les boutons de navigation +function sous_bandeau(){ + echo '
' . + ''. _("Home") .'' . + ''. _("Example") .'' . + ''. _("Contact") .'' . + //''. _("Sources") .'' . //not implemented + ''. _("About") .'' . + ''. _("Admin") .'' . + + '' . + liste_lang() . ''. + + '
' . "\n"; +} +function sous_bandeau_admin(){ + echo '
' . + ''. _("Home") .''; + if(is_readable('logs_studs.txt')) + echo ''. _("Logs") .''; + echo ''. _("Cleaning") .'' . + + '' . + liste_lang() . ''. + + '
'."\n"; +} +function sous_bandeau_choix(){ + echo '
' . + ''. _("Home") .'' . + '
'."\n"; +} + + +#les bandeaux de pied +function sur_bandeau_pied(){ + echo '
'."\n"; +} +function bandeau_pied(){ + echo '
'. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
'."\n"; +} +function bandeau_pied_mobile(){ + echo '
'."\n" . + '
'. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
'."\n"; +} + + + +?> diff --git a/block_enter.js b/block_enter.js new file mode 100644 index 0000000..9e25913 --- /dev/null +++ b/block_enter.js @@ -0,0 +1,14 @@ +if (document.layers) + document.captureEvents(Event.KEYPRESS); + +function process_keypress(e) { + if(window.event){ + if (window.event.type == "keypress" & window.event.keyCode == 13) + return !(window.event.type == "keypress" & window.event.keyCode == 13); + } + if(e){ + if (e.type == "keypress" & e.keyCode == 13) + return !e; + } +} +document.onkeypress = process_keypress; diff --git a/choix_autre.php b/choix_autre.php new file mode 100644 index 0000000..37f304d --- /dev/null +++ b/choix_autre.php @@ -0,0 +1,219 @@ +'."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Error!")); + echo '
'."\n"; + print "

" . _("You haven't filled the first section of the poll creation.") . " !

"."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; + echo '


'."\n"; + echo '
'."\n"; + //bandeau de pied + bandeau_pied(); + echo ''."\n"; + echo ''."\n"; + +} +else { + + //partie creation du sondage dans la base SQL + //On prépare les données pour les inserer dans la base + if ($_POST["confirmecreation_x"]){ + + //recuperation des données de champs textes + for ($i=0;$i<$_SESSION["nbrecases"]+1;$i++){ + if ($_POST["choix"][$i]){ + $toutchoix.=','; + $toutchoix.=str_replace(","," ",$_POST["choix"][$i]); + } + } + + $toutchoix=str_replace("'","°",$toutchoix); + $toutchoix=substr("$toutchoix",1); + + $_SESSION["toutchoix"]=$toutchoix; + + if ($_POST["champdatefin"]){ + $registredate=explode("/",$_POST["champdatefin"]); + if (mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2])>time()+250000){ + $_SESSION["champdatefin"]=mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]); + } + } + else{ + $_SESSION["champdatefin"]=time()+15552000; + } + + //format du sondage AUTRE + $_SESSION["formatsondage"]="A".$_SESSION["studsplus"]; + + ajouter_sondage(); + + } + + + // recuperation des sujets pour sondage AUTRE + for ($i=0;$i<$_SESSION["nbrecases"];$i++){ + if (!preg_match(';<|>|";',$_POST["choix"][$i])){ + $_SESSION["choix$i"]=$_POST["choix"][$i]; + } + else {$erreur_injection="yes";} + } + + //nombre de cases par défaut + if(!$_SESSION["nbrecases"]){ + $_SESSION["nbrecases"]=10; + } + if ($_POST["ajoutcases"]||$_POST["ajoutcases_x"]){ + $_SESSION["nbrecases"]=$_SESSION["nbrecases"]+5; + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''; + + echo ''."\n"; + echo ''."\n"; + + + echo '
'."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Poll subjects (2 on 2)")); + sous_bandeau_choix(); + + echo '
'."\n"; + echo '
'. _("Your poll aim is to make a choice between different subjects.
Enter the subjects to vote for:") .'

'."\n"; + echo ''."\n"; + + //affichage des cases texte de formulaire + for ($i=0;$i<$_SESSION["nbrecases"];$i++){ + $j=$i+1; + echo ''."\n"; + } + + echo '
'. _("Choice") .' '.$j.' :
'."\n"; + + //focus javascript sur premiere case + echo ''."\n"; + + //ajout de cases supplementaires + echo ''."\n"; + echo ''."\n"; + echo '
'. _("5 choices more") .'
'."\n"; + echo'
'."\n"; + + echo ''."\n"; + echo ''."\n"; + echo '
'. _("Next") .'
'."\n"; + + //test de remplissage des cases + for ($i=0;$i<$_SESSION["nbrecases"];$i++){ + if ($_POST["choix"][$i]!=""){$testremplissage="ok";} + } + + //message d'erreur si aucun champ renseigné + if ($testremplissage!="ok"&&($_POST["fin_sondage_autre"]||$_POST["fin_sondage_autre_x"])){ + print "
" . _("Enter at least one choice") . "

"."\n"; + $erreur="yes"; + } + + if ($erreur_injection){ + print "" . _("Characters \" < and > are not permitted") . "

\n"; + } + + if (($_POST["fin_sondage_autre"]||$_POST["fin_sondage_autre_x"])&&!$erreur&&!$erreur_injection){ + + //demande de la date de fin du sondage + + echo '
'."\n"; + echo '
'."\n"; + echo '
'. _("Your poll will be automatically removed after 6 months.
You can fix another removal date for it.") .'

'."\n"; + + echo _("Removal date (optional)") .' : '. _("(DD/MM/YYYY)") ."\n"; + echo '
'."\n"; + echo '
'."\n"; + echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .''."\n"; + echo '
'."\n"; + echo '
'."\n"; + + echo ''."\n"; + echo ''."\n"; + echo '
'. _("Create the poll") .'
'."\n"; + } + + + //fin du formulaire et bandeau de pied + echo ''."\n"; + echo ''."\n"; + echo '


'."\n"; + echo '
'."\n"; + //bandeau de pied + bandeau_pied_mobile(); + + echo ''."\n"; + echo ''."\n"; + +} + +?> diff --git a/choix_date.php b/choix_date.php new file mode 100644 index 0000000..2bd4891 --- /dev/null +++ b/choix_date.php @@ -0,0 +1,594 @@ +'."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Error!")); + echo '
'."\n"; + print "

" . _("You haven't filled the first section of the poll creation.") . " !

"."\n"; + print _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.' . "\n"; + echo '


'."\n"; + echo '
'."\n"; + //bandeau de pied + //sur_bandeau_pied(); + bandeau_pied(); + + echo ''."\n"; + echo ''."\n"; + +} + +//sinon on peut afficher le calendrier normalement +else { + +//partie creation du sondage dans la base SQL +//On prépare les données pour les inserer dans la base +if ($_POST["confirmation"]||$_POST["confirmation_x"]){ + for ($i=0;$i 0 && $_SESSION["mois"] < 13) + $motmois=strftime('%B', mktime(0, 0, 0, $_SESSION["mois"], 10)); +else + $motmois=strftime('%B'); + +//debut de la page web +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''.NOMAPPLICATION.''."\n"; +echo ''."\n"; +echo ''; + +echo ''."\n"; +echo ''."\n"; + +//Debut du formulaire et bandeaux de tete +echo '
'."\n"; +logo(); +bandeau_tete(); +bandeau_titre(_("Poll dates (2 on 2)")); +sous_bandeau_choix(); + +//affichage de l'aide pour les jours +echo '
'."\n"; +echo _("Select your dates amoung the free days (green). The selected days are in blue.
You can unselect a day previously selected by clicking again on it.") ."\n"; +echo '
'."\n"; + +//debut du tableau qui affiche le calendrier +echo '
'."\n"; +echo ''."\n"; +echo ''."\n"; +echo '
'.$motmois.' '.$_SESSION["annee"].'
'."\n"; +echo ''."\n"; + +echo ''."\n"; +//affichage des jours de la semaine en haut du tableau +for($i = 0; $i < 7; $i++) + echo ''; +echo ''."\n"; + + +//ajout d'une entrée dans la variable de session qui contient toutes les dates +if ($_POST["choixjourajout"]){ + if (!isset($_SESSION["totalchoixjour"])){ + $_SESSION["totalchoixjour"]=array(); + } + +// Test pour éviter les doublons dans la variable qui contient toutes les dates + $journeuf=true; + for ($i=0;$i'."\n"; + +for ($i=0;$i<$nbrejourmois+$premierjourmois;$i++){ + + $numerojour=$i-$premierjourmois+1; + +// On saute a la ligne tous les 7 jours + if (($i%7)==0&&$i!=0){ + echo ''."\n"; + } + +// On affiche les jours precedants en gris et incliquables + if ($i<$premierjourmois){ + echo ''."\n"; + } + else{ + + for ($j=0;$j'."\n"; + $dejafait=$numerojour; + } + } + //Si pas de bouton ROUGE alors on affiche un bouton VERT ou GRIS avec le numéro du jour dessus + if ($dejafait!=$numerojour){ + + //bouton vert + if (($numerojour>=$jourAJ&&$_SESSION["mois"]==$moisAJ&&$_SESSION["annee"]==$anneeAJ)||($_SESSION["mois"]>$moisAJ&&$_SESSION["annee"]==$anneeAJ)||$_SESSION["annee"]>$anneeAJ){ + echo ''."\n"; + } + //bouton gris + else{ + echo ''."\n"; + } + } + } +} + +//fin du tableau +echo ''."\n"; +echo '
'. strftime('%A',mktime(0,0,0,0,$i,10)) .'
'.$numerojour.'
'."\n"; +echo '
'."\n"; + +//traitement de l'entrée des heures dans les cases texte +$errheure = $erreur = false; +if ($_POST["choixheures"]||$_POST["choixheures_x"]){ + //On sauvegarde les heures deja entrées + for ($i=0;$i'."\n"; + +//affichage de tous les jours choisis +if ($_SESSION["totalchoixjour"]&&(!$_POST["choixheures_x"]||$erreur)){ + + //affichage des jours + echo '
'."\n"; + echo '

'. _("Selected days") .' :

'."\n"; + //affichage de l'aide pour les jours + echo _("For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'

'."\n"; + echo ''."\n"; + + echo ''."\n"; + echo ''."\n"; + for ($i=0;$i<$_SESSION["nbrecaseshoraires"];$i++){ + $j=$i+1; + echo ''."\n"; + } + if ($_SESSION["nbrecaseshoraires"]<10){ + echo ''."\n"; + } + echo ''."\n"; + + //affichage de la liste des jours choisis + for ($i=0;$i'."\n"; + if ($_SESSION["langue"]=="EN") + echo ''."\n"; + else + echo ''."\n"; + $affichageerreurfindeligne=false; + //affichage des cases d'horaires + for ($j=0;$j<$_SESSION["nbrecaseshoraires"];$j++){ + //si on voit une erreur, le fond de la case est rouge + if ($errheure[$i][$j]){ + echo ''."\n"; + $affichageerreurfindeligne=true; + } + //sinon la case est vide normalement + else { + echo ''."\n"; + } + } + if ($affichageerreurfindeligne){ + echo ''."\n"; + } + echo ''."\n"; + } + echo '
'. _("Time") .' '.$j.'
'.date("l, F jS Y",$_SESSION["totalchoixjour"][$i]).' : '.strftime(_("%A, den %e. %B %Y"),$_SESSION["totalchoixjour"][$i]).' : '. _("Bad format!") .'
'."\n"; + + //affichage des boutons de formulaire pour annuler, effacer les jours ou créer le sondage + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo''."\n"; + echo ''."\n"; + echo '

'. _("Next") .'
'."\n"; + //si un seul jour et aucunes horaires choisies, : message d'erreur + if (($_POST["choixheures"]||$_POST["choixheures_x"])&&(count($_SESSION["totalchoixjour"])=="1"&&$_POST["horaires0"][0]==""&&$_POST["horaires0"][1]==""&&$_POST["horaires0"][2]==""&&$_POST["horaires0"][3]==""&&$_POST["horaires0"][4]=="")){ + echo '
'. _("Enter more choices for the voters") .'
'."\n"; + $erreur=true; + } +} + //s'il n'y a pas d'erreur et que le bouton de creation est activé, on demande confirmation + if ( ! $erreur &&($_POST["choixheures"]||$_POST["choixheures_x"])){ + $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1; + $jour_arret=$_SESSION["totalchoixjour"][$taille_tableau]+200000; + if ($_SESSION["langue"]=="EN") + $date_fin=date("l, F jS Y",$jour_arret); + else + $date_fin=strftime(_("%A, den %e. %B %Y"),$jour_arret); + echo '
'. _("Your poll will expire automatically 2 days after the last date of your poll.") .'

'. _("Removal date") .' : '.$date_fin.'

'."\n"; + echo '
'."\n"; + echo '
'."\n"; + echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .''."\n"; + echo'
'."\n"; + // echo'

'."\n"; + // echo 'Pour finir la création du sondage, cliquez sur le bouton ajout ci-dessous'."\n"; + // echo '

'."\n"; + echo ''."\n"; + echo ''."\n"; + echo''."\n"; + echo '
'. _("Back to hours") .'
'. _("Create the poll") .'
'."\n"; + } + echo ''."\n"; + echo ''."\n"; + +echo ''."\n"; +//fin du formulaire et bandeau de pied +echo ''."\n"; +//bandeau de pied +echo '



'."\n"; + +echo ''."\n"; +bandeau_pied_mobile(); +echo ''."\n"; +echo ''."\n"; + +//bouton de nettoyage de tous les jours choisis +if ($_POST["reset"]){ + + for ($i=0;$i'; +} + +} + +?> diff --git a/contacts.php b/contacts.php new file mode 100644 index 0000000..229e040 --- /dev/null +++ b/contacts.php @@ -0,0 +1,152 @@ +\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail (ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers); + if ($_POST["adresse_mail"]!=""){ + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + } + + //affichage de la page de confirmation d'envoi + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Make your polls")); + + echo '
'."\n"; + print "

" . _("Your message has been sent!") . "



"."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; + echo '


'."\n"; + echo '
'."\n"; + + bandeau_pied(); + + session_unset(); + +} + +else { + $_SESSION["question"]=$_POST["question"]; + $_SESSION["nom"]=$_POST["nom"]; + $_SESSION["adresse_mail"]=$_POST["adresse_mail"]; + + //affichage de la page + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //debut du formulaire + echo '
'."\n"; + + //bandeaux de tete + logo(); + bandeau_tete(); + bandeau_titre(_("Contact us")); + sous_bandeau(); + + //blablabla + echo '
'."\n"; + echo _("If you have questions, you can send a message here.") .'

'."\n"; + + echo _("Your name") .' :
'."\n"; + echo ''; + + if ($_POST["envoiquestion"]&&$_SESSION["nom"]==""){ + echo ' '. _("Enter a name") .''; + } + + echo '

'."\n"; + echo _("Your email address ") .' :
'."\n"; + echo ''."\n"; + + + echo '

'; + + echo _("Question") .' :
'."\n"; + echo ''; + + if ($_POST["envoiquestion"]&&$_SESSION["question"]==""){ + echo '  Il faut poser une question !'; + } + + echo '


'."\n"; + echo ''."\n"; + echo ''."\n"; + echo '
'. _("Send your question") .'
'."\n"; + echo '


'."\n"; + echo '
'."\n"; + echo '
'."\n"; + + //bandeau de pied + bandeau_pied(); + + echo ''."\n"; + echo ''."\n"; + +} + +?> diff --git a/creation_sondage.php b/creation_sondage.php new file mode 100644 index 0000000..c0ce1f9 --- /dev/null +++ b/creation_sondage.php @@ -0,0 +1,101 @@ +time()+250000){ + $date_fin=$_SESSION["champdatefin"]; + } + } + else{$date_fin=time()+15552000;} +} + +if ($_SESSION["formatsondage"]=="D"||$_SESSION["formatsondage"]=="D+"){ + + //Calcul de la date de fin du sondage + $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1; + $date_fin=$_SESSION["totalchoixjour"][$taille_tableau]+200000; +} + + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + + global $connect; + $connect->Execute('insert into sondage ' . + '(id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) ' . + 'VALUES '. + "('$sondage','$_SESSION[commentaires]', '$_SESSION[adresse]', '$_SESSION[nom]', '$_SESSION[titre]','$sondage_admin', FROM_UNIXTIME('$date_fin'), '$_SESSION[formatsondage]','$_SESSION[mailsonde]' )"); + $connect->Execute("insert into sujet_studs values ('$sondage', '$_SESSION[toutchoix]' )"); + + + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), "" . _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.") . "\n\n".stripslashes($_SESSION["nom"])." " . _("hast just created a poll called") . " : \"".stripslashes($_SESSION["titre"])."\".\n" . _("Thanks for filling the poll at the link above") . " :\n\n".get_server_name()."studs.php?sondage=$sondage \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION,$headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), + _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above") . + " :\n\n".get_server_name()."adminstuds.php?sondage=$sondage_admin \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION,$headers); + + $date=date('H:i:s d/m/Y:'); + error_log($date . " CREATION: $sondage\t$_SESSION[formatsondage]\t$_SESSION[nom]\t$_SESSION[adresse]\t \t$_SESSION[toutchoix]\n", 3, 'admin/logs_studs.txt'); + + header("Location:studs.php?sondage=$sondage"); + + exit(); + session_unset(); +} +?> diff --git a/errors/error-forbidden.php b/errors/error-forbidden.php new file mode 100644 index 0000000..edc9f15 --- /dev/null +++ b/errors/error-forbidden.php @@ -0,0 +1,67 @@ +'."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +echo 'Erreur !'."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +logo(); +bandeau_tete(); +bandeau_titre(_("Make your polls")); +echo '
'."\n"; +print "

Vous n'avez pas l'autorisation de voir ce répertoire.

Vous devez, pour cela, initier votre connexion depuis une machine de l'Université.
Si vous avez un compte à l'Université, vous pouvez également utiliser le VPN sécurisé.

"."\n"; +print "Vous pouvez retourner à la page d'accueil de ".NOMAPPLICATION."."."\n"; +echo '


'."\n"; +echo '
'."\n"; + + +// Affichage du bandeau de pied +sur_bandeau_pied(); +bandeau_pied(); +echo ''."\n"; +echo ''."\n"; + +?> diff --git a/exportcsv.php b/exportcsv.php new file mode 100644 index 0000000..750c707 --- /dev/null +++ b/exportcsv.php @@ -0,0 +1,103 @@ +Execute("SELECT * FROM user_studs WHERE id_sondage=" . $_GET['numsondage'] . " ORDER BY id_users"); + +$dsondage = get_sondage_from_id($_GET['numsondage']); +$nbcolonnes=substr_count($dsondage->sujet,',')+1; + +$toutsujet=explode(",",$dsondage->sujet); +#$toutsujet=str_replace("°","'",$toutsujet); + +//affichage des sujets du sondage + +$input.=";"; +for ($i=0;$toutsujet[$i];$i++){ + if ($dsondage->format=="D"||$dsondage->format=="D+"){ + $input.=''.date("j/n/Y",$toutsujet[$i]).';'; + } + else{ + $input.=''.$toutsujet[$i].';'; + } +} +$input.="\r\n"; + +if (strpos($dsondage->sujet,'@') !== false){ + $input.=";"; + for ($i=0;$toutsujet[$i];$i++){ + $heures=explode("@",$toutsujet[$i]); + $input.=''.$heures[1].';'; + } + $input.="\r\n"; +} + +while ( $data=$user_studs->FetchNextObject(false)) { +// Le nom de l'utilisateur + $nombase=str_replace("°","'",$data->nom); + $input.=$nombase.';'; +//affichage des resultats + $ensemblereponses=$data->reponses; + for ($k=0;$k<$nbcolonnes;$k++){ + $car=substr($ensemblereponses,$k,1); + if ($car=="1"){ + $input.='OK;'; + $somme[$k]++; + } + else { + $input.=';'; + } + } + $input.="\r\n"; +} + +$filesize = strlen( $input ); +$filename=$_GET["numsondage"].".csv"; + + header( 'Content-Type: text/csv; charset=utf-8' ); + header( 'Content-Length: '.$filesize ); + header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); + header( 'Cache-Control: max-age=10' ); +echo $input; + die(); +?> diff --git a/exportics.php b/exportics.php new file mode 100644 index 0000000..6df0a42 --- /dev/null +++ b/exportics.php @@ -0,0 +1,105 @@ +setConfig( 'unique_id', $_SESSION["numsondage"] ); // set Your unique id +$v->setProperty( 'method', 'PUBLISH' ); // required of some calendar software + + +$vevent = new vevent(); // create an event calendar component + +/* + tested with : + $test = array( '1275818164@12h-15h', '1275818164@12h15-15h57', '1275818164@12:15-15:57', '1275818164@8:30', '1275818164@8h30'); + foreach($test as $meilleursujet) { +*/ +$adate = strtok($meilleursujet, "@"); +$dtstart = $dtend = array( + 'year'=>intval(date("Y",$adate)), + 'month'=>intval(date("n",$adate)), + 'day'=>intval(date("j",$adate)), + 'hour'=>0, + 'min'=>0, + 'sec'=>0 + ); +$double_time = false; +if(strpos($meilleursujet, '-') !== false) + $double_time = true; + +$dtstart['hour'] = intval(strtok(":Hh")); +$a = intval(strtok(":Hh-")); +$b = intval(strtok(":Hh-")); +if($b === false) { + if($double_time) + $dtend['hour'] = $a; + else + $dtstart['min'] = $a; +} else { + $dtstart['min'] = $a; + $dtend['hour'] = $b; + $dtend['min'] = intval(strtok(":Hh-")); +} + +if(! $double_time ) { + $dtend['hour'] = $dtstart['hour'] + 1; + $dtend['min'] = $dtstart['min']; +} + +$vevent->setProperty( 'dtstart', $dtstart); +$vevent->setProperty( 'dtend', $dtend); +$vevent->setProperty( 'summary', $_SESSION["sondagetitre"] ); + +$v->setComponent ( $vevent ); // add event to calendar +$v->setConfig( "language", "fr" ); +$v->setConfig( "directory", "export" ); +$v->setConfig( "filename", $_SESSION["numsondage"].".ics" ); // set file name + +$v->returnCalendar(); + +?> diff --git a/exportpdf.php b/exportpdf.php new file mode 100644 index 0000000..342d39e --- /dev/null +++ b/exportpdf.php @@ -0,0 +1,86 @@ +AddPage(); +$PDF->SetFont('Arial','',11); + +//affichage de la date de convocation +$PDF->Text(140,30,"Le ".date("d/m/Y")); + +$PDF->Image("./".LOGOLETTRE."",20,20,65,40); + +$PDF->SetFont('Arial','U',11); +$PDF->Text(40,120,"Objet : "); +$PDF->SetFont('Arial','',11); +$PDF->Text(55,120,_(' Convocation')); + +$PDF->Text(55,140,_('Hello,')); + +$PDF->Text(40,150,_("You're invited at the meeting") . ' "'.utf8_decode($dsondage->titre).'".'); + +$PDF->SetFont('Arial','B',11); +$PDF->Text(40,170,_('Informations about the meeting')); + +$PDF->SetFont('Arial','',11); +$PDF->Text(60,180,_('Date') . ' : '.date("d/m/Y", "$datereunion[0]").' ' . _('at') . ' '.$datereunion[1]); +$PDF->Text(60,185,_('Place') . ' : ' . utf8_decode($lieureunion)); + +$PDF->Text(55,220,_('Cordially,')); + +$PDF->Text(140,240,utf8_decode($dsondage->nom_admin)); + +$PDF->SetFont('Arial','B',8); +// TODO: translate +$PDF->Text(35,275,"Cette lettre de convocation a t gnre automatiquement par ".NOMAPPLICATION." sur ".get_server_name()); + +//Sortie +$PDF->Output(); + +?> diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..551344a2f254a5e1513c3f2f2ff91aff75e4c222 GIT binary patch literal 1150 zcmd6lF%E)25Jktt&W6N96KyChIf6&v0w$D}9AR(Z5oql^0!QHp9s%FSnZ$yEH5M*; z%rHCu??5nHaTSGeFYUTE+nL!3C{cOW3Deqc%)~F({bCjLkd)_oyKW=~19`pFM`yZ+ zW(W_(ZmCD~p()|<;nT)mPSn}%G34l?7p>;d_e@cni^u&TLFcr@25Pv0_G&zC(0bHd zqSrI~(J!r#rt(}qXZqwZ&EmP9<=4#36gBOG&e8YO@0hjFl<Connect(SERVEURBASE, USERBASE, USERPASSWD, BASE); + //$DB->debug = true; + return $DB; +} + +function get_server_name() { + $scheme = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? 'https' : 'http'; + $url = sprintf("%s://%s%s", $scheme, + STUDS_URL, + dirname($_SERVER["SCRIPT_NAME"])); + if (!preg_match("|/$|", $url)){ + $url = $url."/"; + } + return $url; +} + +function get_sondage_from_id($id) { + global $connect; + // Ouverture de la base de données + if(preg_match(";^[\w\d]{16}$;i",$id)) { + $sondage=$connect->Execute("SELECT sondage.*,sujet_studs.sujet FROM sondage". + " LEFT OUTER JOIN sujet_studs ON sondage.id_sondage = sujet_studs.id_sondage". + " WHERE sondage.id_sondage = $id"); + $psondage = $sondage->FetchObject(false); + $psondage->date_fin = strtotime($psondage->date_fin); + return $psondage; + } + return false; +} + +$connect=connexion_base(); + +define('COMMENT_EMPTY', 0x0000000001); +define('COMMENT_USER_EMPTY', 0x0000000010); +define('COMMENT_INSERT_FAILED', 0x0000000100); +define('NAME_EMPTY', 0x0000001000); +define('NAME_TAKEN', 0x0000010000); +define('NO_POLL', 0x0000100000); +define('NO_POLL_ID', 0x0001000000); +define('INVALID_EMAIL', 0x0010000000); +define('TITLE_EMPTY', 0x0100000000); +define('INVALID_DATE', 0x1000000000); +$err = 0; + +function is_error($cerr) { + global $err; + if ( $err == 0 ) + return false; + return (($err & $cerr) != 0 ); +} + + +function is_user() { + return isset($_SERVER['REMOTE_USER']) || (isset($_SESSION['nom'])); +} + +function print_header($js = false) { + ?> + + + + + <?php echo NOMAPPLICATION; ?> + +'; +echo ''; +} + +function check_table_sondage() { + global $connect; + $tables = $connect->MetaTables('TABLES'); + if (in_array("sondage", $tables)) + return true; + return false; +} + +?> diff --git a/i18n.php b/i18n.php new file mode 100644 index 0000000..fbb2709 --- /dev/null +++ b/i18n.php @@ -0,0 +1,31 @@ + diff --git a/iCalcreator/iCalUtilityFunctions.class.php b/iCalcreator/iCalUtilityFunctions.class.php new file mode 100644 index 0000000..84ad0e6 --- /dev/null +++ b/iCalcreator/iCalUtilityFunctions.class.php @@ -0,0 +1,1340 @@ + + * @since 2.6.22 - 2010-09-25 + * + */ +class iCalUtilityFunctions { + // Store the single instance of iCalUtilityFunctions + private static $m_pInstance; + + // Private constructor to limit object instantiation to within the class + private function __construct() { + $m_pInstance = FALSE; + } + + // Getter method for creating/returning the single instance of this class + public static function getInstance() { + if (!self::$m_pInstance) + self::$m_pInstance = new iCalUtilityFunctions(); + + return self::$m_pInstance; + } +/** + * check a date(-time) for an opt. timezone and if it is a DATE-TIME or DATE + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-25 + * @param array $date, date to check + * @param int $parno, no of date parts (i.e. year, month.. .) + * @return array $params, property parameters + */ + public static function _chkdatecfg( $theDate, & $parno, & $params ) { + if( isset( $params['TZID'] )) + $parno = 6; + elseif( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] )) + $parno = 3; + else { + if( isset( $params['VALUE'] ) && ( 'PERIOD' == $params['VALUE'] )) + $parno = 7; + if( is_array( $theDate )) { + if( isset( $theDate['timestamp'] )) + $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : null; + else + $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : ( 7 == count( $theDate )) ? end( $theDate ) : null; + if( !empty( $tzid )) { + $parno = 7; + if( !iCalUtilityFunctions::_isOffset( $tzid )) + $params['TZID'] = $tzid; // save only timezone + } + elseif( !$parno && ( 3 == count( $theDate )) && + ( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] ))) + $parno = 3; + else + $parno = 6; + } + else { // string + $date = trim( $theDate ); + if( 'Z' == substr( $date, -1 )) + $parno = 7; // UTC DATE-TIME + elseif((( 8 == strlen( $date ) && ctype_digit( $date )) || ( 11 >= strlen( $date ))) && + ( !isset( $params['VALUE'] ) || !in_array( $params['VALUE'], array( 'DATE-TIME', 'PERIOD' )))) + $parno = 3; // DATE + $date = iCalUtilityFunctions::_date_time_string( $date, $parno ); + if( !empty( $date['tz'] )) { + $parno = 7; + if( !iCalUtilityFunctions::_isOffset( $date['tz'] )) + $params['TZID'] = $date['tz']; // save only timezone + } + elseif( empty( $parno )) + $parno = 6; + } + if( isset( $params['TZID'] )) + $parno = 6; + } + } +/** + * convert date/datetime to timestamp + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-30 + * @param array $datetime datetime/(date) + * @param string $tz timezone + * @return timestamp + */ + public static function _date2timestamp( $datetime, $tz=null ) { + $output = null; + if( !isset( $datetime['hour'] )) $datetime['hour'] = '0'; + if( !isset( $datetime['min'] )) $datetime['min'] = '0'; + if( !isset( $datetime['sec'] )) $datetime['sec'] = '0'; + foreach( $datetime as $dkey => $dvalue ) { + if( 'tz' != $dkey ) + $datetime[$dkey] = (integer) $dvalue; + } + if( $tz ) + $datetime['tz'] = $tz; + $offset = ( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) ? iCalUtilityFunctions::_tz2offset( $datetime['tz'] ) : 0; + $output = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year'] ); + return $output; + } +/** + * ensures internal date-time/date format for input date-time/date in array format + * + * @author Kjell-Inge Gustafsson + * @since 0.3.0 - 2006-08-15 + * @param array $datetime + * @param int $parno optional, default FALSE + * @return array + */ + public static function _date_time_array( $datetime, $parno=FALSE ) { + $output = array(); + foreach( $datetime as $dateKey => $datePart ) { + switch ( $dateKey ) { + case '0': case 'year': $output['year'] = $datePart; break; + case '1': case 'month': $output['month'] = $datePart; break; + case '2': case 'day': $output['day'] = $datePart; break; + } + if( 3 != $parno ) { + switch ( $dateKey ) { + case '0': + case '1': + case '2': break; + case '3': case 'hour': $output['hour'] = $datePart; break; + case '4': case 'min' : $output['min'] = $datePart; break; + case '5': case 'sec' : $output['sec'] = $datePart; break; + case '6': case 'tz' : $output['tz'] = $datePart; break; + } + } + } + if( 3 != $parno ) { + if( !isset( $output['hour'] )) + $output['hour'] = 0; + if( !isset( $output['min'] )) + $output['min'] = 0; + if( !isset( $output['sec'] )) + $output['sec'] = 0; + } + return $output; + } +/** + * ensures internal date-time/date format for input date-time/date in string fromat + * + * @author Kjell-Inge Gustafsson + * @since 2.6.35 - 2010-12-03 + * @param array $datetime + * @param int $parno optional, default FALSE + * @return array + */ + public static function _date_time_string( $datetime, $parno=FALSE ) { + $datetime = (string) trim( $datetime ); + $tz = null; + $len = strlen( $datetime ) - 1; + if( 'Z' == substr( $datetime, -1 )) { + $tz = 'Z'; + $datetime = trim( substr( $datetime, 0, $len )); + } + elseif( ( ctype_digit( substr( $datetime, -2, 2 ))) && // time or date + ( '-' == substr( $datetime, -3, 1 )) || + ( ':' == substr( $datetime, -3, 1 )) || + ( '.' == substr( $datetime, -3, 1 ))) { + $continue = TRUE; + } + elseif( ( ctype_digit( substr( $datetime, -4, 4 ))) && // 4 pos offset + ( ' +' == substr( $datetime, -6, 2 )) || + ( ' -' == substr( $datetime, -6, 2 ))) { + $tz = substr( $datetime, -5, 5 ); + $datetime = substr( $datetime, 0, ($len - 5)); + } + elseif( ( ctype_digit( substr( $datetime, -6, 6 ))) && // 6 pos offset + ( ' +' == substr( $datetime, -8, 2 )) || + ( ' -' == substr( $datetime, -8, 2 ))) { + $tz = substr( $datetime, -7, 7 ); + $datetime = substr( $datetime, 0, ($len - 7)); + } + elseif( ( 6 < $len ) && ( ctype_digit( substr( $datetime, -6, 6 )))) { + $continue = TRUE; + } + elseif( 'T' == substr( $datetime, -7, 1 )) { + $continue = TRUE; + } + else { + $cx = $tx = 0; // 19970415T133000 US-Eastern + for( $cx = -1; $cx > ( 9 - $len ); $cx-- ) { + $char = substr( $datetime, $cx, 1 ); + if(( ' ' == $char) || ctype_digit( $char)) + break; // if exists, tz ends here.. . ? + else + $tx--; // tz length counter + } + if( 0 > $tx ) { + $tz = substr( $datetime, $tx ); + $datetime = trim( substr( $datetime, 0, $len + $tx + 1 )); + } + } + if( 0 < substr_count( $datetime, '-' )) { + $datetime = str_replace( '-', '/', $datetime ); + } + elseif( ctype_digit( substr( $datetime, 0, 8 )) && + ( 'T' == substr( $datetime, 8, 1 )) && + ctype_digit( substr( $datetime, 9, 6 ))) { + $datetime = substr( $datetime, 4, 2 ) + .'/'.substr( $datetime, 6, 2 ) + .'/'.substr( $datetime, 0, 4 ) + .' '.substr( $datetime, 9, 2 ) + .':'.substr( $datetime, 11, 2 ) + .':'.substr( $datetime, 13); + } + $datestring = date( 'Y-m-d H:i:s', strtotime( $datetime )); + $tz = trim( $tz ); + $output = array(); + $output['year'] = substr( $datestring, 0, 4 ); + $output['month'] = substr( $datestring, 5, 2 ); + $output['day'] = substr( $datestring, 8, 2 ); + if(( 6 == $parno ) || ( 7 == $parno ) || ( !$parno && ( 'Z' == $tz ))) { + $output['hour'] = substr( $datestring, 11, 2 ); + $output['min'] = substr( $datestring, 14, 2 ); + $output['sec'] = substr( $datestring, 17, 2 ); + if( !empty( $tz )) + $output['tz'] = $tz; + } + elseif( 3 != $parno ) { + if(( '00' < substr( $datestring, 11, 2 )) || + ( '00' < substr( $datestring, 14, 2 )) || + ( '00' < substr( $datestring, 17, 2 ))) { + $output['hour'] = substr( $datestring, 11, 2 ); + $output['min'] = substr( $datestring, 14, 2 ); + $output['sec'] = substr( $datestring, 17, 2 ); + } + if( !empty( $tz )) + $output['tz'] = $tz; + } + return $output; + } +/** + * convert local startdate/enddate (Ymd[His]) to duration array + * + * uses this component dates if missing input dates + * + * @author Kjell-Inge Gustafsson + * @since 2.6.11 - 2010-10-21 + * @param array $startdate + * @param array $duration + * @return array duration + */ + function _date2duration( $startdate, $enddate ) { + $startWdate = mktime( 0, 0, 0, $startdate['month'], $startdate['day'], $startdate['year'] ); + $endWdate = mktime( 0, 0, 0, $enddate['month'], $enddate['day'], $enddate['year'] ); + $wduration = $endWdate - $startWdate; + $dur = array(); + $dur['week'] = (int) floor( $wduration / ( 7 * 24 * 60 * 60 )); + $wduration = $wduration % ( 7 * 24 * 60 * 60 ); + $dur['day'] = (int) floor( $wduration / ( 24 * 60 * 60 )); + $wduration = $wduration % ( 24 * 60 * 60 ); + $dur['hour'] = (int) floor( $wduration / ( 60 * 60 )); + $wduration = $wduration % ( 60 * 60 ); + $dur['min'] = (int) floor( $wduration / ( 60 )); + $dur['sec'] = (int) $wduration % ( 60 ); + return $dur; + } +/** + * ensures internal duration format for input in array format + * + * @author Kjell-Inge Gustafsson + * @since 2.1.1 - 2007-06-24 + * @param array $duration + * @return array + */ + public static function _duration_array( $duration ) { + $output = array(); + if( is_array( $duration ) && + ( 1 == count( $duration )) && + isset( $duration['sec'] ) && + ( 60 < $duration['sec'] )) { + $durseconds = $duration['sec']; + $output['week'] = floor( $durseconds / ( 60 * 60 * 24 * 7 )); + $durseconds = $durseconds % ( 60 * 60 * 24 * 7 ); + $output['day'] = floor( $durseconds / ( 60 * 60 * 24 )); + $durseconds = $durseconds % ( 60 * 60 * 24 ); + $output['hour'] = floor( $durseconds / ( 60 * 60 )); + $durseconds = $durseconds % ( 60 * 60 ); + $output['min'] = floor( $durseconds / ( 60 )); + $output['sec'] = ( $durseconds % ( 60 )); + } + else { + foreach( $duration as $durKey => $durValue ) { + if( empty( $durValue )) continue; + switch ( $durKey ) { + case '0': case 'week': $output['week'] = $durValue; break; + case '1': case 'day': $output['day'] = $durValue; break; + case '2': case 'hour': $output['hour'] = $durValue; break; + case '3': case 'min': $output['min'] = $durValue; break; + case '4': case 'sec': $output['sec'] = $durValue; break; + } + } + } + if( isset( $output['week'] ) && ( 0 < $output['week'] )) { + unset( $output['day'], $output['hour'], $output['min'], $output['sec'] ); + return $output; + } + unset( $output['week'] ); + if( empty( $output['day'] )) + unset( $output['day'] ); + if ( isset( $output['hour'] ) || isset( $output['min'] ) || isset( $output['sec'] )) { + if( !isset( $output['hour'] )) $output['hour'] = 0; + if( !isset( $output['min'] )) $output['min'] = 0; + if( !isset( $output['sec'] )) $output['sec'] = 0; + if(( 0 == $output['hour'] ) && ( 0 == $output['min'] ) && ( 0 == $output['sec'] )) + unset( $output['hour'], $output['min'], $output['sec'] ); + } + return $output; + } +/** + * ensures internal duration format for input in string format + * + * @author Kjell-Inge Gustafsson + * @since 2.0.5 - 2007-03-14 + * @param string $duration + * @return array + */ + public static function _duration_string( $duration ) { + $duration = (string) trim( $duration ); + while( 'P' != strtoupper( substr( $duration, 0, 1 ))) { + if( 0 < strlen( $duration )) + $duration = substr( $duration, 1 ); + else + return false; // no leading P !?!? + } + $duration = substr( $duration, 1 ); // skip P + $duration = str_replace ( 't', 'T', $duration ); + $duration = str_replace ( 'T', '', $duration ); + $output = array(); + $val = null; + for( $ix=0; $ix < strlen( $duration ); $ix++ ) { + switch( strtoupper( substr( $duration, $ix, 1 ))) { + case 'W': + $output['week'] = $val; + $val = null; + break; + case 'D': + $output['day'] = $val; + $val = null; + break; + case 'H': + $output['hour'] = $val; + $val = null; + break; + case 'M': + $output['min'] = $val; + $val = null; + break; + case 'S': + $output['sec'] = $val; + $val = null; + break; + default: + if( !ctype_digit( substr( $duration, $ix, 1 ))) + return false; // unknown duration controll character !?!? + else + $val .= substr( $duration, $ix, 1 ); + } + } + return iCalUtilityFunctions::_duration_array( $output ); + } +/** + * convert duration to date in array format + * + * @author Kjell-Inge Gustafsson + * @since 2.6.23 - 2010-10-23 + * @param array $startdate + * @param array $duration + * @return array, date format + */ + function _duration2date( $startdate=null, $duration=null ) { + if( empty( $startdate )) return FALSE; + if( empty( $duration )) return FALSE; + $dateOnly = ( isset( $startdate['hour'] ) || isset( $startdate['min'] ) || isset( $startdate['sec'] )) ? FALSE : TRUE; + $startdate['hour'] = ( isset( $startdate['hour'] )) ? $startdate['hour'] : 0; + $startdate['min'] = ( isset( $startdate['min'] )) ? $startdate['min'] : 0; + $startdate['sec'] = ( isset( $startdate['sec'] )) ? $startdate['sec'] : 0; + $dtend = 0; + if( isset( $duration['week'] )) + $dtend += ( $duration['week'] * 7 * 24 * 60 * 60 ); + if( isset( $duration['day'] )) + $dtend += ( $duration['day'] * 24 * 60 * 60 ); + if( isset( $duration['hour'] )) + $dtend += ( $duration['hour'] * 60 *60 ); + if( isset( $duration['min'] )) + $dtend += ( $duration['min'] * 60 ); + if( isset( $duration['sec'] )) + $dtend += $duration['sec']; + if(( 24 * 60 * 60 ) < $dtend ) + $dtend -= ( 24 * 60 * 60 ); // exclude start day + $dtend += mktime( $startdate['hour'], $startdate['min'], $startdate['sec'], $startdate['month'], $startdate['day'], $startdate['year'] ); + $dtend2 = array(); + $dtend2['year'] = date('Y', $dtend ); + $dtend2['month'] = date('m', $dtend ); + $dtend2['day'] = date('d', $dtend ); + $dtend2['hour'] = date('H', $dtend ); + $dtend2['min'] = date('i', $dtend ); + $dtend2['sec'] = date('s', $dtend ); + if( isset( $startdate['tz'] )) + $dtend2['tz'] = $startdate['tz']; + if( $dateOnly && (( 0 == $dtend2['hour'] ) && ( 0 == $dtend2['min'] ) && ( 0 == $dtend2['sec'] ))) + unset( $dtend2['hour'], $dtend2['min'], $dtend2['sec'] ); + return $dtend2; + } +/** + * if not preSet, if exist, remove key with expected value from array and return hit value else return elseValue + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-11-08 + * @param array $array + * @param string $expkey, expected key + * @param string $expval, expected value + * @param int $hitVal optional, return value if found + * @param int $elseVal optional, return value if not found + * @param int $preSet optional, return value if already preset + * @return int + */ + public static function _existRem( &$array, $expkey, $expval=FALSE, $hitVal=null, $elseVal=null, $preSet=null ) { + if( $preSet ) + return $preSet; + if( !is_array( $array ) || ( 0 == count( $array ))) + return $elseVal; + foreach( $array as $key => $value ) { + if( strtoupper( $expkey ) == strtoupper( $key )) { + if( !$expval || ( strtoupper( $expval ) == strtoupper( $array[$key] ))) { + unset( $array[$key] ); + return $hitVal; + } + } + } + return $elseVal; + } +/** + * creates formatted output for calendar component property data value type date/date-time + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-30 + * @param array $datetime + * @param int $parno, optional, default 6 + * @return string + */ + public static function _format_date_time( $datetime, $parno=6 ) { + if( !isset( $datetime['year'] ) && + !isset( $datetime['month'] ) && + !isset( $datetime['day'] ) && + !isset( $datetime['hour'] ) && + !isset( $datetime['min'] ) && + !isset( $datetime['sec'] )) + return ; + $output = null; + // if( !isset( $datetime['day'] )) { $o=''; foreach($datetime as $k=>$v) {if(is_array($v)) $v=implode('-',$v);$o.=" $k=>$v";} echo " day SAKNAS : $o
\n"; } + foreach( $datetime as $dkey => & $dvalue ) + if( 'tz' != $dkey ) $dvalue = (integer) $dvalue; + $output = date('Ymd', mktime( 0, 0, 0, $datetime['month'], $datetime['day'], $datetime['year'])); + if( isset( $datetime['hour'] ) || + isset( $datetime['min'] ) || + isset( $datetime['sec'] ) || + isset( $datetime['tz'] )) { + if( isset( $datetime['tz'] ) && + !isset( $datetime['hour'] )) + $datetime['hour'] = 0; + if( isset( $datetime['hour'] ) && + !isset( $datetime['min'] )) + $datetime['min'] = 0; + if( isset( $datetime['hour'] ) && + isset( $datetime['min'] ) && + !isset( $datetime['sec'] )) + $datetime['sec'] = 0; + $date = mktime( $datetime['hour'], $datetime['min'], $datetime['sec'], $datetime['month'], $datetime['day'], $datetime['year']); + $output .= date('\THis', $date ); + if( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) { + $datetime['tz'] = trim( $datetime['tz'] ); + if( 'Z' == $datetime['tz'] ) + $output .= 'Z'; + $offset = iCalUtilityFunctions::_tz2offset( $datetime['tz'] ); + if( 0 != $offset ) { + $date = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year']); + $output = date( 'Ymd\THis\Z', $date ); + } + } + elseif( 7 == $parno ) + $output .= 'Z'; + } + return $output; + } +/** + * creates formatted output for calendar component property data value type duration + * + * @author Kjell-Inge Gustafsson + * @since 2.6.10 - 2010-11-28 + * @param array $duration ( week, day, hour, min, sec ) + * @return string + */ + public static function _format_duration( $duration ) { + if( isset( $duration['week'] ) || + isset( $duration['day'] ) || + isset( $duration['hour'] ) || + isset( $duration['min'] ) || + isset( $duration['sec'] )) + $ok = TRUE; + else + return; + if( isset( $duration['week'] ) && ( 0 < $duration['week'] )) + return 'P'.$duration['week'].'W'; + $output = 'P'; + if( isset($duration['day'] ) && ( 0 < $duration['day'] )) + $output .= $duration['day'].'D'; + if(( isset( $duration['hour']) && ( 0 < $duration['hour'] )) || + ( isset( $duration['min']) && ( 0 < $duration['min'] )) || + ( isset( $duration['sec']) && ( 0 < $duration['sec'] ))) + $output .= 'T'; + $output .= ( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ? $duration['hour'].'H' : ''; + $output .= ( isset( $duration['min']) && ( 0 < $duration['min'] )) ? $duration['min']. 'M' : ''; + $output .= ( isset( $duration['sec']) && ( 0 < $duration['sec'] )) ? $duration['sec']. 'S' : ''; + return $output; + } +/** + * checks if input array contains a date + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-25 + * @param array $input + * @return bool + */ + public static function _isArrayDate( $input ) { + if( isset( $input['week'] ) || ( !in_array( count( $input ), array( 3, 6, 7 )))) + return FALSE; + if( 7 == count( $input )) + return TRUE; + if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] )) + return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] ); + if( isset( $input['day'] ) || isset( $input['hour'] ) || isset( $input['min'] ) || isset( $input['sec'] )) + return FALSE; + if( in_array( 0, $input )) + return FALSE; + if(( 1970 > $input[0] ) || ( 12 < $input[1] ) || ( 31 < $input[2] )) + return FALSE; + if(( isset( $input[0] ) && isset( $input[1] ) && isset( $input[2] )) && + checkdate( (int) $input[1], (int) $input[2], (int) $input[0] )) + return TRUE; + $input = iCalUtilityFunctions::_date_time_string( $input[1].'/'.$input[2].'/'.$input[0], 3 ); // m - d - Y + if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] )) + return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] ); + return FALSE; + } +/** + * checks if input array contains a timestamp date + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-18 + * @param array $input + * @return bool + */ + public static function _isArrayTimestampDate( $input ) { + return ( is_array( $input ) && isset( $input['timestamp'] )) ? TRUE : FALSE ; + } +/** + * controll if input string contains trailing UTC offset + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-19 + * @param string $input + * @return bool + */ + public static function _isOffset( $input ) { + $input = trim( (string) $input ); + if( 'Z' == substr( $input, -1 )) + return TRUE; + elseif(( 5 <= strlen( $input )) && + ( in_array( substr( $input, -5, 1 ), array( '+', '-' ))) && + ( '0000' < substr( $input, -4 )) && ( '9999' >= substr( $input, -4 ))) + return TRUE; + elseif(( 7 <= strlen( $input )) && + ( in_array( substr( $input, -7, 1 ), array( '+', '-' ))) && + ( '000000' < substr( $input, -6 )) && ( '999999' >= substr( $input, -6 ))) + return TRUE; + return FALSE; + + } +/** + * remakes a recur pattern to an array of dates + * + * if missing, UNTIL is set 1 year from startdate (emergency break) + * + * @author Kjell-Inge Gustafsson + * @since 2.4.23 - 2010-10-24 + * @param array $result, array to update, array([timestamp] => timestamp) + * @param array $recur, pattern for recurrency (only value part, params ignored) + * @param array $wdate, component start date + * @param array $startdate, start date + * @param array $enddate, optional + * @return array of recurrence (start-)dates as index + * @todo BYHOUR, BYMINUTE, BYSECOND, ev. BYSETPOS due to ambiguity, WEEKLY at year end/start + */ + public static function _recur2date( & $result, $recur, $wdate, $startdate, $enddate=FALSE ) { + foreach( $wdate as $k => $v ) if( ctype_digit( $v )) $wdate[$k] = (int) $v; + $wdatets = iCalUtilityFunctions::_date2timestamp( $wdate ); + $startdatets = iCalUtilityFunctions::_date2timestamp( $startdate ); + if( !$enddate ) { + $enddate = $startdate; + $enddate['year'] += 1; +// echo "recur __in_ ".implode('-',$startdate)." period start ".implode('-',$wdate)." period end ".implode('-',$enddate)."
\n";print_r($recur);echo "
\n";//test### + } + $endDatets = iCalUtilityFunctions::_date2timestamp( $enddate ); // fix break + if( !isset( $recur['COUNT'] ) && !isset( $recur['UNTIL'] )) + $recur['UNTIL'] = $enddate; // create break + if( isset( $recur['UNTIL'] )) { + $tdatets = iCalUtilityFunctions::_date2timestamp( $recur['UNTIL'] ); + if( $endDatets > $tdatets ) { + $endDatets = $tdatets; // emergency break + $enddate = iCalUtilityFunctions::_timestamp2date( $endDatets, 6 ); + } + else + $recur['UNTIL'] = iCalUtilityFunctions::_timestamp2date( $endDatets, 6 ); + } + if( $wdatets > $endDatets ) { + //echo "recur out of date ".implode('-',iCalUtilityFunctions::_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."
\n";//test + return array(); // nothing to do.. . + } + if( !isset( $recur['FREQ'] )) // "MUST be specified.. ." + $recur['FREQ'] = 'DAILY'; // ?? + $wkst = ( isset( $recur['WKST'] ) && ( 'SU' == $recur['WKST'] )) ? 24*60*60 : 0; // ?? + if( !isset( $recur['INTERVAL'] )) + $recur['INTERVAL'] = 1; + $countcnt = ( !isset( $recur['BYSETPOS'] )) ? 1 : 0; // DTSTART counts as the first occurrence + /* find out how to step up dates and set index for interval count */ + $step = array(); + if( 'YEARLY' == $recur['FREQ'] ) + $step['year'] = 1; + elseif( 'MONTHLY' == $recur['FREQ'] ) + $step['month'] = 1; + elseif( 'WEEKLY' == $recur['FREQ'] ) + $step['day'] = 7; + else + $step['day'] = 1; + if( isset( $step['year'] ) && isset( $recur['BYMONTH'] )) + $step = array( 'month' => 1 ); + if( empty( $step ) && isset( $recur['BYWEEKNO'] )) // ?? + $step = array( 'day' => 7 ); + if( isset( $recur['BYYEARDAY'] ) || isset( $recur['BYMONTHDAY'] ) || isset( $recur['BYDAY'] )) + $step = array( 'day' => 1 ); + $intervalarr = array(); + if( 1 < $recur['INTERVAL'] ) { + $intervalix = iCalUtilityFunctions::_recurIntervalIx( $recur['FREQ'], $wdate, $wkst ); + $intervalarr = array( $intervalix => 0 ); + } + if( isset( $recur['BYSETPOS'] )) { // save start date + weekno + $bysetposymd1 = $bysetposymd2 = $bysetposw1 = $bysetposw2 = array(); + $bysetposWold = (int) date( 'W', ( $wdatets + $wkst )); + $bysetposYold = $wdate['year']; + $bysetposMold = $wdate['month']; + $bysetposDold = $wdate['day']; + if( is_array( $recur['BYSETPOS'] )) { + foreach( $recur['BYSETPOS'] as $bix => $bval ) + $recur['BYSETPOS'][$bix] = (int) $bval; + } + else + $recur['BYSETPOS'] = array( (int) $recur['BYSETPOS'] ); + iCalUtilityFunctions::_stepdate( $enddate, $endDatets, $step); // make sure to count whole last period + } + iCalUtilityFunctions::_stepdate( $wdate, $wdatets, $step); + $year_old = null; + $daynames = array( 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA' ); + /* MAIN LOOP */ + // echo "recur start ".implode('-',$wdate)." end ".implode('-',$enddate)."
\n";//test + while( TRUE ) { + if( isset( $endDatets ) && ( $wdatets > $endDatets )) + break; + if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] )) + break; + if( $year_old != $wdate['year'] ) { + $year_old = $wdate['year']; + $daycnts = array(); + $yeardays = $weekno = 0; + $yeardaycnt = array(); + for( $m = 1; $m <= 12; $m++ ) { // count up and update up-counters + $daycnts[$m] = array(); + $weekdaycnt = array(); + foreach( $daynames as $dn ) + $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0; + $mcnt = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] )); + for( $d = 1; $d <= $mcnt; $d++ ) { + $daycnts[$m][$d] = array(); + if( isset( $recur['BYYEARDAY'] )) { + $yeardays++; + $daycnts[$m][$d]['yearcnt_up'] = $yeardays; + } + if( isset( $recur['BYDAY'] )) { + $day = date( 'w', mktime( 0, 0, 0, $m, $d, $wdate['year'] )); + $day = $daynames[$day]; + $daycnts[$m][$d]['DAY'] = $day; + $weekdaycnt[$day]++; + $daycnts[$m][$d]['monthdayno_up'] = $weekdaycnt[$day]; + $yeardaycnt[$day]++; + $daycnts[$m][$d]['yeardayno_up'] = $yeardaycnt[$day]; + } + if( isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) + $daycnts[$m][$d]['weekno_up'] =(int)date('W',mktime(0,0,$wkst,$m,$d,$wdate['year'])); + } + } + $daycnt = 0; + $yeardaycnt = array(); + if( isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) { + $weekno = null; + for( $d=31; $d > 25; $d-- ) { // get last weekno for year + if( !$weekno ) + $weekno = $daycnts[12][$d]['weekno_up']; + elseif( $weekno < $daycnts[12][$d]['weekno_up'] ) { + $weekno = $daycnts[12][$d]['weekno_up']; + break; + } + } + } + for( $m = 12; $m > 0; $m-- ) { // count down and update down-counters + $weekdaycnt = array(); + foreach( $daynames as $dn ) + $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0; + $monthcnt = 0; + $mcnt = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] )); + for( $d = $mcnt; $d > 0; $d-- ) { + if( isset( $recur['BYYEARDAY'] )) { + $daycnt -= 1; + $daycnts[$m][$d]['yearcnt_down'] = $daycnt; + } + if( isset( $recur['BYMONTHDAY'] )) { + $monthcnt -= 1; + $daycnts[$m][$d]['monthcnt_down'] = $monthcnt; + } + if( isset( $recur['BYDAY'] )) { + $day = $daycnts[$m][$d]['DAY']; + $weekdaycnt[$day] -= 1; + $daycnts[$m][$d]['monthdayno_down'] = $weekdaycnt[$day]; + $yeardaycnt[$day] -= 1; + $daycnts[$m][$d]['yeardayno_down'] = $yeardaycnt[$day]; + } + if( isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) + $daycnts[$m][$d]['weekno_down'] = ($daycnts[$m][$d]['weekno_up'] - $weekno - 1); + } + } + } + /* check interval */ + if( 1 < $recur['INTERVAL'] ) { + /* create interval index */ + $intervalix = iCalUtilityFunctions::_recurIntervalIx( $recur['FREQ'], $wdate, $wkst ); + /* check interval */ + $currentKey = array_keys( $intervalarr ); + $currentKey = end( $currentKey ); // get last index + if( $currentKey != $intervalix ) + $intervalarr = array( $intervalix => ( $intervalarr[$currentKey] + 1 )); + if(( $recur['INTERVAL'] != $intervalarr[$intervalix] ) && + ( 0 != $intervalarr[$intervalix] )) { + /* step up date */ + //echo "skip: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."
\n";//test + iCalUtilityFunctions::_stepdate( $wdate, $wdatets, $step); + continue; + } + else // continue within the selected interval + $intervalarr[$intervalix] = 0; + //echo "cont: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."
\n";//test + } + $updateOK = TRUE; + if( $updateOK && isset( $recur['BYMONTH'] )) + $updateOK = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYMONTH'] + , $wdate['month'] + ,($wdate['month'] - 13)); + if( $updateOK && isset( $recur['BYWEEKNO'] )) + $updateOK = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYWEEKNO'] + , $daycnts[$wdate['month']][$wdate['day']]['weekno_up'] + , $daycnts[$wdate['month']][$wdate['day']]['weekno_down'] ); + if( $updateOK && isset( $recur['BYYEARDAY'] )) + $updateOK = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYYEARDAY'] + , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_up'] + , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_down'] ); + if( $updateOK && isset( $recur['BYMONTHDAY'] )) + $updateOK = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYMONTHDAY'] + , $wdate['day'] + , $daycnts[$wdate['month']][$wdate['day']]['monthcnt_down'] ); + //echo "efter BYMONTHDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "
\n";//test### + if( $updateOK && isset( $recur['BYDAY'] )) { + $updateOK = FALSE; + $m = $wdate['month']; + $d = $wdate['day']; + if( isset( $recur['BYDAY']['DAY'] )) { // single day, opt with year/month day order no + $daynoexists = $daynosw = $daynamesw = FALSE; + if( $recur['BYDAY']['DAY'] == $daycnts[$m][$d]['DAY'] ) + $daynamesw = TRUE; + if( isset( $recur['BYDAY'][0] )) { + $daynoexists = TRUE; + if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) || isset( $recur['BYMONTH'] )) + $daynosw = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYDAY'][0] + , $daycnts[$m][$d]['monthdayno_up'] + , $daycnts[$m][$d]['monthdayno_down'] ); + elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' )) + $daynosw = iCalUtilityFunctions::_recurBYcntcheck( $recur['BYDAY'][0] + , $daycnts[$m][$d]['yeardayno_up'] + , $daycnts[$m][$d]['yeardayno_down'] ); + } + if(( $daynoexists && $daynosw && $daynamesw ) || + ( !$daynoexists && !$daynosw && $daynamesw )) { + $updateOK = TRUE; + } + //echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw
\n"; // test ### + } + else { + foreach( $recur['BYDAY'] as $bydayvalue ) { + $daynoexists = $daynosw = $daynamesw = FALSE; + if( isset( $bydayvalue['DAY'] ) && + ( $bydayvalue['DAY'] == $daycnts[$m][$d]['DAY'] )) + $daynamesw = TRUE; + if( isset( $bydayvalue[0] )) { + $daynoexists = TRUE; + if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) || + isset( $recur['BYMONTH'] )) + $daynosw = iCalUtilityFunctions::_recurBYcntcheck( $bydayvalue['0'] + , $daycnts[$m][$d]['monthdayno_up'] + , $daycnts[$m][$d]['monthdayno_down'] ); + elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' )) + $daynosw = iCalUtilityFunctions::_recurBYcntcheck( $bydayvalue['0'] + , $daycnts[$m][$d]['yeardayno_up'] + , $daycnts[$m][$d]['yeardayno_down'] ); + } + //echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw
\n"; // test ### + if(( $daynoexists && $daynosw && $daynamesw ) || + ( !$daynoexists && !$daynosw && $daynamesw )) { + $updateOK = TRUE; + break; + } + } + } + } + //echo "efter BYDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "
\n"; // test ### + /* check BYSETPOS */ + if( $updateOK ) { + if( isset( $recur['BYSETPOS'] ) && + ( in_array( $recur['FREQ'], array( 'YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY' )))) { + if( isset( $recur['WEEKLY'] )) { + if( $bysetposWold == $daycnts[$wdate['month']][$wdate['day']]['weekno_up'] ) + $bysetposw1[] = $wdatets; + else + $bysetposw2[] = $wdatets; + } + else { + if(( isset( $recur['FREQ'] ) && ( 'YEARLY' == $recur['FREQ'] ) && + ( $bysetposYold == $wdate['year'] )) || + ( isset( $recur['FREQ'] ) && ( 'MONTHLY' == $recur['FREQ'] ) && + (( $bysetposYold == $wdate['year'] ) && + ( $bysetposMold == $wdate['month'] ))) || + ( isset( $recur['FREQ'] ) && ( 'DAILY' == $recur['FREQ'] ) && + (( $bysetposYold == $wdate['year'] ) && + ( $bysetposMold == $wdate['month']) && + ( $bysetposDold == $wdate['day'] )))) + $bysetposymd1[] = $wdatets; + else + $bysetposymd2[] = $wdatets; + } + } + else { + /* update result array if BYSETPOS is set */ + $countcnt++; + if( $startdatets <= $wdatets ) { // only output within period + $result[$wdatets] = TRUE; + //echo "recur ".implode('-',iCalUtilityFunctions::_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."
\n";//test + } + //else echo "recur undate ".implode('-',iCalUtilityFunctions::_date_time_string(date('Y-m-d H:i:s',$wdatets),6))." okdatstart ".implode('-',iCalUtilityFunctions::_date_time_string(date('Y-m-d H:i:s',$startdatets),6))."
\n";//test + $updateOK = FALSE; + } + } + /* step up date */ + iCalUtilityFunctions::_stepdate( $wdate, $wdatets, $step); + /* check if BYSETPOS is set for updating result array */ + if( $updateOK && isset( $recur['BYSETPOS'] )) { + $bysetpos = FALSE; + if( isset( $recur['FREQ'] ) && ( 'YEARLY' == $recur['FREQ'] ) && + ( $bysetposYold != $wdate['year'] )) { + $bysetpos = TRUE; + $bysetposYold = $wdate['year']; + } + elseif( isset( $recur['FREQ'] ) && ( 'MONTHLY' == $recur['FREQ'] && + (( $bysetposYold != $wdate['year'] ) || ( $bysetposMold != $wdate['month'] )))) { + $bysetpos = TRUE; + $bysetposYold = $wdate['year']; + $bysetposMold = $wdate['month']; + } + elseif( isset( $recur['FREQ'] ) && ( 'WEEKLY' == $recur['FREQ'] )) { + $weekno = (int) date( 'W', mktime( 0, 0, $wkst, $wdate['month'], $wdate['day'], $wdate['year'])); + if( $bysetposWold != $weekno ) { + $bysetposWold = $weekno; + $bysetpos = TRUE; + } + } + elseif( isset( $recur['FREQ'] ) && ( 'DAILY' == $recur['FREQ'] ) && + (( $bysetposYold != $wdate['year'] ) || + ( $bysetposMold != $wdate['month'] ) || + ( $bysetposDold != $wdate['day'] ))) { + $bysetpos = TRUE; + $bysetposYold = $wdate['year']; + $bysetposMold = $wdate['month']; + $bysetposDold = $wdate['day']; + } + if( $bysetpos ) { + if( isset( $recur['BYWEEKNO'] )) { + $bysetposarr1 = & $bysetposw1; + $bysetposarr2 = & $bysetposw2; + } + else { + $bysetposarr1 = & $bysetposymd1; + $bysetposarr2 = & $bysetposymd2; + } + foreach( $recur['BYSETPOS'] as $ix ) { + if( 0 > $ix ) // both positive and negative BYSETPOS allowed + $ix = ( count( $bysetposarr1 ) + $ix + 1); + $ix--; + if( isset( $bysetposarr1[$ix] )) { + if( $startdatets <= $bysetposarr1[$ix] ) { // only output within period + $result[$bysetposarr1[$ix]] = TRUE; + //echo "recur ".implode('-',iCalUtilityFunctions::_date_time_string(date('Y-m-d H:i:s',$bysetposarr1[$ix]),6))."
\n";//test + } + $countcnt++; + } + if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] )) + break; + } + $bysetposarr1 = $bysetposarr2; + $bysetposarr2 = array(); + } + } + } + } + public static function _recurBYcntcheck( $BYvalue, $upValue, $downValue ) { + if( is_array( $BYvalue ) && + ( in_array( $upValue, $BYvalue ) || in_array( $downValue, $BYvalue ))) + return TRUE; + elseif(( $BYvalue == $upValue ) || ( $BYvalue == $downValue )) + return TRUE; + else + return FALSE; + } + public static function _recurIntervalIx( $freq, $date, $wkst ) { + /* create interval index */ + switch( $freq ) { + case 'YEARLY': + $intervalix = $date['year']; + break; + case 'MONTHLY': + $intervalix = $date['year'].'-'.$date['month']; + break; + case 'WEEKLY': + $wdatets = iCalUtilityFunctions::_date2timestamp( $date ); + $intervalix = (int) date( 'W', ( $wdatets + $wkst )); + break; + case 'DAILY': + default: + $intervalix = $date['year'].'-'.$date['month'].'-'.$date['day']; + break; + } + return $intervalix; + } +/** + * convert input format for exrule and rrule to internal format + * + * @author Kjell-Inge Gustafsson + * @since 2.6.23 - 2010-12-07 + * @param array $rexrule + * @return array + */ + public static function _setRexrule( $rexrule ) { + $input = array(); + if( empty( $rexrule )) + return $input; + foreach( $rexrule as $rexrulelabel => $rexrulevalue ) { + $rexrulelabel = strtoupper( $rexrulelabel ); + if( 'UNTIL' != $rexrulelabel ) + $input[$rexrulelabel] = $rexrulevalue; + else { + if( iCalUtilityFunctions::_isArrayTimestampDate( $rexrulevalue )) // timestamp date + $input[$rexrulelabel] = iCalUtilityFunctions::_timestamp2date( $rexrulevalue, 6 ); + elseif( iCalUtilityFunctions::_isArrayDate( $rexrulevalue )) // date-time + $input[$rexrulelabel] = iCalUtilityFunctions::_date_time_array( $rexrulevalue, 6 ); + elseif( 8 <= strlen( trim( $rexrulevalue ))) // ex. 2006-08-03 10:12:18 + $input[$rexrulelabel] = iCalUtilityFunctions::_date_time_string( $rexrulevalue ); + if(( 3 < count( $input[$rexrulelabel] )) && !isset( $input[$rexrulelabel]['tz'] )) + $input[$rexrulelabel]['tz'] = 'Z'; + } + } + /* set recurrence rule specification in rfc2445 order */ + $input2 = array(); + if( isset( $input['FREQ'] )) + $input2['FREQ'] = $input['FREQ']; + if( isset( $input['UNTIL'] )) + $input2['UNTIL'] = $input['UNTIL']; + elseif( isset( $input['COUNT'] )) + $input2['COUNT'] = $input['COUNT']; + if( isset( $input['INTERVAL'] )) + $input2['INTERVAL'] = $input['INTERVAL']; + if( isset( $input['BYSECOND'] )) + $input2['BYSECOND'] = $input['BYSECOND']; + if( isset( $input['BYMINUTE'] )) + $input2['BYMINUTE'] = $input['BYMINUTE']; + if( isset( $input['BYHOUR'] )) + $input2['BYHOUR'] = $input['BYHOUR']; + if( isset( $input['BYDAY'] )) + $input2['BYDAY'] = $input['BYDAY']; + if( isset( $input['BYMONTHDAY'] )) + $input2['BYMONTHDAY'] = $input['BYMONTHDAY']; + if( isset( $input['BYYEARDAY'] )) + $input2['BYYEARDAY'] = $input['BYYEARDAY']; + if( isset( $input['BYWEEKNO'] )) + $input2['BYWEEKNO'] = $input['BYWEEKNO']; + if( isset( $input['BYMONTH'] )) + $input2['BYMONTH'] = $input['BYMONTH']; + if( isset( $input['BYSETPOS'] )) + $input2['BYSETPOS'] = $input['BYSETPOS']; + if( isset( $input['WKST'] )) + $input2['WKST'] = $input['WKST']; + return $input2; + } +/** + * convert format for input date to internal date with parameters + * + * @author Kjell-Inge Gustafsson + * @since 2.6.22 - 2010-09-25 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param string $tz optional + * @param array $params optional + * @param string $caller optional + * @param string $objName optional + * @return array + */ + public static function _setDate( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE, $caller=null, $objName=null ) { + $input = $parno = null; + $localtime = (( 'dtstart' == $caller ) && in_array( $objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE; + if( iCalUtilityFunctions::_isArrayDate( $year )) { + if( $localtime ) unset ( $month['VALUE'], $month['TZID'] ); + $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' )); + if( isset( $input['params']['TZID'] )) { + $input['params']['VALUE'] = 'DATE-TIME'; + unset( $year['tz'] ); + } + $hitval = (( !empty( $year['tz'] ) || !empty( $year[6] ))) ? 7 : 6; + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval ); + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE', 3, count( $year ), $parno ); + $input['value'] = iCalUtilityFunctions::_date_time_array( $year, $parno ); + } + elseif( iCalUtilityFunctions::_isArrayTimestampDate( $year )) { + if( $localtime ) unset ( $month['VALUE'], $month['TZID'] ); + $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' )); + if( isset( $input['params']['TZID'] )) { + $input['params']['VALUE'] = 'DATE-TIME'; + unset( $year['tz'] ); + } + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE', 3 ); + $hitval = ( isset( $year['tz'] )) ? 7 : 6; + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno ); + $input['value'] = iCalUtilityFunctions::_timestamp2date( $year, $parno ); + } + elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18 + if( $localtime ) unset ( $month['VALUE'], $month['TZID'] ); + $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' )); + if( isset( $input['params']['TZID'] )) { + $input['params']['VALUE'] = 'DATE-TIME'; + $parno = 6; + } + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7, $parno ); + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE', 3, $parno, $parno ); + $input['value'] = iCalUtilityFunctions::_date_time_string( $year, $parno ); + } + else { + if( is_array( $params )) { + if( $localtime ) unset ( $params['VALUE'], $params['TZID'] ); + $input['params'] = iCalUtilityFunctions::_setParams( $params, array( 'VALUE' => 'DATE-TIME' )); + } + elseif( is_array( $tz )) { + $input['params'] = iCalUtilityFunctions::_setParams( $tz, array( 'VALUE' => 'DATE-TIME' )); + $tz = FALSE; + } + elseif( is_array( $hour )) { + $input['params'] = iCalUtilityFunctions::_setParams( $hour, array( 'VALUE' => 'DATE-TIME' )); + $hour = $min = $sec = $tz = FALSE; + } + if( isset( $input['params']['TZID'] )) { + $tz = null; + $input['params']['VALUE'] = 'DATE-TIME'; + } + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE', 3 ); + $hitval = ( !empty( $tz )) ? 7 : 6; + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno, $parno ); + $input['value'] = array( 'year' => $year, 'month' => $month, 'day' => $day ); + if( 3 != $parno ) { + $input['value']['hour'] = ( $hour ) ? $hour : '0'; + $input['value']['min'] = ( $min ) ? $min : '0'; + $input['value']['sec'] = ( $sec ) ? $sec : '0'; + if( !empty( $tz )) + $input['value']['tz'] = $tz; + } + } + if( 3 == $parno ) { + $input['params']['VALUE'] = 'DATE'; + unset( $input['value']['tz'] ); + unset( $input['params']['TZID'] ); + } + elseif( isset( $input['params']['TZID'] )) + unset( $input['value']['tz'] ); + if( $localtime ) unset( $input['value']['tz'], $input['params']['TZID'] ); + if( isset( $input['value']['tz'] )) + $input['value']['tz'] = (string) $input['value']['tz']; + if( !empty( $input['value']['tz'] ) && ( 'Z' != $input['value']['tz'] ) && + ( !iCalUtilityFunctions::_isOffset( $input['value']['tz'] ))) + $input['params']['TZID'] = $input['value']['tz']; + return $input; + } +/** + * convert format for input date (UTC) to internal date with parameters + * + * @author Kjell-Inge Gustafsson + * @since 2.4.17 - 2008-10-31 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param array $params optional + * @return array + */ + public static function _setDate2( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) { + $input = null; + if( iCalUtilityFunctions::_isArrayDate( $year )) { + $input['value'] = iCalUtilityFunctions::_date_time_array( $year, 7 ); + $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) ); + } + elseif( iCalUtilityFunctions::_isArrayTimestampDate( $year )) { + $input['value'] = iCalUtilityFunctions::_timestamp2date( $year, 7 ); + $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) ); + } + elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18 + $input['value'] = iCalUtilityFunctions::_date_time_string( $year, 7 ); + $input['params'] = iCalUtilityFunctions::_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) ); + } + else { + $input['value'] = array( 'year' => $year + , 'month' => $month + , 'day' => $day + , 'hour' => $hour + , 'min' => $min + , 'sec' => $sec ); + $input['params'] = iCalUtilityFunctions::_setParams( $params, array( 'VALUE' => 'DATE-TIME' )); + } + $parno = iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7 ); // remove default + if( !isset( $input['value']['hour'] )) + $input['value']['hour'] = 0; + if( !isset( $input['value']['min'] )) + $input['value']['min'] = 0; + if( !isset( $input['value']['sec'] )) + $input['value']['sec'] = 0; + if( !isset( $input['value']['tz'] ) || !iCalUtilityFunctions::_isOffset( $input['value']['tz'] )) + $input['value']['tz'] = 'Z'; + return $input; + } +/** + * check index and set (an indexed) content in multiple value array + * + * @author Kjell-Inge Gustafsson + * @since 2.6.12 - 2011-01-03 + * @param array $valArr + * @param mixed $value + * @param array $params + * @param array $defaults + * @param int $index + * @return void + */ + public static function _setMval( & $valArr, $value, $params=FALSE, $defaults=FALSE, $index=FALSE ) { + if( !is_array( $valArr )) $valArr = array(); + if( $index ) + $index = $index - 1; + elseif( 0 < count( $valArr )) { + $keys = array_keys( $valArr ); + $index = end( $keys ) + 1; + } + else + $index = 0; + $valArr[$index] = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params, $defaults )); + ksort( $valArr ); + } +/** + * set input (formatted) parameters- component property attributes + * + * default parameters can be set, if missing + * + * @author Kjell-Inge Gustafsson + * @since 1.x.x - 2007-05-01 + * @param array $params + * @param array $defaults + * @return array + */ + public static function _setParams( $params, $defaults=FALSE ) { + if( !is_array( $params)) + $params = array(); + $input = array(); + foreach( $params as $paramKey => $paramValue ) { + if( is_array( $paramValue )) { + foreach( $paramValue as $pkey => $pValue ) { + if(( '"' == substr( $pValue, 0, 1 )) && ( '"' == substr( $pValue, -1 ))) + $paramValue[$pkey] = substr( $pValue, 1, ( strlen( $pValue ) - 2 )); + } + } + elseif(( '"' == substr( $paramValue, 0, 1 )) && ( '"' == substr( $paramValue, -1 ))) + $paramValue = substr( $paramValue, 1, ( strlen( $paramValue ) - 2 )); + if( 'VALUE' == strtoupper( $paramKey )) + $input['VALUE'] = strtoupper( $paramValue ); + else + $input[strtoupper( $paramKey )] = $paramValue; + } + if( is_array( $defaults )) { + foreach( $defaults as $paramKey => $paramValue ) { + if( !isset( $input[$paramKey] )) + $input[$paramKey] = $paramValue; + } + } + return (0 < count( $input )) ? $input : null; + } +/** + * step date, return updated date, array and timpstamp + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-18 + * @param array $date, date to step + * @param int $timestamp + * @param array $step, default array( 'day' => 1 ) + * @return void + */ + public static function _stepdate( &$date, &$timestamp, $step=array( 'day' => 1 )) { + foreach( $step as $stepix => $stepvalue ) + $date[$stepix] += $stepvalue; + $timestamp = iCalUtilityFunctions::_date2timestamp( $date ); + $date = iCalUtilityFunctions::_timestamp2date( $timestamp, 6 ); + foreach( $date as $k => $v ) { + if( ctype_digit( $v )) + $date[$k] = (int) $v; + } + } +/** + * convert timestamp to date array + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-11-01 + * @param mixed $timestamp + * @param int $parno + * @return array + */ + public static function _timestamp2date( $timestamp, $parno=6 ) { + if( is_array( $timestamp )) { + if(( 7 == $parno ) && !empty( $timestamp['tz'] )) + $tz = $timestamp['tz']; + $timestamp = $timestamp['timestamp']; + } + $output = array( 'year' => date( 'Y', $timestamp ) + , 'month' => date( 'm', $timestamp ) + , 'day' => date( 'd', $timestamp )); + if( 3 != $parno ) { + $output['hour'] = date( 'H', $timestamp ); + $output['min'] = date( 'i', $timestamp ); + $output['sec'] = date( 's', $timestamp ); + if( isset( $tz )) + $output['tz'] = $tz; + } + return $output; + } +/** + * convert timestamp to duration in array format + * + * @author Kjell-Inge Gustafsson + * @since 2.6.23 - 2010-10-23 + * @param int $timestamp + * @return array, duration format + */ + function _timestamp2duration( $timestamp ) { + $dur = array(); + $dur['week'] = (int) floor( $timestamp / ( 7 * 24 * 60 * 60 )); + $timestamp = $timestamp % ( 7 * 24 * 60 * 60 ); + $dur['day'] = (int) floor( $timestamp / ( 24 * 60 * 60 )); + $timestamp = $timestamp % ( 24 * 60 * 60 ); + $dur['hour'] = (int) floor( $timestamp / ( 60 * 60 )); + $timestamp = $timestamp % ( 60 * 60 ); + $dur['min'] = (int) floor( $timestamp / ( 60 )); + $dur['sec'] = (int) $timestamp % ( 60 ); + return $dur; + } +/** + * convert (numeric) local time offset to seconds correcting localtime to GMT + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-19 + * @param string $offset + * @return integer + */ + public static function _tz2offset( $tz ) { + $tz = trim( (string) $tz ); + $offset = 0; + if((( 5 != strlen( $tz )) && ( 7 != strlen( $tz ))) || + (( '+' != substr( $tz, 0, 1 )) && ( '-' != substr( $tz, 0, 1 ))) || + (( '0000' >= substr( $tz, 1, 4 )) && ( '9999' < substr( $tz, 1, 4 ))) || + (( 7 == strlen( $tz )) && ( '00' > substr( $tz, 5, 2 )) && ( '99' < substr( $tz, 5, 2 )))) + return $offset; + $hours2sec = (int) substr( $tz, 1, 2 ) * 3600; + $min2sec = (int) substr( $tz, 3, 2 ) * 60; + $sec = ( 7 == strlen( $tz )) ? (int) substr( $tz, -2 ) : '00'; + $offset = $hours2sec + $min2sec + $sec; + $offset = ('-' == substr( $tz, 0, 1 )) ? $offset : -1 * $offset; + return $offset; + } +} +?> \ No newline at end of file diff --git a/iCalcreator/iCalcreator.class.php b/iCalcreator/iCalcreator.class.php new file mode 100644 index 0000000..b8be8d6 --- /dev/null +++ b/iCalcreator/iCalcreator.class.php @@ -0,0 +1,6490 @@ += '5.1' ) + // && ( 'UTC' == date_default_timezone_get())) + date_default_timezone_set( 'Europe/Stockholm' ); +/*********************************************************************************/ +/* since 2.6.22 - 2010-09-25, do NOT remove!! */ +require_once ( 'iCalUtilityFunctions.class.php' ); +/*********************************************************************************/ +/* version string, do NOT remove!! */ +define( 'ICALCREATOR_VERSION', 'iCalcreator 2.8' ); +/*********************************************************************************/ +/*********************************************************************************/ +/** + * vcalendar class + * + * @author Kjell-Inge Gustafsson + * @since 2.2.13 - 2007-12-30 + */ +class vcalendar { + // calendar property variables + var $calscale; + var $method; + var $prodid; + var $version; + var $xprop; + // container for calendar components + var $components; + // component config variables + var $allowEmpty; + var $unique_id; + var $language; + var $directory; + var $filename; + var $url; + var $delimiter; + var $nl; + var $format; + // component internal variables + var $attributeDelimiter; + var $valueInit; + // component xCal declaration container + var $xcaldecl; +/* + * constructor for calendar object + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-20 + * @param array $config + * @return void + */ + function vcalendar ( $config = array()) { + $this->_makeVersion(); + $this->calscale = null; + $this->method = null; + $this->_makeUnique_id(); + $this->prodid = null; + $this->xprop = array(); + $this->language = null; + $this->directory = null; + $this->filename = null; + $this->url = null; +/** + * language = + */ + if( defined( 'ICAL_LANG' ) && !isset( $config['language'] )) + $config['language'] = ICAL_LANG; + if( !isset( $config['allowEmpty'] )) $config['allowEmpty'] = TRUE; + if( !isset( $config['nl'] )) $config['nl'] = PHP_EOL; + if( !isset( $config['format'] )) $config['format'] = 'iCal'; + if( !isset( $config['delimiter'] )) $config['delimiter'] = DIRECTORY_SEPARATOR; + $this->setConfig( $config ); + + $this->xcaldecl = array(); + $this->components = array(); + } +/*********************************************************************************/ +/** + * Property Name: CALSCALE + */ +/** + * creates formatted output for calendar property calscale + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createCalscale() { + if( empty( $this->calscale )) return FALSE; + switch( $this->format ) { + case 'xcal': + return ' calscale="'.$this->calscale.'"'.$this->nl; + break; + default: + return 'CALSCALE:'.$this->calscale.$this->nl; + break; + } + } +/** + * set calendar property calscale + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @param string $value + * @return void + */ + function setCalscale( $value ) { + if( empty( $value )) return FALSE; + $this->calscale = $value; + } +/*********************************************************************************/ +/** + * Property Name: METHOD + */ +/** + * creates formatted output for calendar property method + * + * @author Kjell-Inge Gustafsson + * @since 0.9.7 - 2006-11-20 + * @return string + */ + function createMethod() { + if( empty( $this->method )) return FALSE; + switch( $this->format ) { + case 'xcal': + return ' method="'.$this->method.'"'.$this->nl; + break; + default: + return 'METHOD:'.$this->method.$this->nl; + break; + } + } +/** + * set calendar property method + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-20-23 + * @param string $value + * @return bool + */ + function setMethod( $value ) { + if( empty( $value )) return FALSE; + $this->method = $value; + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: PRODID + * + * The identifier is RECOMMENDED to be the identical syntax to the + * [RFC 822] addr-spec. A good method to assure uniqueness is to put the + * domain name or a domain literal IP address of the host on which.. . + */ +/** + * creates formatted output for calendar property prodid + * + * @author Kjell-Inge Gustafsson + * @since 0.9.7 - 2006-11-20 + * @return string + */ + function createProdid() { + if( !isset( $this->prodid )) + $this->_makeProdid(); + switch( $this->format ) { + case 'xcal': + return ' prodid="'.$this->prodid.'"'.$this->nl; + break; + default: + return 'PRODID:'.$this->prodid.$this->nl; + break; + } + } +/** + * make default value for calendar prodid + * + * @author Kjell-Inge Gustafsson + * @since 2.6.8 - 2009-12-30 + * @return void + */ + function _makeProdid() { + $this->prodid = '-//'.$this->unique_id.'//NONSGML kigkonsult.se '.ICALCREATOR_VERSION.'//'.strtoupper( $this->language ); + } +/** + * Conformance: The property MUST be specified once in an iCalendar object. + * Description: The vendor of the implementation SHOULD assure that this + * is a globally unique identifier; using some technique such as an FPI + * value, as defined in [ISO 9070]. + */ +/** + * make default unique_id for calendar prodid + * + * @author Kjell-Inge Gustafsson + * @since 0.3.0 - 2006-08-10 + * @return void + */ + function _makeUnique_id() { + $this->unique_id = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost'; + } +/*********************************************************************************/ +/** + * Property Name: VERSION + * + * Description: A value of "2.0" corresponds to this memo. + */ +/** + * creates formatted output for calendar property version + + * + * @author Kjell-Inge Gustafsson + * @since 0.9.7 - 2006-11-20 + * @return string + */ + function createVersion() { + if( empty( $this->version )) + $this->_makeVersion(); + switch( $this->format ) { + case 'xcal': + return ' version="'.$this->version.'"'.$this->nl; + break; + default: + return 'VERSION:'.$this->version.$this->nl; + break; + } + } +/** + * set default calendar version + * + * @author Kjell-Inge Gustafsson + * @since 0.3.0 - 2006-08-10 + * @return void + */ + function _makeVersion() { + $this->version = '2.0'; + } +/** + * set calendar version + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @param string $value + * @return void + */ + function setVersion( $value ) { + if( empty( $value )) return FALSE; + $this->version = $value; + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: x-prop + */ +/** + * creates formatted output for calendar property x-prop, iCal format only + * + * @author Kjell-Inge Gustafsson + * @since 2.4.11 - 2008-11-03 + * @return string + */ + function createXprop() { + if( 'xcal' == $this->format ) + return false; + if( 0 >= count( $this->xprop )) + return; + $output = null; + $toolbox = new calendarComponent(); + $toolbox->setConfig( 'language', $this->getConfig( 'language' )); + $toolbox->setConfig( 'nl', $this->getConfig( 'nl' )); + $toolbox->_createFormat( $this->getConfig( 'format' )); + foreach( $this->xprop as $label => $xpropPart ) { + if( empty( $xpropPart['value'] )) { + $output .= $toolbox->_createElement( $label ); + continue; + } + $attributes = $toolbox->_createParams( $xpropPart['params'], array( 'LANGUAGE' )); + if( is_array( $xpropPart['value'] )) { + foreach( $xpropPart['value'] as $pix => $theXpart ) + $xpropPart['value'][$pix] = $toolbox->_strrep( $theXpart ); + $xpropPart['value'] = implode( ',', $xpropPart['value'] ); + } + else + $xpropPart['value'] = $toolbox->_strrep( $xpropPart['value'] ); + $output .= $toolbox->_createElement( $label, $attributes, $xpropPart['value'] ); + } + return $output; + } +/** + * set calendar property x-prop + * + * @author Kjell-Inge Gustafsson + * @since 2.6.22 - 2010-09-25 + * @param string $label + * @param string $value + * @param array $params optional + * @return bool + */ + function setXprop( $label, $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + if( empty( $label )) return FALSE; + $xprop = array( 'value' => $value ); + $xprop['params'] = iCalUtilityFunctions::_setParams( $params ); + if( !is_array( $this->xprop )) $this->xprop = array(); + $this->xprop[strtoupper( $label )] = $xprop; + return TRUE; + } +/*********************************************************************************/ +/** + * delete calendar property value + * + * @author Kjell-Inge Gustafsson + * @since 2.6.4 - 2011-01-05 + * @param mixed $propName, bool FALSE => X-property + * @param int $propix, optional, if specific property is wanted in case of multiply occurences + * @return bool, if successfull delete + */ + function deleteProperty( $propName=FALSE, $propix=FALSE ) { + $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP'; + if( !$propix ) + $propix = ( isset( $this->propdelix[$propName] ) && ( 'X-PROP' != $propName )) ? $this->propdelix[$propName] + 2 : 1; + $this->propdelix[$propName] = --$propix; + $return = FALSE; + switch( $propName ) { + case 'CALSCALE': + if( isset( $this->calscale )) { + $this->calscale = null; + $return = TRUE; + } + break; + case 'METHOD': + if( isset( $this->method )) { + $this->method = null; + $return = TRUE; + } + break; + default: + $reduced = array(); + if( $propName != 'X-PROP' ) { + if( !isset( $this->xprop[$propName] )) return FALSE; + foreach( $this->xprop as $k => $a ) { + if(( $k != $propName ) && !empty( $a )) + $reduced[$k] = $a; + } + } + else { + if( count( $this->xprop ) <= $propix ) return FALSE; + $xpropno = 0; + foreach( $this->xprop as $xpropkey => $xpropvalue ) { + if( $propix != $xpropno ) + $reduced[$xpropkey] = $xpropvalue; + $xpropno++; + } + } + $this->xprop = $reduced; + if( empty( $this->xprop )) + return FALSE; + return TRUE; + } + return $return; + } +/** + * get calendar property value/params + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-02 + * @param string $propName, optional + * @param int $propix, optional, if specific property is wanted in case of multiply occurences + * @param bool $inclParam=FALSE + * @return mixed + */ + function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE ) { + $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP'; + if( 'X-PROP' == $propName ) { + if( !$propix ) + $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1; + $this->propix[$propName] = --$propix; + } + switch( $propName ) { + case 'CALSCALE': + return ( !empty( $this->calscale )) ? $this->calscale : null; + break; + case 'METHOD': + return ( !empty( $this->method )) ? $this->method : null; + break; + case 'PRODID': + if( empty( $this->prodid )) + $this->_makeProdid(); + return $this->prodid; + break; + case 'VERSION': + return ( !empty( $this->version )) ? $this->version : null; + break; + default: + if( $propName != 'X-PROP' ) { + if( !isset( $this->xprop[$propName] )) return FALSE; + return ( $inclParam ) ? array( $propName, $this->xprop[$propName] ) + : array( $propName, $this->xprop[$propName]['value'] ); + } + else { + if( empty( $this->xprop )) return FALSE; + $xpropno = 0; + foreach( $this->xprop as $xpropkey => $xpropvalue ) { + if( $propix == $xpropno ) + return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] ) + : array( $xpropkey, $this->xprop[$xpropkey]['value'] ); + else + $xpropno++; + } + return FALSE; // not found ?? + } + } + return FALSE; + } +/** + * general vcalendar property setting + * + * @author Kjell-Inge Gustafsson + * @since 2.2.13 - 2007-11-04 + * @param mixed $args variable number of function arguments, + * first argument is ALWAYS component name, + * second ALWAYS component value! + * @return bool + */ + function setProperty () { + $numargs = func_num_args(); + if( 1 > $numargs ) + return FALSE; + $arglist = func_get_args(); + $arglist[0] = strtoupper( $arglist[0] ); + switch( $arglist[0] ) { + case 'CALSCALE': + return $this->setCalscale( $arglist[1] ); + case 'METHOD': + return $this->setMethod( $arglist[1] ); + case 'VERSION': + return $this->setVersion( $arglist[1] ); + default: + if( !isset( $arglist[1] )) $arglist[1] = null; + if( !isset( $arglist[2] )) $arglist[2] = null; + return $this->setXprop( $arglist[0], $arglist[1], $arglist[2] ); + } + return FALSE; + } +/*********************************************************************************/ +/** + * get vcalendar config values or * calendar components + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-27 + * @param mixed $config + * @return value + */ + function getConfig( $config = FALSE ) { + if( !$config ) { + $return = array(); + $return['ALLOWEMPTY'] = $this->getConfig( 'ALLOWEMPTY' ); + $return['DELIMITER'] = $this->getConfig( 'DELIMITER' ); + $return['DIRECTORY'] = $this->getConfig( 'DIRECTORY' ); + $return['FILENAME'] = $this->getConfig( 'FILENAME' ); + $return['DIRFILE'] = $this->getConfig( 'DIRFILE' ); + $return['FILESIZE'] = $this->getConfig( 'FILESIZE' ); + $return['FORMAT'] = $this->getConfig( 'FORMAT' ); + if( FALSE !== ( $lang = $this->getConfig( 'LANGUAGE' ))) + $return['LANGUAGE'] = $lang; + $return['NEWLINECHAR'] = $this->getConfig( 'NEWLINECHAR' ); + $return['UNIQUE_ID'] = $this->getConfig( 'UNIQUE_ID' ); + if( FALSE !== ( $url = $this->getConfig( 'URL' ))) + $return['URL'] = $url; + return $return; + } + switch( strtoupper( $config )) { + case 'ALLOWEMPTY': + return $this->allowEmpty; + break; + case 'COMPSINFO': + unset( $this->compix ); + $info = array(); + foreach( $this->components as $cix => $component ) { + if( empty( $component )) continue; + unset( $component->propix ); + $info[$cix]['ordno'] = $cix + 1; + $info[$cix]['type'] = $component->objName; + $info[$cix]['uid'] = $component->getProperty( 'uid' ); + $info[$cix]['props'] = $component->getConfig( 'propinfo' ); + $info[$cix]['sub'] = $component->getConfig( 'compsinfo' ); + unset( $component->propix ); + } + return $info; + break; + case 'DELIMITER': + return $this->delimiter; + break; + case 'DIRECTORY': + if( empty( $this->directory )) + $this->directory = '.'; + return $this->directory; + break; + case 'DIRFILE': + return $this->getConfig( 'directory' ).$this->getConfig( 'delimiter' ).$this->getConfig( 'filename' ); + break; + case 'FILEINFO': + return array( $this->getConfig( 'directory' ) + , $this->getConfig( 'filename' ) + , $this->getConfig( 'filesize' )); + break; + case 'FILENAME': + if( empty( $this->filename )) { + if( 'xcal' == $this->format ) + $this->filename = date( 'YmdHis' ).'.xml'; // recommended xcs.. . + else + $this->filename = date( 'YmdHis' ).'.ics'; + } + return $this->filename; + break; + case 'FILESIZE': + $size = 0; + if( empty( $this->url )) { + $dirfile = $this->getConfig( 'dirfile' ); + if( !is_file( $dirfile ) || ( FALSE === ( $size = filesize( $dirfile )))) + $size = 0; + clearstatcache(); + } + return $size; + break; + case 'FORMAT': + return ( $this->format == 'xcal' ) ? 'xCal' : 'iCal'; + break; + case 'LANGUAGE': + /* get language for calendar component as defined in [RFC 1766] */ + return $this->language; + break; + case 'NL': + case 'NEWLINECHAR': + return $this->nl; + break; + case 'UNIQUE_ID': + return $this->unique_id; + break; + case 'URL': + if( !empty( $this->url )) + return $this->url; + else + return FALSE; + break; + } + } +/** + * general vcalendar config setting + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-12-12 + * @param mixed $config + * @param string $value + * @return void + */ + function setConfig( $config, $value = FALSE) { + if( is_array( $config )) { + foreach( $config as $cKey => $cValue ) { + if( FALSE === $this->setConfig( $cKey, $cValue )) + return FALSE; + } + return TRUE; + } + $res = FALSE; + switch( strtoupper( $config )) { + case 'ALLOWEMPTY': + $this->allowEmpty = $value; + $subcfg = array( 'ALLOWEMPTY' => $value ); + $res = TRUE; + break; + case 'DELIMITER': + $this->delimiter = $value; + return TRUE; + break; + case 'DIRECTORY': + $value = trim( $value ); + $del = $this->getConfig('delimiter'); + if( $del == substr( $value, ( 0 - strlen( $del )))) + $value = substr( $value, 0, ( strlen( $value ) - strlen( $del ))); + if( is_dir( $value )) { + /* local directory */ + clearstatcache(); + $this->directory = $value; + $this->url = null; + return TRUE; + } + else + return FALSE; + break; + case 'FILENAME': + $value = trim( $value ); + if( !empty( $this->url )) { + /* remote directory+file -> URL */ + $this->filename = $value; + return TRUE; + } + $dirfile = $this->getConfig( 'directory' ).$this->getConfig( 'delimiter' ).$value; + if( file_exists( $dirfile )) { + /* local file exists */ + if( is_readable( $dirfile ) || is_writable( $dirfile )) { + clearstatcache(); + $this->filename = $value; + return TRUE; + } + else + return FALSE; + } + elseif( is_readable($this->getConfig( 'directory' ) ) || is_writable( $this->getConfig( 'directory' ) )) { + /* read- or writable directory */ + $this->filename = $value; + return TRUE; + } + else + return FALSE; + break; + case 'FORMAT': + $value = trim( strtolower( $value )); + if( 'xcal' == $value ) { + $this->format = 'xcal'; + $this->attributeDelimiter = $this->nl; + $this->valueInit = null; + } + else { + $this->format = null; + $this->attributeDelimiter = ';'; + $this->valueInit = ':'; + } + $subcfg = array( 'FORMAT' => $value ); + $res = TRUE; + break; + case 'LANGUAGE': + // set language for calendar component as defined in [RFC 1766] + $value = trim( $value ); + $this->language = $value; + $subcfg = array( 'LANGUAGE' => $value ); + $res = TRUE; + break; + case 'NL': + case 'NEWLINECHAR': + $this->nl = $value; + $subcfg = array( 'NL' => $value ); + $res = TRUE; + break; + case 'UNIQUE_ID': + $value = trim( $value ); + $this->unique_id = $value; + $subcfg = array( 'UNIQUE_ID' => $value ); + $res = TRUE; + break; + case 'URL': + /* remote file - URL */ + $value = trim( $value ); + $value = str_replace( 'HTTP://', 'http://', $value ); + $value = str_replace( 'WEBCAL://', 'http://', $value ); + $value = str_replace( 'webcal://', 'http://', $value ); + $this->url = $value; + $this->directory = null; + $parts = pathinfo( $value ); + return $this->setConfig( 'filename', $parts['basename'] ); + break; + default: // any unvalid config key.. . + return TRUE; + } + if( !$res ) return FALSE; + if( isset( $subcfg ) && !empty( $this->components )) { + foreach( $subcfg as $cfgkey => $cfgvalue ) { + foreach( $this->components as $cix => $component ) { + $res = $component->setConfig( $cfgkey, $cfgvalue, TRUE ); + if( !$res ) + break 2; + $this->components[$cix] = $component->copy(); // PHP4 compliant + } + } + } + return $res; + } +/*********************************************************************************/ +/** + * add calendar component to container + * + * alias to setComponent + * + * @author Kjell-Inge Gustafsson + * @since 1.x.x - 2007-04-24 + * @param object $component calendar component + * @return void + */ + function addComponent( $component ) { + $this->setComponent( $component ); + } +/** + * delete calendar component from container + * + * @author Kjell-Inge Gustafsson + * @since 2.4.10 - 2008-08-05 + * @param mixed $arg1 ordno / component type / component uid + * @param mixed $arg2 optional, ordno if arg1 = component type + * @return void + */ + function deleteComponent( $arg1, $arg2=FALSE ) { + $argType = $index = null; + if ( ctype_digit( (string) $arg1 )) { + $argType = 'INDEX'; + $index = (int) $arg1 - 1; + } + elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) { + $argType = strtolower( $arg1 ); + $index = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0; + } + $cix1dC = 0; + foreach ( $this->components as $cix => $component) { + if( empty( $component )) continue; + unset( $component->propix ); + if(( 'INDEX' == $argType ) && ( $index == $cix )) { + unset( $this->components[$cix] ); + return TRUE; + } + elseif( $argType == $component->objName ) { + if( $index == $cix1dC ) { + unset( $this->components[$cix] ); + return TRUE; + } + $cix1dC++; + } + elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) { + unset( $this->components[$cix] ); + return TRUE; + } + } + return FALSE; + } +/** + * get calendar component from container + * + * @author Kjell-Inge Gustafsson + * @since 2.4.10 - 2008-08-06 + * @param mixed $arg1 optional, ordno/component type/ component uid + * @param mixed $arg2 optional, ordno if arg1 = component type + * @return object + */ + function getComponent( $arg1=FALSE, $arg2=FALSE ) { + $index = $argType = null; + if ( !$arg1 ) { + $argType = 'INDEX'; + $index = $this->compix['INDEX'] = + ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1; + } + elseif ( ctype_digit( (string) $arg1 )) { + $argType = 'INDEX'; + $index = (int) $arg1; + unset( $this->compix ); + } + elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) { + unset( $this->compix['INDEX'] ); + $argType = strtolower( $arg1 ); + if( !$arg2 ) + $index = $this->compix[$argType] = ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1; + else + $index = (int) $arg2; + } + $index -= 1; + $ckeys = array_keys( $this->components ); + if( !empty( $index) && ( $index > end( $ckeys ))) + return FALSE; + $cix1gC = 0; + foreach ( $this->components as $cix => $component) { + if( empty( $component )) continue; + unset( $component->propix ); + if(( 'INDEX' == $argType ) && ( $index == $cix )) + return $component->copy(); + elseif( $argType == $component->objName ) { + if( $index == $cix1gC ) + return $component->copy(); + $cix1gC++; + } + elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) { + unset( $component->propix ); + return $component->copy(); + } + } + /* not found.. . */ + unset( $this->compix ); + return FALSE; + } +/** + * create new calendar component, already included within calendar + * + * @author Kjell-Inge Gustafsson + * @since 2.6.33 - 2011-01-03 + * @param string $compType component type + * @return object (reference) + */ + function & newComponent( $compType ) { + $config = $this->getConfig(); + $keys = array_keys( $this->components ); + $ix = end( $keys) + 1; + switch( strtoupper( $compType )) { + case 'EVENT': + case 'VEVENT': + $this->components[$ix] = new vevent( $config ); + break; + case 'TODO': + case 'VTODO': + $this->components[$ix] = new vtodo( $config ); + break; + case 'JOURNAL': + case 'VJOURNAL': + $this->components[$ix] = new vjournal( $config ); + break; + case 'FREEBUSY': + case 'VFREEBUSY': + $this->components[$ix] = new vfreebusy( $config ); + break; + case 'TIMEZONE': + case 'VTIMEZONE': + array_unshift( $this->components, new vtimezone( $config )); + $ix = 0; + break; + default: + return FALSE; + } + return $this->components[$ix]; + } +/** + * select components from calendar on date basis + * + * Ensure DTSTART is set for every component. + * No date controls occurs. + * + * @author Kjell-Inge Gustafsson + * @since 2.6.22 - 2010-10-21 + * @param int $startY optional, start Year, default current Year + * @param int $startM optional, start Month, default current Month + * @param int $startD optional, start Day, default current Day + * @param int $endY optional, end Year, default $startY + * @param int $endY optional, end Month, default $startM + * @param int $endY optional, end Day, default $startD + * @param mixed $cType optional, calendar component type(-s), default FALSE=all else string/array type(-s) + * @param bool $flat optional, FALSE (default) => output : array[Year][Month][Day][] + * TRUE => output : array[] (ignores split) + * @param bool $any optional, TRUE (default) - select component that take place within period + * FALSE - only components that starts within period + * @param bool $split optional, TRUE (default) - one component copy every day it take place during the + * period (implies flat=FALSE) + * FALSE - one occurance of component only in output array + * @return array or FALSE + */ + function selectComponents( $startY=FALSE, $startM=FALSE, $startD=FALSE, $endY=FALSE, $endM=FALSE, $endD=FALSE, $cType=FALSE, $flat=FALSE, $any=TRUE, $split=TRUE ) { + /* check if empty calendar */ + if( 0 >= count( $this->components )) return FALSE; + /* check default dates */ + if( !$startY ) $startY = date( 'Y' ); + if( !$startM ) $startM = date( 'm' ); + if( !$startD ) $startD = date( 'd' ); + $startDate = mktime( 0, 0, 0, $startM, $startD, $startY ); + if( !$endY ) $endY = $startY; + if( !$endM ) $endM = $startM; + if( !$endD ) $endD = $startD; + $endDate = mktime( 23, 59, 59, $endM, $endD, $endY ); + /* check component types */ + $validTypes = array('vevent', 'vtodo', 'vjournal', 'vfreebusy' ); + if( is_array( $cType )) { + foreach( $cType as $cix => $theType ) { + $cType[$cix] = $theType = strtolower( $theType ); + if( !in_array( $theType, $validTypes )) + $cType[$cix] = 'vevent'; + } + $cType = array_unique( $cType ); + } + elseif( !empty( $cType )) { + $cType = strtolower( $cType ); + if( !in_array( $cType, $validTypes )) + $cType = array( 'vevent' ); + else + $cType = array( $cType ); + } + else + $cType = $validTypes; + if( 0 >= count( $cType )) + $cType = $validTypes; + /* iterate components */ + $result = array(); + foreach ( $this->components as $cix => $component ) { + if( empty( $component )) continue; + unset( $component->propix, $start ); + /* deselect unvalid type components */ + if( !in_array( $component->objName, $cType )) continue; + $start = $component->getProperty( 'dtstart' ); + /* select due when dtstart is missing */ + if( empty( $start ) && ( $component->objName == 'vtodo' ) && ( FALSE === ( $start = $component->getProperty( 'due' )))) + continue; + $dtendExist = $dueExist = $durationExist = $endAllDayEvent = FALSE; + unset( $end, $startWdate, $endWdate, $rdurWsecs, $rdur, $exdatelist, $workstart, $workend, $endDateFormat ); // clean up + $startWdate = iCalUtilityFunctions::_date2timestamp( $start ); + $startDateFormat = ( isset( $start['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d'; + /* get end date from dtend/due/duration properties */ + $end = $component->getProperty( 'dtend' ); + if( !empty( $end )) { + $dtendExist = TRUE; + $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d'; + } + // if( !empty($end)) echo 'selectComp 1 start='.implode('-',$start).' end='.implode('-',$end)."
\n"; // test ### + if( empty( $end ) && ( $component->objName == 'vtodo' )) { + $end = $component->getProperty( 'due' ); + if( !empty( $end )) { + $dueExist = TRUE; + $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d'; + } + // if( !empty($end)) echo 'selectComp 2 start='.implode('-',$start).' end='.implode('-',$end)."
\n"; // test ### + } + if( !empty( $end ) && !isset( $end['hour'] )) { + /* a DTEND without time part regards an event that ends the day before, + for an all-day event DTSTART=20071201 DTEND=20071202 (taking place 20071201!!! */ + $endAllDayEvent = TRUE; + $endWdate = mktime( 23, 59, 59, $end['month'], ($end['day'] - 1), $end['year'] ); + $end['year'] = date( 'Y', $endWdate ); + $end['month'] = date( 'm', $endWdate ); + $end['day'] = date( 'd', $endWdate ); + $end['hour'] = 23; + $end['min'] = $end['sec'] = 59; + // if( !empty($end)) echo 'selectComp 3 start='.implode('-',$start).' end='.implode('-',$end)."
\n"; // test ### + } + if( empty( $end )) { + $end = $component->getProperty( 'duration', FALSE, FALSE, TRUE );// in dtend (array) format + if( !empty( $end )) + $durationExist = TRUE; + $endDateFormat = ( isset( $start['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d'; + // if( !empty($end)) echo 'selectComp 4 start='.implode('-',$start).' end='.implode('-',$end)."
\n"; // test ### + } + if( empty( $end )) { // assume one day duration if missing end date + $end = array( 'year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59 ); + // if( isset($end)) echo 'selectComp 5 start='.implode('-',$start).' end='.implode('-',$end)."
\n"; // test ### + } + $endWdate = iCalUtilityFunctions::_date2timestamp( $end ); + if( $endWdate < $startWdate ) { // MUST be after start date!! + $end = array( 'year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59 ); + $endWdate = iCalUtilityFunctions::_date2timestamp( $end ); + } + $rdurWsecs = $endWdate - $startWdate; // compute component duration in seconds + /* make a list of optional exclude dates for component occurence from exrule and exdate */ + $exdatelist = array(); + $workstart = iCalUtilityFunctions::_timestamp2date(( $startDate - $rdurWsecs ), 6); + $workend = iCalUtilityFunctions::_timestamp2date(( $endDate + $rdurWsecs ), 6); + while( FALSE !== ( $exrule = $component->getProperty( 'exrule' ))) // check exrule + iCalUtilityFunctions::_recur2date( $exdatelist, $exrule, $start, $workstart, $workend ); + while( FALSE !== ( $exdate = $component->getProperty( 'exdate' ))) { // check exdate + foreach( $exdate as $theExdate ) { + $exWdate = iCalUtilityFunctions::_date2timestamp( $theExdate ); + $exWdate = mktime( 0, 0, 0, date( 'm', $exWdate ), date( 'd', $exWdate ), date( 'Y', $exWdate ) ); // on a day-basis !!! + if((( $startDate - $rdurWsecs ) <= $exWdate ) && ( $endDate >= $exWdate )) + $exdatelist[$exWdate] = TRUE; + } + } + /* if 'any' components, check repeating components, removing all excluding dates */ + if( TRUE === $any ) { + /* make a list of optional repeating dates for component occurence, rrule, rdate */ + $recurlist = array(); + while( FALSE !== ( $rrule = $component->getProperty( 'rrule' ))) // check rrule + iCalUtilityFunctions::_recur2date( $recurlist, $rrule, $start, $workstart, $workend ); + foreach( $recurlist as $recurkey => $recurvalue ) // key=match date as timestamp + $recurlist[$recurkey] = $rdurWsecs; // add duration in seconds + while( FALSE !== ( $rdate = $component->getProperty( 'rdate' ))) { // check rdate + foreach( $rdate as $theRdate ) { + if( is_array( $theRdate ) && ( 2 == count( $theRdate )) && // all days within PERIOD + array_key_exists( '0', $theRdate ) && array_key_exists( '1', $theRdate )) { + $rstart = iCalUtilityFunctions::_date2timestamp( $theRdate[0] ); + if(( $rstart < ( $startDate - $rdurWsecs )) || ( $rstart > $endDate )) + continue; + if( isset( $theRdate[1]['year'] )) // date-date period + $rend = iCalUtilityFunctions::_date2timestamp( $theRdate[1] ); + else { // date-duration period + $rend = iCalUtilityFunctions::_duration2date( $theRdate[0], $theRdate[1] ); + $rend = iCalUtilityFunctions::_date2timestamp( $rend ); + } + while( $rstart < $rend ) { + $recurlist[$rstart] = $rdurWsecs; // set start date for recurrence instance + rdate duration in seconds + $rstart = mktime( date( 'H', $rstart ), date( 'i', $rstart ), date( 's', $rstart ), date( 'm', $rstart ), date( 'd', $rstart ) + 1, date( 'Y', $rstart ) ); // step one day + } + } // PERIOD end + else { // single date + $theRdate = iCalUtilityFunctions::_date2timestamp( $theRdate ); + if((( $startDate - $rdurWsecs ) <= $theRdate ) && ( $endDate >= $theRdate )) + $recurlist[$theRdate] = $rdurWsecs; // set start date for recurrence instance + event duration in seconds + } + } + } + if( 0 < count( $recurlist )) { + ksort( $recurlist ); + $xRecurrence = 1; + foreach( $recurlist as $recurkey => $durvalue ) { + if((( $startDate - $rdurWsecs ) > $recurkey ) || ( $endDate < $recurkey )) // not within period + continue; + $checkDate = mktime( 0, 0, 0, date( 'm', $recurkey ), date( 'd', $recurkey ), date( 'Y', $recurkey ) ); // on a day-basis !!! + if( isset( $exdatelist[$checkDate] )) // check excluded dates + continue; + if( $startWdate >= $recurkey ) // exclude component start date + continue; + $component2 = $component->copy(); + $rstart = $recurkey; + $rend = $recurkey + $durvalue; + /* add repeating components within valid dates to output array, only start date set */ + if( $flat ) { + $datestring = date( $startDateFormat, $recurkey ); + if( isset( $start['tz'] )) + $datestring .= ' '.$start['tz']; + $component2->setProperty( 'X-CURRENT-DTSTART', $datestring ); + if( $dtendExist || $dueExist || $durationExist ) { + $datestring = date( $endDateFormat, $recurkey + $durvalue ); // fixa korrekt sluttid + if( isset( $end['tz'] )) + $datestring .= ' '.$end['tz']; + $propName = ( !$dueExist ) ? 'X-CURRENT-DTEND' : 'X-CURRENT-DUE'; + $component2->setProperty( $propName, $datestring ); + } // end if( $dtendExist || $dueExist || $durationExist ) + $component2->setProperty( 'X-RECURRENCE', ++$xRecurrence ); + $result[$component2->getProperty( 'UID' )] = $component2->copy(); // copy to output + } + /* add repeating components within valid dates to output array, one each day */ + elseif( $split ) { + $xRecurrence += 1; + if( $rend > $endDate ) + $rend = $endDate; + while( $rstart <= $rend ) { // iterate.. . + $checkDate = mktime( 0, 0, 0, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!! + if( isset( $exdatelist[$checkDate] )) // exclude any recurrence START date, found in exdatelist + break; + if( $rstart > $startDate ) { // date after dtstart + $datestring = date( $startDateFormat, $rstart ); + if( isset( $start['tz'] )) + $datestring .= ' '.$start['tz']; + $component2->setProperty( 'X-CURRENT-DTSTART', $datestring ); + if( $dtendExist || $dueExist || $durationExist ) { + $tend = mktime( date( 'H', $endWdate ), date( 'i', $endWdate ), date( 's', $endWdate ), date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!! + $datestring = date( $endDateFormat, $tend ); + if( isset( $end['tz'] )) + $datestring .= ' '.$end['tz']; + $propName = ( !$dueExist ) ? 'X-CURRENT-DTEND' : 'X-CURRENT-DUE'; + $component2->setProperty( $propName, $datestring ); + } // end if( $dtendExist || $dueExist || $durationExist ) + $component2->setProperty( 'X-RECURRENCE', $xRecurrence ); + $wd = getdate( $rstart ); + $result[$wd['year']][$wd['mon']][$wd['mday']][$component2->getProperty( 'UID' )] = $component2->copy(); // copy to output + } + $rstart = mktime( date( 'H', $rstart ), date( 'i', $rstart ), date( 's', $rstart ), date( 'm', $rstart ), date( 'd', $rstart ) + 1, date( 'Y', $rstart ) ); // step one day + } // end while( $rstart <= $rend ) + } // end elseif( $split ) + elseif( $rstart >= $startDate ) { // date within period //* flat=FALSE && split=FALSE *// + $checkDate = mktime( 0, 0, 0, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!! + if( !isset( $exdatelist[$checkDate] )) { // exclude any recurrence START date, found in exdatelist + $xRecurrence += 1; + $datestring = date( $startDateFormat, $rstart ); + if( isset( $start['tz'] )) + $datestring .= ' '.$start['tz']; + $component2->setProperty( 'X-CURRENT-DTSTART', $datestring ); + if( $dtendExist || $dueExist || $durationExist ) { + $rstart += $rdurWsecs; + $tend = mktime( date( 'H', $endWdate ), date( 'i', $endWdate ), date( 's', $endWdate ), date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!! + $datestring = date( $endDateFormat, $tend ); + if( isset( $end['tz'] )) + $datestring .= ' '.$end['tz']; + $propName = ( !$dueExist ) ? 'X-CURRENT-DTEND' : 'X-CURRENT-DUE'; + $component2->setProperty( $propName, $datestring ); + } // end if( $dtendExist || $dueExist || $durationExist ) + $component2->setProperty( 'X-RECURRENCE', $xRecurrence ); + $wd = getdate( $rstart ); + $result[$wd['year']][$wd['mon']][$wd['mday']][$component2->getProperty( 'UID' )] = $component2->copy(); // copy to output + } // end if( !isset( $exdatelist[$checkDate] )) + } // end elseif( $rstart >= $startDate ) + } // end foreach( $recurlist as $recurkey => $durvalue ) + } // end if( 0 < count( $recurlist )) + /* deselect components with startdate/enddate not within period */ + if(( $endWdate < $startDate ) || ( $startWdate > $endDate )) + continue; + } // end if( TRUE === $any ) + /* deselect components with startdate not within period */ + elseif(( $startWdate < $startDate ) || ( $startWdate > $endDate )) + continue; + /* add the selected component (WITHIN valid dates) to output array */ + if( $flat ) + $result[$component->getProperty( 'UID' )] = $component->copy(); // copy to output; + elseif( $split ) { + if( $endWdate > $endDate ) + $endWdate = $endDate; // use period end date + $rstart = $startWdate; + if( $rstart < $startDate ) + $rstart = $startDate; // use period start date + $checkDate = mktime( 0, 0, 0, date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!! + if( !isset( $exdatelist[$checkDate] )) { // exclude any recurrence START date, found in exdatelist + while( $rstart <= $endWdate ) { // iterate + if( $rstart > $startWdate ) { // if NOT startdate, set X-properties + $datestring = date( $startDateFormat, $rstart ); + if( isset( $start['tz'] )) + $datestring .= ' '.$start['tz']; + $component->setProperty( 'X-CURRENT-DTSTART', $datestring ); + if( $dtendExist || $dueExist || $durationExist ) { + $tend = mktime( date( 'H', $endWdate ), date( 'i', $endWdate ), date( 's', $endWdate ), date( 'm', $rstart ), date( 'd', $rstart ), date( 'Y', $rstart ) ); // on a day-basis !!! + $datestring = date( $endDateFormat, $tend ); + if( isset( $end['tz'] )) + $datestring .= ' '.$end['tz']; + $propName = ( !$dueExist ) ? 'X-CURRENT-DTEND' : 'X-CURRENT-DUE'; + $component->setProperty( $propName, $datestring ); + } // end if( $dtendExist || $dueExist || $durationExist ) + } // end if( $rstart > $startWdate ) + $wd = getdate( $rstart ); + $result[$wd['year']][$wd['mon']][$wd['mday']][$component->getProperty( 'UID' )] = $component->copy(); // copy to output + $rstart = mktime( date( 'H', $rstart ), date( 'i', $rstart ), date( 's', $rstart ), date( 'm', $rstart ), date( 'd', $rstart ) + 1, date( 'Y', $rstart ) ); // step one day + } // end while( $rstart <= $endWdate ) + } // end if( !isset( $exdatelist[$checkDate] )) + } // end if( $split ) - else use component date + elseif( $startWdate >= $startDate ) { // within period + $checkDate = mktime( 0, 0, 0, date( 'm', $startWdate ), date( 'd', $startWdate ), date( 'Y', $startWdate ) ); // on a day-basis !!! + if( !isset( $exdatelist[$checkDate] )) { // exclude any recurrence START date, found in exdatelist + $wd = getdate( $startWdate ); + $result[$wd['year']][$wd['mon']][$wd['mday']][$component->getProperty( 'UID' )] = $component->copy(); // copy to output + } + } + } // end foreach ( $this->components as $cix => $component ) + if( 0 >= count( $result )) return FALSE; + elseif( !$flat ) { + foreach( $result as $y => $yeararr ) { + foreach( $yeararr as $m => $montharr ) { + foreach( $montharr as $d => $dayarr ) + $result[$y][$m][$d] = array_values( $dayarr ); // skip tricky UID-index + ksort( $result[$y][$m] ); + } + ksort( $result[$y] ); + } + ksort( $result ); + } // end elseif( !$flat ) + return $result; + } +/** + * add calendar component to container + * + * @author Kjell-Inge Gustafsson + * @since 2.6.28 - 2011-01-01 + * @param object $component calendar component + * @param mixed $arg1 optional, ordno/component type/ component uid + * @param mixed $arg2 optional, ordno if arg1 = component type + * @return void + */ + function setComponent( $component, $arg1=FALSE, $arg2=FALSE ) { + $component->setConfig( $this->getConfig(), FALSE, TRUE ); + if( !in_array( $component->objName, array( 'valarm', 'vtimezone' ))) { + unset( $component->propix ); + /* make sure dtstamp and uid is set */ + $dummy1 = $component->getProperty( 'dtstamp' ); + $dummy2 = $component->getProperty( 'uid' ); + } + if( !$arg1 ) { // plain insert, last in chain + $this->components[] = $component->copy(); + return TRUE; + } + $argType = $index = null; + if ( ctype_digit( (string) $arg1 )) { // index insert/replace + $argType = 'INDEX'; + $index = (int) $arg1 - 1; + } + elseif( in_array( strtolower( $arg1 ), array( 'vevent', 'vtodo', 'vjournal', 'vfreebusy', 'valarm', 'vtimezone' ))) { + $argType = strtolower( $arg1 ); + $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0; + } + // else if arg1 is set, arg1 must be an UID + $cix1sC = 0; + foreach ( $this->components as $cix => $component2) { + if( empty( $component2 )) continue; + unset( $component2->propix ); + if(( 'INDEX' == $argType ) && ( $index == $cix )) { // index insert/replace + $this->components[$cix] = $component->copy(); + return TRUE; + } + elseif( $argType == $component2->objName ) { // component Type index insert/replace + if( $index == $cix1sC ) { + $this->components[$cix] = $component->copy(); + return TRUE; + } + $cix1sC++; + } + elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) { // UID insert/replace + $this->components[$cix] = $component->copy(); + return TRUE; + } + } + /* arg1=index and not found.. . insert at index .. .*/ + if( 'INDEX' == $argType ) { + $this->components[$index] = $component->copy(); + ksort( $this->components, SORT_NUMERIC ); + } + else /* not found.. . insert last in chain anyway .. .*/ + $this->components[] = $component->copy(); + return TRUE; + } +/** + * sort iCal compoments, only local date sort + * + * ascending sort on properties (if exist) x-current-dtstart, dtstart, + * x-current-dtend, dtend, x-current-due, due, duration, created, dtstamp, uid + * + * @author Kjell-Inge Gustafsson + * @since 2.6.3 - 2010-12-05 + * @return void + * + */ + function sort() { + if( is_array( $this->components )) { + /* set sort parameters for each component */ + foreach( $this->components as & $c ) { + $c->srtk = array( '0', '0', '0', '0' ); + if( 'vtimezone' == $c->objName ) { + if( FALSE === ( $c->srtk[0] = $c->getProperty( 'tzid' ))) + $c->srtk[0] = 0; + continue; + } + if( FALSE !== ( $d = $c->getProperty( 'X-CURRENT-DTSTART' ))) + $c->srtk[0] = iCalUtilityFunctions::_date_time_string( $d[1] ); + elseif( FALSE === ( $c->srtk[0] = $c->getProperty( 'dtstart' ))) + $c->srtk[1] = 0; // sortkey 0 : dtstart + if( FALSE !== ( $d = $c->getProperty( 'X-CURRENT-DTEND' ))) + $c->srtk[1] = iCalUtilityFunctions::_date_time_string( $d[1] ); // sortkey 1 : dtend/due(/dtstart+duration) + elseif( FALSE === ( $c->srtk[1] = $c->getProperty( 'dtend' ))) { + if( FALSE !== ( $d = $c->getProperty( 'X-CURRENT-DUE' ))) + $c->srtk[1] = iCalUtilityFunctions::_date_time_string( $d[1] ); + elseif( FALSE === ( $c->srtk[1] = $c->getProperty( 'due' ))) + if( FALSE === ( $c->srtk[1] = $c->getProperty( 'duration', FALSE, FALSE, TRUE ))) + $c->srtk[1] = 0; + } + if( FALSE === ( $c->srtk[2] = $c->getProperty( 'created' ))) // sortkey 2 : created/dtstamp + if( FALSE === ( $c->srtk[2] = $c->getProperty( 'dtstamp' ))) + $c->srtk[2] = 0; + if( FALSE === ( $c->srtk[3] = $c->getProperty( 'uid' ))) // sortkey 3 : uid + $c->srtk[3] = 0; + } // end foreach( $this->components as & $c + /* sort */ + usort( $this->components, array( $this, '_cmpfcn' )); + } + } + function _cmpfcn( $a, $b ) { + if( empty( $a )) return -1; + if( empty( $b )) return 1; + if( 'vtimezone' == $a->objName ) { + if( 'vtimezone' != $b->objName ) return -1; + elseif( $a->srtk[0] <= $b->srtk[0] ) return -1; + else return 1; + } + elseif( 'vtimezone' == $b->objName ) return 1; + $sortkeys = array( 'year', 'month', 'day', 'hour', 'min', 'sec' ); + for( $k = 0; $k < 4 ; $k++ ) { + if( empty( $a->srtk[$k] )) return -1; + elseif( empty( $b->srtk[$k] )) return 1; + if( is_array( $a->srtk[$k] )) { + if( is_array( $b->srtk[$k] )) { + foreach( $sortkeys as $key ) { + if ( empty( $a->srtk[$k][$key] )) return -1; + elseif( empty( $b->srtk[$k][$key] )) return 1; + if ( $a->srtk[$k][$key] == $b->srtk[$k][$key]) + continue; + if (( (int) $a->srtk[$k][$key] ) < ((int) $b->srtk[$k][$key] )) + return -1; + elseif(( (int) $a->srtk[$k][$key] ) > ((int) $b->srtk[$k][$key] )) + return 1; + } + } + else return -1; + } + elseif( is_array( $b->srtk[$k] )) return 1; + elseif( $a->srtk[$k] < $b->srtk[$k] ) return -1; + elseif( $a->srtk[$k] > $b->srtk[$k] ) return 1; + } + return 0; + } +/** + * parse iCal text/file into vcalendar, components, properties and parameters + * + * @author Kjell-Inge Gustafsson + * @since 2.6.32 - 2010-12-19 + * @param mixed $unparsedtext, optional, strict rfc2445 formatted, single property string or array of property strings + * @return bool FALSE if error occurs during parsing + * + */ + function parse( $unparsedtext=FALSE ) { + $nl = $this->getConfig( 'nl' ); + if( FALSE === $unparsedtext ) { + /* directory+filename is set previously via setConfig directory+filename or url */ + if( FALSE === ( $filename = $this->getConfig( 'url' ))) + $filename = $this->getConfig( 'dirfile' ); + /* READ FILE */ + if( FALSE === ( $rows = file( $filename ))) + return FALSE; /* err 1 */ + } + elseif( !is_array( $unparsedtext )) + $rows = explode( $nl, $unparsedtext ); + else + $rows = & $unparsedtext; + /* identify BEGIN:VCALENDAR, MUST be first row */ + if( 'BEGIN:VCALENDAR' != strtoupper( trim( $rows[0] ))) + return FALSE; /* err 8 */ + /* skip trailing empty lines */ + $lix = count( $rows ) - 1; + while( empty( $rows[$lix] ) && ( 0 < $lix )) + $lix--; + /* identify ending END:VCALENDAR row, MUST be last row */ + if( 'END:VCALENDAR' != strtoupper( trim( $rows[ $lix ] ))) + return FALSE; /* err 9 */ + if( 3 > count( $rows )) + return FALSE; /* err 10 */ + $comp = & $this; + $calsync = 0; + /* identify components and update unparsed data within component */ + foreach( $rows as $line ) { + if( '' == trim( $line )) + continue; + if( $nl == substr( $line, 0 - strlen( $nl ))) + $line = substr( $line, 0, ( strlen( $line ) - strlen( $nl ))).'\n'; + elseif( "\n\r" == substr( $line, 0 - strlen( "\n\r" ))) + $line = substr( $line, 0, ( strlen( $line ) - strlen( "\n\r" ))).'\n'; + if( 'BEGIN:VCALENDAR' == strtoupper( substr( $line, 0, 15 ))) { + $calsync++; + continue; + } + elseif( 'END:VCALENDAR' == strtoupper( substr( $line, 0, 13 ))) { + $calsync--; + break; + } + elseif( 1 != $calsync ) + return FALSE; /* err 20 */ + elseif( in_array( strtoupper( substr( $line, 0, 6 )), array( 'END:VE', 'END:VF', 'END:VJ', 'END:VT' ))) { + $this->components[] = $comp->copy(); + continue; + } + if( 'BEGIN:VEVENT' == strtoupper( substr( $line, 0, 12 ))) + $comp = new vevent(); + elseif( 'BEGIN:VFREEBUSY' == strtoupper( substr( $line, 0, 15 ))) + $comp = new vfreebusy(); + elseif( 'BEGIN:VJOURNAL' == strtoupper( substr( $line, 0, 14 ))) + $comp = new vjournal(); + elseif( 'BEGIN:VTODO' == strtoupper( substr( $line, 0, 11 ))) + $comp = new vtodo(); + elseif( 'BEGIN:VTIMEZONE' == strtoupper( substr( $line, 0, 15 ))) + $comp = new vtimezone(); + else /* update component with unparsed data */ + $comp->unparsed[] = $line; + } // end - foreach( rows.. . + /* parse data for calendar (this) object */ + if( is_array( $this->unparsed ) && ( 0 < count( $this->unparsed ))) { + /* concatenate property values spread over several lines */ + $lastix = -1; + $propnames = array( 'calscale','method','prodid','version','x-' ); + $proprows = array(); + foreach( $this->unparsed as $line ) { + if( '' == trim( $line )) + continue; + $newProp = FALSE; + foreach ( $propnames as $propname ) { + if( $propname == strtolower( substr( $line, 0, strlen( $propname )))) { + $newProp = TRUE; + break; + } + } + if( $newProp ) { + $newProp = FALSE; + $lastix++; + $proprows[$lastix] = $line; + } + else { + /* todo: fix count for multibyte characters.. . */ + $strlen = ( defined( MB_OVERLOAD_STRING )) ? mb_strlen( $proprows[$lastix] ) : strlen( $proprows[$lastix] ); + /* remove line breaks */ +// if(( 1 < strlen( $proprows[$lastix] )) && + if(( 73 < $strlen ) && + ( '\n' == substr( $proprows[$lastix], -2 )) && + ( ' ' == substr( $line, 0, 1 ))) { +// $proprows[$lastix] = substr( $proprows[$lastix], 0, strlen( $proprows[$lastix] ) - 2 ); + $proprows[$lastix] = substr( $proprows[$lastix], 0, ( $strlen - 2 )); + $line = substr( $line, 1 ); + } + /* concatenate lines within the same property */ + $proprows[$lastix] .= $line; + } + } + foreach( $proprows as $line ) { + if( '\n' == substr( $line, -2 )) + $line = substr( $line, 0, strlen( $line ) - 2 ); + /* get propname */ + $cix = $propname = null; + for( $cix=0, $clen = strlen( $line ); $cix < $clen; $cix++ ) { + if( in_array( $line[$cix], array( ':', ';' ))) + break; + else + $propname .= $line[$cix]; + } + /* ignore version/prodid properties */ + if( in_array( strtoupper( $propname ), array( 'VERSION', 'PRODID' ))) + continue; + $line = substr( $line, $cix); + /* separate attributes from value */ + $attr = array(); + $attrix = -1; + $strlen = strlen( $line ); + for( $cix=0; $cix < $strlen; $cix++ ) { + if(( ':' == $line[$cix] ) && + ( '://' != substr( $line, $cix, 3 )) && + ( !in_array( strtolower( substr( $line, $cix - 3, 4 )), array( 'fax:', 'cid:', 'sms:', 'tel:', 'urn:' ))) && + ( !in_array( strtolower( substr( $line, $cix - 4, 5 )), array( 'crid:', 'news:', 'pres:' ))) && + ( 'mailto:' != strtolower( substr( $line, $cix - 6, 7 )))) { + $attrEnd = TRUE; + if(( $cix < ( $strlen - 4 )) && + ctype_digit( substr( $line, $cix+1, 4 ))) { // an URI with a (4pos) portnr?? + for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) { + if( '://' == substr( $line, $c2ix - 2, 3 )) { + $attrEnd = FALSE; + break; // an URI with a portnr!! + } + } + } + if( $attrEnd) { + $line = substr( $line, $cix + 1 ); + break; + } + } + if( ';' == $line[$cix] ) + $attr[++$attrix] = null; + else + $attr[$attrix] .= $line[$cix]; + } + + /* make attributes in array format */ + $propattr = array(); + foreach( $attr as $attribute ) { + $attrsplit = explode( '=', $attribute, 2 ); + if( 1 < count( $attrsplit )) + $propattr[$attrsplit[0]] = $attrsplit[1]; + else + $propattr[] = $attribute; + } + /* update Property */ + if( FALSE !== strpos( $line, ',' )) { + $content = explode( ',', $line ); + $clen = count( $content ); + for( $cix = 0; $cix < $clen; $cix++ ) { + if( "\\" == substr( $content[$cix], -1 )) { + $content[$cix] .= ','.$content[$cix + 1]; + unset( $content[$cix + 1] ); + $cix++; + } + } + if( 1 < count( $content )) { + foreach( $content as $cix => $contentPart ) + $content[$cix] = calendarComponent::_strunrep( $contentPart ); + $this->setProperty( $propname, $content, $propattr ); + continue; + } + else + $line = reset( $content ); + $line = calendarComponent::_strunrep( $line ); + } + $this->setProperty( $propname, trim( $line ), $propattr ); + } // end - foreach( $this->unparsed.. . + } // end - if( is_array( $this->unparsed.. . + unset( $unparsedtext, $rows, $this->unparsed, $proprows ); + /* parse Components */ + if( is_array( $this->components ) && ( 0 < count( $this->components ))) { + $ckeys = array_keys( $this->components ); + foreach( $ckeys as $ckey ) { + if( !empty( $this->components[$ckey] ) && !empty( $this->components[$ckey]->unparsed )) { + $this->components[$ckey]->parse(); + } + } + } + else + return FALSE; /* err 91 or something.. . */ + return TRUE; + } +/*********************************************************************************/ +/** + * creates formatted output for calendar object instance + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-12-12 + * @return string + */ + function createCalendar() { + $calendarInit1 = $calendarInit2 = $calendarxCaldecl = $calendarStart = $calendar = null; + switch( $this->format ) { + case 'xcal': + $calendarInit1 = ''.$this->nl. + 'nl. + '"http://www.ietf.org/internet-drafts/draft-ietf-calsch-many-xcal-01.txt"'; + $calendarInit2 = '>'.$this->nl; + $calendarStart = 'nl; + break; + } + $calendarStart .= $this->createProdid(); + $calendarStart .= $this->createVersion(); + $calendarStart .= $this->createCalscale(); + $calendarStart .= $this->createMethod(); + switch( $this->format ) { + case 'xcal': + $nlstrlen = strlen( $this->nl ); + if( $this->nl == substr( $calendarStart, ( 0 - $nlstrlen ))) + $calendarStart = substr( $calendarStart, 0, ( strlen( $calendarStart ) - $nlstrlen )); + $calendarStart .= '>'.$this->nl; + break; + default: + break; + } + $calendar .= $this->createXprop(); + foreach( $this->components as $component ) { + if( empty( $component )) continue; + $component->setConfig( $this->getConfig(), FALSE, TRUE ); + $calendar .= $component->createComponent( $this->xcaldecl ); + } + if(( 0 < count( $this->xcaldecl )) && ( 'xcal' == $this->format )) { // xCal only + $calendarInit1 .= $this->nl.'['.$this->nl; + $old_xcaldecl = array(); + foreach( $this->xcaldecl as $declix => $declPart ) { + if(( 0 < count( $old_xcaldecl)) && + ( in_array( $declPart['uri'], $old_xcaldecl['uri'] )) && + ( in_array( $declPart['external'], $old_xcaldecl['external'] ))) + continue; // no duplicate uri and ext. references + $calendarxCaldecl .= ' $declValue ) { + switch( $declKey ) { // index + case 'xmldecl': // no 1 + $calendarxCaldecl .= $declValue.' '; + break; + case 'uri': // no 2 + $calendarxCaldecl .= $declValue.' '; + $old_xcaldecl['uri'][] = $declValue; + break; + case 'ref': // no 3 + $calendarxCaldecl .= $declValue.' '; + break; + case 'external': // no 4 + $calendarxCaldecl .= '"'.$declValue.'" '; + $old_xcaldecl['external'][] = $declValue; + break; + case 'type': // no 5 + $calendarxCaldecl .= $declValue.' '; + break; + case 'type2': // no 6 + $calendarxCaldecl .= $declValue; + break; + } + } + $calendarxCaldecl .= '>'.$this->nl; + } + $calendarInit2 = ']'.$calendarInit2; + } + switch( $this->format ) { + case 'xcal': + $calendar .= ''.$this->nl; + break; + default: + $calendar .= 'END:VCALENDAR'.$this->nl; + break; + } + return $calendarInit1.$calendarxCaldecl.$calendarInit2.$calendarStart.$calendar; + } +/** + * a HTTP redirect header is sent with created, updated and/or parsed calendar + * + * @author Kjell-Inge Gustafsson + * @since 2.2.12 - 2007-10-23 + * @return redirect + */ + function returnCalendar() { + $filename = $this->getConfig( 'filename' ); + $output = $this->createCalendar(); + $filesize = strlen( $output ); +// if( headers_sent( $filename, $linenum )) +// die( "Headers already sent in $filename on line $linenum\n" ); + if( 'xcal' == $this->format ) + header( 'Content-Type: application/calendar+xml; charset=utf-8' ); + else + header( 'Content-Type: text/calendar; charset=utf-8' ); + header( 'Content-Length: '.$filesize ); + header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); + header( 'Cache-Control: max-age=10' ); + echo $output; + die(); + } +/** + * save content in a file + * + * @author Kjell-Inge Gustafsson + * @since 2.2.12 - 2007-12-30 + * @param string $directory optional + * @param string $filename optional + * @param string $delimiter optional + * @return bool + */ + function saveCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE ) { + if( $directory ) + $this->setConfig( 'directory', $directory ); + if( $filename ) + $this->setConfig( 'filename', $filename ); + if( $delimiter && ($delimiter != DIRECTORY_SEPARATOR )) + $this->setConfig( 'delimiter', $delimiter ); + if( FALSE === ( $dirfile = $this->getConfig( 'url' ))) + $dirfile = $this->getConfig( 'dirfile' ); + $iCalFile = @fopen( $dirfile, 'w' ); + if( $iCalFile ) { + if( FALSE === fwrite( $iCalFile, $this->createCalendar() )) + return FALSE; + fclose( $iCalFile ); + return TRUE; + } + else + return FALSE; + } +/** + * if recent version of calendar file exists (default one hour), an HTTP redirect header is sent + * else FALSE is returned + * + * @author Kjell-Inge Gustafsson + * @since 2.2.12 - 2007-10-28 + * @param string $directory optional alt. int timeout + * @param string $filename optional + * @param string $delimiter optional + * @param int timeout optional, default 3600 sec + * @return redirect/FALSE + */ + function useCachedCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE, $timeout=3600) { + if ( $directory && ctype_digit( (string) $directory ) && !$filename ) { + $timeout = (int) $directory; + $directory = FALSE; + } + if( $directory ) + $this->setConfig( 'directory', $directory ); + if( $filename ) + $this->setConfig( 'filename', $filename ); + if( $delimiter && ( $delimiter != DIRECTORY_SEPARATOR )) + $this->setConfig( 'delimiter', $delimiter ); + $filesize = $this->getConfig( 'filesize' ); + if( 0 >= $filesize ) + return FALSE; + $dirfile = $this->getConfig( 'dirfile' ); + if( time() - filemtime( $dirfile ) < $timeout) { + clearstatcache(); + $dirfile = $this->getConfig( 'dirfile' ); + $filename = $this->getConfig( 'filename' ); +// if( headers_sent( $filename, $linenum )) +// die( "Headers already sent in $filename on line $linenum\n" ); + if( 'xcal' == $this->format ) + header( 'Content-Type: application/calendar+xml; charset=utf-8' ); + else + header( 'Content-Type: text/calendar; charset=utf-8' ); + header( 'Content-Length: '.$filesize ); + header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); + header( 'Cache-Control: max-age=10' ); + $fp = @fopen( $dirfile, 'r' ); + if( $fp ) { + fpassthru( $fp ); + fclose( $fp ); + } + die(); + } + else + return FALSE; + } +} +/*********************************************************************************/ +/*********************************************************************************/ +/** + * abstract class for calendar components + * + * @author Kjell-Inge Gustafsson + * @since 2.4.19 - 2008-10-12 + */ +class calendarComponent { + // component property variables + var $uid; + var $dtstamp; + + // component config variables + var $allowEmpty; + var $language; + var $nl; + var $unique_id; + var $format; + var $objName; // created automatically at instance creation + // component internal variables + var $componentStart1; + var $componentStart2; + var $componentEnd1; + var $componentEnd2; + var $elementStart1; + var $elementStart2; + var $elementEnd1; + var $elementEnd2; + var $intAttrDelimiter; + var $attributeDelimiter; + var $valueInit; + // component xCal declaration container + var $xcaldecl; +/** + * constructor for calendar component object + * + * @author Kjell-Inge Gustafsson + * @since 2.4.19 - 2008-10-23 + */ + function calendarComponent() { + $this->objName = ( isset( $this->timezonetype )) ? + strtolower( $this->timezonetype ) : get_class ( $this ); + $this->uid = array(); + $this->dtstamp = array(); + + $this->language = null; + $this->nl = null; + $this->unique_id = null; + $this->format = null; + $this->allowEmpty = TRUE; + $this->xcaldecl = array(); + + $this->_createFormat(); + $this->_makeDtstamp(); + } +/*********************************************************************************/ +/** + * Property Name: ACTION + */ +/** + * creates formatted output for calendar component property action + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createAction() { + if( empty( $this->action )) return FALSE; + if( empty( $this->action['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ACTION' ) : FALSE; + $attributes = $this->_createParams( $this->action['params'] ); + return $this->_createElement( 'ACTION', $attributes, $this->action['value'] ); + } +/** + * set calendar component property action + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value "AUDIO" / "DISPLAY" / "EMAIL" / "PROCEDURE" + * @param mixed $params + * @return bool + */ + function setAction( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->action = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: ATTACH + */ +/** + * creates formatted output for calendar component property attach + * + * @author Kjell-Inge Gustafsson + * @since 0.9.7 - 2006-11-23 + * @return string + */ + function createAttach() { + if( empty( $this->attach )) return FALSE; + $output = null; + foreach( $this->attach as $attachPart ) { + if(! empty( $attachPart['value'] )) { + $attributes = $this->_createParams( $attachPart['params'] ); + $output .= $this->_createElement( 'ATTACH', $attributes, $attachPart['value'] ); + } + elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'ATTACH' ); + } + return $output; + } +/** + * set calendar component property attach + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-06 + * @param string $value + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setAttach( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + iCalUtilityFunctions::_setMval( $this->attach, $value, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: ATTENDEE + */ +/** + * creates formatted output for calendar component property attendee + * + * @author Kjell-Inge Gustafsson + * @since 2.6.29 - 2010-11-29 + * @return string + */ + function createAttendee() { + if( empty( $this->attendee )) return FALSE; + $output = null; + foreach( $this->attendee as $attendeePart ) { // start foreach 1 + if( empty( $attendeePart['value'] )) { + if( $this->getConfig( 'allowEmpty' )) + $output .= $this->_createElement( 'ATTENDEE' ); + continue; + } + $attendee1 = $attendee2 = null; + foreach( $attendeePart as $paramlabel => $paramvalue ) { // start foreach 2 + if( 'value' == $paramlabel ) + $attendee2 .= $paramvalue; + elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) { // start elseif + // set attenddee parameters in rfc2445 order + if( isset( $paramvalue['CUTYPE'] )) + $attendee1 .= $this->intAttrDelimiter.'CUTYPE="'.$paramvalue['CUTYPE'].'"'; + if( isset( $paramvalue['MEMBER'] )) { + $attendee1 .= $this->intAttrDelimiter.'MEMBER='; + foreach( $paramvalue['MEMBER'] as $cix => $opv ) + $attendee1 .= ( $cix ) ? ', "'.$opv.'"' : '"'.$opv.'"' ; + } + if( isset( $paramvalue['ROLE'] )) + $attendee1 .= $this->intAttrDelimiter.'ROLE="'.$paramvalue['ROLE'].'"'; + if( isset( $paramvalue['PARTSTAT'] )) + $attendee1 .= $this->intAttrDelimiter.'PARTSTAT="'.$paramvalue['PARTSTAT'].'"'; + if( isset( $paramvalue['RSVP'] )) + $attendee1 .= $this->intAttrDelimiter.'RSVP="'.$paramvalue['RSVP'].'"'; + if( isset( $paramvalue['DELEGATED-TO'] )) { + $attendee1 .= $this->intAttrDelimiter.'DELEGATED-TO='; + foreach( $paramvalue['DELEGATED-TO'] as $cix => $opv ) + $attendee1 .= ( $cix ) ? ', "'.$opv.'"' : '"'.$opv.'"' ; + } + if( isset( $paramvalue['DELEGATED-FROM'] )) { + $attendee1 .= $this->intAttrDelimiter.'DELEGATED-FROM='; + foreach( $paramvalue['DELEGATED-FROM'] as $cix => $opv ) + $attendee1 .= ( $cix ) ? ', "'.$opv.'"' : '"'.$opv.'"' ; + } + if( isset( $paramvalue['SENT-BY'] )) + $attendee1 .= $this->intAttrDelimiter.'SENT-BY="'.$paramvalue['SENT-BY'].'"'; + if( isset( $paramvalue['CN'] )) + $attendee1 .= $this->intAttrDelimiter.'CN="'.$paramvalue['CN'].'"'; + if( isset( $paramvalue['DIR'] )) + $attendee1 .= $this->intAttrDelimiter.'DIR="'.$paramvalue['DIR'].'"'; + if( isset( $paramvalue['LANGUAGE'] )) + $attendee1 .= $this->intAttrDelimiter.'LANGUAGE='.$paramvalue['LANGUAGE']; + $xparams = array(); + foreach( $paramvalue as $optparamlabel => $optparamvalue ) { // start foreach 3 + if( ctype_digit( (string) $optparamlabel )) { + $xparams[] = $optparamvalue; + continue; + } + if( !in_array( $optparamlabel, array( 'CUTYPE', 'MEMBER', 'ROLE', 'PARTSTAT', 'RSVP', 'DELEGATED-TO', 'DELEGATED-FROM', 'SENT-BY', 'CN', 'DIR', 'LANGUAGE' ))) + $xparams[$optparamlabel] = $optparamvalue; + } // end foreach 3 + ksort( $xparams, SORT_STRING ); + foreach( $xparams as $paramKey => $paramValue ) { + if( ctype_digit( (string) $paramKey )) + $attendee1 .= $this->intAttrDelimiter.$paramValue; + else + $attendee1 .= $this->intAttrDelimiter."$paramKey=$paramValue"; + } // end foreach 3 + } // end elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) + } // end foreach 2 + $output .= $this->_createElement( 'ATTENDEE', $attendee1, $attendee2 ); + } // end foreach 1 + return $output; + } +/** + * set calendar component property attach + * + * @author Kjell-Inge Gustafsson + * @since 2.6.34 - 2010-12-18 + * @param string $value + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setAttendee( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + // ftp://, http://, mailto:, file://, gopher://, news:, nntp://, telnet://, wais://, prospero:// may exist.. . also in params + if( FALSE !== ( $pos = strpos( substr( $value, 0, 9 ), ':' ))) + $value = strtoupper( substr( $value, 0, $pos )).substr( $value, $pos ); + elseif( !empty( $value )) + $value = 'MAILTO:'.$value; + $params2 = array(); + if( is_array($params )) { + $optarrays = array(); + foreach( $params as $optparamlabel => $optparamvalue ) { + $optparamlabel = strtoupper( $optparamlabel ); + switch( $optparamlabel ) { + case 'MEMBER': + case 'DELEGATED-TO': + case 'DELEGATED-FROM': + if( !is_array( $optparamvalue )) + $optparamvalue = array( $optparamvalue ); + foreach( $optparamvalue as $part ) { + $part = trim( $part ); + if(( '"' == substr( $part, 0, 1 )) && + ( '"' == substr( $part, -1 ))) + $part = substr( $part, 1, ( strlen( $part ) - 2 )); + if( 'mailto:' != strtolower( substr( $part, 0, 7 ))) + $part = "MAILTO:$part"; + else + $part = 'MAILTO:'.substr( $part, 7 ); + $optarrays[$optparamlabel][] = $part; + } + break; + default: + if(( '"' == substr( $optparamvalue, 0, 1 )) && + ( '"' == substr( $optparamvalue, -1 ))) + $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 )); + if( 'SENT-BY' == $optparamlabel ) { + if( 'mailto:' != strtolower( substr( $optparamvalue, 0, 7 ))) + $optparamvalue = "MAILTO:$optparamvalue"; + else + $optparamvalue = 'MAILTO:'.substr( $optparamvalue, 7 ); + } + $params2[$optparamlabel] = $optparamvalue; + break; + } // end switch( $optparamlabel.. . + } // end foreach( $optparam.. . + foreach( $optarrays as $optparamlabel => $optparams ) + $params2[$optparamlabel] = $optparams; + } + // remove defaults + iCalUtilityFunctions::_existRem( $params2, 'CUTYPE', 'INDIVIDUAL' ); + iCalUtilityFunctions::_existRem( $params2, 'PARTSTAT', 'NEEDS-ACTION' ); + iCalUtilityFunctions::_existRem( $params2, 'ROLE', 'REQ-PARTICIPANT' ); + iCalUtilityFunctions::_existRem( $params2, 'RSVP', 'FALSE' ); + // check language setting + if( isset( $params2['CN' ] )) { + $lang = $this->getConfig( 'language' ); + if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang )) + $params2['LANGUAGE' ] = $lang; + } + iCalUtilityFunctions::_setMval( $this->attendee, $value, $params2, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: CATEGORIES + */ +/** + * creates formatted output for calendar component property categories + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createCategories() { + if( empty( $this->categories )) return FALSE; + $output = null; + foreach( $this->categories as $category ) { + if( empty( $category['value'] )) { + if ( $this->getConfig( 'allowEmpty' )) + $output .= $this->_createElement( 'CATEGORIES' ); + continue; + } + $attributes = $this->_createParams( $category['params'], array( 'LANGUAGE' )); + if( is_array( $category['value'] )) { + foreach( $category['value'] as $cix => $categoryPart ) + $category['value'][$cix] = $this->_strrep( $categoryPart ); + $content = implode( ',', $category['value'] ); + } + else + $content = $this->_strrep( $category['value'] ); + $output .= $this->_createElement( 'CATEGORIES', $attributes, $content ); + } + return $output; + } +/** + * set calendar component property categories + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-06 + * @param mixed $value + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setCategories( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + iCalUtilityFunctions::_setMval( $this->categories, $value, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: CLASS + */ +/** + * creates formatted output for calendar component property class + * + * @author Kjell-Inge Gustafsson + * @since 0.9.7 - 2006-11-20 + * @return string + */ + function createClass() { + if( empty( $this->class )) return FALSE; + if( empty( $this->class['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE; + $attributes = $this->_createParams( $this->class['params'] ); + return $this->_createElement( 'CLASS', $attributes, $this->class['value'] ); + } +/** + * set calendar component property class + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value "PUBLIC" / "PRIVATE" / "CONFIDENTIAL" / iana-token / x-name + * @param array $params optional + * @return bool + */ + function setClass( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->class = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: COMMENT + */ +/** + * creates formatted output for calendar component property comment + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createComment() { + if( empty( $this->comment )) return FALSE; + $output = null; + foreach( $this->comment as $commentPart ) { + if( empty( $commentPart['value'] )) { + if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'COMMENT' ); + continue; + } + $attributes = $this->_createParams( $commentPart['params'], array( 'ALTREP', 'LANGUAGE' )); + $content = $this->_strrep( $commentPart['value'] ); + $output .= $this->_createElement( 'COMMENT', $attributes, $content ); + } + return $output; + } +/** + * set calendar component property comment + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-06 + * @param string $value + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setComment( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + iCalUtilityFunctions::_setMval( $this->comment, $value, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: COMPLETED + */ +/** + * creates formatted output for calendar component property completed + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createCompleted( ) { + if( empty( $this->completed )) return FALSE; + if( !isset( $this->completed['value']['year'] ) && + !isset( $this->completed['value']['month'] ) && + !isset( $this->completed['value']['day'] ) && + !isset( $this->completed['value']['hour'] ) && + !isset( $this->completed['value']['min'] ) && + !isset( $this->completed['value']['sec'] )) + if( $this->getConfig( 'allowEmpty' )) + return $this->_createElement( 'COMPLETED' ); + else return FALSE; + $formatted = iCalUtilityFunctions::_format_date_time( $this->completed['value'], 7 ); + $attributes = $this->_createParams( $this->completed['params'] ); + return $this->_createElement( 'COMPLETED', $attributes, $formatted ); + } +/** + * set calendar component property completed + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param array $params optional + * @return bool + */ + function setCompleted( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) { + if( empty( $year )) { + if( $this->getConfig( 'allowEmpty' )) { + $this->completed = array( 'value' => null, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } + else + return FALSE; + } + $this->completed = iCalUtilityFunctions::_setDate2( $year, $month, $day, $hour, $min, $sec, $params ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: CONTACT + */ +/** + * creates formatted output for calendar component property contact + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @return string + */ + function createContact() { + if( empty( $this->contact )) return FALSE; + $output = null; + foreach( $this->contact as $contact ) { + if( !empty( $contact['value'] )) { + $attributes = $this->_createParams( $contact['params'], array( 'ALTREP', 'LANGUAGE' )); + $content = $this->_strrep( $contact['value'] ); + $output .= $this->_createElement( 'CONTACT', $attributes, $content ); + } + elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'CONTACT' ); + } + return $output; + } +/** + * set calendar component property contact + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param string $value + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setContact( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + iCalUtilityFunctions::_setMval( $this->contact, $value, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: CREATED + */ +/** + * creates formatted output for calendar component property created + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createCreated() { + if( empty( $this->created )) return FALSE; + $formatted = iCalUtilityFunctions::_format_date_time( $this->created['value'], 7 ); + $attributes = $this->_createParams( $this->created['params'] ); + return $this->_createElement( 'CREATED', $attributes, $formatted ); + } +/** + * set calendar component property created + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @param mixed $year optional + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param mixed $params optional + * @return bool + */ + function setCreated( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) { + if( !isset( $year )) { + $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' ))); + } + $this->created = iCalUtilityFunctions::_setDate2( $year, $month, $day, $hour, $min, $sec, $params ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: DESCRIPTION + */ +/** + * creates formatted output for calendar component property description + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createDescription() { + if( empty( $this->description )) return FALSE; + $output = null; + foreach( $this->description as $description ) { + if( !empty( $description['value'] )) { + $attributes = $this->_createParams( $description['params'], array( 'ALTREP', 'LANGUAGE' )); + $content = $this->_strrep( $description['value'] ); + $output .= $this->_createElement( 'DESCRIPTION', $attributes, $content ); + } + elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'DESCRIPTION' ); + } + return $output; + } +/** + * set calendar component property description + * + * @author Kjell-Inge Gustafsson + * @since 2.6.24 - 2010-11-06 + * @param string $value + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setDescription( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) { if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; } + if( 'vjournal' != $this->objName ) + $index = 1; + iCalUtilityFunctions::_setMval( $this->description, $value, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: DTEND + */ +/** + * creates formatted output for calendar component property dtend + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createDtend() { + if( empty( $this->dtend )) return FALSE; + if( !isset( $this->dtend['value']['year'] ) && + !isset( $this->dtend['value']['month'] ) && + !isset( $this->dtend['value']['day'] ) && + !isset( $this->dtend['value']['hour'] ) && + !isset( $this->dtend['value']['min'] ) && + !isset( $this->dtend['value']['sec'] )) + if( $this->getConfig( 'allowEmpty' )) + return $this->_createElement( 'DTEND' ); + else return FALSE; + $formatted = iCalUtilityFunctions::_format_date_time( $this->dtend['value'] ); + $attributes = $this->_createParams( $this->dtend['params'] ); + return $this->_createElement( 'DTEND', $attributes, $formatted ); + } +/** + * set calendar component property dtend + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param string $tz optional + * @param array params optional + * @return bool + */ + function setDtend( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) { + if( empty( $year )) { + if( $this->getConfig( 'allowEmpty' )) { + $this->dtend = array( 'value' => null, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } + else + return FALSE; + } + $this->dtend = iCalUtilityFunctions::_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: DTSTAMP + */ +/** + * creates formatted output for calendar component property dtstamp + * + * @author Kjell-Inge Gustafsson + * @since 2.4.4 - 2008-03-07 + * @return string + */ + function createDtstamp() { + if( !isset( $this->dtstamp['value']['year'] ) && + !isset( $this->dtstamp['value']['month'] ) && + !isset( $this->dtstamp['value']['day'] ) && + !isset( $this->dtstamp['value']['hour'] ) && + !isset( $this->dtstamp['value']['min'] ) && + !isset( $this->dtstamp['value']['sec'] )) + $this->_makeDtstamp(); + $formatted = iCalUtilityFunctions::_format_date_time( $this->dtstamp['value'], 7 ); + $attributes = $this->_createParams( $this->dtstamp['params'] ); + return $this->_createElement( 'DTSTAMP', $attributes, $formatted ); + } +/** + * computes datestamp for calendar component object instance dtstamp + * + * @author Kjell-Inge Gustafsson + * @since 2.6.25 - 2010-11-09 + * @return void + */ + function _makeDtstamp() { + $d = mktime( date('H'), date('m'), (date('s') - date( 'Z' )), date('m'), date('d'), date('Y')); + $this->dtstamp['value'] = array( 'year' => date( 'Y', $d ) + , 'month' => date( 'm', $d ) + , 'day' => date( 'd', $d ) + , 'hour' => date( 'H', $d ) + , 'min' => date( 'i', $d ) + , 'sec' => date( 's', $d )); + $this->dtstamp['params'] = null; + } +/** + * set calendar component property dtstamp + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param array $params optional + * @return TRUE + */ + function setDtstamp( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) { + if( empty( $year )) + $this->_makeDtstamp(); + else + $this->dtstamp = iCalUtilityFunctions::_setDate2( $year, $month, $day, $hour, $min, $sec, $params ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: DTSTART + */ +/** + * creates formatted output for calendar component property dtstart + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-26 + * @return string + */ + function createDtstart() { + if( empty( $this->dtstart )) return FALSE; + if( !isset( $this->dtstart['value']['year'] ) && + !isset( $this->dtstart['value']['month'] ) && + !isset( $this->dtstart['value']['day'] ) && + !isset( $this->dtstart['value']['hour'] ) && + !isset( $this->dtstart['value']['min'] ) && + !isset( $this->dtstart['value']['sec'] )) + if( $this->getConfig( 'allowEmpty' )) + return $this->_createElement( 'DTSTART' ); + else return FALSE; + if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) + unset( $this->dtstart['value']['tz'], $this->dtstart['params']['TZID'] ); + $formatted = iCalUtilityFunctions::_format_date_time( $this->dtstart['value'] ); + $attributes = $this->_createParams( $this->dtstart['params'] ); + return $this->_createElement( 'DTSTART', $attributes, $formatted ); + } +/** + * set calendar component property dtstart + * + * @author Kjell-Inge Gustafsson + * @since 2.6.22 - 2010-09-22 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param string $tz optional + * @param array $params optional + * @return bool + */ + function setDtstart( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) { + if( empty( $year )) { + if( $this->getConfig( 'allowEmpty' )) { + $this->dtstart = array( 'value' => null, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } + else + return FALSE; + } + $this->dtstart = iCalUtilityFunctions::_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params, 'dtstart', $this->objName ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: DUE + */ +/** + * creates formatted output for calendar component property due + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createDue() { + if( empty( $this->due )) return FALSE; + if( !isset( $this->due['value']['year'] ) && + !isset( $this->due['value']['month'] ) && + !isset( $this->due['value']['day'] ) && + !isset( $this->due['value']['hour'] ) && + !isset( $this->due['value']['min'] ) && + !isset( $this->due['value']['sec'] )) + if( $this->getConfig( 'allowEmpty' )) + return $this->_createElement( 'DUE' ); + else return FALSE; + $formatted = iCalUtilityFunctions::_format_date_time( $this->due['value'] ); + $attributes = $this->_createParams( $this->due['params'] ); + return $this->_createElement( 'DUE', $attributes, $formatted ); + } +/** + * set calendar component property due + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param array $params optional + * @return bool + */ + function setDue( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) { + if( empty( $year )) { + if( $this->getConfig( 'allowEmpty' )) { + $this->due = array( 'value' => null, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } + else + return FALSE; + } + $this->due = iCalUtilityFunctions::_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: DURATION + */ +/** + * creates formatted output for calendar component property duration + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createDuration() { + if( empty( $this->duration )) return FALSE; + if( !isset( $this->duration['value']['week'] ) && + !isset( $this->duration['value']['day'] ) && + !isset( $this->duration['value']['hour'] ) && + !isset( $this->duration['value']['min'] ) && + !isset( $this->duration['value']['sec'] )) + if( $this->getConfig( 'allowEmpty' )) + return $this->_createElement( 'DURATION', array(), null ); + else return FALSE; + $attributes = $this->_createParams( $this->duration['params'] ); + return $this->_createElement( 'DURATION', $attributes, iCalUtilityFunctions::_format_duration( $this->duration['value'] )); + } +/** + * set calendar component property duration + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param mixed $week + * @param mixed $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param array $params optional + * @return bool + */ + function setDuration( $week, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) { + if( empty( $week )) if( $this->getConfig( 'allowEmpty' )) $week = null; else return FALSE; + if( is_array( $week ) && ( 1 <= count( $week ))) + $this->duration = array( 'value' => iCalUtilityFunctions::_duration_array( $week ), 'params' => iCalUtilityFunctions::_setParams( $day )); + elseif( is_string( $week ) && ( 3 <= strlen( trim( $week )))) { + $week = trim( $week ); + if( in_array( substr( $week, 0, 1 ), array( '+', '-' ))) + $week = substr( $week, 1 ); + $this->duration = array( 'value' => iCalUtilityFunctions::_duration_string( $week ), 'params' => iCalUtilityFunctions::_setParams( $day )); + } + elseif( empty( $week ) && empty( $day ) && empty( $hour ) && empty( $min ) && empty( $sec )) + return FALSE; + else + $this->duration = array( 'value' => iCalUtilityFunctions::_duration_array( array( $week, $day, $hour, $min, $sec )), 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: EXDATE + */ +/** + * creates formatted output for calendar component property exdate + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createExdate() { + if( empty( $this->exdate )) return FALSE; + $output = null; + foreach( $this->exdate as $ex => $theExdate ) { + if( empty( $theExdate['value'] )) { + if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'EXDATE' ); + continue; + } + $content = $attributes = null; + foreach( $theExdate['value'] as $eix => $exdatePart ) { + $parno = count( $exdatePart ); + $formatted = iCalUtilityFunctions::_format_date_time( $exdatePart, $parno ); + if( isset( $theExdate['params']['TZID'] )) + $formatted = str_replace( 'Z', '', $formatted); + if( 0 < $eix ) { + if( isset( $theExdate['value'][0]['tz'] )) { + if( ctype_digit( substr( $theExdate['value'][0]['tz'], -4 )) || + ( 'Z' == $theExdate['value'][0]['tz'] )) { + if( 'Z' != substr( $formatted, -1 )) + $formatted .= 'Z'; + } + else + $formatted = str_replace( 'Z', '', $formatted ); + } + else + $formatted = str_replace( 'Z', '', $formatted ); + } + $content .= ( 0 < $eix ) ? ','.$formatted : $formatted; + } + $attributes .= $this->_createParams( $theExdate['params'] ); + $output .= $this->_createElement( 'EXDATE', $attributes, $content ); + } + return $output; + } +/** + * set calendar component property exdate + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param array exdates + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setExdate( $exdates, $params=FALSE, $index=FALSE ) { + if( empty( $exdates )) { + if( $this->getConfig( 'allowEmpty' )) { + iCalUtilityFunctions::_setMval( $this->exdate, null, $params, FALSE, $index ); + return TRUE; + } + else + return FALSE; + } + $input = array( 'params' => iCalUtilityFunctions::_setParams( $params, array( 'VALUE' => 'DATE-TIME' ))); + /* ev. check 1:st date and save ev. timezone **/ + iCalUtilityFunctions::_chkdatecfg( reset( $exdates ), $parno, $input['params'] ); + iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default parameter + foreach( $exdates as $eix => $theExdate ) { + if( iCalUtilityFunctions::_isArrayTimestampDate( $theExdate )) + $exdatea = iCalUtilityFunctions::_timestamp2date( $theExdate, $parno ); + elseif( is_array( $theExdate )) + $exdatea = iCalUtilityFunctions::_date_time_array( $theExdate, $parno ); + elseif( 8 <= strlen( trim( $theExdate ))) // ex. 2006-08-03 10:12:18 + $exdatea = iCalUtilityFunctions::_date_time_string( $theExdate, $parno ); + if( 3 == $parno ) + unset( $exdatea['hour'], $exdatea['min'], $exdatea['sec'], $exdatea['tz'] ); + elseif( isset( $exdatea['tz'] )) + $exdatea['tz'] = (string) $exdatea['tz']; + if( isset( $input['params']['TZID'] ) || + ( isset( $exdatea['tz'] ) && !iCalUtilityFunctions::_isOffset( $exdatea['tz'] )) || + ( isset( $input['value'][0] ) && ( !isset( $input['value'][0]['tz'] ))) || + ( isset( $input['value'][0]['tz'] ) && !iCalUtilityFunctions::_isOffset( $input['value'][0]['tz'] ))) + unset( $exdatea['tz'] ); + $input['value'][] = $exdatea; + } + if( 0 >= count( $input['value'] )) + return FALSE; + if( 3 == $parno ) { + $input['params']['VALUE'] = 'DATE'; + unset( $input['params']['TZID'] ); + } + iCalUtilityFunctions::_setMval( $this->exdate, $input['value'], $input['params'], FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: EXRULE + */ +/** + * creates formatted output for calendar component property exrule + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createExrule() { + if( empty( $this->exrule )) return FALSE; + return $this->_format_recur( 'EXRULE', $this->exrule ); + } +/** + * set calendar component property exdate + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param array $exruleset + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setExrule( $exruleset, $params=FALSE, $index=FALSE ) { + if( empty( $exruleset )) if( $this->getConfig( 'allowEmpty' )) $exruleset = null; else return FALSE; + iCalUtilityFunctions::_setMval( $this->exrule, iCalUtilityFunctions::_setRexrule( $exruleset ), $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: FREEBUSY + */ +/** + * creates formatted output for calendar component property freebusy + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createFreebusy() { + if( empty( $this->freebusy )) return FALSE; + $output = null; + foreach( $this->freebusy as $freebusyPart ) { + if( empty( $freebusyPart['value'] )) { + if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'FREEBUSY' ); + continue; + } + $attributes = $content = null; + if( isset( $freebusyPart['value']['fbtype'] )) { + $attributes .= $this->intAttrDelimiter.'FBTYPE='.$freebusyPart['value']['fbtype']; + unset( $freebusyPart['value']['fbtype'] ); + $freebusyPart['value'] = array_values( $freebusyPart['value'] ); + } + else + $attributes .= $this->intAttrDelimiter.'FBTYPE=BUSY'; + $attributes .= $this->_createParams( $freebusyPart['params'] ); + $fno = 1; + $cnt = count( $freebusyPart['value']); + foreach( $freebusyPart['value'] as $periodix => $freebusyPeriod ) { + $formatted = iCalUtilityFunctions::_format_date_time( $freebusyPeriod[0] ); + $content .= $formatted; + $content .= '/'; + $cnt2 = count( $freebusyPeriod[1]); + if( array_key_exists( 'year', $freebusyPeriod[1] )) // date-time + $cnt2 = 7; + elseif( array_key_exists( 'week', $freebusyPeriod[1] )) // duration + $cnt2 = 5; + if(( 7 == $cnt2 ) && // period= -> date-time + isset( $freebusyPeriod[1]['year'] ) && + isset( $freebusyPeriod[1]['month'] ) && + isset( $freebusyPeriod[1]['day'] )) { + $content .= iCalUtilityFunctions::_format_date_time( $freebusyPeriod[1] ); + } + else { // period= -> dur-time + $content .= iCalUtilityFunctions::_format_duration( $freebusyPeriod[1] ); + } + if( $fno < $cnt ) + $content .= ','; + $fno++; + } + $output .= $this->_createElement( 'FREEBUSY', $attributes, $content ); + } + return $output; + } +/** + * set calendar component property freebusy + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param string $fbType + * @param array $fbValues + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setFreebusy( $fbType, $fbValues, $params=FALSE, $index=FALSE ) { + if( empty( $fbValues )) { + if( $this->getConfig( 'allowEmpty' )) { + iCalUtilityFunctions::_setMval( $this->freebusy, null, $params, FALSE, $index ); + return TRUE; + } + else + return FALSE; + } + $fbType = strtoupper( $fbType ); + if(( !in_array( $fbType, array( 'FREE', 'BUSY', 'BUSY-UNAVAILABLE', 'BUSY-TENTATIVE' ))) && + ( 'X-' != substr( $fbType, 0, 2 ))) + $fbType = 'BUSY'; + $input = array( 'fbtype' => $fbType ); + foreach( $fbValues as $fbPeriod ) { // periods => period + $freebusyPeriod = array(); + foreach( $fbPeriod as $fbMember ) { // pairs => singlepart + $freebusyPairMember = array(); + if( is_array( $fbMember )) { + if( iCalUtilityFunctions::_isArrayDate( $fbMember )) { // date-time value + $freebusyPairMember = iCalUtilityFunctions::_date_time_array( $fbMember, 7 ); + $freebusyPairMember['tz'] = 'Z'; + } + elseif( iCalUtilityFunctions::_isArrayTimestampDate( $fbMember )) { // timestamp value + $freebusyPairMember = iCalUtilityFunctions::_timestamp2date( $fbMember['timestamp'], 7 ); + $freebusyPairMember['tz'] = 'Z'; + } + else { // array format duration + $freebusyPairMember = iCalUtilityFunctions::_duration_array( $fbMember ); + } + } + elseif(( 3 <= strlen( trim( $fbMember ))) && // string format duration + ( in_array( $fbMember{0}, array( 'P', '+', '-' )))) { + if( 'P' != $fbMember{0} ) + $fbmember = substr( $fbMember, 1 ); + $freebusyPairMember = iCalUtilityFunctions::_duration_string( $fbMember ); + } + elseif( 8 <= strlen( trim( $fbMember ))) { // text date ex. 2006-08-03 10:12:18 + $freebusyPairMember = iCalUtilityFunctions::_date_time_string( $fbMember, 7 ); + $freebusyPairMember['tz'] = 'Z'; + } + $freebusyPeriod[] = $freebusyPairMember; + } + $input[] = $freebusyPeriod; + } + iCalUtilityFunctions::_setMval( $this->freebusy, $input, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: GEO + */ +/** + * creates formatted output for calendar component property geo + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createGeo() { + if( empty( $this->geo )) return FALSE; + if( empty( $this->geo['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'GEO' ) : FALSE; + $attributes = $this->_createParams( $this->geo['params'] ); + $content = null; + $content .= number_format( (float) $this->geo['value']['latitude'], 6, '.', ''); + $content .= ';'; + $content .= number_format( (float) $this->geo['value']['longitude'], 6, '.', ''); + return $this->_createElement( 'GEO', $attributes, $content ); + } +/** + * set calendar component property geo + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param float $latitude + * @param float $longitude + * @param array $params optional + * @return bool + */ + function setGeo( $latitude, $longitude, $params=FALSE ) { + if( !empty( $latitude ) && !empty( $longitude )) { + if( !is_array( $this->geo )) $this->geo = array(); + $this->geo['value']['latitude'] = $latitude; + $this->geo['value']['longitude'] = $longitude; + $this->geo['params'] = iCalUtilityFunctions::_setParams( $params ); + } + elseif( $this->getConfig( 'allowEmpty' )) + $this->geo = array( 'value' => null, 'params' => iCalUtilityFunctions::_setParams( $params ) ); + else + return FALSE; + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: LAST-MODIFIED + */ +/** + * creates formatted output for calendar component property last-modified + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createLastModified() { + if( empty( $this->lastmodified )) return FALSE; + $attributes = $this->_createParams( $this->lastmodified['params'] ); + $formatted = iCalUtilityFunctions::_format_date_time( $this->lastmodified['value'], 7 ); + return $this->_createElement( 'LAST-MODIFIED', $attributes, $formatted ); + } +/** + * set calendar component property completed + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @param mixed $year optional + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param array $params optional + * @return boll + */ + function setLastModified( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) { + if( empty( $year )) + $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' ))); + $this->lastmodified = iCalUtilityFunctions::_setDate2( $year, $month, $day, $hour, $min, $sec, $params ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: LOCATION + */ +/** + * creates formatted output for calendar component property location + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createLocation() { + if( empty( $this->location )) return FALSE; + if( empty( $this->location['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'LOCATION' ) : FALSE; + $attributes = $this->_createParams( $this->location['params'], array( 'ALTREP', 'LANGUAGE' )); + $content = $this->_strrep( $this->location['value'] ); + return $this->_createElement( 'LOCATION', $attributes, $content ); + } +/** + * set calendar component property location + ' + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param array params optional + * @return bool + */ + function setLocation( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->location = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: ORGANIZER + */ +/** + * creates formatted output for calendar component property organizer + * + * @author Kjell-Inge Gustafsson + * @since 2.6.33 - 2010-12-17 + * @return string + */ + function createOrganizer() { + if( empty( $this->organizer )) return FALSE; + if( empty( $this->organizer['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ORGANIZER' ) : FALSE; + $attributes = $this->_createParams( $this->organizer['params'] + , array( 'CN', 'DIR', 'SENT-BY', 'LANGUAGE' )); + return $this->_createElement( 'ORGANIZER', $attributes, $this->organizer['value'] ); + } +/** + * set calendar component property organizer + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-29 + * @param string $value + * @param array params optional + * @return bool + */ + function setOrganizer( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + if( FALSE === ( $pos = strpos( substr( $value, 0, 9 ), ':' ))) + $value = 'MAILTO:'.$value; + else + $value = strtolower( substr( $value, 0, $pos )).substr( $value, $pos ); + $value = str_replace( 'mailto:', 'MAILTO:', $value ); + $this->organizer = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + if( isset( $this->organizer['params']['SENT-BY'] )){ + if( 'mailto:' !== strtolower( substr( $this->organizer['params']['SENT-BY'], 0, 7 ))) + $this->organizer['params']['SENT-BY'] = 'MAILTO:'.$this->organizer['params']['SENT-BY']; + else + $this->organizer['params']['SENT-BY'] = 'MAILTO:'.substr( $this->organizer['params']['SENT-BY'], 7 ); + } + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: PERCENT-COMPLETE + */ +/** + * creates formatted output for calendar component property percent-complete + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @return string + */ + function createPercentComplete() { + if( empty( $this->percentcomplete )) return FALSE; + if( empty( $this->percentcomplete['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PERCENT-COMPLETE' ) : FALSE; + $attributes = $this->_createParams( $this->percentcomplete['params'] ); + return $this->_createElement( 'PERCENT-COMPLETE', $attributes, $this->percentcomplete['value'] ); + } +/** + * set calendar component property percent-complete + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param int $value + * @param array $params optional + * @return bool + */ + function setPercentComplete( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->percentcomplete = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: PRIORITY + */ +/** + * creates formatted output for calendar component property priority + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createPriority() { + if( empty( $this->priority )) return FALSE; + if( empty( $this->priority['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PRIORITY' ) : FALSE; + $attributes = $this->_createParams( $this->priority['params'] ); + return $this->_createElement( 'PRIORITY', $attributes, $this->priority['value'] ); + } +/** + * set calendar component property priority + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param int $value + * @param array $params optional + * @return bool + */ + function setPriority( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->priority = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: RDATE + */ +/** + * creates formatted output for calendar component property rdate + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-26 + * @return string + */ + function createRdate() { + if( empty( $this->rdate )) return FALSE; + $utctime = ( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE; + $output = null; + if( $utctime ) + unset( $this->rdate['params']['TZID'] ); + foreach( $this->rdate as $theRdate ) { + if( empty( $theRdate['value'] )) { + if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RDATE' ); + continue; + } + if( $utctime ) + unset( $theRdate['params']['TZID'] ); + $attributes = $this->_createParams( $theRdate['params'] ); + $cnt = count( $theRdate['value'] ); + $content = null; + $rno = 1; + foreach( $theRdate['value'] as $rpix => $rdatePart ) { + $contentPart = null; + if( is_array( $rdatePart ) && + isset( $theRdate['params']['VALUE'] ) && ( 'PERIOD' == $theRdate['params']['VALUE'] )) { // PERIOD + if( $utctime ) + unset( $rdatePart[0]['tz'] ); + $formatted = iCalUtilityFunctions::_format_date_time( $rdatePart[0]); // PERIOD part 1 + if( $utctime || !empty( $theRdate['params']['TZID'] )) + $formatted = str_replace( 'Z', '', $formatted); + if( 0 < $rpix ) { + if( !empty( $rdatePart[0]['tz'] ) && iCalUtilityFunctions::_isOffset( $rdatePart[0]['tz'] )) { + if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z'; + } + else + $formatted = str_replace( 'Z', '', $formatted ); + } + $contentPart .= $formatted; + $contentPart .= '/'; + $cnt2 = count( $rdatePart[1]); + if( array_key_exists( 'year', $rdatePart[1] )) { + if( array_key_exists( 'hour', $rdatePart[1] )) + $cnt2 = 7; // date-time + else + $cnt2 = 3; // date + } + elseif( array_key_exists( 'week', $rdatePart[1] )) // duration + $cnt2 = 5; + if(( 7 == $cnt2 ) && // period= -> date-time + isset( $rdatePart[1]['year'] ) && + isset( $rdatePart[1]['month'] ) && + isset( $rdatePart[1]['day'] )) { + if( $utctime ) + unset( $rdatePart[1]['tz'] ); + $formatted = iCalUtilityFunctions::_format_date_time( $rdatePart[1] ); // PERIOD part 2 + if( $utctime || !empty( $theRdate['params']['TZID'] )) + $formatted = str_replace( 'Z', '', $formatted); + if( !empty( $rdatePart[0]['tz'] ) && iCalUtilityFunctions::_isOffset( $rdatePart[0]['tz'] )) { + if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z'; + } + else + $formatted = str_replace( 'Z', '', $formatted ); + $contentPart .= $formatted; + } + else { // period= -> dur-time + $contentPart .= iCalUtilityFunctions::_format_duration( $rdatePart[1] ); + } + } // PERIOD end + else { // SINGLE date start + if( $utctime ) + unset( $rdatePart['tz'] ); + $formatted = iCalUtilityFunctions::_format_date_time( $rdatePart); + if( $utctime || !empty( $theRdate['params']['TZID'] )) + $formatted = str_replace( 'Z', '', $formatted); + if( !$utctime && ( 0 < $rpix )) { + if( !empty( $theRdate['value'][0]['tz'] ) && iCalUtilityFunctions::_isOffset( $theRdate['value'][0]['tz'] )) { + if( 'Z' != substr( $formatted, -1 )) + $formatted .= 'Z'; + } + else + $formatted = str_replace( 'Z', '', $formatted ); + } + $contentPart .= $formatted; + } + $content .= $contentPart; + if( $rno < $cnt ) + $content .= ','; + $rno++; + } + $output .= $this->_createElement( 'RDATE', $attributes, $content ); + } + return $output; + } +/** + * set calendar component property rdate + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-07 + * @param array $rdates + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setRdate( $rdates, $params=FALSE, $index=FALSE ) { + if( empty( $rdates )) { + if( $this->getConfig( 'allowEmpty' )) { + iCalUtilityFunctions::_setMval( $this->rdate, null, $params, FALSE, $index ); + return TRUE; + } + else + return FALSE; + } + $input = array( 'params' => iCalUtilityFunctions::_setParams( $params, array( 'VALUE' => 'DATE-TIME' ))); + if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) { + unset( $input['params']['TZID'] ); + $input['params']['VALUE'] = 'DATE-TIME'; + } + /* check if PERIOD, if not set */ + if((!isset( $input['params']['VALUE'] ) || !in_array( $input['params']['VALUE'], array( 'DATE', 'PERIOD' ))) && + isset( $rdates[0] ) && is_array( $rdates[0] ) && ( 2 == count( $rdates[0] )) && + isset( $rdates[0][0] ) && isset( $rdates[0][1] ) && !isset( $rdates[0]['timestamp'] ) && + (( is_array( $rdates[0][0] ) && ( isset( $rdates[0][0]['timestamp'] ) || + iCalUtilityFunctions::_isArrayDate( $rdates[0][0] ))) || + ( is_string( $rdates[0][0] ) && ( 8 <= strlen( trim( $rdates[0][0] ))))) && + ( is_array( $rdates[0][1] ) || ( is_string( $rdates[0][1] ) && ( 3 <= strlen( trim( $rdates[0][1] )))))) + $input['params']['VALUE'] = 'PERIOD'; + /* check 1:st date, upd. $parno (opt) and save ev. timezone **/ + $date = reset( $rdates ); + if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) // PERIOD + $date = reset( $date ); + iCalUtilityFunctions::_chkdatecfg( $date, $parno, $input['params'] ); + if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) + unset( $input['params']['TZID'] ); + iCalUtilityFunctions::_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default + foreach( $rdates as $rpix => $theRdate ) { + $inputa = null; + if( is_array( $theRdate )) { + if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) { // PERIOD + foreach( $theRdate as $rix => $rPeriod ) { + if( is_array( $rPeriod )) { + if( iCalUtilityFunctions::_isArrayTimestampDate( $rPeriod )) // timestamp + $inputab = ( isset( $rPeriod['tz'] )) ? iCalUtilityFunctions::_timestamp2date( $rPeriod, $parno ) : iCalUtilityFunctions::_timestamp2date( $rPeriod, 6 ); + elseif( iCalUtilityFunctions::_isArrayDate( $rPeriod )) + $inputab = ( 3 < count ( $rPeriod )) ? iCalUtilityFunctions::_date_time_array( $rPeriod, $parno ) : iCalUtilityFunctions::_date_time_array( $rPeriod, 6 ); + elseif (( 1 == count( $rPeriod )) && ( 8 <= strlen( reset( $rPeriod )))) // text-date + $inputab = iCalUtilityFunctions::_date_time_string( reset( $rPeriod ), $parno ); + else // array format duration + $inputab = iCalUtilityFunctions::_duration_array( $rPeriod ); + } + elseif(( 3 <= strlen( trim( $rPeriod ))) && // string format duration + ( in_array( $rPeriod[0], array( 'P', '+', '-' )))) { + if( 'P' != $rPeriod[0] ) + $rPeriod = substr( $rPeriod, 1 ); + $inputab = iCalUtilityFunctions::_duration_string( $rPeriod ); + } + elseif( 8 <= strlen( trim( $rPeriod ))) // text date ex. 2006-08-03 10:12:18 + $inputab = iCalUtilityFunctions::_date_time_string( $rPeriod, $parno ); + if( isset( $input['params']['TZID'] ) || + ( isset( $inputab['tz'] ) && !iCalUtilityFunctions::_isOffset( $inputab['tz'] )) || + ( isset( $inputa[0] ) && ( !isset( $inputa[0]['tz'] ))) || + ( isset( $inputa[0]['tz'] ) && !iCalUtilityFunctions::_isOffset( $inputa[0]['tz'] ))) + unset( $inputab['tz'] ); + $inputa[] = $inputab; + } + } // PERIOD end + elseif ( iCalUtilityFunctions::_isArrayTimestampDate( $theRdate )) // timestamp + $inputa = iCalUtilityFunctions::_timestamp2date( $theRdate, $parno ); + else // date[-time] + $inputa = iCalUtilityFunctions::_date_time_array( $theRdate, $parno ); + } + elseif( 8 <= strlen( trim( $theRdate ))) // text date ex. 2006-08-03 10:12:18 + $inputa = iCalUtilityFunctions::_date_time_string( $theRdate, $parno ); + if( !isset( $input['params']['VALUE'] ) || ( 'PERIOD' != $input['params']['VALUE'] )) { // no PERIOD + if( 3 == $parno ) + unset( $inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz'] ); + elseif( isset( $inputa['tz'] )) + $inputa['tz'] = (string) $inputa['tz']; + if( isset( $input['params']['TZID'] ) || + ( isset( $inputa['tz'] ) && !iCalUtilityFunctions::_isOffset( $inputa['tz'] )) || + ( isset( $input['value'][0] ) && ( !isset( $input['value'][0]['tz'] ))) || + ( isset( $input['value'][0]['tz'] ) && !iCalUtilityFunctions::_isOffset( $input['value'][0]['tz'] ))) + unset( $inputa['tz'] ); + } + $input['value'][] = $inputa; + } + if( 3 == $parno ) { + $input['params']['VALUE'] = 'DATE'; + unset( $input['params']['TZID'] ); + } + iCalUtilityFunctions::_setMval( $this->rdate, $input['value'], $input['params'], FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: RECURRENCE-ID + */ +/** + * creates formatted output for calendar component property recurrence-id + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createRecurrenceid() { + if( empty( $this->recurrenceid )) return FALSE; + if( empty( $this->recurrenceid['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'RECURRENCE-ID' ) : FALSE; + $formatted = iCalUtilityFunctions::_format_date_time( $this->recurrenceid['value'] ); + $attributes = $this->_createParams( $this->recurrenceid['params'] ); + return $this->_createElement( 'RECURRENCE-ID', $attributes, $formatted ); + } +/** + * set calendar component property recurrence-id + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param array $params optional + * @return bool + */ + function setRecurrenceid( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) { + if( empty( $year )) { + if( $this->getConfig( 'allowEmpty' )) { + $this->recurrenceid = array( 'value' => null, 'params' => null ); + return TRUE; + } + else + return FALSE; + } + $this->recurrenceid = iCalUtilityFunctions::_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: RELATED-TO + */ +/** + * creates formatted output for calendar component property related-to + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @return string + */ + function createRelatedTo() { + if( empty( $this->relatedto )) return FALSE; + $output = null; + foreach( $this->relatedto as $relation ) { + if( empty( $relation['value'] )) { + if( $this->getConfig( 'allowEmpty' )) $output.= $this->_createElement( 'RELATED-TO', $this->_createParams( $relation['params'] )); + continue; + } + $attributes = $this->_createParams( $relation['params'] ); + $content = ( 'xcal' != $this->format ) ? '<' : ''; + $content .= $this->_strrep( $relation['value'] ); + $content .= ( 'xcal' != $this->format ) ? '>' : ''; + $output .= $this->_createElement( 'RELATED-TO', $attributes, $content ); + } + return $output; + } +/** + * set calendar component property related-to + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-07 + * @param float $relid + * @param array $params, optional + * @param index $index, optional + * @return bool + */ + function setRelatedTo( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + if(( '<' == substr( $value, 0, 1 )) && ( '>' == substr( $value, -1 ))) + $value = substr( $value, 1, ( strlen( $value ) - 2 )); + iCalUtilityFunctions::_existRem( $params, 'RELTYPE', 'PARENT', TRUE ); // remove default + iCalUtilityFunctions::_setMval( $this->relatedto, $value, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: REPEAT + */ +/** + * creates formatted output for calendar component property repeat + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createRepeat() { + if( empty( $this->repeat )) return FALSE; + if( empty( $this->repeat['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'REPEAT' ) : FALSE; + $attributes = $this->_createParams( $this->repeat['params'] ); + return $this->_createElement( 'REPEAT', $attributes, $this->repeat['value'] ); + } +/** + * set calendar component property transp + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param array $params optional + * @return void + */ + function setRepeat( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->repeat = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: REQUEST-STATUS + */ +/** + * creates formatted output for calendar component property request-status + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @return string + */ + function createRequestStatus() { + if( empty( $this->requeststatus )) return FALSE; + $output = null; + foreach( $this->requeststatus as $rstat ) { + if( empty( $rstat['value']['statcode'] )) { + if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'REQUEST-STATUS' ); + continue; + } + $attributes = $this->_createParams( $rstat['params'], array( 'LANGUAGE' )); + $content = number_format( (float) $rstat['value']['statcode'], 2, '.', ''); + $content .= ';'.$this->_strrep( $rstat['value']['text'] ); + if( isset( $rstat['value']['extdata'] )) + $content .= ';'.$this->_strrep( $rstat['value']['extdata'] ); + $output .= $this->_createElement( 'REQUEST-STATUS', $attributes, $content ); + } + return $output; + } +/** + * set calendar component property request-status + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param float $statcode + * @param string $text + * @param string $extdata, optional + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setRequestStatus( $statcode, $text, $extdata=FALSE, $params=FALSE, $index=FALSE ) { + if( empty( $statcode ) || empty( $text )) if( $this->getConfig( 'allowEmpty' )) $statcode = $text = null; else return FALSE; + $input = array( 'statcode' => $statcode, 'text' => $text ); + if( $extdata ) + $input['extdata'] = $extdata; + iCalUtilityFunctions::_setMval( $this->requeststatus, $input, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: RESOURCES + */ +/** + * creates formatted output for calendar component property resources + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-23 + * @return string + */ + function createResources() { + if( empty( $this->resources )) return FALSE; + $output = null; + foreach( $this->resources as $resource ) { + if( empty( $resource['value'] )) { + if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RESOURCES' ); + continue; + } + $attributes = $this->_createParams( $resource['params'], array( 'ALTREP', 'LANGUAGE' )); + if( is_array( $resource['value'] )) { + foreach( $resource['value'] as $rix => $resourcePart ) + $resource['value'][$rix] = $this->_strrep( $resourcePart ); + $content = implode( ',', $resource['value'] ); + } + else + $content = $this->_strrep( $resource['value'] ); + $output .= $this->_createElement( 'RESOURCES', $attributes, $content ); + } + return $output; + } +/** + * set calendar component property recources + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param mixed $value + * @param array $params, optional + * @param integer $index, optional + * @return bool + */ + function setResources( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + iCalUtilityFunctions::_setMval( $this->resources, $value, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: RRULE + */ +/** + * creates formatted output for calendar component property rrule + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createRrule() { + if( empty( $this->rrule )) return FALSE; + return $this->_format_recur( 'RRULE', $this->rrule ); + } +/** + * set calendar component property rrule + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param array $rruleset + * @param array $params, optional + * @param integer $index, optional + * @return void + */ + function setRrule( $rruleset, $params=FALSE, $index=FALSE ) { + if( empty( $rruleset )) if( $this->getConfig( 'allowEmpty' )) $rruleset = null; else return FALSE; + iCalUtilityFunctions::_setMval( $this->rrule, iCalUtilityFunctions::_setRexrule( $rruleset ), $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: SEQUENCE + */ +/** + * creates formatted output for calendar component property sequence + * @author Kjell-Inge Gustafsson + * @since 2.6.9 - 2009-12-30 + * @return string + */ + function createSequence() { + if( empty( $this->sequence )) return FALSE; + if( empty( $this->sequence['value'] ) && ( '0' != $this->sequence['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SEQUENCE' ) : FALSE; + $attributes = $this->_createParams( $this->sequence['params'] ); + return $this->_createElement( 'SEQUENCE', $attributes, $this->sequence['value'] ); + } +/** + * set calendar component property sequence + * @author Kjell-Inge Gustafsson + * @since 2.6.9 - 2009-12-30 + * @param int $value optional + * @param array $params optional + * @return bool + */ + function setSequence( $value=FALSE, $params=FALSE ) { + if( empty( $value ) && ( '0' != $value )) + $value = ( isset( $this->sequence['value'] ) && ( 0 < $this->sequence['value'] )) ? $this->sequence['value'] + 1 : 1; + $this->sequence = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: STATUS + */ +/** + * creates formatted output for calendar component property status + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createStatus() { + if( empty( $this->status )) return FALSE; + if( empty( $this->status['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'STATUS' ) : FALSE; + $attributes = $this->_createParams( $this->status['params'] ); + return $this->_createElement( 'STATUS', $attributes, $this->status['value'] ); + } +/** + * set calendar component property status + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param array $params optional + * @return bool + */ + function setStatus( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->status = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: SUMMARY + */ +/** + * creates formatted output for calendar component property summary + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createSummary() { + if( empty( $this->summary )) return FALSE; + if( empty( $this->summary['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SUMMARY' ) : FALSE; + $attributes = $this->_createParams( $this->summary['params'], array( 'ALTREP', 'LANGUAGE' )); + $content = $this->_strrep( $this->summary['value'] ); + return $this->_createElement( 'SUMMARY', $attributes, $content ); + } +/** + * set calendar component property summary + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param string $params optional + * @return bool + */ + function setSummary( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->summary = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: TRANSP + */ +/** + * creates formatted output for calendar component property transp + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createTransp() { + if( empty( $this->transp )) return FALSE; + if( empty( $this->transp['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRANSP' ) : FALSE; + $attributes = $this->_createParams( $this->transp['params'] ); + return $this->_createElement( 'TRANSP', $attributes, $this->transp['value'] ); + } +/** + * set calendar component property transp + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param string $params optional + * @return bool + */ + function setTransp( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->transp = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: TRIGGER + */ +/** + * creates formatted output for calendar component property trigger + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-10-21 + * @return string + */ + function createTrigger() { + if( empty( $this->trigger )) return FALSE; + if( empty( $this->trigger['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRIGGER' ) : FALSE; + $content = $attributes = null; + if( isset( $this->trigger['value']['year'] ) && + isset( $this->trigger['value']['month'] ) && + isset( $this->trigger['value']['day'] )) + $content .= iCalUtilityFunctions::_format_date_time( $this->trigger['value'] ); + else { + if( TRUE !== $this->trigger['value']['relatedStart'] ) + $attributes .= $this->intAttrDelimiter.'RELATED=END'; + if( $this->trigger['value']['before'] ) + $content .= '-'; + $content .= iCalUtilityFunctions::_format_duration( $this->trigger['value'] ); + } + $attributes .= $this->_createParams( $this->trigger['params'] ); + return $this->_createElement( 'TRIGGER', $attributes, $content ); + } +/** + * set calendar component property trigger + * + * @author Kjell-Inge Gustafsson + * @since 2.4.16 - 2008-11-04 + * @param mixed $year + * @param mixed $month optional + * @param int $day optional + * @param int $week optional + * @param int $hour optional + * @param int $min optional + * @param int $sec optional + * @param bool $relatedStart optional + * @param bool $before optional + * @param array $params optional + * @return bool + */ + function setTrigger( $year, $month=null, $day=null, $week=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $relatedStart=TRUE, $before=TRUE, $params=FALSE ) { + if( empty( $year ) && empty( $month ) && empty( $day ) && empty( $week ) && empty( $hour ) && empty( $min ) && empty( $sec )) + if( $this->getConfig( 'allowEmpty' )) { + $this->trigger = array( 'value' => null, 'params' => iCalUtilityFunctions::_setParams( $params ) ); + return TRUE; + } + else + return FALSE; + if( iCalUtilityFunctions::_isArrayTimestampDate( $year )) { // timestamp + $params = iCalUtilityFunctions::_setParams( $month ); + $date = iCalUtilityFunctions::_timestamp2date( $year, 7 ); + foreach( $date as $k => $v ) + $$k = $v; + } + elseif( is_array( $year ) && ( is_array( $month ) || empty( $month ))) { + $params = iCalUtilityFunctions::_setParams( $month ); + if(!(array_key_exists( 'year', $year ) && // exclude date-time + array_key_exists( 'month', $year ) && + array_key_exists( 'day', $year ))) { // so this must be a duration + if( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] )) + $relatedStart = FALSE; + else + $relatedStart = ( array_key_exists( 'relatedStart', $year ) && ( TRUE !== $year['relatedStart'] )) ? FALSE : TRUE; + $before = ( array_key_exists( 'before', $year ) && ( TRUE !== $year['before'] )) ? FALSE : TRUE; + } + $SSYY = ( array_key_exists( 'year', $year )) ? $year['year'] : null; + $month = ( array_key_exists( 'month', $year )) ? $year['month'] : null; + $day = ( array_key_exists( 'day', $year )) ? $year['day'] : null; + $week = ( array_key_exists( 'week', $year )) ? $year['week'] : null; + $hour = ( array_key_exists( 'hour', $year )) ? $year['hour'] : 0; //null; + $min = ( array_key_exists( 'min', $year )) ? $year['min'] : 0; //null; + $sec = ( array_key_exists( 'sec', $year )) ? $year['sec'] : 0; //null; + $year = $SSYY; + } + elseif(is_string( $year ) && ( is_array( $month ) || empty( $month ))) { // duration or date in a string + $params = iCalUtilityFunctions::_setParams( $month ); + if( in_array( $year{0}, array( 'P', '+', '-' ))) { // duration + $relatedStart = ( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] )) ? FALSE : TRUE; + $before = ( '-' == $year{0} ) ? TRUE : FALSE; + if( 'P' != $year{0} ) + $year = substr( $year, 1 ); + $date = iCalUtilityFunctions::_duration_string( $year); + } + else // date + $date = iCalUtilityFunctions::_date_time_string( $year, 7 ); + unset( $year, $month, $day ); + foreach( $date as $k => $v ) + $$k = $v; + } + else // single values in function input parameters + $params = iCalUtilityFunctions::_setParams( $params ); + if( !empty( $year ) && !empty( $month ) && !empty( $day )) { // date + $params['VALUE'] = 'DATE-TIME'; + $hour = ( $hour ) ? $hour : 0; + $min = ( $min ) ? $min : 0; + $sec = ( $sec ) ? $sec : 0; + $this->trigger = array( 'params' => $params ); + $this->trigger['value'] = array( 'year' => $year + , 'month' => $month + , 'day' => $day + , 'hour' => $hour + , 'min' => $min + , 'sec' => $sec + , 'tz' => 'Z' ); + return TRUE; + } + elseif(( empty( $year ) && empty( $month )) && // duration + (!empty( $week ) || !empty( $day ) || !empty( $hour ) || !empty( $min ) || !empty( $sec ))) { + unset( $params['RELATED'] ); // set at output creation (END only) + unset( $params['VALUE'] ); // 'DURATION' default + $this->trigger = array( 'params' => $params ); + $relatedStart = ( FALSE !== $relatedStart ) ? TRUE : FALSE; + $before = ( FALSE !== $before ) ? TRUE : FALSE; + $this->trigger['value'] = array( 'relatedStart' => $relatedStart + , 'before' => $before ); + if( !empty( $week )) $this->trigger['value']['week'] = $week; + if( !empty( $day )) $this->trigger['value']['day'] = $day; + if( !empty( $hour )) $this->trigger['value']['hour'] = $hour; + if( !empty( $min )) $this->trigger['value']['min'] = $min; + if( !empty( $sec )) $this->trigger['value']['sec'] = $sec; + return TRUE; + } + return FALSE; + } +/*********************************************************************************/ +/** + * Property Name: TZID + */ +/** + * creates formatted output for calendar component property tzid + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createTzid() { + if( empty( $this->tzid )) return FALSE; + if( empty( $this->tzid['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZID' ) : FALSE; + $attributes = $this->_createParams( $this->tzid['params'] ); + return $this->_createElement( 'TZID', $attributes, $this->_strrep( $this->tzid['value'] )); + } +/** + * set calendar component property tzid + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param array $params optional + * @return bool + */ + function setTzid( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->tzid = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * .. . + * Property Name: TZNAME + */ +/** + * creates formatted output for calendar component property tzname + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createTzname() { + if( empty( $this->tzname )) return FALSE; + $output = null; + foreach( $this->tzname as $theName ) { + if( !empty( $theName['value'] )) { + $attributes = $this->_createParams( $theName['params'], array( 'LANGUAGE' )); + $output .= $this->_createElement( 'TZNAME', $attributes, $this->_strrep( $theName['value'] )); + } + elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'TZNAME' ); + } + return $output; + } +/** + * set calendar component property tzname + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param string $value + * @param string $params, optional + * @param integer $index, optional + * @return bool + */ + function setTzname( $value, $params=FALSE, $index=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + iCalUtilityFunctions::_setMval( $this->tzname, $value, $params, FALSE, $index ); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: TZOFFSETFROM + */ +/** + * creates formatted output for calendar component property tzoffsetfrom + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createTzoffsetfrom() { + if( empty( $this->tzoffsetfrom )) return FALSE; + if( empty( $this->tzoffsetfrom['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETFROM' ) : FALSE; + $attributes = $this->_createParams( $this->tzoffsetfrom['params'] ); + return $this->_createElement( 'TZOFFSETFROM', $attributes, $this->tzoffsetfrom['value'] ); + } +/** + * set calendar component property tzoffsetfrom + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param string $params optional + * @return bool + */ + function setTzoffsetfrom( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->tzoffsetfrom = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: TZOFFSETTO + */ +/** + * creates formatted output for calendar component property tzoffsetto + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createTzoffsetto() { + if( empty( $this->tzoffsetto )) return FALSE; + if( empty( $this->tzoffsetto['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETTO' ) : FALSE; + $attributes = $this->_createParams( $this->tzoffsetto['params'] ); + return $this->_createElement( 'TZOFFSETTO', $attributes, $this->tzoffsetto['value'] ); + } +/** + * set calendar component property tzoffsetto + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param string $params optional + * @return bool + */ + function setTzoffsetto( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->tzoffsetto = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: TZURL + */ +/** + * creates formatted output for calendar component property tzurl + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createTzurl() { + if( empty( $this->tzurl )) return FALSE; + if( empty( $this->tzurl['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZURL' ) : FALSE; + $attributes = $this->_createParams( $this->tzurl['params'] ); + return $this->_createElement( 'TZURL', $attributes, $this->tzurl['value'] ); + } +/** + * set calendar component property tzurl + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param string $params optional + * @return boll + */ + function setTzurl( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->tzurl = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: UID + */ +/** + * creates formatted output for calendar component property uid + * + * @author Kjell-Inge Gustafsson + * @since 0.9.7 - 2006-11-20 + * @return string + */ + function createUid() { + if( 0 >= count( $this->uid )) + $this->_makeuid(); + $attributes = $this->_createParams( $this->uid['params'] ); + return $this->_createElement( 'UID', $attributes, $this->uid['value'] ); + } +/** + * create an unique id for this calendar component object instance + * + * @author Kjell-Inge Gustafsson + * @since 2.2.7 - 2007-09-04 + * @return void + */ + function _makeUid() { + $date = date('Ymd\THisT'); + $unique = substr(microtime(), 2, 4); + $base = 'aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPrRsStTuUvVxXuUvVwWzZ1234567890'; + $start = 0; + $end = strlen( $base ) - 1; + $length = 6; + $str = null; + for( $p = 0; $p < $length; $p++ ) + $unique .= $base{mt_rand( $start, $end )}; + $this->uid = array( 'params' => null ); + $this->uid['value'] = $date.'-'.$unique.'@'.$this->getConfig( 'unique_id' ); + } +/** + * set calendar component property uid + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param string $params optional + * @return bool + */ + function setUid( $value, $params=FALSE ) { + if( empty( $value )) return FALSE; // no allowEmpty check here !!!! + $this->uid = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: URL + */ +/** + * creates formatted output for calendar component property url + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-21 + * @return string + */ + function createUrl() { + if( empty( $this->url )) return FALSE; + if( empty( $this->url['value'] )) + return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'URL' ) : FALSE; + $attributes = $this->_createParams( $this->url['params'] ); + return $this->_createElement( 'URL', $attributes, $this->url['value'] ); + } +/** + * set calendar component property url + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-11-04 + * @param string $value + * @param string $params optional + * @return bool + */ + function setUrl( $value, $params=FALSE ) { + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $this->url = array( 'value' => $value, 'params' => iCalUtilityFunctions::_setParams( $params )); + return TRUE; + } +/*********************************************************************************/ +/** + * Property Name: x-prop + */ +/** + * creates formatted output for calendar component property x-prop + * + * @author Kjell-Inge Gustafsson + * @since 2.4.11 - 2008-10-22 + * @return string + */ + function createXprop() { + if( empty( $this->xprop )) return FALSE; + $output = null; + foreach( $this->xprop as $label => $xpropPart ) { + if( empty( $xpropPart['value'] )) { + if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $label ); + continue; + } + $attributes = $this->_createParams( $xpropPart['params'], array( 'LANGUAGE' )); + if( is_array( $xpropPart['value'] )) { + foreach( $xpropPart['value'] as $pix => $theXpart ) + $xpropPart['value'][$pix] = $this->_strrep( $theXpart ); + $xpropPart['value'] = implode( ',', $xpropPart['value'] ); + } + else + $xpropPart['value'] = $this->_strrep( $xpropPart['value'] ); + $output .= $this->_createElement( $label, $attributes, $xpropPart['value'] ); + } + return $output; + } +/** + * set calendar component property x-prop + * + * @author Kjell-Inge Gustafsson + * @since 2.6.22 - 2010-09-25 + * @param string $label + * @param mixed $value + * @param array $params optional + * @return bool + */ + function setXprop( $label, $value, $params=FALSE ) { + if( empty( $label )) return; + if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; + $xprop = array( 'value' => $value ); + $xprop['params'] = iCalUtilityFunctions::_setParams( $params ); + if( !is_array( $this->xprop )) $this->xprop = array(); + $this->xprop[strtoupper( $label )] = $xprop; + return TRUE; + } +/*********************************************************************************/ +/*********************************************************************************/ +/** + * create element format parts + * + * @author Kjell-Inge Gustafsson + * @since 2.0.6 - 2006-06-20 + * @return string + */ + function _createFormat() { + $objectname = null; + switch( $this->format ) { + case 'xcal': + $objectname = ( isset( $this->timezonetype )) ? + strtolower( $this->timezonetype ) : strtolower( $this->objName ); + $this->componentStart1 = $this->elementStart1 = '<'; + $this->componentStart2 = $this->elementStart2 = '>'; + $this->componentEnd1 = $this->elementEnd1 = 'componentEnd2 = $this->elementEnd2 = '>'.$this->nl; + $this->intAttrDelimiter = ''; + $this->attributeDelimiter = $this->nl; + $this->valueInit = null; + break; + default: + $objectname = ( isset( $this->timezonetype )) ? + strtoupper( $this->timezonetype ) : strtoupper( $this->objName ); + $this->componentStart1 = 'BEGIN:'; + $this->componentStart2 = null; + $this->componentEnd1 = 'END:'; + $this->componentEnd2 = $this->nl; + $this->elementStart1 = null; + $this->elementStart2 = null; + $this->elementEnd1 = null; + $this->elementEnd2 = $this->nl; + $this->intAttrDelimiter = ''; + $this->attributeDelimiter = ';'; + $this->valueInit = ':'; + break; + } + return $objectname; + } +/** + * creates formatted output for calendar component property + * + * @author Kjell-Inge Gustafsson + * @since 2.6.22 - 2010-12-06 + * @param string $label property name + * @param string $attributes property attributes + * @param string $content property content (optional) + * @return string + */ + function _createElement( $label, $attributes=null, $content=FALSE ) { + switch( $this->format ) { + case 'xcal': + $label = strtolower( $label ); + break; + default: + $label = strtoupper( $label ); + break; + } + $output = $this->elementStart1.$label; + $categoriesAttrLang = null; + $attachInlineBinary = FALSE; + $attachfmttype = null; + if( !empty( $attributes )) { + $attributes = trim( $attributes ); + if ( 'xcal' == $this->format) { + $attributes2 = explode( $this->intAttrDelimiter, $attributes ); + $attributes = null; + foreach( $attributes2 as $attribute ) { + $attrKVarr = explode( '=', $attribute ); + if( empty( $attrKVarr[0] )) + continue; + if( !isset( $attrKVarr[1] )) { + $attrValue = $attrKVarr[0]; + $attrKey = null; + } + elseif( 2 == count( $attrKVarr)) { + $attrKey = strtolower( $attrKVarr[0] ); + $attrValue = $attrKVarr[1]; + } + else { + $attrKey = strtolower( $attrKVarr[0] ); + unset( $attrKVarr[0] ); + $attrValue = implode( '=', $attrKVarr ); + } + if(( 'attach' == $label ) && ( in_array( $attrKey, array( 'fmttype', 'encoding', 'value' )))) { + $attachInlineBinary = TRUE; + if( 'fmttype' == $attrKey ) + $attachfmttype = $attrKey.'='.$attrValue; + continue; + } + elseif(( 'categories' == $label ) && ( 'language' == $attrKey )) + $categoriesAttrLang = $attrKey.'='.$attrValue; + else { + $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' '; + $attributes .= ( !empty( $attrKey )) ? $attrKey.'=' : null; + if(( '"' == substr( $attrValue, 0, 1 )) && ( '"' == substr( $attrValue, -1 ))) { + $attrValue = substr( $attrValue, 1, ( strlen( $attrValue ) - 2 )); + $attrValue = str_replace( '"', '', $attrValue ); + } + $attributes .= '"'.htmlspecialchars( $attrValue ).'"'; + } + } + } + else { + $attributes = str_replace( $this->intAttrDelimiter, $this->attributeDelimiter, $attributes ); + } + } + if(((( 'attach' == $label ) && !$attachInlineBinary ) || + ( in_array( $label, array( 'tzurl', 'url' )))) && ( 'xcal' == $this->format)) { + $pos = strrpos($content, "/"); + $docname = ( $pos !== false) ? substr( $content, (1 - strlen( $content ) + $pos )) : $content; + $this->xcaldecl[] = array( 'xmldecl' => 'ENTITY' + , 'uri' => $docname + , 'ref' => 'SYSTEM' + , 'external' => $content + , 'type' => 'NDATA' + , 'type2' => 'BINERY' ); + $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' '; + $attributes .= 'uri="'.$docname.'"'; + $content = null; + if( 'attach' == $label ) { + $attributes = str_replace( $this->attributeDelimiter, $this->intAttrDelimiter, $attributes ); + $content = $this->_createElement( 'extref', $attributes, null ); + $attributes = null; + } + } + elseif(( 'attach' == $label ) && $attachInlineBinary && ( 'xcal' == $this->format)) { + $content = $this->nl.$this->_createElement( 'b64bin', $attachfmttype, $content ); // max one attribute + } + $output .= $attributes; + if( !$content && ( '0' != $content )) { + switch( $this->format ) { + case 'xcal': + $output .= ' /'; + $output .= $this->elementStart2; + return $output; + break; + default: + $output .= $this->elementStart2.$this->valueInit; + return $this->_size75( $output ); + break; + } + } + $output .= $this->elementStart2; + $output .= $this->valueInit.$content; + switch( $this->format ) { + case 'xcal': + return $output.$this->elementEnd1.$label.$this->elementEnd2; + break; + default: + return $this->_size75( $output ); + break; + } + } +/** + * creates formatted output for calendar component property parameters + * + * @author Kjell-Inge Gustafsson + * @since 2.6.33 - 2010-12-18 + * @param array $params optional + * @param array $ctrKeys optional + * @return string + */ + function _createParams( $params=array(), $ctrKeys=array() ) { + if( !is_array( $params ) || empty( $params )) + $params = array(); + $attrLANG = $attr1 = $attr2 = $lang = null; + $CNattrKey = ( in_array( 'CN', $ctrKeys )) ? TRUE : FALSE ; + $LANGattrKey = ( in_array( 'LANGUAGE', $ctrKeys )) ? TRUE : FALSE ; + $CNattrExist = $LANGattrExist = FALSE; + $xparams = array(); + foreach( $params as $paramKey => $paramValue ) { + if( ctype_digit( (string) $paramKey )) { + $xparams[] = $paramValue; + continue; + } + $paramKey = strtoupper( $paramKey ); + if( !in_array( $paramKey, array( 'ALTREP', 'CN', 'DIR', 'ENCODING', 'FMTTYPE', 'LANGUAGE', 'RANGE', 'RELTYPE', 'SENT-BY', 'TZID', 'VALUE' ))) + $xparams[$paramKey] = $paramValue; + else + $params[$paramKey] = $paramValue; + } + ksort( $xparams, SORT_STRING ); + foreach( $xparams as $paramKey => $paramValue ) { + if( ctype_digit( (string) $paramKey )) + $attr2 .= $this->intAttrDelimiter.$paramValue; + else + $attr2 .= $this->intAttrDelimiter."$paramKey=$paramValue"; + } + if( isset( $params['FMTTYPE'] ) && !in_array( 'FMTTYPE', $ctrKeys )) { + $attr1 .= $this->intAttrDelimiter.'FMTTYPE='.$params['FMTTYPE'].$attr2; + $attr2 = null; + } + if( isset( $params['ENCODING'] ) && !in_array( 'ENCODING', $ctrKeys )) { + if( !empty( $attr2 )) { + $attr1 .= $attr2; + $attr2 = null; + } + $attr1 .= $this->intAttrDelimiter.'ENCODING='.$params['ENCODING']; + } + if( isset( $params['VALUE'] ) && !in_array( 'VALUE', $ctrKeys )) + $attr1 .= $this->intAttrDelimiter.'VALUE='.$params['VALUE']; + if( isset( $params['TZID'] ) && !in_array( 'TZID', $ctrKeys )) + $attr1 .= $this->intAttrDelimiter.'TZID='.$params['TZID']; + if( isset( $params['RANGE'] ) && !in_array( 'RANGE', $ctrKeys )) + $attr1 .= $this->intAttrDelimiter.'RANGE='.$params['RANGE']; + if( isset( $params['RELTYPE'] ) && !in_array( 'RELTYPE', $ctrKeys )) + $attr1 .= $this->intAttrDelimiter.'RELTYPE='.$params['RELTYPE']; + if( isset( $params['CN'] ) && $CNattrKey ) { + $attr1 = $this->intAttrDelimiter.'CN="'.$params['CN'].'"'; + $CNattrExist = TRUE; + } + if( isset( $params['DIR'] ) && in_array( 'DIR', $ctrKeys )) + $attr1 .= $this->intAttrDelimiter.'DIR="'.$params['DIR'].'"'; + if( isset( $params['SENT-BY'] ) && in_array( 'SENT-BY', $ctrKeys )) + $attr1 .= $this->intAttrDelimiter.'SENT-BY="'.$params['SENT-BY'].'"'; + if( isset( $params['ALTREP'] ) && in_array( 'ALTREP', $ctrKeys )) + $attr1 .= $this->intAttrDelimiter.'ALTREP="'.$params['ALTREP'].'"'; + if( isset( $params['LANGUAGE'] ) && $LANGattrKey ) { + $attrLANG .= $this->intAttrDelimiter.'LANGUAGE='.$params['LANGUAGE']; + $LANGattrExist = TRUE; + } + if( !$LANGattrExist ) { + $lang = $this->getConfig( 'language' ); + if(( $CNattrExist || $LANGattrKey ) && $lang ) + $attrLANG .= $this->intAttrDelimiter.'LANGUAGE='.$lang; + } + return $attr1.$attrLANG.$attr2; + } +/** + * creates formatted output for calendar component property data value type recur + * + * @author Kjell-Inge Gustafsson + * @since 2.4.8 - 2008-10-22 + * @param array $recurlabel + * @param array $recurdata + * @return string + */ + function _format_recur( $recurlabel, $recurdata ) { + $output = null; + foreach( $recurdata as $therule ) { + if( empty( $therule['value'] )) { + if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $recurlabel ); + continue; + } + $attributes = ( isset( $therule['params'] )) ? $this->_createParams( $therule['params'] ) : null; + $content1 = $content2 = null; + foreach( $therule['value'] as $rulelabel => $rulevalue ) { + switch( $rulelabel ) { + case 'FREQ': { + $content1 .= "FREQ=$rulevalue"; + break; + } + case 'UNTIL': { + $content2 .= ";UNTIL="; + $content2 .= iCalUtilityFunctions::_format_date_time( $rulevalue ); + break; + } + case 'COUNT': + case 'INTERVAL': + case 'WKST': { + $content2 .= ";$rulelabel=$rulevalue"; + break; + } + case 'BYSECOND': + case 'BYMINUTE': + case 'BYHOUR': + case 'BYMONTHDAY': + case 'BYYEARDAY': + case 'BYWEEKNO': + case 'BYMONTH': + case 'BYSETPOS': { + $content2 .= ";$rulelabel="; + if( is_array( $rulevalue )) { + foreach( $rulevalue as $vix => $valuePart ) { + $content2 .= ( $vix ) ? ',' : null; + $content2 .= $valuePart; + } + } + else + $content2 .= $rulevalue; + break; + } + case 'BYDAY': { + $content2 .= ";$rulelabel="; + $bydaycnt = 0; + foreach( $rulevalue as $vix => $valuePart ) { + $content21 = $content22 = null; + if( is_array( $valuePart )) { + $content2 .= ( $bydaycnt ) ? ',' : null; + foreach( $valuePart as $vix2 => $valuePart2 ) { + if( 'DAY' != strtoupper( $vix2 )) + $content21 .= $valuePart2; + else + $content22 .= $valuePart2; + } + $content2 .= $content21.$content22; + $bydaycnt++; + } + else { + $content2 .= ( $bydaycnt ) ? ',' : null; + if( 'DAY' != strtoupper( $vix )) + $content21 .= $valuePart; + else { + $content22 .= $valuePart; + $bydaycnt++; + } + $content2 .= $content21.$content22; + } + } + break; + } + default: { + $content2 .= ";$rulelabel=$rulevalue"; + break; + } + } + } + $output .= $this->_createElement( $recurlabel, $attributes, $content1.$content2 ); + } + return $output; + } +/** + * check if property not exists within component + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-15 + * @param string $propName + * @return bool + */ + function _notExistProp( $propName ) { + if( empty( $propName )) return FALSE; // when deleting x-prop, an empty propName may be used=allowed + $propName = strtolower( $propName ); + if( 'last-modified' == $propName ) { if( !isset( $this->lastmodified )) return TRUE; } + elseif( 'percent-complete' == $propName ) { if( !isset( $this->percentcomplete )) return TRUE; } + elseif( 'recurrence-id' == $propName ) { if( !isset( $this->recurrenceid )) return TRUE; } + elseif( 'related-to' == $propName ) { if( !isset( $this->relatedto )) return TRUE; } + elseif( 'request-status' == $propName ) { if( !isset( $this->requeststatus )) return TRUE; } + elseif(( 'x-' != substr($propName,0,2)) && !isset( $this->$propName )) return TRUE; + return FALSE; + } +/*********************************************************************************/ +/*********************************************************************************/ +/** + * get general component config variables or info about subcomponents + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-27 + * @param mixed $config + * @return value + */ + function getConfig( $config = FALSE) { + if( !$config ) { + $return = array(); + $return['ALLOWEMPTY'] = $this->getConfig( 'ALLOWEMPTY' ); + $return['FORMAT'] = $this->getConfig( 'FORMAT' ); + if( FALSE !== ( $lang = $this->getConfig( 'LANGUAGE' ))) + $return['LANGUAGE'] = $lang; + $return['NEWLINECHAR'] = $this->getConfig( 'NEWLINECHAR' ); + $return['UNIQUE_ID'] = $this->getConfig( 'UNIQUE_ID' ); + return $return; + } + switch( strtoupper( $config )) { + case 'ALLOWEMPTY': + return $this->allowEmpty; + break; + case 'COMPSINFO': + unset( $this->compix ); + $info = array(); + if( isset( $this->components )) { + foreach( $this->components as $cix => $component ) { + if( empty( $component )) continue; + unset( $component->propix ); + $info[$cix]['ordno'] = $cix + 1; + $info[$cix]['type'] = $component->objName; + $info[$cix]['uid'] = $component->getProperty( 'uid' ); + $info[$cix]['props'] = $component->getConfig( 'propinfo' ); + $info[$cix]['sub'] = $component->getConfig( 'compsinfo' ); + unset( $component->propix ); + } + } + return $info; + break; + case 'FORMAT': + return $this->format; + break; + case 'LANGUAGE': + // get language for calendar component as defined in [RFC 1766] + return $this->language; + break; + case 'NL': + case 'NEWLINECHAR': + return $this->nl; + break; + case 'PROPINFO': + $output = array(); + if( !in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) { + if( empty( $this->uid['value'] )) $this->_makeuid(); + $output['UID'] = 1; + } + if( !empty( $this->dtstamp )) $output['DTSTAMP'] = 1; + if( !empty( $this->summary )) $output['SUMMARY'] = 1; + if( !empty( $this->description )) $output['DESCRIPTION'] = count( $this->description ); + if( !empty( $this->dtstart )) $output['DTSTART'] = 1; + if( !empty( $this->dtend )) $output['DTEND'] = 1; + if( !empty( $this->due )) $output['DUE'] = 1; + if( !empty( $this->duration )) $output['DURATION'] = 1; + if( !empty( $this->rrule )) $output['RRULE'] = count( $this->rrule ); + if( !empty( $this->rdate )) $output['RDATE'] = count( $this->rdate ); + if( !empty( $this->exdate )) $output['EXDATE'] = count( $this->exdate ); + if( !empty( $this->exrule )) $output['EXRULE'] = count( $this->exrule ); + if( !empty( $this->action )) $output['ACTION'] = 1; + if( !empty( $this->attach )) $output['ATTACH'] = count( $this->attach ); + if( !empty( $this->attendee )) $output['ATTENDEE'] = count( $this->attendee ); + if( !empty( $this->categories )) $output['CATEGORIES'] = count( $this->categories ); + if( !empty( $this->class )) $output['CLASS'] = 1; + if( !empty( $this->comment )) $output['COMMENT'] = count( $this->comment ); + if( !empty( $this->completed )) $output['COMPLETED'] = 1; + if( !empty( $this->contact )) $output['CONTACT'] = count( $this->contact ); + if( !empty( $this->created )) $output['CREATED'] = 1; + if( !empty( $this->freebusy )) $output['FREEBUSY'] = count( $this->freebusy ); + if( !empty( $this->geo )) $output['GEO'] = 1; + if( !empty( $this->lastmodified )) $output['LAST-MODIFIED'] = 1; + if( !empty( $this->location )) $output['LOCATION'] = 1; + if( !empty( $this->organizer )) $output['ORGANIZER'] = 1; + if( !empty( $this->percentcomplete )) $output['PERCENT-COMPLETE'] = 1; + if( !empty( $this->priority )) $output['PRIORITY'] = 1; + if( !empty( $this->recurrenceid )) $output['RECURRENCE-ID'] = 1; + if( !empty( $this->relatedto )) $output['RELATED-TO'] = count( $this->relatedto ); + if( !empty( $this->repeat )) $output['REPEAT'] = 1; + if( !empty( $this->requeststatus )) $output['REQUEST-STATUS'] = count( $this->requeststatus ); + if( !empty( $this->resources )) $output['RESOURCES'] = count( $this->resources ); + if( !empty( $this->sequence )) $output['SEQUENCE'] = 1; + if( !empty( $this->sequence )) $output['SEQUENCE'] = 1; + if( !empty( $this->status )) $output['STATUS'] = 1; + if( !empty( $this->transp )) $output['TRANSP'] = 1; + if( !empty( $this->trigger )) $output['TRIGGER'] = 1; + if( !empty( $this->tzid )) $output['TZID'] = 1; + if( !empty( $this->tzname )) $output['TZNAME'] = count( $this->tzname ); + if( !empty( $this->tzoffsetfrom )) $output['TZOFFSETFROM'] = 1; + if( !empty( $this->tzoffsetto )) $output['TZOFFSETTO'] = 1; + if( !empty( $this->tzurl )) $output['TZURL'] = 1; + if( !empty( $this->url )) $output['URL'] = 1; + if( !empty( $this->xprop )) $output['X-PROP'] = count( $this->xprop ); + return $output; + break; + case 'UNIQUE_ID': + if( empty( $this->unique_id )) + $this->unique_id = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost'; + return $this->unique_id; + break; + } + } +/** + * general component config setting + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-12-12 + * @param mixed $config + * @param string $value + * @param bool $softUpdate + * @return void + */ + function setConfig( $config, $value = FALSE, $softUpdate = FALSE ) { + if( is_array( $config )) { + foreach( $config as $cKey => $cValue ) { + if( FALSE === $this->setConfig( $cKey, $cValue, $softUpdate )) + return FALSE; + } + return TRUE; + } + $res = FALSE; + switch( strtoupper( $config )) { + case 'ALLOWEMPTY': + $this->allowEmpty = $value; + $subcfg = array( 'ALLOWEMPTY' => $value ); + $res = TRUE; + break; + case 'FORMAT': + $value = trim( strtolower( $value )); + $this->format = $value; + $this->_createFormat(); + $subcfg = array( 'FORMAT' => $value ); + $res = TRUE; + break; + case 'LANGUAGE': + // set language for calendar component as defined in [RFC 1766] + $value = trim( $value ); + if( empty( $this->language ) || !$softUpdate ) + $this->language = $value; + $subcfg = array( 'LANGUAGE' => $value ); + $res = TRUE; + break; + case 'NL': + case 'NEWLINECHAR': + $this->nl = $value; + $subcfg = array( 'NL' => $value ); + $res = TRUE; + break; + case 'UNIQUE_ID': + $value = trim( $value ); + $this->unique_id = $value; + $subcfg = array( 'UNIQUE_ID' => $value ); + $res = TRUE; + break; + default: // any unvalid config key.. . + return TRUE; + } + if( !$res ) return FALSE; + if( isset( $subcfg ) && !empty( $this->components )) { + foreach( $subcfg as $cfgkey => $cfgvalue ) { + foreach( $this->components as $cix => $component ) { + $res = $component->setConfig( $cfgkey, $cfgvalue, $softUpdate ); + if( !$res ) + break 2; + $this->components[$cix] = $component->copy(); // PHP4 compliant + } + } + } + return $res; + } +/*********************************************************************************/ +/** + * delete component property value + * + * @author Kjell-Inge Gustafsson + * @since 2.6.4 - 2011-01-05 + * @param mixed $propName, bool FALSE => X-property + * @param int $propix, optional, if specific property is wanted in case of multiply occurences + * @return bool, if successfull delete TRUE + */ + function deleteProperty( $propName=FALSE, $propix=FALSE ) { + if( $this->_notExistProp( $propName )) return FALSE; + $propName = strtoupper( $propName ); + if( in_array( $propName, array( 'ATTACH', 'ATTENDEE', 'CATEGORIES', 'COMMENT', 'CONTACT', 'DESCRIPTION', 'EXDATE', 'EXRULE', + 'FREEBUSY', 'RDATE', 'RELATED-TO', 'RESOURCES', 'RRULE', 'REQUEST-STATUS', 'TZNAME', 'X-PROP' ))) { + if( !$propix ) + $propix = ( isset( $this->propdelix[$propName] ) && ( 'X-PROP' != $propName )) ? $this->propdelix[$propName] + 2 : 1; + $this->propdelix[$propName] = --$propix; + } + $return = FALSE; + switch( $propName ) { + case 'ACTION': + if( !empty( $this->action )) { + $this->action = ''; + $return = TRUE; + } + break; + case 'ATTACH': + return $this->deletePropertyM( $this->attach, $propix ); + break; + case 'ATTENDEE': + return $this->deletePropertyM( $this->attendee, $propix ); + break; + case 'CATEGORIES': + return $this->deletePropertyM( $this->categories, $propix ); + break; + case 'CLASS': + if( !empty( $this->class )) { + $this->class = ''; + $return = TRUE; + } + break; + case 'COMMENT': + return $this->deletePropertyM( $this->comment, $propix ); + break; + case 'COMPLETED': + if( !empty( $this->completed )) { + $this->completed = ''; + $return = TRUE; + } + break; + case 'CONTACT': + return $this->deletePropertyM( $this->contact, $propix ); + break; + case 'CREATED': + if( !empty( $this->created )) { + $this->created = ''; + $return = TRUE; + } + break; + case 'DESCRIPTION': + return $this->deletePropertyM( $this->description, $propix ); + break; + case 'DTEND': + if( !empty( $this->dtend )) { + $this->dtend = ''; + $return = TRUE; + } + break; + case 'DTSTAMP': + if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) + return FALSE; + if( !empty( $this->dtstamp )) { + $this->dtstamp = ''; + $return = TRUE; + } + break; + case 'DTSTART': + if( !empty( $this->dtstart )) { + $this->dtstart = ''; + $return = TRUE; + } + break; + case 'DUE': + if( !empty( $this->due )) { + $this->due = ''; + $return = TRUE; + } + break; + case 'DURATION': + if( !empty( $this->duration )) { + $this->duration = ''; + $return = TRUE; + } + break; + case 'EXDATE': + return $this->deletePropertyM( $this->exdate, $propix ); + break; + case 'EXRULE': + return $this->deletePropertyM( $this->exrule, $propix ); + break; + case 'FREEBUSY': + return $this->deletePropertyM( $this->freebusy, $propix ); + break; + case 'GEO': + if( !empty( $this->geo )) { + $this->geo = ''; + $return = TRUE; + } + break; + case 'LAST-MODIFIED': + if( !empty( $this->lastmodified )) { + $this->lastmodified = ''; + $return = TRUE; + } + break; + case 'LOCATION': + if( !empty( $this->location )) { + $this->location = ''; + $return = TRUE; + } + break; + case 'ORGANIZER': + if( !empty( $this->organizer )) { + $this->organizer = ''; + $return = TRUE; + } + break; + case 'PERCENT-COMPLETE': + if( !empty( $this->percentcomplete )) { + $this->percentcomplete = ''; + $return = TRUE; + } + break; + case 'PRIORITY': + if( !empty( $this->priority )) { + $this->priority = ''; + $return = TRUE; + } + break; + case 'RDATE': + return $this->deletePropertyM( $this->rdate, $propix ); + break; + case 'RECURRENCE-ID': + if( !empty( $this->recurrenceid )) { + $this->recurrenceid = ''; + $return = TRUE; + } + break; + case 'RELATED-TO': + return $this->deletePropertyM( $this->relatedto, $propix ); + break; + case 'REPEAT': + if( !empty( $this->repeat )) { + $this->repeat = ''; + $return = TRUE; + } + break; + case 'REQUEST-STATUS': + return $this->deletePropertyM( $this->requeststatus, $propix ); + break; + case 'RESOURCES': + return $this->deletePropertyM( $this->resources, $propix ); + break; + case 'RRULE': + return $this->deletePropertyM( $this->rrule, $propix ); + break; + case 'SEQUENCE': + if( !empty( $this->sequence )) { + $this->sequence = ''; + $return = TRUE; + } + break; + case 'STATUS': + if( !empty( $this->status )) { + $this->status = ''; + $return = TRUE; + } + break; + case 'SUMMARY': + if( !empty( $this->summary )) { + $this->summary = ''; + $return = TRUE; + } + break; + case 'TRANSP': + if( !empty( $this->transp )) { + $this->transp = ''; + $return = TRUE; + } + break; + case 'TRIGGER': + if( !empty( $this->trigger )) { + $this->trigger = ''; + $return = TRUE; + } + break; + case 'TZID': + if( !empty( $this->tzid )) { + $this->tzid = ''; + $return = TRUE; + } + break; + case 'TZNAME': + return $this->deletePropertyM( $this->tzname, $propix ); + break; + case 'TZOFFSETFROM': + if( !empty( $this->tzoffsetfrom )) { + $this->tzoffsetfrom = ''; + $return = TRUE; + } + break; + case 'TZOFFSETTO': + if( !empty( $this->tzoffsetto )) { + $this->tzoffsetto = ''; + $return = TRUE; + } + break; + case 'TZURL': + if( !empty( $this->tzurl )) { + $this->tzurl = ''; + $return = TRUE; + } + break; + case 'UID': + if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) + return FALSE; + if( !empty( $this->uid )) { + $this->uid = ''; + $return = TRUE; + } + break; + case 'URL': + if( !empty( $this->url )) { + $this->url = ''; + $return = TRUE; + } + break; + default: + $reduced = ''; + if( $propName != 'X-PROP' ) { + if( !isset( $this->xprop[$propName] )) return FALSE; + foreach( $this->xprop as $k => $a ) { + if(( $k != $propName ) && !empty( $a )) + $reduced[$k] = $a; + } + } + else { + if( count( $this->xprop ) <= $propix ) return FALSE; + $xpropno = 0; + foreach( $this->xprop as $xpropkey => $xpropvalue ) { + if( $propix != $xpropno ) + $reduced[$xpropkey] = $xpropvalue; + $xpropno++; + } + } + $this->xprop = $reduced; + if( empty( $this->xprop )) + return FALSE; + return TRUE; + } + return $return; + } +/*********************************************************************************/ +/** + * delete component property value, fixing components with multiple occurencies + * + * @author Kjell-Inge Gustafsson + * @since 2.6.19 - 2009-12-30 + * @param array $multiprop, reference to a component property + * @param int $propix, default 0 + * @return bool TRUE + */ + function deletePropertyM( & $multiprop, $propix=0 ) { + if( !isset( $multiprop[$propix])) return FALSE; + unset( $multiprop[$propix] ); + if( empty( $multiprop )) $multiprop = ''; + return ( isset( $multiprop[$propix] )) ? FALSE : TRUE; + } +/** + * get component property value/params + * + * if property has multiply values, consequtive function calls are needed + * + * @author Kjell-Inge Gustafsson + * @since 2.6.22 - 2010-10-21 + * @param string $propName, optional + * @param int @propix, optional, if specific property is wanted in case of multiply occurences + * @param bool $inclParam=FALSE + * @param bool $specform=FALSE + * @return mixed + */ + function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE, $specform=FALSE ) { + if( $this->_notExistProp( $propName )) return FALSE; + $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP'; + if( in_array( $propName, array( 'ATTACH', 'ATTENDEE', 'CATEGORIES', 'COMMENT', 'CONTACT', 'DESCRIPTION', 'EXDATE', 'EXRULE', + 'FREEBUSY', 'RDATE', 'RELATED-TO', 'RESOURCES', 'RRULE', 'REQUEST-STATUS', 'TZNAME', 'X-PROP' ))) { + if( !$propix ) + $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1; + $this->propix[$propName] = --$propix; + } + switch( $propName ) { + case 'ACTION': + if( !empty( $this->action['value'] )) return ( $inclParam ) ? $this->action : $this->action['value']; + break; + case 'ATTACH': + if( !isset( $this->attach[$propix] )) return FALSE; + return ( $inclParam ) ? $this->attach[$propix] : $this->attach[$propix]['value']; + break; + case 'ATTENDEE': + if( !isset( $this->attendee[$propix] )) return FALSE; + return ( $inclParam ) ? $this->attendee[$propix] : $this->attendee[$propix]['value']; + break; + case 'CATEGORIES': + if( !isset( $this->categories[$propix] )) return FALSE; + return ( $inclParam ) ? $this->categories[$propix] : $this->categories[$propix]['value']; + break; + case 'CLASS': + if( !empty( $this->class['value'] )) return ( $inclParam ) ? $this->class : $this->class['value']; + break; + case 'COMMENT': + if( !isset( $this->comment[$propix] )) return FALSE; + return ( $inclParam ) ? $this->comment[$propix] : $this->comment[$propix]['value']; + break; + case 'COMPLETED': + if( !empty( $this->completed['value'] )) return ( $inclParam ) ? $this->completed : $this->completed['value']; + break; + case 'CONTACT': + if( !isset( $this->contact[$propix] )) return FALSE; + return ( $inclParam ) ? $this->contact[$propix] : $this->contact[$propix]['value']; + break; + case 'CREATED': + if( !empty( $this->created['value'] )) return ( $inclParam ) ? $this->created : $this->created['value']; + break; + case 'DESCRIPTION': + if( !isset( $this->description[$propix] )) return FALSE; + return ( $inclParam ) ? $this->description[$propix] : $this->description[$propix]['value']; + break; + case 'DTEND': + if( !empty( $this->dtend['value'] )) return ( $inclParam ) ? $this->dtend : $this->dtend['value']; + break; + case 'DTSTAMP': + if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) + return; + if( !isset( $this->dtstamp['value'] )) + $this->_makeDtstamp(); + return ( $inclParam ) ? $this->dtstamp : $this->dtstamp['value']; + break; + case 'DTSTART': + if( !empty( $this->dtstart['value'] )) return ( $inclParam ) ? $this->dtstart : $this->dtstart['value']; + break; + case 'DUE': + if( !empty( $this->due['value'] )) return ( $inclParam ) ? $this->due : $this->due['value']; + break; + case 'DURATION': + if( !isset( $this->duration['value'] )) return FALSE; + $value = ( $specform && isset( $this->dtstart['value'] ) && isset( $this->duration['value'] )) ? iCalUtilityFunctions::_duration2date( $this->dtstart['value'], $this->duration['value'] ) : $this->duration['value']; + return ( $inclParam ) ? array( 'value' => $value, 'params' => $this->duration['params'] ) : $value; + break; + case 'EXDATE': + if( !isset( $this->exdate[$propix] )) return FALSE; + return ( $inclParam ) ? $this->exdate[$propix] : $this->exdate[$propix]['value']; + break; + case 'EXRULE': + if( !isset( $this->exrule[$propix] )) return FALSE; + return ( $inclParam ) ? $this->exrule[$propix] : $this->exrule[$propix]['value']; + break; + case 'FREEBUSY': + if( !isset( $this->freebusy[$propix] )) return FALSE; + return ( $inclParam ) ? $this->freebusy[$propix] : $this->freebusy[$propix]['value']; + break; + case 'GEO': + if( !empty( $this->geo['value'] )) return ( $inclParam ) ? $this->geo : $this->geo['value']; + break; + case 'LAST-MODIFIED': + if( !empty( $this->lastmodified['value'] )) return ( $inclParam ) ? $this->lastmodified : $this->lastmodified['value']; + break; + case 'LOCATION': + if( !empty( $this->location['value'] )) return ( $inclParam ) ? $this->location : $this->location['value']; + break; + case 'ORGANIZER': + if( !empty( $this->organizer['value'] )) return ( $inclParam ) ? $this->organizer : $this->organizer['value']; + break; + case 'PERCENT-COMPLETE': + if( !empty( $this->percentcomplete['value'] )) return ( $inclParam ) ? $this->percentcomplete : $this->percentcomplete['value']; + break; + case 'PRIORITY': + if( !empty( $this->priority['value'] )) return ( $inclParam ) ? $this->priority : $this->priority['value']; + break; + case 'RDATE': + if( !isset( $this->rdate[$propix] )) return FALSE; + return ( $inclParam ) ? $this->rdate[$propix] : $this->rdate[$propix]['value']; + break; + case 'RECURRENCE-ID': + if( !empty( $this->recurrenceid['value'] )) return ( $inclParam ) ? $this->recurrenceid : $this->recurrenceid['value']; + break; + case 'RELATED-TO': + if( !isset( $this->relatedto[$propix] )) return FALSE; + return ( $inclParam ) ? $this->relatedto[$propix] : $this->relatedto[$propix]['value']; + break; + case 'REPEAT': + if( !empty( $this->repeat['value'] )) return ( $inclParam ) ? $this->repeat : $this->repeat['value']; + break; + case 'REQUEST-STATUS': + if( !isset( $this->requeststatus[$propix] )) return FALSE; + return ( $inclParam ) ? $this->requeststatus[$propix] : $this->requeststatus[$propix]['value']; + break; + case 'RESOURCES': + if( !isset( $this->resources[$propix] )) return FALSE; + return ( $inclParam ) ? $this->resources[$propix] : $this->resources[$propix]['value']; + break; + case 'RRULE': + if( !isset( $this->rrule[$propix] )) return FALSE; + return ( $inclParam ) ? $this->rrule[$propix] : $this->rrule[$propix]['value']; + break; + case 'SEQUENCE': + if( isset( $this->sequence['value'] ) && ( '0' <= $this->sequence['value'] )) return ( $inclParam ) ? $this->sequence : $this->sequence['value']; + break; + case 'STATUS': + if( !empty( $this->status['value'] )) return ( $inclParam ) ? $this->status : $this->status['value']; + break; + case 'SUMMARY': + if( !empty( $this->summary['value'] )) return ( $inclParam ) ? $this->summary : $this->summary['value']; + break; + case 'TRANSP': + if( !empty( $this->transp['value'] )) return ( $inclParam ) ? $this->transp : $this->transp['value']; + break; + case 'TRIGGER': + if( !empty( $this->trigger['value'] )) return ( $inclParam ) ? $this->trigger : $this->trigger['value']; + break; + case 'TZID': + if( !empty( $this->tzid['value'] )) return ( $inclParam ) ? $this->tzid : $this->tzid['value']; + break; + case 'TZNAME': + if( !isset( $this->tzname[$propix] )) return FALSE; + return ( $inclParam ) ? $this->tzname[$propix] : $this->tzname[$propix]['value']; + break; + case 'TZOFFSETFROM': + if( !empty( $this->tzoffsetfrom['value'] )) return ( $inclParam ) ? $this->tzoffsetfrom : $this->tzoffsetfrom['value']; + break; + case 'TZOFFSETTO': + if( !empty( $this->tzoffsetto['value'] )) return ( $inclParam ) ? $this->tzoffsetto : $this->tzoffsetto['value']; + break; + case 'TZURL': + if( !empty( $this->tzurl['value'] )) return ( $inclParam ) ? $this->tzurl : $this->tzurl['value']; + break; + case 'UID': + if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) + return FALSE; + if( empty( $this->uid['value'] )) + $this->_makeuid(); + return ( $inclParam ) ? $this->uid : $this->uid['value']; + break; + case 'URL': + if( !empty( $this->url['value'] )) return ( $inclParam ) ? $this->url : $this->url['value']; + break; + default: + if( $propName != 'X-PROP' ) { + if( !isset( $this->xprop[$propName] )) return FALSE; + return ( $inclParam ) ? array( $propName, $this->xprop[$propName] ) + : array( $propName, $this->xprop[$propName]['value'] ); + } + else { + if( empty( $this->xprop )) return FALSE; + $xpropno = 0; + foreach( $this->xprop as $xpropkey => $xpropvalue ) { + if( $propix == $xpropno ) + return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] ) + : array( $xpropkey, $this->xprop[$xpropkey]['value'] ); + else + $xpropno++; + } + return FALSE; // not found ?? + } + } + return FALSE; + } +/** + * general component property setting + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-05 + * @param mixed $args variable number of function arguments, + * first argument is ALWAYS component name, + * second ALWAYS component value! + * @return void + */ + function setProperty() { + $numargs = func_num_args(); + if( 1 > $numargs ) return FALSE; + $arglist = func_get_args(); + if( $this->_notExistProp( $arglist[0] )) return FALSE; + if( !$this->getConfig( 'allowEmpty' ) && ( !isset( $arglist[1] ) || empty( $arglist[1] ))) + return FALSE; + $arglist[0] = strtoupper( $arglist[0] ); + for( $argix=$numargs; $argix < 12; $argix++ ) { + if( !isset( $arglist[$argix] )) + $arglist[$argix] = null; + } + switch( $arglist[0] ) { + case 'ACTION': + return $this->setAction( $arglist[1], $arglist[2] ); + case 'ATTACH': + return $this->setAttach( $arglist[1], $arglist[2], $arglist[3] ); + case 'ATTENDEE': + return $this->setAttendee( $arglist[1], $arglist[2], $arglist[3] ); + case 'CATEGORIES': + return $this->setCategories( $arglist[1], $arglist[2], $arglist[3] ); + case 'CLASS': + return $this->setClass( $arglist[1], $arglist[2] ); + case 'COMMENT': + return $this->setComment( $arglist[1], $arglist[2], $arglist[3] ); + case 'COMPLETED': + return $this->setCompleted( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] ); + case 'CONTACT': + return $this->setContact( $arglist[1], $arglist[2], $arglist[3] ); + case 'CREATED': + return $this->setCreated( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] ); + case 'DESCRIPTION': + return $this->setDescription( $arglist[1], $arglist[2], $arglist[3] ); + case 'DTEND': + return $this->setDtend( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] ); + case 'DTSTAMP': + return $this->setDtstamp( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] ); + case 'DTSTART': + return $this->setDtstart( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] ); + case 'DUE': + return $this->setDue( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] ); + case 'DURATION': + return $this->setDuration( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6] ); + case 'EXDATE': + return $this->setExdate( $arglist[1], $arglist[2], $arglist[3] ); + case 'EXRULE': + return $this->setExrule( $arglist[1], $arglist[2], $arglist[3] ); + case 'FREEBUSY': + return $this->setFreebusy( $arglist[1], $arglist[2], $arglist[3], $arglist[4] ); + case 'GEO': + return $this->setGeo( $arglist[1], $arglist[2], $arglist[3] ); + case 'LAST-MODIFIED': + return $this->setLastModified( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] ); + case 'LOCATION': + return $this->setLocation( $arglist[1], $arglist[2] ); + case 'ORGANIZER': + return $this->setOrganizer( $arglist[1], $arglist[2] ); + case 'PERCENT-COMPLETE': + return $this->setPercentComplete( $arglist[1], $arglist[2] ); + case 'PRIORITY': + return $this->setPriority( $arglist[1], $arglist[2] ); + case 'RDATE': + return $this->setRdate( $arglist[1], $arglist[2], $arglist[3] ); + case 'RECURRENCE-ID': + return $this->setRecurrenceid( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] ); + case 'RELATED-TO': + return $this->setRelatedTo( $arglist[1], $arglist[2], $arglist[3] ); + case 'REPEAT': + return $this->setRepeat( $arglist[1], $arglist[2] ); + case 'REQUEST-STATUS': + return $this->setRequestStatus( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5] ); + case 'RESOURCES': + return $this->setResources( $arglist[1], $arglist[2], $arglist[3] ); + case 'RRULE': + return $this->setRrule( $arglist[1], $arglist[2], $arglist[3] ); + case 'SEQUENCE': + return $this->setSequence( $arglist[1], $arglist[2] ); + case 'STATUS': + return $this->setStatus( $arglist[1], $arglist[2] ); + case 'SUMMARY': + return $this->setSummary( $arglist[1], $arglist[2] ); + case 'TRANSP': + return $this->setTransp( $arglist[1], $arglist[2] ); + case 'TRIGGER': + return $this->setTrigger( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8], $arglist[9], $arglist[10], $arglist[11] ); + case 'TZID': + return $this->setTzid( $arglist[1], $arglist[2] ); + case 'TZNAME': + return $this->setTzname( $arglist[1], $arglist[2], $arglist[3] ); + case 'TZOFFSETFROM': + return $this->setTzoffsetfrom( $arglist[1], $arglist[2] ); + case 'TZOFFSETTO': + return $this->setTzoffsetto( $arglist[1], $arglist[2] ); + case 'TZURL': + return $this->setTzurl( $arglist[1], $arglist[2] ); + case 'UID': + return $this->setUid( $arglist[1], $arglist[2] ); + case 'URL': + return $this->setUrl( $arglist[1], $arglist[2] ); + default: + return $this->setXprop( $arglist[0], $arglist[1], $arglist[2] ); + } + return FALSE; + } +/*********************************************************************************/ +/** + * parse component unparsed data into properties + * + * @author Kjell-Inge Gustafsson + * @since 2.6.33 - 2010-12-14 + * @param mixed $unparsedtext, optional, strict rfc2445 formatted, single property string or array of property strings + * @return bool FALSE if error occurs during parsing + * + */ + function parse( $unparsedtext=null ) { + if( $unparsedtext ) { + if( !is_array( $unparsedtext )) + $unparsedtext = array( $unparsedtext ); + } + elseif( !isset( $this->unparsed )) + $unparsedtext = array(); + else + $unparsedtext = $this->unparsed; + $this->unparsed = array(); + $comp = & $this; + foreach ( $unparsedtext as $line ) { +// echo $comp->objName.": $line
"; // test ### + if( in_array( strtoupper( substr( $line, 0, 6 )), array( 'END:VA', 'END:ST', 'END:DA' ))) + $this->components[] = $comp->copy(); + elseif( 'END:' == strtoupper( substr( $line, 0, 4 ))) + break; + elseif( 'BEGIN:VALARM' == strtoupper( substr( $line, 0, 12 ))) + $comp = new valarm(); + elseif( 'BEGIN:STANDARD' == strtoupper( substr( $line, 0, 14 ))) + $comp = new vtimezone( 'standard' ); + elseif( 'BEGIN:DAYLIGHT' == strtoupper( substr( $line, 0, 14 ))) + $comp = new vtimezone( 'daylight' ); + elseif( 'BEGIN:' == strtoupper( substr( $line, 0, 6 ))) + continue; + else { + $comp->unparsed[] = $line; +// echo $comp->objName.": $line
\n"; // test ### + } + } +// echo $this->objName.'
'.var_export( $this->unparsed, TRUE )."
\n"; // test ### + /* concatenate property values spread over several lines */ + $lastix = -1; + $propnames = array( 'action', 'attach', 'attendee', 'categories', 'comment', 'completed' + , 'contact', 'class', 'created', 'description', 'dtend', 'dtstart' + , 'dtstamp', 'due', 'duration', 'exdate', 'exrule', 'freebusy', 'geo' + , 'last-modified', 'location', 'organizer', 'percent-complete' + , 'priority', 'rdate', 'recurrence-id', 'related-to', 'repeat' + , 'request-status', 'resources', 'rrule', 'sequence', 'status' + , 'summary', 'transp', 'trigger', 'tzid', 'tzname', 'tzoffsetfrom' + , 'tzoffsetto', 'tzurl', 'uid', 'url', 'x-' ); + $proprows = array(); + foreach( $this->unparsed as $line ) { + $newProp = FALSE; + foreach ( $propnames as $propname ) { + if( $propname == strtolower( substr( $line, 0, strlen( $propname )))) { + $newProp = TRUE; + break; + } + } + if( $newProp ) { + $newProp = FALSE; + $lastix++; + $proprows[$lastix] = $line; + } + else { + /* remove line breaks */ + if(( 1 < strlen( $proprows[$lastix] )) && + ( '\n' == substr( $proprows[$lastix], -2 )) && + ( ' ' == substr( $line, 0, 1 ))) { + $proprows[$lastix] = substr( $proprows[$lastix], 0, strlen( $proprows[$lastix] ) - 2 ); + $line = substr( $line, 1 ); + } + $proprows[$lastix] .= $line; + } + } + /* parse each property 'line' */ + foreach( $proprows as $line ) { + $line = str_replace( "\n ", '', $line ); + if( '\n' == substr( $line, -2 )) + $line = substr( $line, 0, strlen( $line ) - 2 ); + /* get propname, (problem with x-properties, otherwise in previous loop) */ + $cix = $propname = null; + for( $cix=0, $clen = strlen( $line ); $cix < $clen; $cix++ ) { + if( in_array( $line[$cix], array( ':', ';' ))) + break; + else { + $propname .= $line[$cix]; + } + } + if(( 'x-' == substr( $propname, 0, 2 )) || ( 'X-' == substr( $propname, 0, 2 ))) { + $propname2 = $propname; + $propname = 'X-'; + } + /* rest of the line is opt.params and value */ + $line = substr( $line, $cix ); + /* separate attributes from value */ + $attr = array(); + $attrix = -1; + $clen = strlen( $line ); + for( $cix=0; $cix < $clen; $cix++ ) { + if(( ':' == $line[$cix] ) && + ( '://' != substr( $line, $cix, 3 )) && + ( !in_array( strtolower( substr( $line, $cix - 3, 4 )), array( 'fax:', 'cid:', 'sms:', 'tel:', 'urn:' ))) && + ( !in_array( strtolower( substr( $line, $cix - 4, 5 )), array( 'crid:', 'news:', 'pres:' ))) && + ( 'mailto:' != strtolower( substr( $line, $cix - 6, 7 )))) { + $attrEnd = TRUE; + if(( $cix < ( $clen - 4 )) && + ctype_digit( substr( $line, $cix+1, 4 ))) { // an URI with a (4pos) portnr?? + for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) { + if( '://' == substr( $line, $c2ix - 2, 3 )) { + $attrEnd = FALSE; + break; // an URI with a portnr!! + } + } + } + if( $attrEnd) { + $line = substr( $line, $cix + 1 ); + break; + } + } + if( ';' == $line[$cix] ) + $attr[++$attrix] = null; + else + $attr[$attrix] .= $line[$cix]; + } + /* make attributes in array format */ + $propattr = array(); + foreach( $attr as $attribute ) { + $attrsplit = explode( '=', $attribute, 2 ); + if( 1 < count( $attrsplit )) + $propattr[$attrsplit[0]] = $attrsplit[1]; + else + $propattr[] = $attribute; + } + /* call setProperty( $propname.. . */ + switch( strtoupper( $propname )) { + case 'ATTENDEE': + foreach( $propattr as $pix => $attr ) { + $attr2 = explode( ',', $attr ); + if( 1 < count( $attr2 )) + $propattr[$pix] = $attr2; + } + $this->setProperty( $propname, $line, $propattr ); + break; + case 'CATEGORIES': + case 'RESOURCES': + if( FALSE !== strpos( $line, ',' )) { + $content = explode( ',', $line ); + $clen = count( $content ); + for( $cix = 0; $cix < $clen; $cix++ ) { + if( "\\" == substr($content[$cix], -1)) { + $content[$cix] .= ','.$content[$cix + 1]; + unset($content[$cix + 1]); + $cix++; + } + } + if( 1 < count( $content )) { + $content = array_values( $content ); + foreach( $content as $cix => $contentPart ) + $content[$cix] = calendarComponent::_strunrep( $contentPart ); + $this->setProperty( $propname, $content, $propattr ); + break; + } + else + $line = reset( $content ); + } + case 'X-': + $propname = ( isset( $propname2 )) ? $propname2 : $propname; + case 'COMMENT': + case 'CONTACT': + case 'DESCRIPTION': + case 'LOCATION': + case 'SUMMARY': + if( empty( $line )) + $propattr = null; + $this->setProperty( $propname, calendarComponent::_strunrep( $line ), $propattr ); + unset( $propname2 ); + break; + case 'REQUEST-STATUS': + $values = explode( ';', $line, 3 ); + $values[1] = ( !isset( $values[1] )) ? null : calendarComponent::_strunrep( $values[1] ); + $values[2] = ( !isset( $values[2] )) ? null : calendarComponent::_strunrep( $values[2] ); + $this->setProperty( $propname + , $values[0] // statcode + , $values[1] // statdesc + , $values[2] // extdata + , $propattr ); + break; + case 'FREEBUSY': + $fbtype = ( isset( $propattr['FBTYPE'] )) ? $propattr['FBTYPE'] : ''; // force setting default, if missing + unset( $propattr['FBTYPE'] ); + $values = explode( ',', $line ); + foreach( $values as $vix => $value ) { + $value2 = explode( '/', $value ); + if( 1 < count( $value2 )) + $values[$vix] = $value2; + } + $this->setProperty( $propname, $fbtype, $values, $propattr ); + break; + case 'GEO': + $value = explode( ';', $line, 2 ); + if( 2 > count( $value )) + $value[1] = null; + $this->setProperty( $propname, $value[0], $value[1], $propattr ); + break; + case 'EXDATE': + $values = ( !empty( $line )) ? explode( ',', $line ) : null; + $this->setProperty( $propname, $values, $propattr ); + break; + case 'RDATE': + if( empty( $line )) { + $this->setProperty( $propname, $line, $propattr ); + break; + } + $values = explode( ',', $line ); + foreach( $values as $vix => $value ) { + $value2 = explode( '/', $value ); + if( 1 < count( $value2 )) + $values[$vix] = $value2; + } + $this->setProperty( $propname, $values, $propattr ); + break; + case 'EXRULE': + case 'RRULE': + $values = explode( ';', $line ); + $recur = array(); + foreach( $values as $value2 ) { + if( empty( $value2 )) + continue; // ;-char in ending position ??? + $value3 = explode( '=', $value2, 2 ); + $rulelabel = strtoupper( $value3[0] ); + switch( $rulelabel ) { + case 'BYDAY': { + $value4 = explode( ',', $value3[1] ); + if( 1 < count( $value4 )) { + foreach( $value4 as $v5ix => $value5 ) { + $value6 = array(); + $dayno = $dayname = null; + $value5 = trim( (string) $value5 ); + if(( ctype_alpha( substr( $value5, -1 ))) && + ( ctype_alpha( substr( $value5, -2, 1 )))) { + $dayname = substr( $value5, -2, 2 ); + if( 2 < strlen( $value5 )) + $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 )); + } + if( $dayno ) + $value6[] = $dayno; + if( $dayname ) + $value6['DAY'] = $dayname; + $value4[$v5ix] = $value6; + } + } + else { + $value4 = array(); + $dayno = $dayname = null; + $value5 = trim( (string) $value3[1] ); + if(( ctype_alpha( substr( $value5, -1 ))) && + ( ctype_alpha( substr( $value5, -2, 1 )))) { + $dayname = substr( $value5, -2, 2 ); + if( 2 < strlen( $value5 )) + $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 )); + } + if( $dayno ) + $value4[] = $dayno; + if( $dayname ) + $value4['DAY'] = $dayname; + } + $recur[$rulelabel] = $value4; + break; + } + default: { + $value4 = explode( ',', $value3[1] ); + if( 1 < count( $value4 )) + $value3[1] = $value4; + $recur[$rulelabel] = $value3[1]; + break; + } + } // end - switch $rulelabel + } // end - foreach( $values.. . + $this->setProperty( $propname, $recur, $propattr ); + break; + case 'ACTION': + case 'CLASSIFICATION': + case 'STATUS': + case 'TRANSP': + case 'UID': + case 'TZID': + case 'RELATED-TO': + case 'TZNAME': + $line = calendarComponent::_strunrep( $line ); + default: + $this->setProperty( $propname, $line, $propattr ); + break; + } // end switch( $propname.. . + } // end - foreach( $proprows.. . + unset( $unparsedtext, $this->unparsed, $proprows ); + if( isset( $this->components ) && is_array( $this->components ) && ( 0 < count( $this->components ))) { + $ckeys = array_keys( $this->components ); + foreach( $ckeys as $ckey ) { + if( !empty( $this->components[$ckey] ) && !empty( $this->components[$ckey]->unparsed )) { + $this->components[$ckey]->parse(); + } + } + } + return TRUE; + } +/*********************************************************************************/ +/*********************************************************************************/ +/** + * return a copy of this component + * + * @author Kjell-Inge Gustafsson + * @since 2.2.16 - 2007-11-07 + * @return object + */ + function copy() { + $serialized_contents = serialize( $this ); + $copy = unserialize( $serialized_contents ); + unset( $copy->propix ); + return $copy; + } +/*********************************************************************************/ +/*********************************************************************************/ +/** + * delete calendar subcomponent from component container + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-15 + * @param mixed $arg1 ordno / component type / component uid + * @param mixed $arg2 optional, ordno if arg1 = component type + * @return void + */ + function deleteComponent( $arg1, $arg2=FALSE ) { + if( !isset( $this->components )) return FALSE; + $argType = $index = null; + if ( ctype_digit( (string) $arg1 )) { + $argType = 'INDEX'; + $index = (int) $arg1 - 1; + } + elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) { + $argType = strtolower( $arg1 ); + $index = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0; + } + $cix2dC = 0; + foreach ( $this->components as $cix => $component) { + if( empty( $component )) continue; + unset( $component->propix ); + if(( 'INDEX' == $argType ) && ( $index == $cix )) { + unset( $this->components[$cix] ); + return TRUE; + } + elseif( $argType == $component->objName ) { + if( $index == $cix2dC ) { + unset( $this->components[$cix] ); + return TRUE; + } + $cix2dC++; + } + elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) { + unset( $this->components[$cix] ); + return TRUE; + } + } + return FALSE; + } +/** + * get calendar component subcomponent from component container + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-15 + * @param mixed $arg1 optional, ordno/component type/ component uid + * @param mixed $arg2 optional, ordno if arg1 = component type + * @return object + */ + function getComponent ( $arg1=FALSE, $arg2=FALSE ) { + if( !isset( $this->components )) return FALSE; + $index = $argType = null; + if ( !$arg1 ) { + $argType = 'INDEX'; + $index = $this->compix['INDEX'] = + ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1; + } + elseif ( ctype_digit( (string) $arg1 )) { + $argType = 'INDEX'; + $index = (int) $arg1; + unset( $this->compix ); + } + elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) { + unset( $this->compix['INDEX'] ); + $argType = strtolower( $arg1 ); + if( !$arg2 ) + $index = $this->compix[$argType] = ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1; + else + $index = (int) $arg2; + } + $index -= 1; + $ckeys = array_keys( $this->components ); + if( !empty( $index) && ( $index > end( $ckeys ))) + return FALSE; + $cix2gC = 0; + foreach( $this->components as $cix => $component ) { + if( empty( $component )) continue; + unset( $component->propix ); + if(( 'INDEX' == $argType ) && ( $index == $cix )) + return $component->copy(); + elseif( $argType == $component->objName ) { + if( $index == $cix2gC ) + return $component->copy(); + $cix2gC++; + } + elseif( !$argType && ( $arg1 == $component->getProperty( 'uid' ))) { + unset( $component->propix ); + return $component->copy(); + } + } + /* not found.. . */ + unset( $this->compix ); + return false; + } +/** + * add calendar component as subcomponent to container for subcomponents + * + * @author Kjell-Inge Gustafsson + * @since 1.x.x - 2007-04-24 + * @param object $component calendar component + * @return void + */ + function addSubComponent ( $component ) { + $this->setComponent( $component ); + } +/** + * create new calendar component subcomponent, already included within component + * + * @author Kjell-Inge Gustafsson + * @since 2.6.33 - 2011-01-03 + * @param string $compType subcomponent type + * @return object (reference) + */ + function & newComponent( $compType ) { + $config = $this->getConfig(); + $keys = array_keys( $this->components ); + $ix = end( $keys) + 1; + switch( strtoupper( $compType )) { + case 'ALARM': + case 'VALARM': + $this->components[$ix] = new valarm( $config ); + break; + case 'STANDARD': + array_unshift( $this->components, new vtimezone( 'STANDARD', $config )); + $ix = 0; + break; + case 'DAYLIGHT': + $this->components[$ix] = new vtimezone( 'DAYLIGHT', $config ); + break; + default: + return FALSE; + } + return $this->components[$ix]; + } +/** + * add calendar component as subcomponent to container for subcomponents + * + * @author Kjell-Inge Gustafsson + * @since 2.6.28 - 2011-01-01 + * @param object $component calendar component + * @param mixed $arg1 optional, ordno/component type/ component uid + * @param mixed $arg2 optional, ordno if arg1 = component type + * @return bool + */ + function setComponent( $component, $arg1=FALSE, $arg2=FALSE ) { + if( !isset( $this->components )) return FALSE; + $component->setConfig( $this->getConfig(), FALSE, TRUE ); + if( !in_array( $component->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) { + unset( $component->propix ); + /* make sure dtstamp and uid is set */ + $dummy = $component->getProperty( 'dtstamp' ); + $dummy = $component->getProperty( 'uid' ); + } + if( !$arg1 ) { // plain insert, last in chain + $this->components[] = $component->copy(); + return TRUE; + } + $argType = $index = null; + if ( ctype_digit( (string) $arg1 )) { // index insert/replace + $argType = 'INDEX'; + $index = (int) $arg1 - 1; + } + elseif( in_array( strtolower( $arg1 ), array( 'vevent', 'vtodo', 'vjournal', 'vfreebusy', 'valarm', 'vtimezone' ))) { + $argType = strtolower( $arg1 ); + $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0; + } + // else if arg1 is set, arg1 must be an UID + $cix2sC = 0; + foreach ( $this->components as $cix => $component2 ) { + if( empty( $component2 )) continue; + unset( $component2->propix ); + if(( 'INDEX' == $argType ) && ( $index == $cix )) { // index insert/replace + $this->components[$cix] = $component->copy(); + return TRUE; + } + elseif( $argType == $component2->objName ) { // component Type index insert/replace + if( $index == $cix2sC ) { + $this->components[$cix] = $component->copy(); + return TRUE; + } + $cix2sC++; + } + elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) { // UID insert/replace + $this->components[$cix] = $component->copy(); + return TRUE; + } + } + /* arg1=index and not found.. . insert at index .. .*/ + if( 'INDEX' == $argType ) { + $this->components[$index] = $component->copy(); + ksort( $this->components, SORT_NUMERIC ); + } + else /* not found.. . insert last in chain anyway .. .*/ + $this->components[] = $component->copy(); + return TRUE; + } +/** + * creates formatted output for subcomponents + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-12-12 + * @return string + */ + function createSubComponent() { + $output = null; + foreach( $this->components as $component ) { + if( empty( $component )) continue; + $component->setConfig( $this->getConfig(), FALSE, TRUE ); + $output .= $component->createComponent( $this->xcaldecl ); + } + return $output; + } +/********************************************************************************/ +/** + * break lines at pos 75 + * + * Lines of text SHOULD NOT be longer than 75 octets, excluding the line + * break. Long content lines SHOULD be split into a multiple line + * representations using a line "folding" technique. That is, a long + * line can be split between any two characters by inserting a CRLF + * immediately followed by a single linear white space character (i.e., + * SPACE, US-ASCII decimal 32 or HTAB, US-ASCII decimal 9). Any sequence + * of CRLF followed immediately by a single linear white space character + * is ignored (i.e., removed) when processing the content type. + * + * Edited 2007-08-26 by Anders Litzell, anders@litzell.se to fix bug where + * the reserved expression "\n" in the arg $string could be broken up by the + * folding of lines, causing ambiguity in the return string. + * Fix uses var $breakAtChar=75 and breaks the line at $breakAtChar-1 if need be. + * + * @author Kjell-Inge Gustafsson + * @since 2.6.13 - 2010-12-06 + * @param string $value + * @return string + */ + function _size75( $string ) { + $tmp = $string; + $string = null; + /* if PHP is config with mb_string.. . */ + if( defined( MB_OVERLOAD_STRING )) { + $strlen = mb_strlen( $tmp ); + while( $strlen > 75 ) { + $breakAtChar = 75; + if( substr( $tmp, ( $breakAtChar - 1 ), strlen( '\n' )) == '\n' ) + $breakAtChar = $breakAtChar - 1; + $string .= mb_substr( $tmp, 0, $breakAtChar ).$this->nl; + $tmp = ' '.mb_substr( $tmp, $breakAtChar ); + $strlen = mb_strlen( $tmp ); + } // end while + $string .= rtrim( $tmp ); // the rest + if( $this->nl != mb_substr( $string, ( 0 - strlen( $this->nl )))) + $string .= $this->nl; + return $string; + } + /* if PHP is not config with mb_string.. . */ + $eolcharlen = strlen( '\n' ); + $eolchrxlen = strlen( "\n" ); + while( TRUE ) { + $bytecnt = strlen( $tmp ); + $charCnt = $ix = 0; + for( $ix = 0; $ix < $bytecnt; $ix++ ) { + if(( 73 < $charCnt ) && ( '\n' == substr( $tmp, $ix, $eolcharlen ))) { + $ix += $eolcharlen; + break; // break when '\n' and eol + } + elseif( 74 < $charCnt ) + break; // always break for-loop here + else { + $byte = ord( $tmp[$ix] ); + if ($byte <= 127) { // add a one byte character + $string .= substr( $tmp, $ix, 1 ); + $charCnt += 1; + } + else if ($byte >= 194 && $byte <= 223) { // start byte in two byte character + $string .= substr( $tmp, $ix, 2 ); // add a two bytes character + $charCnt += 1; + } + else if ($byte >= 224 && $byte <= 239) { // start byte in three bytes character + $string .= substr( $tmp, $ix, 3 ); // add a three bytes character + $charCnt += 1; + } + else if ($byte >= 240 && $byte <= 244) { // start byte in four bytes character + $string .= substr( $tmp, $ix, 4 ); // add a four bytes character + $charCnt += 1; + } + } + } // end for + $string .= $this->nl; + $tmp = substr( $tmp, $ix ); + if( empty( $tmp )) + break; // while-loop breakes here + else + $tmp = ' '.$tmp; + } // end while + $string .= rtrim( $tmp ); // the rest + $string = str_replace( "\\\\n", "\\n", $string ); + if( $this->nl != substr( $string, ( 0 - strlen( $this->nl )))) + $string .= $this->nl; + return $string; + } +/** + * special characters management output + * + * @author Kjell-Inge Gustafsson + * @since 2.6.15 - 2010-09-24 + * @param string $string + * @return string + */ + function _strrep( $string ) { + switch( $this->format ) { + case 'xcal': + $string = str_replace( '\n', $this->nl, $string); + $string = htmlspecialchars( strip_tags( stripslashes( urldecode ( $string )))); + break; + default: + $pos = 0; + $specChars = array( 'n', 'N', 'r', ',', ';' ); + while( $pos <= strlen( $string )) { + $pos = strpos( $string, "\\", $pos ); + if( FALSE === $pos ) + break; + if( !in_array( substr( $string, $pos, 1 ), $specChars )) { + $string = substr( $string, 0, $pos )."\\".substr( $string, ( $pos + 1 )); + $pos += 1; + } + $pos += 1; + } + if( FALSE !== strpos( $string, '"' )) + $string = str_replace('"', "'", $string); + if( FALSE !== strpos( $string, ',' )) + $string = str_replace(',', '\,', $string); + if( FALSE !== strpos( $string, ';' )) + $string = str_replace(';', '\;', $string); + if( FALSE !== strpos( $string, "\r\n" )) + $string = str_replace( "\r\n", '\n', $string); + elseif( FALSE !== strpos( $string, "\r" )) + $string = str_replace( "\r", '\n', $string); + + elseif( FALSE !== strpos( $string, "\n" )) + $string = str_replace( "\n", '\n', $string); + + if( FALSE !== strpos( $string, '\N' )) + $string = str_replace( '\N', '\n', $string); +// if( FALSE !== strpos( $string, $this->nl )) + $string = str_replace( $this->nl, '\n', $string); + break; + } + return $string; + } +/** + * special characters management input (from iCal file) + * + * @author Kjell-Inge Gustafsson + * @since 2.6.22 - 2010-10-17 + * @param string $string + * @return string + */ + static function _strunrep( $string ) { + $string = str_replace( '\\\\', '\\', $string); + $string = str_replace( '\,', ',', $string); + $string = str_replace( '\;', ';', $string); +// $string = str_replace( '\n', $this->nl, $string); // ?? + return $string; + } +} +/*********************************************************************************/ +/*********************************************************************************/ +/** + * class for calendar component VEVENT + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-12 + */ +class vevent extends calendarComponent { + var $attach; + var $attendee; + var $categories; + var $comment; + var $contact; + var $class; + var $created; + var $description; + var $dtend; + var $dtstart; + var $duration; + var $exdate; + var $exrule; + var $geo; + var $lastmodified; + var $location; + var $organizer; + var $priority; + var $rdate; + var $recurrenceid; + var $relatedto; + var $requeststatus; + var $resources; + var $rrule; + var $sequence; + var $status; + var $summary; + var $transp; + var $url; + var $xprop; + // component subcomponents container + var $components; +/** + * constructor for calendar component VEVENT object + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-20 + * @param array $config + * @return void + */ + function vevent( $config = array()) { + $this->calendarComponent(); + + $this->attach = ''; + $this->attendee = ''; + $this->categories = ''; + $this->class = ''; + $this->comment = ''; + $this->contact = ''; + $this->created = ''; + $this->description = ''; + $this->dtstart = ''; + $this->dtend = ''; + $this->duration = ''; + $this->exdate = ''; + $this->exrule = ''; + $this->geo = ''; + $this->lastmodified = ''; + $this->location = ''; + $this->organizer = ''; + $this->priority = ''; + $this->rdate = ''; + $this->recurrenceid = ''; + $this->relatedto = ''; + $this->requeststatus = ''; + $this->resources = ''; + $this->rrule = ''; + $this->sequence = ''; + $this->status = ''; + $this->summary = ''; + $this->transp = ''; + $this->url = ''; + $this->xprop = ''; + + $this->components = array(); + + if( defined( 'ICAL_LANG' ) && !isset( $config['language'] )) + $config['language'] = ICAL_LANG; + if( !isset( $config['allowEmpty'] )) $config['allowEmpty'] = TRUE; + if( !isset( $config['nl'] )) $config['nl'] = PHP_EOL; + if( !isset( $config['format'] )) $config['format'] = 'iCal'; + if( !isset( $config['delimiter'] )) $config['delimiter'] = DIRECTORY_SEPARATOR; + $this->setConfig( $config ); + + } +/** + * create formatted output for calendar component VEVENT object instance + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-07 + * @param array $xcaldecl + * @return string + */ + function createComponent( &$xcaldecl ) { + $objectname = $this->_createFormat(); + $component = $this->componentStart1.$objectname.$this->componentStart2.$this->nl; + $component .= $this->createUid(); + $component .= $this->createDtstamp(); + $component .= $this->createAttach(); + $component .= $this->createAttendee(); + $component .= $this->createCategories(); + $component .= $this->createComment(); + $component .= $this->createContact(); + $component .= $this->createClass(); + $component .= $this->createCreated(); + $component .= $this->createDescription(); + $component .= $this->createDtstart(); + $component .= $this->createDtend(); + $component .= $this->createDuration(); + $component .= $this->createExdate(); + $component .= $this->createExrule(); + $component .= $this->createGeo(); + $component .= $this->createLastModified(); + $component .= $this->createLocation(); + $component .= $this->createOrganizer(); + $component .= $this->createPriority(); + $component .= $this->createRdate(); + $component .= $this->createRrule(); + $component .= $this->createRelatedTo(); + $component .= $this->createRequestStatus(); + $component .= $this->createRecurrenceid(); + $component .= $this->createResources(); + $component .= $this->createSequence(); + $component .= $this->createStatus(); + $component .= $this->createSummary(); + $component .= $this->createTransp(); + $component .= $this->createUrl(); + $component .= $this->createXprop(); + $component .= $this->createSubComponent(); + $component .= $this->componentEnd1.$objectname.$this->componentEnd2; + if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) { + foreach( $this->xcaldecl as $localxcaldecl ) + $xcaldecl[] = $localxcaldecl; + } + return $component; + } +} +/*********************************************************************************/ +/*********************************************************************************/ +/** + * class for calendar component VTODO + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-12 + */ +class vtodo extends calendarComponent { + var $attach; + var $attendee; + var $categories; + var $comment; + var $completed; + var $contact; + var $class; + var $created; + var $description; + var $dtstart; + var $due; + var $duration; + var $exdate; + var $exrule; + var $geo; + var $lastmodified; + var $location; + var $organizer; + var $percentcomplete; + var $priority; + var $rdate; + var $recurrenceid; + var $relatedto; + var $requeststatus; + var $resources; + var $rrule; + var $sequence; + var $status; + var $summary; + var $url; + var $xprop; + // component subcomponents container + var $components; +/** + * constructor for calendar component VTODO object + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-20 + * @param array $config + * @return void + */ + function vtodo( $config = array()) { + $this->calendarComponent(); + + $this->attach = ''; + $this->attendee = ''; + $this->categories = ''; + $this->class = ''; + $this->comment = ''; + $this->completed = ''; + $this->contact = ''; + $this->created = ''; + $this->description = ''; + $this->dtstart = ''; + $this->due = ''; + $this->duration = ''; + $this->exdate = ''; + $this->exrule = ''; + $this->geo = ''; + $this->lastmodified = ''; + $this->location = ''; + $this->organizer = ''; + $this->percentcomplete = ''; + $this->priority = ''; + $this->rdate = ''; + $this->recurrenceid = ''; + $this->relatedto = ''; + $this->requeststatus = ''; + $this->resources = ''; + $this->rrule = ''; + $this->sequence = ''; + $this->status = ''; + $this->summary = ''; + $this->url = ''; + $this->xprop = ''; + + $this->components = array(); + + if( defined( 'ICAL_LANG' ) && !isset( $config['language'] )) + $config['language'] = ICAL_LANG; + if( !isset( $config['allowEmpty'] )) $config['allowEmpty'] = TRUE; + if( !isset( $config['nl'] )) $config['nl'] = PHP_EOL; + if( !isset( $config['format'] )) $config['format'] = 'iCal'; + if( !isset( $config['delimiter'] )) $config['delimiter'] = DIRECTORY_SEPARATOR; + $this->setConfig( $config ); + + } +/** + * create formatted output for calendar component VTODO object instance + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-11-07 + * @param array $xcaldecl + * @return string + */ + function createComponent( &$xcaldecl ) { + $objectname = $this->_createFormat(); + $component = $this->componentStart1.$objectname.$this->componentStart2.$this->nl; + $component .= $this->createUid(); + $component .= $this->createDtstamp(); + $component .= $this->createAttach(); + $component .= $this->createAttendee(); + $component .= $this->createCategories(); + $component .= $this->createClass(); + $component .= $this->createComment(); + $component .= $this->createCompleted(); + $component .= $this->createContact(); + $component .= $this->createCreated(); + $component .= $this->createDescription(); + $component .= $this->createDtstart(); + $component .= $this->createDue(); + $component .= $this->createDuration(); + $component .= $this->createExdate(); + $component .= $this->createExrule(); + $component .= $this->createGeo(); + $component .= $this->createLastModified(); + $component .= $this->createLocation(); + $component .= $this->createOrganizer(); + $component .= $this->createPercentComplete(); + $component .= $this->createPriority(); + $component .= $this->createRdate(); + $component .= $this->createRelatedTo(); + $component .= $this->createRequestStatus(); + $component .= $this->createRecurrenceid(); + $component .= $this->createResources(); + $component .= $this->createRrule(); + $component .= $this->createSequence(); + $component .= $this->createStatus(); + $component .= $this->createSummary(); + $component .= $this->createUrl(); + $component .= $this->createXprop(); + $component .= $this->createSubComponent(); + $component .= $this->componentEnd1.$objectname.$this->componentEnd2; + if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) { + foreach( $this->xcaldecl as $localxcaldecl ) + $xcaldecl[] = $localxcaldecl; + } + return $component; + } +} +/*********************************************************************************/ +/*********************************************************************************/ +/** + * class for calendar component VJOURNAL + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-12 + */ +class vjournal extends calendarComponent { + var $attach; + var $attendee; + var $categories; + var $comment; + var $contact; + var $class; + var $created; + var $description; + var $dtstart; + var $exdate; + var $exrule; + var $lastmodified; + var $organizer; + var $rdate; + var $recurrenceid; + var $relatedto; + var $requeststatus; + var $rrule; + var $sequence; + var $status; + var $summary; + var $url; + var $xprop; +/** + * constructor for calendar component VJOURNAL object + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-20 + * @param array $config + * @return void + */ + function vjournal( $config = array()) { + $this->calendarComponent(); + + $this->attach = ''; + $this->attendee = ''; + $this->categories = ''; + $this->class = ''; + $this->comment = ''; + $this->contact = ''; + $this->created = ''; + $this->description = ''; + $this->dtstart = ''; + $this->exdate = ''; + $this->exrule = ''; + $this->lastmodified = ''; + $this->organizer = ''; + $this->rdate = ''; + $this->recurrenceid = ''; + $this->relatedto = ''; + $this->requeststatus = ''; + $this->rrule = ''; + $this->sequence = ''; + $this->status = ''; + $this->summary = ''; + $this->url = ''; + $this->xprop = ''; + + if( defined( 'ICAL_LANG' ) && !isset( $config['language'] )) + $config['language'] = ICAL_LANG; + if( !isset( $config['allowEmpty'] )) $config['allowEmpty'] = TRUE; + if( !isset( $config['nl'] )) $config['nl'] = PHP_EOL; + if( !isset( $config['format'] )) $config['format'] = 'iCal'; + if( !isset( $config['delimiter'] )) $config['delimiter'] = DIRECTORY_SEPARATOR; + $this->setConfig( $config ); + + } +/** + * create formatted output for calendar component VJOURNAL object instance + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-12 + * @param array $xcaldecl + * @return string + */ + function createComponent( &$xcaldecl ) { + $objectname = $this->_createFormat(); + $component = $this->componentStart1.$objectname.$this->componentStart2.$this->nl; + $component .= $this->createUid(); + $component .= $this->createDtstamp(); + $component .= $this->createAttach(); + $component .= $this->createAttendee(); + $component .= $this->createCategories(); + $component .= $this->createClass(); + $component .= $this->createComment(); + $component .= $this->createContact(); + $component .= $this->createCreated(); + $component .= $this->createDescription(); + $component .= $this->createDtstart(); + $component .= $this->createExdate(); + $component .= $this->createExrule(); + $component .= $this->createLastModified(); + $component .= $this->createOrganizer(); + $component .= $this->createRdate(); + $component .= $this->createRequestStatus(); + $component .= $this->createRecurrenceid(); + $component .= $this->createRelatedTo(); + $component .= $this->createRrule(); + $component .= $this->createSequence(); + $component .= $this->createStatus(); + $component .= $this->createSummary(); + $component .= $this->createUrl(); + $component .= $this->createXprop(); + $component .= $this->componentEnd1.$objectname.$this->componentEnd2; + if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) { + foreach( $this->xcaldecl as $localxcaldecl ) + $xcaldecl[] = $localxcaldecl; + } + return $component; + } +} +/*********************************************************************************/ +/*********************************************************************************/ +/** + * class for calendar component VFREEBUSY + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-12 + */ +class vfreebusy extends calendarComponent { + var $attendee; + var $comment; + var $contact; + var $dtend; + var $dtstart; + var $duration; + var $freebusy; + var $organizer; + var $requeststatus; + var $url; + var $xprop; + // component subcomponents container + var $components; +/** + * constructor for calendar component VFREEBUSY object + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-10 + * @param array $config + * @return void + */ + function vfreebusy( $config = array()) { + $this->calendarComponent(); + + $this->attendee = ''; + $this->comment = ''; + $this->contact = ''; + $this->dtend = ''; + $this->dtstart = ''; + $this->duration = ''; + $this->freebusy = ''; + $this->organizer = ''; + $this->requeststatus = ''; + $this->url = ''; + $this->xprop = ''; + + if( defined( 'ICAL_LANG' ) && !isset( $config['language'] )) + $config['language'] = ICAL_LANG; + if( !isset( $config['allowEmpty'] )) $config['allowEmpty'] = TRUE; + if( !isset( $config['nl'] )) $config['nl'] = PHP_EOL; + if( !isset( $config['format'] )) $config['format'] = 'iCal'; + if( !isset( $config['delimiter'] )) $config['delimiter'] = DIRECTORY_SEPARATOR; + $this->setConfig( $config ); + + } +/** + * create formatted output for calendar component VFREEBUSY object instance + * + * @author Kjell-Inge Gustafsson + * @since 2.3.1 - 2007-11-19 + * @param array $xcaldecl + * @return string + */ + function createComponent( &$xcaldecl ) { + $objectname = $this->_createFormat(); + $component = $this->componentStart1.$objectname.$this->componentStart2.$this->nl; + $component .= $this->createUid(); + $component .= $this->createDtstamp(); + $component .= $this->createAttendee(); + $component .= $this->createComment(); + $component .= $this->createContact(); + $component .= $this->createDtstart(); + $component .= $this->createDtend(); + $component .= $this->createDuration(); + $component .= $this->createFreebusy(); + $component .= $this->createOrganizer(); + $component .= $this->createRequestStatus(); + $component .= $this->createUrl(); + $component .= $this->createXprop(); + $component .= $this->componentEnd1.$objectname.$this->componentEnd2; + if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) { + foreach( $this->xcaldecl as $localxcaldecl ) + $xcaldecl[] = $localxcaldecl; + } + return $component; + } +} +/*********************************************************************************/ +/*********************************************************************************/ +/** + * class for calendar component VALARM + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-12 + */ +class valarm extends calendarComponent { + var $action; + var $attach; + var $attendee; + var $description; + var $duration; + var $repeat; + var $summary; + var $trigger; + var $xprop; +/** + * constructor for calendar component VALARM object + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-20 + * @param array $config + * @return void + */ + function valarm( $config = array()) { + $this->calendarComponent(); + + $this->action = ''; + $this->attach = ''; + $this->attendee = ''; + $this->description = ''; + $this->duration = ''; + $this->repeat = ''; + $this->summary = ''; + $this->trigger = ''; + $this->xprop = ''; + + if( defined( 'ICAL_LANG' ) && !isset( $config['language'] )) + $config['language'] = ICAL_LANG; + if( !isset( $config['allowEmpty'] )) $config['allowEmpty'] = TRUE; + if( !isset( $config['nl'] )) $config['nl'] = PHP_EOL; + if( !isset( $config['format'] )) $config['format'] = 'iCal'; + if( !isset( $config['delimiter'] )) $config['delimiter'] = DIRECTORY_SEPARATOR; + $this->setConfig( $config ); + + } +/** + * create formatted output for calendar component VALARM object instance + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-22 + * @param array $xcaldecl + * @return string + */ + function createComponent( &$xcaldecl ) { + $objectname = $this->_createFormat(); + $component = $this->componentStart1.$objectname.$this->componentStart2.$this->nl; + $component .= $this->createAction(); + $component .= $this->createAttach(); + $component .= $this->createAttendee(); + $component .= $this->createDescription(); + $component .= $this->createDuration(); + $component .= $this->createRepeat(); + $component .= $this->createSummary(); + $component .= $this->createTrigger(); + $component .= $this->createXprop(); + $component .= $this->componentEnd1.$objectname.$this->componentEnd2; + return $component; + } +} +/********************************************************************************** +/*********************************************************************************/ +/** + * class for calendar component VTIMEZONE + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-12 + */ +class vtimezone extends calendarComponent { + var $timezonetype; + + var $comment; + var $dtstart; + var $lastmodified; + var $rdate; + var $rrule; + var $tzid; + var $tzname; + var $tzoffsetfrom; + var $tzoffsetto; + var $tzurl; + var $xprop; + // component subcomponents container + var $components; +/** + * constructor for calendar component VTIMEZONE object + * + * @author Kjell-Inge Gustafsson + * @since 2.6.27 - 2010-11-20 + * @param mixed $timezonetype optional, default FALSE ( STANDARD / DAYLIGHT ) + * @param array $config + * @return void + */ + function vtimezone( $timezonetype=FALSE, $config = array()) { + if( is_array( $timezonetype )) { + $config = $timezonetype; + $timezonetype = FALSE; + } + if( !$timezonetype ) + $this->timezonetype = 'VTIMEZONE'; + else + $this->timezonetype = strtoupper( $timezonetype ); + $this->calendarComponent(); + + $this->comment = ''; + $this->dtstart = ''; + $this->lastmodified = ''; + $this->rdate = ''; + $this->rrule = ''; + $this->tzid = ''; + $this->tzname = ''; + $this->tzoffsetfrom = ''; + $this->tzoffsetto = ''; + $this->tzurl = ''; + $this->xprop = ''; + + $this->components = array(); + + if( defined( 'ICAL_LANG' ) && !isset( $config['language'] )) + $config['language'] = ICAL_LANG; + if( !isset( $config['allowEmpty'] )) $config['allowEmpty'] = TRUE; + if( !isset( $config['nl'] )) $config['nl'] = PHP_EOL; + if( !isset( $config['format'] )) $config['format'] = 'iCal'; + if( !isset( $config['delimiter'] )) $config['delimiter'] = DIRECTORY_SEPARATOR; + $this->setConfig( $config ); + + } +/** + * create formatted output for calendar component VTIMEZONE object instance + * + * @author Kjell-Inge Gustafsson + * @since 2.5.1 - 2008-10-25 + * @param array $xcaldecl + * @return string + */ + function createComponent( &$xcaldecl ) { + $objectname = $this->_createFormat(); + $component = $this->componentStart1.$objectname.$this->componentStart2.$this->nl; + $component .= $this->createTzid(); + $component .= $this->createLastModified(); + $component .= $this->createTzurl(); + $component .= $this->createDtstart(); + $component .= $this->createTzoffsetfrom(); + $component .= $this->createTzoffsetto(); + $component .= $this->createComment(); + $component .= $this->createRdate(); + $component .= $this->createRrule(); + $component .= $this->createTzname(); + $component .= $this->createXprop(); + $component .= $this->createSubComponent(); + $component .= $this->componentEnd1.$objectname.$this->componentEnd2; + if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) { + foreach( $this->xcaldecl as $localxcaldecl ) + $xcaldecl[] = $localxcaldecl; + } + return $component; + } +} +?> \ No newline at end of file diff --git a/iCalcreator/lgpl.txt b/iCalcreator/lgpl.txt new file mode 100644 index 0000000..5ab7695 --- /dev/null +++ b/iCalcreator/lgpl.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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.1 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. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/iCalcreator/releaseNotes-2.8.txt b/iCalcreator/releaseNotes-2.8.txt new file mode 100644 index 0000000..8e07fd8 --- /dev/null +++ b/iCalcreator/releaseNotes-2.8.txt @@ -0,0 +1,100 @@ +2.6.1 ###################### +config 'nl' default set to PHP_EOL +function vcalendar, parse + +2.6.2 ###################### /thanks, Simon L. +function selectComponents, select components with (latest) recurrence_id + +2.6.3 ###################### +function sort, refactored + +2.6.4 ###################### +function deleteProperty (removal of x-properties) + +2.6.5 ###################### +function getConfig, typo error + +2.6.6 ###################### +function setConfig, no longer creates file (on disc) when setting 'filename' + +2.6.7 ###################### /thanks Steve S. +using.html, typo errors + +2.6.8 ###################### +Updated calendar properties PRODID and VERSION + +2.6.9 ###################### +function createSequence, setSequence, getProperty, allow SEQUENCE '0' + +2.6.10 ###################### +function _format_duration, fix duration format, skip trailing ..0S, ..0M0S etc. + +2.6.11 ###################### +function (component) parse and management of all TEXT-properties + +2.6.12 ###################### /thanks Enrico T. +function _setMval, PHP error + +2.6.13 ###################### /thanks Ivar N. and Robert S. +function _size75, support for multibyte characters +alt. using mb_string, if installed and configured + +2.6.15 ###################### +function _strrep, eol character management + +2.6.19 ###################### +function deletePropertyM typo errror + +2.6.20 ###################### +function (component) parse, return value + +2.6.20 ###################### +function selectComponent, accepts DUE in vtodo if DTSTART is missing + +2.6.22 ###################### +utility (static) functions collected in support class, +iCalUtilityFunctions.class.php + +2.6.23 ###################### +function selectComponents, RDATE/EXDATE bug + +2.6.24 ###################### +function setDescription, force index=1 if NOT vjournal +DESCRIPTION MAY occur more than once only in VJOURNAL component + +2.6.25 ###################### +function makeDtstamp, bug in date creation + +2.6.26 ###################### +function setComponent, insert at index position + +2.6.27 ###################### +function setConfig, accepts array as single argument +function getConfig. returns array if called without arguments +create vcalendar/components and accept config array as argument + +2.6.28 ###################### /Damian R. +function setComponent, bugfix when using a short UID + +2.6.29 ###################### +function setOrganizer, value prefix (protocol) + +2.6.31 ###################### /thanks Nate +function _date_time_string, Time Zone incorrectly detected + +2.6.32 ###################### /thanks Mauro B. +function (calendar ) parse, removed argument filename, accepts string/array (calendar) + +2.6.33 ###################### +new function newComponent, factory-method for creating components + +2.6.34 ###################### +function setAttendee, setRdate, all TEXT-properties etc +property parameters in rfc 2445 order + +2.6.35 ###################### +function _date_time_string, bug when datetime ends with 'T000000Z' + +2.6.36 ###################### /thanks Greg L. +date_default_timezone_set is available from PHP 5.1.0, updated + diff --git a/iCalcreator/samples.php b/iCalcreator/samples.php new file mode 100644 index 0000000..6e6be6c --- /dev/null +++ b/iCalcreator/samples.php @@ -0,0 +1,275 @@ +\n
\n"; + +$v = new vcalendar( array( 'unique_id' => 'test.org' )); + // initiate new CALENDAR + +$e = & $v->newComponent( 'vevent' ); // initiate a new EVENT +$e->setProperty( 'categories' + , 'FAMILY' ); // catagorize +$e->setProperty( 'dtstart' + , 2006, 12, 24, 19, 30, 00 ); // 24 dec 2006 19.30 +$e->setProperty( 'duration' + , 0, 0, 3 ); // 3 hours +$e->setProperty( 'description' + , 'x-mas evening - diner' ); // describe the event +$e->setProperty( 'location' + , 'Home' ); // locate the event + +/* alt. production */ +// $v->returnCalendar(); // generate and redirect output to user browser + +/* alt. dev. and test */ +$str = $v->createCalendar(); // generate and get output in string, for testing? +echo $str; +echo "
\n\n"; + +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + +$v = new vcalendar( array( 'unique_id' => 'test.org' )); + // initiate new CALENDAR + +$v->setProperty( 'X-WR-CALNAME' + , 'Sample calendar' ); // set some X-properties, name, content.. . +$v->setProperty( 'X-WR-CALDESC' + , 'Description of the calendar' ); +$v->setProperty( 'X-WR-TIMEZONE' + , 'Europe/Stockholm' ); + +$e = & $v->newComponent( 'vevent' ); // initiate a new EVENT +$e->setProperty( 'categories' + , 'FAMILY' ); // catagorize +$e->setProperty( 'dtstart' + , 2007, 12, 24, 19, 30, 00 ); // 24 dec 2007 19.30 +$e->setProperty( 'duration' + , 0, 0, 3 ); // 3 hours +$e->setProperty( 'description' + , 'x-mas evening - diner' ); // describe the event +$e->setProperty( 'location' + , 'Home' ); // locate the event + +$a = & $e->newComponent( 'valarm' ); // initiate ALARM +$a->setProperty( 'action' + , 'DISPLAY' ); // set what to do +$a->setProperty( 'description' + , 'Buy X-mas gifts' ); // describe alarm +$a->setProperty( 'trigger' + , array( 'week' => 1 )); // set trigger one week before + +/* alt. production */ +// $v->returnCalendar(); // generate and redirect output to user browser +/* alt. dev. and test */ +$str = $v->createCalendar(); // generate and get output in string, for testing? +echo $str; +echo "
\n\n"; + +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +/* define timezone */ +$v = new vcalendar( array( 'unique_id' => 'test.org' )); +$t = & $v->newComponent( 'vtimezone' ); +$t->setProperty( 'tzid' + , 'US-Eastern'); +$t->setProperty( 'last-modified' + , 1987, 1, 1 ); + +$ts = & $t->newComponent( 'standard' ); // initiate timezone standard +$ts->setProperty( 'dtstart' + , 1997, 10, 26, 2 ); +$rdate1 = array ( 'year' => 1997, 'month' => 10, 'day' => 26, 'hour' => 02, 'min' => 0, 'sec' => 0 ); +$ts->setProperty( 'rdate' + , array( $rdate1 )); +$ts->setProperty( 'tzoffsetfrom' + , '-0400' ); +$ts->setProperty( 'tzoffsetto' + , '-0500' ); +$ts->setProperty( 'tzname' + , 'EST' ); + +$td = & $t->newComponent( 'daylight' ); // initiate timezone daylight +$td->setProperty( 'dtstart' + , 1997, 10, 26, 2 ); +$rdate1 = array ( 'year' => 1997, 'month' => 4, 'day' => 6, 'hour' => 02, 'min' => 0, 'sec' => 0 ); +$td->setProperty( 'rdate' + , array( $rdate1 )); +$td->setProperty( 'tzoffsetfrom' + , '-0500' ); +$td->setProperty( 'tzoffsetto' + , '-0400' ); +$td->setProperty( 'tzname' + , 'EDT' ); + +/* alt. production +$v->returnCalendar(); // generate and redirect output to user browser +*/ +/* alt. dev. and test */ +$str = $v->createCalendar(); // generate and get output in string, for testing? +echo $str; +echo "
\n\n"; + +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + +/* + * Samples from RFC2445, all output as strings to display + */ + +/* + * Example: The following is an example of the "VEVENT" calendar + * component used to represent a meeting that will also be opaque to + * searches for busy time: + * BEGIN:VEVENT + * UID:19970901T130000Z-123401@host.com + * DTSTAMP:19970901T1300Z + * DTSTART:19970903T163000Z + * DTEND:19970903T190000Z + * SUMMARY:Annual Employee Review + * CLASS:PRIVATE + * CATEGORIES:BUSINESS,HUMAN RESOURCES + * END:VEVENT + */ +$c = new vcalendar( array( 'unique_id' => 'test.org' )); +$e = & $c->newComponent( 'vevent' ); +$e->setProperty( 'dtstart' + , '19970901T163000Z' ); +$e->setProperty( 'dtend' + , '19970903T190000Z' ); +$e->setProperty( 'summary' + , 'Annual Employee Review' ); +$e->setProperty( 'class' + , 'PRIVATE' ); +$e->setProperty( 'categories' + , 'BUSINESS' ); +$e->setProperty( 'categories' + , 'HUMAN RESOURCES' ); + +$str = $c->createCalendar(); +echo $str; +echo "
\n\n"; +/* + * The following is an example of the "VEVENT" calendar component used + * to represent a reminder that will not be opaque, but rather + * transparent, to searches for busy time: + * + * BEGIN:VEVENT + * UID:19970901T130000Z-123402@host.com + * DTSTAMP:19970901T1300Z + * DTSTART:19970401T163000Z + * DTEND:19970402T010000Z + * SUMMARY:Laurel is in sensitivity awareness class. + * CLASS:PUBLIC + * CATEGORIES:BUSINESS,HUMAN RESOURCES + * TRANSP:TRANSPARENT + * END:VEVENT + */ + +$c = new vcalendar( array( 'unique_id' => 'test.org' )); +$e = & $c->newComponent( 'vevent' ); +$e->setProperty( 'dtstart' + , '19970401T163000Z' ); +$e->setProperty( 'dtend' + , '19970402T010000Z' ); +$e->setProperty( 'summary' + , 'Laurel is in sensitivity awareness class.' ); +$e->setProperty( 'class' + , 'PUBLIC' ); +$e->setProperty( 'categories' + , 'BUSINESS' ); +$e->setProperty( 'categories' + , 'HUMAN RESOURCES' ); +$e->setProperty( 'transp' + , 'TRANSPARENT' ); +$str = $c->createCalendar(); +echo $str; +echo "
\n\n"; +/* + * The following is an example of the "VEVENT" calendar component used + * to represent an anniversary that will occur annually. Since it takes + * up no time, it will not appear as opaque in a search for busy time; + * no matter what the value of the "TRANSP" property indicates: + * + * BEGIN:VEVENT + * UID:19970901T130000Z-123403@host.com + * DTSTAMP:19970901T1300Z + * DTSTART:19971102 + * SUMMARY:Our Blissful Anniversary + * CLASS:CONFIDENTIAL + * CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION + * RRULE:FREQ=YEARLY + * END:VEVENT + */ + +$c = new vcalendar( array( 'unique_id' => 'test.org' )); +$e = & $c->newComponent( 'vevent' ); +$e->setProperty( 'dtstart' + , '19971102' ); +$e->setProperty( 'summary' + , 'Our Blissful Anniversary' ); +$e->setProperty( 'class' + , 'CONFIDENTIAL' ); +$e->setProperty( 'categories' + , 'ANNIVERSARY' ); +$e->setProperty( 'categories' + , 'PERSONAL' ); +$e->setProperty( 'categories' + , 'SPECIAL OCCASION' ); +$e->setProperty( 'rrule' + , array( 'FREQ' => 'YEARLY' )); + +$str = $c->createCalendar(); +echo $str; +echo "
\n\n"; +/* + * BEGIN:VTODO + * UID:19970901T130000Z-123404@host.com + * DTSTAMP:19970901T1300Z + * DTSTART:19970415T133000Z + * DUE:19970416T045959Z + * SUMMARY:1996 Income Tax Preparation + * CLASS:CONFIDENTIAL + * CATEGORIES:FAMILY,FINANCE + * PRIORITY:1 + * STATUS:NEEDS-ACTION + * END:VTODO + */ +$c = new vcalendar( array( 'unique_id' => 'test.org' )); +$t = & $c->newComponent( 'vtodo' ); +$t->setProperty( 'dtstart' + , '19970415T133000 GMT' ); +$t->setProperty( 'due' + , '19970416T045959 GMT' ); +$t->setProperty( 'summary' + , '1996 Income Tax Preparation' ); +$t->setProperty( 'class' + , 'CONFIDENTIAL' ); +$t->setProperty( 'categories' + , 'FAMILY' ); +$t->setProperty( 'categories' + , 'FINANCE' ); +$t->setProperty( 'priority' + , 1 ); +$t->setProperty( 'status' + , 'NEEDS-ACTION' ); + +$str = $c->createCalendar(); +echo $str; +?> \ No newline at end of file diff --git a/iCalcreator/summary.html b/iCalcreator/summary.html new file mode 100644 index 0000000..d55eb1d --- /dev/null +++ b/iCalcreator/summary.html @@ -0,0 +1,263 @@ + + + +iCalcreator 2.8 summary + + + + + + + +

iCalcreator 2.8

+iCalcreator class v2.8
+copyright (c) 2007-2011 Kjell-Inge Gustafsson, kigkonsult
+www.kigkonsult.se/iCalcreator
+ical@kigkonsult.se
+
+iCalcreator is a PHP class managing iCal formatted files for non-calendar +systems like CMS, project management systems and other applications able +to process calendar information like agendas, tasks, reports, totos, +journaling data and for communication with calendar systems and applications. +

+This is a short summary how to use iCalcreator; create, parse, edit, select and output functionality. +

+iCalcreator is built of a class file with support of a function class file and are calendar component property oriented. +Development environment is PHP version 5.x but coding is done to meet 4.x backward compatibility and may work. +

iCal

+A short iCal description is found at Wikipedia. If You are not familiar with iCal, read this first!
+Knowledge of calendar protocol rfc2445/rfc2446 is to recommend;
+rfc2445 + - Internet Calendaring and Scheduling Core Object Specification (iCalendar)
+rfc2446 + - iCalendar Transport-Independent Interoperability Protocol (iTIP) Scheduling Events, BusyTime, To-dos and Journal Entries
+All functions calls are made as simple as possible BUT (, !!!,) read these rfc's properly!
+

Downloads

+Download +complete manual +and +coding samples. +from www.kigkonsult.se/iCalcreator. +

INSTALL

+Unpack to any folder
+- add this folder to your include-path
+- or unpack to your application-(include)-folder
+Add "require_once [folder/]iCalcreator.class.php;" to your php-script. +
+
+If using php version 5.1 or higher, the default timezone need to be set/altered, now "Europe/Stockholm", +line 50 in the iCalcreator.class.php file. +
+When creating a new calendar/component instance, review config settings. + +

CREATE

+ +

require_once( 'iCalcreator.class.php' ); +$config = array( 'unique_id' => 'icaldomain.com' ); // set Your unique id +$v = new vcalendar( $config ); // create a new calendar instance + +$v->setProperty( 'method', 'PUBLISH' ); // required of some calendar software +$v->setProperty( "x-wr-calname", "Calendar Sample" ); // required of some calendar software +$v->setProperty( "X-WR-CALDESC", "Calendar Description" ); // required of some calendar software +$v->setProperty( "X-WR-TIMEZONE", "Europe/Stockholm" ); // required of some calendar software +.. . +$vevent = & $v->newComponent( 'vevent' ); // create an event calendar component +$vevent->setProperty( 'dtstart', array( 'year'=>2007, 'month'=>4, 'day'=>1, 'hour'=>19, 'min'=>0, 'sec'=>0 )); +$vevent->setProperty( 'dtend', array( 'year'=>2007, 'month'=>4, 'day'=>1, 'hour'=>22, 'min'=>30, 'sec'=>0 )); +$vevent->setProperty( 'LOCATION', 'Central Placa' ); // property name - case independent +$vevent->setProperty( 'summary', 'PHP summit' ); +$vevent->setProperty( 'description', 'This is a description' ); +$vevent->setProperty( 'comment', 'This is a comment' ); +$vevent->setProperty( 'attendee', 'attendee1@icaldomain.net' ); +.. . +$vevent = & $v->newComponent( 'vevent' ); // create next event calendar component +$vevent->setProperty( 'dtstart', '20070401', array('VALUE' => 'DATE'));// alt. date format, now for an all-day event +$vevent->setProperty( "organizer" , 'boss@icaldomain.com' ); +$vevent->setProperty( 'summary', 'ALL-DAY event' ); +$vevent->setProperty( 'description', 'This is a description for an all-day event' ); +$vevent->setProperty( 'resources', 'COMPUTER PROJECTOR' ); +$vevent->setProperty( 'rrule', array( 'FREQ' => 'WEEKLY', 'count' => 4));// weekly, four occasions +$vevent->parse( 'LOCATION:1CP Conference Room 4350' ); // supporting parse of strict rfc2445 formatted text +.. . +.. .// all calendar components are described in rfc2445 +.. .// a complete iCalcreator function list (ex. setProperty) in iCalcreator manual +.. . +$v->returnCalendar(); // redirect calendar file to browser +

+

PARSE

+

require_once( 'iCalcreator.class.php' ); +$config = array( 'unique_id', 'icaldomain.com' ); // set Your unique id, required if any component UID is missing +$v = new vcalendar( $config ); // create a new calendar instance + + /* start parse of local file */ +$config = array( 'directory' => 'calendar', 'filename' => 'file.ics' ); +$v->setConfig( $config ); // set directory and file name +$v->parse(); + + /* start parse of remote file */ +$v->setConfig( 'url', 'http://www.aDomain.net/file.ics' ); // iCalcreator also support parse from or write to remote files +$v->parse(); + +$v->setProperty( 'method', 'PUBLISH' ); // required of some calendar software +$v->setProperty( "x-wr-calname", "Calendar Sample" ); // required of some calendar software +$v->setProperty( "X-WR-CALDESC", "Calendar Description" ); // required of some calendar software +$v->setProperty( "X-WR-TIMEZONE", "Europe/Stockholm" ); // required of some calendar software + +.. . +$v->sort(); // ensure start date order +.. . +

+

EDIT

+

require_once( 'iCalcreator.class.php' ); +$config = array( 'unique_id' => 'icaldomain.com', 'directory' => 'calendar', 'filename' => 'file.ics' ); + // set Your unique id, import directory and file name +$v = new vcalendar( $config ); // create a new calendar instance + +$v->parse(); + +$v->setProperty( 'method', 'PUBLISH' ); // required of some calendar software +$v->setProperty( "x-wr-calname", "Calendar Sample" ); // required of some calendar software +$v->setProperty( "X-WR-CALDESC", "Calendar Description" ); // required of some calendar software +$v->setProperty( "X-WR-TIMEZONE", "Europe/Stockholm" ); // required of some calendar software + +while( $vevent = $v->getComponent( 'vevent' )) { // read events, one by one + $uid = $vevent->getProperty( 'uid' ); // uid required, one occurence (unique id/key for component) + .. . + $dtstart = $vevent->getProperty( 'dtstart' ); // dtstart required, one occurence + .. . + if( $description = $vevent->getProperty( 'description', 1 )) { // description optional, first occurence + .. . // edit the description + $vevent->setProperty( 'description', $description, FALSE, 1 ); // update/replace the description + } + while( $comment = $vevent->getProperty( 'comment' )) { // comment optional, may occur more than once + .. . // manage comments + } + .. . + while( $vevent->deleteProperty( 'attendee' )) + continue; // remove all ATTENDEE properties .. . + .. . + $v->setComponent ( $vevent, $uid ); // update/replace event in calendar with uid as key +} +.. . +.. .// a complete iCalcreator function list (ex. getProperty, deleteProperty) in iCalcreator manual +.. . +

+

SELECT

+

require_once( 'iCalcreator.class.php' ); +$config = array( 'unique_id' => 'icaldomain.com' ); // set Your unique id +$v = new vcalendar( $config ); // create a new calendar instance + +$v->setConfig( 'url', 'http://www.aDomain.net/file.ics' ); // iCalcreator also support remote files +$v->parse(); +$v->sort(); // ensure start date order + +$v->setProperty( 'method', 'PUBLISH' ); // required of some calendar software +$v->setProperty( "x-wr-calname", "Calendar Sample" ); // required of some calendar software +$v->setProperty( "X-WR-CALDESC", "Calendar Description" ); // required of some calendar software +$v->setProperty( "X-WR-TIMEZONE", "Europe/Stockholm" ); // required of some calendar software + +$eventArray = $v->selectComponents(); // select components occuring today + // (including components with recurrence pattern) +foreach( $eventArray as $year => $yearArray) { + foreach( $yearArray as $month => $monthArray ) { + foreach( $monthArray as $day => $dailyEventsArray ) { + foreach( $dailyEventsArray as $vevent ) { + $currddate = $event->getProperty( 'x-current-dtstart' ); + // if member of a recurrence set (2nd occurence etc) + // returns array( 'x-current-dtstart' + // , <(string) date("Y-m-d [H:i:s][timezone/UTC offset]")>) + $dtstart = $vevent->getProperty( 'dtstart' ); // dtstart required, one occurence, (orig. start date) + $summary = $vevent->getProperty( 'summary' ); + $description = $vevent->getProperty( 'description' ); + .. . + .. . +

+

OUTPUT

+

require_once( 'iCalcreator.class.php' ); +$config = array( 'unique_id' => 'icaldomain.com' ); // set Your unique id +$v = new vcalendar( $config ); // create a new calendar instance + +$v->setProperty( 'method', 'PUBLISH' ); // required of some calendar software +$v->setProperty( "x-wr-calname", "Calendar Sample" ); // required of some calendar software +$v->setProperty( "X-WR-CALDESC", "Calendar Description" ); // required of some calendar software +$v->setProperty( "X-WR-TIMEZONE", "Europe/Stockholm" ); // required of some calendar software +.. . +.. .// parse calendar file(s) and/or edit/create calendar components.. . +.. . +

+

// opt 1

+

.. . +$v->returnCalendar(); // redirect calendar file to browser +

+

// opt 2

+

.. . +$config = array( 'directory' => 'depot', 'filename' => 'calendar.ics' ); +$v->setConfig( $config ); // set output directory and file name +$v->saveCalendar(); // save calendar to (local) file +

+

// opt 3

+

.. . +$config = array( 'url' => 'http://www.aDomain.net/file.ics' ); +$v->setConfig( $config ); // set output url +$v->saveCalendar(); // save calendar to remote url +

+ +

COPYRIGHT AND LICENSE

+ +

Copyright

+iCalcreator class
+copyright (c) 2007-2011 Kjell-Inge Gustafsson, kigkonsult
+www.kigkonsult.se/iCalcreator
+ical@kigkonsult.se
+ +

License

+ +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.1 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. +

+You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +or download it here. +
+
+ + \ No newline at end of file diff --git a/images/accept-24.png b/images/accept-24.png new file mode 100644 index 0000000000000000000000000000000000000000..65ca043ee12627bd42bb6e8563fb73ed61e07d06 GIT binary patch literal 1696 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 P00000NkvXXu0mjfpFpSJ literal 0 HcmV?d00001 diff --git a/images/accept.png b/images/accept.png new file mode 100644 index 0000000000000000000000000000000000000000..ada57a9ae60ebccf4cf8f4fcb9523cffbc6c51d0 GIT binary patch literal 901 zcmV;01A6?4P)dCy7H)TT{LFKH{8ZL@ZD61C8Mkl_ujB9adZqJv$Wvbir}b(lh?Vj@yy zDnk@6=ob|fyNMvPxT#26S7&h_#@ZFqW~3%<(zI#pN#FFGvo{Bgm-o}*egDtz{BIA3 z_fBYJ*hNHfhb+r0HC=NVmpVd9M){3WdZE6yKJ<1x_xfWbJRe9DU?H*mDuKLMu!}dV|-2 z45dgg;18dCg;ra0C(CAY4q}9iMqdPei9Yrn>bnGIu^lD>ka-;?R*t=c9xG1%eKlLHJi06p~{2TaLg&ig2L! z6s`_-;ojO)S(C!Mxp*QTI6iRR_bl3v@&dwwIF^9`!V3(*8-ULmze9s9r&2v_z1v!>vKds9;V5t*Gna;{QRw;{mX?1CZ~d1BsJ;6n(zDN4 zc@z_~3WA>Vz1-CFWc2&)^<^GA6Y6#NdhtQr{O25oll>@?i?P#l6lP+<-QjNB9{dTF z7Bd{C1fGtKBe3jN%mDbGtS@USwZm;&i{&-ng3TWfMy{jWQjJFYawKP`ao|xKD&z<& zFAAI4iRXzp{GQGjmrkd9I{LS_SjiY>XcFFr(`c}-X6ft3{5aN!;2$Tz(QB-%DWepN z>_D74u&0rgkeo~g?nW;AhT>=0*i|MFvB~`-njGtl;OFrnoPFwr)11j~pQ;O}weP}; z(k(%5e0J`}e@s+Ipl8rHU zIgy+Q49)cUejW0$fT>py9`r+6Ldk{IAM8gZzo;{l$!xBvS)k_4l!HhTIjoV)zP}S)WN_kl zq-G<=TaoNUed!7`l&s2XirA5*)L&Iy^TteXpIlD}Av;8oFgvS;ojIKg(JVFWTv1W^ bj-CGpV^3H~a~vrn00000NkvXXu0mjfc^9ui literal 0 HcmV?d00001 diff --git a/images/add-16.png b/images/add-16.png new file mode 100644 index 0000000000000000000000000000000000000000..23d5bed776023cee0402e7c0b1649d57704e36d3 GIT binary patch literal 845 zcmV-T1G4;yP)|8WvWN;ij47sw?j7x|_Q?^be&3;f({(`?mg#x_uO;8OYpDlu%$EA zuI)_08kf3~5Dg=PhA~gC`Z^j=n`pc{F_|RbG;;=ff73Dh!F}Z_$ypIYvPFd)CkRH8 zFyS|%$E|674QDu1^om z4GRUdj@Jnc>8AE0x1B{bB>{*sgK2u=tYCmbPggZiClKOvf8L1Mc>^Ueqwlh>BOZwD zULZKQ<^0mts}}=$(CartQV3YWp={MNy}cH11r$v{jFOCmID|zO@7e(0U2iENX=Zoh zdqYWPs)R2-D`K>R1zT#_fa=^%9XAc{#FW^thTMNd>FUGgcaDkycR~r z0*-aUZOXa`9)tk2x67Y+FPAjnZVL=n#> zu3=(+9KBy0`0;ciK$fj#+;uPQB_I8E_=Vpypih@;Uyp`uE&B5G+cFGC1{PHlj<6W= zS`fYFY15za#6x?lbsdLZJ{6kwE6L?phe!F%I z+R$Fnl(x$&CBqZ7>xuLdc(S!g$4B2)LxiB?XpkT@#XxEBw1XG-{E>2I)@D;z{)O~B zo)&%;Y?xJ9D8FjJasZ=fh|j2)3u;gve;dR|q;OHnzb)OmjBRvPr4=V{w2_c(#EhJz z3nwlCl1SzJDWWMa$6FDKo&5VVC0d~|m964j)&k-*X3JE*Qa~D$hiALAh`ey8p2Xyz X@8?yrXY&hd00000NkvXXu0mjf$sm%K literal 0 HcmV?d00001 diff --git a/images/add-24.png b/images/add-24.png new file mode 100644 index 0000000000000000000000000000000000000000..c63af7f39062ad0d5b9f1c5f9afa617e7ada0d5d GIT binary patch literal 1393 zcmV-%1&;cOP)6#sqq-gdW-t$P6jF>D#QF+f0xI6@`_MgoI~JVHX0#Az@Rd1!=13>pF5Wz9XWWc(0uI%Mny0zW9+x2yOZ?9i(N7-nn;Up(HJ?A^;_ucdQ zO7P$GBIWg*1|<`6$@HuVN*19CS1)n*b}1G~#C7_!hVs3!0+2EE^B4}5`LFSd=ap&6 zoDyL2gfMb4M6j#^$AA_#hX!~50PdU*D{WVUzeglgP`}&%2f$F?mo;1e$-HtCJFQSg z(G)+jGbC`F0x3cuN(@4j{UHV(frZ1VMQ0nq?c;*%yzBpx`hP|_k_>>Qd~)Kd?2U8Q z7_hR~jTfE|(4f(PPXa&Y*l(iBeQpkI?L3-medsyo`T+{wq_O0u0ghyru4^f1@@;i`2UrSZ0n1X!LjE91h--A1x) zjV+!E!Ovnq;1Cj-q=ga{27@98Aw9gL2)qgqpqFW=?#))e1j$R(V06Xfo>+{Yc*SJWPJBO~JrsIuKc7cA0#c5DM25Ir@j|vcP z^_4{ds+S$edAnkZQ%y^^D+NwLn~;w3slQ^PevT?X@;9Q|x+LL@T}Xk|rB`dxT1VUY zptYJn$F)?|8wzLS`QfFvHrotPl*D|$S8xTBh5_sp;M>-v31^~ice+jR1UL)~aA^Ig zwV9+$)&**sWIm!0bhvmp1`}@|r4I@(W3pkkD);#A;Tub7(sSMYJX(7VYUf#Yclt^0 z%NphIl~~s_+EU>Qv6z}xjE#ARVdS#ojvT{-A+c_XC=uFe!MJTma^Y0R4p@acc!Ml3f z+xxRlA64A!N>>3k=O4ntNo$`8;D-GSjy?R40ubCB25?vX9VDrlFdu9*7Ks$O-e!U? zOvgepU|IGiq-nF_0T$)Gj&xltWuAZw*E-IPXi+yVxlSU;`QWE1`pcTCPPk{!1530` zkMFr`EYHm4(Cjv%$IFjyi(xu4|13@0%;9u2VSD|EIT*2U`ua6!x6`4siwNvDpNN`P zlx|76uw<(q{Q(Vb^=2eZ!Lj1gC@{qUS_hl3xo%zZT6E~>24E4qXovjUBX!VNoryH< zxR_qZ=vdtEH^JuT6CA%=_#=waXQ*<1%cSAh|-GL ztNHV#pQaH%t-)<~1_Vhn%DEzc7s_XCRORXir%?Iut5NoF2yogs1nDl4PIoG3aIT>0 zUq-I$uNUo1+gh;7s1~|WFu^UQJSoQzi)H%Qa9#3W1~JNUTO^>s=OnSnp zB+X|us2smAwIp+aiD>f;2orYHb14RZpw)*^L%$Mf?7s?G*+u;to(?n?z+;+Ac^%PS8~fPv4sYG{I}))SONY8M7L~y&{-FO00000NkvXXu0mjf-!+?f literal 0 HcmV?d00001 diff --git a/images/add.png b/images/add.png new file mode 100644 index 0000000000000000000000000000000000000000..7409ef332d2435c3fb43c879a80c9fcb5820f796 GIT binary patch literal 2017 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 Hu0mjf!zXq{ literal 0 HcmV?d00001 diff --git a/images/info.png b/images/info.png new file mode 100644 index 0000000000000000000000000000000000000000..4c665a4f0a10633d475480553f673bceb10f594a GIT binary patch literal 777 zcmV+k1NQuhP)2Rxem5IpiJG?3n;E5IYLG=}N_7!xQP~$15m*-)L}4Iw6GYKXN|*+M zrQQg2;YafWLX*(SCOWm5Ij3$qx3%qkdz?+|5kZ3BwVCn0t=d9> zXg}b{sq^mi!mCn2wiO<)hvb8p@nGcH=i{+zX0?nEnUu=nz%QHewz+DC05N_*@yYT* zU2a)gtS$o!HXcD@K&oKykY9lpz`5Xu5Yb=8#9%K*3^knu$O)8CrQMcVnOAbz-!{7& zSfB+lb%E{?5i}=eYtMzFuD3qA1IPT-bpqTA0KzF7^#$j`)A#LyOvYey3RDW6PG!iY z1S8P=BGA>`3R7PrWRtyl4L#%S8z0gkN-aC`%DA-LZ0NNNQ4$8)2kVl6&Pia{@Crsl zBjhFna^kG$`iMPs1J=Ivr%aFolxjoN8ck$eDpZ@c_%CnCV#3_S5LRZ4keT}-ag5&YGbu)2kHks7bO=lgU1AuDDys3k>KYjSBeJ)s zauOp}+N0$R`|Cd8#ba3%?*>FV*vg00000NkvXX Hu0mjf>jh(& literal 0 HcmV?d00001 diff --git a/images/logo_uds_bandeau.gif b/images/logo_uds_bandeau.gif new file mode 100644 index 0000000000000000000000000000000000000000..3132c13a75a91be0d8a555378ddcd370e6828b29 GIT binary patch literal 3391 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 >b8vY=(IPpDf^πLu6f#KcpaWJR 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 literal 0 HcmV?d00001 diff --git a/images/next.png b/images/next.png new file mode 100644 index 0000000000000000000000000000000000000000..24d94e830a33157c791a714ab60565f9aebf0d6e GIT binary patch literal 1349 zcmV-L1-kl)P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igW1 z5hpUz)>8fe00hNJL_t(Y$BmXrY+OYUhQIE9%e?W79pfwxORy4$m?T&sL1aOg9fCLj zVmSbU2ysD3zzKwekPrwFaRG!7%LNhO64na{5MqgR~3P>KRv+y>qK7QzA9w{sEjCZIv>H#~45ati_dLTsgtUF*b^@afC}s1eG>S9HCi`HZo8pNMcO68$YuDY#H6V z6&Q4YBP_pFU3>Se8OxRwo{3<>5F15c45)$}A*vYXaBXF94yn}(Z;}{|=9tFrEh~`x z84Iip=dbB&?_b&i$2nj!496j^oDj~Q*)m?5dm`Z}EBk=UEO1TRic4_iQUMPC&cO27 z3D2(W<>GnmXr3KYda4073J5yeQ4vhwDD|!axW*E-tuCLo1Vm5~)C-#XmVv7m&g9bh zT|9S19~-V*!onG)qdfTOz*yl)rHpYF6(O8G55n>)>#DPQf{tndo_jRU(L5&~87UG) zwU~|J+*3Pw=ceU6c>V%9LetXyS3IsQLA_w25L-T>$GS?j)Fg4LGC+1<7*r0+#K2nC zEkBu$Z(GGp{c~IU&2uIUix7)ohSzcgxk01MUD3IF0PqTe{76&s=1{BS*g48fP z%7c;G1dqM3jTb%}!bf2X&^IznSa>Y;2@oMaxDQRowm2ZSrOJ(Q&lyFYH5Eo{$oK@a z+hWc;eJ&f`|CV)6f57J7Mp0v0L>?X*!5^xjxhLKA5&3~1?>B%mN%gz#JD=|}VM2bW zhNKNN_n7)PT2644GBS}K%|m@0lY6L?!CJJDA+>QNtugxcLp!ulU+MrQZ|s)Z$PIDt z*~U0qfO&x+00m96Vtu4oSLldBo+INEs0ia=PbYk z0h%@nKANHUFYz92G{6h#;3m?Y?>`AVb!0zyFa7b$MJ7y^hTXj_(lnb)ykh~YVnk8z zQ4!MbKV*FS8?OMjAFJUg@Oootdzc>>S`*IcwYF5jMj-@6bu~rJz!-xuwy5MH__1N? zTVKx8!A%bXcTH`X(>48-xL|$UyLzCsaFq#WEdb*VOCrru^8JIPL!WEo=Py1){5`-I z$NQ>ijx&L4vB7|ApS8%ul`a%y;?S^+{ka3lo6nYSrUUo~KxWuI!U%fE00000NkvXX Hu0mjfSMp}6 literal 0 HcmV?d00001 diff --git a/images/previous.png b/images/previous.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b79aeec517f11788920581a3b6044a2bf80930 GIT binary patch literal 1388 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'."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''.NOMAPPLICATION.''."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; + +//debut du formulaire +echo '
'."\n"; + +//bandeaux de tete +logo(); +bandeau_tete(); +bandeau_titre(_("Make your polls")); +sous_bandeau(); + +echo '
'."\n"; + +echo '

'.NOMAPPLICATION.'
'. _("What is it about?") .'

'; +echo '

'. _("Making polls to schedule meetings or events, quickly and easily.
You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'

'."\n".'
'."\n"; + +echo '
'. _("Make a poll") .'' . + '' . + '' . _('Make a poll') . '' . + '
' . "\n"; + +echo '
'."\n"; +echo '

'."\n"; +echo '
'."\n"; +echo '
'."\n"; +//bandeau de pied +//sur_bandeau_pied(); +bandeau_pied(); + +echo ''."\n"; +echo ''."\n"; + + + +?> diff --git a/infos_sondage.php b/infos_sondage.php new file mode 100644 index 0000000..1348fa0 --- /dev/null +++ b/infos_sondage.php @@ -0,0 +1,201 @@ +|";',$_POST["titre"])){ + $erreur_injection_titre = true; + } + if (preg_match(';<|>|";',$_POST["nom"])){ + $erreur_injection_nom = true; + } + if (preg_match(';<|>|";',$_POST["commentaires"])){ + $erreur_injection_commentaires = true; + } + + // Si pas d'erreur dans l'adresse alors on change de page vers date ou autre + if ($_POST["titre"] && $_POST["nom"] && $_POST["adresse"] && + ! $erreur_adresse && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom ){ + if ($_POST["creation_sondage_date"]||$_POST["creation_sondage_date_x"]){ + header("Location:choix_date.php"); + exit(); + } + + if ($_POST["creation_sondage_autre"]||$_POST["creation_sondage_autre_x"]){ + header("Location:choix_autre.php"); + exit(); + } + } + + //En cas d'erreur, recuperation des variables deja entrées + if (empty($_POST["titre"]) || empty($_POST["adresse"]) || empty($_POST["nom"])) { + $_SESSION["titre"]=$_POST["titre"]; + $_SESSION["nom"]=$_POST["nom"]; + $_SESSION["adresse"]=$_POST["adresse"]; + $_SESSION["commentaires"]=$_POST["commentaires"]; + } + +} + +//affichage de la page + +print_header(true); +echo ''."\n"; + +//affichage des bandeaux de tete +logo(); +bandeau_tete(); +echo '
'. _("Poll creation (1 on 2)") .'
'."\n"; +sous_bandeau(); + +// premier sondage ? test l'existence des schémas SQL avant d'aller plus loin +if(! check_table_sondage() ) { + echo '

' . + _("STUdS is not properly installed, please check the 'INSTALL' to setup the database before continuing") . + "

"."\n"; + bandeau_pied(); + echo ''."\n"; + echo ''."\n"; + die(); +} + +//debut du formulaire +echo '
'."\n"; + +echo '
'."\n"; +echo '
'. _("You are in the poll creation section.
Required fields cannot be left blank") .'

'."\n"; + +//Affichage des différents champs textes a remplir +echo ''."\n"; + +echo ''."\n"; +if (!$_SESSION["titre"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ + print ""."\n"; +} +elseif ($erreur_injection_titre){ + print "
"."\n"; +} +echo ''."\n"; +echo ''."\n"; +if ($erreur_injection_commentaires){ + print "
"."\n"; +} +echo ''."\n"; +echo ''."\n"; +else + echo ''."\n"; +if (!$_SESSION["nom"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ + print ""."\n"; +} +elseif ($erreur_injection_nom){ + print "
"."\n"; +} +echo ''."\n"; +echo ''."\n"; +else + echo ''."\n"; +if (!$_SESSION["adresse"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ + print ""."\n"; +} +elseif ($erreur_adresse&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ + print ""."\n"; +} + +echo ''."\n"; + +echo '
'. _("Poll title *: ") .'" . _("Enter a title") . "" . _("Characters < > and \" are not permitted") . "
'. _("Comments: ") .'" . _("Characters < > and \" are not permitted") . "
'. _("Your name*: ") .''; +if (isset($_SERVER['REMOTE_USER'])) + echo ''.$_SESSION["nom"].'" . _("Enter a name") . "" . _("Characters < > and \" are not permitted") . "
'. _("Your e-mail address *: ") .''; +if (isset($_SERVER['REMOTE_USER'])) + echo ''.$_SESSION["adresse"].'" . _("Enter an email address") . " " . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "
'."\n"; + +//focus javascript sur le premier champ +echo ''."\n"; + +echo '
'. _("The fields marked with * are required!") .'

'."\n"; + +#affichage du cochage par défaut +if (!$_SESSION["studsplus"]&&!$_POST["creation_sondage_date"]&&!$_POST["creation_sondage_autre"]&&!$_POST["creation_sondage_date_x"]&&!$_POST["creation_sondage_autre_x"]){$_SESSION["studsplus"]="+";} + +if ($_SESSION["studsplus"]=="+"){$cocheplus="checked";} +echo ''. _(" Voters can modify their vote themselves.") .'
'."\n"; +if ($_SESSION["mailsonde"]){$cochemail="checked";} +echo ''. _(" To receive an email for each new vote.") .'
'."\n"; + +//affichage des boutons pour choisir sondage date ou autre +echo '
'."\n"; +echo ' '."\n"; +echo ''."\n"; +echo ' '."\n"; +echo ''."\n"; +echo '
'. _("Schedule an event") .'
'. _("Make a choice") .'
'."\n"; +echo '


'."\n"; +echo '
'."\n"; +echo '
'."\n"; +//bandeau de pied +bandeau_pied(); +echo ''."\n"; +echo ''."\n"; +?> diff --git a/install.mysql.sql b/install.mysql.sql new file mode 100644 index 0000000..bd0f086 --- /dev/null +++ b/install.mysql.sql @@ -0,0 +1,89 @@ +CREATE TABLE IF NOT EXISTS `sondage` ( + `id_sondage` CHAR(16) NOT NULL, + `commentaires` text, + `mail_admin` VARCHAR(128), + `nom_admin` VARCHAR(64), + `titre` text, + `id_sondage_admin` CHAR(24), + `date_fin` TIMESTAMP, + `format` VARCHAR(2), + `mailsonde` BOOLEAN DEFAULT '0', + UNIQUE KEY (`id_sondage`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +-- +-- Name: sujet_studs; Type: TABLE; +-- + +CREATE TABLE IF NOT EXISTS `sujet_studs` ( + `id_sondage` CHAR(16) NOT NULL, + `sujet` TEXT, + FOREIGN KEY (`id_sondage`) REFERENCES sondage(id_sondage) on delete cascade +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +-- +-- Name: user_studs; Type: TABLE; +-- + +CREATE TABLE IF NOT EXISTS `user_studs` ( + `id_users` INT(11) unsigned NOT NULL AUTO_INCREMENT, + `nom` VARCHAR(64) NOT NULL, + `id_sondage` CHAR(16) NOT NULL, + `reponses` text NOT NULL, + PRIMARY KEY (`id_users`), + FOREIGN KEY (`id_sondage`) REFERENCES sondage(id_sondage) on delete cascade +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +-- +-- Name: comments; Type: TABLE; +-- + +CREATE TABLE IF NOT EXISTS `comments` ( + `id_comment` INT(11) unsigned NOT NULL AUTO_INCREMENT, + `id_sondage` CHAR(16) NOT NULL, + `comment` text NOT NULL, + `usercomment` text, + PRIMARY KEY (`id_comment`), + FOREIGN KEY (`id_sondage`) REFERENCES sondage(id_sondage) on delete cascade +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +-- +-- Data for Name: sondage; Type: TABLE DATA; +-- + +INSERT INTO `sondage` +(`id_sondage`, `commentaires`, `mail_admin`, `nom_admin`, + `titre`, `id_sondage_admin`, + `date_fin`, `format`) +VALUES +('aqg259dth55iuhwm','Repas de Noel du service','Stephanie@saillard.com','Stephanie', + 'Repas de Noel','aqg259dth55iuhwmy9d8jlwk', + FROM_UNIXTIME('1627100361'),'D+'); + +-- +-- Data for Name: sujet_studs; Type: TABLE DATA; +-- + +INSERT INTO `sujet_studs` (`id_sondage`, `sujet`) VALUES +('aqg259dth55iuhwm','1225839600@12h,1225839600@19h,1226012400@12h,1226012400@19h,1226876400@12h,1226876400@19h,1227049200@12h,1227049200@19h,1227826800@12h,1227826800@19h'); + +-- +-- Data for Name: user_studs; Type: TABLE DATA; +-- + +INSERT INTO `user_studs` (`nom`, `id_sondage`, `reponses`, `id_users`) VALUES +('marcel','aqg259dth55iuhwm','0110111101','933'), +('paul','aqg259dth55iuhwm','1011010111','935'), +('sophie','aqg259dth55iuhwm','1110110000','945'), +('barack','aqg259dth55iuhwm','0110000','948'), +('takashi','aqg259dth55iuhwm','0000110100','951'), +('albert','aqg259dth55iuhwm','1010110','975'), +('alfred','aqg259dth55iuhwm','0110010','1135'), +('marcs','aqg259dth55iuhwm','0100001010','1143'), +('laure','aqg259dth55iuhwm','0011000','1347'), +('benda','aqg259dth55iuhwm','1101101100','1667'), +('Albert','aqg259dth55iuhwm','1111110011','1668'); diff --git a/install.sql b/install.sql new file mode 100644 index 0000000..b02c955 --- /dev/null +++ b/install.sql @@ -0,0 +1,147 @@ +--========================================================================== +-- +--Université de Strasbourg - Direction Informatique +--Auteur : Guilhem BORGHESI +--Création : Février 2008 +-- +--borghesi@unistra.fr +-- +--Ce logiciel est régi par la licence CeCILL-B soumise au droit français et +--respectant les principes de diffusion des logiciels libres. Vous pouvez +--utiliser, modifier et/ou redistribuer ce programme sous les conditions +--de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +--sur le site "http://www.cecill.info". +-- +--Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +--pris connaissance de la licence CeCILL-B, et que vous en avez accepté les +--termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. +-- +--========================================================================== +-- +--Université de Strasbourg - Direction Informatique +--Author : Guilhem BORGHESI +--Creation : Feb 2008 +-- +--borghesi@unistra.fr +-- +--This software is governed by the CeCILL-B license under French law and +--abiding by the rules of distribution of free software. You can use, +--modify and/ or redistribute the software under the terms of the CeCILL-B +--license as circulated by CEA, CNRS and INRIA at the following URL +--"http://www.cecill.info". +-- +--The fact that you are presently reading this means that you have had +--knowledge of the CeCILL-B license and that you accept its terms. You can +--find a copy of this license in the file LICENSE. +-- +--========================================================================== + +-- +-- PostgreSQL database dump +-- + +-- +-- Name: sondage; Type: TABLE; +-- + +CREATE TABLE sondage ( + id_sondage text NOT NULL, + commentaires text, + mail_admin text, + nom_admin text, + titre text, + id_sondage_admin text, + date_fin text, + format text, + mailsonde text +); + + +-- +-- Name: sujet_studs; Type: TABLE; +-- + +CREATE TABLE sujet_studs ( + id_sondage text, + sujet text +); + + +-- +-- Name: user_studs; Type: TABLE; +-- + +CREATE TABLE user_studs ( + nom text, + id_sondage text, + reponses text, + id_users serial NOT NULL +); + + +-- +-- Name: comments; Type: TABLE; +-- + +CREATE TABLE comments ( + id_sondage text, + comment text, + usercomment text, + id_comment serial NOT NULL +); + +CREATE OR REPLACE FUNCTION from_unixtime(integer) RETURNS timestamp AS +'SELECT $1::abstime::timestamp without time zone AS result' LANGUAGE 'SQL'; + +-- +-- Data for Name: sondage; Type: TABLE DATA; +-- + +COPY sondage (id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) FROM stdin; +aqg259dth55iuhwm Repas de Noel du service Stephanie@saillard.com Stephanie Repas de Noel aqg259dth55iuhwmy9d8jlwk 1627100361 D+ +\. + + +-- +-- Data for Name: sujet_studs; Type: TABLE DATA; +-- + +COPY sujet_studs (id_sondage, sujet) FROM stdin; +aqg259dth55iuhwm 1225839600@12h,1225839600@19h,1226012400@12h,1226012400@19h,1226876400@12h,1226876400@19h,1227049200@12h,1227049200@19h,1227826800@12h,1227826800@19h +\. + + +-- +-- Data for Name: user_studs; Type: TABLE DATA; +-- + +COPY user_studs (nom, id_sondage, reponses, id_users) FROM stdin; +marcel aqg259dth55iuhwm 0110111101 933 +paul aqg259dth55iuhwm 1011010111 935 +sophie aqg259dth55iuhwm 1110110000 945 +barack aqg259dth55iuhwm 0110000 948 +takashi aqg259dth55iuhwm 0000110100 951 +albert aqg259dth55iuhwm 1010110 975 +alfred aqg259dth55iuhwm 0110010 1135 +marcs aqg259dth55iuhwm 0100001010 1143 +laure aqg259dth55iuhwm 0011000 1347 +benda aqg259dth55iuhwm 1101101100 1667 +Albert aqg259dth55iuhwm 1111110011 1668 +\. + + +-- +-- Name: sondage_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY sondage + ADD CONSTRAINT sondage_pkey PRIMARY KEY (id_sondage); + + +-- +-- Name: user_studs_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY user_studs + ADD CONSTRAINT user_studs_pkey PRIMARY KEY (id_users); + diff --git a/locale/de_DE/LC_MESSAGES/Studs.mo b/locale/de_DE/LC_MESSAGES/Studs.mo new file mode 100644 index 0000000000000000000000000000000000000000..87e4b0a94ee56eb514315313831af748be5977cc GIT binary patch literal 16852 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 literal 0 HcmV?d00001 diff --git a/locale/de_DE/LC_MESSAGES/Studs.po b/locale/de_DE/LC_MESSAGES/Studs.po new file mode 100644 index 0000000..fe3da6b --- /dev/null +++ b/locale/de_DE/LC_MESSAGES/Studs.po @@ -0,0 +1,754 @@ +msgid "" +msgstr "" +"Project-Id-Version: Studs 0.6.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-06-05 21:39+0100\n" +"PO-Revision-Date: 2010-06-05 21:39+0100\n" +"Last-Translator: Raphaël Droz \n" +"Language-Team: Guilhem Borghesi, Raphaël Droz\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: GERMANY\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-KeywordsList: _\n" +"X-Poedit-Basepath: /var/www/studs\n" +"X-Poedit-SearchPath-0: .\n" + +#: bandeaux.php:59 +msgid "Make your polls" +msgstr "Ihre Umfrage erstellen" + +#: bandeaux.php:62 +msgid "Poll dates (2 on 2)" +msgstr "Terminforschläge (2 / 2)" + +#: bandeaux.php:65 +msgid "Poll subjects (2 on 2)" +msgstr "Themaforschläge (2 / 2)" + +#: bandeaux.php:68 +msgid "Polls administrator" +msgstr "Datenbankadministrator" + +#: bandeaux.php:71 +msgid "Contact us" +msgstr "Kontakt" + +#: bandeaux.php:77 +msgid "Error!" +msgstr "Fehler!" + +#: bandeaux.php:80 +#: bandeaux.php:98 +msgid "About" +msgstr "Allgemeine Informationen" + +#: bandeaux.php:94 +#: bandeaux.php:108 +#: bandeaux.php:119 +msgid "Home" +msgstr "Startseite" + +#: bandeaux.php:95 +msgid "Example" +msgstr "Beispiel" + +#: bandeaux.php:96 +msgid "Contact" +msgstr "Kontakt" + +#: bandeaux.php:99 +msgid "Admin" +msgstr "Admin" + +#: bandeaux.php:109 +msgid "Logs" +msgstr "Logs" + +#: bandeaux.php:110 +msgid "Cleaning" +msgstr "Reinigung" + +#: bandeaux.php:129 +#: bandeaux.php:135 +msgid "Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009" +msgstr "Universität Strassburg. Autor : Guilhem BORGHESI. 2008-2009" + +#: creation_sondage.php:89 +msgid "For sending to the polled users" +msgstr "Für Verbreiterung an den Befragten" + +#: creation_sondage.php:89 +#: creation_sondage.php:90 +msgid "Poll" +msgstr "Umfrage" + +#: creation_sondage.php:89 +msgid "" +"This is the message you have to send to the people you want to poll. \n" +"Now, you have to send this message to everyone you want to poll." +msgstr "" +"Das ist die Botschaft die den Befragten gesendet werden soll. \n" +"Sie können jetzt diese Botschaft allen Personnen die an der Abstimmung teilnehmen könnten weitergeben." + +#: creation_sondage.php:89 +msgid "hast just created a poll called" +msgstr "hat eine betitelte Umfrage erstellt" + +#: creation_sondage.php:89 +msgid "Thanks for filling the poll at the link above" +msgstr "Bitte erkundigen Sie die Umfrage an dem folgende Weblink" + +#: creation_sondage.php:89 +#: creation_sondage.php:92 +msgid "Thanks for your confidence" +msgstr "Danke fur ihr vertrauen" + +#: creation_sondage.php:90 +msgid "Author's message" +msgstr "Fur den Autor reserviert" + +#: creation_sondage.php:91 +msgid "" +"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" +"\n" +"You can now modify it at the link above" +msgstr "" +"Diese Botschaft soll nicht weitergegeben werden, sie ist fur den Autor reserviert.\n" +"\n" +"Sie können diese Umfrage an dem folgenden Weblink ändern" + +#: choix_date.php:63 +#: choix_autre.php:62 +msgid "You haven't filled the first section of the poll creation." +msgstr "Die erste Seite wurde nicht ausgefullt" + +#: choix_date.php:64 +#: contacts.php:77 +#: studs.php:88 +#: choix_autre.php:63 +#: adminstuds.php:79 +#: adminstuds.php:1044 +msgid "Back to the homepage of " +msgstr "Kehren sie zur Startseite zurück " + +#: choix_date.php:220 +msgid "Select your dates amoung the free days (green). The selected days are in blue.
You can unselect a day previously selected by clicking again on it." +msgstr "Wählen sie ihr Termin unter den in grün angegebenen Tagen an. Die Felder erscheinen in blau wen sie ausgew heltsind.
Sie können ihre Wahl wiederufen in dem sie das Feld wiederauswählen." + +#: choix_date.php:233 +msgid "monday" +msgstr "Montag" + +#: choix_date.php:233 +msgid "tuesday" +msgstr "Dienstag" + +#: choix_date.php:233 +msgid "wednesday" +msgstr "Mittwoch" + +#: choix_date.php:233 +msgid "thursday" +msgstr "Donnerstag" + +#: choix_date.php:233 +msgid "friday" +msgstr "Freitag" + +#: choix_date.php:233 +msgid "saturday" +msgstr "Samstag" + +#: choix_date.php:233 +msgid "sunday" +msgstr "Sonntag" + +#: choix_date.php:485 +msgid "Selected days" +msgstr "Gewälhter Tag" + +#: choix_date.php:487 +msgid "For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." +msgstr "Für jeden ausgewählten Tag, haben Sie die Möglichkeit die Uhrzeit der Versammlung zu bestimmen in einem der folgenden Formaten :
- lehr, wenn Sie keine bestimmte Uhrzeit möchten,
- \"8h\", \"8H\" oder \"8:00\" um den Beginn der Versammlung vorzuschlagen,
- \"8-11\", \"8h-11h\", \"8H-11H\" oder \"8:00-11:00\" für eine Zeitspanne,
- \"8h15-11h15\", \"8H15-11H15\" oder \"8:15-11:15\" für ein Zeitspanne mit minuten." + +#: choix_date.php:494 +msgid "Time" +msgstr "Uhrzeit" + +#: choix_date.php:522 +msgid "Bad format!" +msgstr "Inkorrektes Format!" + +#: choix_date.php:531 +msgid "Remove all days" +msgstr "Alle Tage löschen" + +#: choix_date.php:531 +msgid "Copy hours of the first day" +msgstr "Uhrzeiten des ersten Tages auch für die folgende Tage übernehmen" + +#: choix_date.php:531 +msgid "Remove all hours" +msgstr "Alle Uhrzeiten löschen" + +#: choix_date.php:533 +#: choix_autre.php:167 +msgid "Next" +msgstr "Weiter" + +#: choix_date.php:537 +msgid "Enter more choices for the voters" +msgstr "Sie lassen den Beteiligten nicht genügend Möglichkeiten!" + +#: choix_date.php:549 +msgid "Your poll will expire automatically 2 days after the last date of your poll." +msgstr "Ihre Umfrage wird automatisch nach dem letzten eingetragenen Datum gelöscht." + +#: choix_date.php:549 +msgid "Removal date" +msgstr "Datum an dem die Umfrage gelöscht werden soll" + +#: choix_date.php:552 +#: choix_autre.php:196 +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgstr "Als Sie die Herschtelung der Umfrage bestätigt haben werden, werden Sie zur Webseite Ihrer Umfrage automatisch wieder geleitet sein

Gleichzeitig werden Sie ein E-Mail bekommen in dem ein Link zu ihrer Umfrage ist, um in der erforschten Zukunft zu folgen." + +#: choix_date.php:558 +msgid "Back to hours" +msgstr "Zurück zu den Uhrzeiten" + +#: choix_date.php:559 +#: choix_autre.php:201 +msgid "Create the poll" +msgstr "Umfrage erstellen" + +#: infos_sondage.php:119 +msgid "Poll creation (1 on 2)" +msgstr "Erstellen einer Umfrage (1 / 2)" + +#: infos_sondage.php:123 +msgid "You are in the poll creation section.
Required fields cannot be left blank" +msgstr "Sie machten eine neue umfrage erstellen !
Fullen sie die folgenden Felder aus." + +#: infos_sondage.php:128 +msgid "Poll title *: " +msgstr "Titel der Umfrage *: " + +#: infos_sondage.php:130 +msgid "Enter a title" +msgstr "Geben sie einen Titel an!" + +#: infos_sondage.php:133 +#: infos_sondage.php:138 +#: infos_sondage.php:150 +msgid "Characters < > and \" are not permitted" +msgstr "Die Schriftzeichen < > und \" sind nicht genehmigt!" + +#: infos_sondage.php:136 +msgid "Comments: " +msgstr "Komentar (optional): " + +#: infos_sondage.php:141 +msgid "Your name*: " +msgstr "Name *: " + +#: infos_sondage.php:147 +#: contacts.php:119 +msgid "Enter a name" +msgstr "Geben sie einen Namen an!" + +#: infos_sondage.php:153 +msgid "Your e-mail address *: " +msgstr "E-mail Adresse *: " + +#: infos_sondage.php:159 +msgid "Enter an email address" +msgstr "Geben sie eine e-mail Adresse an!" + +#: infos_sondage.php:162 +msgid "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)" +msgstr "Die e-mail adresse ist nicht korrekt! (Sie müssen eine gütlige e-mail Adresse eintragen)" + +#: infos_sondage.php:173 +msgid "The fields marked with * are required!" +msgstr "Die mit * markierten Felder sind obligatorisch!" + +#: infos_sondage.php:179 +msgid " Voters can modify their vote themselves." +msgstr " Sie erlauben eine Änderung der linien durch die Befragten" + +#: infos_sondage.php:181 +msgid " To receive an email for each new vote." +msgstr " Sie möchten eine e-mail bei jeder Beteiligung erhalten" + +#: infos_sondage.php:185 +msgid "Schedule an event" +msgstr "Terminumfrage" + +#: infos_sondage.php:187 +msgid "Make a choice" +msgstr "Andere Umfragen" + +#: infos_sondage.php:188 +#: index.php:73 +msgid "Make a poll" +msgstr "Umfrage erstellen" + +#: contacts.php:56 +msgid "[CONTACT] You have sent a question " +msgstr "[KONTAKT] Senden von Fragen " + +#: contacts.php:56 +msgid "You have a question from a user " +msgstr "Sie haben eine benützer Frager " + +#: contacts.php:56 +msgid "User" +msgstr "Benützer" + +#: contacts.php:56 +msgid "User's email address" +msgstr "Email adresse des Benützers" + +#: contacts.php:56 +msgid "Message" +msgstr "Email" + +#: contacts.php:59 +msgid "[COPY] Someone has sent a question " +msgstr "[KOPIE] Senden einer frage " + +#: contacts.php:59 +msgid "Here is a copy of your question" +msgstr "Kopie ihrer frage" + +#: contacts.php:59 +msgid "We're going to answer your question shortly." +msgstr "Ihre email wird schnell bearbeitet." + +#: contacts.php:59 +#: studs.php:171 +#: studs.php:211 +#: adminstuds.php:273 +#: adminstuds.php:379 +#: adminstuds.php:500 +#: adminstuds.php:510 +#: adminstuds.php:522 +#: adminstuds.php:1022 +msgid "Thanks for your confidence." +msgstr "Wir dancken ihnen für Ihr Vertrauen." + +#: contacts.php:76 +msgid "Your message has been sent!" +msgstr "Ihre email wurde erfolgreich gesendet!" + +#: contacts.php:113 +msgid "If you have questions, you can send a message here." +msgstr "Fragen oder Vorschläge in bezug auf können sie uns mit diesem Formular zukommen lassen." + +#: contacts.php:115 +msgid "Your name" +msgstr "Ihr Name" + +#: contacts.php:123 +msgid "Your email address " +msgstr "Ihre Email Adresse " + +#: contacts.php:129 +msgid "Question" +msgstr "Frage (english speaking please)" + +#: contacts.php:138 +msgid "Send your question" +msgstr "Senden sie ihre Frage" + +#: studs.php:87 +#: adminstuds.php:78 +msgid "This poll doesn't exist !" +msgstr "Diese Umfrage gibt es nicht!" + +#: studs.php:118 +msgid "anonyme" +msgstr "" + +#: studs.php:171 +#: studs.php:211 +msgid "Poll's participation" +msgstr "Umfragebeteiligung" + +#: studs.php:171 +#: studs.php:211 +msgid "" +"has filled a line.\n" +"You can find your poll at the link" +msgstr " hat einen Eintrag gemacht. Sie finden ihre Umfrage unter folgender Adresse" + +#: studs.php:246 +#: adminstuds.php:567 +msgid "Initiator of the poll" +msgstr "Autor der Umfrage" + +#: studs.php:250 +#: studs.php:540 +#: adminstuds.php:571 +#: adminstuds.php:964 +msgid "Comments" +msgstr "Kommentar" + +#: studs.php:261 +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." +msgstr "Um an dieser Umfrage Teilzunehmen tragen sie bitte ihren Namen, wählen sie die ihnen passenden Wehrte (ohne die dispo der anderen Teilnehmer zu beachten)
und bestätigen sie ihre Wahl mit dem Knopf am ende der Ligne." + +#: studs.php:445 +#: adminstuds.php:806 +msgid "Addition" +msgstr "Summe" + +#: studs.php:473 +#: adminstuds.php:836 +msgid "Enter a name !" +msgstr "Sie haben keinen Namen eingetragen!" + +#: studs.php:476 +#: adminstuds.php:841 +msgid "The name you've chosen already exist in this poll!" +msgstr "Den gewählten Namen gibt es schon!" + +#: studs.php:479 +#: adminstuds.php:846 +msgid "Characters \" ' < et > are not permitted" +msgstr "Die Schriftzeichen < und > sind nicht genehmigt!" + +#: studs.php:503 +#: studs.php:505 +#: adminstuds.php:876 +#: adminstuds.php:878 +msgid "for" +msgstr "bis" + +#: studs.php:505 +#: studs.php:511 +msgid "%A, den %e. %B %Y" +msgstr "%A, den %e. %B %Y" + +#: studs.php:522 +#: adminstuds.php:899 +msgid "vote" +msgstr "wähle" + +#: studs.php:524 +#: adminstuds.php:901 +#, fuzzy +msgid "votes" +msgstr "wähle" + +#: studs.php:528 +#: adminstuds.php:905 +msgid "The best choice at this time is" +msgstr "Vorlaufig ist die beste Wahl:" + +#: studs.php:528 +#: studs.php:531 +#: adminstuds.php:905 +#: adminstuds.php:908 +msgid "with" +msgstr "mit" + +#: studs.php:531 +#: adminstuds.php:908 +msgid "The bests choices at this time are" +msgstr "Vorläufig sind die besten Wahlen: " + +#: studs.php:548 +#: adminstuds.php:974 +msgid "Enter a name and a comment!" +msgstr "Geben sie irhen Name und ein Kommentar ein bitte!" + +#: studs.php:552 +#: adminstuds.php:978 +msgid "Add a comment in the poll" +msgstr "Geben sie ein Kommentar ein bitte" + +#: studs.php:555 +#: adminstuds.php:979 +msgid "Name" +msgstr "Name" + +#: studs.php:563 +msgid "Export: Spreadsheet" +msgstr "Export : Tabellenkalkulationprogram" + +#: studs.php:565 +msgid "Agenda" +msgstr "Agenda" + +#: index.php:70 +msgid "What is it about?" +msgstr "Warum dies ?" + +#: index.php:71 +msgid "Making polls to schedule meetings or events, quickly and easily.
You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." +msgstr "Ein Datum zu finden das allen Betroffenen passt.
Sie können ebenfalls benötigen um gemeinsam eine Wahl zu treffen für ein Termin ein Treffpunkt, ein Besprechungsthema oder die Marke ihrer nächsten Kaffeemaschine " + +#: choix_autre.php:144 +msgid "Your poll aim is to make a choice between different subjects.
Enter the subjects to vote for:" +msgstr "Sie erstellen eine Umfrage mit mehreren Wahlmglichkeiten
Geben sie die verschiedenen Wahlmglichkeiten an :" + +#: choix_autre.php:150 +msgid "Choice" +msgstr "Wahl" + +#: choix_autre.php:162 +msgid "5 choices more" +msgstr "Um 5 weitere Felder zu erstellen" + +#: choix_autre.php:177 +msgid "Enter at least one choice" +msgstr "Mindestens 1 Feld muss ausgefüllt sein !" + +#: choix_autre.php:182 +msgid "Characters \" < and > are not permitted" +msgstr "Die Schriftzeichen < > und \" sind nicht genehmigt !" + +#: choix_autre.php:191 +msgid "Your poll will be automatically removed after 6 months.
You can fix another removal date for it." +msgstr "Ihre Umfrage wird automatisch nach 6 Monaten gelscht.
Sie können dennoch eine andere Frist wählen." + +#: choix_autre.php:193 +msgid "Removal date (optional)" +msgstr "Enddatum (optional)" + +#: choix_autre.php:193 +msgid "(DD/MM/YYYY)" +msgstr "(TT/MM/JJJJ)" + +#: adminstuds.php:114 +msgid "Column's adding" +msgstr "Einfügen einer Spalte" + +#: adminstuds.php:117 +msgid "Add a new column" +msgstr "Wenn sie eine Spalte einfügen möchten" + +#: adminstuds.php:121 +msgid "You can add a new scheduling date to your poll.
If you just want to add a new hour to an existant date, put the same date and choose a new hour." +msgstr "Sie können in ihrer Umfrage ein Datum einfügen. Falls das Datum bereits schon besteht und sie eine Uhrzeit eingeben möchten tragen sie bitte das ganze Datum ein mit der gewünschten Uhrzeit so das dieser in der Umfrage erscheinen kann." + +#: adminstuds.php:122 +msgid "Add a date" +msgstr "Einfügen eines datums" + +#: adminstuds.php:143 +msgid "Add a start hour (optional)" +msgstr "Einfügen einer Startuhrtzeit (optional)" + +#: adminstuds.php:157 +msgid "Add a end hour (optional)" +msgstr "Einfügen einer Enduhrzeit (optional)" + +#: adminstuds.php:273 +#: adminstuds.php:378 +msgid "[ADMINISTRATOR] New column for your poll" +msgstr "[ADMINISTRATOR] Einfügen einer neuen Spalte in die Umfrage " + +#: adminstuds.php:273 +#: adminstuds.php:379 +msgid "" +"You have added a new column in your poll. \n" +"You can inform the voters of this change with this link" +msgstr "" +"Sie haben eine neue Spalte in die Umfrage eingefügt. \n" +"Sie können die Beteiligten über diese änderung informieren in dem sie ihen folgende Adresse schicken. " + +#: adminstuds.php:498 +msgid "[ADMINISTRATOR] New title for your poll" +msgstr "[ADMINISTRATOR] änderung des Titels der " + +#: adminstuds.php:499 +msgid "" +"You have changed the title of your poll. \n" +"You can modify this poll with this link" +msgstr "" +"Sie haben den Titel ihrer Umfrage geändert. \n" +"Sie können diese Umfrage mit dem fogenden Link ändern " + +#: adminstuds.php:510 +msgid "[ADMINISTRATOR] New comments for your poll" +msgstr "[ADMINISTRATOR] änderung der Kommentare der Umfrage mit " + +#: adminstuds.php:510 +msgid "" +"You have changed the comments of your poll. \n" +"You can modify this poll with this link" +msgstr "" +" Sie haben die Kommentare ihrer Umfrage geändert. \n" +"Sie können diese Umfrage mit dem fogenden Link ändern " + +#: adminstuds.php:520 +msgid "[ADMINISTRATOR] New email address for your poll" +msgstr "[ADMINISTRATOR] änderung der email Adresse des administrator " + +#: adminstuds.php:521 +msgid "" +"You have changed your email address in your poll. \n" +"You can modify this poll with this link" +msgstr "" + +#: adminstuds.php:582 +msgid "As poll administrator, you can change all the lines of this poll with \"infos\".
You can, as well, remove a column or a line with \"Cancel\".
You can also add a new column with \"Add.
Finally, you can change the informations of this poll like the title, the comments or your email address." +msgstr "Als administrator können sie alle linien ihrer Umfrage mit \"Icone ändern.
Sie haben auch die möglichkeit eine Spalte oder eine Linie mit \"Annuler\" zu löschen.
Falls sie vergessen haben eine Wahlmöglichkeit einzutragen können sie eine Spalte zufügen in dem sie \"rückgängig\"
auswählen. en bout de ligne des noms de colonne. Sie können ebenfalls informationen wie den Titel die Kommentare oder ihre email adresse ändern. " + +#: adminstuds.php:851 +msgid "The date is not correct !" +msgstr "Das gewählte Datum ist nicht korrekt!" + +#: adminstuds.php:916 +msgid "Poll's management" +msgstr "Verwaltung ihrer Umfrage" + +#: adminstuds.php:921 +msgid "Change the title" +msgstr "Wenn sie den Titel der Umfrage ändern möchten" + +#: adminstuds.php:928 +msgid "Generate the convocation letter (.PDF), choose the place to meet and validate" +msgstr "Wenn sie die Einladung (in PDF) erstellen möchten, wählen sie bitte einen Versammlungsort und bestätigen" + +#: adminstuds.php:939 +msgid "Enter a meeting place!" +msgstr "Geben sie den Versammlungsort an!" + +#: adminstuds.php:944 +msgid "Enter a new title!" +msgstr "Geben sie einen neuen Titel an!" + +#: adminstuds.php:948 +msgid "Change the comments" +msgstr "Wenn sie die Kommentare der Umfrage ändern möchten" + +#: adminstuds.php:952 +msgid "Change your email address" +msgstr "Wenn sie ihre email adresse ändern möchten" + +#: adminstuds.php:956 +msgid "Enter a new email address!" +msgstr "Geben sie eine neue Adresse an!" + +#: adminstuds.php:985 +msgid "Remove your poll" +msgstr "Wenn sie ihre Umfrage löschen möchten" + +#: adminstuds.php:985 +msgid "Remove the poll" +msgstr "Löschen der Umfrage" + +#: adminstuds.php:988 +msgid "Confirm removal of your poll" +msgstr "Bestätigen sie bitte das löschen der Umfrage" + +#: adminstuds.php:988 +msgid "Remove this poll!" +msgstr "Ich lösche die Umfrage!" + +#: adminstuds.php:989 +msgid "Keep this poll!" +msgstr "Ich behalte die Umfrage!" + +#: adminstuds.php:1022 +msgid "[ADMINISTRATOR] Removing of your poll" +msgstr "[ADMINISTRATOR] Löschen der Umfrage mit " + +#: adminstuds.php:1022 +msgid "" +"You have removed your poll. \n" +"You can make new polls with this link" +msgstr "" +"Sie haben eine Umfrage. \n" +"Mit folgendem können sie ein neue Umfrage erstellen." + +#: adminstuds.php:1043 +msgid "Your poll has been removed!" +msgstr "Ihre Umfrage wurde gelöscht!" + +#: admin/index.php:82 +msgid "Confirm removal of the poll " +msgstr "Löschen dieser Umfrage bestätigen" + +#: admin/index.php:112 +msgid "polls in the database at this time" +msgstr " In der Basis vorhandene Umfragen" + +#: admin/index.php:117 +msgid "Poll ID" +msgstr "Umfrage ID" + +#: admin/index.php:117 +msgid "Format" +msgstr "Format" + +#: admin/index.php:117 +msgid "Title" +msgstr "Titel" + +#: admin/index.php:117 +msgid "Author" +msgstr "Autor" + +#: admin/index.php:117 +msgid "Expiration's date" +msgstr "Enddatum" + +#: admin/index.php:117 +msgid "Users" +msgstr "Anzahl der Benutzer" + +#: admin/index.php:117 +msgid "Actions" +msgstr "Aktionen" + +#: admin/index.php:140 +msgid "See the poll" +msgstr "Umfrage ansehen" + +#: admin/index.php:141 +msgid "Change the poll" +msgstr "Umfrage ändern" + +#~ msgid "january" +#~ msgstr "Januar" +#~ msgid "february" +#~ msgstr "Februar" +#~ msgid "march" +#~ msgstr "März" +#~ msgid "april" +#~ msgstr "April" +#~ msgid "may" +#~ msgstr "May" +#~ msgid "june" +#~ msgstr "Juni" +#~ msgid "july" +#~ msgstr "Juli" +#~ msgid "august" +#~ msgstr "August" +#~ msgid "september" +#~ msgstr "September" +#~ msgid "october" +#~ msgstr "Oktober" +#~ msgid "november" +#~ msgstr "November" +#~ msgid "december" +#~ msgstr "December" +#~ msgid "Sources" +#~ msgstr "Quellen" +#~ msgid "Back" +#~ msgstr "Zurück" +#~ msgid "" +#~ "Here are the sources of " +#~ msgstr "" +#~ "Die Quellen von " + diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo new file mode 100644 index 0000000000000000000000000000000000000000..5ccc44f7a9d7da3e3948eff4cdebfa9b07863b96 GIT binary patch literal 12736 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 G2>%zLXJ5qt literal 0 HcmV?d00001 diff --git a/locale/en_GB/LC_MESSAGES/Studs.po b/locale/en_GB/LC_MESSAGES/Studs.po new file mode 100644 index 0000000..cd1a11e --- /dev/null +++ b/locale/en_GB/LC_MESSAGES/Studs.po @@ -0,0 +1,751 @@ +msgid "" +msgstr "" +"Project-Id-Version: Studs 0.6.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-05-02 11:21+0100\n" +"PO-Revision-Date: 2010-05-02 11:32+0100\n" +"Last-Translator: Raphaël Droz \n" +"Language-Team: Guilhem Borghesi, Raphaël Droz\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: EN\n" +"X-Poedit-Country: UNITED KINGDOM\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-KeywordsList: _\n" +"X-Poedit-Basepath: /var/www/studs\n" +"X-Poedit-SearchPath-0: .\n" + +#: creation_sondage.php:98 +msgid "For sending to the polled users" +msgstr "For sending to the polled users" + +#: creation_sondage.php:98 +#: creation_sondage.php:99 +msgid "Poll" +msgstr "Poll" + +#: creation_sondage.php:98 +msgid "" +"This is the message you have to send to the people you want to poll. \n" +"Now, you have to send this message to everyone you want to poll." +msgstr "" +"This is the message you have to send to the people you want to poll. \n" +"Now, you have to send this message to everyone you want to poll." + +#: creation_sondage.php:98 +msgid "hast just created a poll called" +msgstr "hast just created a poll called" + +#: creation_sondage.php:98 +msgid "Thanks for filling the poll at the link above" +msgstr "Thanks for filling the poll at the link above" + +#: creation_sondage.php:98 +#: creation_sondage.php:101 +msgid "Thanks for your confidence" +msgstr "Thanks for your confidence" + +#: creation_sondage.php:99 +msgid "Author's message" +msgstr "Author's message" + +#: creation_sondage.php:100 +msgid "" +"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" +"\n" +"You can now modify it at the link above" +msgstr "" +"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" +"\n" +"You can now modify it at the link above" + +#: choix_date.php:71 +#: choix_autre.php:70 +msgid "You haven't filled the first section of the poll creation." +msgstr "You haven't filled the first section of the poll creation." + +#: choix_date.php:72 +#: contacts.php:132 +#: studs.php:107 +#: choix_autre.php:71 +#: adminstuds.php:109 +#: adminstuds.php:1118 +msgid "Back to the homepage of " +msgstr "Back to the homepage of " + +#: choix_date.php:218 +#: adminstuds.php:161 +msgid "january" +msgstr "january" + +#: choix_date.php:219 +#: adminstuds.php:162 +msgid "february" +msgstr "february" + +#: choix_date.php:220 +#: adminstuds.php:163 +msgid "march" +msgstr "march" + +#: choix_date.php:221 +#: adminstuds.php:164 +msgid "april" +msgstr "april" + +#: choix_date.php:222 +#: adminstuds.php:165 +msgid "may" +msgstr "may" + +#: choix_date.php:223 +#: adminstuds.php:166 +msgid "june" +msgstr "june" + +#: choix_date.php:224 +#: adminstuds.php:167 +msgid "july" +msgstr "july" + +#: choix_date.php:225 +#: adminstuds.php:168 +msgid "august" +msgstr "august" + +#: choix_date.php:226 +#: adminstuds.php:169 +msgid "september" +msgstr "september" + +#: choix_date.php:227 +#: adminstuds.php:170 +msgid "october" +msgstr "october" + +#: choix_date.php:228 +#: adminstuds.php:171 +msgid "november" +msgstr "november" + +#: choix_date.php:229 +#: adminstuds.php:172 +msgid "december" +msgstr "december" + +#: choix_date.php:253 +msgid "Select your dates amoung the free days (green). The selected days are in blue.
You can unselect a day previously selected by clicking again on it." +msgstr "Select your dates amoung the free days (green). The selected days are in blue.
You can unselect a day previously selected by clicking again on it." + +#: choix_date.php:266 +msgid "monday" +msgstr "monday" + +#: choix_date.php:266 +msgid "tuesday" +msgstr "tuesday" + +#: choix_date.php:266 +msgid "wednesday" +msgstr "wednesday" + +#: choix_date.php:266 +msgid "thursday" +msgstr "thursday" + +#: choix_date.php:266 +msgid "friday" +msgstr "friday" + +#: choix_date.php:266 +msgid "saturday" +msgstr "saturday" + +#: choix_date.php:266 +msgid "sunday" +msgstr "sunday" + +#: choix_date.php:519 +msgid "Selected days" +msgstr "Selected days" + +#: choix_date.php:521 +msgid "For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- " +msgstr "" + +#: choix_date.php:528 +msgid "Time" +msgstr "Time" + +#: choix_date.php:556 +msgid "Bad format!" +msgstr "Bad format!" + +#: choix_date.php:565 +msgid "Remove all days" +msgstr "Remove all days" + +#: choix_date.php:565 +msgid "Copy hours of the first day" +msgstr "Copy hours of the first day" + +#: choix_date.php:565 +msgid "Remove all hours" +msgstr "Remove all hours" + +#: choix_date.php:567 +#: choix_autre.php:188 +msgid "Next" +msgstr "Next" + +#: choix_date.php:571 +msgid "Enter more choices for the voters" +msgstr "Enter more choices for the voters" + +#: choix_date.php:583 +msgid "Your poll will expire automatically 2 days after the last date of your poll." +msgstr "Your poll will expire automatically 2 days after the last date of your poll." + +#: choix_date.php:583 +msgid "Removal date" +msgstr "Removal date" + +#: choix_date.php:586 +#: choix_autre.php:217 +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgstr "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

Then, you will receive quickly an email contening the link to your poll for sending it to the voters." + +#: choix_date.php:592 +msgid "Back to hours" +msgstr "Back to hours" + +#: choix_date.php:593 +#: choix_autre.php:222 +msgid "Create the poll" +msgstr "Create the poll" + +#: infos_sondage.php:187 +msgid "You are in the poll creation section.
Required fields cannot be left blank" +msgstr "You are in the poll creation section.
Required fields cannot be left blank" + +#: infos_sondage.php:192 +msgid "Poll title *: " +msgstr "Poll title *: " + +#: infos_sondage.php:194 +msgid "Enter a title" +msgstr "Enter a title" + +#: infos_sondage.php:197 +#: infos_sondage.php:202 +#: infos_sondage.php:214 +msgid "Characters < > and \" are not permitted" +msgstr "Characters < > and \" are not permitted" + +#: infos_sondage.php:200 +msgid "Comments: " +msgstr "Comments: " + +#: infos_sondage.php:205 +msgid "Your name*: " +msgstr "Your name*: " + +#: infos_sondage.php:211 +#: contacts.php:174 +msgid "Enter a name" +msgstr "Enter a name" + +#: infos_sondage.php:217 +msgid "Your e-mail address *: " +msgstr "Your e-mail address *: " + +#: infos_sondage.php:223 +msgid "Enter an email address" +msgstr "Enter an email address" + +#: infos_sondage.php:226 +msgid "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)" +msgstr "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)" + +#: infos_sondage.php:237 +msgid "The fields marked with * are required!" +msgstr "The fields marked with * are required!" + +#: infos_sondage.php:243 +msgid " Voters can modify their vote themselves." +msgstr " Voters can modify their vote themselves." + +#: infos_sondage.php:245 +msgid " To receive an email for each new vote." +msgstr " To receive an email for each new vote." + +#: infos_sondage.php:249 +msgid "Schedule an event" +msgstr "Schedule an event" + +#: infos_sondage.php:251 +msgid "Make a choice" +msgstr "Make a choice" + +#: contacts.php:111 +msgid "[CONTACT] You have sent a question " +msgstr "[CONTACT] You have sent a question " + +#: contacts.php:111 +msgid "You have a question from a user " +msgstr "You have a question from a user " + +#: contacts.php:111 +msgid "User" +msgstr "User" + +#: contacts.php:111 +msgid "User's email address" +msgstr "User's email address" + +#: contacts.php:111 +msgid "Message" +msgstr "Message" + +#: contacts.php:114 +msgid "[COPY] Someone has sent a question " +msgstr "[COPY] Someone has sent a question " + +#: contacts.php:114 +msgid "Here is a copy of your question" +msgstr "Here is a copy of your question" + +#: contacts.php:114 +msgid "We're going to answer your question shortly." +msgstr "We're going to answer your question shortly." + +#: contacts.php:114 +#: studs.php:219 +#: studs.php:258 +#: adminstuds.php:354 +#: adminstuds.php:458 +#: adminstuds.php:578 +#: adminstuds.php:588 +#: adminstuds.php:600 +#: adminstuds.php:1096 +msgid "Thanks for your confidence." +msgstr "Thanks for your confidence." + +#: contacts.php:131 +msgid "Your message has been sent!" +msgstr "Your message has been sent!" + +#: contacts.php:168 +msgid "If you have questions, you can send a message here." +msgstr "If you have questions, you can send a message here." + +#: contacts.php:170 +msgid "Your name" +msgstr "Your name" + +#: contacts.php:178 +msgid "Your email address " +msgstr "Your email address " + +#: contacts.php:184 +msgid "Question" +msgstr "Question" + +#: contacts.php:193 +msgid "Send your question" +msgstr "Send your question" + +#: studs.php:106 +#: adminstuds.php:108 +msgid "This poll doesn't exist !" +msgstr "This poll doesn't exist !" + +#: studs.php:219 +#: studs.php:258 +msgid "Poll's participation" +msgstr "Poll's participation" + +#: studs.php:219 +#: studs.php:258 +msgid "" +"has filled a line.\n" +"You can find your poll at the link" +msgstr "" +"has filled a line.\n" +"You can find your poll at the link" + +#: studs.php:295 +#: adminstuds.php:647 +msgid "Initiator of the poll" +msgstr "Initiator of the poll" + +#: studs.php:299 +#: studs.php:613 +#: adminstuds.php:651 +#: adminstuds.php:1038 +msgid "Comments" +msgstr "Comments" + +#: studs.php:310 +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." +msgstr "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." + +#: studs.php:517 +#: adminstuds.php:886 +msgid "Addition" +msgstr "Addition" + +#: studs.php:545 +#: adminstuds.php:916 +msgid "Enter a name !" +msgstr "Enter a name !" + +#: studs.php:548 +#: adminstuds.php:921 +msgid "The name you've chosen already exist in this poll!" +msgstr "The name you've chosen already exist in this poll!" + +#: studs.php:551 +#: adminstuds.php:926 +msgid "Characters \" ' < et > are not permitted" +msgstr "Characters \" ' < et > are not permitted" + +#: studs.php:601 +#: adminstuds.php:985 +msgid "The best choice at this time is" +msgstr "The best choice at this time is" + +#: studs.php:601 +#: studs.php:604 +#: adminstuds.php:985 +#: adminstuds.php:988 +msgid "with" +msgstr "with" + +#: studs.php:601 +#: studs.php:604 +#: adminstuds.php:985 +#: adminstuds.php:988 +msgid "vote" +msgstr "vote" + +#: studs.php:604 +#: adminstuds.php:988 +msgid "The bests choices at this time are" +msgstr "The bests choices at this time are" + +#: studs.php:621 +#: adminstuds.php:1048 +msgid "Enter a name and a comment!" +msgstr "Enter a name and a comment!" + +#: studs.php:625 +#: adminstuds.php:1052 +msgid "Add a comment in the poll" +msgstr "Add a comment in the poll" + +#: studs.php:626 +#: adminstuds.php:1053 +msgid "Name" +msgstr "Name" + +#: studs.php:636 +msgid "Export: Spreadsheet" +msgstr "Export: Spreadsheet" + +#: studs.php:638 +msgid "Agenda" +msgstr "Agenda" + +#: index.php:127 +msgid "What is it about?" +msgstr "What is it about?" + +#: index.php:128 +msgid "Making polls to schedule meetings or events, quickly and easily.
You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." +msgstr "Making polls to schedule meetings or events, quickly and easily.
You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." + +#: index.php:131 +msgid "Make a poll" +msgstr "Make a poll" + +#: choix_autre.php:165 +msgid "Your poll aim is to make a choice between different subjects.
Enter the subjects to vote for:" +msgstr "Your poll aim is to make a choice between different subjects.
Enter the subjects to vote for:" + +#: choix_autre.php:171 +msgid "Choice" +msgstr "Choice" + +#: choix_autre.php:183 +msgid "5 choices more" +msgstr "5 choices more" + +#: choix_autre.php:198 +msgid "Enter at least one choice" +msgstr "Enter at least one choice" + +#: choix_autre.php:203 +msgid "Characters \" < and > are not permitted" +msgstr "Characters \" < and > are not permitted" + +#: choix_autre.php:212 +msgid "Your poll will be automatically removed after 6 months.
You can fix another removal date for it." +msgstr "Your poll will be automatically removed after 6 months.
You can fix another removal date for it." + +#: choix_autre.php:214 +msgid "Removal date (optional)" +msgstr "Removal date (optional)" + +#: choix_autre.php:214 +msgid "(DD/MM/YYYY)" +msgstr "(DD/MM/YYYY)" + +#: adminstuds.php:143 +msgid "Column's adding" +msgstr "Column's adding" + +#: adminstuds.php:146 +msgid "Add a new column" +msgstr "Add a new column" + +#: adminstuds.php:150 +msgid "You can add a new scheduling date to your poll.
If you just want to add a new hour to an existant date, put the same date and choose a new hour." +msgstr "You can add a new scheduling date to your poll.
If you just want to add a new hour to an existant date, put the same date and choose a new hour." + +#: adminstuds.php:151 +msgid "Add a date" +msgstr "Add a date" + +#: adminstuds.php:182 +msgid "Add a start hour (optional)" +msgstr "Add a start hour (optional)" + +#: adminstuds.php:196 +msgid "Add a end hour (optional)" +msgstr "Add a end hour (optional)" + +#: adminstuds.php:354 +#: adminstuds.php:458 +msgid "[ADMINISTRATOR] New column for your poll" +msgstr "[ADMINISTRATOR] New column for your poll" + +#: adminstuds.php:354 +#: adminstuds.php:458 +msgid "" +"You have added a new column in your poll. \n" +"You can inform the voters of this change with this link" +msgstr "" +"You have added a new column in your poll. \n" +"You can inform the voters of this change with this link" + +#: adminstuds.php:576 +msgid "[ADMINISTRATOR] New title for your poll" +msgstr "[ADMINISTRATOR] New title for your poll" + +#: adminstuds.php:577 +msgid "" +"You have changed the title of your poll. \n" +"You can modify this poll with this link" +msgstr "" +"You have changed the title of your poll. \n" +"You can modify this poll with this link" + +#: adminstuds.php:588 +msgid "[ADMINISTRATOR] New comments for your poll" +msgstr "[ADMINISTRATOR] New comments for your poll" + +#: adminstuds.php:588 +msgid "" +"You have changed the comments of your poll. \n" +"You can modify this poll with this link" +msgstr "" +"You have changed the comments of your poll. \n" +"You can modify this poll with this link" + +#: adminstuds.php:598 +msgid "[ADMINISTRATOR] New email address for your poll" +msgstr "[ADMINISTRATOR] New email address for your poll" + +#: adminstuds.php:599 +msgid "" +"You have changed your email address in your poll. \n" +"You can modify this poll with this link" +msgstr "" +"You have changed your email address in your poll. \n" +"You can modify this poll with this link" + +#: adminstuds.php:662 +msgid "As poll administrator, you can change all the lines of this poll with - empty,
- \"8h\", \"8H\" or \"8:00\" to give a " +#~ "meeting's start hour,
- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-" +#~ "11:00\" to give a meeting's start and end hour,
- \"8h15-11h15\", " +#~ "\"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." +#~ msgstr "" +#~ "For each selected day, you can choose, or not, meeting hours in the " +#~ "following format :
- empty,
- \"8h\", \"8H\" or \"8:00\" to give a " +#~ "meeting's start hour,
- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-" +#~ "11:00\" to give a meeting's start and end hour,
- \"8h15-11h15\", " +#~ "\"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." +#~ msgid "Confirm removal of the poll " +#~ msgstr "Confirm removal of the poll " +#~ msgid "" +#~ "As poll administrator, you can change all the lines of this poll with " +#~ "\"infos\".
You can, as well, remove " +#~ "a column or a line with \"Cancel\". " +#~ "
You can also add a new column with +#~ .
Finally, you can change the informations of this " +#~ "poll like the title, the comments or your email address." +#~ msgstr "" +#~ "As poll administrator, you can change all the lines of this poll with " +#~ "\"infos\".
You can, as well, remove " +#~ "a column or a line with \"Cancel\". " +#~ "
You can also add a new column with +#~ .
Finally, you can change the informations of this " +#~ "poll like the title, the comments or your email address." +#~ msgid "Users" +#~ msgstr "Users" +#~ msgid "About" +#~ msgstr "About" +#~ msgid "Contact us" +#~ msgstr "Contact us" +#~ msgid "Actions" +#~ msgstr "Actions" +#~ msgid "Expiration's date" +#~ msgstr "Expiration's date" +#~ msgid "Error!" +#~ msgstr "Error!" +#~ msgid "Format" +#~ msgstr "Format" +#~ msgid "Author" +#~ msgstr "Author" +#~ msgid "Poll creation (1 on 2)" +#~ msgstr "Poll creation (1 on 2)" +#~ msgid "Title" +#~ msgstr "Title" +#~ msgid "Polls administrator" +#~ msgstr "Polls administrator" +#~ msgid "Change the poll" +#~ msgstr "Change the poll" +#~ msgid "Poll subjects (2 on 2)" +#~ msgstr "Poll subjects (2 on 2)" +#~ msgid "Poll dates (2 on 2)" +#~ msgstr "Poll dates (2 on 2)" +#~ msgid "polls in the database at this time" +#~ msgstr "polls in the database at this time" +#~ msgid "Logs" +#~ msgstr "Logs" +#~ msgid "Poll ID" +#~ msgstr "Poll ID" +#~ msgid "Cleaning" +#~ msgstr "Cleaning" +#~ msgid "Admin" +#~ msgstr "Admin" +#~ msgid "See the poll" +#~ msgstr "See the poll" +#~ msgid "Sources" +#~ msgstr "Sources" +#~ msgid "Contact" +#~ msgstr "Contact" +#~ msgid "Home" +#~ msgstr "Home" +#~ msgid "Example" +#~ msgstr "Example" +#~ msgid "Make your polls" +#~ msgstr "Make your polls" +#~ msgid "Back" +#~ msgstr "Back" +#~ msgid "" +#~ "Here are the sources of " +#~ msgstr "" +#~ "Here are the sources of " +#~ msgid "" +#~ "Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009" +#~ msgstr "" +#~ "Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009" + diff --git a/locale/es_ES/LC_MESSAGES/Studs.mo b/locale/es_ES/LC_MESSAGES/Studs.mo new file mode 100644 index 0000000000000000000000000000000000000000..ab0a92d3103d65e5e2924916313958d4630b1dbe GIT binary patch literal 16845 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\n" +"Language-Team: Guilhem Borghesi, Raphaël Droz\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: ES\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-KeywordsList: _\n" +"X-Poedit-Basepath: /var/www/studs\n" +"X-Poedit-SearchPath-0: .\n" + +#: bandeaux.php:59 +msgid "Make your polls" +msgstr "Encuestas para la universidad" + +#: bandeaux.php:62 +msgid "Poll dates (2 on 2)" +msgstr "Elección de dís (2 de 2)" + +#: bandeaux.php:65 +msgid "Poll subjects (2 on 2)" +msgstr "Elección de temas (2 de 2)" + +#: bandeaux.php:68 +msgid "Polls administrator" +msgstr "Administrador de la base" + +#: bandeaux.php:71 +msgid "Contact us" +msgstr "Contáctenos" + +#: bandeaux.php:77 +msgid "Error!" +msgstr "Error!" + +#: bandeaux.php:80 +#: bandeaux.php:98 +msgid "About" +msgstr "Informaciones generales" + +#: bandeaux.php:94 +#: bandeaux.php:108 +#: bandeaux.php:119 +msgid "Home" +msgstr "Inicio" + +#: bandeaux.php:95 +msgid "Example" +msgstr "Ejemplo" + +#: bandeaux.php:96 +msgid "Contact" +msgstr "Contáctenos" + +#: bandeaux.php:99 +msgid "Admin" +msgstr "Admin" + +#: bandeaux.php:109 +msgid "Logs" +msgstr "Histórico" + +#: bandeaux.php:110 +msgid "Cleaning" +msgstr "Limpieza" + +#: bandeaux.php:129 +#: bandeaux.php:135 +msgid "Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009" +msgstr "Université de Strasbourg. Creación: Guilhem BORGHESI. 2008-2009" + +#: creation_sondage.php:89 +msgid "For sending to the polled users" +msgstr "Para enviar a los encuestados" + +#: creation_sondage.php:89 +#: creation_sondage.php:90 +msgid "Poll" +msgstr "Encuesta" + +#: creation_sondage.php:89 +msgid "" +"This is the message you have to send to the people you want to poll. \n" +"Now, you have to send this message to everyone you want to poll." +msgstr "Eso es el mensaje que debe estar enviado ahora a los encuestados." + +#: creation_sondage.php:89 +msgid "hast just created a poll called" +msgstr "ha creado una encuesta titulado" + +#: creation_sondage.php:89 +msgid "Thanks for filling the poll at the link above" +msgstr "Gracias de llenar esta encuesta al enlace siguiente" + +#: creation_sondage.php:89 +#: creation_sondage.php:92 +msgid "Thanks for your confidence" +msgstr "Gracias por su confianza" + +#: creation_sondage.php:90 +msgid "Author's message" +msgstr "Reservado al autor" + +#: creation_sondage.php:91 +msgid "" +"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" +"\n" +"You can now modify it at the link above" +msgstr "" +"Este mensaje no debe estar enviado a los encuestados. Esta reservado al autor dela encuesta.\n" +"\n" +"Usted puede editar esta encuesta al enlace siguiente" + +#: choix_date.php:63 +#: choix_autre.php:62 +msgid "You haven't filled the first section of the poll creation." +msgstr "Usted no habia llenado la primera pagina dela encuesta" + +#: choix_date.php:64 +#: contacts.php:77 +#: studs.php:88 +#: choix_autre.php:63 +#: adminstuds.php:79 +#: adminstuds.php:1044 +msgid "Back to the homepage of " +msgstr "Retroceder al inicio de" + +#: choix_date.php:220 +msgid "Select your dates amoung the free days (green). The selected days are in blue.
You can unselect a day previously selected by clicking again on it." +msgstr "Seleccionar sus fechas entre los días disponibles que aparecen en verde. Cuando son seleccionados los días aparecen en azul.
Usted puede egalemente borrar días en seleccionarlos de nuevo." + +#: choix_date.php:233 +msgid "monday" +msgstr "lunes" + +#: choix_date.php:233 +msgid "tuesday" +msgstr "martes" + +#: choix_date.php:233 +msgid "wednesday" +msgstr "miécoles" + +#: choix_date.php:233 +msgid "thursday" +msgstr "jueves" + +#: choix_date.php:233 +msgid "friday" +msgstr "vienes" + +#: choix_date.php:233 +msgid "saturday" +msgstr "sábado" + +#: choix_date.php:233 +msgid "sunday" +msgstr "domingo" + +#: choix_date.php:485 +msgid "Selected days" +msgstr "Días seleccionados" + +#: choix_date.php:487 +msgid "For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." +msgstr "Para algún día que había seleccionado, Usted puede escoger, o no, de horas de reunión con este formato:
- vacío,
- \"8h\", \"8H\" o \"8:00\" para proponer una hora de principio de reunión,
- \"8-11\", \"8h-11h\", \"8H-11H\" o \"8:00-11:00\" para un hueco,
- \"8h15-11h15\", \"8H15-11H15\" o \"8:15-11:15\" para un hueco con minutos." + +#: choix_date.php:494 +msgid "Time" +msgstr "Horario" + +#: choix_date.php:522 +msgid "Bad format!" +msgstr "Formato incorrecto !" + +#: choix_date.php:531 +msgid "Remove all days" +msgstr "Borrar todos los días" + +#: choix_date.php:531 +msgid "Copy hours of the first day" +msgstr "Copiar los horarios del primer día" + +#: choix_date.php:531 +msgid "Remove all hours" +msgstr "Borrar todos los horarios" + +#: choix_date.php:533 +#: choix_autre.php:167 +msgid "Next" +msgstr "Seguir" + +#: choix_date.php:537 +msgid "Enter more choices for the voters" +msgstr "Introduzca más posibilidades por la encuesta!" + +#: choix_date.php:549 +msgid "Your poll will expire automatically 2 days after the last date of your poll." +msgstr "Su encuesta será automaticamente borrado 2 días despúes de la última fecha." + +#: choix_date.php:549 +msgid "Removal date" +msgstr "Fecha de borrado" + +#: choix_date.php:552 +#: choix_autre.php:196 +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgstr "Cuando Usted confirmarà la creacion de su encuesta, Usted serà automaticamente redigiriendo a la pagina de su encuesta.

Alora, Usted recibirà rapidamente uno correo electrinico conteniendo el enlace de su encuesta para darlo a los encuestados." + +#: choix_date.php:558 +msgid "Back to hours" +msgstr "Retroceder a los horarios" + +#: choix_date.php:559 +#: choix_autre.php:201 +msgid "Create the poll" +msgstr "Crear la encuesta" + +#: infos_sondage.php:119 +msgid "Poll creation (1 on 2)" +msgstr "Creación de encuesta (1 de 2)" + +#: infos_sondage.php:123 +msgid "You are in the poll creation section.
Required fields cannot be left blank" +msgstr "Usted ha eligiendo de crear une nueva encuesta!
Gracias por completar los campos con una *." + +#: infos_sondage.php:128 +msgid "Poll title *: " +msgstr "Título dela encuesta *: " + +#: infos_sondage.php:130 +msgid "Enter a title" +msgstr "Introducza un título" + +#: infos_sondage.php:133 +#: infos_sondage.php:138 +#: infos_sondage.php:150 +msgid "Characters < > and \" are not permitted" +msgstr "Los caracteres < > y \" no estan autorizados!" + +#: infos_sondage.php:136 +msgid "Comments: " +msgstr "Comentarios : " + +#: infos_sondage.php:141 +msgid "Your name*: " +msgstr "Su nombre *: " + +#: infos_sondage.php:147 +#: contacts.php:119 +msgid "Enter a name" +msgstr "Introduzca un nombre" + +#: infos_sondage.php:153 +msgid "Your e-mail address *: " +msgstr "Su dirección electrónica *: " + +#: infos_sondage.php:159 +msgid "Enter an email address" +msgstr "Introduzca una dirección electrónica" + +#: infos_sondage.php:162 +msgid "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)" +msgstr "La dirección electrónica no está correcta! (Introduzca una dirección electrónica valida para recibir el enlace de su encuesta)" + +#: infos_sondage.php:173 +msgid "The fields marked with * are required!" +msgstr "Los campos con una * estan obligatorios!" + +#: infos_sondage.php:179 +msgid " Voters can modify their vote themselves." +msgstr " Los encuentados pueden cambiar su línea ellos mismos." + +#: infos_sondage.php:181 +msgid " To receive an email for each new vote." +msgstr " Usted quiere recibir un correo electónico cada vez que alguien participe a la encuesta." + +#: infos_sondage.php:185 +msgid "Schedule an event" +msgstr "Encuesta para planificar un evento" + +#: infos_sondage.php:187 +msgid "Make a choice" +msgstr "Encuesta para otras cosas" + +#: infos_sondage.php:188 +#: index.php:73 +msgid "Make a poll" +msgstr "Crear una encuesta" + +#: contacts.php:56 +msgid "[CONTACT] You have sent a question " +msgstr "[CONTACT] Envia de pregunta " + +#: contacts.php:56 +msgid "You have a question from a user " +msgstr "Hay une pregunta de usuario de " + +#: contacts.php:56 +msgid "User" +msgstr "Usuario" + +#: contacts.php:56 +msgid "User's email address" +msgstr "Dirección electrónica del usuario" + +#: contacts.php:56 +msgid "Message" +msgstr "Mensaje" + +#: contacts.php:59 +msgid "[COPY] Someone has sent a question " +msgstr "[COPIA] Envia de pregunta " + +#: contacts.php:59 +msgid "Here is a copy of your question" +msgstr "Eso es una copia de su pregunta" + +#: contacts.php:59 +msgid "We're going to answer your question shortly." +msgstr "Nos tomaremos en cuenta vuestro mensaje rapidamente." + +#: contacts.php:59 +#: studs.php:171 +#: studs.php:211 +#: adminstuds.php:273 +#: adminstuds.php:379 +#: adminstuds.php:500 +#: adminstuds.php:510 +#: adminstuds.php:522 +#: adminstuds.php:1022 +msgid "Thanks for your confidence." +msgstr "Gracias por su confianza." + +#: contacts.php:76 +msgid "Your message has been sent!" +msgstr "Su mensaje ha sido buen expedido!" + +#: contacts.php:113 +msgid "If you have questions, you can send a message here." +msgstr "Para todas preguntas, Usted puede dejar un mensaje con este pagina." + +#: contacts.php:115 +msgid "Your name" +msgstr "Su nombre" + +#: contacts.php:123 +msgid "Your email address " +msgstr "Su dirección electrónica " + +#: contacts.php:129 +msgid "Question" +msgstr "Pregunta" + +#: contacts.php:138 +msgid "Send your question" +msgstr "Enviar su pregunta" + +#: studs.php:87 +#: adminstuds.php:78 +msgid "This poll doesn't exist !" +msgstr "Este encuesta no existe!" + +#: studs.php:118 +msgid "anonyme" +msgstr "" + +#: studs.php:171 +#: studs.php:211 +msgid "Poll's participation" +msgstr "Participación a la encuesta" + +#: studs.php:171 +#: studs.php:211 +msgid "" +"has filled a line.\n" +"You can find your poll at the link" +msgstr "" +"acaba de llenar una línea.\n" +"Usted puede retroceder a su encuesta con el enlace siguiente" + +#: studs.php:246 +#: adminstuds.php:567 +msgid "Initiator of the poll" +msgstr "Autor dela encuesta" + +#: studs.php:250 +#: studs.php:540 +#: adminstuds.php:571 +#: adminstuds.php:964 +msgid "Comments" +msgstr "Comentarios" + +#: studs.php:261 +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." +msgstr "Para participar a esta encuesta, introduzca su nombre, elige todas las valores que son apriopriadas
(sin tener en cuenta los otros encuestados) y validar su seleccion con el botón verde a la fin de línea." + +#: studs.php:445 +#: adminstuds.php:806 +msgid "Addition" +msgstr "Suma" + +#: studs.php:473 +#: adminstuds.php:836 +msgid "Enter a name !" +msgstr "Introduzca un nombre!" + +#: studs.php:476 +#: adminstuds.php:841 +msgid "The name you've chosen already exist in this poll!" +msgstr "El nombre entrado existe ya!" + +#: studs.php:479 +#: adminstuds.php:846 +msgid "Characters \" ' < et > are not permitted" +msgstr "Los caracteres \" ' < y > no estan autorizados!" + +#: studs.php:503 +#: studs.php:505 +#: adminstuds.php:876 +#: adminstuds.php:878 +msgid "for" +msgstr "por" + +#: studs.php:505 +#: studs.php:511 +msgid "%A, den %e. %B %Y" +msgstr "%A %e de %B %Y" + +#: studs.php:522 +#: adminstuds.php:899 +msgid "vote" +msgstr "voto" + +#: studs.php:524 +#: adminstuds.php:901 +msgid "votes" +msgstr "votos" + +#: studs.php:528 +#: adminstuds.php:905 +msgid "The best choice at this time is" +msgstr "El mejor elección por el momento esta" + +#: studs.php:528 +#: studs.php:531 +#: adminstuds.php:905 +#: adminstuds.php:908 +msgid "with" +msgstr "con" + +#: studs.php:531 +#: adminstuds.php:908 +msgid "The bests choices at this time are" +msgstr "Los mejores elecciones por el momento estan" + +#: studs.php:548 +#: adminstuds.php:974 +msgid "Enter a name and a comment!" +msgstr "Introduzca su nombre y un comentario!" + +#: studs.php:552 +#: adminstuds.php:978 +msgid "Add a comment in the poll" +msgstr "Dejar un comentario en la encuesta" + +#: studs.php:555 +#: adminstuds.php:979 +msgid "Name" +msgstr "Su nombre" + +#: studs.php:563 +msgid "Export: Spreadsheet" +msgstr "Exportar : Hoja de cálculo" + +#: studs.php:565 +msgid "Agenda" +msgstr "Agenda" + +#: index.php:70 +msgid "What is it about?" +msgstr "¿Por qué esto?" + +#: index.php:71 +msgid "Making polls to schedule meetings or events, quickly and easily.
You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." +msgstr "Hacer encuestas para planificar un evento como una reuníon de trabajo o una sortida al cine. Sirve de definir la mejora fecha por todos.
Usted puede también utilizarlo para espicificar su preferencia entre películas, destinos de viaje o cualquier otra selección." + +#: choix_autre.php:144 +msgid "Your poll aim is to make a choice between different subjects.
Enter the subjects to vote for:" +msgstr "Usted ha eligiendo de crear une nueva encuesta!
Introducza las differentes opciones :" + +#: choix_autre.php:150 +msgid "Choice" +msgstr "Opciòn" + +#: choix_autre.php:162 +msgid "5 choices more" +msgstr "Para añadir 5 campos de texto" + +#: choix_autre.php:177 +msgid "Enter at least one choice" +msgstr "Introduzca por lo menos un campo!" + +#: choix_autre.php:182 +msgid "Characters \" < and > are not permitted" +msgstr "Los caracteres \" < y > no estan autorizados!" + +#: choix_autre.php:191 +msgid "Your poll will be automatically removed after 6 months.
You can fix another removal date for it." +msgstr "Su encuesta será automaticamente borrado dentro de 6 meses.
Mientras, usted puede cambiar este fecha aquí." + +#: choix_autre.php:193 +msgid "Removal date (optional)" +msgstr "Fecha de fin (opcional)" + +#: choix_autre.php:193 +msgid "(DD/MM/YYYY)" +msgstr "(DD/MM/AAAA)" + +#: adminstuds.php:114 +msgid "Column's adding" +msgstr "Añadido de columna" + +#: adminstuds.php:117 +msgid "Add a new column" +msgstr "Para añadir una columna" + +#: adminstuds.php:121 +msgid "You can add a new scheduling date to your poll.
If you just want to add a new hour to an existant date, put the same date and choose a new hour." +msgstr "Usted puede añadir una fecha por su encuesta. Si la fecha existe ya y que usted vuele solamente añadire un horario,
pone la fecha entera con el nuevo horario o el nuevo hueco y fuera normalemente añado a la encuesta." + +#: adminstuds.php:122 +msgid "Add a date" +msgstr "Para añadir una fecha" + +#: adminstuds.php:143 +msgid "Add a start hour (optional)" +msgstr "Para añadir un horario de principio (optional)" + +#: adminstuds.php:157 +msgid "Add a end hour (optional)" +msgstr "Para añadir un horario de fin (optional)" + +#: adminstuds.php:273 +#: adminstuds.php:378 +msgid "[ADMINISTRATOR] New column for your poll" +msgstr "[ADMINISTRADOR] Añado de una nueva columna a la encuesta" + +#: adminstuds.php:273 +#: adminstuds.php:379 +msgid "" +"You have added a new column in your poll. \n" +"You can inform the voters of this change with this link" +msgstr "" +"Usted ha añado una nueva columna en su encuesta. \n" +"Usted puede informar sus usuarios de este cambio con el enlace siguiente" + +#: adminstuds.php:498 +msgid "[ADMINISTRATOR] New title for your poll" +msgstr "[ADMINISTRADOR] Cambio del titulo dela encuesta" + +#: adminstuds.php:499 +msgid "" +"You have changed the title of your poll. \n" +"You can modify this poll with this link" +msgstr "" +"Usted ha añado el titulo de su encuesta. \n" +"Usted puede cambiar su encuesta al enlace siguiente" + +#: adminstuds.php:510 +msgid "[ADMINISTRATOR] New comments for your poll" +msgstr "[ADMINISTRADOR] Cambio des los comentarios dela encuesta" + +#: adminstuds.php:510 +msgid "" +"You have changed the comments of your poll. \n" +"You can modify this poll with this link" +msgstr "" +"Usted ha cambiado los commentarios de su encuesta. \n" +"Usted puede cambiar su encuesta al enlace siguiente" + +#: adminstuds.php:520 +msgid "[ADMINISTRATOR] New email address for your poll" +msgstr "[ADMINISTRADOR] Cambio de su Dirección electrónica" + +#: adminstuds.php:521 +msgid "" +"You have changed your email address in your poll. \n" +"You can modify this poll with this link" +msgstr "" +"Usted ha cambiado su dirección elestrónica. \n" +"Usted puede cambiar su encuesta al enlace siguiente" + +#: adminstuds.php:582 +msgid "As poll administrator, you can change all the lines of this poll with \"infos\".
You can, as well, remove a column or a line with \"Cancel\".
You can also add a new column with \"Add.
Finally, you can change the informations of this poll like the title, the comments or your email address." +msgstr "En calidad de administrador, Usted puede cambiar todas la líneas de este encuesta con \"Icone.
Usted puede también borrar una columna o una línea con \"Annuler\".
Usted puede añadir une nueva columna con \"Annuler\"
. Para acabar, Usted puede cambiar las informaciones relativas
a su encuesta como el titulo, los comentarios o ademas su dirección electrónica." + +#: adminstuds.php:851 +msgid "The date is not correct !" +msgstr "La fecha no esta correcta!" + +#: adminstuds.php:916 +msgid "Poll's management" +msgstr "Administración de su encuesta" + +#: adminstuds.php:921 +msgid "Change the title" +msgstr "Cambiar el titulo dela encuesta" + +#: adminstuds.php:928 +msgid "Generate the convocation letter (.PDF), choose the place to meet and validate" +msgstr "Producir la letra de convocación (en PDF), elige un lugar de reunión y valida" + +#: adminstuds.php:939 +msgid "Enter a meeting place!" +msgstr "Introduzca un lugar de reunión !" + +#: adminstuds.php:944 +msgid "Enter a new title!" +msgstr "Introduzca un nuevo titulo!" + +#: adminstuds.php:948 +msgid "Change the comments" +msgstr "Cambiar los commentarios dela encuesta" + +#: adminstuds.php:952 +msgid "Change your email address" +msgstr "Cambiar su dirección eletrónica" + +#: adminstuds.php:956 +msgid "Enter a new email address!" +msgstr "Introduzca una nuva dirección eletrónica!" + +#: adminstuds.php:985 +msgid "Remove your poll" +msgstr "Borrar su encuesta" + +#: adminstuds.php:985 +msgid "Remove the poll" +msgstr "Borrada de encuesta" + +#: adminstuds.php:988 +msgid "Confirm removal of your poll" +msgstr "Confirmar la borrada de su encuesta" + +#: adminstuds.php:988 +msgid "Remove this poll!" +msgstr "Borrar este encuesta!" + +#: adminstuds.php:989 +msgid "Keep this poll!" +msgstr "Dejar este encuesta!" + +#: adminstuds.php:1022 +msgid "[ADMINISTRATOR] Removing of your poll" +msgstr "[ADMINISTRADOR] Borrada de su encuesta" + +#: adminstuds.php:1022 +msgid "" +"You have removed your poll. \n" +"You can make new polls with this link" +msgstr "" +"Usted ha sido la borrada de su encuesta. \n" +"Usted puede hacer nuevas encuestas al enlace siguiente" + +#: adminstuds.php:1043 +msgid "Your poll has been removed!" +msgstr "Su encuesta ha sido borrado!" + +#: admin/index.php:82 +msgid "Confirm removal of the poll " +msgstr "Confirmar el borrado dela encuesta" + +#: admin/index.php:112 +msgid "polls in the database at this time" +msgstr "encuestas en la basa por el momento" + +#: admin/index.php:117 +msgid "Poll ID" +msgstr "ID encuesta" + +#: admin/index.php:117 +msgid "Format" +msgstr "Formato" + +#: admin/index.php:117 +msgid "Title" +msgstr "Titulo" + +#: admin/index.php:117 +msgid "Author" +msgstr "Autor" + +#: admin/index.php:117 +msgid "Expiration's date" +msgstr "Fecha de fin" + +#: admin/index.php:117 +msgid "Users" +msgstr "Usuarios" + +#: admin/index.php:117 +msgid "Actions" +msgstr "Acciones" + +#: admin/index.php:140 +msgid "See the poll" +msgstr "Ver la encuesta" + +#: admin/index.php:141 +msgid "Change the poll" +msgstr "Cambiar la encuesta" + +#~ msgid "january" +#~ msgstr "enero" +#~ msgid "february" +#~ msgstr "febrero" +#~ msgid "march" +#~ msgstr "marzo" +#~ msgid "april" +#~ msgstr "abril" +#~ msgid "may" +#~ msgstr "mayo" +#~ msgid "june" +#~ msgstr "junio" +#~ msgid "july" +#~ msgstr "julio" +#~ msgid "august" +#~ msgstr "agosto" +#~ msgid "september" +#~ msgstr "septiembre" +#~ msgid "october" +#~ msgstr "octubre" +#~ msgid "november" +#~ msgstr "noviembre" +#~ msgid "december" +#~ msgstr "diciembre" +#~ msgid "Sources" +#~ msgstr "Fuentes" +#~ msgid "Back" +#~ msgstr "Retroceder" +#~ msgid "" +#~ "Here are the sources of " +#~ msgstr "" +#~ "Las fuentes de " + diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo new file mode 100644 index 0000000000000000000000000000000000000000..8129fa983c6d659c21839a71c5bc0fc736c60c43 GIT binary patch literal 18901 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

uWt%c~a26QCyz=P>W+x0ukhN)KQ4Okg%Kr;M zXB6kvS)j8XNHGFFGaLqD*u;)c&-%%^kbeE_5G$<-Q?#+x)iC;e-7vC@P(5ncOIIWd zqU;rdnnZ1DB-q-4cZn_0perm#=3p-7dxyXk=iwULESr7zU_q6+8p_B{zg(c@t{p9U z^KxtBjf<5lhp>yK^nj8_&Vw>2KJIp=A~1@*Ao5Ga8dMB1ibWQm`xvzueT;mEt64Nf z3ziKd8<<8^VHJp>Z;!Xy=M1$885$jFm{l^GqTF)tKpVo*SD;JJ~|5A4n2=*Evi8oIW(7Ig#23hJbi|w zP$p~scf&48oOMObgd%AD5zJy8n?pTveP26n5HWn@;mKnx5K)-C<$a?pmnJoMMRbOK zk6WSKn-sr`0mUq3Y-BC#RNIxTS+KllQ>ye1^aK|2A8jl)g*aBoHG5%!I4Y#YENEct!=A}+wl~7s4fQ4XQ!z7lg?3v06?$;ez69k)5R2W=e zwuEq_j{NEx9GqFvr~FfXzF`{4CTsPPd>FW1ZFt5EkM8&!3`Vq4T`rak; zU%MO)x02kIcCnlFu2)TlHeQ2VKbu5_*=Y%(i&W56_@H@=$A7xEm*>tlB^{z*y@%g{E781&(Q3nX!8yz}Q^=b3;T`o? zI!Z2VOQQBV_Ib{s{rAP2+zMaioO?9#LLE_kMAXIP5CzDG*#>KC#IBRh_zKpDG$^AS xvF*bF+r)YnDAbI?zh?bG7o!t--XWB7cgTW$ch2SzRVC+ZBdM7EsUnd!`fpk%OzHpt literal 0 HcmV?d00001 diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po new file mode 100644 index 0000000..8ba13ae --- /dev/null +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -0,0 +1,859 @@ +msgid "" +msgstr "" +"Project-Id-Version: Studs 0.6.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-02-23 16:15+0100\n" +"PO-Revision-Date: 2011-02-23 16:16+0100\n" +"Last-Translator: Raphaël Droz \n" +"Language-Team: Guilhem Borghesi, Raphaël Droz\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: French\n" +"X-Poedit-Country: FRANCE\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-KeywordsList: _\n" +"X-Poedit-Basepath: /var/www/studs\n" +"X-Poedit-SearchPath-0: .\n" + +#: exportpdf.php:62 +msgid " Convocation" +msgstr "Convocation" + +#: exportpdf.php:64 +msgid "Hello," +msgstr "Bonjour," + +#: exportpdf.php:66 +msgid "You're invited at the meeting" +msgstr "Vous êtes invité à la réunion" + +#: exportpdf.php:69 +msgid "Informations about the meeting" +msgstr "Information à propos de la réunion" + +#: exportpdf.php:72 +msgid "Date" +msgstr "Date" + +#: exportpdf.php:72 +msgid "at" +msgstr "à" + +#: exportpdf.php:73 +msgid "Place" +msgstr "Lieu" + +#: exportpdf.php:75 +msgid "Cordially," +msgstr "Cordiallement" + +#: choix_autre.php:60 +#: choix_date.php:61 +#: studs.php:175 +#: adminstuds.php:70 +msgid "Error!" +msgstr "Erreur !" + +#: choix_autre.php:62 +#: choix_date.php:63 +msgid "You haven't filled the first section of the poll creation." +msgstr "Vous n'avez pas renseigné la première page du sondage" + +#: choix_autre.php:63 +#: choix_date.php:64 +#: adminstuds.php:73 +#: adminstuds.php:274 +msgid "Back to the homepage of " +msgstr "Retournez à la page d'accueil de" + +#: choix_autre.php:140 +msgid "Poll subjects (2 on 2)" +msgstr "Choix des sujets (2 sur 2)" + +#: choix_autre.php:144 +msgid "Your poll aim is to make a choice between different subjects.
Enter the subjects to vote for:" +msgstr "Vous avez créé un sondage pour déterminer un choix entre plusieurs choses
Entrez les différents choix à proposer au vote :" + +#: choix_autre.php:150 +msgid "Choice" +msgstr "Choix" + +#: choix_autre.php:162 +msgid "5 choices more" +msgstr "Pour ajouter 5 cases supplémentaires" + +#: choix_autre.php:167 +#: choix_date.php:535 +msgid "Next" +msgstr "Continuer" + +#: choix_autre.php:177 +msgid "Enter at least one choice" +msgstr "Il faut remplir au moins un champ !" + +#: choix_autre.php:182 +msgid "Characters \" < and > are not permitted" +msgstr "Les caractères \" < et > ne sont pas autorisés !" + +#: choix_autre.php:191 +msgid "Your poll will be automatically removed after 6 months.
You can fix another removal date for it." +msgstr "Votre sondage sera automatiquement effacé dans 6 mois.
Néanmoins vous pouvez décider ci-dessous d'une date plus rapprochée pour la destruction de votre sondage." + +#: choix_autre.php:193 +msgid "Removal date (optional)" +msgstr "Date de fin (optionnelle)" + +#: choix_autre.php:193 +msgid "(DD/MM/YYYY)" +msgstr "(JJ/MM/AAAA)" + +#: choix_autre.php:196 +#: choix_date.php:554 +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgstr "Une fois que vous aurez confirmé la création du sondage, vous serez redirigé automatiquement vers la page de votre sondage.

En même temps, vous recevrez un courrier électronique contenant le lien vers votre sondage pour le faire suivre aux futurs sondés." + +#: choix_autre.php:201 +#: choix_date.php:561 +msgid "Create the poll" +msgstr "Créer le sondage" + +#: infos_sondage.php:107 +msgid "Poll creation (1 on 2)" +msgstr "Création de sondage (1 sur 2)" + +#: infos_sondage.php:113 +msgid "STUdS is not properly installed, please check the 'INSTALL' to setup the database before continuing" +msgstr "STUdS n'est pas correctement installé, merci de vous référer au fichier INSTALL pour initialiser la base de données avant de continuer." + +#: infos_sondage.php:125 +msgid "You are in the poll creation section.
Required fields cannot be left blank" +msgstr "Vous avez choisi de créer un nouveau sondage !
Merci de remplir les champs obligatoires." + +#: infos_sondage.php:130 +msgid "Poll title *: " +msgstr "Titre du sondage * : " + +#: infos_sondage.php:132 +msgid "Enter a title" +msgstr "Il faut remplir un titre !" + +#: infos_sondage.php:135 +#: infos_sondage.php:140 +#: infos_sondage.php:152 +msgid "Characters < > and \" are not permitted" +msgstr "Les caractères < > et \" ne sont pas autorisés !" + +#: infos_sondage.php:138 +msgid "Comments: " +msgstr "Commentaires : " + +#: infos_sondage.php:143 +msgid "Your name*: " +msgstr "Votre nom * : " + +#: infos_sondage.php:149 +msgid "Enter a name" +msgstr "Il faut remplir un nom !" + +#: infos_sondage.php:155 +msgid "Your e-mail address *: " +msgstr "Votre adresse e-mail * : " + +#: infos_sondage.php:161 +msgid "Enter an email address" +msgstr "Il faut remplir une adresse !" + +#: infos_sondage.php:164 +msgid "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)" +msgstr "L'adresse saisie n'est pas correcte ! (Il faut une adresse valide pour recevoir le lien vers le sondage)" + +#: infos_sondage.php:176 +msgid "The fields marked with * are required!" +msgstr "Les champs marqués d'une étoile * sont obligatoires !" + +#: infos_sondage.php:182 +msgid " Voters can modify their vote themselves." +msgstr " Vous souhaitez que les sondés puissent modifier leur ligne eux-mêmes." + +#: infos_sondage.php:184 +msgid " To receive an email for each new vote." +msgstr " Vous souhaitez recevoir un mail à chaque participation d'un sondé." + +#: infos_sondage.php:188 +msgid "Schedule an event" +msgstr "Sondage pour choisir une date" + +#: infos_sondage.php:190 +msgid "Make a choice" +msgstr "Autre sondage" + +#: infos_sondage.php:192 +#: index.php:72 +#: index.php:74 +msgid "Make a poll" +msgstr "Créer un sondage" + +#: choix_date.php:217 +msgid "Poll dates (2 on 2)" +msgstr "Choix des dates (2 sur 2)" + +#: choix_date.php:222 +msgid "Select your dates amoung the free days (green). The selected days are in blue.
You can unselect a day previously selected by clicking again on it." +msgstr "Selectionnez vos dates parmi les jours disponibles qui sont en vert. Une fois selectionnés, les jours apparaissent en bleu.
Vous pouvez également enlever des jours déjà choisis en recliquant sur la case." + +#: choix_date.php:487 +msgid "Selected days" +msgstr "Jour retenus" + +#: choix_date.php:489 +msgid "For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." +msgstr "Pour chacun des jours que vous avez sélectionné, vous avez la possibilité de choisir ou non, des heures de réunion avec ce format :
- vide, si vous ne désirez pas mettre d'horaires particuliers,
- \"8h\", \"8H\" ou \"8:00\" pour proposer une heure de début de réunion,
- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" pour un créneau,
- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" pour un créneau avec minutes." + +#: choix_date.php:496 +msgid "Time" +msgstr "Horaire" + +#: choix_date.php:509 +#: choix_date.php:550 +#: studs.php:517 +#: studs.php:523 +#: adminstuds.php:926 +#: adminstuds.php:932 +msgid "%A, den %e. %B %Y" +msgstr "%A %e %B %Y" + +#: choix_date.php:524 +msgid "Bad format!" +msgstr "Format incorrect !" + +#: choix_date.php:533 +msgid "Remove all days" +msgstr "Effacer tous les jours" + +#: choix_date.php:533 +msgid "Copy hours of the first day" +msgstr "Reporter les horaires du premier jour" + +#: choix_date.php:533 +msgid "Remove all hours" +msgstr "Effacer tous les horaires" + +#: choix_date.php:539 +msgid "Enter more choices for the voters" +msgstr "Cela ne laisse pas assez de choix aux participants !" + +#: choix_date.php:551 +msgid "Your poll will expire automatically 2 days after the last date of your poll." +msgstr "Votre sondage sera automatiquement effacé après la date la plus tardive." + +#: choix_date.php:551 +msgid "Removal date" +msgstr "Date de destruction" + +#: choix_date.php:560 +msgid "Back to hours" +msgstr "Retourner aux horaires" + +#: apropos.php:65 +#: bandeaux.php:74 +msgid "About" +msgstr "Informations générales" + +#: bandeaux.php:70 +#: bandeaux.php:84 +#: bandeaux.php:96 +msgid "Home" +msgstr "Accueil" + +#: bandeaux.php:71 +msgid "Example" +msgstr "Exemple" + +#: bandeaux.php:72 +msgid "Contact" +msgstr "Contact" + +#: bandeaux.php:75 +msgid "Admin" +msgstr "Admin" + +#: bandeaux.php:86 +msgid "Logs" +msgstr "Historique" + +#: bandeaux.php:87 +msgid "Cleaning" +msgstr "Nettoyage" + +#: bandeaux.php:106 +#: bandeaux.php:110 +msgid "Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009" +msgstr "Université de Strasbourg. Création : Guilhem BORGHESI. 2008-2009" + +#: studs.php:95 +msgid "anonyme" +msgstr "anonyme" + +#: studs.php:153 +#: studs.php:283 +msgid "Poll's participation" +msgstr "Participation au sondage" + +#: studs.php:156 +#: studs.php:283 +msgid "" +"has filled a line.\n" +"You can find your poll at the link" +msgstr "" +" vient de remplir une ligne.\n" +"Vous pouvez retrouver votre sondage au lien suivant" + +#: studs.php:158 +#: studs.php:283 +#: adminstuds.php:107 +#: adminstuds.php:125 +#: adminstuds.php:144 +#: adminstuds.php:256 +#: adminstuds.php:395 +#: adminstuds.php:500 +msgid "Thanks for your confidence." +msgstr "Merci de votre confiance." + +#: studs.php:171 +#: index.php:64 +#: adminstuds.php:161 +#: adminstuds.php:270 +#: adminstuds.php:314 +msgid "Make your polls" +msgstr "Se Trouver à l'Université de Strasbourg" + +#: studs.php:179 +#: adminstuds.php:884 +msgid "Enter a name !" +msgstr "Vous n'avez pas saisi de nom !" + +#: studs.php:182 +#: adminstuds.php:889 +msgid "The name you've chosen already exist in this poll!" +msgstr "Le nom que vous avez choisi existe déjà !" + +#: studs.php:186 +#: adminstuds.php:1022 +msgid "Enter a name and a comment!" +msgstr "Merci de remplir les deux champs !" + +#: studs.php:190 +msgid "Failed to insert the comment!" +msgstr "Échec à l'insertion du commentaire !" + +#: studs.php:197 +#: adminstuds.php:72 +msgid "This poll doesn't exist !" +msgstr "Ce sondage n'existe pas !" + +#: studs.php:198 +msgid "Back to the homepage of" +msgstr "Retournez à la page d'accueil de" + +#: studs.php:217 +#: adminstuds.php:324 +msgid "Initiator of the poll" +msgstr "Auteur du sondage" + +#: studs.php:221 +#: adminstuds.php:328 +#: adminstuds.php:1012 +msgid "Comments" +msgstr "Commentaires des sondés" + +#: studs.php:238 +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." +msgstr "Pour participer à ce sondage, veuillez entrer votre nom, choisir toutes les valeurs qui vous conviennent
(sans tenir compte des disponibilités des autres sondés) et valider votre choix avec le bouton en bout de ligne." + +#: studs.php:456 +msgid "Participate" +msgstr "Participation au sondage" + +#: studs.php:474 +#: adminstuds.php:854 +msgid "Addition" +msgstr "Somme" + +#: studs.php:487 +msgid "Best choice" +msgstr "Meilleur choix" + +#: studs.php:515 +#: studs.php:517 +#: adminstuds.php:924 +#: adminstuds.php:926 +msgid "for" +msgstr "à" + +#: studs.php:534 +#: adminstuds.php:947 +msgid "vote" +msgstr "vote" + +#: studs.php:536 +#: adminstuds.php:949 +msgid "votes" +msgstr "votes" + +#: studs.php:542 +msgid "The best choice at this time is:" +msgstr "Le meilleur choix pour l'instant est :" + +#: studs.php:542 +#: studs.php:545 +#: adminstuds.php:953 +#: adminstuds.php:956 +msgid "with" +msgstr "avec" + +#: studs.php:545 +msgid "The bests choices at this time are:" +msgstr "Les meilleurs choix pour l'instant sont :" + +#: studs.php:554 +msgid "Comments of polled people" +msgstr "Commentaires de sondés" + +#: studs.php:563 +msgid "Add a comment in the poll:" +msgstr "Ajoutez un commentaire dans ce sondage :" + +#: studs.php:566 +#: adminstuds.php:1027 +msgid "Name" +msgstr "Nom" + +#: studs.php:578 +msgid "Export to CSV" +msgstr "Export to CSV" + +#: studs.php:580 +msgid "Export: Spreadsheet" +msgstr "Export : Tableur" + +#: studs.php:587 +msgid "Export iCal" +msgstr "Export iCal" + +#: studs.php:589 +msgid "Agenda" +msgstr "Agenda" + +#: index.php:69 +msgid "What is it about?" +msgstr "A quoi ça sert ?" + +#: index.php:70 +msgid "Making polls to schedule meetings or events, quickly and easily.
You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." +msgstr "A faire des sondages pour que vous puissiez trouver une date de réunion qui convienne à toutes les personnes concernées.
Vous pouvez également utiliser cette application pour déterminer à plusieurs un choix quelconque comme un lieu de RV, un thème de réunion ou la marque de votre prochaine machine à café." + +#: creation_sondage.php:88 +msgid "For sending to the polled users" +msgstr "Pour diffusion aux sondés" + +#: creation_sondage.php:88 +#: creation_sondage.php:89 +msgid "Poll" +msgstr "Sondage" + +#: creation_sondage.php:88 +msgid "" +"This is the message you have to send to the people you want to poll. \n" +"Now, you have to send this message to everyone you want to poll." +msgstr "" +"Ceci est le message qui doit être envoyé aux sondés. \n" +"Vous pouvez maintenant transmettre ce message à toutes les personnes susceptibles de participer au vote." + +#: creation_sondage.php:88 +msgid "hast just created a poll called" +msgstr " vient de créer un sondage intitulé " + +#: creation_sondage.php:88 +msgid "Thanks for filling the poll at the link above" +msgstr "Merci de bien vouloir remplir le sondage à l'adresse suivante" + +#: creation_sondage.php:88 +#: creation_sondage.php:91 +msgid "Thanks for your confidence" +msgstr "Merci de votre confiance" + +#: creation_sondage.php:89 +msgid "Author's message" +msgstr "Réservé à l'auteur" + +#: creation_sondage.php:90 +msgid "" +"This message should NOT be sended to the polled people. It is private for the poll's creator.\n" +"\n" +"You can now modify it at the link above" +msgstr "" +"Ce message ne doit PAS être diffusé aux sondés. Il est réservé à l'auteur du sondage.\n" +"\n" +"Vous pouvez modifier ce sondage à l'adresse suivante " + +#: adminstuds.php:104 +msgid "[ADMINISTRATOR] New title for your poll" +msgstr "[ADMINISTRATEUR] Changement du titre du sondage avec " + +#: adminstuds.php:105 +msgid "" +"You have changed the title of your poll. \n" +"You can modify this poll with this link" +msgstr "" +"Vous avez fait la modification du titre de votre sondage. \n" +"Vous pouvez modifier ce sondage au lien suivant" + +#: adminstuds.php:122 +msgid "[ADMINISTRATOR] New comments for your poll" +msgstr "[ADMINISTRATEUR] Changement des commentaires du sondage avec " + +#: adminstuds.php:123 +msgid "" +"You have changed the comments of your poll. \n" +"You can modify this poll with this link" +msgstr "" +"Vous avez fait la modification des commentaires de votre sondage. \n" +"Vous pouvez modifier ce sondage au lien suivant" + +#: adminstuds.php:141 +msgid "[ADMINISTRATOR] New email address for your poll" +msgstr "[ADMINISTRATEUR] Changement d'adresse électronique de l'administrateur avec " + +#: adminstuds.php:142 +msgid "" +"You have changed your email address in your poll. \n" +"You can modify this poll with this link" +msgstr "" +"Vous avez fait la modification de votre adresse mail. \n" +"Vous pouvez modifier ce sondage au lien suivant" + +#: adminstuds.php:168 +msgid "Column's adding" +msgstr "Ajout de colonne" + +#: adminstuds.php:171 +msgid "Add a new column" +msgstr "Si vous souhaitez ajouter une colonne" + +#: adminstuds.php:175 +msgid "You can add a new scheduling date to your poll.
If you just want to add a new hour to an existant date, put the same date and choose a new hour." +msgstr "Vous pouvez ajouter une date à votre sondage. Si la date existe déjà et que vous ne voulez que rajouter un horaire,
mettez le jour en entier avec l'horaire ou le créneau supplémentaire il sera intégré normalement au sondage existant." + +#: adminstuds.php:176 +msgid "Add a date" +msgstr "Pour ajouter une date" + +#: adminstuds.php:197 +msgid "Add a start hour (optional)" +msgstr "Pour ajouter un horaire de début (optionnel)" + +#: adminstuds.php:211 +msgid "Add a end hour (optional)" +msgstr "Pour ajouter un horaire de fin (optionnel)" + +#: adminstuds.php:253 +msgid "[ADMINISTRATOR] Removing of your poll" +msgstr "[ADMINISTRATEUR] Suppression de sondage avec " + +#: adminstuds.php:254 +msgid "" +"You have removed your poll. \n" +"You can make new polls with this link" +msgstr "" +"Vous avez fait la suppression d'un sondage. \n" +"Vous pouvez faire de nouveaux sondages au lien suivant" + +#: adminstuds.php:273 +msgid "Your poll has been removed!" +msgstr "Votre sondage a été supprimé !" + +#: adminstuds.php:395 +#: adminstuds.php:499 +msgid "[ADMINISTRATOR] New column for your poll" +msgstr "[ADMINISTRATEUR] Ajout d'une nouvelle colonne au sondage " + +#: adminstuds.php:395 +#: adminstuds.php:500 +msgid "" +"You have added a new column in your poll. \n" +"You can inform the voters of this change with this link" +msgstr "" +"Vous avez fait l'ajout d'une colonne dans votre sondage. \n" +"Vous pouvez informer vos utilisateurs de ce changement en leur envoyant l'adresse suivante" + +#: adminstuds.php:630 +msgid "As poll administrator, you can change all the lines of this poll with \"infos\".
You can, as well, remove a column or a line with \"Cancel\".
You can also add a new column with \"Add.
Finally, you can change the informations of this poll like the title, the comments or your email address." +msgstr "En tant qu'administrateur, vous pouvez modifier toutes les lignes de ce sondage avec \"Icone.
Vous avez aussi la possibilité d'effacer une colonne ou une ligne avec \"Annuler\".
Si vous avez oublié de mettre un choix vous pouvez rajouter une colonne en cliquant sur \"Annuler\"
en bout de ligne des noms de colonne. Vous pouvez enfin également modifier les informations
relatives à ce sondage comme le titre, les commentaires ou encore votre adresse électronique." + +#: adminstuds.php:669 +#: adminstuds.php:689 +#: adminstuds.php:708 +#: adminstuds.php:720 +#: adminstuds.php:738 +#: adminstuds.php:837 +msgid "Add" +msgstr "Ajouter" + +#: adminstuds.php:894 +msgid "Characters \" ' < et > are not permitted" +msgstr "Les caractères \" ' < et > ne sont pas autorisés !" + +#: adminstuds.php:899 +msgid "The date is not correct !" +msgstr "La date choisie n'est pas correcte !" + +#: adminstuds.php:953 +msgid "The best choice at this time is" +msgstr "Le meilleur choix pour l'instant est" + +#: adminstuds.php:956 +msgid "The bests choices at this time are" +msgstr "Les meilleurs choix pour l'instant sont" + +#: adminstuds.php:964 +msgid "Poll's management" +msgstr "Gestion de votre sondage" + +#: adminstuds.php:969 +msgid "Change the title" +msgstr "Si vous souhaitez changer le titre du sondage" + +#: adminstuds.php:976 +msgid "Generate the convocation letter (.PDF), choose the place to meet and validate" +msgstr "Si vous souhaitez produire la lettre de convocation (en PDF), choississez un lieu de réunion et validez" + +#: adminstuds.php:987 +msgid "Enter a meeting place!" +msgstr "Veuillez entrer un lieu de réunion !" + +#: adminstuds.php:992 +msgid "Enter a new title!" +msgstr "Veuillez entrer un nouveau titre !" + +#: adminstuds.php:996 +msgid "Change the comments" +msgstr "Si vous souhaitez changer les commentaires du sondage" + +#: adminstuds.php:1000 +msgid "Change your email address" +msgstr "Si vous souhaitez changer votre adresse de courrier électronique" + +#: adminstuds.php:1004 +msgid "Enter a new email address!" +msgstr "Veuillez entrer une nouvelle adresse !" + +#: adminstuds.php:1026 +msgid "Add a comment in the poll" +msgstr "Ajoutez un commentaire dans ce sondage" + +#: adminstuds.php:1033 +msgid "Remove your poll" +msgstr "Si vous souhaitez supprimer votre sondage" + +#: adminstuds.php:1033 +msgid "Remove the poll" +msgstr "Suppression du sondage" + +#: adminstuds.php:1033 +msgid "Cancel" +msgstr "Annuler" + +#: adminstuds.php:1036 +msgid "Confirm removal of your poll" +msgstr "Confirmer la suppression de votre sondage" + +#: adminstuds.php:1036 +msgid "Remove this poll!" +msgstr "Je supprime ce sondage !" + +#: adminstuds.php:1037 +msgid "Keep this poll!" +msgstr "Je garde ce sondage !" + +#: contacts.php:56 +msgid "[CONTACT] You have sent a question " +msgstr "[CONTACT] Envoi de question " + +#: contacts.php:56 +msgid "You have a question from a user " +msgstr "Vous avez une question d'utilisateur de " + +#: contacts.php:56 +msgid "User" +msgstr "Utilisateur" + +#: contacts.php:56 +msgid "User's email address" +msgstr "Adresse utilisateur" + +#: contacts.php:56 +msgid "Message" +msgstr "Message" + +#: contacts.php:59 +msgid "[COPY] Someone has sent a question " +msgstr "[COPIE] Envoi de question " + +#: contacts.php:59 +msgid "Here is a copy of your question" +msgstr "Voici une copie de votre question" + +#: contacts.php:59 +msgid "We're going to answer your question shortly." +msgstr "Nous allons prendre en compte votre message rapidement." + +#: contacts.php:76 +msgid "Your message has been sent!" +msgstr "Votre message a bien été envoyé !" + +#: contacts.php:108 +msgid "Contact us" +msgstr "Nous contacter" + +#: contacts.php:113 +msgid "If you have questions, you can send a message here." +msgstr "Pour toutes questions ou suggestions vous pouvez laisser un message via ce formulaire." + +#: contacts.php:115 +msgid "Your name" +msgstr "Votre nom" + +#: contacts.php:123 +msgid "Your email address " +msgstr "Votre adresse électronique " + +#: contacts.php:129 +msgid "Question" +msgstr "Question" + +#: contacts.php:138 +msgid "Send your question" +msgstr "Envoyer votre question" + +#: admin/index.php:64 +msgid "Polls administrator" +msgstr "Administrateur de la base" + +#: admin/index.php:76 +msgid "Confirm removal of the poll " +msgstr "Confirmer la suppression du sondage " + +#: admin/index.php:104 +msgid "polls in the database at this time" +msgstr "sondages dans la base actuellement" + +#: admin/index.php:109 +msgid "Poll ID" +msgstr "ID sondage" + +#: admin/index.php:109 +msgid "Format" +msgstr "Format" + +#: admin/index.php:109 +msgid "Title" +msgstr "Titre" + +#: admin/index.php:109 +msgid "Author" +msgstr "Auteur" + +#: admin/index.php:109 +msgid "Expiration's date" +msgstr "Date d'expiration" + +#: admin/index.php:109 +msgid "Users" +msgstr "Nombre d'utilisateurs" + +#: admin/index.php:109 +msgid "Actions" +msgstr "Actions" + +#: admin/index.php:132 +msgid "See the poll" +msgstr "Voir le sondage" + +#: admin/index.php:133 +msgid "Change the poll" +msgstr "Modifier le sondage" + +#~ msgid "Enter a name!" +#~ msgstr "Vous n'avez pas saisi de nom !" + +#~ msgid "monday" +#~ msgstr "lundi" + +#~ msgid "tuesday" +#~ msgstr "mardi" + +#~ msgid "wednesday" +#~ msgstr "mercredi" + +#~ msgid "thursday" +#~ msgstr "jeudi" + +#~ msgid "friday" +#~ msgstr "vendredi" + +#~ msgid "saturday" +#~ msgstr "samedi" + +#~ msgid "sunday" +#~ msgstr "dimanche" + +#~ msgid "january" +#~ msgstr "janvier" + +#~ msgid "february" +#~ msgstr "février" + +#~ msgid "march" +#~ msgstr "mars" + +#~ msgid "april" +#~ msgstr "avril" + +#~ msgid "may" +#~ msgstr "mai" + +#~ msgid "june" +#~ msgstr "juin" + +#~ msgid "july" +#~ msgstr "juillet" + +#~ msgid "august" +#~ msgstr "août" + +#~ msgid "september" +#~ msgstr "septembre" + +#~ msgid "october" +#~ msgstr "octobre" + +#~ msgid "november" +#~ msgstr "novembre" + +#~ msgid "december" +#~ msgstr "décembre" + +#~ msgid "Sources" +#~ msgstr "Sources" + +#~ msgid "Back" +#~ msgstr "Retour" + +#~ msgid "" +#~ "Here are the sources of " +#~ msgstr "" +#~ "Voila les sources de " diff --git a/maintenance.php b/maintenance.php new file mode 100644 index 0000000..738e013 --- /dev/null +++ b/maintenance.php @@ -0,0 +1,65 @@ +'."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +echo 'Maintenance '.NOMAPPLICATION.' '."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +logo(); +bandeau_tete(); + +echo '

'."\n"; +print "

L'application ".NOMAPPLICATION." est pour l'instant en maintenance.

"."\n"; +print "Merci de votre compréhension."."\n"; +echo '


'."\n"; +echo '
'."\n"; + +// Affichage du bandeau de pied +sur_bandeau_pied(); +bandeau_pied(); +echo ''."\n"; +echo ''."\n"; + +?> diff --git a/php2pdf/font/courier.php b/php2pdf/font/courier.php new file mode 100644 index 0000000..4c009f3 --- /dev/null +++ b/php2pdf/font/courier.php @@ -0,0 +1,7 @@ + diff --git a/php2pdf/font/helvetica.php b/php2pdf/font/helvetica.php new file mode 100644 index 0000000..8fa7683 --- /dev/null +++ b/php2pdf/font/helvetica.php @@ -0,0 +1,15 @@ +278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278, + chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584, + ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667, + 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944, + 'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833, + 'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556, + chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000, + chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333, + chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667, + chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722, + chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556, + chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500); +?> diff --git a/php2pdf/font/helveticab.php b/php2pdf/font/helveticab.php new file mode 100644 index 0000000..a8473c9 --- /dev/null +++ b/php2pdf/font/helveticab.php @@ -0,0 +1,15 @@ +278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278, + chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584, + ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722, + 'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944, + 'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889, + 'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556, + chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000, + chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333, + chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722, + chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722, + chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611, + chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556); +?> diff --git a/php2pdf/font/helveticabi.php b/php2pdf/font/helveticabi.php new file mode 100644 index 0000000..4137953 --- /dev/null +++ b/php2pdf/font/helveticabi.php @@ -0,0 +1,15 @@ +278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278, + chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584, + ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722, + 'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944, + 'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889, + 'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556, + chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000, + chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333, + chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722, + chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722, + chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611, + chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556); +?> diff --git a/php2pdf/font/helveticai.php b/php2pdf/font/helveticai.php new file mode 100644 index 0000000..d5bb6e0 --- /dev/null +++ b/php2pdf/font/helveticai.php @@ -0,0 +1,15 @@ +278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278, + chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584, + ','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667, + 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944, + 'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833, + 'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556, + chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000, + chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333, + chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667, + chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722, + chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556, + chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500); +?> diff --git a/php2pdf/font/makefont/cp1250.map b/php2pdf/font/makefont/cp1250.map new file mode 100644 index 0000000..ec110af --- /dev/null +++ b/php2pdf/font/makefont/cp1250.map @@ -0,0 +1,251 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+20AC Euro +!82 U+201A quotesinglbase +!84 U+201E quotedblbase +!85 U+2026 ellipsis +!86 U+2020 dagger +!87 U+2021 daggerdbl +!89 U+2030 perthousand +!8A U+0160 Scaron +!8B U+2039 guilsinglleft +!8C U+015A Sacute +!8D U+0164 Tcaron +!8E U+017D Zcaron +!8F U+0179 Zacute +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!99 U+2122 trademark +!9A U+0161 scaron +!9B U+203A guilsinglright +!9C U+015B sacute +!9D U+0165 tcaron +!9E U+017E zcaron +!9F U+017A zacute +!A0 U+00A0 space +!A1 U+02C7 caron +!A2 U+02D8 breve +!A3 U+0141 Lslash +!A4 U+00A4 currency +!A5 U+0104 Aogonek +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AA U+015E Scedilla +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+017B Zdotaccent +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+02DB ogonek +!B3 U+0142 lslash +!B4 U+00B4 acute +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+00B8 cedilla +!B9 U+0105 aogonek +!BA U+015F scedilla +!BB U+00BB guillemotright +!BC U+013D Lcaron +!BD U+02DD hungarumlaut +!BE U+013E lcaron +!BF U+017C zdotaccent +!C0 U+0154 Racute +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+0102 Abreve +!C4 U+00C4 Adieresis +!C5 U+0139 Lacute +!C6 U+0106 Cacute +!C7 U+00C7 Ccedilla +!C8 U+010C Ccaron +!C9 U+00C9 Eacute +!CA U+0118 Eogonek +!CB U+00CB Edieresis +!CC U+011A Ecaron +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+010E Dcaron +!D0 U+0110 Dcroat +!D1 U+0143 Nacute +!D2 U+0147 Ncaron +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+0150 Ohungarumlaut +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+0158 Rcaron +!D9 U+016E Uring +!DA U+00DA Uacute +!DB U+0170 Uhungarumlaut +!DC U+00DC Udieresis +!DD U+00DD Yacute +!DE U+0162 Tcommaaccent +!DF U+00DF germandbls +!E0 U+0155 racute +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+0103 abreve +!E4 U+00E4 adieresis +!E5 U+013A lacute +!E6 U+0107 cacute +!E7 U+00E7 ccedilla +!E8 U+010D ccaron +!E9 U+00E9 eacute +!EA U+0119 eogonek +!EB U+00EB edieresis +!EC U+011B ecaron +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+010F dcaron +!F0 U+0111 dcroat +!F1 U+0144 nacute +!F2 U+0148 ncaron +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+0151 ohungarumlaut +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+0159 rcaron +!F9 U+016F uring +!FA U+00FA uacute +!FB U+0171 uhungarumlaut +!FC U+00FC udieresis +!FD U+00FD yacute +!FE U+0163 tcommaaccent +!FF U+02D9 dotaccent diff --git a/php2pdf/font/makefont/cp1251.map b/php2pdf/font/makefont/cp1251.map new file mode 100644 index 0000000..de6a198 --- /dev/null +++ b/php2pdf/font/makefont/cp1251.map @@ -0,0 +1,255 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0402 afii10051 +!81 U+0403 afii10052 +!82 U+201A quotesinglbase +!83 U+0453 afii10100 +!84 U+201E quotedblbase +!85 U+2026 ellipsis +!86 U+2020 dagger +!87 U+2021 daggerdbl +!88 U+20AC Euro +!89 U+2030 perthousand +!8A U+0409 afii10058 +!8B U+2039 guilsinglleft +!8C U+040A afii10059 +!8D U+040C afii10061 +!8E U+040B afii10060 +!8F U+040F afii10145 +!90 U+0452 afii10099 +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!99 U+2122 trademark +!9A U+0459 afii10106 +!9B U+203A guilsinglright +!9C U+045A afii10107 +!9D U+045C afii10109 +!9E U+045B afii10108 +!9F U+045F afii10193 +!A0 U+00A0 space +!A1 U+040E afii10062 +!A2 U+045E afii10110 +!A3 U+0408 afii10057 +!A4 U+00A4 currency +!A5 U+0490 afii10050 +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+0401 afii10023 +!A9 U+00A9 copyright +!AA U+0404 afii10053 +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+0407 afii10056 +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+0406 afii10055 +!B3 U+0456 afii10103 +!B4 U+0491 afii10098 +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+0451 afii10071 +!B9 U+2116 afii61352 +!BA U+0454 afii10101 +!BB U+00BB guillemotright +!BC U+0458 afii10105 +!BD U+0405 afii10054 +!BE U+0455 afii10102 +!BF U+0457 afii10104 +!C0 U+0410 afii10017 +!C1 U+0411 afii10018 +!C2 U+0412 afii10019 +!C3 U+0413 afii10020 +!C4 U+0414 afii10021 +!C5 U+0415 afii10022 +!C6 U+0416 afii10024 +!C7 U+0417 afii10025 +!C8 U+0418 afii10026 +!C9 U+0419 afii10027 +!CA U+041A afii10028 +!CB U+041B afii10029 +!CC U+041C afii10030 +!CD U+041D afii10031 +!CE U+041E afii10032 +!CF U+041F afii10033 +!D0 U+0420 afii10034 +!D1 U+0421 afii10035 +!D2 U+0422 afii10036 +!D3 U+0423 afii10037 +!D4 U+0424 afii10038 +!D5 U+0425 afii10039 +!D6 U+0426 afii10040 +!D7 U+0427 afii10041 +!D8 U+0428 afii10042 +!D9 U+0429 afii10043 +!DA U+042A afii10044 +!DB U+042B afii10045 +!DC U+042C afii10046 +!DD U+042D afii10047 +!DE U+042E afii10048 +!DF U+042F afii10049 +!E0 U+0430 afii10065 +!E1 U+0431 afii10066 +!E2 U+0432 afii10067 +!E3 U+0433 afii10068 +!E4 U+0434 afii10069 +!E5 U+0435 afii10070 +!E6 U+0436 afii10072 +!E7 U+0437 afii10073 +!E8 U+0438 afii10074 +!E9 U+0439 afii10075 +!EA U+043A afii10076 +!EB U+043B afii10077 +!EC U+043C afii10078 +!ED U+043D afii10079 +!EE U+043E afii10080 +!EF U+043F afii10081 +!F0 U+0440 afii10082 +!F1 U+0441 afii10083 +!F2 U+0442 afii10084 +!F3 U+0443 afii10085 +!F4 U+0444 afii10086 +!F5 U+0445 afii10087 +!F6 U+0446 afii10088 +!F7 U+0447 afii10089 +!F8 U+0448 afii10090 +!F9 U+0449 afii10091 +!FA U+044A afii10092 +!FB U+044B afii10093 +!FC U+044C afii10094 +!FD U+044D afii10095 +!FE U+044E afii10096 +!FF U+044F afii10097 diff --git a/php2pdf/font/makefont/cp1252.map b/php2pdf/font/makefont/cp1252.map new file mode 100644 index 0000000..dd490e5 --- /dev/null +++ b/php2pdf/font/makefont/cp1252.map @@ -0,0 +1,251 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+20AC Euro +!82 U+201A quotesinglbase +!83 U+0192 florin +!84 U+201E quotedblbase +!85 U+2026 ellipsis +!86 U+2020 dagger +!87 U+2021 daggerdbl +!88 U+02C6 circumflex +!89 U+2030 perthousand +!8A U+0160 Scaron +!8B U+2039 guilsinglleft +!8C U+0152 OE +!8E U+017D Zcaron +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!98 U+02DC tilde +!99 U+2122 trademark +!9A U+0161 scaron +!9B U+203A guilsinglright +!9C U+0153 oe +!9E U+017E zcaron +!9F U+0178 Ydieresis +!A0 U+00A0 space +!A1 U+00A1 exclamdown +!A2 U+00A2 cent +!A3 U+00A3 sterling +!A4 U+00A4 currency +!A5 U+00A5 yen +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AA U+00AA ordfeminine +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+00AF macron +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+00B4 acute +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+00B8 cedilla +!B9 U+00B9 onesuperior +!BA U+00BA ordmasculine +!BB U+00BB guillemotright +!BC U+00BC onequarter +!BD U+00BD onehalf +!BE U+00BE threequarters +!BF U+00BF questiondown +!C0 U+00C0 Agrave +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+00C3 Atilde +!C4 U+00C4 Adieresis +!C5 U+00C5 Aring +!C6 U+00C6 AE +!C7 U+00C7 Ccedilla +!C8 U+00C8 Egrave +!C9 U+00C9 Eacute +!CA U+00CA Ecircumflex +!CB U+00CB Edieresis +!CC U+00CC Igrave +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+00CF Idieresis +!D0 U+00D0 Eth +!D1 U+00D1 Ntilde +!D2 U+00D2 Ograve +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+00D5 Otilde +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+00D8 Oslash +!D9 U+00D9 Ugrave +!DA U+00DA Uacute +!DB U+00DB Ucircumflex +!DC U+00DC Udieresis +!DD U+00DD Yacute +!DE U+00DE Thorn +!DF U+00DF germandbls +!E0 U+00E0 agrave +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+00E3 atilde +!E4 U+00E4 adieresis +!E5 U+00E5 aring +!E6 U+00E6 ae +!E7 U+00E7 ccedilla +!E8 U+00E8 egrave +!E9 U+00E9 eacute +!EA U+00EA ecircumflex +!EB U+00EB edieresis +!EC U+00EC igrave +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+00EF idieresis +!F0 U+00F0 eth +!F1 U+00F1 ntilde +!F2 U+00F2 ograve +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+00F5 otilde +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+00F8 oslash +!F9 U+00F9 ugrave +!FA U+00FA uacute +!FB U+00FB ucircumflex +!FC U+00FC udieresis +!FD U+00FD yacute +!FE U+00FE thorn +!FF U+00FF ydieresis diff --git a/php2pdf/font/makefont/cp1253.map b/php2pdf/font/makefont/cp1253.map new file mode 100644 index 0000000..4bd826f --- /dev/null +++ b/php2pdf/font/makefont/cp1253.map @@ -0,0 +1,239 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+20AC Euro +!82 U+201A quotesinglbase +!83 U+0192 florin +!84 U+201E quotedblbase +!85 U+2026 ellipsis +!86 U+2020 dagger +!87 U+2021 daggerdbl +!89 U+2030 perthousand +!8B U+2039 guilsinglleft +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!99 U+2122 trademark +!9B U+203A guilsinglright +!A0 U+00A0 space +!A1 U+0385 dieresistonos +!A2 U+0386 Alphatonos +!A3 U+00A3 sterling +!A4 U+00A4 currency +!A5 U+00A5 yen +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+2015 afii00208 +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+0384 tonos +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+0388 Epsilontonos +!B9 U+0389 Etatonos +!BA U+038A Iotatonos +!BB U+00BB guillemotright +!BC U+038C Omicrontonos +!BD U+00BD onehalf +!BE U+038E Upsilontonos +!BF U+038F Omegatonos +!C0 U+0390 iotadieresistonos +!C1 U+0391 Alpha +!C2 U+0392 Beta +!C3 U+0393 Gamma +!C4 U+0394 Delta +!C5 U+0395 Epsilon +!C6 U+0396 Zeta +!C7 U+0397 Eta +!C8 U+0398 Theta +!C9 U+0399 Iota +!CA U+039A Kappa +!CB U+039B Lambda +!CC U+039C Mu +!CD U+039D Nu +!CE U+039E Xi +!CF U+039F Omicron +!D0 U+03A0 Pi +!D1 U+03A1 Rho +!D3 U+03A3 Sigma +!D4 U+03A4 Tau +!D5 U+03A5 Upsilon +!D6 U+03A6 Phi +!D7 U+03A7 Chi +!D8 U+03A8 Psi +!D9 U+03A9 Omega +!DA U+03AA Iotadieresis +!DB U+03AB Upsilondieresis +!DC U+03AC alphatonos +!DD U+03AD epsilontonos +!DE U+03AE etatonos +!DF U+03AF iotatonos +!E0 U+03B0 upsilondieresistonos +!E1 U+03B1 alpha +!E2 U+03B2 beta +!E3 U+03B3 gamma +!E4 U+03B4 delta +!E5 U+03B5 epsilon +!E6 U+03B6 zeta +!E7 U+03B7 eta +!E8 U+03B8 theta +!E9 U+03B9 iota +!EA U+03BA kappa +!EB U+03BB lambda +!EC U+03BC mu +!ED U+03BD nu +!EE U+03BE xi +!EF U+03BF omicron +!F0 U+03C0 pi +!F1 U+03C1 rho +!F2 U+03C2 sigma1 +!F3 U+03C3 sigma +!F4 U+03C4 tau +!F5 U+03C5 upsilon +!F6 U+03C6 phi +!F7 U+03C7 chi +!F8 U+03C8 psi +!F9 U+03C9 omega +!FA U+03CA iotadieresis +!FB U+03CB upsilondieresis +!FC U+03CC omicrontonos +!FD U+03CD upsilontonos +!FE U+03CE omegatonos diff --git a/php2pdf/font/makefont/cp1254.map b/php2pdf/font/makefont/cp1254.map new file mode 100644 index 0000000..829473b --- /dev/null +++ b/php2pdf/font/makefont/cp1254.map @@ -0,0 +1,249 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+20AC Euro +!82 U+201A quotesinglbase +!83 U+0192 florin +!84 U+201E quotedblbase +!85 U+2026 ellipsis +!86 U+2020 dagger +!87 U+2021 daggerdbl +!88 U+02C6 circumflex +!89 U+2030 perthousand +!8A U+0160 Scaron +!8B U+2039 guilsinglleft +!8C U+0152 OE +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!98 U+02DC tilde +!99 U+2122 trademark +!9A U+0161 scaron +!9B U+203A guilsinglright +!9C U+0153 oe +!9F U+0178 Ydieresis +!A0 U+00A0 space +!A1 U+00A1 exclamdown +!A2 U+00A2 cent +!A3 U+00A3 sterling +!A4 U+00A4 currency +!A5 U+00A5 yen +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AA U+00AA ordfeminine +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+00AF macron +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+00B4 acute +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+00B8 cedilla +!B9 U+00B9 onesuperior +!BA U+00BA ordmasculine +!BB U+00BB guillemotright +!BC U+00BC onequarter +!BD U+00BD onehalf +!BE U+00BE threequarters +!BF U+00BF questiondown +!C0 U+00C0 Agrave +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+00C3 Atilde +!C4 U+00C4 Adieresis +!C5 U+00C5 Aring +!C6 U+00C6 AE +!C7 U+00C7 Ccedilla +!C8 U+00C8 Egrave +!C9 U+00C9 Eacute +!CA U+00CA Ecircumflex +!CB U+00CB Edieresis +!CC U+00CC Igrave +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+00CF Idieresis +!D0 U+011E Gbreve +!D1 U+00D1 Ntilde +!D2 U+00D2 Ograve +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+00D5 Otilde +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+00D8 Oslash +!D9 U+00D9 Ugrave +!DA U+00DA Uacute +!DB U+00DB Ucircumflex +!DC U+00DC Udieresis +!DD U+0130 Idotaccent +!DE U+015E Scedilla +!DF U+00DF germandbls +!E0 U+00E0 agrave +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+00E3 atilde +!E4 U+00E4 adieresis +!E5 U+00E5 aring +!E6 U+00E6 ae +!E7 U+00E7 ccedilla +!E8 U+00E8 egrave +!E9 U+00E9 eacute +!EA U+00EA ecircumflex +!EB U+00EB edieresis +!EC U+00EC igrave +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+00EF idieresis +!F0 U+011F gbreve +!F1 U+00F1 ntilde +!F2 U+00F2 ograve +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+00F5 otilde +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+00F8 oslash +!F9 U+00F9 ugrave +!FA U+00FA uacute +!FB U+00FB ucircumflex +!FC U+00FC udieresis +!FD U+0131 dotlessi +!FE U+015F scedilla +!FF U+00FF ydieresis diff --git a/php2pdf/font/makefont/cp1255.map b/php2pdf/font/makefont/cp1255.map new file mode 100644 index 0000000..079e10c --- /dev/null +++ b/php2pdf/font/makefont/cp1255.map @@ -0,0 +1,233 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+20AC Euro +!82 U+201A quotesinglbase +!83 U+0192 florin +!84 U+201E quotedblbase +!85 U+2026 ellipsis +!86 U+2020 dagger +!87 U+2021 daggerdbl +!88 U+02C6 circumflex +!89 U+2030 perthousand +!8B U+2039 guilsinglleft +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!98 U+02DC tilde +!99 U+2122 trademark +!9B U+203A guilsinglright +!A0 U+00A0 space +!A1 U+00A1 exclamdown +!A2 U+00A2 cent +!A3 U+00A3 sterling +!A4 U+20AA afii57636 +!A5 U+00A5 yen +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AA U+00D7 multiply +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD sfthyphen +!AE U+00AE registered +!AF U+00AF macron +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+00B4 acute +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 middot +!B8 U+00B8 cedilla +!B9 U+00B9 onesuperior +!BA U+00F7 divide +!BB U+00BB guillemotright +!BC U+00BC onequarter +!BD U+00BD onehalf +!BE U+00BE threequarters +!BF U+00BF questiondown +!C0 U+05B0 afii57799 +!C1 U+05B1 afii57801 +!C2 U+05B2 afii57800 +!C3 U+05B3 afii57802 +!C4 U+05B4 afii57793 +!C5 U+05B5 afii57794 +!C6 U+05B6 afii57795 +!C7 U+05B7 afii57798 +!C8 U+05B8 afii57797 +!C9 U+05B9 afii57806 +!CB U+05BB afii57796 +!CC U+05BC afii57807 +!CD U+05BD afii57839 +!CE U+05BE afii57645 +!CF U+05BF afii57841 +!D0 U+05C0 afii57842 +!D1 U+05C1 afii57804 +!D2 U+05C2 afii57803 +!D3 U+05C3 afii57658 +!D4 U+05F0 afii57716 +!D5 U+05F1 afii57717 +!D6 U+05F2 afii57718 +!D7 U+05F3 gereshhebrew +!D8 U+05F4 gershayimhebrew +!E0 U+05D0 afii57664 +!E1 U+05D1 afii57665 +!E2 U+05D2 afii57666 +!E3 U+05D3 afii57667 +!E4 U+05D4 afii57668 +!E5 U+05D5 afii57669 +!E6 U+05D6 afii57670 +!E7 U+05D7 afii57671 +!E8 U+05D8 afii57672 +!E9 U+05D9 afii57673 +!EA U+05DA afii57674 +!EB U+05DB afii57675 +!EC U+05DC afii57676 +!ED U+05DD afii57677 +!EE U+05DE afii57678 +!EF U+05DF afii57679 +!F0 U+05E0 afii57680 +!F1 U+05E1 afii57681 +!F2 U+05E2 afii57682 +!F3 U+05E3 afii57683 +!F4 U+05E4 afii57684 +!F5 U+05E5 afii57685 +!F6 U+05E6 afii57686 +!F7 U+05E7 afii57687 +!F8 U+05E8 afii57688 +!F9 U+05E9 afii57689 +!FA U+05EA afii57690 +!FD U+200E afii299 +!FE U+200F afii300 diff --git a/php2pdf/font/makefont/cp1257.map b/php2pdf/font/makefont/cp1257.map new file mode 100644 index 0000000..2f2ecfa --- /dev/null +++ b/php2pdf/font/makefont/cp1257.map @@ -0,0 +1,244 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+20AC Euro +!82 U+201A quotesinglbase +!84 U+201E quotedblbase +!85 U+2026 ellipsis +!86 U+2020 dagger +!87 U+2021 daggerdbl +!89 U+2030 perthousand +!8B U+2039 guilsinglleft +!8D U+00A8 dieresis +!8E U+02C7 caron +!8F U+00B8 cedilla +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!99 U+2122 trademark +!9B U+203A guilsinglright +!9D U+00AF macron +!9E U+02DB ogonek +!A0 U+00A0 space +!A2 U+00A2 cent +!A3 U+00A3 sterling +!A4 U+00A4 currency +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00D8 Oslash +!A9 U+00A9 copyright +!AA U+0156 Rcommaaccent +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+00C6 AE +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+00B4 acute +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+00F8 oslash +!B9 U+00B9 onesuperior +!BA U+0157 rcommaaccent +!BB U+00BB guillemotright +!BC U+00BC onequarter +!BD U+00BD onehalf +!BE U+00BE threequarters +!BF U+00E6 ae +!C0 U+0104 Aogonek +!C1 U+012E Iogonek +!C2 U+0100 Amacron +!C3 U+0106 Cacute +!C4 U+00C4 Adieresis +!C5 U+00C5 Aring +!C6 U+0118 Eogonek +!C7 U+0112 Emacron +!C8 U+010C Ccaron +!C9 U+00C9 Eacute +!CA U+0179 Zacute +!CB U+0116 Edotaccent +!CC U+0122 Gcommaaccent +!CD U+0136 Kcommaaccent +!CE U+012A Imacron +!CF U+013B Lcommaaccent +!D0 U+0160 Scaron +!D1 U+0143 Nacute +!D2 U+0145 Ncommaaccent +!D3 U+00D3 Oacute +!D4 U+014C Omacron +!D5 U+00D5 Otilde +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+0172 Uogonek +!D9 U+0141 Lslash +!DA U+015A Sacute +!DB U+016A Umacron +!DC U+00DC Udieresis +!DD U+017B Zdotaccent +!DE U+017D Zcaron +!DF U+00DF germandbls +!E0 U+0105 aogonek +!E1 U+012F iogonek +!E2 U+0101 amacron +!E3 U+0107 cacute +!E4 U+00E4 adieresis +!E5 U+00E5 aring +!E6 U+0119 eogonek +!E7 U+0113 emacron +!E8 U+010D ccaron +!E9 U+00E9 eacute +!EA U+017A zacute +!EB U+0117 edotaccent +!EC U+0123 gcommaaccent +!ED U+0137 kcommaaccent +!EE U+012B imacron +!EF U+013C lcommaaccent +!F0 U+0161 scaron +!F1 U+0144 nacute +!F2 U+0146 ncommaaccent +!F3 U+00F3 oacute +!F4 U+014D omacron +!F5 U+00F5 otilde +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+0173 uogonek +!F9 U+0142 lslash +!FA U+015B sacute +!FB U+016B umacron +!FC U+00FC udieresis +!FD U+017C zdotaccent +!FE U+017E zcaron +!FF U+02D9 dotaccent diff --git a/php2pdf/font/makefont/cp1258.map b/php2pdf/font/makefont/cp1258.map new file mode 100644 index 0000000..fed915f --- /dev/null +++ b/php2pdf/font/makefont/cp1258.map @@ -0,0 +1,247 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+20AC Euro +!82 U+201A quotesinglbase +!83 U+0192 florin +!84 U+201E quotedblbase +!85 U+2026 ellipsis +!86 U+2020 dagger +!87 U+2021 daggerdbl +!88 U+02C6 circumflex +!89 U+2030 perthousand +!8B U+2039 guilsinglleft +!8C U+0152 OE +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!98 U+02DC tilde +!99 U+2122 trademark +!9B U+203A guilsinglright +!9C U+0153 oe +!9F U+0178 Ydieresis +!A0 U+00A0 space +!A1 U+00A1 exclamdown +!A2 U+00A2 cent +!A3 U+00A3 sterling +!A4 U+00A4 currency +!A5 U+00A5 yen +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AA U+00AA ordfeminine +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+00AF macron +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+00B4 acute +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+00B8 cedilla +!B9 U+00B9 onesuperior +!BA U+00BA ordmasculine +!BB U+00BB guillemotright +!BC U+00BC onequarter +!BD U+00BD onehalf +!BE U+00BE threequarters +!BF U+00BF questiondown +!C0 U+00C0 Agrave +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+0102 Abreve +!C4 U+00C4 Adieresis +!C5 U+00C5 Aring +!C6 U+00C6 AE +!C7 U+00C7 Ccedilla +!C8 U+00C8 Egrave +!C9 U+00C9 Eacute +!CA U+00CA Ecircumflex +!CB U+00CB Edieresis +!CC U+0300 gravecomb +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+00CF Idieresis +!D0 U+0110 Dcroat +!D1 U+00D1 Ntilde +!D2 U+0309 hookabovecomb +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+01A0 Ohorn +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+00D8 Oslash +!D9 U+00D9 Ugrave +!DA U+00DA Uacute +!DB U+00DB Ucircumflex +!DC U+00DC Udieresis +!DD U+01AF Uhorn +!DE U+0303 tildecomb +!DF U+00DF germandbls +!E0 U+00E0 agrave +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+0103 abreve +!E4 U+00E4 adieresis +!E5 U+00E5 aring +!E6 U+00E6 ae +!E7 U+00E7 ccedilla +!E8 U+00E8 egrave +!E9 U+00E9 eacute +!EA U+00EA ecircumflex +!EB U+00EB edieresis +!EC U+0301 acutecomb +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+00EF idieresis +!F0 U+0111 dcroat +!F1 U+00F1 ntilde +!F2 U+0323 dotbelowcomb +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+01A1 ohorn +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+00F8 oslash +!F9 U+00F9 ugrave +!FA U+00FA uacute +!FB U+00FB ucircumflex +!FC U+00FC udieresis +!FD U+01B0 uhorn +!FE U+20AB dong +!FF U+00FF ydieresis diff --git a/php2pdf/font/makefont/cp874.map b/php2pdf/font/makefont/cp874.map new file mode 100644 index 0000000..1006e6b --- /dev/null +++ b/php2pdf/font/makefont/cp874.map @@ -0,0 +1,225 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+20AC Euro +!85 U+2026 ellipsis +!91 U+2018 quoteleft +!92 U+2019 quoteright +!93 U+201C quotedblleft +!94 U+201D quotedblright +!95 U+2022 bullet +!96 U+2013 endash +!97 U+2014 emdash +!A0 U+00A0 space +!A1 U+0E01 kokaithai +!A2 U+0E02 khokhaithai +!A3 U+0E03 khokhuatthai +!A4 U+0E04 khokhwaithai +!A5 U+0E05 khokhonthai +!A6 U+0E06 khorakhangthai +!A7 U+0E07 ngonguthai +!A8 U+0E08 chochanthai +!A9 U+0E09 chochingthai +!AA U+0E0A chochangthai +!AB U+0E0B sosothai +!AC U+0E0C chochoethai +!AD U+0E0D yoyingthai +!AE U+0E0E dochadathai +!AF U+0E0F topatakthai +!B0 U+0E10 thothanthai +!B1 U+0E11 thonangmonthothai +!B2 U+0E12 thophuthaothai +!B3 U+0E13 nonenthai +!B4 U+0E14 dodekthai +!B5 U+0E15 totaothai +!B6 U+0E16 thothungthai +!B7 U+0E17 thothahanthai +!B8 U+0E18 thothongthai +!B9 U+0E19 nonuthai +!BA U+0E1A bobaimaithai +!BB U+0E1B poplathai +!BC U+0E1C phophungthai +!BD U+0E1D fofathai +!BE U+0E1E phophanthai +!BF U+0E1F fofanthai +!C0 U+0E20 phosamphaothai +!C1 U+0E21 momathai +!C2 U+0E22 yoyakthai +!C3 U+0E23 roruathai +!C4 U+0E24 ruthai +!C5 U+0E25 lolingthai +!C6 U+0E26 luthai +!C7 U+0E27 wowaenthai +!C8 U+0E28 sosalathai +!C9 U+0E29 sorusithai +!CA U+0E2A sosuathai +!CB U+0E2B hohipthai +!CC U+0E2C lochulathai +!CD U+0E2D oangthai +!CE U+0E2E honokhukthai +!CF U+0E2F paiyannoithai +!D0 U+0E30 saraathai +!D1 U+0E31 maihanakatthai +!D2 U+0E32 saraaathai +!D3 U+0E33 saraamthai +!D4 U+0E34 saraithai +!D5 U+0E35 saraiithai +!D6 U+0E36 sarauethai +!D7 U+0E37 saraueethai +!D8 U+0E38 sarauthai +!D9 U+0E39 sarauuthai +!DA U+0E3A phinthuthai +!DF U+0E3F bahtthai +!E0 U+0E40 saraethai +!E1 U+0E41 saraaethai +!E2 U+0E42 saraothai +!E3 U+0E43 saraaimaimuanthai +!E4 U+0E44 saraaimaimalaithai +!E5 U+0E45 lakkhangyaothai +!E6 U+0E46 maiyamokthai +!E7 U+0E47 maitaikhuthai +!E8 U+0E48 maiekthai +!E9 U+0E49 maithothai +!EA U+0E4A maitrithai +!EB U+0E4B maichattawathai +!EC U+0E4C thanthakhatthai +!ED U+0E4D nikhahitthai +!EE U+0E4E yamakkanthai +!EF U+0E4F fongmanthai +!F0 U+0E50 zerothai +!F1 U+0E51 onethai +!F2 U+0E52 twothai +!F3 U+0E53 threethai +!F4 U+0E54 fourthai +!F5 U+0E55 fivethai +!F6 U+0E56 sixthai +!F7 U+0E57 seventhai +!F8 U+0E58 eightthai +!F9 U+0E59 ninethai +!FA U+0E5A angkhankhuthai +!FB U+0E5B khomutthai diff --git a/php2pdf/font/makefont/iso-8859-1.map b/php2pdf/font/makefont/iso-8859-1.map new file mode 100644 index 0000000..61740a3 --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-1.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+00A1 exclamdown +!A2 U+00A2 cent +!A3 U+00A3 sterling +!A4 U+00A4 currency +!A5 U+00A5 yen +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AA U+00AA ordfeminine +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+00AF macron +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+00B4 acute +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+00B8 cedilla +!B9 U+00B9 onesuperior +!BA U+00BA ordmasculine +!BB U+00BB guillemotright +!BC U+00BC onequarter +!BD U+00BD onehalf +!BE U+00BE threequarters +!BF U+00BF questiondown +!C0 U+00C0 Agrave +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+00C3 Atilde +!C4 U+00C4 Adieresis +!C5 U+00C5 Aring +!C6 U+00C6 AE +!C7 U+00C7 Ccedilla +!C8 U+00C8 Egrave +!C9 U+00C9 Eacute +!CA U+00CA Ecircumflex +!CB U+00CB Edieresis +!CC U+00CC Igrave +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+00CF Idieresis +!D0 U+00D0 Eth +!D1 U+00D1 Ntilde +!D2 U+00D2 Ograve +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+00D5 Otilde +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+00D8 Oslash +!D9 U+00D9 Ugrave +!DA U+00DA Uacute +!DB U+00DB Ucircumflex +!DC U+00DC Udieresis +!DD U+00DD Yacute +!DE U+00DE Thorn +!DF U+00DF germandbls +!E0 U+00E0 agrave +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+00E3 atilde +!E4 U+00E4 adieresis +!E5 U+00E5 aring +!E6 U+00E6 ae +!E7 U+00E7 ccedilla +!E8 U+00E8 egrave +!E9 U+00E9 eacute +!EA U+00EA ecircumflex +!EB U+00EB edieresis +!EC U+00EC igrave +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+00EF idieresis +!F0 U+00F0 eth +!F1 U+00F1 ntilde +!F2 U+00F2 ograve +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+00F5 otilde +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+00F8 oslash +!F9 U+00F9 ugrave +!FA U+00FA uacute +!FB U+00FB ucircumflex +!FC U+00FC udieresis +!FD U+00FD yacute +!FE U+00FE thorn +!FF U+00FF ydieresis diff --git a/php2pdf/font/makefont/iso-8859-11.map b/php2pdf/font/makefont/iso-8859-11.map new file mode 100644 index 0000000..9168812 --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-11.map @@ -0,0 +1,248 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+0E01 kokaithai +!A2 U+0E02 khokhaithai +!A3 U+0E03 khokhuatthai +!A4 U+0E04 khokhwaithai +!A5 U+0E05 khokhonthai +!A6 U+0E06 khorakhangthai +!A7 U+0E07 ngonguthai +!A8 U+0E08 chochanthai +!A9 U+0E09 chochingthai +!AA U+0E0A chochangthai +!AB U+0E0B sosothai +!AC U+0E0C chochoethai +!AD U+0E0D yoyingthai +!AE U+0E0E dochadathai +!AF U+0E0F topatakthai +!B0 U+0E10 thothanthai +!B1 U+0E11 thonangmonthothai +!B2 U+0E12 thophuthaothai +!B3 U+0E13 nonenthai +!B4 U+0E14 dodekthai +!B5 U+0E15 totaothai +!B6 U+0E16 thothungthai +!B7 U+0E17 thothahanthai +!B8 U+0E18 thothongthai +!B9 U+0E19 nonuthai +!BA U+0E1A bobaimaithai +!BB U+0E1B poplathai +!BC U+0E1C phophungthai +!BD U+0E1D fofathai +!BE U+0E1E phophanthai +!BF U+0E1F fofanthai +!C0 U+0E20 phosamphaothai +!C1 U+0E21 momathai +!C2 U+0E22 yoyakthai +!C3 U+0E23 roruathai +!C4 U+0E24 ruthai +!C5 U+0E25 lolingthai +!C6 U+0E26 luthai +!C7 U+0E27 wowaenthai +!C8 U+0E28 sosalathai +!C9 U+0E29 sorusithai +!CA U+0E2A sosuathai +!CB U+0E2B hohipthai +!CC U+0E2C lochulathai +!CD U+0E2D oangthai +!CE U+0E2E honokhukthai +!CF U+0E2F paiyannoithai +!D0 U+0E30 saraathai +!D1 U+0E31 maihanakatthai +!D2 U+0E32 saraaathai +!D3 U+0E33 saraamthai +!D4 U+0E34 saraithai +!D5 U+0E35 saraiithai +!D6 U+0E36 sarauethai +!D7 U+0E37 saraueethai +!D8 U+0E38 sarauthai +!D9 U+0E39 sarauuthai +!DA U+0E3A phinthuthai +!DF U+0E3F bahtthai +!E0 U+0E40 saraethai +!E1 U+0E41 saraaethai +!E2 U+0E42 saraothai +!E3 U+0E43 saraaimaimuanthai +!E4 U+0E44 saraaimaimalaithai +!E5 U+0E45 lakkhangyaothai +!E6 U+0E46 maiyamokthai +!E7 U+0E47 maitaikhuthai +!E8 U+0E48 maiekthai +!E9 U+0E49 maithothai +!EA U+0E4A maitrithai +!EB U+0E4B maichattawathai +!EC U+0E4C thanthakhatthai +!ED U+0E4D nikhahitthai +!EE U+0E4E yamakkanthai +!EF U+0E4F fongmanthai +!F0 U+0E50 zerothai +!F1 U+0E51 onethai +!F2 U+0E52 twothai +!F3 U+0E53 threethai +!F4 U+0E54 fourthai +!F5 U+0E55 fivethai +!F6 U+0E56 sixthai +!F7 U+0E57 seventhai +!F8 U+0E58 eightthai +!F9 U+0E59 ninethai +!FA U+0E5A angkhankhuthai +!FB U+0E5B khomutthai diff --git a/php2pdf/font/makefont/iso-8859-15.map b/php2pdf/font/makefont/iso-8859-15.map new file mode 100644 index 0000000..6c2b571 --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-15.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+00A1 exclamdown +!A2 U+00A2 cent +!A3 U+00A3 sterling +!A4 U+20AC Euro +!A5 U+00A5 yen +!A6 U+0160 Scaron +!A7 U+00A7 section +!A8 U+0161 scaron +!A9 U+00A9 copyright +!AA U+00AA ordfeminine +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+00AF macron +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+017D Zcaron +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+017E zcaron +!B9 U+00B9 onesuperior +!BA U+00BA ordmasculine +!BB U+00BB guillemotright +!BC U+0152 OE +!BD U+0153 oe +!BE U+0178 Ydieresis +!BF U+00BF questiondown +!C0 U+00C0 Agrave +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+00C3 Atilde +!C4 U+00C4 Adieresis +!C5 U+00C5 Aring +!C6 U+00C6 AE +!C7 U+00C7 Ccedilla +!C8 U+00C8 Egrave +!C9 U+00C9 Eacute +!CA U+00CA Ecircumflex +!CB U+00CB Edieresis +!CC U+00CC Igrave +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+00CF Idieresis +!D0 U+00D0 Eth +!D1 U+00D1 Ntilde +!D2 U+00D2 Ograve +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+00D5 Otilde +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+00D8 Oslash +!D9 U+00D9 Ugrave +!DA U+00DA Uacute +!DB U+00DB Ucircumflex +!DC U+00DC Udieresis +!DD U+00DD Yacute +!DE U+00DE Thorn +!DF U+00DF germandbls +!E0 U+00E0 agrave +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+00E3 atilde +!E4 U+00E4 adieresis +!E5 U+00E5 aring +!E6 U+00E6 ae +!E7 U+00E7 ccedilla +!E8 U+00E8 egrave +!E9 U+00E9 eacute +!EA U+00EA ecircumflex +!EB U+00EB edieresis +!EC U+00EC igrave +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+00EF idieresis +!F0 U+00F0 eth +!F1 U+00F1 ntilde +!F2 U+00F2 ograve +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+00F5 otilde +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+00F8 oslash +!F9 U+00F9 ugrave +!FA U+00FA uacute +!FB U+00FB ucircumflex +!FC U+00FC udieresis +!FD U+00FD yacute +!FE U+00FE thorn +!FF U+00FF ydieresis diff --git a/php2pdf/font/makefont/iso-8859-16.map b/php2pdf/font/makefont/iso-8859-16.map new file mode 100644 index 0000000..202c8fe --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-16.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+0104 Aogonek +!A2 U+0105 aogonek +!A3 U+0141 Lslash +!A4 U+20AC Euro +!A5 U+201E quotedblbase +!A6 U+0160 Scaron +!A7 U+00A7 section +!A8 U+0161 scaron +!A9 U+00A9 copyright +!AA U+0218 Scommaaccent +!AB U+00AB guillemotleft +!AC U+0179 Zacute +!AD U+00AD hyphen +!AE U+017A zacute +!AF U+017B Zdotaccent +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+010C Ccaron +!B3 U+0142 lslash +!B4 U+017D Zcaron +!B5 U+201D quotedblright +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+017E zcaron +!B9 U+010D ccaron +!BA U+0219 scommaaccent +!BB U+00BB guillemotright +!BC U+0152 OE +!BD U+0153 oe +!BE U+0178 Ydieresis +!BF U+017C zdotaccent +!C0 U+00C0 Agrave +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+0102 Abreve +!C4 U+00C4 Adieresis +!C5 U+0106 Cacute +!C6 U+00C6 AE +!C7 U+00C7 Ccedilla +!C8 U+00C8 Egrave +!C9 U+00C9 Eacute +!CA U+00CA Ecircumflex +!CB U+00CB Edieresis +!CC U+00CC Igrave +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+00CF Idieresis +!D0 U+0110 Dcroat +!D1 U+0143 Nacute +!D2 U+00D2 Ograve +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+0150 Ohungarumlaut +!D6 U+00D6 Odieresis +!D7 U+015A Sacute +!D8 U+0170 Uhungarumlaut +!D9 U+00D9 Ugrave +!DA U+00DA Uacute +!DB U+00DB Ucircumflex +!DC U+00DC Udieresis +!DD U+0118 Eogonek +!DE U+021A Tcommaaccent +!DF U+00DF germandbls +!E0 U+00E0 agrave +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+0103 abreve +!E4 U+00E4 adieresis +!E5 U+0107 cacute +!E6 U+00E6 ae +!E7 U+00E7 ccedilla +!E8 U+00E8 egrave +!E9 U+00E9 eacute +!EA U+00EA ecircumflex +!EB U+00EB edieresis +!EC U+00EC igrave +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+00EF idieresis +!F0 U+0111 dcroat +!F1 U+0144 nacute +!F2 U+00F2 ograve +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+0151 ohungarumlaut +!F6 U+00F6 odieresis +!F7 U+015B sacute +!F8 U+0171 uhungarumlaut +!F9 U+00F9 ugrave +!FA U+00FA uacute +!FB U+00FB ucircumflex +!FC U+00FC udieresis +!FD U+0119 eogonek +!FE U+021B tcommaaccent +!FF U+00FF ydieresis diff --git a/php2pdf/font/makefont/iso-8859-2.map b/php2pdf/font/makefont/iso-8859-2.map new file mode 100644 index 0000000..65ae09f --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-2.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+0104 Aogonek +!A2 U+02D8 breve +!A3 U+0141 Lslash +!A4 U+00A4 currency +!A5 U+013D Lcaron +!A6 U+015A Sacute +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+0160 Scaron +!AA U+015E Scedilla +!AB U+0164 Tcaron +!AC U+0179 Zacute +!AD U+00AD hyphen +!AE U+017D Zcaron +!AF U+017B Zdotaccent +!B0 U+00B0 degree +!B1 U+0105 aogonek +!B2 U+02DB ogonek +!B3 U+0142 lslash +!B4 U+00B4 acute +!B5 U+013E lcaron +!B6 U+015B sacute +!B7 U+02C7 caron +!B8 U+00B8 cedilla +!B9 U+0161 scaron +!BA U+015F scedilla +!BB U+0165 tcaron +!BC U+017A zacute +!BD U+02DD hungarumlaut +!BE U+017E zcaron +!BF U+017C zdotaccent +!C0 U+0154 Racute +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+0102 Abreve +!C4 U+00C4 Adieresis +!C5 U+0139 Lacute +!C6 U+0106 Cacute +!C7 U+00C7 Ccedilla +!C8 U+010C Ccaron +!C9 U+00C9 Eacute +!CA U+0118 Eogonek +!CB U+00CB Edieresis +!CC U+011A Ecaron +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+010E Dcaron +!D0 U+0110 Dcroat +!D1 U+0143 Nacute +!D2 U+0147 Ncaron +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+0150 Ohungarumlaut +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+0158 Rcaron +!D9 U+016E Uring +!DA U+00DA Uacute +!DB U+0170 Uhungarumlaut +!DC U+00DC Udieresis +!DD U+00DD Yacute +!DE U+0162 Tcommaaccent +!DF U+00DF germandbls +!E0 U+0155 racute +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+0103 abreve +!E4 U+00E4 adieresis +!E5 U+013A lacute +!E6 U+0107 cacute +!E7 U+00E7 ccedilla +!E8 U+010D ccaron +!E9 U+00E9 eacute +!EA U+0119 eogonek +!EB U+00EB edieresis +!EC U+011B ecaron +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+010F dcaron +!F0 U+0111 dcroat +!F1 U+0144 nacute +!F2 U+0148 ncaron +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+0151 ohungarumlaut +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+0159 rcaron +!F9 U+016F uring +!FA U+00FA uacute +!FB U+0171 uhungarumlaut +!FC U+00FC udieresis +!FD U+00FD yacute +!FE U+0163 tcommaaccent +!FF U+02D9 dotaccent diff --git a/php2pdf/font/makefont/iso-8859-4.map b/php2pdf/font/makefont/iso-8859-4.map new file mode 100644 index 0000000..a7d87bf --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-4.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+0104 Aogonek +!A2 U+0138 kgreenlandic +!A3 U+0156 Rcommaaccent +!A4 U+00A4 currency +!A5 U+0128 Itilde +!A6 U+013B Lcommaaccent +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+0160 Scaron +!AA U+0112 Emacron +!AB U+0122 Gcommaaccent +!AC U+0166 Tbar +!AD U+00AD hyphen +!AE U+017D Zcaron +!AF U+00AF macron +!B0 U+00B0 degree +!B1 U+0105 aogonek +!B2 U+02DB ogonek +!B3 U+0157 rcommaaccent +!B4 U+00B4 acute +!B5 U+0129 itilde +!B6 U+013C lcommaaccent +!B7 U+02C7 caron +!B8 U+00B8 cedilla +!B9 U+0161 scaron +!BA U+0113 emacron +!BB U+0123 gcommaaccent +!BC U+0167 tbar +!BD U+014A Eng +!BE U+017E zcaron +!BF U+014B eng +!C0 U+0100 Amacron +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+00C3 Atilde +!C4 U+00C4 Adieresis +!C5 U+00C5 Aring +!C6 U+00C6 AE +!C7 U+012E Iogonek +!C8 U+010C Ccaron +!C9 U+00C9 Eacute +!CA U+0118 Eogonek +!CB U+00CB Edieresis +!CC U+0116 Edotaccent +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+012A Imacron +!D0 U+0110 Dcroat +!D1 U+0145 Ncommaaccent +!D2 U+014C Omacron +!D3 U+0136 Kcommaaccent +!D4 U+00D4 Ocircumflex +!D5 U+00D5 Otilde +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+00D8 Oslash +!D9 U+0172 Uogonek +!DA U+00DA Uacute +!DB U+00DB Ucircumflex +!DC U+00DC Udieresis +!DD U+0168 Utilde +!DE U+016A Umacron +!DF U+00DF germandbls +!E0 U+0101 amacron +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+00E3 atilde +!E4 U+00E4 adieresis +!E5 U+00E5 aring +!E6 U+00E6 ae +!E7 U+012F iogonek +!E8 U+010D ccaron +!E9 U+00E9 eacute +!EA U+0119 eogonek +!EB U+00EB edieresis +!EC U+0117 edotaccent +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+012B imacron +!F0 U+0111 dcroat +!F1 U+0146 ncommaaccent +!F2 U+014D omacron +!F3 U+0137 kcommaaccent +!F4 U+00F4 ocircumflex +!F5 U+00F5 otilde +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+00F8 oslash +!F9 U+0173 uogonek +!FA U+00FA uacute +!FB U+00FB ucircumflex +!FC U+00FC udieresis +!FD U+0169 utilde +!FE U+016B umacron +!FF U+02D9 dotaccent diff --git a/php2pdf/font/makefont/iso-8859-5.map b/php2pdf/font/makefont/iso-8859-5.map new file mode 100644 index 0000000..f9cd4ed --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-5.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+0401 afii10023 +!A2 U+0402 afii10051 +!A3 U+0403 afii10052 +!A4 U+0404 afii10053 +!A5 U+0405 afii10054 +!A6 U+0406 afii10055 +!A7 U+0407 afii10056 +!A8 U+0408 afii10057 +!A9 U+0409 afii10058 +!AA U+040A afii10059 +!AB U+040B afii10060 +!AC U+040C afii10061 +!AD U+00AD hyphen +!AE U+040E afii10062 +!AF U+040F afii10145 +!B0 U+0410 afii10017 +!B1 U+0411 afii10018 +!B2 U+0412 afii10019 +!B3 U+0413 afii10020 +!B4 U+0414 afii10021 +!B5 U+0415 afii10022 +!B6 U+0416 afii10024 +!B7 U+0417 afii10025 +!B8 U+0418 afii10026 +!B9 U+0419 afii10027 +!BA U+041A afii10028 +!BB U+041B afii10029 +!BC U+041C afii10030 +!BD U+041D afii10031 +!BE U+041E afii10032 +!BF U+041F afii10033 +!C0 U+0420 afii10034 +!C1 U+0421 afii10035 +!C2 U+0422 afii10036 +!C3 U+0423 afii10037 +!C4 U+0424 afii10038 +!C5 U+0425 afii10039 +!C6 U+0426 afii10040 +!C7 U+0427 afii10041 +!C8 U+0428 afii10042 +!C9 U+0429 afii10043 +!CA U+042A afii10044 +!CB U+042B afii10045 +!CC U+042C afii10046 +!CD U+042D afii10047 +!CE U+042E afii10048 +!CF U+042F afii10049 +!D0 U+0430 afii10065 +!D1 U+0431 afii10066 +!D2 U+0432 afii10067 +!D3 U+0433 afii10068 +!D4 U+0434 afii10069 +!D5 U+0435 afii10070 +!D6 U+0436 afii10072 +!D7 U+0437 afii10073 +!D8 U+0438 afii10074 +!D9 U+0439 afii10075 +!DA U+043A afii10076 +!DB U+043B afii10077 +!DC U+043C afii10078 +!DD U+043D afii10079 +!DE U+043E afii10080 +!DF U+043F afii10081 +!E0 U+0440 afii10082 +!E1 U+0441 afii10083 +!E2 U+0442 afii10084 +!E3 U+0443 afii10085 +!E4 U+0444 afii10086 +!E5 U+0445 afii10087 +!E6 U+0446 afii10088 +!E7 U+0447 afii10089 +!E8 U+0448 afii10090 +!E9 U+0449 afii10091 +!EA U+044A afii10092 +!EB U+044B afii10093 +!EC U+044C afii10094 +!ED U+044D afii10095 +!EE U+044E afii10096 +!EF U+044F afii10097 +!F0 U+2116 afii61352 +!F1 U+0451 afii10071 +!F2 U+0452 afii10099 +!F3 U+0453 afii10100 +!F4 U+0454 afii10101 +!F5 U+0455 afii10102 +!F6 U+0456 afii10103 +!F7 U+0457 afii10104 +!F8 U+0458 afii10105 +!F9 U+0459 afii10106 +!FA U+045A afii10107 +!FB U+045B afii10108 +!FC U+045C afii10109 +!FD U+00A7 section +!FE U+045E afii10110 +!FF U+045F afii10193 diff --git a/php2pdf/font/makefont/iso-8859-7.map b/php2pdf/font/makefont/iso-8859-7.map new file mode 100644 index 0000000..e163796 --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-7.map @@ -0,0 +1,250 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+2018 quoteleft +!A2 U+2019 quoteright +!A3 U+00A3 sterling +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AF U+2015 afii00208 +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+0384 tonos +!B5 U+0385 dieresistonos +!B6 U+0386 Alphatonos +!B7 U+00B7 periodcentered +!B8 U+0388 Epsilontonos +!B9 U+0389 Etatonos +!BA U+038A Iotatonos +!BB U+00BB guillemotright +!BC U+038C Omicrontonos +!BD U+00BD onehalf +!BE U+038E Upsilontonos +!BF U+038F Omegatonos +!C0 U+0390 iotadieresistonos +!C1 U+0391 Alpha +!C2 U+0392 Beta +!C3 U+0393 Gamma +!C4 U+0394 Delta +!C5 U+0395 Epsilon +!C6 U+0396 Zeta +!C7 U+0397 Eta +!C8 U+0398 Theta +!C9 U+0399 Iota +!CA U+039A Kappa +!CB U+039B Lambda +!CC U+039C Mu +!CD U+039D Nu +!CE U+039E Xi +!CF U+039F Omicron +!D0 U+03A0 Pi +!D1 U+03A1 Rho +!D3 U+03A3 Sigma +!D4 U+03A4 Tau +!D5 U+03A5 Upsilon +!D6 U+03A6 Phi +!D7 U+03A7 Chi +!D8 U+03A8 Psi +!D9 U+03A9 Omega +!DA U+03AA Iotadieresis +!DB U+03AB Upsilondieresis +!DC U+03AC alphatonos +!DD U+03AD epsilontonos +!DE U+03AE etatonos +!DF U+03AF iotatonos +!E0 U+03B0 upsilondieresistonos +!E1 U+03B1 alpha +!E2 U+03B2 beta +!E3 U+03B3 gamma +!E4 U+03B4 delta +!E5 U+03B5 epsilon +!E6 U+03B6 zeta +!E7 U+03B7 eta +!E8 U+03B8 theta +!E9 U+03B9 iota +!EA U+03BA kappa +!EB U+03BB lambda +!EC U+03BC mu +!ED U+03BD nu +!EE U+03BE xi +!EF U+03BF omicron +!F0 U+03C0 pi +!F1 U+03C1 rho +!F2 U+03C2 sigma1 +!F3 U+03C3 sigma +!F4 U+03C4 tau +!F5 U+03C5 upsilon +!F6 U+03C6 phi +!F7 U+03C7 chi +!F8 U+03C8 psi +!F9 U+03C9 omega +!FA U+03CA iotadieresis +!FB U+03CB upsilondieresis +!FC U+03CC omicrontonos +!FD U+03CD upsilontonos +!FE U+03CE omegatonos diff --git a/php2pdf/font/makefont/iso-8859-9.map b/php2pdf/font/makefont/iso-8859-9.map new file mode 100644 index 0000000..48c123a --- /dev/null +++ b/php2pdf/font/makefont/iso-8859-9.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+0080 .notdef +!81 U+0081 .notdef +!82 U+0082 .notdef +!83 U+0083 .notdef +!84 U+0084 .notdef +!85 U+0085 .notdef +!86 U+0086 .notdef +!87 U+0087 .notdef +!88 U+0088 .notdef +!89 U+0089 .notdef +!8A U+008A .notdef +!8B U+008B .notdef +!8C U+008C .notdef +!8D U+008D .notdef +!8E U+008E .notdef +!8F U+008F .notdef +!90 U+0090 .notdef +!91 U+0091 .notdef +!92 U+0092 .notdef +!93 U+0093 .notdef +!94 U+0094 .notdef +!95 U+0095 .notdef +!96 U+0096 .notdef +!97 U+0097 .notdef +!98 U+0098 .notdef +!99 U+0099 .notdef +!9A U+009A .notdef +!9B U+009B .notdef +!9C U+009C .notdef +!9D U+009D .notdef +!9E U+009E .notdef +!9F U+009F .notdef +!A0 U+00A0 space +!A1 U+00A1 exclamdown +!A2 U+00A2 cent +!A3 U+00A3 sterling +!A4 U+00A4 currency +!A5 U+00A5 yen +!A6 U+00A6 brokenbar +!A7 U+00A7 section +!A8 U+00A8 dieresis +!A9 U+00A9 copyright +!AA U+00AA ordfeminine +!AB U+00AB guillemotleft +!AC U+00AC logicalnot +!AD U+00AD hyphen +!AE U+00AE registered +!AF U+00AF macron +!B0 U+00B0 degree +!B1 U+00B1 plusminus +!B2 U+00B2 twosuperior +!B3 U+00B3 threesuperior +!B4 U+00B4 acute +!B5 U+00B5 mu +!B6 U+00B6 paragraph +!B7 U+00B7 periodcentered +!B8 U+00B8 cedilla +!B9 U+00B9 onesuperior +!BA U+00BA ordmasculine +!BB U+00BB guillemotright +!BC U+00BC onequarter +!BD U+00BD onehalf +!BE U+00BE threequarters +!BF U+00BF questiondown +!C0 U+00C0 Agrave +!C1 U+00C1 Aacute +!C2 U+00C2 Acircumflex +!C3 U+00C3 Atilde +!C4 U+00C4 Adieresis +!C5 U+00C5 Aring +!C6 U+00C6 AE +!C7 U+00C7 Ccedilla +!C8 U+00C8 Egrave +!C9 U+00C9 Eacute +!CA U+00CA Ecircumflex +!CB U+00CB Edieresis +!CC U+00CC Igrave +!CD U+00CD Iacute +!CE U+00CE Icircumflex +!CF U+00CF Idieresis +!D0 U+011E Gbreve +!D1 U+00D1 Ntilde +!D2 U+00D2 Ograve +!D3 U+00D3 Oacute +!D4 U+00D4 Ocircumflex +!D5 U+00D5 Otilde +!D6 U+00D6 Odieresis +!D7 U+00D7 multiply +!D8 U+00D8 Oslash +!D9 U+00D9 Ugrave +!DA U+00DA Uacute +!DB U+00DB Ucircumflex +!DC U+00DC Udieresis +!DD U+0130 Idotaccent +!DE U+015E Scedilla +!DF U+00DF germandbls +!E0 U+00E0 agrave +!E1 U+00E1 aacute +!E2 U+00E2 acircumflex +!E3 U+00E3 atilde +!E4 U+00E4 adieresis +!E5 U+00E5 aring +!E6 U+00E6 ae +!E7 U+00E7 ccedilla +!E8 U+00E8 egrave +!E9 U+00E9 eacute +!EA U+00EA ecircumflex +!EB U+00EB edieresis +!EC U+00EC igrave +!ED U+00ED iacute +!EE U+00EE icircumflex +!EF U+00EF idieresis +!F0 U+011F gbreve +!F1 U+00F1 ntilde +!F2 U+00F2 ograve +!F3 U+00F3 oacute +!F4 U+00F4 ocircumflex +!F5 U+00F5 otilde +!F6 U+00F6 odieresis +!F7 U+00F7 divide +!F8 U+00F8 oslash +!F9 U+00F9 ugrave +!FA U+00FA uacute +!FB U+00FB ucircumflex +!FC U+00FC udieresis +!FD U+0131 dotlessi +!FE U+015F scedilla +!FF U+00FF ydieresis diff --git a/php2pdf/font/makefont/koi8-r.map b/php2pdf/font/makefont/koi8-r.map new file mode 100644 index 0000000..6ad5d05 --- /dev/null +++ b/php2pdf/font/makefont/koi8-r.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+2500 SF100000 +!81 U+2502 SF110000 +!82 U+250C SF010000 +!83 U+2510 SF030000 +!84 U+2514 SF020000 +!85 U+2518 SF040000 +!86 U+251C SF080000 +!87 U+2524 SF090000 +!88 U+252C SF060000 +!89 U+2534 SF070000 +!8A U+253C SF050000 +!8B U+2580 upblock +!8C U+2584 dnblock +!8D U+2588 block +!8E U+258C lfblock +!8F U+2590 rtblock +!90 U+2591 ltshade +!91 U+2592 shade +!92 U+2593 dkshade +!93 U+2320 integraltp +!94 U+25A0 filledbox +!95 U+2219 periodcentered +!96 U+221A radical +!97 U+2248 approxequal +!98 U+2264 lessequal +!99 U+2265 greaterequal +!9A U+00A0 space +!9B U+2321 integralbt +!9C U+00B0 degree +!9D U+00B2 twosuperior +!9E U+00B7 periodcentered +!9F U+00F7 divide +!A0 U+2550 SF430000 +!A1 U+2551 SF240000 +!A2 U+2552 SF510000 +!A3 U+0451 afii10071 +!A4 U+2553 SF520000 +!A5 U+2554 SF390000 +!A6 U+2555 SF220000 +!A7 U+2556 SF210000 +!A8 U+2557 SF250000 +!A9 U+2558 SF500000 +!AA U+2559 SF490000 +!AB U+255A SF380000 +!AC U+255B SF280000 +!AD U+255C SF270000 +!AE U+255D SF260000 +!AF U+255E SF360000 +!B0 U+255F SF370000 +!B1 U+2560 SF420000 +!B2 U+2561 SF190000 +!B3 U+0401 afii10023 +!B4 U+2562 SF200000 +!B5 U+2563 SF230000 +!B6 U+2564 SF470000 +!B7 U+2565 SF480000 +!B8 U+2566 SF410000 +!B9 U+2567 SF450000 +!BA U+2568 SF460000 +!BB U+2569 SF400000 +!BC U+256A SF540000 +!BD U+256B SF530000 +!BE U+256C SF440000 +!BF U+00A9 copyright +!C0 U+044E afii10096 +!C1 U+0430 afii10065 +!C2 U+0431 afii10066 +!C3 U+0446 afii10088 +!C4 U+0434 afii10069 +!C5 U+0435 afii10070 +!C6 U+0444 afii10086 +!C7 U+0433 afii10068 +!C8 U+0445 afii10087 +!C9 U+0438 afii10074 +!CA U+0439 afii10075 +!CB U+043A afii10076 +!CC U+043B afii10077 +!CD U+043C afii10078 +!CE U+043D afii10079 +!CF U+043E afii10080 +!D0 U+043F afii10081 +!D1 U+044F afii10097 +!D2 U+0440 afii10082 +!D3 U+0441 afii10083 +!D4 U+0442 afii10084 +!D5 U+0443 afii10085 +!D6 U+0436 afii10072 +!D7 U+0432 afii10067 +!D8 U+044C afii10094 +!D9 U+044B afii10093 +!DA U+0437 afii10073 +!DB U+0448 afii10090 +!DC U+044D afii10095 +!DD U+0449 afii10091 +!DE U+0447 afii10089 +!DF U+044A afii10092 +!E0 U+042E afii10048 +!E1 U+0410 afii10017 +!E2 U+0411 afii10018 +!E3 U+0426 afii10040 +!E4 U+0414 afii10021 +!E5 U+0415 afii10022 +!E6 U+0424 afii10038 +!E7 U+0413 afii10020 +!E8 U+0425 afii10039 +!E9 U+0418 afii10026 +!EA U+0419 afii10027 +!EB U+041A afii10028 +!EC U+041B afii10029 +!ED U+041C afii10030 +!EE U+041D afii10031 +!EF U+041E afii10032 +!F0 U+041F afii10033 +!F1 U+042F afii10049 +!F2 U+0420 afii10034 +!F3 U+0421 afii10035 +!F4 U+0422 afii10036 +!F5 U+0423 afii10037 +!F6 U+0416 afii10024 +!F7 U+0412 afii10019 +!F8 U+042C afii10046 +!F9 U+042B afii10045 +!FA U+0417 afii10025 +!FB U+0428 afii10042 +!FC U+042D afii10047 +!FD U+0429 afii10043 +!FE U+0427 afii10041 +!FF U+042A afii10044 diff --git a/php2pdf/font/makefont/koi8-u.map b/php2pdf/font/makefont/koi8-u.map new file mode 100644 index 0000000..40a7e4f --- /dev/null +++ b/php2pdf/font/makefont/koi8-u.map @@ -0,0 +1,256 @@ +!00 U+0000 .notdef +!01 U+0001 .notdef +!02 U+0002 .notdef +!03 U+0003 .notdef +!04 U+0004 .notdef +!05 U+0005 .notdef +!06 U+0006 .notdef +!07 U+0007 .notdef +!08 U+0008 .notdef +!09 U+0009 .notdef +!0A U+000A .notdef +!0B U+000B .notdef +!0C U+000C .notdef +!0D U+000D .notdef +!0E U+000E .notdef +!0F U+000F .notdef +!10 U+0010 .notdef +!11 U+0011 .notdef +!12 U+0012 .notdef +!13 U+0013 .notdef +!14 U+0014 .notdef +!15 U+0015 .notdef +!16 U+0016 .notdef +!17 U+0017 .notdef +!18 U+0018 .notdef +!19 U+0019 .notdef +!1A U+001A .notdef +!1B U+001B .notdef +!1C U+001C .notdef +!1D U+001D .notdef +!1E U+001E .notdef +!1F U+001F .notdef +!20 U+0020 space +!21 U+0021 exclam +!22 U+0022 quotedbl +!23 U+0023 numbersign +!24 U+0024 dollar +!25 U+0025 percent +!26 U+0026 ampersand +!27 U+0027 quotesingle +!28 U+0028 parenleft +!29 U+0029 parenright +!2A U+002A asterisk +!2B U+002B plus +!2C U+002C comma +!2D U+002D hyphen +!2E U+002E period +!2F U+002F slash +!30 U+0030 zero +!31 U+0031 one +!32 U+0032 two +!33 U+0033 three +!34 U+0034 four +!35 U+0035 five +!36 U+0036 six +!37 U+0037 seven +!38 U+0038 eight +!39 U+0039 nine +!3A U+003A colon +!3B U+003B semicolon +!3C U+003C less +!3D U+003D equal +!3E U+003E greater +!3F U+003F question +!40 U+0040 at +!41 U+0041 A +!42 U+0042 B +!43 U+0043 C +!44 U+0044 D +!45 U+0045 E +!46 U+0046 F +!47 U+0047 G +!48 U+0048 H +!49 U+0049 I +!4A U+004A J +!4B U+004B K +!4C U+004C L +!4D U+004D M +!4E U+004E N +!4F U+004F O +!50 U+0050 P +!51 U+0051 Q +!52 U+0052 R +!53 U+0053 S +!54 U+0054 T +!55 U+0055 U +!56 U+0056 V +!57 U+0057 W +!58 U+0058 X +!59 U+0059 Y +!5A U+005A Z +!5B U+005B bracketleft +!5C U+005C backslash +!5D U+005D bracketright +!5E U+005E asciicircum +!5F U+005F underscore +!60 U+0060 grave +!61 U+0061 a +!62 U+0062 b +!63 U+0063 c +!64 U+0064 d +!65 U+0065 e +!66 U+0066 f +!67 U+0067 g +!68 U+0068 h +!69 U+0069 i +!6A U+006A j +!6B U+006B k +!6C U+006C l +!6D U+006D m +!6E U+006E n +!6F U+006F o +!70 U+0070 p +!71 U+0071 q +!72 U+0072 r +!73 U+0073 s +!74 U+0074 t +!75 U+0075 u +!76 U+0076 v +!77 U+0077 w +!78 U+0078 x +!79 U+0079 y +!7A U+007A z +!7B U+007B braceleft +!7C U+007C bar +!7D U+007D braceright +!7E U+007E asciitilde +!7F U+007F .notdef +!80 U+2500 SF100000 +!81 U+2502 SF110000 +!82 U+250C SF010000 +!83 U+2510 SF030000 +!84 U+2514 SF020000 +!85 U+2518 SF040000 +!86 U+251C SF080000 +!87 U+2524 SF090000 +!88 U+252C SF060000 +!89 U+2534 SF070000 +!8A U+253C SF050000 +!8B U+2580 upblock +!8C U+2584 dnblock +!8D U+2588 block +!8E U+258C lfblock +!8F U+2590 rtblock +!90 U+2591 ltshade +!91 U+2592 shade +!92 U+2593 dkshade +!93 U+2320 integraltp +!94 U+25A0 filledbox +!95 U+2022 bullet +!96 U+221A radical +!97 U+2248 approxequal +!98 U+2264 lessequal +!99 U+2265 greaterequal +!9A U+00A0 space +!9B U+2321 integralbt +!9C U+00B0 degree +!9D U+00B2 twosuperior +!9E U+00B7 periodcentered +!9F U+00F7 divide +!A0 U+2550 SF430000 +!A1 U+2551 SF240000 +!A2 U+2552 SF510000 +!A3 U+0451 afii10071 +!A4 U+0454 afii10101 +!A5 U+2554 SF390000 +!A6 U+0456 afii10103 +!A7 U+0457 afii10104 +!A8 U+2557 SF250000 +!A9 U+2558 SF500000 +!AA U+2559 SF490000 +!AB U+255A SF380000 +!AC U+255B SF280000 +!AD U+0491 afii10098 +!AE U+255D SF260000 +!AF U+255E SF360000 +!B0 U+255F SF370000 +!B1 U+2560 SF420000 +!B2 U+2561 SF190000 +!B3 U+0401 afii10023 +!B4 U+0404 afii10053 +!B5 U+2563 SF230000 +!B6 U+0406 afii10055 +!B7 U+0407 afii10056 +!B8 U+2566 SF410000 +!B9 U+2567 SF450000 +!BA U+2568 SF460000 +!BB U+2569 SF400000 +!BC U+256A SF540000 +!BD U+0490 afii10050 +!BE U+256C SF440000 +!BF U+00A9 copyright +!C0 U+044E afii10096 +!C1 U+0430 afii10065 +!C2 U+0431 afii10066 +!C3 U+0446 afii10088 +!C4 U+0434 afii10069 +!C5 U+0435 afii10070 +!C6 U+0444 afii10086 +!C7 U+0433 afii10068 +!C8 U+0445 afii10087 +!C9 U+0438 afii10074 +!CA U+0439 afii10075 +!CB U+043A afii10076 +!CC U+043B afii10077 +!CD U+043C afii10078 +!CE U+043D afii10079 +!CF U+043E afii10080 +!D0 U+043F afii10081 +!D1 U+044F afii10097 +!D2 U+0440 afii10082 +!D3 U+0441 afii10083 +!D4 U+0442 afii10084 +!D5 U+0443 afii10085 +!D6 U+0436 afii10072 +!D7 U+0432 afii10067 +!D8 U+044C afii10094 +!D9 U+044B afii10093 +!DA U+0437 afii10073 +!DB U+0448 afii10090 +!DC U+044D afii10095 +!DD U+0449 afii10091 +!DE U+0447 afii10089 +!DF U+044A afii10092 +!E0 U+042E afii10048 +!E1 U+0410 afii10017 +!E2 U+0411 afii10018 +!E3 U+0426 afii10040 +!E4 U+0414 afii10021 +!E5 U+0415 afii10022 +!E6 U+0424 afii10038 +!E7 U+0413 afii10020 +!E8 U+0425 afii10039 +!E9 U+0418 afii10026 +!EA U+0419 afii10027 +!EB U+041A afii10028 +!EC U+041B afii10029 +!ED U+041C afii10030 +!EE U+041D afii10031 +!EF U+041E afii10032 +!F0 U+041F afii10033 +!F1 U+042F afii10049 +!F2 U+0420 afii10034 +!F3 U+0421 afii10035 +!F4 U+0422 afii10036 +!F5 U+0423 afii10037 +!F6 U+0416 afii10024 +!F7 U+0412 afii10019 +!F8 U+042C afii10046 +!F9 U+042B afii10045 +!FA U+0417 afii10025 +!FB U+0428 afii10042 +!FC U+042D afii10047 +!FD U+0429 afii10043 +!FE U+0427 afii10041 +!FF U+042A afii10044 diff --git a/php2pdf/font/makefont/makefont.php b/php2pdf/font/makefont/makefont.php new file mode 100644 index 0000000..7ac3efe --- /dev/null +++ b/php2pdf/font/makefont/makefont.php @@ -0,0 +1,416 @@ +Error: encoding not found: '.$enc); + $cc2gn=array(); + foreach($a as $l) + { + if($l{0}=='!') + { + $e=preg_split('/[ \\t]+/',rtrim($l)); + $cc=hexdec(substr($e[0],1)); + $gn=$e[2]; + $cc2gn[$cc]=$gn; + } + } + for($i=0;$i<=255;$i++) + { + if(!isset($cc2gn[$i])) + $cc2gn[$i]='.notdef'; + } + return $cc2gn; +} + +function ReadAFM($file,&$map) +{ + //Read a font metric file + $a=file($file); + if(empty($a)) + die('File not found'); + $widths=array(); + $fm=array(); + $fix=array('Edot'=>'Edotaccent','edot'=>'edotaccent','Idot'=>'Idotaccent','Zdot'=>'Zdotaccent','zdot'=>'zdotaccent', + 'Odblacute'=>'Ohungarumlaut','odblacute'=>'ohungarumlaut','Udblacute'=>'Uhungarumlaut','udblacute'=>'uhungarumlaut', + 'Gcedilla'=>'Gcommaaccent','gcedilla'=>'gcommaaccent','Kcedilla'=>'Kcommaaccent','kcedilla'=>'kcommaaccent', + 'Lcedilla'=>'Lcommaaccent','lcedilla'=>'lcommaaccent','Ncedilla'=>'Ncommaaccent','ncedilla'=>'ncommaaccent', + 'Rcedilla'=>'Rcommaaccent','rcedilla'=>'rcommaaccent','Scedilla'=>'Scommaaccent','scedilla'=>'scommaaccent', + 'Tcedilla'=>'Tcommaaccent','tcedilla'=>'tcommaaccent','Dslash'=>'Dcroat','dslash'=>'dcroat','Dmacron'=>'Dcroat','dmacron'=>'dcroat', + 'combininggraveaccent'=>'gravecomb','combininghookabove'=>'hookabovecomb','combiningtildeaccent'=>'tildecomb', + 'combiningacuteaccent'=>'acutecomb','combiningdotbelow'=>'dotbelowcomb','dongsign'=>'dong'); + foreach($a as $l) + { + $e=explode(' ',rtrim($l)); + if(count($e)<2) + continue; + $code=$e[0]; + $param=$e[1]; + if($code=='C') + { + //Character metrics + $cc=(int)$e[1]; + $w=$e[4]; + $gn=$e[7]; + if(substr($gn,-4)=='20AC') + $gn='Euro'; + if(isset($fix[$gn])) + { + //Fix incorrect glyph name + foreach($map as $c=>$n) + { + if($n==$fix[$gn]) + $map[$c]=$gn; + } + } + if(empty($map)) + { + //Symbolic font: use built-in encoding + $widths[$cc]=$w; + } + else + { + $widths[$gn]=$w; + if($gn=='X') + $fm['CapXHeight']=$e[13]; + } + if($gn=='.notdef') + $fm['MissingWidth']=$w; + } + elseif($code=='FontName') + $fm['FontName']=$param; + elseif($code=='Weight') + $fm['Weight']=$param; + elseif($code=='ItalicAngle') + $fm['ItalicAngle']=(double)$param; + elseif($code=='Ascender') + $fm['Ascender']=(int)$param; + elseif($code=='Descender') + $fm['Descender']=(int)$param; + elseif($code=='UnderlineThickness') + $fm['UnderlineThickness']=(int)$param; + elseif($code=='UnderlinePosition') + $fm['UnderlinePosition']=(int)$param; + elseif($code=='IsFixedPitch') + $fm['IsFixedPitch']=($param=='true'); + elseif($code=='FontBBox') + $fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]); + elseif($code=='CapHeight') + $fm['CapHeight']=(int)$param; + elseif($code=='StdVW') + $fm['StdVW']=(int)$param; + } + if(!isset($fm['FontName'])) + die('FontName not found'); + if(!empty($map)) + { + if(!isset($widths['.notdef'])) + $widths['.notdef']=600; + if(!isset($widths['Delta']) and isset($widths['increment'])) + $widths['Delta']=$widths['increment']; + //Order widths according to map + for($i=0;$i<=255;$i++) + { + if(!isset($widths[$map[$i]])) + { + echo 'Warning: character '.$map[$i].' is missing
'; + $widths[$i]=$widths['.notdef']; + } + else + $widths[$i]=$widths[$map[$i]]; + } + } + $fm['Widths']=$widths; + return $fm; +} + +function MakeFontDescriptor($fm,$symbolic) +{ + //Ascent + $asc=(isset($fm['Ascender']) ? $fm['Ascender'] : 1000); + $fd="array('Ascent'=>".$asc; + //Descent + $desc=(isset($fm['Descender']) ? $fm['Descender'] : -200); + $fd.=",'Descent'=>".$desc; + //CapHeight + if(isset($fm['CapHeight'])) + $ch=$fm['CapHeight']; + elseif(isset($fm['CapXHeight'])) + $ch=$fm['CapXHeight']; + else + $ch=$asc; + $fd.=",'CapHeight'=>".$ch; + //Flags + $flags=0; + if(isset($fm['IsFixedPitch']) and $fm['IsFixedPitch']) + $flags+=1<<0; + if($symbolic) + $flags+=1<<2; + if(!$symbolic) + $flags+=1<<5; + if(isset($fm['ItalicAngle']) and $fm['ItalicAngle']!=0) + $flags+=1<<6; + $fd.=",'Flags'=>".$flags; + //FontBBox + if(isset($fm['FontBBox'])) + $fbb=$fm['FontBBox']; + else + $fbb=array(0,$des-100,1000,$asc+100); + $fd.=",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'"; + //ItalicAngle + $ia=(isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0); + $fd.=",'ItalicAngle'=>".$ia; + //StemV + if(isset($fm['StdVW'])) + $stemv=$fm['StdVW']; + elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight'])) + $stemv=120; + else + $stemv=70; + $fd.=",'StemV'=>".$stemv; + //MissingWidth + if(isset($fm['MissingWidth'])) + $fd.=",'MissingWidth'=>".$fm['MissingWidth']; + $fd.=')'; + return $fd; +} + +function MakeWidthArray($fm) +{ + //Make character width array + $s="array(\n\t"; + $cw=$fm['Widths']; + for($i=0;$i<=255;$i++) + { + if(chr($i)=="'") + $s.="'\\''"; + elseif(chr($i)=="\\") + $s.="'\\\\'"; + elseif($i>=32 and $i<=126) + $s.="'".chr($i)."'"; + else + $s.="chr($i)"; + $s.='=>'.$fm['Widths'][$i]; + if($i<255) + $s.=','; + if(($i+1)%22==0) + $s.="\n\t"; + } + $s.=')'; + return $s; +} + +function MakeFontEncoding($map) +{ + //Build differences from reference encoding + $ref=ReadMap('cp1252'); + $s=''; + $last=0; + for($i=32;$i<=255;$i++) + { + if($map[$i]!=$ref[$i]) + { + if($i!=$last+1) + $s.=$i.' '; + $last=$i; + $s.='/'.$map[$i].' '; + } + } + return rtrim($s); +} + +function SaveToFile($file,$s,$mode='t') +{ + $f=fopen($file,'w'.$mode); + if(!$f) + die('Can\'t write to file '.$file); + fwrite($f,$s,strlen($s)); + fclose($f); +} + +function ReadShort($f) +{ + $a=unpack('n1n',fread($f,2)); + return $a['n']; +} + +function ReadLong($f) +{ + $a=unpack('N1N',fread($f,4)); + return $a['N']; +} + +function CheckTTF($file) +{ + //Check if font license allows embedding + $f=fopen($file,'rb'); + if(!$f) + die('Error: Can\'t open '.$file); + //Extract number of tables + fseek($f,4,SEEK_CUR); + $nb=ReadShort($f); + fseek($f,6,SEEK_CUR); + //Seek OS/2 table + $found=false; + for($i=0;$i<$nb;$i++) + { + if(fread($f,4)=='OS/2') + { + $found=true; + break; + } + fseek($f,12,SEEK_CUR); + } + if(!$found) + { + fclose($f); + return; + } + fseek($f,4,SEEK_CUR); + $offset=ReadLong($f); + fseek($f,$offset,SEEK_SET); + //Extract fsType flags + fseek($f,8,SEEK_CUR); + $fsType=ReadShort($f); + $rl=($fsType & 0x02)!=0; + $pp=($fsType & 0x04)!=0; + $e=($fsType & 0x08)!=0; + fclose($f); + if($rl and !$pp and !$e) + echo 'Warning: font license does not allow embedding'; +} + +/******************************************************************************* +* $fontfile : chemin du fichier TTF (ou chane vide si pas d'incorporation) * +* $afmfile : chemin du fichier AFM * +* $enc : encodage (ou chane vide si la police est symbolique) * +* $patch : patch optionnel pour l'encodage * +* $type : type de la police si $fontfile est vide * +*******************************************************************************/ +function MakeFont($fontfile,$afmfile,$enc='cp1252',$patch=array(),$type='TrueType') +{ + //Generate a font definition file + set_magic_quotes_runtime(0); + ini_set('auto_detect_line_endings','1'); + if($enc) + { + $map=ReadMap($enc); + foreach($patch as $cc=>$gn) + $map[$cc]=$gn; + } + else + $map=array(); + if(!file_exists($afmfile)) + die('Error: AFM file not found: '.$afmfile); + $fm=ReadAFM($afmfile,$map); + if($enc) + $diff=MakeFontEncoding($map); + else + $diff=''; + $fd=MakeFontDescriptor($fm,empty($map)); + //Find font type + if($fontfile) + { + $ext=strtolower(substr($fontfile,-3)); + if($ext=='ttf') + $type='TrueType'; + elseif($ext=='pfb') + $type='Type1'; + else + die('Error: unrecognized font file extension: '.$ext); + } + else + { + if($type!='TrueType' and $type!='Type1') + die('Error: incorrect font type: '.$type); + } + //Start generation + $s='Error: font file not found: '.$fontfile); + if($type=='TrueType') + CheckTTF($fontfile); + $f=fopen($fontfile,'rb'); + if(!$f) + die('Error: Can\'t open '.$fontfile); + $file=fread($f,filesize($fontfile)); + fclose($f); + if($type=='Type1') + { + //Find first two sections and discard third one + $header=(ord($file{0})==128); + if($header) + { + //Strip first binary header + $file=substr($file,6); + } + $pos=strpos($file,'eexec'); + if(!$pos) + die('Error: font file does not seem to be valid Type1'); + $size1=$pos+6; + if($header and ord($file{$size1})==128) + { + //Strip second binary header + $file=substr($file,0,$size1).substr($file,$size1+6); + } + $pos=strpos($file,'00000000'); + if(!$pos) + die('Error: font file does not seem to be valid Type1'); + $size2=$pos-$size1; + $file=substr($file,0,$size1+$size2); + } + if(function_exists('gzcompress')) + { + $cmp=$basename.'.z'; + SaveToFile($cmp,gzcompress($file),'b'); + $s.='$file=\''.$cmp."';\n"; + echo 'Font file compressed ('.$cmp.')
'; + } + else + { + $s.='$file=\''.basename($fontfile)."';\n"; + echo 'Notice: font file could not be compressed (zlib extension not available)
'; + } + if($type=='Type1') + { + $s.='$size1='.$size1.";\n"; + $s.='$size2='.$size2.";\n"; + } + else + $s.='$originalsize='.filesize($fontfile).";\n"; + } + else + { + //Not embedded font + $s.='$file='."'';\n"; + } + $s.="?>\n"; + SaveToFile($basename.'.php',$s); + echo 'Font definition file generated ('.$basename.'.php'.')
'; +} +?> diff --git a/php2pdf/font/symbol.php b/php2pdf/font/symbol.php new file mode 100644 index 0000000..b556ed8 --- /dev/null +++ b/php2pdf/font/symbol.php @@ -0,0 +1,15 @@ +250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250, + chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549, + ','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722, + 'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768, + 'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576, + 'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0, + chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0, + chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603, + chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768, + chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042, + chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329, + chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0); +?> diff --git a/php2pdf/font/times.php b/php2pdf/font/times.php new file mode 100644 index 0000000..b9be1b2 --- /dev/null +++ b/php2pdf/font/times.php @@ -0,0 +1,15 @@ +250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250, + chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564, + ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722, + 'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944, + 'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778, + 'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500, + chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980, + chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333, + chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722, + chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722, + chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500, + chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500); +?> diff --git a/php2pdf/font/timesb.php b/php2pdf/font/timesb.php new file mode 100644 index 0000000..c3eb9fa --- /dev/null +++ b/php2pdf/font/timesb.php @@ -0,0 +1,15 @@ +250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250, + chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570, + ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722, + 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000, + 'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833, + 'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500, + chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000, + chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333, + chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722, + chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722, + chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556, + chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500); +?> diff --git a/php2pdf/font/timesbi.php b/php2pdf/font/timesbi.php new file mode 100644 index 0000000..161f630 --- /dev/null +++ b/php2pdf/font/timesbi.php @@ -0,0 +1,15 @@ +250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250, + chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570, + ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667, + 'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889, + 'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778, + 'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500, + chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000, + chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333, + chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667, + chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722, + chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556, + chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444); +?> diff --git a/php2pdf/font/timesi.php b/php2pdf/font/timesi.php new file mode 100644 index 0000000..de171fd --- /dev/null +++ b/php2pdf/font/timesi.php @@ -0,0 +1,15 @@ +250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250, + chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675, + ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611, + 'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833, + 'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722, + 'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500, + chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980, + chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333, + chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611, + chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722, + chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500, + chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444); +?> diff --git a/php2pdf/font/zapfdingbats.php b/php2pdf/font/zapfdingbats.php new file mode 100644 index 0000000..f2bdfd5 --- /dev/null +++ b/php2pdf/font/zapfdingbats.php @@ -0,0 +1,15 @@ +0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0, + chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939, + ','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692, + 'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776, + 'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873, + 'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317, + chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0, + chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788, + chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788, + chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918, + chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874, + chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0); +?> diff --git a/php2pdf/fpdf.php b/php2pdf/fpdf.php new file mode 100644 index 0000000..c463aa6 --- /dev/null +++ b/php2pdf/fpdf.php @@ -0,0 +1,1647 @@ +_dochecks(); + //Initialization of properties + $this->page=0; + $this->n=2; + $this->buffer=''; + $this->pages=array(); + $this->OrientationChanges=array(); + $this->state=0; + $this->fonts=array(); + $this->FontFiles=array(); + $this->diffs=array(); + $this->images=array(); + $this->links=array(); + $this->InFooter=false; + $this->lasth=0; + $this->FontFamily=''; + $this->FontStyle=''; + $this->FontSizePt=12; + $this->underline=false; + $this->DrawColor='0 G'; + $this->FillColor='0 g'; + $this->TextColor='0 g'; + $this->ColorFlag=false; + $this->ws=0; + //Standard fonts + $this->CoreFonts=array('courier'=>'Courier','courierB'=>'Courier-Bold','courierI'=>'Courier-Oblique','courierBI'=>'Courier-BoldOblique', + 'helvetica'=>'Helvetica','helveticaB'=>'Helvetica-Bold','helveticaI'=>'Helvetica-Oblique','helveticaBI'=>'Helvetica-BoldOblique', + 'times'=>'Times-Roman','timesB'=>'Times-Bold','timesI'=>'Times-Italic','timesBI'=>'Times-BoldItalic', + 'symbol'=>'Symbol','zapfdingbats'=>'ZapfDingbats'); + //Scale factor + if($unit=='pt') + $this->k=1; + elseif($unit=='mm') + $this->k=72/25.4; + elseif($unit=='cm') + $this->k=72/2.54; + elseif($unit=='in') + $this->k=72; + else + $this->Error('Incorrect unit: '.$unit); + //Page format + if(is_string($format)) + { + $format=strtolower($format); + if($format=='a3') + $format=array(841.89,1190.55); + elseif($format=='a4') + $format=array(595.28,841.89); + elseif($format=='a5') + $format=array(420.94,595.28); + elseif($format=='letter') + $format=array(612,792); + elseif($format=='legal') + $format=array(612,1008); + else + $this->Error('Unknown page format: '.$format); + $this->fwPt=$format[0]; + $this->fhPt=$format[1]; + } + else + { + $this->fwPt=$format[0]*$this->k; + $this->fhPt=$format[1]*$this->k; + } + $this->fw=$this->fwPt/$this->k; + $this->fh=$this->fhPt/$this->k; + //Page orientation + $orientation=strtolower($orientation); + if($orientation=='p' || $orientation=='portrait') + { + $this->DefOrientation='P'; + $this->wPt=$this->fwPt; + $this->hPt=$this->fhPt; + } + elseif($orientation=='l' || $orientation=='landscape') + { + $this->DefOrientation='L'; + $this->wPt=$this->fhPt; + $this->hPt=$this->fwPt; + } + else + $this->Error('Incorrect orientation: '.$orientation); + $this->CurOrientation=$this->DefOrientation; + $this->w=$this->wPt/$this->k; + $this->h=$this->hPt/$this->k; + //Page margins (1 cm) + $margin=28.35/$this->k; + $this->SetMargins($margin,$margin); + //Interior cell margin (1 mm) + $this->cMargin=$margin/10; + //Line width (0.2 mm) + $this->LineWidth=.567/$this->k; + //Automatic page break + $this->SetAutoPageBreak(true,2*$margin); + //Full width display mode + $this->SetDisplayMode('fullwidth'); + //Enable compression + $this->SetCompression(true); + //Set default PDF version number + $this->PDFVersion='1.3'; +} + +function SetMargins($left,$top,$right=-1) +{ + //Set left, top and right margins + $this->lMargin=$left; + $this->tMargin=$top; + if($right==-1) + $right=$left; + $this->rMargin=$right; +} + +function SetLeftMargin($margin) +{ + //Set left margin + $this->lMargin=$margin; + if($this->page>0 && $this->x<$margin) + $this->x=$margin; +} + +function SetTopMargin($margin) +{ + //Set top margin + $this->tMargin=$margin; +} + +function SetRightMargin($margin) +{ + //Set right margin + $this->rMargin=$margin; +} + +function SetAutoPageBreak($auto,$margin=0) +{ + //Set auto page break mode and triggering margin + $this->AutoPageBreak=$auto; + $this->bMargin=$margin; + $this->PageBreakTrigger=$this->h-$margin; +} + +function SetDisplayMode($zoom,$layout='continuous') +{ + //Set display mode in viewer + if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom)) + $this->ZoomMode=$zoom; + else + $this->Error('Incorrect zoom display mode: '.$zoom); + if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default') + $this->LayoutMode=$layout; + else + $this->Error('Incorrect layout display mode: '.$layout); +} + +function SetCompression($compress) +{ + //Set page compression + if(function_exists('gzcompress')) + $this->compress=$compress; + else + $this->compress=false; +} + +function SetTitle($title) +{ + //Title of document + $this->title=$title; +} + +function SetSubject($subject) +{ + //Subject of document + $this->subject=$subject; +} + +function SetAuthor($author) +{ + //Author of document + $this->author=$author; +} + +function SetKeywords($keywords) +{ + //Keywords of document + $this->keywords=$keywords; +} + +function SetCreator($creator) +{ + //Creator of document + $this->creator=$creator; +} + +function AliasNbPages($alias='{nb}') +{ + //Define an alias for total number of pages + $this->AliasNbPages=$alias; +} + +function Error($msg) +{ + //Fatal error + die('FPDF error: '.$msg); +} + +function Open() +{ + //Begin document + $this->state=1; +} + +function Close() +{ + //Terminate document + if($this->state==3) + return; + if($this->page==0) + $this->AddPage(); + //Page footer + $this->InFooter=true; + $this->Footer(); + $this->InFooter=false; + //Close page + $this->_endpage(); + //Close document + $this->_enddoc(); +} + +function AddPage($orientation='') +{ + //Start a new page + if($this->state==0) + $this->Open(); + $family=$this->FontFamily; + $style=$this->FontStyle.($this->underline ? 'U' : ''); + $size=$this->FontSizePt; + $lw=$this->LineWidth; + $dc=$this->DrawColor; + $fc=$this->FillColor; + $tc=$this->TextColor; + $cf=$this->ColorFlag; + if($this->page>0) + { + //Page footer + $this->InFooter=true; + $this->Footer(); + $this->InFooter=false; + //Close page + $this->_endpage(); + } + //Start new page + $this->_beginpage($orientation); + //Set line cap style to square + $this->_out('2 J'); + //Set line width + $this->LineWidth=$lw; + $this->_out(sprintf('%.2f w',$lw*$this->k)); + //Set font + if($family) + $this->SetFont($family,$style,$size); + //Set colors + $this->DrawColor=$dc; + if($dc!='0 G') + $this->_out($dc); + $this->FillColor=$fc; + if($fc!='0 g') + $this->_out($fc); + $this->TextColor=$tc; + $this->ColorFlag=$cf; + //Page header + $this->Header(); + //Restore line width + if($this->LineWidth!=$lw) + { + $this->LineWidth=$lw; + $this->_out(sprintf('%.2f w',$lw*$this->k)); + } + //Restore font + if($family) + $this->SetFont($family,$style,$size); + //Restore colors + if($this->DrawColor!=$dc) + { + $this->DrawColor=$dc; + $this->_out($dc); + } + if($this->FillColor!=$fc) + { + $this->FillColor=$fc; + $this->_out($fc); + } + $this->TextColor=$tc; + $this->ColorFlag=$cf; +} + +function Header() +{ + //To be implemented in your own inherited class +} + +function Footer() +{ + //To be implemented in your own inherited class +} + +function PageNo() +{ + //Get current page number + return $this->page; +} + +function SetDrawColor($r,$g=-1,$b=-1) +{ + //Set color for all stroking operations + if(($r==0 && $g==0 && $b==0) || $g==-1) + $this->DrawColor=sprintf('%.3f G',$r/255); + else + $this->DrawColor=sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255); + if($this->page>0) + $this->_out($this->DrawColor); +} + +function SetFillColor($r,$g=-1,$b=-1) +{ + //Set color for all filling operations + if(($r==0 && $g==0 && $b==0) || $g==-1) + $this->FillColor=sprintf('%.3f g',$r/255); + else + $this->FillColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255); + $this->ColorFlag=($this->FillColor!=$this->TextColor); + if($this->page>0) + $this->_out($this->FillColor); +} + +function SetTextColor($r,$g=-1,$b=-1) +{ + //Set color for text + if(($r==0 && $g==0 && $b==0) || $g==-1) + $this->TextColor=sprintf('%.3f g',$r/255); + else + $this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255); + $this->ColorFlag=($this->FillColor!=$this->TextColor); +} + +function GetStringWidth($s) +{ + //Get width of a string in the current font + $s=(string)$s; + $cw=&$this->CurrentFont['cw']; + $w=0; + $l=strlen($s); + for($i=0;$i<$l;$i++) + $w+=$cw[$s{$i}]; + return $w*$this->FontSize/1000; +} + +function SetLineWidth($width) +{ + //Set line width + $this->LineWidth=$width; + if($this->page>0) + $this->_out(sprintf('%.2f w',$width*$this->k)); +} + +function Line($x1,$y1,$x2,$y2) +{ + //Draw a line + $this->_out(sprintf('%.2f %.2f m %.2f %.2f l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k)); +} + +function Rect($x,$y,$w,$h,$style='') +{ + //Draw a rectangle + if($style=='F') + $op='f'; + elseif($style=='FD' || $style=='DF') + $op='B'; + else + $op='S'; + $this->_out(sprintf('%.2f %.2f %.2f %.2f re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op)); +} + +function AddFont($family,$style='',$file='') +{ + //Add a TrueType or Type1 font + $family=strtolower($family); + if($file=='') + $file=str_replace(' ','',$family).strtolower($style).'.php'; + if($family=='arial') + $family='helvetica'; + $style=strtoupper($style); + if($style=='IB') + $style='BI'; + $fontkey=$family.$style; + if(isset($this->fonts[$fontkey])) + $this->Error('Font already added: '.$family.' '.$style); + include($this->_getfontpath().$file); + if(!isset($name)) + $this->Error('Could not include font definition file'); + $i=count($this->fonts)+1; + $this->fonts[$fontkey]=array('i'=>$i,'type'=>$type,'name'=>$name,'desc'=>$desc,'up'=>$up,'ut'=>$ut,'cw'=>$cw,'enc'=>$enc,'file'=>$file); + if($diff) + { + //Search existing encodings + $d=0; + $nb=count($this->diffs); + for($i=1;$i<=$nb;$i++) + { + if($this->diffs[$i]==$diff) + { + $d=$i; + break; + } + } + if($d==0) + { + $d=$nb+1; + $this->diffs[$d]=$diff; + } + $this->fonts[$fontkey]['diff']=$d; + } + if($file) + { + if($type=='TrueType') + $this->FontFiles[$file]=array('length1'=>$originalsize); + else + $this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2); + } +} + +function SetFont($family,$style='',$size=0) +{ + //Select a font; size given in points + global $fpdf_charwidths; + + $family=strtolower($family); + if($family=='') + $family=$this->FontFamily; + if($family=='arial') + $family='helvetica'; + elseif($family=='symbol' || $family=='zapfdingbats') + $style=''; + $style=strtoupper($style); + if(strpos($style,'U')!==false) + { + $this->underline=true; + $style=str_replace('U','',$style); + } + else + $this->underline=false; + if($style=='IB') + $style='BI'; + if($size==0) + $size=$this->FontSizePt; + //Test if font is already selected + if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) + return; + //Test if used for the first time + $fontkey=$family.$style; + if(!isset($this->fonts[$fontkey])) + { + //Check if one of the standard fonts + if(isset($this->CoreFonts[$fontkey])) + { + if(!isset($fpdf_charwidths[$fontkey])) + { + //Load metric file + $file=$family; + if($family=='times' || $family=='helvetica') + $file.=strtolower($style); + include($this->_getfontpath().$file.'.php'); + if(!isset($fpdf_charwidths[$fontkey])) + $this->Error('Could not include font metric file'); + } + $i=count($this->fonts)+1; + $this->fonts[$fontkey]=array('i'=>$i,'type'=>'core','name'=>$this->CoreFonts[$fontkey],'up'=>-100,'ut'=>50,'cw'=>$fpdf_charwidths[$fontkey]); + } + else + $this->Error('Undefined font: '.$family.' '.$style); + } + //Select it + $this->FontFamily=$family; + $this->FontStyle=$style; + $this->FontSizePt=$size; + $this->FontSize=$size/$this->k; + $this->CurrentFont=&$this->fonts[$fontkey]; + if($this->page>0) + $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt)); +} + +function SetFontSize($size) +{ + //Set font size in points + if($this->FontSizePt==$size) + return; + $this->FontSizePt=$size; + $this->FontSize=$size/$this->k; + if($this->page>0) + $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt)); +} + +function AddLink() +{ + //Create a new internal link + $n=count($this->links)+1; + $this->links[$n]=array(0,0); + return $n; +} + +function SetLink($link,$y=0,$page=-1) +{ + //Set destination of internal link + if($y==-1) + $y=$this->y; + if($page==-1) + $page=$this->page; + $this->links[$link]=array($page,$y); +} + +function Link($x,$y,$w,$h,$link) +{ + //Put a link on the page + $this->PageLinks[$this->page][]=array($x*$this->k,$this->hPt-$y*$this->k,$w*$this->k,$h*$this->k,$link); +} + +function Text($x,$y,$txt) +{ + //Output a string + $s=sprintf('BT %.2f %.2f Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt)); + if($this->underline && $txt!='') + $s.=' '.$this->_dounderline($x,$y,$txt); + if($this->ColorFlag) + $s='q '.$this->TextColor.' '.$s.' Q'; + $this->_out($s); +} + +function AcceptPageBreak() +{ + //Accept automatic page break or not + return $this->AutoPageBreak; +} + +function Cell($w,$h=0,$txt='',$border=0,$ln=0,$align='',$fill=0,$link='') +{ + //Output a cell + $k=$this->k; + if($this->y+$h>$this->PageBreakTrigger && !$this->InFooter && $this->AcceptPageBreak()) + { + //Automatic page break + $x=$this->x; + $ws=$this->ws; + if($ws>0) + { + $this->ws=0; + $this->_out('0 Tw'); + } + $this->AddPage($this->CurOrientation); + $this->x=$x; + if($ws>0) + { + $this->ws=$ws; + $this->_out(sprintf('%.3f Tw',$ws*$k)); + } + } + if($w==0) + $w=$this->w-$this->rMargin-$this->x; + $s=''; + if($fill==1 || $border==1) + { + if($fill==1) + $op=($border==1) ? 'B' : 'f'; + else + $op='S'; + $s=sprintf('%.2f %.2f %.2f %.2f re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op); + } + if(is_string($border)) + { + $x=$this->x; + $y=$this->y; + if(strpos($border,'L')!==false) + $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k); + if(strpos($border,'T')!==false) + $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k); + if(strpos($border,'R')!==false) + $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k); + if(strpos($border,'B')!==false) + $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k); + } + if($txt!=='') + { + if($align=='R') + $dx=$w-$this->cMargin-$this->GetStringWidth($txt); + elseif($align=='C') + $dx=($w-$this->GetStringWidth($txt))/2; + else + $dx=$this->cMargin; + if($this->ColorFlag) + $s.='q '.$this->TextColor.' '; + $txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt))); + $s.=sprintf('BT %.2f %.2f Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2); + if($this->underline) + $s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt); + if($this->ColorFlag) + $s.=' Q'; + if($link) + $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link); + } + if($s) + $this->_out($s); + $this->lasth=$h; + if($ln>0) + { + //Go to next line + $this->y+=$h; + if($ln==1) + $this->x=$this->lMargin; + } + else + $this->x+=$w; +} + +function MultiCell($w,$h,$txt,$border=0,$align='J',$fill=0) +{ + //Output text with automatic or explicit line breaks + $cw=&$this->CurrentFont['cw']; + if($w==0) + $w=$this->w-$this->rMargin-$this->x; + $wmax=($w-2*$this->cMargin)*1000/$this->FontSize; + $s=str_replace("\r",'',$txt); + $nb=strlen($s); + if($nb>0 && $s[$nb-1]=="\n") + $nb--; + $b=0; + if($border) + { + if($border==1) + { + $border='LTRB'; + $b='LRT'; + $b2='LR'; + } + else + { + $b2=''; + if(strpos($border,'L')!==false) + $b2.='L'; + if(strpos($border,'R')!==false) + $b2.='R'; + $b=(strpos($border,'T')!==false) ? $b2.'T' : $b2; + } + } + $sep=-1; + $i=0; + $j=0; + $l=0; + $ns=0; + $nl=1; + while($i<$nb) + { + //Get next character + $c=$s{$i}; + if($c=="\n") + { + //Explicit line break + if($this->ws>0) + { + $this->ws=0; + $this->_out('0 Tw'); + } + $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill); + $i++; + $sep=-1; + $j=$i; + $l=0; + $ns=0; + $nl++; + if($border && $nl==2) + $b=$b2; + continue; + } + if($c==' ') + { + $sep=$i; + $ls=$l; + $ns++; + } + $l+=$cw[$c]; + if($l>$wmax) + { + //Automatic line break + if($sep==-1) + { + if($i==$j) + $i++; + if($this->ws>0) + { + $this->ws=0; + $this->_out('0 Tw'); + } + $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill); + } + else + { + if($align=='J') + { + $this->ws=($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0; + $this->_out(sprintf('%.3f Tw',$this->ws*$this->k)); + } + $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill); + $i=$sep+1; + } + $sep=-1; + $j=$i; + $l=0; + $ns=0; + $nl++; + if($border && $nl==2) + $b=$b2; + } + else + $i++; + } + //Last chunk + if($this->ws>0) + { + $this->ws=0; + $this->_out('0 Tw'); + } + if($border && strpos($border,'B')!==false) + $b.='B'; + $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill); + $this->x=$this->lMargin; +} + +function Write($h,$txt,$link='') +{ + //Output text in flowing mode + $cw=&$this->CurrentFont['cw']; + $w=$this->w-$this->rMargin-$this->x; + $wmax=($w-2*$this->cMargin)*1000/$this->FontSize; + $s=str_replace("\r",'',$txt); + $nb=strlen($s); + $sep=-1; + $i=0; + $j=0; + $l=0; + $nl=1; + while($i<$nb) + { + //Get next character + $c=$s{$i}; + if($c=="\n") + { + //Explicit line break + $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link); + $i++; + $sep=-1; + $j=$i; + $l=0; + if($nl==1) + { + $this->x=$this->lMargin; + $w=$this->w-$this->rMargin-$this->x; + $wmax=($w-2*$this->cMargin)*1000/$this->FontSize; + } + $nl++; + continue; + } + if($c==' ') + $sep=$i; + $l+=$cw[$c]; + if($l>$wmax) + { + //Automatic line break + if($sep==-1) + { + if($this->x>$this->lMargin) + { + //Move to next line + $this->x=$this->lMargin; + $this->y+=$h; + $w=$this->w-$this->rMargin-$this->x; + $wmax=($w-2*$this->cMargin)*1000/$this->FontSize; + $i++; + $nl++; + continue; + } + if($i==$j) + $i++; + $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link); + } + else + { + $this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link); + $i=$sep+1; + } + $sep=-1; + $j=$i; + $l=0; + if($nl==1) + { + $this->x=$this->lMargin; + $w=$this->w-$this->rMargin-$this->x; + $wmax=($w-2*$this->cMargin)*1000/$this->FontSize; + } + $nl++; + } + else + $i++; + } + //Last chunk + if($i!=$j) + $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link); +} + +function Image($file,$x,$y,$w=0,$h=0,$type='',$link='') +{ + //Put an image on the page + if(!isset($this->images[$file])) + { + //First use of image, get info + if($type=='') + { + $pos=strrpos($file,'.'); + if(!$pos) + $this->Error('Image file has no extension and no type was specified: '.$file); + $type=substr($file,$pos+1); + } + $type=strtolower($type); + $mqr=get_magic_quotes_runtime(); + set_magic_quotes_runtime(0); + if($type=='jpg' || $type=='jpeg') + $info=$this->_parsejpg($file); + elseif($type=='png') + $info=$this->_parsepng($file); + else + { + //Allow for additional formats + $mtd='_parse'.$type; + if(!method_exists($this,$mtd)) + $this->Error('Unsupported image type: '.$type); + $info=$this->$mtd($file); + } + set_magic_quotes_runtime($mqr); + $info['i']=count($this->images)+1; + $this->images[$file]=$info; + } + else + $info=$this->images[$file]; + //Automatic width and height calculation if needed + if($w==0 && $h==0) + { + //Put image at 72 dpi + $w=$info['w']/$this->k; + $h=$info['h']/$this->k; + } + if($w==0) + $w=$h*$info['w']/$info['h']; + if($h==0) + $h=$w*$info['h']/$info['w']; + $this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i'])); + if($link) + $this->Link($x,$y,$w,$h,$link); +} + +function Ln($h='') +{ + //Line feed; default value is last cell height + $this->x=$this->lMargin; + if(is_string($h)) + $this->y+=$this->lasth; + else + $this->y+=$h; +} + +function GetX() +{ + //Get x position + return $this->x; +} + +function SetX($x) +{ + //Set x position + if($x>=0) + $this->x=$x; + else + $this->x=$this->w+$x; +} + +function GetY() +{ + //Get y position + return $this->y; +} + +function SetY($y) +{ + //Set y position and reset x + $this->x=$this->lMargin; + if($y>=0) + $this->y=$y; + else + $this->y=$this->h+$y; +} + +function SetXY($x,$y) +{ + //Set x and y positions + $this->SetY($y); + $this->SetX($x); +} + +function Output($name='',$dest='') +{ + //Output PDF to some destination + //Finish document if necessary + if($this->state<3) + $this->Close(); + //Normalize parameters + if(is_bool($dest)) + $dest=$dest ? 'D' : 'F'; + $dest=strtoupper($dest); + if($dest=='') + { + if($name=='') + { + $name='doc.pdf'; + $dest='I'; + } + else + $dest='F'; + } + switch($dest) + { + case 'I': + //Send to standard output + if(ob_get_contents()) + $this->Error('Some data has already been output, can\'t send PDF file'); + if(php_sapi_name()!='cli') + { + //We send to a browser + header('Content-Type: application/pdf'); + if(headers_sent()) + $this->Error('Some data has already been output to browser, can\'t send PDF file'); + header('Content-Length: '.strlen($this->buffer)); + header('Content-disposition: inline; filename="'.$name.'"'); + } + echo $this->buffer; + break; + case 'D': + //Download file + if(ob_get_contents()) + $this->Error('Some data has already been output, can\'t send PDF file'); + if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) + header('Content-Type: application/force-download'); + else + header('Content-Type: application/octet-stream'); + if(headers_sent()) + $this->Error('Some data has already been output to browser, can\'t send PDF file'); + header('Content-Length: '.strlen($this->buffer)); + header('Content-disposition: attachment; filename="'.$name.'"'); + echo $this->buffer; + break; + case 'F': + //Save to local file + $f=fopen($name,'wb'); + if(!$f) + $this->Error('Unable to create output file: '.$name); + fwrite($f,$this->buffer,strlen($this->buffer)); + fclose($f); + break; + case 'S': + //Return as a string + return $this->buffer; + default: + $this->Error('Incorrect output destination: '.$dest); + } + return ''; +} + +/******************************************************************************* +* * +* Protected methods * +* * +*******************************************************************************/ +function _dochecks() +{ + //Check for locale-related bug + if(1.1==1) + $this->Error('Don\'t alter the locale before including class file'); + //Check for decimal separator + if(sprintf('%.1f',1.0)!='1.0') + setlocale(LC_NUMERIC,'C'); +} + +function _getfontpath() +{ + if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font')) + define('FPDF_FONTPATH',dirname(__FILE__).'/font/'); + return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : ''; +} + +function _putpages() +{ + $nb=$this->page; + if(!empty($this->AliasNbPages)) + { + //Replace number of pages + for($n=1;$n<=$nb;$n++) + $this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]); + } + if($this->DefOrientation=='P') + { + $wPt=$this->fwPt; + $hPt=$this->fhPt; + } + else + { + $wPt=$this->fhPt; + $hPt=$this->fwPt; + } + $filter=($this->compress) ? '/Filter /FlateDecode ' : ''; + for($n=1;$n<=$nb;$n++) + { + //Page + $this->_newobj(); + $this->_out('<_out('/Parent 1 0 R'); + if(isset($this->OrientationChanges[$n])) + $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$hPt,$wPt)); + $this->_out('/Resources 2 0 R'); + if(isset($this->PageLinks[$n])) + { + //Links + $annots='/Annots ['; + foreach($this->PageLinks[$n] as $pl) + { + $rect=sprintf('%.2f %.2f %.2f %.2f',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]); + $annots.='<_textstring($pl[4]).'>>>>'; + else + { + $l=$this->links[$pl[4]]; + $h=isset($this->OrientationChanges[$l[0]]) ? $wPt : $hPt; + $annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2f null]>>',1+2*$l[0],$h-$l[1]*$this->k); + } + } + $this->_out($annots.']'); + } + $this->_out('/Contents '.($this->n+1).' 0 R>>'); + $this->_out('endobj'); + //Page content + $p=($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n]; + $this->_newobj(); + $this->_out('<<'.$filter.'/Length '.strlen($p).'>>'); + $this->_putstream($p); + $this->_out('endobj'); + } + //Pages root + $this->offsets[1]=strlen($this->buffer); + $this->_out('1 0 obj'); + $this->_out('<_out($kids.']'); + $this->_out('/Count '.$nb); + $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$wPt,$hPt)); + $this->_out('>>'); + $this->_out('endobj'); +} + +function _putfonts() +{ + $nf=$this->n; + foreach($this->diffs as $diff) + { + //Encodings + $this->_newobj(); + $this->_out('<>'); + $this->_out('endobj'); + } + $mqr=get_magic_quotes_runtime(); + set_magic_quotes_runtime(0); + foreach($this->FontFiles as $file=>$info) + { + //Font file embedding + $this->_newobj(); + $this->FontFiles[$file]['n']=$this->n; + $font=''; + $f=fopen($this->_getfontpath().$file,'rb',1); + if(!$f) + $this->Error('Font file not found'); + while(!feof($f)) + $font.=fread($f,8192); + fclose($f); + $compressed=(substr($file,-2)=='.z'); + if(!$compressed && isset($info['length2'])) + { + $header=(ord($font{0})==128); + if($header) + { + //Strip first binary header + $font=substr($font,6); + } + if($header && ord($font{$info['length1']})==128) + { + //Strip second binary header + $font=substr($font,0,$info['length1']).substr($font,$info['length1']+6); + } + } + $this->_out('<_out('/Filter /FlateDecode'); + $this->_out('/Length1 '.$info['length1']); + if(isset($info['length2'])) + $this->_out('/Length2 '.$info['length2'].' /Length3 0'); + $this->_out('>>'); + $this->_putstream($font); + $this->_out('endobj'); + } + set_magic_quotes_runtime($mqr); + foreach($this->fonts as $k=>$font) + { + //Font objects + $this->fonts[$k]['n']=$this->n+1; + $type=$font['type']; + $name=$font['name']; + if($type=='core') + { + //Standard font + $this->_newobj(); + $this->_out('<_out('/BaseFont /'.$name); + $this->_out('/Subtype /Type1'); + if($name!='Symbol' && $name!='ZapfDingbats') + $this->_out('/Encoding /WinAnsiEncoding'); + $this->_out('>>'); + $this->_out('endobj'); + } + elseif($type=='Type1' || $type=='TrueType') + { + //Additional Type1 or TrueType font + $this->_newobj(); + $this->_out('<_out('/BaseFont /'.$name); + $this->_out('/Subtype /'.$type); + $this->_out('/FirstChar 32 /LastChar 255'); + $this->_out('/Widths '.($this->n+1).' 0 R'); + $this->_out('/FontDescriptor '.($this->n+2).' 0 R'); + if($font['enc']) + { + if(isset($font['diff'])) + $this->_out('/Encoding '.($nf+$font['diff']).' 0 R'); + else + $this->_out('/Encoding /WinAnsiEncoding'); + } + $this->_out('>>'); + $this->_out('endobj'); + //Widths + $this->_newobj(); + $cw=&$font['cw']; + $s='['; + for($i=32;$i<=255;$i++) + $s.=$cw[chr($i)].' '; + $this->_out($s.']'); + $this->_out('endobj'); + //Descriptor + $this->_newobj(); + $s='<$v) + $s.=' /'.$k.' '.$v; + $file=$font['file']; + if($file) + $s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R'; + $this->_out($s.'>>'); + $this->_out('endobj'); + } + else + { + //Allow for additional types + $mtd='_put'.strtolower($type); + if(!method_exists($this,$mtd)) + $this->Error('Unsupported font type: '.$type); + $this->$mtd($font); + } + } +} + +function _putimages() +{ + $filter=($this->compress) ? '/Filter /FlateDecode ' : ''; + reset($this->images); + while(list($file,$info)=each($this->images)) + { + $this->_newobj(); + $this->images[$file]['n']=$this->n; + $this->_out('<_out('/Subtype /Image'); + $this->_out('/Width '.$info['w']); + $this->_out('/Height '.$info['h']); + if($info['cs']=='Indexed') + $this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]'); + else + { + $this->_out('/ColorSpace /'.$info['cs']); + if($info['cs']=='DeviceCMYK') + $this->_out('/Decode [1 0 1 0 1 0 1 0]'); + } + $this->_out('/BitsPerComponent '.$info['bpc']); + if(isset($info['f'])) + $this->_out('/Filter /'.$info['f']); + if(isset($info['parms'])) + $this->_out($info['parms']); + if(isset($info['trns']) && is_array($info['trns'])) + { + $trns=''; + for($i=0;$i_out('/Mask ['.$trns.']'); + } + $this->_out('/Length '.strlen($info['data']).'>>'); + $this->_putstream($info['data']); + unset($this->images[$file]['data']); + $this->_out('endobj'); + //Palette + if($info['cs']=='Indexed') + { + $this->_newobj(); + $pal=($this->compress) ? gzcompress($info['pal']) : $info['pal']; + $this->_out('<<'.$filter.'/Length '.strlen($pal).'>>'); + $this->_putstream($pal); + $this->_out('endobj'); + } + } +} + +function _putxobjectdict() +{ + foreach($this->images as $image) + $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R'); +} + +function _putresourcedict() +{ + $this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]'); + $this->_out('/Font <<'); + foreach($this->fonts as $font) + $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R'); + $this->_out('>>'); + $this->_out('/XObject <<'); + $this->_putxobjectdict(); + $this->_out('>>'); +} + +function _putresources() +{ + $this->_putfonts(); + $this->_putimages(); + //Resource dictionary + $this->offsets[2]=strlen($this->buffer); + $this->_out('2 0 obj'); + $this->_out('<<'); + $this->_putresourcedict(); + $this->_out('>>'); + $this->_out('endobj'); +} + +function _putinfo() +{ + $this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION)); + if(!empty($this->title)) + $this->_out('/Title '.$this->_textstring($this->title)); + if(!empty($this->subject)) + $this->_out('/Subject '.$this->_textstring($this->subject)); + if(!empty($this->author)) + $this->_out('/Author '.$this->_textstring($this->author)); + if(!empty($this->keywords)) + $this->_out('/Keywords '.$this->_textstring($this->keywords)); + if(!empty($this->creator)) + $this->_out('/Creator '.$this->_textstring($this->creator)); + $this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis'))); +} + +function _putcatalog() +{ + $this->_out('/Type /Catalog'); + $this->_out('/Pages 1 0 R'); + if($this->ZoomMode=='fullpage') + $this->_out('/OpenAction [3 0 R /Fit]'); + elseif($this->ZoomMode=='fullwidth') + $this->_out('/OpenAction [3 0 R /FitH null]'); + elseif($this->ZoomMode=='real') + $this->_out('/OpenAction [3 0 R /XYZ null null 1]'); + elseif(!is_string($this->ZoomMode)) + $this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']'); + if($this->LayoutMode=='single') + $this->_out('/PageLayout /SinglePage'); + elseif($this->LayoutMode=='continuous') + $this->_out('/PageLayout /OneColumn'); + elseif($this->LayoutMode=='two') + $this->_out('/PageLayout /TwoColumnLeft'); +} + +function _putheader() +{ + $this->_out('%PDF-'.$this->PDFVersion); +} + +function _puttrailer() +{ + $this->_out('/Size '.($this->n+1)); + $this->_out('/Root '.$this->n.' 0 R'); + $this->_out('/Info '.($this->n-1).' 0 R'); +} + +function _enddoc() +{ + $this->_putheader(); + $this->_putpages(); + $this->_putresources(); + //Info + $this->_newobj(); + $this->_out('<<'); + $this->_putinfo(); + $this->_out('>>'); + $this->_out('endobj'); + //Catalog + $this->_newobj(); + $this->_out('<<'); + $this->_putcatalog(); + $this->_out('>>'); + $this->_out('endobj'); + //Cross-ref + $o=strlen($this->buffer); + $this->_out('xref'); + $this->_out('0 '.($this->n+1)); + $this->_out('0000000000 65535 f '); + for($i=1;$i<=$this->n;$i++) + $this->_out(sprintf('%010d 00000 n ',$this->offsets[$i])); + //Trailer + $this->_out('trailer'); + $this->_out('<<'); + $this->_puttrailer(); + $this->_out('>>'); + $this->_out('startxref'); + $this->_out($o); + $this->_out('%%EOF'); + $this->state=3; +} + +function _beginpage($orientation) +{ + $this->page++; + $this->pages[$this->page]=''; + $this->state=2; + $this->x=$this->lMargin; + $this->y=$this->tMargin; + $this->FontFamily=''; + //Page orientation + if(!$orientation) + $orientation=$this->DefOrientation; + else + { + $orientation=strtoupper($orientation{0}); + if($orientation!=$this->DefOrientation) + $this->OrientationChanges[$this->page]=true; + } + if($orientation!=$this->CurOrientation) + { + //Change orientation + if($orientation=='P') + { + $this->wPt=$this->fwPt; + $this->hPt=$this->fhPt; + $this->w=$this->fw; + $this->h=$this->fh; + } + else + { + $this->wPt=$this->fhPt; + $this->hPt=$this->fwPt; + $this->w=$this->fh; + $this->h=$this->fw; + } + $this->PageBreakTrigger=$this->h-$this->bMargin; + $this->CurOrientation=$orientation; + } +} + +function _endpage() +{ + //End of page contents + $this->state=1; +} + +function _newobj() +{ + //Begin a new object + $this->n++; + $this->offsets[$this->n]=strlen($this->buffer); + $this->_out($this->n.' 0 obj'); +} + +function _dounderline($x,$y,$txt) +{ + //Underline text + $up=$this->CurrentFont['up']; + $ut=$this->CurrentFont['ut']; + $w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' '); + return sprintf('%.2f %.2f %.2f %.2f re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt); +} + +function _parsejpg($file) +{ + //Extract info from a JPEG file + $a=GetImageSize($file); + if(!$a) + $this->Error('Missing or incorrect image file: '.$file); + if($a[2]!=2) + $this->Error('Not a JPEG file: '.$file); + if(!isset($a['channels']) || $a['channels']==3) + $colspace='DeviceRGB'; + elseif($a['channels']==4) + $colspace='DeviceCMYK'; + else + $colspace='DeviceGray'; + $bpc=isset($a['bits']) ? $a['bits'] : 8; + //Read whole file + $f=fopen($file,'rb'); + $data=''; + while(!feof($f)) + $data.=fread($f,4096); + fclose($f); + return array('w'=>$a[0],'h'=>$a[1],'cs'=>$colspace,'bpc'=>$bpc,'f'=>'DCTDecode','data'=>$data); +} + +function _parsepng($file) +{ + //Extract info from a PNG file + $f=fopen($file,'rb'); + if(!$f) + $this->Error('Can\'t open image file: '.$file); + //Check signature + if(fread($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) + $this->Error('Not a PNG file: '.$file); + //Read header chunk + fread($f,4); + if(fread($f,4)!='IHDR') + $this->Error('Incorrect PNG file: '.$file); + $w=$this->_freadint($f); + $h=$this->_freadint($f); + $bpc=ord(fread($f,1)); + if($bpc>8) + $this->Error('16-bit depth not supported: '.$file); + $ct=ord(fread($f,1)); + if($ct==0) + $colspace='DeviceGray'; + elseif($ct==2) + $colspace='DeviceRGB'; + elseif($ct==3) + $colspace='Indexed'; + else + $this->Error('Alpha channel not supported: '.$file); + if(ord(fread($f,1))!=0) + $this->Error('Unknown compression method: '.$file); + if(ord(fread($f,1))!=0) + $this->Error('Unknown filter method: '.$file); + if(ord(fread($f,1))!=0) + $this->Error('Interlacing not supported: '.$file); + fread($f,4); + $parms='/DecodeParms <>'; + //Scan chunks looking for palette, transparency and image data + $pal=''; + $trns=''; + $data=''; + do + { + $n=$this->_freadint($f); + $type=fread($f,4); + if($type=='PLTE') + { + //Read palette + $pal=fread($f,$n); + fread($f,4); + } + elseif($type=='tRNS') + { + //Read transparency info + $t=fread($f,$n); + if($ct==0) + $trns=array(ord(substr($t,1,1))); + elseif($ct==2) + $trns=array(ord(substr($t,1,1)),ord(substr($t,3,1)),ord(substr($t,5,1))); + else + { + $pos=strpos($t,chr(0)); + if($pos!==false) + $trns=array($pos); + } + fread($f,4); + } + elseif($type=='IDAT') + { + //Read image data block + $data.=fread($f,$n); + fread($f,4); + } + elseif($type=='IEND') + break; + else + fread($f,$n+4); + } + while($n); + if($colspace=='Indexed' && empty($pal)) + $this->Error('Missing palette in '.$file); + fclose($f); + return array('w'=>$w,'h'=>$h,'cs'=>$colspace,'bpc'=>$bpc,'f'=>'FlateDecode','parms'=>$parms,'pal'=>$pal,'trns'=>$trns,'data'=>$data); +} + +function _freadint($f) +{ + //Read a 4-byte integer from file + $a=unpack('Ni',fread($f,4)); + return $a['i']; +} + +function _textstring($s) +{ + //Format a text string + return '('.$this->_escape($s).')'; +} + +function _escape($s) +{ + //Add \ before \, ( and ) + return str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$s))); +} + +function _putstream($s) +{ + $this->_out('stream'); + $this->_out($s); + $this->_out('endstream'); +} + +function _out($s) +{ + //Add a line to the document + if($this->state==2) + $this->pages[$this->page].=$s."\n"; + else + $this->buffer.=$s."\n"; +} +//End of class +} + +//Handle special IE contype request +if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=='contype') +{ + header('Content-Type: application/pdf'); + exit; +} + +} +?> diff --git a/php2pdf/phpToPDF.php b/php2pdf/phpToPDF.php new file mode 100644 index 0000000..471dfae --- /dev/null +++ b/php2pdf/phpToPDF.php @@ -0,0 +1,1394 @@ + 10000) $ratio=1000; + else if ($valeur > 1000) $ratio=100; + else if ($valeur > 100) $ratio=10; + else $ratio=1; + + $res = $valeur + (0.1*$valeur); + $res = round($res/$ratio) * $ratio; + + return $res; +} + +function moins10pourcentArrondi($valeur) +{ + if ($valeur > 10000) $ratio=1000; + else if ($valeur > 1000) $ratio=100; + else if ($valeur > 100) $ratio=10; + else $ratio=1; + + if ($valeur >0) + $res = $valeur - (0.1*$valeur); + else $res = $valeur + (0.1*$valeur); + + $res = round($res/$ratio) * $ratio; + return $res; +} + +class phpToPDF extends FPDF +{ + var $legends; + var $wLegend; + var $sum; + var $NbVal; + + var $_toc=array(); + var $_numbering=false; + var $_numberingFooter=false; + var $_numPageNum=1; + + var $tb_columns; //number of columns of the table + var $tb_header_type; //array which contains the header characteristics and texts + var $tb_header_draw; //TRUE or FALSE, the header is drawed or not + var $tb_border_draw; //TRUE or FALSE, the table border is drawed or not + var $tb_data_type; //array which contains the data characteristics (only the characteristics) + var $tb_table_type; //array which contains the table charactersitics + var $table_startx, $table_starty; //the X and Y position where the table starts + + var $Draw_Header_Command; //command which determines in the DrawData first the header draw + var $New_Page_Commit; // = true/false if a new page has been comited + var $Data_On_Current_Page; // = true/false ... if on current page was some data written + + + function AddPage($orientation='') { + parent::AddPage($orientation); + if($this->_numbering) + $this->_numPageNum++; + } + + function startPageNums() { + $this->_numbering=true; + $this->_numberingFooter=true; + } + + function stopPageNums() { + $this->_numbering=false; + } + + function numPageNo() { + return $this->_numPageNum; + } + + function TOC_Entry($txt,$level=0) { + $this->_toc[]=array('t'=>$txt,'l'=>$level,'p'=>$this->numPageNo()); + } + + function insertTOC( $location=1, + $labelSize=20, + $entrySize=10, + $tocfont='Times', + $label='Table des matires' + ) { + //make toc at end + $this->stopPageNums(); + $this->AddPage(); + $tocstart=$this->page; + + $this->SetFont($tocfont,'B',$labelSize); + $this->Cell(0,5,$label,0,1,'C'); + $this->Ln(20); + + + $this->SetLeftMargin(20); + + + + foreach($this->_toc as $t) { + + //Offset + $level=$t['l']; + if($level>0) + $this->Cell($level*8); + $weight=''; + if($level==0) + $weight='B'; + $str=$t['t']; + $this->SetFont($tocfont,$weight,$entrySize); + $strsize=$this->GetStringWidth($str); + $this->Cell($strsize+2,$this->FontSize+2,$str); + + //Filling dots + $this->SetFont($tocfont,'',$entrySize); + $PageCellSize=$this->GetStringWidth($t['p'])+2; + $w=$this->w-$this->lMargin-$this->rMargin-$PageCellSize-($level*8)-($strsize+2); + $nb=$w/$this->GetStringWidth('.'); + $dots=str_repeat('.',$nb); + $this->Cell($w,$this->FontSize+2,$dots,0,0,'R'); + + //Page number + $this->Cell($PageCellSize,$this->FontSize+2,$t['p'],0,1,'R'); + + $this->Ln(2); + } + + //grab it and move to selected location + $n=$this->page; + $n_toc = $n - $tocstart + 1; + $last = array(); + + //store toc pages + for($i = $tocstart;$i <= $n;$i++) + $last[]=$this->pages[$i]; + + //move pages + for($i=$tocstart - 1;$i>=$location-1;$i--) + $this->pages[$i+$n_toc]=$this->pages[$i]; + + //Put toc pages at insert point + for($i = 0;$i < $n_toc;$i++) + $this->pages[$location + $i]=$last[$i]; + } + + function Footer() { + if($this->_numberingFooter==false) + return; + //Go to 1.5 cm from bottom + $this->SetY(-15); + //Select Arial italic 8 + $this->SetFont('Arial','I',8); + $this->Cell(0,7,$this->numPageNo(),0,0,'C'); + if($this->_numbering==false) + $this->_numberingFooter=false; + } + + function SetDash($black=false,$white=false) + { + if($black and $white) + $s=sprintf('[%.3f %.3f] 0 d',$black*$this->k,$white*$this->k); + else + $s='[] 0 d'; + $this->_out($s); + } + + function SetLegends($data, $format) + { + $this->legends=array(); + $this->wLegend=0; + $this->sum=array_sum($data); + $this->NbVal=count($data); + foreach($data as $l=>$val) + { + $p=sprintf('%.2f',$val/$this->sum*100).'%'; + $legend=str_replace(array('%l','%v','%p'),array($l,$val,$p),$format); + $this->legends[]=$legend; + $this->wLegend=max($this->GetStringWidth($legend),$this->wLegend); + } + } + + function DiagCirculaire($largeur, $hauteur, $data, $format, $couleurs=null, $legend=1) + { + $this->SetFont('Courier', '', 10); + $this->SetLegends($data,$format); + + $XPage = $this->GetX(); + $YPage = $this->GetY(); + $marge = 2; + $hLegende = 5; + $rayon = min($largeur - $marge * 4 - $hLegende - $this->wLegend, $hauteur - $marge * 2); + $rayon = floor($rayon / 2); + $XDiag = $XPage + $marge + $rayon; + $YDiag = $YPage + $marge + $rayon; + if($couleurs == null) { + for($i = 0;$i < $this->NbVal; $i++) { + $gray = $i * intval(255 / $this->NbVal); + $couleurs[$i] = array($gray,$gray,$gray); + } + } + + //Secteurs + $this->SetLineWidth(0.2); + $angleDebut = 0; + $angleFin = 0; + $i = 0; + foreach($data as $val) { + $angle = floor(($val * 360) / doubleval($this->sum)); + if ($angle != 0) { + $angleFin = $angleDebut + $angle; + $this->SetFillColor($couleurs[$i][0],$couleurs[$i][1],$couleurs[$i][2]); + $this->Sector($XDiag, $YDiag, $rayon, $angleDebut, $angleFin); + $angleDebut += $angle; + } + $i++; + } + if ($angleFin != 360) { + $this->Sector($XDiag, $YDiag, $rayon, $angleDebut - $angle, 360); + } + + //Lgendes + if ($legend == 1) + { + $this->SetFont('Courier', '', 10); + $x1 = $XPage + 2 * $rayon + 4 * $marge; + $x2 = $x1 + $hLegende + $marge; + $y1 = $YDiag - $rayon + (2 * $rayon - $this->NbVal*($hLegende + $marge)) / 2; + for($i=0; $i<$this->NbVal; $i++) { + $this->SetFillColor($couleurs[$i][0],$couleurs[$i][1],$couleurs[$i][2]); + $this->Rect($x1, $y1, $hLegende, $hLegende, 'DF'); + $this->SetXY($x2,$y1); + $this->Cell(0,$hLegende,$this->legends[$i]); + $y1+=$hLegende + $marge; + } + } + } + + + function DiagBatons($largeur, $hauteur, $data, $format, $couleur=null, $maxValRepere=0, $nbIndRepere=4) + { + $this->SetFont('Courier', '', 10); + $this->SetLegends($data,$format); + + $XPage = $this->GetX(); + $YPage = $this->GetY(); + $marge = 2; + $YDiag = $YPage + $marge; + $hDiag = floor($hauteur - $marge * 2); + $XDiag = $XPage + $marge * 2 + $this->wLegend; + $lDiag = floor($largeur - $marge * 3 - $this->wLegend); + if($couleur == null) + $couleur=array(155,155,155); + if ($maxValRepere == 0) { + $maxValRepere = max($data); + } + $valIndRepere = ceil($maxValRepere / $nbIndRepere); + $maxValRepere = $valIndRepere * $nbIndRepere; + $lRepere = floor($lDiag / $nbIndRepere); + $lDiag = $lRepere * $nbIndRepere; + $unite = $lDiag / $maxValRepere; + $hBaton = floor($hDiag / ($this->NbVal + 1)); + $hDiag = $hBaton * ($this->NbVal + 1); + $eBaton = floor($hBaton * 80 / 100); + + $this->SetLineWidth(0.2); + $this->Rect($XDiag, $YDiag, $lDiag, $hDiag); + + $this->SetFont('Courier', '', 10); + $this->SetFillColor($couleur[0],$couleur[1],$couleur[2]); + $i=0; + foreach($data as $val) { + //Barre + $xval = $XDiag; + $lval = (int)($val * $unite); + $yval = $YDiag + ($i + 1) * $hBaton - $eBaton / 2; + $hval = $eBaton; + $this->Rect($xval, $yval, $lval, $hval, 'DF'); + //Lgende + $this->SetXY(0, $yval); + $this->Cell($xval - $marge, $hval, $this->legends[$i],0,0,'R'); + $i++; + } + + //Echelles + for ($i = 0; $i <= $nbIndRepere; $i++) { + $xpos = $XDiag + $lRepere * $i; + $this->Line($xpos, $YDiag, $xpos, $YDiag + $hDiag); + $val = $i * $valIndRepere; + $xpos = $XDiag + $lRepere * $i - $this->GetStringWidth($val) / 2; + $ypos = $YDiag + $hDiag - $marge; + $this->Text($xpos, $ypos, $val); + } + } + + function Sector($xc, $yc, $r, $a, $b, $style='FD', $cw=true, $o=90) + { + if($cw){ + $d = $b; + $b = $o - $a; + $a = $o - $d; + }else{ + $b += $o; + $a += $o; + } + $a = ($a%360)+360; + $b = ($b%360)+360; + if ($a > $b) + $b +=360; + $b = $b/360*2*M_PI; + $a = $a/360*2*M_PI; + $d = $b-$a; + if ($d == 0 ) + $d =2*M_PI; + $k = $this->k; + $hp = $this->h; + if($style=='F') + $op='f'; + elseif($style=='FD' or $style=='DF') + $op='b'; + else + $op='s'; + if (sin($d/2)) + $MyArc = 4/3*(1-cos($d/2))/sin($d/2)*$r; + //first put the center + $this->_out(sprintf('%.2f %.2f m',($xc)*$k,($hp-$yc)*$k)); + //put the first point + $this->_out(sprintf('%.2f %.2f l',($xc+$r*cos($a))*$k,(($hp-($yc-$r*sin($a)))*$k))); + //draw the arc + if ($d < M_PI/2){ + $this->_Arc($xc+$r*cos($a)+$MyArc*cos(M_PI/2+$a), + $yc-$r*sin($a)-$MyArc*sin(M_PI/2+$a), + $xc+$r*cos($b)+$MyArc*cos($b-M_PI/2), + $yc-$r*sin($b)-$MyArc*sin($b-M_PI/2), + $xc+$r*cos($b), + $yc-$r*sin($b) + ); + }else{ + $b = $a + $d/4; + $MyArc = 4/3*(1-cos($d/8))/sin($d/8)*$r; + $this->_Arc($xc+$r*cos($a)+$MyArc*cos(M_PI/2+$a), + $yc-$r*sin($a)-$MyArc*sin(M_PI/2+$a), + $xc+$r*cos($b)+$MyArc*cos($b-M_PI/2), + $yc-$r*sin($b)-$MyArc*sin($b-M_PI/2), + $xc+$r*cos($b), + $yc-$r*sin($b) + ); + $a = $b; + $b = $a + $d/4; + $this->_Arc($xc+$r*cos($a)+$MyArc*cos(M_PI/2+$a), + $yc-$r*sin($a)-$MyArc*sin(M_PI/2+$a), + $xc+$r*cos($b)+$MyArc*cos($b-M_PI/2), + $yc-$r*sin($b)-$MyArc*sin($b-M_PI/2), + $xc+$r*cos($b), + $yc-$r*sin($b) + ); + $a = $b; + $b = $a + $d/4; + $this->_Arc($xc+$r*cos($a)+$MyArc*cos(M_PI/2+$a), + $yc-$r*sin($a)-$MyArc*sin(M_PI/2+$a), + $xc+$r*cos($b)+$MyArc*cos($b-M_PI/2), + $yc-$r*sin($b)-$MyArc*sin($b-M_PI/2), + $xc+$r*cos($b), + $yc-$r*sin($b) + ); + $a = $b; + $b = $a + $d/4; + $this->_Arc($xc+$r*cos($a)+$MyArc*cos(M_PI/2+$a), + $yc-$r*sin($a)-$MyArc*sin(M_PI/2+$a), + $xc+$r*cos($b)+$MyArc*cos($b-M_PI/2), + $yc-$r*sin($b)-$MyArc*sin($b-M_PI/2), + $xc+$r*cos($b), + $yc-$r*sin($b) + ); + } + //terminate drawing + $this->_out($op); + } + + function _Arc($x1, $y1, $x2, $y2, $x3, $y3 ) + { + $h = $this->h; + $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c', + $x1*$this->k, + ($h-$y1)*$this->k, + $x2*$this->k, + ($h-$y2)*$this->k, + $x3*$this->k, + ($h-$y3)*$this->k)); + } + + //returns the width of the page in user units + function PageWidth(){ + return (int) $this->w-$this->rMargin-$this->lMargin; + } + + //constructor(not a real one, but have to call it first) + //we initialize all the variables that we use + function Table_Init($col_no = 0, $header_draw = true, $border_draw = true){ + $this->tb_columns = $col_no; + $this->tb_header_type = Array(); + $this->tb_header_draw = $header_draw; + $this->tb_border_draw = $border_draw; + $this->tb_data_type = Array(); + $this->tb_type = Array(); + $this->table_startx = $this->GetX(); + $this->table_starty = $this->GetY(); + + $this->Draw_Header_Command = false; //by default we don't draw the header + $this->New_Page_Commit = false; //NO we do not consider first time a new page + $this->Data_On_Current_Page = false; + } + + //Sets the number of columns of the table + function Set_Table_Columns($nr){ + $this->tb_columns = $nr; + } + + /* + Characteristics constants for Header Type: + EVERY CELL FROM THE TABLE IS A MULTICELL + + WIDTH - this is the cell width. This value must be sent only to the HEADER!!!!!!!! + T_COLOR - text color = array(r,g,b); + T_SIZE - text size + T_FONT - text font - font type = "Arial", "Times" + T_ALIGN - text align - "RLCJ" + V_ALIGN - text vertical alignment - "TMB" + T_TYPE - text type (Bold Italic etc) + LN_SPACE - space between lines + BG_COLOR - background color = array(r,g,b); + BRD_COLOR - border color = array(r,g,b); + BRD_SIZE - border size -- + BRD_TYPE - border size -- up down, with border without!!! etc + BRD_TYPE_NEW_PAGE - border type on new page - this is user only if specified(<>'') + TEXT - header text -- THIS ALSO BELONGS ONLY TO THE HEADER!!!! + + all these setting conform to the settings from the multicell functions!!!! + */ + + /* + Function: Set_Header_Type($type_arr) -- sets the array for the header type + + type array = + array( + 0=>array( + "WIDTH" => 10, + "T_COLOR" => array(120,120,120), + "T_SIZE" => 5, + ... + "TEXT" => "Header text 1" + ), + 1=>array( + ... + ), + ); + where 0,1... are the column number + */ + + function Set_Header_Type($type_arr){ + $this->tb_header_type = $type_arr; + } + + + /* + Characteristics constants for Data Type: + EVERY CELL FROM THE TABLE IS A MULTICELL + T_COLOR - text color = array(r,g,b); + T_SIZE - text size + T_FONT - text font - font type = "Arial", "Times" + T_ALIGN - text align - "RLCJ" + V_ALIGN - text vertical alignment - "TMB" + T_TYPE - text type (Bold Italic etc) + LN_SPACE - space between lines + BG_COLOR - background color = array(r,g,b); + BRD_COLOR - border color = array(r,g,b); + BRD_SIZE - border size -- + BRD_TYPE - border size -- up down, with border without!!! etc + BRD_TYPE_NEW_PAGE - border type on new page - this is user only if specified(<>'') + + all these settings conform to the settings from the multicell functions!!!! + */ + + /* + Function: Set_data_Type($type_arr) -- sets the array for the header type + + type array = + array( + 0=>array( + "T_COLOR" => array(120,120,120), + "T_SIZE" => 5, + ... + "BRD_TYPE" => 1 + ), + 1=>array( + ... + ), + ); + where 0,1... are the column number + */ + + function Set_Data_Type($type_arr){ + $this->tb_data_type = $type_arr; + } + + + + /* + Function Set_Table_Type + + $type_arr = array( + "BRD_COLOR"=> array (120,120,120), //border color + "BRD_SIZE"=>5), //border line width + "TB_COLUMNS"=>5), //the number of columns + "TB_ALIGN"=>"L"), //the align of the table, possible values = L, R, C equivalent to Left, Right, Center + 'L_MARGIN' => 0// left margin... reference from this->lmargin values + ) + */ + function Set_Table_Type($type_arr){ + + if (isset($type_arr['TB_COLUMNS'])) $this->tb_columns = $type_arr['TB_COLUMNS']; + if (!isset($type_arr['L_MARGIN'])) $type_arr['L_MARGIN']=0;//default values + + $this->tb_table_type = $type_arr; + + } + + //this functiondraws the exterior table border!!!! + function Draw_Table_Border(){ + /* "BRD_COLOR"=> array (120,120,120), //border color + "BRD_SIZE"=>5), //border line width + "TB_COLUMNS"=>5), //the number of columns + "TB_ALIGN"=>"L"), //the align of the table, possible values = L, R, C equivalent to Left, Right, Center + */ + + if ( ! $this->tb_border_draw ) return; + + if ( ! $this->Data_On_Current_Page) return; //there was no data on the current page + + //set the colors + list($r, $g, $b) = $this->tb_table_type['BRD_COLOR']; + $this->SetDrawColor($r, $g, $b); + + //set the line width + $this->SetLineWidth($this->tb_table_type['BRD_SIZE']); + + //draw the border + $this->Rect( + $this->table_startx, + $this->table_starty, + $this->Get_Table_Width(), + $this->GetY()-$this->table_starty); + + } + + function End_Page_Border(){ + if (isset($this->tb_table_type['BRD_TYPE_END_PAGE'])){ + + if (strpos($this->tb_table_type['BRD_TYPE_END_PAGE'], 'B') >= 0){ + + //set the colors + list($r, $g, $b) = $this->tb_table_type['BRD_COLOR']; + $this->SetDrawColor($r, $g, $b); + + //set the line width + $this->SetLineWidth($this->tb_table_type['BRD_SIZE']); + + //draw the line + $this->Line($this->table_startx, $this->GetY(), $this->table_startx + $this->Get_Table_Width(), $this->GetY()); + } + } + } + + //returns the table width in user units + function Get_Table_Width() + { + //calculate the table width + $tb_width = 0; + for ($i=0; $i < $this->tb_columns; $i++){ + $tb_width += $this->tb_header_type[$i]['WIDTH']; + } + return $tb_width; + } + + //alignes the table to C, L or R(default is L) + function Table_Align(){ + //check if the table is aligned + if (isset($this->tb_table_type['TB_ALIGN'])) $tb_align = $this->tb_table_type['TB_ALIGN']; else $tb_align=''; + + //set the table align + switch($tb_align){ + case 'C': + $this->SetX($this->lMargin + $this->tb_table_type['L_MARGIN'] + ($this->PageWidth() - $this->Get_Table_Width())/2); + break; + case 'R': + $this->SetX($this->lMargin + $this->tb_table_type['L_MARGIN'] + ($this->PageWidth() - $this->Get_Table_Width())); + break; + default: + $this->SetX($this->lMargin + $this->tb_table_type['L_MARGIN']); + break; + }//if (isset($this->tb_table_type['TB_ALIGN'])){ + } + + //Draws the Header + function Draw_Header(){ + $this->Draw_Header_Command = true; + } + + //Draws the Header + function Draw_Header_( $next_line_height = 0 ){ + + $this->Table_Align(); + + $this->table_startx = $this->GetX(); + $this->table_starty = $this->GetY(); + + //if the header will be showed + if ( ! $this->tb_header_draw ) return; + + $h = 0; + + //calculate the maximum height of the cells + for($i=0;$i<$this->tb_columns;$i++) + { + + $this->SetFont( $this->tb_header_type[$i]['T_FONT'], + $this->tb_header_type[$i]['T_TYPE'], + $this->tb_header_type[$i]['T_SIZE']); + + $this->tb_header_type[$i]['CELL_WIDTH'] = $this->tb_header_type[$i]['WIDTH']; + + if (isset($this->tb_header_type[$i]['COLSPAN'])){ + + $colspan = (int) $this->tb_header_type[$i]['COLSPAN'];//convert to integer + + for ($j = 1; $j < $colspan; $j++){ + //if there is a colspan, then calculate the number of lines also with the with of the next cell + if (($i + $j) < $this->tb_columns) + $this->tb_header_type[$i]['CELL_WIDTH'] += $this->tb_header_type[$i + $j]['WIDTH']; + } + } + + $this->tb_header_type[$i]['CELL_LINES'] = + $this->NbLines($this->tb_header_type[$i]['CELL_WIDTH'],$this->tb_header_type[$i]['TEXT']); + + //this is the maximum cell height + $h = max($h, $this->tb_header_type[$i]['LN_SIZE'] * $this->tb_header_type[$i]['CELL_LINES']); + +// if (isset($data[$i]['COLSPAN'])){ + //just skip the other cells +// $i = $i + $colspan - 1; +// } + + } + + //Issue a page break first if needed + //calculate the header hight and the next data line hight + $this->CheckPageBreak($h + $next_line_height, false); + + //Draw the cells of the row + for($i=0; $i<$this->tb_columns; $i++) + { + //border size BRD_SIZE + $this->SetLineWidth($this->tb_header_type[$i]['BRD_SIZE']); + + //fill color = BG_COLOR + list($r, $g, $b) = $this->tb_header_type[$i]['BG_COLOR']; + $this->SetFillColor($r, $g, $b); + + //Draw Color = BRD_COLOR + list($r, $g, $b) = $this->tb_header_type[$i]['BRD_COLOR']; + $this->SetDrawColor($r, $g, $b); + + //Text Color = T_COLOR + list($r, $g, $b) = $this->tb_header_type[$i]['T_COLOR']; + $this->SetTextColor($r, $g, $b); + + //Set the font, font type and size + $this->SetFont( $this->tb_header_type[$i]['T_FONT'], + $this->tb_header_type[$i]['T_TYPE'], + $this->tb_header_type[$i]['T_SIZE']); + + //Save the current position + $x=$this->GetX(); + $y=$this->GetY(); + + if ($this->New_Page_Commit){ + if (isset($this->tb_header_type[$i]['BRD_TYPE_NEW_PAGE'])){ + $this->tb_header_type[$i]['BRD_TYPE'] .= $this->tb_header_type[$i]['BRD_TYPE_NEW_PAGE']; + } + } + + //Print the text + $this->MultiCellTable( + $this->tb_header_type[$i]['CELL_WIDTH'], + $this->tb_header_type[$i]['LN_SIZE'], + $this->tb_header_type[$i]['TEXT'], + $this->tb_header_type[$i]['BRD_TYPE'], + $this->tb_header_type[$i]['T_ALIGN'], + $this->tb_header_type[$i]['V_ALIGN'], + 1, + $h - $this->tb_header_type[$i]['LN_SIZE'] * $this->tb_header_type[$i]['CELL_LINES'] + ); + + //Put the position to the right of the cell + $this->SetXY($x+$this->tb_header_type[$i]['CELL_WIDTH'],$y); + + if (isset($this->tb_header_type[$i]['COLSPAN'])){ + $i = $i + (int)$this->tb_header_type[$i]['COLSPAN'] - 1; + } + + + } + + //Go to the next line + $this->Ln($h); + + $this->Draw_Header_Command = false; + $this->New_Page_Commit = false; + $this->Data_On_Current_Page = true; + } + + //this function Draws the data's from the table + //have to call this function after the table initialization, after the table, header and data types are set + //and after the header is drawed + /* + $header = true -> on new page draws the header + = false - > the header is not drawed + */ + + function Draw_Data($data, $header = true){ + + $h = 0; + + //calculate the maximum height of the cells + for($i=0; $i < $this->tb_columns; $i++) + { + + if (!isset($data[$i]['T_FONT'])) $data[$i]['T_FONT'] = $this->tb_data_type[$i]['T_FONT']; + if (!isset($data[$i]['T_TYPE'])) $data[$i]['T_TYPE'] = $this->tb_data_type[$i]['T_TYPE']; + if (!isset($data[$i]['T_SIZE'])) $data[$i]['T_SIZE'] = $this->tb_data_type[$i]['T_SIZE']; + if (!isset($data[$i]['T_COLOR'])) $data[$i]['T_COLOR'] = $this->tb_data_type[$i]['T_COLOR']; + if (!isset($data[$i]['T_ALIGN'])) $data[$i]['T_ALIGN'] = $this->tb_data_type[$i]['T_ALIGN']; + if (!isset($data[$i]['V_ALIGN'])) $data[$i]['V_ALIGN'] = $this->tb_data_type[$i]['V_ALIGN']; + if (!isset($data[$i]['LN_SIZE'])) $data[$i]['LN_SIZE'] = $this->tb_data_type[$i]['LN_SIZE']; + if (!isset($data[$i]['BRD_SIZE'])) $data[$i]['BRD_SIZE'] = $this->tb_data_type[$i]['BRD_SIZE']; + if (!isset($data[$i]['BRD_COLOR'])) $data[$i]['BRD_COLOR'] = $this->tb_data_type[$i]['BRD_COLOR']; + if (!isset($data[$i]['BRD_TYPE'])) $data[$i]['BRD_TYPE'] = $this->tb_data_type[$i]['BRD_TYPE']; + if (!isset($data[$i]['BG_COLOR'])) $data[$i]['BG_COLOR'] = $this->tb_data_type[$i]['BG_COLOR']; + + $this->SetFont( $data[$i]['T_FONT'], + $data[$i]['T_TYPE'], + $data[$i]['T_SIZE']); + + $data[$i]['CELL_WIDTH'] = $this->tb_header_type[$i]['WIDTH']; + + if (isset($data[$i]['COLSPAN'])){ + + $colspan = (int) $data[$i]['COLSPAN'];//convert to integer + + for ($j = 1; $j < $colspan; $j++){ + //if there is a colspan, then calculate the number of lines also with the with of the next cell + if (($i + $j) < $this->tb_columns) + $data[$i]['CELL_WIDTH'] += $this->tb_header_type[$i + $j]['WIDTH']; + } + } + + $data[$i]['CELL_LINES'] = $this->NbLines($data[$i]['CELL_WIDTH'], $data[$i]['TEXT']); + + //this is the maximum cell height + $h = max($h, $data[$i]['LN_SIZE'] * $data[$i]['CELL_LINES']); + + if (isset($data[$i]['COLSPAN'])){ + //just skip the other cells + $i = $i + $colspan - 1; + } + + } + + + $this->CheckPageBreak($h, $header); + + if ($this->Draw_Header_Command){//draw the header + $this->Draw_Header_($h); + } + + $this->Table_Align(); + + //Draw the cells of the row + for($i=0;$i<$this->tb_columns;$i++) + { + + //border size BRD_SIZE + $this->SetLineWidth($data[$i]['BRD_SIZE']); + + //fill color = BG_COLOR + list($r, $g, $b) = $data[$i]['BG_COLOR']; + $this->SetFillColor($r, $g, $b); + + //Draw Color = BRD_COLOR + list($r, $g, $b) = $data[$i]['BRD_COLOR']; + $this->SetDrawColor($r, $g, $b); + + //Text Color = T_COLOR + list($r, $g, $b) = $data[$i]['T_COLOR']; + $this->SetTextColor($r, $g, $b); + + //Set the font, font type and size + $this->SetFont( $data[$i]['T_FONT'], + $data[$i]['T_TYPE'], + $data[$i]['T_SIZE']); + + //Save the current position + $x=$this->GetX(); + $y=$this->GetY(); + + //print the text + $this->MultiCellTable( + $data[$i]['CELL_WIDTH'], + $data[$i]['LN_SIZE'], + $data[$i]['TEXT'], + $data[$i]['BRD_TYPE'], + $data[$i]['T_ALIGN'], + $data[$i]['V_ALIGN'], + 1, + $h - $data[$i]['LN_SIZE'] * $data[$i]['CELL_LINES'] + ); + + //Put the position to the right of the cell + $this->SetXY($x + $data[$i]['CELL_WIDTH'],$y); + + //if we have colspan, just ignore the next cells + if (isset($data[$i]['COLSPAN'])){ + $i = $i + (int)$data[$i]['COLSPAN'] - 1; + } + + } + + $this->Data_On_Current_Page = true; + + //Go to the next line + $this->Ln($h); + } + + //if the table is bigger than a page then it jumps to next page and draws the header + /* + $h = is the height that if is overriden than the document jumps to a new page + $header = true/false = this specifies at a new page we write again the header or not. This variable + is used at the moment when the header draw makes the new page jump + */ + + function CheckPageBreak($h, $header = true) + { + //If the height h would cause an overflow, add a new page immediately + if($this->GetY()+$h > $this->PageBreakTrigger){ + + $this->Draw_Table_Border();//draw the table border + + $this->End_Page_Border();//if there is a special handling for end page??? this is specific for me + + $this->AddPage($this->CurOrientation);//add a new page + + $this->Data_On_Current_Page = false; + + $this->New_Page_Commit = true;//new page commit + + $this->table_startx = $this->GetX(); + $this->table_starty = $this->GetY(); + if ($header) $this ->Draw_Header();//if we have to draw the header!!! + } + + //align the table + $this->Table_Align(); + } + + /** This method returns the number of lines that will a text ocupy on the specified width + Call: + @param + $w - width + $txt - text + @return number + */ + function NbLines($w,$txt) + { + //Computes the number of lines a MultiCell of width w will take + $cw=&$this->CurrentFont['cw']; + if($w==0) + $w=$this->w-$this->rMargin-$this->x; + $wmax=($w-2*$this->cMargin)*1000/$this->FontSize; + $s=str_replace("\r",'',$txt); + $nb=strlen($s); + if($nb>0 and $s[$nb-1]=="\n") + $nb--; + $sep=-1; + $i=0; + $j=0; + $l=0; + $nl=1; + while($i<$nb) + { + $c=$s[$i]; + if($c=="\n") + { + $i++; + $sep=-1; + $j=$i; + $l=0; + $nl++; + continue; + } + if($c==' ') + $sep=$i; + $l+=$cw[$c]; + if($l>$wmax) + { + if($sep==-1) + { + if($i==$j) + $i++; + } + else + $i=$sep+1; + $sep=-1; + $j=$i; + $l=0; + $nl++; + } + else + $i++; + } + return $nl; + } + + + /** This method allows printing text with line breaks. + It works like a modified MultiCell + Call: + @param + $w - width + $h - line height + $txt - the outputed text + $border - border(LRTB 0 or 1) + $align - horizontal align 'JLR' + $fill - fill (1/0) + $vh - vertical adjustment - the Multicell Height will be with this VH Higher!!!! + $valign - Vertical Alignment - Top, Middle, Bottom + @return nothing + */ + function MultiCellTable($w, $h, $txt, $border=0, $align='J', $valign='T', $fill=0, $vh=0) + { + + $b1 = '';//border for top cell + $b2 = '';//border for middle cell + $b3 = '';//border for bottom cell + + if($border) + { + if($border==1) + { + $border = 'LTRB'; + $b1 = 'LRT';//without the bottom + $b2 = 'LR';//without the top and bottom + $b3 = 'LRB';//without the top + } + else + { + $b2=''; + if(is_int(strpos($border,'L'))) + $b2.='L'; + if(is_int(strpos($border,'R'))) + $b2.='R'; + $b1=is_int(strpos($border,'T')) ? $b2.'T' : $b2; + $b3=is_int(strpos($border,'B')) ? $b2.'B' : $b2; + + } + } + + switch ($valign){ + case 'T': + $wh_T = 0;//Top width + $wh_B = $vh - $wh_T;//Bottom width + break; + case 'M': + $wh_T = $vh/2; + $wh_B = $vh/2; + break; + case 'B': + $wh_T = $vh; + $wh_B = 0; + break; + default://default is TOP ALIGN + $wh_T = 0;//Top width + $wh_B = $vh - $wh_T;//Bottom width + } + + //save the X position + $x = $this->x; + /* + if $wh_T == 0 that means that we have no vertical adjustments so I will skip the cells that + draws the top and bottom borders + */ + + if ($wh_T != 0)//only when there is a difference + { + //draw the top borders!!! + $this->Cell($w,$wh_T,'',$b1,2,$align,$fill); + } + + $b2 = is_int(strpos($border,'T')) && ($wh_T == 0) ? $b2.'T' : $b2; + $b2 = is_int(strpos($border,'B')) && ($wh_B == 0) ? $b2.'B' : $b2; + + $this->MultiCell($w,$h,$txt,$b2,$align,$fill); + + if ($wh_B != 0){//only when there is a difference + + //go to the saved X position + //a multicell always runs to the begin of line + $this->x = $x; + + $this->Cell($w, $wh_B, '', $b3, 2, $align,$fill); + + $this->x=$this->lMargin; + } + + } + + + + + + + + + //*************************************************************************************************************** + // LES FONCTIONS AJOUTEES PAR JC CORNIC + //*************************************************************************************************************** + + function setRepere($titre, $posX, $posY, $sizeX, $sizeY, $datasX, $datasY, $droites) + { + + $espaceX=25; + $espaceY=30; + + // Si le min=max alors on change le nombre de dcoupage d'ordonne + if ($datasY[0] == $datasY[1]) + if ($datasY[0] == 0) $datasY[2] = 0; + else $datasY[2] = 1; + + // Le titre + $this->SetXY($posX+$espaceX, $posY - 10); + $this->Cell($sizeX , 10, $titre, 0, 2, "C"); + + if (($datasY[1]-$datasY[0]) != 0) + $ratioY = $sizeY/($datasY[1]-$datasY[0]); + else $ratioY = abs($sizeY/(2*$datasY[0])); + + if ($datasY[0] < 0) + $decalageYNeg = $datasY[0]*$ratioY; + else $decalageYNeg = 0; + + + $this->SetDrawColor(0, 0, 0); + $this->Line($posX+$espaceX, $posY+$sizeY+$decalageYNeg, $posX+$espaceX+$sizeX, $posY+$sizeY+$decalageYNeg); // X + $this->Line($posX+$espaceX, $posY+$sizeY, $posX+$espaceX, $posY); // Y + + $this->SetTextColor(0,0,0); + // Pour l'axe des X + switch (count($datasX)) + { + case 1: + // Mettre la valeur au milieu de l'axe + $this->SetXY($posX+$espaceX, $posY + $sizeY); + $this->Cell($sizeX, 10, $datasX[0], 0, 1, "C"); + + break; + case 2: + // Mettre les deux valeurs en dbut et fin d'axe + $this->Text($posX+$espaceX, $posY + $sizeY + 10, $datasX[0]); + $this->Text($posX+$espaceX + $sizeX, $posY + $sizeY + 10, $datasX[1]); + break; + default: + break; + } + + // Pour l'axe des Y + $yPos = $posY + $sizeY; + $xPos = $posX+$espaceX - 12; + $value = $datasY[0]; + $yInter = $sizeY / $datasY[2]; + $valueInter = ($datasY[1] - $datasY[0]) / $datasY[2]; + + if ($datasY[2] == 5) //**** minY et maxY diffrents ****// + for ($i=0 ; $i <= $datasY[2] ; $i++) + { + // Mettre les $i valeurs entre le dbut et la fin de l'axe + $this->Text($xPos, $yPos, $value); + + // Mettre les petites barres correspondantes... + $this->Line($posX+$espaceX-2, $yPos, $posX+$espaceX+2, $yPos); + + $yPos -= $yInter; + + if ($i==4) $value=$datasY[1]; + else $value += $valueInter; + } + else //**** minY et maxY gaux --> 1 ou 2 intervalles au lieu de 5 + { + //**** Droite horizontale y=0 + if ($datasY[0] == 0) + { + $this->Text($xPos, $yPos, $value); + $this->Line($posX-2, $yPos, $posX+2, $yPos); + } + else //**** Droite horizontale y=$datasY[0] + { + if ($datasY[0] <0) + { + //**** Y=$datasY[0] < 0 + $this->Text($xPos, $yPos, $value); + $this->Line($posX-2, $yPos, $posX+2, $yPos); + + $yPos -= $yInter/2; + $value = 0; + + //**** Y=0 + $this->Text($xPos, $yPos, $value); + $this->Line($posX-2, $yPos, $posX+2, $yPos); + } + else + { + //**** Y=0 + $this->Text($xPos, $yPos, $value); + $this->Line($posX-2, $yPos, $posX+2, $yPos); + + //**** Y=$datasY[0] > 0 + $this->Text($xPos, $yPos, $value); + $this->Line($posX-2, $yPos, $posX+2, $yPos); + } + } + } + + // Et on y met les droites... + $legendX = $posX+$espaceX + $sizeX/2; + $legendY = $posY + $sizeY + 20; + for ($i=0 ; $iSetDrawColor($droites[$i][2][0], $droites[$i][2][1], $droites[$i][2][2]); + $this->Line($posX+$espaceX, $y1, $posX+$sizeX, $y2); + + // ajouter la lgende si elle doit tre + if ($droites[$i][3] != "") + { + $this->Line($legendX - 20, $legendY, $legendX - 3, $legendY); + + $this->SetTextColor($droites[$i][2][0], $droites[$i][2][1], $droites[$i][2][2]); + $this->Text($legendX, $legendY, $droites[$i][3]); + $legendY += 5; + } + } + + // Et on encadre le repere... + $this->SetDrawColor(0,0,0); + $espace_Y = 15; + $this->Line($posX, $posY - $espace_Y, $posX+$espaceX + $sizeX + $espaceX, $posY - $espace_Y); // -Y + $this->Line($posX+$espaceX + $sizeX + $espaceX, $posY - $espace_Y, $posX+$espaceX + $sizeX + $espaceX, $posY + $sizeY + $espaceY); // +X + $this->Line($posX+$espaceX + $sizeX + $espaceX, $posY + $sizeY + $espaceY, $posX, $posY + $sizeY + $espaceY); // +Y + $this->Line($posX, $posY + $sizeY + $espaceY, $posX, $posY - $espace_Y); // -X + } + + //*********************************************************************************************************** + // Pour crire un texte dans ue case... [BUI] pour le style de la police et [[LCR]] pour le centrage ventuel + // Par dfault, le texte sera normal et gauche... + // Fonction destine dessiner un tableau dans un file.pdf + function drawTableau(&$pdf, $tableType, $headerType, $headerDatas, $datasType, $datas) + { + $nbCol = count($headerDatas)/2; + + //we initialize the table class + $pdf->Table_Init($nbCol, true, true); + + //*************************************************************************** + //TABLE HEADER SETTINGS + //*************************************************************************** + $table_subtype = $tableType; + $pdf->Set_Table_Type($table_subtype); + + for($i=0; $i<$nbCol; $i++) + { + $header_type[$i] = $headerType; + $header_type[$i]['WIDTH'] = $headerDatas[$i]; + + // Les contenus + $j = $nbCol+$i; + $header_type[$i]['TEXT'] = $headerDatas[$j]; + + // Si une donne == 0 alors on affiche rien... + if ($header_type[$i]['TEXT'] != "0") ; + else $header_type[$i]['TEXT'] = ""; + + // par dfaut, le texte est centr gauche, non italic, non soulign et non gras. + // par dfaut, les cellules ne sont pas fusionnes. + $header_type[$i]['T_TYPE'] = ''; + $header_type[$i]['T_ALIGN'] = ''; + $header_type[$i]['COLSPAN'] = "1"; + } + + // Si l'utilisateur veut un alignement spcifique pour la premire colonne. Sinon, T_ALIGN prend le dessus... + if (isset($headerType['T_ALIGN_COL0'])) + $header_type[0]['T_ALIGN'] = $headerType['T_ALIGN_COL0']; + + // Si l'utilisateur veut un fond color spcifique pour la premire colonne. Sinon, BG_COLOR prend le dessus... + if (isset($headerType['BG_COLOR_COL0'])) + $header_type[0]['BG_COLOR'] = $headerType['BG_COLOR_COL0']; + + // Si l'utilisateur prcise un type ou un alignement pour une cellule prcise du tableau, on l'applique ici + // Il faut utiliser les balises [I], [B], [U] pour Italic, Bold et Underline + // Il faut utiliser les balises [L], [C], [R] pour left, centered et rigth + for($i=0; $i<$nbCol; $i++) + { + if (sscanf($header_type[$i]['TEXT'], "[%[a-zA-Z]]%s", $balise, $reste) != 0) + { + //echo "balise = " . $balise; + if ( (strpos($balise, "I")===FALSE) && (strpos($balise, "B")===FALSE) && (strpos($balise, "U")===FALSE) + && (strpos($balise, "L")===FALSE) && (strpos($balise, "C")===FALSE) && (strpos($balise, "R")===FALSE) ) + ; // Mauvaise balise ou l'utilisateur veut mettre des crochets dans son tableau, c'est son droit... + else + { + //echo "balise = " . $balise . "
"; + // On teste les diffrentes balises pour ajuster la cellule. + if (strpos($balise, "I") === FALSE) ; + else $header_type[$i]['T_TYPE'] .= 'I'; + if (strpos($balise, "B") === FALSE) ; + else $header_type[$i]['T_TYPE'] .= 'B'; + if (strpos($balise, "U") === FALSE) ; + else $header_type[$i]['T_TYPE'] .= 'U'; + if (strpos($balise, "L") === FALSE) ; + else $header_type[$i]['T_ALIGN'] .= 'L'; + if (strpos($balise, "C") === FALSE) ; + else $header_type[$i]['T_ALIGN'] .= 'C'; + if (strpos($balise, "R") === FALSE) ; + else $header_type[$i]['T_ALIGN'] .= 'R'; + } + + // On supprime la balise du texte de la cellule... + $header_type[$i]['TEXT'] = str_replace("[".$balise."]", "", $header_type[$i]['TEXT']); + } + } + // Si l'utilsateur ne veut pas de header pour son tableau, il met NULL dans la premiere cellule... + if ($header_type[0]['TEXT'] == NULL) + { + for($i=0; $i<$nbCol; $i++) + { + $header_type[$i]['LN_SIZE'] = 0; + $header_type[$i]['TEXT'] = ""; + } + } + + + // Test si l'utilisateur veut fusionner DEUX cellules dans le header de son tableau. Il doit mettre "COLSPAN2" dans la premire cellule fusionner. + for($i=0 ; $i<$nbCol ; $i++) + { + $k=$nbCol+$i; + $i_1 = $i-1; + if ( ($kSet_Header_Type($header_type); + $pdf->Draw_Header(); + + //*************************************************************************** + //TABLE DATA SETTINGS + //*************************************************************************** + $data_type = Array();//reset the array + for ($i=0; $i<$nbCol; $i++) $data_type[$i] = $datasType; + $pdf->Set_Data_Type($data_type); + + //********************************************************************* + // Ce qui suit est valable pour toutes les cellules du tableau (hors header bien entendu). + //********************************************************************* + $data = Array(); + for ($i=0 ; $i"; + // On teste les diffrentes balises pour ajuster la cellule. + if (strpos($balise, "I") === FALSE) ; + else $data[$k]['T_TYPE'] .= 'I'; + if (strpos($balise, "B") === FALSE) ; + else $data[$k]['T_TYPE'] .= 'B'; + if (strpos($balise, "U") === FALSE) ; + else $data[$k]['T_TYPE'] .= 'U'; + if (strpos($balise, "L") === FALSE) ; + else $data[$k]['T_ALIGN'] .= 'L'; + if (strpos($balise, "C") === FALSE) ; + else $data[$k]['T_ALIGN'] .= 'C'; + if (strpos($balise, "R") === FALSE) ; + else $data[$k]['T_ALIGN'] .= 'R'; + } + + // On supprime la balise du texte de la cellule... + $data[$k]['TEXT'] = str_replace("[".$balise."]", "", $data[$k]['TEXT']); + } + + // Si la valeur de la cellule est 0, le choix a t fait ICI de ne rien mettre dans la cellule. + if ($data[$k]['TEXT'] == "0") + $data[$k]['TEXT'] =""; + + // Test si l'utilisateur veut fusionner deux cellules dans le header de son tableau. Il doit mettre le contenu + // de la cellule fusionne dans la premire cellule et "COLSPAN2" dans la deuxime cellule. + if ( ($k<$nbCol) && ($data[$k]['TEXT'] === "COLSPAN2") ) + { + $k_1 = $k-1; + $data[$k_1]['COLSPAN'] = "2"; + $data[$k]['TEXT']= ""; + } + } + $pdf->Draw_Data($data); + } + + $pdf->Draw_Table_Border(); + } +} +?> \ No newline at end of file diff --git a/php2pdf/phpToPDF.zip b/php2pdf/phpToPDF.zip new file mode 100644 index 0000000000000000000000000000000000000000..64b0d13396c294715a190153d663c16cab81ebab GIT binary patch literal 71560 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 r^3yr~-a|nCv-QUV;vvS-{id_sondage." "; + $sujets=pg_exec($connect, "select sujet from sujet_studs where id_sondage='$dsondage->id_sondage'"); + $dsujets=pg_fetch_object($sujets,0); + + $nouvelledateaffiche=""; + $anciensujethoraires=explode(",",$dsujets->sujet); + + for ($j=0;$j '.$nouvelledate.'@'.$ancientsujet[1].'
'; + $nouvelledateaffiche.=$nouvelledate.'@'.$ancientsujet[1].','; + + + } + } + + else{ + + if (preg_match(";(\d{1,2})/(\d{1,2})/(\d{4});",$anciensujethoraires[$j],$registredate)){ + $nouvelledate=mktime(0,0,0,$registredate[2],$registredate[1],$registredate[3]); +// echo $anciensujethoraires[$j].' ---- > '.$nouvelledate.'
'; + $nouvelledateaffiche.=$nouvelledate.','; + + } + } + } + $nouvelledateaffiche=substr($nouvelledateaffiche,0,-1); + print $dsujets->sujet.' donne '.$nouvelledateaffiche.'\n\n'; +// pg_exec($connect,"update sujet_studs set sujet='$nouvelledateaffiche' where id_sondage='$dsondage->id_sondage'"); + +} + + +?> diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php new file mode 100644 index 0000000..e183b6d --- /dev/null +++ b/scripts/nettoyage_sondage.php @@ -0,0 +1,64 @@ +Execute("select * from sondage"); + +while ( $dsondage=$sondage->FetchNextObject(false)) { + + if ($date_courante > strtotime($dsondage->date_fin)){ + + //destruction des données dans la base + $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . + 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . + "WHERE id_sondage = '$dsondage->id_sondage' "); + + // ecriture des traces dans le fichier de logs + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", '../admin/logs_studs.txt'); + } +} +?> diff --git a/scripts/phpVar2getText.php b/scripts/phpVar2getText.php new file mode 100644 index 0000000..be7e6bd --- /dev/null +++ b/scripts/phpVar2getText.php @@ -0,0 +1,129 @@ +.inc + build un assoc array + preg_replace les appels wrappés dans gettext() dans le php principal + + generate un .po + + ( + echo -e "\x27\2\x27,/p' lang/en.inc; + echo '); ?>' + ) > /tmp/lang.mod + (manually tweak 2 double quotes) + */ + + // drop a $l which contain the array +if(isset($_SERVER['PHP_SELF'])) + die(); // die if not run with php-cli +require_once('/tmp/lang.mod'); +$mypath = '/var/www/studs'; + +/* Language, country need to be adapted */ +$header = 'msgid "" +msgstr "" +"Project-Id-Version: Studs 0.6.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-05-01 18:32+0100\n" +"PO-Revision-Date: 2010-05-01 18:32+0100\n" +"Last-Translator: Raphaël Droz \n" +"Language-Team: Guilhem Borghesi, Raphaël Droz\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: FR\n" +"X-Poedit-Country: FRANCE\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-KeywordsList: _\n" +"X-Poedit-Basepath: /var/www/studs\n" +"X-Poedit-SearchPath-0: .\n" + +'; + + +/* helpers */ +function stripN($a) { + return preg_replace("/\n/","\\n", $a); +} +function addDQ($a) { + return addcslashes($a,'"'); +} + +/* low priority for weak regexps (small variable length) at the end, please */ +function cmp($a, $b) { + return (mb_strlen($a) < mb_strlen($b)); +} +uksort($l, 'cmp'); + +/* + 0: surely direct, like in: echo 'text ' . $var; + 1: wrap in, like in: echo "$var"; + 2: direct, like in: echo $var . "text"; +*/ +$match0 = $repl0 = $match1 = $repl1 = $match2 = $repl2 = $match3 = $repl3 = array(); +foreach($l as $k => $v) { + $match0[] = ';([\'"][ \.]|echo|print) *\$' . $k . ' *([\. ][\'"]|\;);' ; + $repl0[] = '\1 _("' . stripN(stripcslashes($v)) . '") \2' ; + + $match1[] = ';(["\'])(.*?)\$' . $k . ';' ; + $repl1[] = '\1\2" . _("' . stripN(addcslashes(stripcslashes($v),'"')) . '") . \1' ; + + $match2[] = ';\$' . $k . ';' ; + $repl2[] = '_("' . stripN(stripcslashes($v)) . '")' ; + + $match3[] = ';\. *\$GLOBALS\["' . $k . '"\] *\.;' ; + $repl3[] = '. _("' . stripN(stripcslashes($v)) . '") .' ; +} + +foreach (new DirectoryIterator('.') as $fileInfo) { + if($fileInfo->isDot()) continue; + $name = $fileInfo->getFilename(); + // process php files + if(!preg_match('/\.php$/' , $name) || + preg_match('/phpVar2getText/', $name)) + continue; + + $orig = file_get_contents($name); + $a = preg_replace($match0, $repl0, $orig, -1, $b); + $a = preg_replace($match1, $repl1, $a, -1, $c); + $a = preg_replace($match2, $repl2, $a, -1, $d); + $a = preg_replace($match3, $repl3, $a, -1, $e); + $tot = $b + $c + $e; + echo $name . ' --- ' . $tot . " (match1: $c)" . "\n"; + if($tot > 0) { + file_put_contents($name . '.save', $orig); + file_put_contents($name, $a); + } +} + + +foreach(array('fr_FR','es_ES','de_DE', 'en_GB') as $i) { + $ii = explode('_', $i); + $f = $ii[0]; $g = $ii[1]; + + // de.inc corrupted the whole process ! + unset($tt_adminstuds_mail_corps_changemail); + // now define each of the strings with a new langague + require_once($mypath . '/lang/' . $f . '.inc'); + $a = ''; + + /* duplicates are fatal to poedit */ + foreach(array_unique($l) as $k => $v) { + /* poedit is strict with its syntax */ + $po_ready_v = stripN(addDQ($v)); + if($f == 'en') + $a .= 'msgid "' . $po_ready_v . '"' . "\n" . + 'msgstr "' . $po_ready_v . '"' . "\n\n"; + else + $a .= 'msgid "' . $po_ready_v . '"' . "\n" . + /* ${$k} the key (var name) in the orig (EN) array + to look for as a raw $var while the .inc is included in the context */ + 'msgstr "' . stripN(addDQ(${$k})) . '"' . "\n\n"; + } + file_put_contents('locale/' . $f . '_' . $g . '/LC_MESSAGES/Studs.po', $header . $a); +} + +?> diff --git a/scripts/recherche_adresse.pl b/scripts/recherche_adresse.pl new file mode 100644 index 0000000..b7cd63c --- /dev/null +++ b/scripts/recherche_adresse.pl @@ -0,0 +1,53 @@ +#/========================================================================== +#/ +#/Université de Strasbourg - Direction Informatique +#/Auteur : Guilhem BORGHESI +#/Création : Février 2008 +#/ +#/borghesi@unistra.fr +#/ +#/Ce logiciel est régi par la licence CeCILL-B soumise au droit français et +#/respectant les principes de diffusion des logiciels libres. Vous pouvez +#/utiliser, modifier et/ou redistribuer ce programme sous les conditions +#/de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +#/sur le site "http://www.cecill.info". +#/ +#/Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +#/pris connaissance de la licence CeCILL-B, et que vous en avez accepté les +#/termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. +#/ +#/========================================================================== +#/ +#/Université de Strasbourg - Direction Informatique +#/Author : Guilhem BORGHESI +#/Creation : Feb 2008 +#/ +#/borghesi@unistra.fr +#/ +#/This software is governed by the CeCILL-B license under French law and +#/abiding by the rules of distribution of free software. You can use, +#/modify and/ or redistribute the software under the terms of the CeCILL-B +#/license as circulated by CEA, CNRS and INRIA at the following URL +#/"http://www.cecill.info". +#/ +#/The fact that you are presently reading this means that you have had +#/knowledge of the CeCILL-B license and that you accept its terms. You can +#/find a copy of this license in the file LICENSE. +#/ +#/========================================================================== + +#!/usr/bin/perl + + +open (FILE,"../admin/logs_studs.txt"); + +while (){ + + /.*\t(.*u-strasbg.fr)\t.*/; + + print $1."\n"; + + +} + + diff --git a/scripts/recherche_adresse_admin.php b/scripts/recherche_adresse_admin.php new file mode 100644 index 0000000..421aa31 --- /dev/null +++ b/scripts/recherche_adresse_admin.php @@ -0,0 +1,57 @@ +mail_admin, "; +// print "$dsondage->mail_admin\n"; + + +} + + +?> diff --git a/sources/sources.php b/sources/sources.php new file mode 100644 index 0000000..74a7587 --- /dev/null +++ b/sources/sources.php @@ -0,0 +1,66 @@ +'."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +echo 'Sources '.NOMAPPLICATION.''."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; + +logo(); +bandeau_tete(); +bandeau_titre(_("Make your polls")); +sous_bandeau(); +echo ''."\n"; + +// Affichage du bandeau de pied +bandeau_pied(); +echo ''."\n"; +echo ''."\n"; + +?> diff --git a/studs.php b/studs.php new file mode 100644 index 0000000..e96c1c1 --- /dev/null +++ b/studs.php @@ -0,0 +1,604 @@ +is_date) + require_once('exportics.php'); + die(); + } + +// quand on ajoute un commentaire utilisateur +if(isset($_POST['ajoutcomment'])) { + if (isset($_SERVER['REMOTE_USER'])) + $comment_user = $_SESSION['nom']; + elseif(isset($_POST["commentuser"]) && ! empty($_POST["commentuser"])) + $comment_user = $connect->qstr(strip_tags($_POST["commentuser"])); + elseif(isset($_POST["commentuser"])) + $err |= COMMENT_USER_EMPTY; + else + $comment_user = _('anonyme'); + if(empty($_POST["comment"])) + $err |= COMMENT_EMPTY; + + if (isset($_POST["comment"]) && + ! is_error(COMMENT_EMPTY) && ! is_error(NO_POLL) && + ! is_error(COMMENT_USER_EMPTY)) { + if( ! $connect->Execute('INSERT INTO comments ' . + '(id_sondage, comment, usercomment) VALUES ("'. + $numsondage . '","'. + $connect->qstr(strip_tags($_POST['comment'])). + '","' . + $comment_user .'")') ); + $err |= COMMENT_INSERT_FAILED; + } +} + + +// Action quand on clique le bouton participer +$user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' ORDER BY id_users"); +$nbcolonnes=substr_count($dsondage->sujet,',')+1; +if ( ! is_error(NO_POLL) && isset($_POST["boutonp"]) ){ + //Si le nom est bien entré + if (! isset($_POST["nom"]) || empty($_POST['nom'])) + $err |= NAME_EMPTY; + if(! is_error(NAME_EMPTY) && + (!isset($_SERVER['REMOTE_USER']) || $_POST["nom"] == $_SESSION["nom"]) ) { + for ($i=0;$i<$nbcolonnes;$i++){ + // Si la checkbox est enclenchée alors la valeur est 1 + if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1'){ + $nouveauchoix.="1"; + } + // sinon c'est 0 + else { + $nouveauchoix.="0"; + } + } + + while($user = $user_studs->FetchNextObject(false)) { + if ($_POST["nom"]==$user->nom) + $err |= NAME_TAKEN; + } + + // Ecriture des choix de l'utilisateur dans la base + if (! is_error(NAME_TAKEN) && ! is_error(NAME_EMPTY)) { + // TODO: throw error + $nom=substr($_POST["nom"],0,64); + $connect->Execute('INSERT INTO user_studs (nom,id_sondage,reponses) VALUES ("' . + $nom . '","' . + $numsondage . '","' . + $nouveauchoix . '")'); + + if ($dsondage->mailsonde || + /* compatibility for non boolean DB */ + $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { + + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$dsondage->mail_admin", + "[".NOMAPPLICATION."] "._("Poll's participation")." : $dsondage->titre", + + "\"$nom\" ". + _("has filled a line.\nYou can find your poll at the link") . " :\n\n". + get_server_name()."/studs.php?sondage=$numsondage \n\n" . + _("Thanks for your confidence.") . "\n". NOMAPPLICATION, + $headers); + } + } + } + else + $err |= NAME_EMPTY; +} + +print_header(true); +echo ''."\n"; +logo(); +bandeau_tete(); +bandeau_titre(_("Make your polls")); +sous_bandeau(); + +if($err != 0) { + bandeau_titre(_("Error!")); + + echo '
    '."\n"; + if(is_error(NAME_EMPTY)) + echo '
  • ' . _("Enter a name !") . "
    • \n"; + if(is_error(NAME_TAKEN)) + echo '
  • ' . + _("The name you've chosen already exist in this poll!") . + "
    • \n"; + if(is_error(COMMENT_EMPTY) || is_error(COMMENT_USER_EMPTY)) + echo '
  • ' . + _("Enter a name and a comment!") . + "
    • \n"; + if(is_error(COMMENT_INSERT_FAILED) ) + echo '
  • ' . + _("Failed to insert the comment!") . + "
    • \n"; + + echo '
'; + + if(is_error(NO_POLL_ID) || is_error(NO_POLL)) { + echo '
'."\n"; + print "

" . _("This poll doesn't exist !") . "

"."\n"; + print _("Back to the homepage of") . ' '. NOMAPPLICATION . + '.'."\n"; + echo '



'."\n"; + echo '
'."\n"; + bandeau_pied(); + + echo ''."\n"; + echo ''."\n"; + die(); + } + } + +echo '
'."\n"; + +//affichage du titre du sondage + $titre=str_replace("\\","",$dsondage->titre); + echo '

'.$titre.'

'."\n"; + +//affichage du nom de l'auteur du sondage +echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'

'."\n"; + +//affichage des commentaires du sondage + if ($dsondage->commentaires){ + echo _("Comments") .' :
'."\n"; + $commentaires=$dsondage->commentaires; + $commentaires=str_replace("\\","",$commentaires); + echo $commentaires; + + echo '
'."\n"; + } + echo '
'."\n"; +echo '
'."\n"; + +echo '
'."\n"; + +echo ''; + + echo '
'."\n"; + + echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you
(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line.") ."\n"; + + echo '

'."\n"; + +// Debut de l'affichage des resultats du sondage + echo ''."\n"; + +//On récupere les données et les sujets du sondage + $nblignes=$user_studs->RecordCount(); + + + //on teste pour voir si une ligne doit etre modifiée +$testmodifier = false; +$ligneamodifier = -1; + for ($i=0;$i<$nblignes;$i++){ + if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])){ + $ligneamodifier=$i; + } + //test pour voir si une ligne est a modifier + if ($_POST['validermodifier'.$i.'_x']){ + $modifier=$i; + $testmodifier=true; + } + } + //si le test est valide alors on affiche des checkbox pour entrer de nouvelles valeurs + if ($testmodifier){ + + for ($i=0;$i<$nbcolonnes;$i++){ + //recuperation des nouveaux choix de l'utilisateur + if (isset($_POST["choix$i"]) && $_POST["choix$i"] == 1){ + $nouveauchoix.="1"; + } + else { + $nouveauchoix.="0"; + } + } + + $compteur=0; + while ($data=$user_studs->FetchNextObject(false) ) { + //mise a jour des données de l'utilisateur dans la base SQL + if ($compteur==$modifier){ + $connect->Execute("UPDATE user_studs SET reponses='$nouveauchoix' WHERE nom='$data->nom' AND id_users='$data->id_users'"); + if ($dsondage->mailsonde=="yes"){ + + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : $dsondage->titre", "\"$data->nom\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + } + } + $compteur++; + } + } + +//recuperation des utilisateurs du sondage + $user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' ORDER BY id_users"); + + +//reformatage des données des sujets du sondage + $toutsujet=explode(",",$dsondage->sujet); + +//si le sondage est un sondage de date +if ($dsondage->format=="D"||$dsondage->format=="D+"){ + +//affichage des sujets du sondage + echo ''."\n"; + echo ''."\n"; + + //affichage des années + $colspan=1; + for ($i=0;$i'.date('Y', intval($toutsujet[$i])).''."\n"; + $colspan=1; + } + } + echo ''."\n"; + + echo ''."\n"; + echo ''."\n"; + //affichage des mois + $colspan=1; + for ($i=0;$i'.date("F",$cur).''."\n"; + else + echo ''."\n"; + $colspan=1; + } + } + echo ''."\n"; + + echo ''."\n"; + echo ''."\n"; + //affichage des jours + $colspan=1; + for ($i=0;$i'.date("D jS",$cur).''."\n"; + else + echo ''."\n"; + $colspan=1; + } + } + echo ''."\n"; + //affichage des horaires + if (strpos($dsondage->sujet, '@') !== false){ + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$toutsujet[$i];$i++){ + $heures=explode("@",$toutsujet[$i]); + echo ''."\n"; + } + echo ''."\n"; + } +} + +else { + $toutsujet=str_replace("°","'",$toutsujet); + +//affichage des sujets du sondage + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$toutsujet[$i];$i++){ + + echo ''."\n"; + } + echo ''."\n"; + +} + +//Usager pré-authentifié dans la liste? + $user_mod = FALSE; +//affichage des resultats actuels +$somme = array(); + $compteur = 0; + + while ($data=$user_studs->FetchNextObject(false)) { + + echo ''."\n"; + echo ''."\n"; +// Les réponses qu'il a choisit + $ensemblereponses=$data->reponses; +// ligne d'un usager pré-authentifié + $mod_ok = !isset($_SERVER['REMOTE_USER']) || ($nombase == $_SESSION['nom']); + $user_mod |= $mod_ok; + // pour chaque colonne + for ($k=0; $k < $nbcolonnes; $k++){ + // on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs + if ($compteur == $ligneamodifier) { + echo ''."\n"; + } + else { + $car=substr($ensemblereponses,$k,1); + if ($car=="1"){ + echo ''."\n"; + $somme[$k]++; + } + else { + echo ''."\n"; + } + } + } + + //a la fin de chaque ligne se trouve les boutons modifier + if ($compteur != $ligneamodifier && ($dsondage->format=="A+"||$dsondage->format=="D+") && $mod_ok){ + echo ''."\n"; + } + + //demande de confirmation pour modification de ligne + for ($i=0;$i<$nblignes;$i++){ + if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])){ + if ($compteur==$i){ + echo ''."\n"; + } + } + } + $compteur++; + echo ''."\n"; + } + +// affichage de la ligne pour un nouvel utilisateur + if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { + echo ''."\n"; + echo ''."\n"; + +// affichage des cases de formulaire checkbox pour un nouveau choix + for ($i=0;$i<$nbcolonnes;$i++){ + echo ''."\n"; + } + // Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base + echo ''."\n"; + echo ''."\n"; + } + +//determination de la meilleure date + +// On cherche la meilleure colonne + for ($i=0;$i<$nbcolonnes;$i++){ + if ($i=="0"){ + $meilleurecolonne=$somme[$i]; + } + if ($somme[$i]>$meilleurecolonne){ + $meilleurecolonne=$somme[$i]; + } + } + +// Affichage des différentes sommes des colonnes existantes + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$i<$nbcolonnes;$i++){ + $affichesomme=$somme[$i]; + if ($affichesomme==""){$affichesomme="0";} + echo ''."\n"; + } + echo ''."\n"; + + echo ''."\n"; + echo ''."\n"; + for ($i=0;$i<$nbcolonnes;$i++){ + if ($somme[$i]==$meilleurecolonne&&$somme[$i]){ + echo ''."\n"; + } + else { + echo ''."\n"; + } + + } + echo ''."\n"; + + echo '
'.strftime("%B",$cur).'
'.strftime("%a %e",$cur).'
'.$heures[1].'
'.$toutsujet[$i].'
'; + +// Le nom de l'utilisateur + $nombase=str_replace("°","'",$data->nom); + echo $nombase.'OK
'."\n"; + if (isset($_SERVER['REMOTE_USER'])) + echo ''.$_SESSION['nom']."\n"; + else + echo ''."\n"; + echo '
'. _("Addition") .''.$affichesomme.'
' . _('Best choice') . '
'."\n"; + echo '
'."\n"; + +// reformatage des données de la base pour les sujets + $toutsujet=explode(",",$dsondage->sujet); + $toutsujet=str_replace("°","'",$toutsujet); + +// On compare le nombre de résultat avec le meilleur et si le résultat est égal +// on concatene le resultat dans $meilleursujet + + $compteursujet=0; + for ($i=0;$i<$nbcolonnes;$i++){ + if ($somme[$i]==$meilleurecolonne){ + $meilleursujet.=", "; + if ($dsondage->format=="D"||$dsondage->format=="D+"){ + $meilleursujetexport=$toutsujet[$i]; + if (strpos($toutsujet[$i],'@') !== false){ + $toutsujetdate=explode("@",$toutsujet[$i]); + if ($_SESSION["langue"]=="EN") + $meilleursujet.=date("l, F jS Y",$toutsujetdate[0])." " . _("for") ." ".$toutsujetdate[1]; + else + $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujetdate[0]). ' ' . _("for") . ' ' . $toutsujetdate[1]; + } + else { + if ($_SESSION["langue"]=="EN") + $meilleursujet.=date("l, F jS Y",$toutsujet[$i]); + else + $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujet[$i]); + } + } + else + $meilleursujet.=$toutsujet[$i]; + + $compteursujet++; + } + } + $meilleursujet=substr("$meilleursujet",1); + +$vote_str = _('vote'); +if ($meilleurecolonne > 1) + $vote_str = _('votes'); + + echo '

'."\n"; + + // Affichage du meilleur choix + if ($compteursujet=="1"&&$meilleurecolonne){ + print 'Meilleur choix ' . _('The best choice at this time is:') . "$meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; + } + elseif ($meilleurecolonne){ + print 'Meilleur choix ' . _('The bests choices at this time are:') . " $meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; + } + + echo '

'; + + //affichage des commentaires des utilisateurs existants + $comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); + if ($comment_user->RecordCount() != 0) { + + print "
" . _("Comments of polled people") . " :
\n"; + while( $dcomment=$comment_user->FetchNextObject(false)) { + print $dcomment->usercomment . ' : ' . $dcomment->comment . '
'; + } + + } + + //affichage de la case permettant de rajouter un commentaire par les utilisateurs + print '
' . + '

' ._("Add a comment in the poll:") . '

' . "\n"; + +if (isset($_SERVER['REMOTE_USER']) || isset($_SESSION['nom'])) { + echo _("Name") .' : '; + echo '
'."\n"; +} +echo ''."\n"; +echo '
'."\n"; +echo ''."\n"; +// Focus javascript sur la case de texte du formulaire +echo ''."\n"; + +echo '
'."\n"; + +echo ''; +echo ''."\n"; + + bandeau_pied_mobile(); + // Affichage du bandeau de pied + echo ''."\n"; + echo ''."\n"; + +?> diff --git a/style.css b/style.css new file mode 100644 index 0000000..e7fe05d --- /dev/null +++ b/style.css @@ -0,0 +1,433 @@ +/* +========================================================================== + +Université de Strasbourg - Direction Informatique +Auteur : Guilhem BORGHESI +Création : Février 2008 + +borghesi@unistra.fr + +Ce logiciel est régi par la licence CeCILL-B soumise au droit français et +respectant les principes de diffusion des logiciels libres. Vous pouvez +utiliser, modifier et/ou redistribuer ce programme sous les conditions +de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +sur le site "http://www.cecill.info". + +Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +pris connaissance de la licence CeCILL-B, et que vous en avez accepté les +termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. + +========================================================================== + +Université de Strasbourg - Direction Informatique +Author : Guilhem BORGHESI +Creation : Feb 2008 + +borghesi@unistra.fr + +This software is governed by the CeCILL-B license under French law and +abiding by the rules of distribution of free software. You can use, +modify and/ or redistribute the software under the terms of the CeCILL-B +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +The fact that you are presently reading this means that you have had +knowledge of the CeCILL-B license and that you accept its terms. You can +find a copy of this license in the file LICENSE. + +========================================================================== +*/ + +/* +Le fichier style.css est le fichier de style de studs. Il se trouve à la racine +du répertoire studs. Il contient toutes les mises en forme des fichiers PHP +de Studs. +*/ +/*bandeau de titre*/ +div.bandeau{ + line-height:35px; + text-align:center; + background-color: #0b419b; + color:white; + vertical-align:middle; + font-size:35px; + font-family:arial; + padding:8px; + height:35px; + position:static; + top:6px; + left:6px; + right:6px; + +} +div.logo{ + height:64px; + float:right; + top:8px; + right:8px; + margin-left: 0; + margin-right:0; + margin-bottom:auto; +} +/*Sous bandeau avec bouton de navigation*/ +div.bandeautitre{ + height:17px; + background-color: #0077DD; + font-size:14px; + font-weight:bold; + text-align:center; + color:white; + vertical-align:middle; + font-family:arial; + padding:3px; + position:static; + top:57px; + left:6px; + right:6px; +} +div.sousbandeau{ + height:17px; + background-color: #DDDDDD; + font-size:11px; + color:black; + vertical-align:middle; + font-family:arial; + padding:3px; + position:static; + top:80px; + left:6px; + right:6px; +} +/*bandeau de pied*/ +div.surbandeaupied{ + background-color: #0077DD; + position:absolute; + bottom:30px; + left:6px; + right:6px; + height:6px; +} +div.bandeaupied{ + text-align:center; + background-color: #0b419b; + color:white; + font-size:11px; + font-family:arial; + padding:6px; + position:fixed; + bottom:6px; + left:6px; + right:6px; + margin:2px; +} +div.surbandeaupiedmobile{ + background-color: #0077DD; + position:static; + bottom:32px; + left:6px; + right:6px; + height:6px; +} +div.bandeaupiedmobile{ + text-align:center; + background-color: #0b419b; + color:white; + font-size:11px; + font-family:arial; + padding:6px; + position:static; +} +/*les boutons se trouvant dans le sousbandeau*/ +div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { + background-color: #0b419b; + height:16px; + padding: 2px 6px 2px 6px; + vertical-align:middle; + text-align:center; + margin-left:10px; + margin-right:10px; + font-family:arial; + color:white; + font-size:10px; + text-decoration:none; +} +span.sousbandeaulangue { + margin-left:6px; + margin-right:6px; + float:right; +} +/*corps de la page index.php*/ +div.corps{ + font-size:12px; + font-family:arial; + position:static; + top:170px; + left:20px; + right:20px; + padding:30px; +} +div.corps table{ + font-family:arial; + font-size:12px; + font-weight:bold; +} +div.corpscentre{ + font-size:12px; + font-family:arial; + text-align:center; + position:absolute; + top:150px; + margin-right:10%; + margin-left:10%; + width:80%; +} +/*affichage des jours*/ +div.jourschoisis { + background-color: #DDD; + padding:10px; + text-align: center; + position:static; + left:700px; + top:170px; + font-size:12px; + width:100%; +} +/*presenation des pages*/ +div.bodydate { + padding:10px; + font-family:arial; + font-size:12px; + text-align:center; + position:static; + top:330px; + left:20px; + right:20px; +} +div.bodydate table{ + font-family:arial; + font-size:12px; + font-weight:bold; +} +/*cadre de commentaires*/ +div.presentationdate { + width:40%; + font-family:arial; + text-align:center; + font-size:12px; + border-width:1px; + border-style:solid; + border-color:#969696; + position:static; + top:110px; + right:1px; + left:1px; + margin-top:10px; + margin-left:30%; + margin-right: 30%; +} +div.presentationdatefin { + width:40%; + padding:10px; + font-family:arial; + text-align:center; + font-size:12px; + border-width:1px; + border-style:solid; + margin-top: 10px; + margin-left: 30%; + margin-right: 30%; + position:static; +} +/*cadre principal de studs.php*/ +div.cadre { + padding:10px; + font-family:arial; + font-size:12px; + position:static; + top:235px; + text-align:center; + margin:0 auto; +} +/*la table des résultats dans l'affichage de sondage*/ +div.cadre table.resultats { + background-color: white; + text-align: center; + margin:0 auto; +} + +div.cadre td { + height:21px; +} +/*case de tableau OK dans affichage de sondage*/ +div.cadre td.ok { + background-color: #66FF99; + font-size:12px; + text-align:center; +} +/*Case de tableau NON dans affichage de sondage*/ +div.cadre td.non { + background-color: #FF7777; + width:35px; +} +/*Case de tableau VIDE dans affichage de sondage*/ +div.cadre td.vide { + background-color: #DDDDDD; + text-align:center; +} +/*Case de tableau contenant les noms dans affichage de sondage*/ +div.cadre td.nom { + background-color: #DDDDDD; + font-size:12px; + text-align:center; +} +div.cadre td.casevide { + background-color: white; + text-align:center; +} +/*les cases contenant les sommes de chaque colonne dans l'affichage de calendrier*/ +div.cadre td.somme { + background-color: white; + font-weight: bold; + font-size:14px; +} + +/*Case de tableau SUJET dans affichage de sondage*/ +div.cadre td.sujet, div.cadre td.jour, div.cadre td.heure { + border: 2px; + background-color: #DDDDDD; + font-weight: bold; + font-size:14px; + padding:1px 5px; +} + +div.cadre td.annee { + border: 2px; + background-color: #969696; + font-weight: bold; + font-size:14px; + padding:1px 5px; +} +div.cadre td.mois { + border: 2px; + background-color: #C0C0C0; + font-weight: bold; + font-size:14px; + padding:1px 5px; +} + +/*affichage du calendrier*/ +div.calendrier { + padding:10px; + background-color: #AAA; + width:490px; + font-size:12px; + font-family:arial; + margin-left: 30%; + margin-right: 30%; + position:static; +} +/*jour de la semaine dans calendrier*/ +div.calendrier td.joursemaine { + width:65px; + text-align: center; + font-family:arial; + font-size:14px; + border: 2px; + background-color: white; +} +div.calendrier td.jourwe { + width:65px; + text-align: center; + font-family:arial; + font-size:14px; + border: 2px; + background-color: #C0C0C0; +} +/*jour avant le premier jour du mois dans calendrier*/ +div.calendrier td.avant { + width:65px; + text-align: center; + border: 2px; + font-family:arial; + font-size:13px; + background-color: #DDDDDD; +} +/*jour libre dans calendrier*/ +div.calendrier td.libre { + width:65px; + text-align: center; + border: 2px; + background-color: #66FF99; +} +/*jour deja selectionné dans calendrier*/ +div.calendrier td.choisi { + width:65px; + text-align: center; + border: 2px; + background-color: #0077DD; +} +/* Le paragraphe de fin */ +p.affichageresultats{ + text-align: center; + font-family:arial; + font-size:13px; +} + +a.affichageexport{ + text-align: center; + font-family:arial; + font-size:10px; + margin-left:10px; + text-decoration: none; +} +div.titregestionadmin{ + text-align: center; + font-weight:bold; + font-size:18px; + padding:10px; +} + + +.bouton { + width: 65px; + border:0px; + padding:0px 0 0 0; + margin:0px; + cursor:pointer; + font-family:arial; + font-size:13px; +} +/*les boutons pour choisir un jour non selectionné*/ +.ON { + background-color: #66FF99; +} + +/*les boutons pour deselectionner un jour deja choisi*/ +.OFF { + background-color: #0077DD; +} + +div.nouveau_sondage a { + text-decoration: none; +} +div.nouveau_sondage span img { + vertical-align: middle; + border: 0px; +} +div.nouveau_sondage span { + margin-left: 20px; +} + +div.error, div.addcomment { + text-align:center; + border: 1px; + font-family: arial; + font-size: 13px; +} +ul.exports { + text-align:center; + list-style-type : none ; +} +li.error { + color: red; +} diff --git a/variables.php.template b/variables.php.template new file mode 100644 index 0000000..6cbc8ec --- /dev/null +++ b/variables.php.template @@ -0,0 +1,91 @@ +"); + +// adresse mail de l'administrateur de la base +define('ADRESSEMAILADMIN', ''); + +// nom de la base de donnees +define('BASE', ''); + +// nom de l'utilisateur de la base +define('USERBASE', ""); + +// passwd de l'utilisateur de la base +define('USERPASSWD', ''); + +// nom du serveur de base de donnees, laisser vide pour utiliser un socket +define('SERVEURBASE', ''); + +// Type de base de données à utiliser (mysql, postgres, ...) +// http://phplens.com/lens/adodb/docs-adodb.htm#drivers +define('BASE_TYPE', ''); + +// Langue par défaut de l'application (à choisir dans $ALLOWED_LANGUAGES) +define('LANGUE', 'fr_FR'); + +// Nom et emplacement du logo +define('LOGOBANDEAU', ''); + +// Nom et emplacement du logo de la lettre générée en PDF +define('LOGOLETTRE', ''); + +if (@file_exists('variables.local.php')) { + include('variables.local.php'); +} + +// Studs version +define('STUDS_VERSION', '0.6.6'); + +// Do not edit the following +$ALLOWED_LANGUAGES = array('fr_FR' => 'french', + 'en_GB' => 'english', + 'es_ES' => 'spanish', + 'de_DE' => 'german' ); + +?> From 2dd5ce640238dd6cb21ba0f579ebb5c84b36f1f8 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 01:43:25 +0200 Subject: [PATCH 003/129] Clean and protect get_sondage_from_id function --- fonctions.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fonctions.php b/fonctions.php index 2eca39f..f647b6f 100644 --- a/fonctions.php +++ b/fonctions.php @@ -66,9 +66,16 @@ function get_sondage_from_id($id) { global $connect; // Ouverture de la base de données if(preg_match(";^[\w\d]{16}$;i",$id)) { - $sondage=$connect->Execute("SELECT sondage.*,sujet_studs.sujet FROM sondage". - " LEFT OUTER JOIN sujet_studs ON sondage.id_sondage = sujet_studs.id_sondage". - " WHERE sondage.id_sondage = $id"); + $sql = 'SELECT sondage.*,sujet_studs.sujet FROM sondage + LEFT OUTER JOIN sujet_studs ON sondage.id_sondage = sujet_studs.id_sondage + WHERE sondage.id_sondage = '.$connect->Param('id_sondage'); + $sql = $connect->Prepare($sql); + $sondage=$connect->Execute($sql, array($id)); + + if ($sondage === false) { + return false; + } + $psondage = $sondage->FetchObject(false); $psondage->date_fin = strtotime($psondage->date_fin); return $psondage; From 4eb0a46238240bbf673d7f0ff1caa46bc7321d2a Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 01:47:36 +0200 Subject: [PATCH 004/129] mail injection bug --- contacts.php | 20 +++++++++++++------- fonctions.php | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/contacts.php b/contacts.php index 229e040..6d19c67 100644 --- a/contacts.php +++ b/contacts.php @@ -47,14 +47,15 @@ else include_once('bandeaux.php'); // action du bouton annuler -if ($_POST["envoiquestion"]&&$_POST["nom"]!=""&&$_POST["question"]!=""){ +if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isset($_POST['nom']) && !empty($_POST['nom']) && isset($_POST['question']) && !empty($_POST['question'])){ + $message=str_replace("\\","",$_POST["question"]); //envoi des mails $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; mail (ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers); - if ($_POST["adresse_mail"]!=""){ + if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])){ $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; mail ("$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); } @@ -85,9 +86,14 @@ if ($_POST["envoiquestion"]&&$_POST["nom"]!=""&&$_POST["question"]!=""){ } else { - $_SESSION["question"]=$_POST["question"]; - $_SESSION["nom"]=$_POST["nom"]; - $_SESSION["adresse_mail"]=$_POST["adresse_mail"]; + $post_var = array('question', 'nom', 'adresse_mail', ); + foreach ($post_var as $var) { + if (isset($_POST[$var]) && !empty($_POST[$var])) { + $_SESSION[$var] = $_POST[$var]; + } else { + $_SESSION[$var] = null; + } + } //affichage de la page echo ''."\n"; @@ -115,7 +121,7 @@ else { echo _("Your name") .' :
'."\n"; echo ''; - if ($_POST["envoiquestion"]&&$_SESSION["nom"]==""){ + if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && $_SESSION["nom"]==""){ echo ' '. _("Enter a name") .''; } @@ -129,7 +135,7 @@ else { echo _("Question") .' :
'."\n"; echo ''; - if ($_POST["envoiquestion"]&&$_SESSION["question"]==""){ + if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && $_SESSION["question"]==""){ echo '  Il faut poser une question !'; } diff --git a/fonctions.php b/fonctions.php index f647b6f..33d91c5 100644 --- a/fonctions.php +++ b/fonctions.php @@ -131,4 +131,19 @@ function check_table_sondage() { return false; } + + +/** + * Vérifie une adresse e-mail selon les normes RFC + * @param string $email l'adresse e-mail a vérifier + * @return bool vrai si l'adresse est correcte, faux sinon + * @see http://fightingforalostcause.net/misc/2006/compare-email-regex.php + * @see http://svn.php.net/viewvc/php/php-src/trunk/ext/filter/logical_filters.c?view=markup + */ +function validateEmail($email) { + $pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD'; + + return (bool)preg_match($pattern, $email); +} + ?> From 8395be45bf7065efd270141504a2dd54382753ca Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 01:49:29 +0200 Subject: [PATCH 005/129] SQL injection allow to connect in admin with only public key --- adminstuds.php | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index 924fd6c..481968e 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -46,17 +46,31 @@ if (file_exists('bandeaux_local.php')) else include_once('bandeaux.php'); +// Initialisation des variables +$numsondageadmin = false; +$sondage = false; + // recuperation du numero de sondage admin (24 car.) dans l'URL -$numsondageadmin=$_GET["sondage"]; -//on découpe le résultat pour avoir le numéro de sondage (16 car.) -$numsondage=substr($numsondageadmin, 0, 16); - -if (preg_match(";[\w\d]{16};i",$numsondage)){ - - $sondage=$connect->Execute("SELECT * FROM sondage WHERE id_sondage_admin = '$numsondageadmin'"); - $sujets=$connect->Execute("SELECT * FROM sujet_studs WHERE id_sondage='$numsondage'"); - $user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' order by id_users"); +if (isset($_GET['sondage']) && !empty($_GET['sondage']) && is_string($_GET['sondage']) && strlen($_GET['sondage']) === 24) { + $numsondageadmin=$_GET["sondage"]; + //on découpe le résultat pour avoir le numéro de sondage (16 car.) + $numsondage=substr($numsondageadmin, 0, 16); +} +if (preg_match(";[\w\d]{24};i", $numsondageadmin)) { + $sql = 'SELECT * FROM sondage WHERE id_sondage_admin = '.$connect->Param('numsondageadmin'); + $sql = $connect->Prepare($sql); + $sondage = $connect->Execute($sql, array($numsondageadmin)); + + if ($sondage !== false) { + $sql = 'SELECT * FROM sujet_studs WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + $sujets = $connect->Execute($sql, array($numsondage)); + + $sql = 'SELECT * FROM user_studs WHERE id_sondage = '.$connect->Param('numsondage').' order by id_users'; + $sql = $connect->Prepare($sql); + $user_studs = $connect->Execute($sql, array($numsondage)); + } } //verification de l'existence du sondage, s'il n'existe pas on met une page d'erreur From 13f5608a3e90a3d8b9dbc861d336fc693c526476 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 01:57:27 +0200 Subject: [PATCH 006/129] Add .gitignore file to exclude config file --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3bbc6ec --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +variables.php From 4f380d8f8db0c65e1408f3e4d293e36d8b42161c Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 03:56:54 +0200 Subject: [PATCH 007/129] clean code (identation, if with {) --- CHANGELOG | 1 + admin/index.php | 98 +- admin/logs_studs.txt | 1 + adminstuds.php | 1730 ++-- adodb/adodb-active-record.inc.php | 992 +++ adodb/adodb-active-recordx.inc.php | 1421 ++++ adodb/adodb-csvlib.inc.php | 318 + adodb/adodb-datadict.inc.php | 1032 +++ adodb/adodb-error.inc.php | 258 + adodb/adodb-errorhandler.inc.php | 79 + adodb/adodb-errorpear.inc.php | 88 + adodb/adodb-exceptions.inc.php | 82 + adodb/adodb-iterator.inc.php | 30 + adodb/adodb-lib.inc.php | 1197 +++ adodb/adodb-memcache.lib.inc.php | 190 + adodb/adodb-pager.inc.php | 290 + adodb/adodb-pear.inc.php | 374 + adodb/adodb-perf.inc.php | 1099 +++ adodb/adodb-php4.inc.php | 16 + adodb/adodb-time.inc.php | 1429 ++++ adodb/adodb-xmlschema.inc.php | 2225 +++++ adodb/adodb-xmlschema03.inc.php | 2406 ++++++ adodb/adodb.inc.php | 4416 ++++++++++ adodb/contrib/toxmlrpc.inc.php | 183 + adodb/cute_icons_for_site/adodb.gif | Bin 0 -> 1091 bytes adodb/cute_icons_for_site/adodb2.gif | Bin 0 -> 1458 bytes adodb/datadict/datadict-access.inc.php | 96 + adodb/datadict/datadict-db2.inc.php | 144 + adodb/datadict/datadict-firebird.inc.php | 152 + adodb/datadict/datadict-generic.inc.php | 126 + adodb/datadict/datadict-ibase.inc.php | 68 + adodb/datadict/datadict-informix.inc.php | 81 + adodb/datadict/datadict-mssql.inc.php | 284 + adodb/datadict/datadict-mssqlnative.inc.php | 282 + adodb/datadict/datadict-mysql.inc.php | 182 + adodb/datadict/datadict-oci8.inc.php | 297 + adodb/datadict/datadict-postgres.inc.php | 448 + adodb/datadict/datadict-sapdb.inc.php | 122 + adodb/datadict/datadict-sqlite.inc.php | 89 + adodb/datadict/datadict-sybase.inc.php | 229 + adodb/docs/docs-active-record.htm | 1090 +++ adodb/docs/docs-adodb.htm | 7796 ++++++++++++++++++ adodb/docs/docs-datadict.htm | 330 + adodb/docs/docs-oracle.htm | 542 ++ adodb/docs/docs-perf.htm | 965 +++ adodb/docs/docs-session.htm | 342 + adodb/docs/docs-session.old.htm | 313 + adodb/docs/old-changelog.htm | 822 ++ adodb/docs/readme.htm | 68 + adodb/docs/tips_portable_sql.htm | 367 + adodb/docs/tute.htm | 290 + adodb/drivers/adodb-access.inc.php | 87 + adodb/drivers/adodb-ado.inc.php | 660 ++ adodb/drivers/adodb-ado5.inc.php | 708 ++ adodb/drivers/adodb-ado_access.inc.php | 54 + adodb/drivers/adodb-ado_mssql.inc.php | 154 + adodb/drivers/adodb-ads.inc.php | 796 ++ adodb/drivers/adodb-borland_ibase.inc.php | 92 + adodb/drivers/adodb-csv.inc.php | 207 + adodb/drivers/adodb-db2.inc.php | 848 ++ adodb/drivers/adodb-db2oci.inc.php | 230 + adodb/drivers/adodb-db2ora.inc.php | 80 + adodb/drivers/adodb-fbsql.inc.php | 266 + adodb/drivers/adodb-firebird.inc.php | 77 + adodb/drivers/adodb-ibase.inc.php | 887 ++ adodb/drivers/adodb-informix.inc.php | 40 + adodb/drivers/adodb-informix72.inc.php | 475 ++ adodb/drivers/adodb-ldap.inc.php | 423 + adodb/drivers/adodb-mssql.inc.php | 1116 +++ adodb/drivers/adodb-mssql_n.inc.php | 171 + adodb/drivers/adodb-mssqlnative.inc.php | 923 +++ adodb/drivers/adodb-mssqlpo.inc.php | 62 + adodb/drivers/adodb-mysql.inc.php | 795 ++ adodb/drivers/adodb-mysqli.inc.php | 1209 +++ adodb/drivers/adodb-mysqlpo.inc.php | 138 + adodb/drivers/adodb-mysqlt.inc.php | 155 + adodb/drivers/adodb-netezza.inc.php | 170 + adodb/drivers/adodb-oci8.inc.php | 1628 ++++ adodb/drivers/adodb-oci805.inc.php | 59 + adodb/drivers/adodb-oci8po.inc.php | 218 + adodb/drivers/adodb-odbc.inc.php | 744 ++ adodb/drivers/adodb-odbc_db2.inc.php | 368 + adodb/drivers/adodb-odbc_mssql.inc.php | 307 + adodb/drivers/adodb-odbc_oracle.inc.php | 115 + adodb/drivers/adodb-odbtp.inc.php | 839 ++ adodb/drivers/adodb-odbtp_unicode.inc.php | 39 + adodb/drivers/adodb-oracle.inc.php | 342 + adodb/drivers/adodb-pdo.inc.php | 626 ++ adodb/drivers/adodb-pdo_mssql.inc.php | 61 + adodb/drivers/adodb-pdo_mysql.inc.php | 182 + adodb/drivers/adodb-pdo_oci.inc.php | 93 + adodb/drivers/adodb-pdo_pgsql.inc.php | 230 + adodb/drivers/adodb-pdo_sqlite.inc.php | 203 + adodb/drivers/adodb-postgres.inc.php | 14 + adodb/drivers/adodb-postgres64.inc.php | 1071 +++ adodb/drivers/adodb-postgres7.inc.php | 313 + adodb/drivers/adodb-postgres8.inc.php | 12 + adodb/drivers/adodb-proxy.inc.php | 33 + adodb/drivers/adodb-sapdb.inc.php | 184 + adodb/drivers/adodb-sqlanywhere.inc.php | 169 + adodb/drivers/adodb-sqlite.inc.php | 398 + adodb/drivers/adodb-sqlitepo.inc.php | 62 + adodb/drivers/adodb-sybase.inc.php | 428 + adodb/drivers/adodb-sybase_ase.inc.php | 119 + adodb/drivers/adodb-vfp.inc.php | 107 + adodb/lang/adodb-ar.inc.php | 33 + adodb/lang/adodb-bg.inc.php | 37 + adodb/lang/adodb-bgutf8.inc.php | 37 + adodb/lang/adodb-ca.inc.php | 34 + adodb/lang/adodb-cn.inc.php | 35 + adodb/lang/adodb-cz.inc.php | 40 + adodb/lang/adodb-da.inc.php | 33 + adodb/lang/adodb-de.inc.php | 33 + adodb/lang/adodb-en.inc.php | 33 + adodb/lang/adodb-es.inc.php | 33 + adodb/lang/adodb-esperanto.inc.php | 35 + adodb/lang/adodb-fa.inc.php | 35 + adodb/lang/adodb-fr.inc.php | 33 + adodb/lang/adodb-hu.inc.php | 34 + adodb/lang/adodb-it.inc.php | 34 + adodb/lang/adodb-nl.inc.php | 33 + adodb/lang/adodb-pl.inc.php | 35 + adodb/lang/adodb-pt-br.inc.php | 35 + adodb/lang/adodb-ro.inc.php | 35 + adodb/lang/adodb-ru1251.inc.php | 35 + adodb/lang/adodb-sv.inc.php | 33 + adodb/lang/adodb-uk1251.inc.php | 35 + adodb/lang/adodb_th.inc.php | 33 + adodb/license.txt | 182 + adodb/pear/Auth/Container/ADOdb.php | 405 + adodb/pear/readme.Auth.txt | 20 + adodb/perf/perf-db2.inc.php | 102 + adodb/perf/perf-informix.inc.php | 70 + adodb/perf/perf-mssql.inc.php | 164 + adodb/perf/perf-mssqlnative.inc.php | 164 + adodb/perf/perf-mysql.inc.php | 315 + adodb/perf/perf-oci8.inc.php | 618 ++ adodb/perf/perf-postgres.inc.php | 153 + adodb/pivottable.inc.php | 187 + adodb/readme.txt | 62 + adodb/rsfilter.inc.php | 61 + adodb/server.php | 100 + adodb/session/adodb-compress-bzip2.php | 118 + adodb/session/adodb-compress-gzip.php | 93 + adodb/session/adodb-cryptsession.php | 27 + adodb/session/adodb-cryptsession2.php | 27 + adodb/session/adodb-encrypt-mcrypt.php | 109 + adodb/session/adodb-encrypt-md5.php | 39 + adodb/session/adodb-encrypt-secret.php | 48 + adodb/session/adodb-encrypt-sha1.php | 32 + adodb/session/adodb-sess.txt | 131 + adodb/session/adodb-session-clob.php | 24 + adodb/session/adodb-session-clob2.php | 24 + adodb/session/adodb-session.php | 934 +++ adodb/session/adodb-session2.php | 946 +++ adodb/session/adodb-sessions.mysql.sql | 16 + adodb/session/adodb-sessions.oracle.clob.sql | 15 + adodb/session/adodb-sessions.oracle.sql | 16 + adodb/session/crypt.inc.php | 161 + adodb/session/old/adodb-cryptsession.php | 324 + adodb/session/old/adodb-session-clob.php | 448 + adodb/session/old/adodb-session.php | 439 + adodb/session/old/crypt.inc.php | 64 + adodb/session/session_schema.xml | 26 + adodb/session/session_schema2.xml | 38 + adodb/tests/benchmark.php | 84 + adodb/tests/client.php | 198 + adodb/tests/pdo.php | 94 + adodb/tests/test-active-record.php | 141 + adodb/tests/test-active-recs2.php | 77 + adodb/tests/test-active-relations.php | 87 + adodb/tests/test-active-relationsx.php | 419 + adodb/tests/test-datadict.php | 250 + adodb/tests/test-perf.php | 50 + adodb/tests/test-pgblob.php | 88 + adodb/tests/test-php5.php | 115 + adodb/tests/test-xmlschema.php | 54 + adodb/tests/test.php | 1748 ++++ adodb/tests/test2.php | 26 + adodb/tests/test3.php | 44 + adodb/tests/test4.php | 143 + adodb/tests/test5.php | 47 + adodb/tests/test_rs_array.php | 47 + adodb/tests/testcache.php | 29 + adodb/tests/testdatabases.inc.php | 454 + adodb/tests/testgenid.php | 36 + adodb/tests/testmssql.php | 76 + adodb/tests/testoci8.php | 83 + adodb/tests/testoci8cursor.php | 111 + adodb/tests/testpaging.php | 86 + adodb/tests/testpear.php | 34 + adodb/tests/testsessions.php | 98 + adodb/tests/time.php | 18 + adodb/tests/tmssql.php | 80 + adodb/tests/xmlschema-mssql.xml | 34 + adodb/tests/xmlschema.xml | 33 + adodb/toexport.inc.php | 134 + adodb/tohtml.inc.php | 201 + adodb/xmlschema.dtd | 39 + adodb/xmlschema03.dtd | 43 + adodb/xsl/convert-0.1-0.2.xsl | 205 + adodb/xsl/convert-0.1-0.3.xsl | 221 + adodb/xsl/convert-0.2-0.1.xsl | 207 + adodb/xsl/convert-0.2-0.3.xsl | 281 + adodb/xsl/remove-0.2.xsl | 54 + adodb/xsl/remove-0.3.xsl | 54 + apropos.php | 120 +- bandeaux.php | 103 +- block_enter.js | 32 +- choix_autre.php | 339 +- choix_date.php | 1052 ++- contacts.php | 196 +- creation_sondage.php | 106 +- errors/error-forbidden.php | 4 +- exportcsv.php | 80 +- exportics.php | 36 +- exportpdf.php | 4 +- fonctions.php | 157 +- i18n.php | 18 +- index.php | 23 +- infos_sondage.php | 193 +- maintenance.php | 4 +- scripts/migration_date.php | 78 +- scripts/nettoyage_sondage.php | 27 +- scripts/phpVar2getText.php | 70 +- scripts/recherche_adresse.pl | 13 +- scripts/recherche_adresse_admin.php | 16 +- sources/sources.php | 4 +- studs.php | 801 +- 229 files changed, 69871 insertions(+), 2690 deletions(-) create mode 100644 adodb/adodb-active-record.inc.php create mode 100644 adodb/adodb-active-recordx.inc.php create mode 100644 adodb/adodb-csvlib.inc.php create mode 100644 adodb/adodb-datadict.inc.php create mode 100644 adodb/adodb-error.inc.php create mode 100644 adodb/adodb-errorhandler.inc.php create mode 100644 adodb/adodb-errorpear.inc.php create mode 100644 adodb/adodb-exceptions.inc.php create mode 100644 adodb/adodb-iterator.inc.php create mode 100644 adodb/adodb-lib.inc.php create mode 100644 adodb/adodb-memcache.lib.inc.php create mode 100644 adodb/adodb-pager.inc.php create mode 100644 adodb/adodb-pear.inc.php create mode 100644 adodb/adodb-perf.inc.php create mode 100644 adodb/adodb-php4.inc.php create mode 100644 adodb/adodb-time.inc.php create mode 100644 adodb/adodb-xmlschema.inc.php create mode 100644 adodb/adodb-xmlschema03.inc.php create mode 100644 adodb/adodb.inc.php create mode 100644 adodb/contrib/toxmlrpc.inc.php create mode 100644 adodb/cute_icons_for_site/adodb.gif create mode 100644 adodb/cute_icons_for_site/adodb2.gif create mode 100644 adodb/datadict/datadict-access.inc.php create mode 100644 adodb/datadict/datadict-db2.inc.php create mode 100644 adodb/datadict/datadict-firebird.inc.php create mode 100644 adodb/datadict/datadict-generic.inc.php create mode 100644 adodb/datadict/datadict-ibase.inc.php create mode 100644 adodb/datadict/datadict-informix.inc.php create mode 100644 adodb/datadict/datadict-mssql.inc.php create mode 100644 adodb/datadict/datadict-mssqlnative.inc.php create mode 100644 adodb/datadict/datadict-mysql.inc.php create mode 100644 adodb/datadict/datadict-oci8.inc.php create mode 100644 adodb/datadict/datadict-postgres.inc.php create mode 100644 adodb/datadict/datadict-sapdb.inc.php create mode 100644 adodb/datadict/datadict-sqlite.inc.php create mode 100644 adodb/datadict/datadict-sybase.inc.php create mode 100644 adodb/docs/docs-active-record.htm create mode 100644 adodb/docs/docs-adodb.htm create mode 100644 adodb/docs/docs-datadict.htm create mode 100644 adodb/docs/docs-oracle.htm create mode 100644 adodb/docs/docs-perf.htm create mode 100644 adodb/docs/docs-session.htm create mode 100644 adodb/docs/docs-session.old.htm create mode 100644 adodb/docs/old-changelog.htm create mode 100644 adodb/docs/readme.htm create mode 100644 adodb/docs/tips_portable_sql.htm create mode 100644 adodb/docs/tute.htm create mode 100644 adodb/drivers/adodb-access.inc.php create mode 100644 adodb/drivers/adodb-ado.inc.php create mode 100644 adodb/drivers/adodb-ado5.inc.php create mode 100644 adodb/drivers/adodb-ado_access.inc.php create mode 100644 adodb/drivers/adodb-ado_mssql.inc.php create mode 100644 adodb/drivers/adodb-ads.inc.php create mode 100644 adodb/drivers/adodb-borland_ibase.inc.php create mode 100644 adodb/drivers/adodb-csv.inc.php create mode 100644 adodb/drivers/adodb-db2.inc.php create mode 100644 adodb/drivers/adodb-db2oci.inc.php create mode 100644 adodb/drivers/adodb-db2ora.inc.php create mode 100644 adodb/drivers/adodb-fbsql.inc.php create mode 100644 adodb/drivers/adodb-firebird.inc.php create mode 100644 adodb/drivers/adodb-ibase.inc.php create mode 100644 adodb/drivers/adodb-informix.inc.php create mode 100644 adodb/drivers/adodb-informix72.inc.php create mode 100644 adodb/drivers/adodb-ldap.inc.php create mode 100644 adodb/drivers/adodb-mssql.inc.php create mode 100644 adodb/drivers/adodb-mssql_n.inc.php create mode 100644 adodb/drivers/adodb-mssqlnative.inc.php create mode 100644 adodb/drivers/adodb-mssqlpo.inc.php create mode 100644 adodb/drivers/adodb-mysql.inc.php create mode 100644 adodb/drivers/adodb-mysqli.inc.php create mode 100644 adodb/drivers/adodb-mysqlpo.inc.php create mode 100644 adodb/drivers/adodb-mysqlt.inc.php create mode 100644 adodb/drivers/adodb-netezza.inc.php create mode 100644 adodb/drivers/adodb-oci8.inc.php create mode 100644 adodb/drivers/adodb-oci805.inc.php create mode 100644 adodb/drivers/adodb-oci8po.inc.php create mode 100644 adodb/drivers/adodb-odbc.inc.php create mode 100644 adodb/drivers/adodb-odbc_db2.inc.php create mode 100644 adodb/drivers/adodb-odbc_mssql.inc.php create mode 100644 adodb/drivers/adodb-odbc_oracle.inc.php create mode 100644 adodb/drivers/adodb-odbtp.inc.php create mode 100644 adodb/drivers/adodb-odbtp_unicode.inc.php create mode 100644 adodb/drivers/adodb-oracle.inc.php create mode 100644 adodb/drivers/adodb-pdo.inc.php create mode 100644 adodb/drivers/adodb-pdo_mssql.inc.php create mode 100644 adodb/drivers/adodb-pdo_mysql.inc.php create mode 100644 adodb/drivers/adodb-pdo_oci.inc.php create mode 100644 adodb/drivers/adodb-pdo_pgsql.inc.php create mode 100644 adodb/drivers/adodb-pdo_sqlite.inc.php create mode 100644 adodb/drivers/adodb-postgres.inc.php create mode 100644 adodb/drivers/adodb-postgres64.inc.php create mode 100644 adodb/drivers/adodb-postgres7.inc.php create mode 100644 adodb/drivers/adodb-postgres8.inc.php create mode 100644 adodb/drivers/adodb-proxy.inc.php create mode 100644 adodb/drivers/adodb-sapdb.inc.php create mode 100644 adodb/drivers/adodb-sqlanywhere.inc.php create mode 100644 adodb/drivers/adodb-sqlite.inc.php create mode 100644 adodb/drivers/adodb-sqlitepo.inc.php create mode 100644 adodb/drivers/adodb-sybase.inc.php create mode 100644 adodb/drivers/adodb-sybase_ase.inc.php create mode 100644 adodb/drivers/adodb-vfp.inc.php create mode 100644 adodb/lang/adodb-ar.inc.php create mode 100644 adodb/lang/adodb-bg.inc.php create mode 100644 adodb/lang/adodb-bgutf8.inc.php create mode 100644 adodb/lang/adodb-ca.inc.php create mode 100644 adodb/lang/adodb-cn.inc.php create mode 100644 adodb/lang/adodb-cz.inc.php create mode 100644 adodb/lang/adodb-da.inc.php create mode 100644 adodb/lang/adodb-de.inc.php create mode 100644 adodb/lang/adodb-en.inc.php create mode 100644 adodb/lang/adodb-es.inc.php create mode 100644 adodb/lang/adodb-esperanto.inc.php create mode 100644 adodb/lang/adodb-fa.inc.php create mode 100644 adodb/lang/adodb-fr.inc.php create mode 100644 adodb/lang/adodb-hu.inc.php create mode 100644 adodb/lang/adodb-it.inc.php create mode 100644 adodb/lang/adodb-nl.inc.php create mode 100644 adodb/lang/adodb-pl.inc.php create mode 100644 adodb/lang/adodb-pt-br.inc.php create mode 100644 adodb/lang/adodb-ro.inc.php create mode 100644 adodb/lang/adodb-ru1251.inc.php create mode 100644 adodb/lang/adodb-sv.inc.php create mode 100644 adodb/lang/adodb-uk1251.inc.php create mode 100644 adodb/lang/adodb_th.inc.php create mode 100644 adodb/license.txt create mode 100644 adodb/pear/Auth/Container/ADOdb.php create mode 100644 adodb/pear/readme.Auth.txt create mode 100644 adodb/perf/perf-db2.inc.php create mode 100644 adodb/perf/perf-informix.inc.php create mode 100644 adodb/perf/perf-mssql.inc.php create mode 100644 adodb/perf/perf-mssqlnative.inc.php create mode 100644 adodb/perf/perf-mysql.inc.php create mode 100644 adodb/perf/perf-oci8.inc.php create mode 100644 adodb/perf/perf-postgres.inc.php create mode 100644 adodb/pivottable.inc.php create mode 100644 adodb/readme.txt create mode 100644 adodb/rsfilter.inc.php create mode 100644 adodb/server.php create mode 100644 adodb/session/adodb-compress-bzip2.php create mode 100644 adodb/session/adodb-compress-gzip.php create mode 100644 adodb/session/adodb-cryptsession.php create mode 100644 adodb/session/adodb-cryptsession2.php create mode 100644 adodb/session/adodb-encrypt-mcrypt.php create mode 100644 adodb/session/adodb-encrypt-md5.php create mode 100644 adodb/session/adodb-encrypt-secret.php create mode 100644 adodb/session/adodb-encrypt-sha1.php create mode 100644 adodb/session/adodb-sess.txt create mode 100644 adodb/session/adodb-session-clob.php create mode 100644 adodb/session/adodb-session-clob2.php create mode 100644 adodb/session/adodb-session.php create mode 100644 adodb/session/adodb-session2.php create mode 100644 adodb/session/adodb-sessions.mysql.sql create mode 100644 adodb/session/adodb-sessions.oracle.clob.sql create mode 100644 adodb/session/adodb-sessions.oracle.sql create mode 100644 adodb/session/crypt.inc.php create mode 100644 adodb/session/old/adodb-cryptsession.php create mode 100644 adodb/session/old/adodb-session-clob.php create mode 100644 adodb/session/old/adodb-session.php create mode 100644 adodb/session/old/crypt.inc.php create mode 100644 adodb/session/session_schema.xml create mode 100644 adodb/session/session_schema2.xml create mode 100644 adodb/tests/benchmark.php create mode 100644 adodb/tests/client.php create mode 100644 adodb/tests/pdo.php create mode 100644 adodb/tests/test-active-record.php create mode 100644 adodb/tests/test-active-recs2.php create mode 100644 adodb/tests/test-active-relations.php create mode 100644 adodb/tests/test-active-relationsx.php create mode 100644 adodb/tests/test-datadict.php create mode 100644 adodb/tests/test-perf.php create mode 100644 adodb/tests/test-pgblob.php create mode 100644 adodb/tests/test-php5.php create mode 100644 adodb/tests/test-xmlschema.php create mode 100644 adodb/tests/test.php create mode 100644 adodb/tests/test2.php create mode 100644 adodb/tests/test3.php create mode 100644 adodb/tests/test4.php create mode 100644 adodb/tests/test5.php create mode 100644 adodb/tests/test_rs_array.php create mode 100644 adodb/tests/testcache.php create mode 100644 adodb/tests/testdatabases.inc.php create mode 100644 adodb/tests/testgenid.php create mode 100644 adodb/tests/testmssql.php create mode 100644 adodb/tests/testoci8.php create mode 100644 adodb/tests/testoci8cursor.php create mode 100644 adodb/tests/testpaging.php create mode 100644 adodb/tests/testpear.php create mode 100644 adodb/tests/testsessions.php create mode 100644 adodb/tests/time.php create mode 100644 adodb/tests/tmssql.php create mode 100644 adodb/tests/xmlschema-mssql.xml create mode 100644 adodb/tests/xmlschema.xml create mode 100644 adodb/toexport.inc.php create mode 100644 adodb/tohtml.inc.php create mode 100644 adodb/xmlschema.dtd create mode 100644 adodb/xmlschema03.dtd create mode 100644 adodb/xsl/convert-0.1-0.2.xsl create mode 100644 adodb/xsl/convert-0.1-0.3.xsl create mode 100644 adodb/xsl/convert-0.2-0.1.xsl create mode 100644 adodb/xsl/convert-0.2-0.3.xsl create mode 100644 adodb/xsl/remove-0.2.xsl create mode 100644 adodb/xsl/remove-0.3.xsl diff --git a/CHANGELOG b/CHANGELOG index 4ec11ed..d54d216 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Les dernières améliorations de STUdS Changelog version 0.6.7 (mai 2011) - fork du projet STUdS (https://sourcesup.cru.fr/projects/studs/) de la version trunk du 15 mai 2011) + - nettoyage du code (indentation, cohérence de la convention de codage) Changelog version 0.6.6 (XXX 2011) : - internationalisation avec gettext - abstraction de la base de données avec ADOdb diff --git a/admin/index.php b/admin/index.php index 9ce186e..e98749f 100644 --- a/admin/index.php +++ b/admin/index.php @@ -71,73 +71,67 @@ echo '
'."\n"; // Test et affichage du bouton de confirmation en cas de suppression de sondage $i=0; while($dsondage = $sondage->FetchNextObject(false)) { - if ($_POST["supprimersondage$i"]){ - echo ''."\n"; - echo ''."\n"; - echo '
'. _("Confirm removal of the poll ") .'"'.$dsondage->id_sondage.'" : '."\n"; - echo '
'."\n"; - echo '
'."\n"; - } - // Traitement de la confirmation de suppression - - if ($_POST["confirmesuppression$i"]){ - - $date=date('H:i:s d/m/Y'); - - // requetes SQL qui font le ménage dans la base - $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. - 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . - 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . - "WHERE id_sondage = '$dsondage->id_sondage' "); - - // ecriture des traces dans le fichier de logs - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 'logs_studs.txt'); - - } - $i++; + if ($_POST["supprimersondage$i"]) { + echo ''."\n"; + echo ''."\n"; + echo '
'. _("Confirm removal of the poll ") .'"'.$dsondage->id_sondage.'" : '."\n"; + echo '
'."\n"; + echo '
'."\n"; + } + + // Traitement de la confirmation de suppression + if ($_POST["confirmesuppression$i"]) { + $date=date('H:i:s d/m/Y'); + + // requetes SQL qui font le ménage dans la base + $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . + 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . + "WHERE id_sondage = '$dsondage->id_sondage' "); + + // ecriture des traces dans le fichier de logs + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 'logs_studs.txt'); + } + + $i++; } - $sondage=$connect->Execute("select * from sondage"); $nbsondages=$sondage->RecordCount(); echo $nbsondages.' '. _("polls in the database at this time") .'

'."\n"; // tableau qui affiche tous les sondages de la base -echo ''."\n"; - +echo '
'."\n"; echo ''."\n"; - $i = 0; while($dsondage = $sondage->FetchNextObject(false)) { - /* possible en 1 bonne requête dans $sondage */ - $sujets=$connect->Execute( "select * from sujet_studs where id_sondage='$dsondage->id_sondage'"); - $dsujets=$sujets->FetchObject(false); + /* possible en 1 bonne requête dans $sondage */ + $sujets=$connect->Execute( "select * from sujet_studs where id_sondage='$dsondage->id_sondage'"); + $dsujets=$sujets->FetchObject(false); - $user_studs=$connect->Execute( "select * from user_studs where id_sondage='$dsondage->id_sondage'"); - $nbuser=$user_studs->RecordCount(); + $user_studs=$connect->Execute( "select * from user_studs where id_sondage='$dsondage->id_sondage'"); + $nbuser=$user_studs->RecordCount(); - echo ''; + echo ''; - if (strtotime($dsondage->date_fin) > time()){ - echo ''; - } - else{ - echo ''; - } - - echo''."\n"; + if (strtotime($dsondage->date_fin) > time()) { + echo ''; + } else { + echo ''; + } + + echo''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - - echo ''."\n"; - $i++; + echo ''."\n"; + $i++; } -echo '
'. _("Poll ID") .''. _("Format") .''. _("Title") .''. _("Author") .''. _("Expiration's date") .''. _("Users") .''. _("Actions") .'
'.$dsondage->id_sondage.''.$dsondage->format.''.$dsondage->titre.''.$dsondage->nom_admin.'
'.$dsondage->id_sondage.''.$dsondage->format.''.$dsondage->titre.''.$dsondage->nom_admin.''.date("d/m/y",strtotime($dsondage->date_fin)).''.date("d/m/y",strtotime($dsondage->date_fin)).''.$nbuser.''.date("d/m/y",strtotime($dsondage->date_fin)).''.date("d/m/y",strtotime($dsondage->date_fin)).''.$nbuser.''. _("See the poll") .''. _("Change the poll") .''. _("See the poll") .''. _("Change the poll") .'
'."\n"; +echo ''."\n"; echo''."\n"; // fin du formulaire et de la page web echo '
'."\n"; @@ -145,7 +139,5 @@ echo ''."\n"; echo ''."\n"; // si on annule la suppression, rafraichissement de la page -if ($_POST["annulesuppression"]){ -} - -?> +if ($_POST["annulesuppression"]) { +} \ No newline at end of file diff --git a/admin/logs_studs.txt b/admin/logs_studs.txt index d8abac4..b001278 100644 --- a/admin/logs_studs.txt +++ b/admin/logs_studs.txt @@ -1,2 +1,3 @@ 16:34:47 06/06/2010: SUPPRESSION: u5rbpzr2aja7eajb D+ Raph raph@aze.com 3 17:02:51 06/06/2010: CREATION: pii9tzo2dku973qa A+ azeazeaz zezerer@azedqs.com bloup,plop,foo,bar,pz,wx +03:32:01 15/05/2011: CREATION: e2s2e57elm14tgrb D+ simon contact@leblanc-simon.eu 1305410400,1305496800,1305583200 diff --git a/adminstuds.php b/adminstuds.php index 481968e..05824a0 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -41,10 +41,11 @@ session_start(); //setlocale(LC_TIME, "fr_FR"); include_once('fonctions.php'); -if (file_exists('bandeaux_local.php')) - include_once('bandeaux_local.php'); -else - include_once('bandeaux.php'); +if (file_exists('bandeaux_local.php')) { + include_once('bandeaux_local.php'); +} else { + include_once('bandeaux.php'); +} // Initialisation des variables $numsondageadmin = false; @@ -52,25 +53,25 @@ $sondage = false; // recuperation du numero de sondage admin (24 car.) dans l'URL if (isset($_GET['sondage']) && !empty($_GET['sondage']) && is_string($_GET['sondage']) && strlen($_GET['sondage']) === 24) { - $numsondageadmin=$_GET["sondage"]; - //on découpe le résultat pour avoir le numéro de sondage (16 car.) - $numsondage=substr($numsondageadmin, 0, 16); + $numsondageadmin=$_GET["sondage"]; + //on découpe le résultat pour avoir le numéro de sondage (16 car.) + $numsondage=substr($numsondageadmin, 0, 16); } if (preg_match(";[\w\d]{24};i", $numsondageadmin)) { - $sql = 'SELECT * FROM sondage WHERE id_sondage_admin = '.$connect->Param('numsondageadmin'); - $sql = $connect->Prepare($sql); - $sondage = $connect->Execute($sql, array($numsondageadmin)); - - if ($sondage !== false) { - $sql = 'SELECT * FROM sujet_studs WHERE id_sondage = '.$connect->Param('numsondage'); - $sql = $connect->Prepare($sql); - $sujets = $connect->Execute($sql, array($numsondage)); - - $sql = 'SELECT * FROM user_studs WHERE id_sondage = '.$connect->Param('numsondage').' order by id_users'; - $sql = $connect->Prepare($sql); - $user_studs = $connect->Execute($sql, array($numsondage)); - } + $sql = 'SELECT * FROM sondage WHERE id_sondage_admin = '.$connect->Param('numsondageadmin'); + $sql = $connect->Prepare($sql); + $sondage = $connect->Execute($sql, array($numsondageadmin)); + + if ($sondage !== false) { + $sql = 'SELECT * FROM sujet_studs WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + $sujets = $connect->Execute($sql, array($numsondage)); + + $sql = 'SELECT * FROM user_studs WHERE id_sondage = '.$connect->Param('numsondage').' order by id_users'; + $sql = $connect->Prepare($sql); + $user_studs = $connect->Execute($sql, array($numsondage)); + } } //verification de l'existence du sondage, s'il n'existe pas on met une page d'erreur @@ -78,20 +79,20 @@ if (!$sondage || $sondage->RecordCount() != 1){ print_header(false); echo ''."\n"; - logo(); - bandeau_tete(); - bandeau_titre(_("Error!")); - echo '
'."\n"; - print "

" . _("This poll doesn't exist !") . "



"."\n"; - print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; - echo '



'."\n"; - echo '
'."\n"; -# sur_bandeau_pied(); - bandeau_pied(); - - echo''."\n"; - echo ''."\n"; - die(); + logo(); + bandeau_tete(); + bandeau_titre(_("Error!")); + echo '
'."\n"; + print "

" . _("This poll doesn't exist !") . "



"."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; + echo '



'."\n"; + echo '
'."\n"; +# sur_bandeau_pied(); + bandeau_pied(); + + echo''."\n"; + echo ''."\n"; + die(); } $dsujet=$sujets->FetchObject(false); @@ -109,16 +110,16 @@ $header = sprintf($headers_str, NOMAPPLICATION, ADRESSEMAILADMIN ); if (isset($_POST["boutonnouveautitre"])) { - if(! isset($_POST["nouveautitre"]) || empty($_POST["nouveautitre"])) + if(! isset($_POST["nouveautitre"]) || empty($_POST["nouveautitre"])) { $err |= TITLE_EMPTY; - else { + } else { //envoi du mail pour prevenir l'admin de sondage mail ($adresseadmin, - _("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION, - _("You have changed the title of your poll. \nYou can modify this poll with this link") . - " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin\n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + _("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION, + _("You have changed the title of your poll. \nYou can modify this poll with this link") . + " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin\n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); //modification de la base SQL avec le nouveau titre $connect->Execute("UPDATE sondage SET titre = '" . $connect->qstr(strip_tags($_POST['nouveautitre'])) . "' WHERE id_sondage = '" . $numsondage . "'"); @@ -127,16 +128,16 @@ if (isset($_POST["boutonnouveautitre"])) { // si le bouton est activé, quelque soit la valeur du champ textarea if (isset($_POST["boutonnouveauxcommentaires"])) { - if(! isset($_POST["nouveautitre"]) || empty($_POST["nouveautitre"])) + if(! isset($_POST["nouveautitre"]) || empty($_POST["nouveautitre"])) { $err |= COMMENT_EMPTY; - else { + } else { //envoi du mail pour prevenir l'admin de sondage mail ($adresseadmin, - _("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION, - _("You have changed the comments of your poll. \nYou can modify this poll with this link") . - " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin \n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + _("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION, + _("You have changed the comments of your poll. \nYou can modify this poll with this link") . + " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin \n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); //modification de la base SQL avec les nouveaux commentaires $connect->Execute("UPDATE sondage SET commentaires = '" . $connect->qstr(strip_tags($nouveauxcommentaires)) . "' WHERE id_sondage = '" . $numsondage . "'"); @@ -146,16 +147,17 @@ if (isset($_POST["boutonnouveauxcommentaires"])) { //si la valeur de la nouvelle adresse est valide et que le bouton est activé if (isset($_POST["boutonnouvelleadresse"])){ if(! isset($_POST["nouvelleadresse"]) || empty($_POST["nouvelleadresse"]) || - ! filter_var($_POST["nouvelleadresse"], FILTER_VALIDATE_EMAIL) || strpos($_POST["nouvelleadresse"], '@') === false) + ! filter_var($_POST["nouvelleadresse"], FILTER_VALIDATE_EMAIL) || strpos($_POST["nouvelleadresse"], '@') === false) { $err |= INVALID_EMAIL; - else { + } else { //envoi du mail pour prevenir l'admin de sondage mail ($_POST['nouvelleadresse'], - _("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION, - _("You have changed your email address in your poll. \nYou can modify this poll with this link") . - " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin\n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + _("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION, + _("You have changed your email address in your poll. \nYou can modify this poll with this link") . + " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin\n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); + //modification de la base SQL avec la nouvelle adresse $connect->Execute("UPDATE sondage SET mail_admin = '" . $_POST['nouvelleadresse'] . "' WHERE id_sondage = '" . $numsondage . "'"); } @@ -173,146 +175,146 @@ if ($_POST["ajoutsujet_x"]){ bandeau_tete(); bandeau_titre(_("Make your polls")); sous_bandeau(); - + //on recupere les données et les sujets du sondage echo '
'."\n"; - + echo '
'."\n"; - print "

" . _("Column's adding") . "



"."\n"; - - if ($dsondage->format=="A"||$dsondage->format=="A+"){ - echo _("Add a new column") .' :


'."\n"; - } - else{ -//ajout d'une date avec creneau horaire - echo _("You can add a new scheduling date to your poll.
If you just want to add a new hour to an existant date, put the same date and choose a new hour.") .'

'."\n"; - echo _("Add a date") .' :

'."\n"; - echo ''."\n"; + echo "

" . _("Column's adding") . "



"."\n"; + + if ($dsondage->format=="A"||$dsondage->format=="A+"){ + echo _("Add a new column") .' :


'."\n"; + } else { + //ajout d'une date avec creneau horaire + echo _("You can add a new scheduling date to your poll.
If you just want to add a new hour to an existant date, put the same date and choose a new hour.") .'

'."\n"; + echo _("Add a date") .' :

'."\n"; + echo ''."\n"; - echo ''."\n"; + echo ''."\n"; - - echo ''."\n"; - echo '

'. _("Add a start hour (optional)") .' :

'."\n"; - echo ''."\n"; - echo ''."\n"; - echo '

'. _("Add a end hour (optional)") .' :

'."\n"; - echo ''."\n"; - echo ''."\n"; + + echo ''."\n"; + echo '

'. _("Add a start hour (optional)") .' :

'."\n"; + echo ''."\n"; + echo ''."\n"; + echo '

'. _("Add a end hour (optional)") .' :

'."\n"; + echo ''."\n"; + echo ''."\n"; + echo '

'."\n"; + echo' '."\n"; + } - echo '

'."\n"; - echo' '."\n"; - - } + echo ''."\n"; + echo '



'."\n"; + echo '
'."\n"; - echo ''."\n"; - echo '



'."\n"; - echo ''."\n"; - - bandeau_pied(); - - echo''."\n"; - echo ''."\n"; - die(); + bandeau_pied(); + + echo''."\n"; + echo ''."\n"; + die(); } //action si bouton confirmation de suppression est activé -if ($_POST["confirmesuppression"]){ - $nbuser=$user_studs->RecordCount(); - $date=date('H:i:s d/m/Y:'); +if ($_POST["confirmesuppression"]) { + $nbuser=$user_studs->RecordCount(); + $date=date('H:i:s d/m/Y:'); - // on ecrit dans le fichier de logs la suppression du sondage - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 3, 'admin/logs_studs.txt'); + // on ecrit dans le fichier de logs la suppression du sondage + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 3, 'admin/logs_studs.txt'); - //envoi du mail a l'administrateur du sondage - mail ($adresseadmin, - _("[ADMINISTRATOR] Removing of your poll") . ' ' . NOMAPPLICATION, - _("You have removed your poll. \nYou can make new polls with this link") . - " :\n\n".get_server_name()."index.php \n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + //envoi du mail a l'administrateur du sondage + mail ($adresseadmin, + _("[ADMINISTRATOR] Removing of your poll") . ' ' . NOMAPPLICATION, + _("You have removed your poll. \nYou can make new polls with this link") . + " :\n\n".get_server_name()."index.php \n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); - //destruction des données dans la base SQL - $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. - 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . - 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . - "WHERE id_sondage = '$numsondage' "); + //destruction des données dans la base SQL + $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . + 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . + "WHERE id_sondage = '$numsondage' "); - //affichage de l'ecran de confirmation de suppression de sondage - print_header(); - echo ''."\n"; - logo(); - bandeau_tete(); - bandeau_titre(_("Make your polls")); + //affichage de l'ecran de confirmation de suppression de sondage + print_header(); + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Make your polls")); - echo '
'."\n"; - print "

" . _("Your poll has been removed!") . "



"; - print _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; - echo '


'."\n"; - echo '
'."\n"; - sur_bandeau_pied(); - bandeau_pied(); - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - die(); + echo '
'."\n"; + print "

" . _("Your poll has been removed!") . "



"; + print _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; + echo '


'."\n"; + echo '
'."\n"; + sur_bandeau_pied(); + bandeau_pied(); + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + die(); } // quand on ajoute un commentaire utilisateur if(isset($_POST['ajoutcomment'])) { - if(!isset($_POST["commentuser"]) || empty($_POST["commentuser"])) + if(!isset($_POST["commentuser"]) || empty($_POST["commentuser"])) { $err |= COMMENT_USER_EMPTY; - else + } else { $comment_user = $connect->qstr(strip_tags($_POST["commentuser"])); - if(empty($_POST["comment"])) + } + if(empty($_POST["comment"])) { $err |= COMMENT_EMPTY; + } if (isset($_POST["comment"]) && ! is_error(COMMENT_EMPTY) && ! is_error(NO_POLL) && ! is_error(COMMENT_USER_EMPTY)) { if( ! $connect->Execute('INSERT INTO comments ' . - '(id_sondage, comment, usercomment) VALUES ("'. - $numsondage . '","'. - $connect->qstr(strip_tags($_POST['comment'])). - '","' . - $comment_user .'")') ); + '(id_sondage, comment, usercomment) VALUES ("'. + $numsondage . '","'. + $connect->qstr(strip_tags($_POST['comment'])). + '","' . + $comment_user .'")') ); $err |= COMMENT_INSERT_FAILED; } } @@ -326,7 +328,7 @@ logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); sous_bandeau(); - + echo '
'."\n"; +print '

' ._('Back to the homepage of') . ' ' .NOMAPPLICATION."



"."\n"; +print _('Back to the homepage of') . ' ' . NOMAPPLICATION . ''."\n"; +echo '


'."\n"; +echo '
'."\n"; //affichage du titre du sondage @@ -353,712 +355,714 @@ $nblignes=$user_studs->RecordCount(); //si il n'y a pas suppression alors on peut afficher normalement le tableau - //action si le bouton participer est cliqué - if ($_POST["boutonp"]||$_POST["boutonp_x"]){ - //si on a un nom dans la case texte - if ($_POST["nom"]){ - - for ($i=0;$i<$nbcolonnes;$i++){ - //si la checkbox est cochée alors valeur est egale à 1 - if (isset($_POST["choix$i"])){ - $nouveauchoix.="1"; - } - //sinon 0 - else { - $nouveauchoix.="0"; - } - } - - while( $user=$user_studs->FetchNextObject(false)) { - if ($_POST["nom"]==$user->nom){ - $erreur_prenom="yes"; - } - } - - if (preg_match(';<|>|"|\';i', $_POST["nom"])){ - $erreur_injection="yes"; - } - - - // Ecriture des choix de l'utilisateur dans la base - if (!$erreur_prenom&&!$erreur_injection){ - $nom=str_replace("'","°",$_POST["nom"]); - $connect->Execute("INSERT INTO user_studs VALUES ('$nom', '$numsondage', '$nouveauchoix')"); - } - } - - } - - - //action quand on ajoute une colonne au format AUTRE - if ($_POST["ajoutercolonne_x"] && $_POST["nouvellecolonne"]!=""&&($dsondage->format=="A"||$dsondage->format=="A+")){ - - $nouveauxsujets=$dsujet->sujet; - - //on rajoute la valeur a la fin de tous les sujets deja entrés - $nouveauxsujets.=","; - $nouveauxsujets.=str_replace(","," ",$_POST["nouvellecolonne"]); - $nouveauxsujets=str_replace("'","°",$nouveauxsujets); - - //mise a jour avec les nouveaux sujets dans la base - $connect->Execute("UPDATE sujet_studs SET sujet = '$nouveauxsujets' WHERE id_sondage = '$numsondage' "); - - //envoi d'un mail pour prévenir l'administrateur du changement - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); - - } - - //action quand on ajoute une colonne au format DATE - if ($_POST["ajoutercolonne_x"] &&($dsondage->format=="D"||$dsondage->format=="D+")){ - - $nouveauxsujets=$dsujet->sujet; - - if ($_POST["nouveaujour"]!="vide"&&$_POST["nouveaumois"]!="vide"&&$_POST["nouvelleannee"]!="vide"){ - - $nouvelledate=mktime(0,0,0,$_POST["nouveaumois"],$_POST["nouveaujour"],$_POST["nouvelleannee"]); - - if ($_POST["nouvelleheuredebut"]!="vide"){ - - $nouvelledate.="@"; - $nouvelledate.=$_POST["nouvelleheuredebut"]; - $nouvelledate.="h"; - - if ($_POST["nouvelleminutedebut"]!="vide"){ - $nouvelledate.=$_POST["nouvelleminutedebut"]; - } - } - if ($_POST["nouvelleheurefin"]!="vide"){ - $nouvelledate.="-"; - $nouvelledate.=$_POST["nouvelleheurefin"]; - $nouvelledate.="h"; - - if ($_POST["nouvelleminutefin"]!="vide"){ - $nouvelledate.=$_POST["nouvelleminutefin"]; - } - } - if($_POST["nouvelleheuredebut"]=="vide"||($_POST["nouvelleheuredebut"]&&$_POST["nouvelleheurefin"]&&(($_POST["nouvelleheuredebut"]<$_POST["nouvelleheurefin"])||(($_POST["nouvelleheuredebut"]==$_POST["nouvelleheurefin"])&&($_POST["nouvelleminutedebut"]<$_POST["nouvelleminutefin"]))))){ - - } - else {$erreur_ajout_date="yes";} - - //on rajoute la valeur dans les valeurs - $datesbase=explode(",",$dsujet->sujet); - $taillebase=sizeof($datesbase); - - //recherche de l'endroit de l'insertion de la nouvelle date dans les dates deja entrées dans le tableau - - if ($nouvelledate<$datesbase[0]){ - $cleinsertion=0; - } - elseif ($nouvelledate>$datesbase[$taillebase-1]){ - $cleinsertion=count($datesbase); - } - else{ - for ($i=0;$i$datesbase[$i]&&$nouvelledate<$datesbase[$j]){ - $cleinsertion=$j; - } - } - } - - - array_splice($datesbase,$cleinsertion,0,$nouvelledate); - - $cle=array_search ($nouvelledate,$datesbase); - - for ($i=0;$iExecute("UPDATE sujet_studs SET sujet = '$dateinsertion' WHERE id_sondage = '$numsondage' "); - if ($nouvelledate > strtotime($dsondage->date_fin)){ - $date_fin=$nouvelledate+200000; - $connect->Execute("UPDATE sondage SET date_fin = '$date_fin' WHERE id_sondage = '$numsondage' "); - } - } - - //mise a jour des reponses actuelles correspondant au sujet ajouté - while ( $data=$user_studs->FetchNextObject(false)) { - $ensemblereponses=$data->reponses; - - //parcours de toutes les réponses actuelles - for ($j=0;$j<$nbcolonnes;$j++){ - $car=substr($ensemblereponses,$j,1); - - //si les reponses ne concerne pas la colonne ajoutée, on concatene - if ($j==$cle){ - $newcar.="0"; - } - $newcar.=$car; - } - //mise a jour des reponses utilisateurs dans la base - if (!$erreur_ajout_date){ - $connect->Execute("update user_studs set reponses='$newcar' where nom='$data->nom' and id_users=$data->id_users"); - } - $newcar=""; - } - - //envoi d'un mail pour prévenir l'administrateur du changement - $adresseadmin=$dsondage->mail_admin; - - mail ($adresseadmin, - _("[ADMINISTRATOR] New column for your poll"), - _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, - $headers); - - } - else {$erreur_ajout_date="yes";} - } - - //suppression de ligne dans la base - for ($i=0;$i<$nblignes;$i++){ - if ($_POST["effaceligne$i"]||$_POST['effaceligne'.$i.'_x']){ - $compteur=0; - while ($data=$user_studs->FetchNextObject(false)) { - - if ($compteur==$i){ - $connect->Execute("delete from user_studs where nom = '$data->nom' and id_users = '$data->id_users'"); - } - $compteur++; - } - } - } - - //suppression d'un commentaire utilisateur - - $comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); - $i = 0; - while ($dcomment = $comment_user->FetchNextObject(false)) { - if ($_POST['suppressioncomment'.$i.'_x']){ - $connect->Execute("delete from comments where id_comment = '$dcomment->id_comment'"); - } - $i++; - } - - //on teste pour voir si une ligne doit etre modifiée - for ($i=0;$i<$nblignes;$i++){ - if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])){ - $ligneamodifier=$i; - $testligneamodifier="true"; - } - //test pour voir si une ligne est a modifier - if (isset($_POST["validermodifier$i"])){ - $modifier=$i; - $testmodifier="true"; - } - } - - //si le test est valide alors on affiche des checkbox pour entrer de nouvelles valeurs - if ($testmodifier){ - - for ($i=0;$i<$nbcolonnes;$i++){ - //recuperation des nouveaux choix de l'utilisateur - if (isset($_POST["choix$i"])){ - $nouveauchoix.="1"; - } - else { - $nouveauchoix.="0"; - } - } - - $compteur=0; - while ( $data=$user_studs->FetchNextObject(false)) { - //mise a jour des données de l'utilisateur dans la base SQL - if ($compteur==$modifier){ - $connect->Execute("update user_studs set reponses='$nouveauchoix' where nom='$data->nom' and id_users='$data->id_users'"); - } - $compteur++; - } - } - - //suppression de colonnes dans la base - for ($i=0;$i<$nbcolonnes;$i++){ - if ((isset($_POST["effacecolonne$i"])||isset($_POST['effacecolonne'.$i.'_x']))&&$nbcolonnes>1){ - - $toutsujet=explode(",",$dsujet->sujet); - $j=0; - - //parcours de tous les sujets actuels - while ($toutsujet[$j]){ - //si le sujet n'est pas celui qui a été effacé alors on concatene - if ($i!=$j){ - $nouveauxsujets.=','; - $nouveauxsujets.=$toutsujet[$j]; - } - $j++; - } - //on enleve la virgule au début - $nouveauxsujets=substr("$nouveauxsujets",1); - - //nettoyage des reponses actuelles correspondant au sujet effacé - $compteur = 0; - while ($data=$user_studs->FetchNextObject(false)) { - - $ensemblereponses=$data->reponses; - - //parcours de toutes les réponses actuelles - for ($j=0;$j<$nbcolonnes;$j++){ - $car=substr($ensemblereponses,$j,1); - //si les reponses ne concerne pas la colonne effacée, on concatene - if ($i!=$j){ - $newcar.=$car; - } - } - - $compteur++; - - //mise a jour des reponses utilisateurs dans la base - $connect->Execute("update user_studs set reponses='$newcar' where nom='$data->nom' and id_users=$data->id_users"); - $newcar=""; - } - //mise a jour des sujets dans la base - $connect->Execute("update sujet_studs set sujet = '$nouveauxsujets' where id_sondage = '$numsondage' "); - - } - - } - - //recuperation des donnes de la base - $sondage=$connect->Execute("select * from sondage where id_sondage_admin = '$numsondageadmin'"); - $sujets=$connect->Execute("select * from sujet_studs where id_sondage='$numsondage'"); - $user_studs=$connect->Execute("select * from user_studs where id_sondage='$numsondage' order by id_users"); - //on recupere les données et les sujets du sondage - $dsujet=$sujets->FetchObject(false); - $dsondage=$sondage->FetchObject(false); - - $toutsujet=explode(",",$dsujet->sujet); - $toutsujet=str_replace("@","
",$toutsujet); - $toutsujet=str_replace("°","'",$toutsujet); - $nbcolonnes=substr_count($dsujet->sujet,',')+1; - - echo '
'."\n"; - echo '
'."\n"; - echo _('As poll administrator, you can change all the lines of this poll with infos.
You can, as well, remove a column or a line with Cancel.
You can also add a new column with Add column.
Finally, you can change the informations of this poll like the title, the comments or your email address.') ."\n"; - - echo '

'."\n"; - - //debut de l'affichage de résultats - echo ''."\n"; - - //reformatage des données des sujets du sondage - $toutsujet=explode(",",$dsujet->sujet); - - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - - //boucle pour l'affichage des boutons de suppression de colonne - for ($i=0;$toutsujet[$i];$i++){ - echo ''."\n"; - } - echo ''."\n"; - -//si le sondage est un sondage de date -if ($dsondage->format=="D"||$dsondage->format=="D+"){ - -//affichage des sujets du sondage - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - - //affichage des années - $colspan=1; - for ($i=0;$i'.strftime("%Y",$toutsujet[$i]).''."\n"; - $colspan=1; - } - } - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - //affichage des mois - $colspan=1; - for ($i=0;$i'.date("F",$toutsujet[$i]).''."\n"; - else - echo ''."\n"; - $colspan=1; - } - } - - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - //affichage des jours - $colspan=1; - for ($i=0;$i'.date("D jS",$toutsujet[$i]).''."\n"; - else - echo ''."\n"; - $colspan=1; - } - } - echo ''."\n"; - echo ''."\n"; - //affichage des horaires - if (strpos($dsujet->sujet,'@') !== false){ - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - - for ($i=0;$toutsujet[$i];$i++){ - $heures=explode("@",$toutsujet[$i]); - echo ''."\n"; - } - echo ''."\n"; - echo ''."\n"; - } - +//action si le bouton participer est cliqué +if ($_POST["boutonp"]||$_POST["boutonp_x"]) { + //si on a un nom dans la case texte + if ($_POST["nom"]) { + for ($i=0;$i<$nbcolonnes;$i++){ + //si la checkbox est cochée alors valeur est egale à 1 + if (isset($_POST["choix$i"])){ + $nouveauchoix.="1"; + } else { //sinon 0 + $nouveauchoix.="0"; + } + } + + while( $user=$user_studs->FetchNextObject(false)) { + if ($_POST["nom"]==$user->nom){ + $erreur_prenom="yes"; + } + } + + if (preg_match(';<|>|"|\';i', $_POST["nom"])) { + $erreur_injection="yes"; + } + + // Ecriture des choix de l'utilisateur dans la base + if (!$erreur_prenom&&!$erreur_injection) { + $nom=str_replace("'","°",$_POST["nom"]); + $connect->Execute("INSERT INTO user_studs VALUES ('$nom', '$numsondage', '$nouveauchoix')"); + } + } } -else { - $toutsujet=str_replace("°","'",$toutsujet); -//affichage des sujets du sondage - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - - for ($i=0;$toutsujet[$i];$i++){ - - echo ''."\n"; - } - echo ''."\n"; - echo ''."\n"; - -} - - - //affichage des resultats - $somme[]=0; - $compteur = 0; - while ( $data=$user_studs->FetchNextObject(false)) { - $ensemblereponses=$data->reponses; - - echo ''."\n"; - - echo ''."\n"; +//action quand on ajoute une colonne au format AUTRE +if ($_POST["ajoutercolonne_x"] && $_POST["nouvellecolonne"]!=""&&($dsondage->format=="A"||$dsondage->format=="A+")) { + $nouveauxsujets=$dsujet->sujet; - - //affichage du nom - $nombase=str_replace("°","'",$data->nom); - - echo ''."\n"; - - //si la ligne n'est pas a changer, on affiche les données - if (!$testligneamodifier){ - for ($k=0;$k<$nbcolonnes;$k++){ - $car=substr($ensemblereponses,$k,1); - if ($car=="1"){ - echo ''."\n"; - $somme[$k]++; - } - else { - echo ''."\n"; - } - } - } - //sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs - else { - //si c'est bien la ligne a modifier on met les checkbox - if ($compteur=="$ligneamodifier"){ - for ($j=0;$j<$nbcolonnes;$j++){ - - $car=substr($ensemblereponses,$j,1); - if ($car=="1"){ - echo ''."\n"; - } - else { - echo ''."\n"; - } - } - } - //sinon on affiche les lignes normales - else { - for ($k=0;$k<$nbcolonnes;$k++){ - $car=substr($ensemblereponses,$k,1); - if ($car=="1"){ - echo ''."\n"; - $somme[$k]++; - } - else { - echo ''."\n"; - } - } - } - - } - - //a la fin de chaque ligne se trouve les boutons modifier - if (!$testligneamodifier=="true"){ - echo ''."\n"; - } - - //demande de confirmation pour modification de ligne - for ($i=0;$i<$nblignes;$i++){ - if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])){ - if ($compteur==$i){ - echo ''."\n"; - } - } - } + //on rajoute la valeur a la fin de tous les sujets deja entrés + $nouveauxsujets.=","; + $nouveauxsujets.=str_replace(","," ",$_POST["nouvellecolonne"]); + $nouveauxsujets=str_replace("'","°",$nouveauxsujets); + + //mise a jour avec les nouveaux sujets dans la base + $connect->Execute("UPDATE sujet_studs SET sujet = '$nouveauxsujets' WHERE id_sondage = '$numsondage' "); + + //envoi d'un mail pour prévenir l'administrateur du changement + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); +} - - $compteur++; - echo ''."\n"; - - } - - //affichage de la case vide de texte pour un nouvel utilisateur - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - - //une ligne de checkbox pour le choix du nouvel utilisateur - for ($i=0;$i<$nbcolonnes;$i++){ - echo ''."\n"; - } - // Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base - echo ''."\n"; - - echo ''."\n"; - - //determination du meilleur choix - for ($i=0;$i<$nbcolonnes+1;$i++){ - if ($i=="0"){ - $meilleurecolonne=$somme[$i]; - } - if ($somme[$i]>$meilleurecolonne){ - $meilleurecolonne=$somme[$i]; - } - } - - //affichage de la ligne contenant les sommes de chaque colonne - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - - for ($i=0;$i<$nbcolonnes;$i++){ - $affichesomme=$somme[$i]; - if ($affichesomme==""){$affichesomme="0";} - if ($somme[$i]==$meilleurecolonne){ - echo ''."\n"; - } - else { - echo ''."\n"; - } - } - - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - for ($i=0;$i<$nbcolonnes;$i++){ - if ($somme[$i]==$meilleurecolonne&&$somme[$i]){ - echo ''."\n"; - } - else { - echo ''."\n"; - } - } - echo ''."\n"; +//action quand on ajoute une colonne au format DATE +if ($_POST["ajoutercolonne_x"] &&($dsondage->format=="D"||$dsondage->format=="D+")) { + $nouveauxsujets=$dsujet->sujet; + + if ($_POST["nouveaujour"]!="vide"&&$_POST["nouveaumois"]!="vide"&&$_POST["nouvelleannee"]!="vide") { + $nouvelledate=mktime(0,0,0,$_POST["nouveaumois"],$_POST["nouveaujour"],$_POST["nouvelleannee"]); + + if ($_POST["nouvelleheuredebut"]!="vide") { + $nouvelledate.="@"; + $nouvelledate.=$_POST["nouvelleheuredebut"]; + $nouvelledate.="h"; + + if ($_POST["nouvelleminutedebut"]!="vide") { + $nouvelledate.=$_POST["nouvelleminutedebut"]; + } + } + + if ($_POST["nouvelleheurefin"]!="vide") { + $nouvelledate.="-"; + $nouvelledate.=$_POST["nouvelleheurefin"]; + $nouvelledate.="h"; + + if ($_POST["nouvelleminutefin"]!="vide") { + $nouvelledate.=$_POST["nouvelleminutefin"]; + } + } + + if($_POST["nouvelleheuredebut"]=="vide"||($_POST["nouvelleheuredebut"]&&$_POST["nouvelleheurefin"]&&(($_POST["nouvelleheuredebut"]<$_POST["nouvelleheurefin"])||(($_POST["nouvelleheuredebut"]==$_POST["nouvelleheurefin"])&&($_POST["nouvelleminutedebut"]<$_POST["nouvelleminutefin"]))))) { + + } else { + $erreur_ajout_date="yes"; + } + + //on rajoute la valeur dans les valeurs + $datesbase=explode(",",$dsujet->sujet); + $taillebase=sizeof($datesbase); + + //recherche de l'endroit de l'insertion de la nouvelle date dans les dates deja entrées dans le tableau + if ($nouvelledate<$datesbase[0]) { + $cleinsertion=0; + } elseif ($nouvelledate>$datesbase[$taillebase-1]) { + $cleinsertion=count($datesbase); + } else { + for ($i=0;$i$datesbase[$i]&&$nouvelledate<$datesbase[$j]) { + $cleinsertion=$j; + } + } + } + + array_splice($datesbase,$cleinsertion,0,$nouvelledate); + $cle=array_search ($nouvelledate,$datesbase); + + for ($i=0;$iExecute("UPDATE sujet_studs SET sujet = '$dateinsertion' WHERE id_sondage = '$numsondage' "); + if ($nouvelledate > strtotime($dsondage->date_fin)) { + $date_fin=$nouvelledate+200000; + $connect->Execute("UPDATE sondage SET date_fin = '$date_fin' WHERE id_sondage = '$numsondage' "); + } + } + + //mise a jour des reponses actuelles correspondant au sujet ajouté + while ($data=$user_studs->FetchNextObject(false)) { + $ensemblereponses=$data->reponses; + + //parcours de toutes les réponses actuelles + for ($j=0;$j<$nbcolonnes;$j++) { + $car=substr($ensemblereponses,$j,1); + + //si les reponses ne concerne pas la colonne ajoutée, on concatene + if ($j==$cle) { + $newcar.="0"; + } + + $newcar.=$car; + } + + //mise a jour des reponses utilisateurs dans la base + if (!$erreur_ajout_date) { + $connect->Execute("update user_studs set reponses='$newcar' where nom='$data->nom' and id_users=$data->id_users"); + } + + $newcar=""; + } + + //envoi d'un mail pour prévenir l'administrateur du changement + $adresseadmin=$dsondage->mail_admin; + mail ($adresseadmin, + _("[ADMINISTRATOR] New column for your poll"), + _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, + $headers); + } else { + $erreur_ajout_date="yes"; + } +} - // S'il a oublié de remplir un nom - if (($_POST["boutonp"]||$_POST["boutonp_x"])&&$_POST["nom"]=="") { - echo ''."\n"; - print "'."\n"; - } - if ($erreur_prenom){ - echo ''."\n"; - print "\n"; - echo ''."\n"; - } - if ($erreur_injection){ - echo ''."\n"; - print "\n"; - echo ''."\n"; - } - if ($erreur_ajout_date){ - echo ''."\n"; - print "\n"; - echo ''."\n"; - } - //fin du tableau - echo '
'.strftime("%B",$toutsujet[$i]).'
'.strftime("%a %e",$toutsujet[$i]).'
'.$heures[1].'
'.$toutsujet[$i].'
'.$nombase.'OKOK
'."\n"; - echo '
'."\n"; - echo '
'. _("Addition") .''.$affichesomme.''.$affichesomme.'
Meilleur resultat
" . _("Enter a name !") . "\n"; - echo '
" . _("The name you've chosen already exist in this poll!") . "
" . _("Characters \" ' < et > are not permitted") . "
" . _("The date is not correct !") . "
'."\n"; - echo '
'."\n"; - - //focus en javascript sur le champ texte pour le nom d'utilisateur - echo ''."\n"; - - //recuperation des valeurs des sujets et adaptation pour affichage - $toutsujet=explode(",",$dsujet->sujet); - - //recuperation des sujets des meilleures colonnes - $compteursujet=0; - for ($i=0;$i<$nbcolonnes;$i++){ - if ($somme[$i]==$meilleurecolonne){ - $meilleursujet.=", "; - if ($dsondage->format=="D"||$dsondage->format=="D+"){ - $meilleursujetexport=$toutsujet[$i]; - if (strpos($toutsujet[$i],'@') !== false){ - $toutsujetdate=explode("@",$toutsujet[$i]); - if ($_SESSION["langue"]=="EN") - $meilleursujet.=date("l, F jS Y",$toutsujetdate[0])." " . _("for") ." ".$toutsujetdate[1]; - else - $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujetdate[0]). ' ' . _("for") . ' ' . $toutsujetdate[1]; - } - else{ - if ($_SESSION["langue"]=="EN") - $meilleursujet.=date("l, F jS Y",$toutsujet[$i]); - else - $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujet[$i]); - } - } - else{ - $meilleursujet.=$toutsujet[$i]; - } - $compteursujet++; - } - } - - //adaptation pour affichage des valeurs - $meilleursujet=substr("$meilleursujet",1); - $meilleursujet=str_replace("°","'",$meilleursujet); - - //ajout du S si plusieurs votes - $vote_str = _('vote'); - if ($meilleurecolonne!="1") - $vote_str = _('votes'); - echo '

'."\n"; - //affichage de la phrase annoncant le meilleur sujet - if ($compteursujet=="1"&&$meilleurecolonne){ - print "\"Meilleur" . _("The best choice at this time is") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
\n"; - } - elseif ($meilleurecolonne){ - print "\"Meilleur " . _("The bests choices at this time are") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
\n"; - } - - echo '

'."\n"; - echo '

'."\n"; - echo '
'."\n"; - echo '
'."\n"; - //Gestion du sondage - echo '
'. _("Poll's management") .' :
'."\n"; - echo '

'."\n"; - echo '
'."\n"; - //Changer le titre du sondage - $adresseadmin=$dsondage->mail_admin; - echo _("Change the title") .' :
' . - ''. - '

'."\n"; - echo '

'."\n"; - - if ($dsondage->format=="D"||$dsondage->format=="D+"){ - echo '
'."\n"; - echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
'; - echo ''; - echo ''; - echo ''; - echo '

'; - echo '
'."\n"; - // ''. _("Enter a meeting place!") .'

'."\n"; - } - - // TODO - if ($_POST["exportpdf_x"]&&!$_POST["lieureunion"]){ - echo ''. _("Enter a meeting place!") .'

'."\n"; - } - - //si la valeur du nouveau titre est invalide : message d'erreur - if (($_POST["boutonnouveautitre"]||$_POST["boutonnouveautitre_x"]) && $_POST["nouveautitre"]==""){ - echo ''. _("Enter a new title!") .'

'."\n"; - } - - //Changer les commentaires du sondage - echo _("Change the comments") .' :



'."\n"; +//suppression de ligne dans la base +for ($i=0;$i<$nblignes;$i++) { + if ($_POST["effaceligne$i"]||$_POST['effaceligne'.$i.'_x']) { + $compteur=0; + + while ($data=$user_studs->FetchNextObject(false)) { + if ($compteur==$i){ + $connect->Execute("delete from user_studs where nom = '$data->nom' and id_users = '$data->id_users'"); + } + + $compteur++; + } + } +} - //Changer l'adresse de l'administrateur - echo _("Change your email address") .' :

'."\n"; - - //si l'adresse est invalide ou le champ vide : message d'erreur - if (($_POST["boutonnouvelleadresse"]||$_POST["boutonnouvelleadresse_x"]) && $_POST["nouvelleadresse"]==""){ - echo ''. _("Enter a new email address!") .'

'."\n"; - - } - - //affichage des commentaires des utilisateurs existants - $comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); - if ($comment_user->RecordCount() != 0){ - - print "
" . _("Comments") . " :
\n"; - $i = 0; - while ( $dcomment=$comment_user->FetchNextObject(false)) { - print " $dcomment->usercomment : $dcomment->comment
"; - $i++; - } - echo '
'; - } - - if ($erreur_commentaire_vide=="yes"){ - print "" . _("Enter a name and a comment!") . ""; - } - - //affichage de la case permettant de rajouter un commentaire par les utilisateurs - print "
" . _("Add a comment in the poll") . " :
\n"; - echo _("Name") .' :
'."\n"; - echo ''."\n"; - echo '
'."\n"; - - //suppression du sondage - echo '
'."\n"; - echo _("Remove your poll") .' :

'."\n"; - if ($_POST["suppressionsondage"]){ - - echo _("Confirm removal of your poll") .' : '."\n"; - echo '

'."\n"; - } - echo ''."\n"; - echo '

'."\n"; - //fin de la partie GESTION et beandeau de pied - echo '

'."\n"; - bandeau_pied_mobile(); - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; +//suppression d'un commentaire utilisateur +$comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); +$i = 0; +while ($dcomment = $comment_user->FetchNextObject(false)) { + if ($_POST['suppressioncomment'.$i.'_x']) { + $connect->Execute("delete from comments where id_comment = '$dcomment->id_comment'"); + } + + $i++; +} +//on teste pour voir si une ligne doit etre modifiée +for ($i=0;$i<$nblignes;$i++) { + if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])) { + $ligneamodifier=$i; + $testligneamodifier="true"; + } + + //test pour voir si une ligne est a modifier + if (isset($_POST["validermodifier$i"])) { + $modifier=$i; + $testmodifier="true"; + } +} -?> +//si le test est valide alors on affiche des checkbox pour entrer de nouvelles valeurs +if ($testmodifier) { + for ($i=0;$i<$nbcolonnes;$i++) { + //recuperation des nouveaux choix de l'utilisateur + if (isset($_POST["choix$i"])) { + $nouveauchoix.="1"; + } else { + $nouveauchoix.="0"; + } + } + + $compteur=0; + + while ( $data=$user_studs->FetchNextObject(false)) { + //mise a jour des données de l'utilisateur dans la base SQL + if ($compteur==$modifier) { + $connect->Execute("update user_studs set reponses='$nouveauchoix' where nom='$data->nom' and id_users='$data->id_users'"); + } + + $compteur++; + } +} + + +//suppression de colonnes dans la base +for ($i=0;$i<$nbcolonnes;$i++) { + if ((isset($_POST["effacecolonne$i"])||isset($_POST['effacecolonne'.$i.'_x']))&&$nbcolonnes>1){ + $toutsujet=explode(",",$dsujet->sujet); + $j=0; + + //parcours de tous les sujets actuels + while ($toutsujet[$j]) { + //si le sujet n'est pas celui qui a été effacé alors on concatene + if ($i!=$j) { + $nouveauxsujets.=','; + $nouveauxsujets.=$toutsujet[$j]; + } + + $j++; + } + + //on enleve la virgule au début + $nouveauxsujets=substr("$nouveauxsujets",1); + + //nettoyage des reponses actuelles correspondant au sujet effacé + $compteur = 0; + while ($data=$user_studs->FetchNextObject(false)) { + $ensemblereponses=$data->reponses; + + //parcours de toutes les réponses actuelles + for ($j=0;$j<$nbcolonnes;$j++) { + $car=substr($ensemblereponses,$j,1); + //si les reponses ne concerne pas la colonne effacée, on concatene + if ($i!=$j) { + $newcar.=$car; + } + } + + $compteur++; + + //mise a jour des reponses utilisateurs dans la base + $connect->Execute("update user_studs set reponses='$newcar' where nom='$data->nom' and id_users=$data->id_users"); + $newcar=""; + } + + //mise a jour des sujets dans la base + $connect->Execute("update sujet_studs set sujet = '$nouveauxsujets' where id_sondage = '$numsondage' "); + } +} + + +//recuperation des donnes de la base +$sondage=$connect->Execute("select * from sondage where id_sondage_admin = '$numsondageadmin'"); +$sujets=$connect->Execute("select * from sujet_studs where id_sondage='$numsondage'"); +$user_studs=$connect->Execute("select * from user_studs where id_sondage='$numsondage' order by id_users"); + +//on recupere les données et les sujets du sondage +$dsujet=$sujets->FetchObject(false); +$dsondage=$sondage->FetchObject(false); + +$toutsujet=explode(",",$dsujet->sujet); +$toutsujet=str_replace("@","
",$toutsujet); +$toutsujet=str_replace("°","'",$toutsujet); +$nbcolonnes=substr_count($dsujet->sujet,',')+1; + +echo '
'."\n"; +echo '
'."\n"; +echo _('As poll administrator, you can change all the lines of this poll with infos.
You can, as well, remove a column or a line with Cancel.
You can also add a new column with Add column.
Finally, you can change the informations of this poll like the title, the comments or your email address.') ."\n"; +echo '

'."\n"; + +//debut de l'affichage de résultats +echo ''."\n"; + +//reformatage des données des sujets du sondage +$toutsujet=explode(",",$dsujet->sujet); +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; + +//boucle pour l'affichage des boutons de suppression de colonne +for ($i=0;$toutsujet[$i];$i++) { + echo ''."\n"; +} + +echo ''."\n"; + +//si le sondage est un sondage de date +if ($dsondage->format=="D"||$dsondage->format=="D+") { + + //affichage des sujets du sondage + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //affichage des années + $colspan=1; + for ($i=0;$i'.strftime("%Y",$toutsujet[$i]).''."\n"; + $colspan=1; + } + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //affichage des mois + $colspan=1; + for ($i=0;$i'.date("F",$toutsujet[$i]).''."\n"; + } else { + echo ''."\n"; + } + + $colspan=1; + } + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //affichage des jours + $colspan=1; + for ($i=0;$i'.date("D jS",$toutsujet[$i]).''."\n"; + } else { + echo ''."\n"; + } + + $colspan=1; + } + } + + echo ''."\n"; + echo ''."\n"; + + //affichage des horaires + if (strpos($dsujet->sujet,'@') !== false) { + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$toutsujet[$i];$i++) { + $heures=explode("@",$toutsujet[$i]); + echo ''."\n"; + } + + echo ''."\n"; + echo ''."\n"; + } +} else { + $toutsujet=str_replace("°","'",$toutsujet); + + //affichage des sujets du sondage + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$toutsujet[$i];$i++) { + echo ''."\n"; + } + + echo ''."\n"; + echo ''."\n"; +} + + +//affichage des resultats +$somme[]=0; +$compteur = 0; + +while ($data=$user_studs->FetchNextObject(false)) { + $ensemblereponses=$data->reponses; + + echo ''."\n"; + echo ''."\n"; + + //affichage du nom + $nombase=str_replace("°","'",$data->nom); + echo ''."\n"; + + //si la ligne n'est pas a changer, on affiche les données + if (!$testligneamodifier) { + for ($k=0;$k<$nbcolonnes;$k++) { + $car=substr($ensemblereponses,$k,1); + if ($car=="1") { + echo ''."\n"; + $somme[$k]++; + } else { + echo ''."\n"; + } + } + } else { //sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs + + //si c'est bien la ligne a modifier on met les checkbox + if ($compteur=="$ligneamodifier") { + for ($j=0;$j<$nbcolonnes;$j++) { + $car=substr($ensemblereponses,$j,1); + if ($car=="1") { + echo ''."\n"; + } else { + echo ''."\n"; + } + } + } else { //sinon on affiche les lignes normales + for ($k=0;$k<$nbcolonnes;$k++) { + $car=substr($ensemblereponses,$k,1); + + if ($car=="1") { + echo ''."\n"; + $somme[$k]++; + } else { + echo ''."\n"; + } + } + } + } + + //a la fin de chaque ligne se trouve les boutons modifier + if (!$testligneamodifier=="true") { + echo ''."\n"; + } + + //demande de confirmation pour modification de ligne + for ($i=0;$i<$nblignes;$i++) { + if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])) { + if ($compteur==$i) { + echo ''."\n"; + } + } + } + + $compteur++; + echo ''."\n"; +} + + +//affichage de la case vide de texte pour un nouvel utilisateur +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; + +//une ligne de checkbox pour le choix du nouvel utilisateur +for ($i=0;$i<$nbcolonnes;$i++) { + echo ''."\n"; +} + +// Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base +echo ''."\n"; +echo ''."\n"; + +//determination du meilleur choix +for ($i=0;$i<$nbcolonnes+1;$i++) { + if ($i=="0") { + $meilleurecolonne=$somme[$i]; + } + + if ($somme[$i]>$meilleurecolonne) { + $meilleurecolonne=$somme[$i]; + } +} + + +//affichage de la ligne contenant les sommes de chaque colonne +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; + +for ($i=0;$i<$nbcolonnes;$i++) { + $affichesomme=$somme[$i]; + + if ($affichesomme=="") { + $affichesomme="0"; + } + + if ($somme[$i]==$meilleurecolonne) { + echo ''."\n"; + } else { + echo ''."\n"; + } +} + +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; + +for ($i=0;$i<$nbcolonnes;$i++) { + if ($somme[$i]==$meilleurecolonne&&$somme[$i]) { + echo ''."\n"; + } else { + echo ''."\n"; + } +} + +echo ''."\n"; + + +// S'il a oublié de remplir un nom +if (($_POST["boutonp"]||$_POST["boutonp_x"])&&$_POST["nom"]=="") { + echo ''."\n"; + print "'."\n"; +} + +if ($erreur_prenom) { + echo ''."\n"; + print "\n"; + echo ''."\n"; +} + +if ($erreur_injection) { + echo ''."\n"; + print "\n"; + echo ''."\n"; +} + +if ($erreur_ajout_date) { + echo ''."\n"; + print "\n"; + echo ''."\n"; +} + +//fin du tableau +echo '
'.strftime("%B",$toutsujet[$i]).'
'.strftime("%a %e",$toutsujet[$i]).'
'.$heures[1].'
'.$toutsujet[$i].'
'.$nombase.'OKOK
'."\n"; +echo '
'."\n"; +echo '
'. _("Addition") .''.$affichesomme.''.$affichesomme.'
Meilleur resultat
" . _("Enter a name !") . "\n"; + echo '
" . _("The name you've chosen already exist in this poll!") . "
" . _("Characters \" ' < et > are not permitted") . "
" . _("The date is not correct !") . "
'."\n"; +echo '
'."\n"; + +//focus en javascript sur le champ texte pour le nom d'utilisateur +echo ''."\n"; + +//recuperation des valeurs des sujets et adaptation pour affichage +$toutsujet=explode(",",$dsujet->sujet); + +//recuperation des sujets des meilleures colonnes +$compteursujet=0; +for ($i=0;$i<$nbcolonnes;$i++) { + if ($somme[$i]==$meilleurecolonne) { + $meilleursujet.=", "; + + if ($dsondage->format=="D"||$dsondage->format=="D+") { + $meilleursujetexport=$toutsujet[$i]; + if (strpos($toutsujet[$i],'@') !== false) { + $toutsujetdate=explode("@",$toutsujet[$i]); + if ($_SESSION["langue"]=="EN") { + $meilleursujet.=date("l, F jS Y",$toutsujetdate[0])." " . _("for") ." ".$toutsujetdate[1]; + } else { + $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujetdate[0]). ' ' . _("for") . ' ' . $toutsujetdate[1]; + } + } else { + if ($_SESSION["langue"]=="EN") { + $meilleursujet.=date("l, F jS Y",$toutsujet[$i]); + } else { + $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujet[$i]); + } + } + } else { + $meilleursujet.=$toutsujet[$i]; + } + + $compteursujet++; + } +} + +//adaptation pour affichage des valeurs +$meilleursujet=substr("$meilleursujet",1); +$meilleursujet=str_replace("°","'",$meilleursujet); + +//ajout du S si plusieurs votes +$vote_str = _('vote'); +if ($meilleurecolonne!="1") { + $vote_str = _('votes'); +} + +echo '

'."\n"; + +//affichage de la phrase annoncant le meilleur sujet +if ($compteursujet=="1"&&$meilleurecolonne) { + print "\"Meilleur" . _("The best choice at this time is") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
\n"; +} elseif ($meilleurecolonne) { + print "\"Meilleur " . _("The bests choices at this time are") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
\n"; +} + +echo '

'."\n"; +echo '

'."\n"; +echo '
'."\n"; +echo '
'."\n"; + +//Gestion du sondage +echo '
'. _("Poll's management") .' :
'."\n"; +echo '

'."\n"; +echo '
'."\n"; + +//Changer le titre du sondage +$adresseadmin=$dsondage->mail_admin; +echo _("Change the title") .' :
' . + ''. + '

'."\n"; +echo '

'."\n"; + +if ($dsondage->format=="D"||$dsondage->format=="D+") { + echo '
'."\n"; + echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
'; + echo ''; + echo ''; + echo ''; + echo '

'; + echo '
'."\n"; + // ''. _("Enter a meeting place!") .'

'."\n"; +} + +// TODO +if ($_POST["exportpdf_x"]&&!$_POST["lieureunion"]) { + echo ''. _("Enter a meeting place!") .'

'."\n"; +} + +//si la valeur du nouveau titre est invalide : message d'erreur +if (($_POST["boutonnouveautitre"]||$_POST["boutonnouveautitre_x"]) && $_POST["nouveautitre"]=="") { + echo ''. _("Enter a new title!") .'

'."\n"; +} + +//Changer les commentaires du sondage +echo _("Change the comments") .' :



'."\n"; + +//Changer l'adresse de l'administrateur +echo _("Change your email address") .' :

'."\n"; + +//si l'adresse est invalide ou le champ vide : message d'erreur +if (($_POST["boutonnouvelleadresse"]||$_POST["boutonnouvelleadresse_x"]) && $_POST["nouvelleadresse"]=="") { + echo ''. _("Enter a new email address!") .'

'."\n"; +} + +//affichage des commentaires des utilisateurs existants +$comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); +if ($comment_user->RecordCount() != 0) { + print "
" . _("Comments") . " :
\n"; + + $i = 0; + while ( $dcomment=$comment_user->FetchNextObject(false)) { + print " $dcomment->usercomment : $dcomment->comment
"; + $i++; + } + + echo '
'; +} + +if ($erreur_commentaire_vide=="yes") { + print "" . _("Enter a name and a comment!") . ""; +} + +//affichage de la case permettant de rajouter un commentaire par les utilisateurs +print "
" . _("Add a comment in the poll") . " :
\n"; +echo _("Name") .' :
'."\n"; +echo ''."\n"; +echo '
'."\n"; + +//suppression du sondage +echo '
'."\n"; +echo _("Remove your poll") .' :

'."\n"; + +if ($_POST["suppressionsondage"]) { + echo _("Confirm removal of your poll") .' : '."\n"; + echo '

'."\n"; +} + +echo ''."\n"; +echo '

'."\n"; + +//fin de la partie GESTION et beandeau de pied +echo '

'."\n"; +bandeau_pied_mobile(); +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; \ No newline at end of file diff --git a/adodb/adodb-active-record.inc.php b/adodb/adodb-active-record.inc.php new file mode 100644 index 0000000..845c656 --- /dev/null +++ b/adodb/adodb-active-record.inc.php @@ -0,0 +1,992 @@ +_dbat +$_ADODB_ACTIVE_DBS = array(); +$ACTIVE_RECORD_SAFETY = true; +$ADODB_ACTIVE_DEFVALS = false; +$ADODB_ACTIVE_CACHESECS = 0; + +class ADODB_Active_DB { + var $db; // ADOConnection + var $tables; // assoc array of ADODB_Active_Table objects, indexed by tablename +} + +class ADODB_Active_Table { + var $name; // table name + var $flds; // assoc array of adofieldobjs, indexed by fieldname + var $keys; // assoc array of primary keys, indexed by fieldname + var $_created; // only used when stored as a cached file + var $_belongsTo = array(); + var $_hasMany = array(); +} + +// $db = database connection +// $index = name of index - can be associative, for an example see +// http://phplens.com/lens/lensforum/msgs.php?id=17790 +// returns index into $_ADODB_ACTIVE_DBS +function ADODB_SetDatabaseAdapter(&$db, $index=false) +{ + global $_ADODB_ACTIVE_DBS; + + foreach($_ADODB_ACTIVE_DBS as $k => $d) { + if (PHP_VERSION >= 5) { + if ($d->db === $db) return $k; + } else { + if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) + return $k; + } + } + + $obj = new ADODB_Active_DB(); + $obj->db = $db; + $obj->tables = array(); + + if ($index == false) $index = sizeof($_ADODB_ACTIVE_DBS); + + + $_ADODB_ACTIVE_DBS[$index] = $obj; + + return sizeof($_ADODB_ACTIVE_DBS)-1; +} + + +class ADODB_Active_Record { + static $_changeNames = true; // dynamically pluralize table names + static $_quoteNames = false; + + static $_foreignSuffix = '_id'; // + var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat] + var $_table; // tablename, if set in class definition then use it as table name + var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat] + var $_where; // where clause set in Load() + var $_saved = false; // indicates whether data is already inserted. + var $_lasterr = false; // last error message + var $_original = false; // the original values loaded or inserted, refreshed on update + + var $foreignName; // CFR: class name when in a relationship + + static function UseDefaultValues($bool=null) + { + global $ADODB_ACTIVE_DEFVALS; + if (isset($bool)) $ADODB_ACTIVE_DEFVALS = $bool; + return $ADODB_ACTIVE_DEFVALS; + } + + // should be static + static function SetDatabaseAdapter(&$db, $index=false) + { + return ADODB_SetDatabaseAdapter($db, $index); + } + + + public function __set($name, $value) + { + $name = str_replace(' ', '_', $name); + $this->$name = $value; + } + + // php5 constructor + function __construct($table = false, $pkeyarr=false, $db=false) + { + global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS; + + if ($db == false && is_object($pkeyarr)) { + $db = $pkeyarr; + $pkeyarr = false; + } + + if (!$table) { + if (!empty($this->_table)) $table = $this->_table; + else $table = $this->_pluralize(get_class($this)); + } + $this->foreignName = strtolower(get_class($this)); // CFR: default foreign name + if ($db) { + $this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db); + } else if (!isset($this->_dbat)) { + if (sizeof($_ADODB_ACTIVE_DBS) == 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor'); + end($_ADODB_ACTIVE_DBS); + $this->_dbat = key($_ADODB_ACTIVE_DBS); + } + + $this->_table = $table; + $this->_tableat = $table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future + + $this->UpdateActiveTable($pkeyarr); + } + + function __wakeup() + { + $class = get_class($this); + new $class; + } + + function _pluralize($table) + { + if (!ADODB_Active_Record::$_changeNames) return $table; + + $ut = strtoupper($table); + $len = strlen($table); + $lastc = $ut[$len-1]; + $lastc2 = substr($ut,$len-2); + switch ($lastc) { + case 'S': + return $table.'es'; + case 'Y': + return substr($table,0,$len-1).'ies'; + case 'X': + return $table.'es'; + case 'H': + if ($lastc2 == 'CH' || $lastc2 == 'SH') + return $table.'es'; + default: + return $table.'s'; + } + } + + // CFR Lamest singular inflector ever - @todo Make it real! + // Note: There is an assumption here...and it is that the argument's length >= 4 + function _singularize($tables) + { + + if (!ADODB_Active_Record::$_changeNames) return $table; + + $ut = strtoupper($tables); + $len = strlen($tables); + if($ut[$len-1] != 'S') + return $tables; // I know...forget oxen + if($ut[$len-2] != 'E') + return substr($tables, 0, $len-1); + switch($ut[$len-3]) + { + case 'S': + case 'X': + return substr($tables, 0, $len-2); + case 'I': + return substr($tables, 0, $len-3) . 'y'; + case 'H'; + if($ut[$len-4] == 'C' || $ut[$len-4] == 'S') + return substr($tables, 0, $len-2); + default: + return substr($tables, 0, $len-1); // ? + } + } + + function hasMany($foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') + { + $ar = new $foreignClass($foreignRef); + $ar->foreignName = $foreignRef; + $ar->UpdateActiveTable(); + $ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix; + $table =& $this->TableInfo(); + $table->_hasMany[$foreignRef] = $ar; + # $this->$foreignRef = $this->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get() + } + + // use when you don't want ADOdb to auto-pluralize tablename + static function TableHasMany($table, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') + { + $ar = new ADODB_Active_Record($table); + $ar->hasMany($foreignRef, $foreignKey, $foreignClass); + } + + // use when you don't want ADOdb to auto-pluralize tablename + static function TableKeyHasMany($table, $tablePKey, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') + { + if (!is_array($tablePKey)) $tablePKey = array($tablePKey); + $ar = new ADODB_Active_Record($table,$tablePKey); + $ar->hasMany($foreignRef, $foreignKey, $foreignClass); + } + + + // use when you want ADOdb to auto-pluralize tablename for you. Note that the class must already be defined. + // e.g. class Person will generate relationship for table Persons + static function ClassHasMany($parentclass, $foreignRef, $foreignKey = false, $foreignClass = 'ADODB_Active_Record') + { + $ar = new $parentclass(); + $ar->hasMany($foreignRef, $foreignKey, $foreignClass); + } + + + function belongsTo($foreignRef,$foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') + { + global $inflector; + + $ar = new $parentClass($this->_pluralize($foreignRef)); + $ar->foreignName = $foreignRef; + $ar->parentKey = $parentKey; + $ar->UpdateActiveTable(); + $ar->foreignKey = ($foreignKey) ? $foreignKey : $foreignRef.ADODB_Active_Record::$_foreignSuffix; + + $table =& $this->TableInfo(); + $table->_belongsTo[$foreignRef] = $ar; + # $this->$foreignRef = $this->_belongsTo[$foreignRef]; + } + + static function ClassBelongsTo($class, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') + { + $ar = new $class(); + $ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass); + } + + static function TableBelongsTo($table, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') + { + $ar = new ADOdb_Active_Record($table); + $ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass); + } + + static function TableKeyBelongsTo($table, $tablePKey, $foreignRef, $foreignKey=false, $parentKey='', $parentClass = 'ADODB_Active_Record') + { + if (!is_array($tablePKey)) $tablePKey = array($tablePKey); + $ar = new ADOdb_Active_Record($table, $tablePKey); + $ar->belongsTo($foreignRef, $foreignKey, $parentKey, $parentClass); + } + + + /** + * __get Access properties - used for lazy loading + * + * @param mixed $name + * @access protected + * @return mixed + */ + function __get($name) + { + return $this->LoadRelations($name, '', -1, -1); + } + + /** + * @param string $name + * @param string $whereOrderBy : eg. ' AND field1 = value ORDER BY field2' + * @param offset + * @param limit + * @return mixed + */ + function LoadRelations($name, $whereOrderBy='', $offset=-1,$limit=-1) + { + $extras = array(); + $table = $this->TableInfo(); + if ($limit >= 0) $extras['limit'] = $limit; + if ($offset >= 0) $extras['offset'] = $offset; + + if (strlen($whereOrderBy)) + if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy)) + if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy)) + $whereOrderBy = 'AND '.$whereOrderBy; + + if(!empty($table->_belongsTo[$name])) + { + $obj = $table->_belongsTo[$name]; + $columnName = $obj->foreignKey; + if(empty($this->$columnName)) + $this->$name = null; + else + { + if ($obj->parentKey) $key = $obj->parentKey; + else $key = reset($table->keys); + + $arrayOfOne = $obj->Find($key.'='.$this->$columnName.' '.$whereOrderBy,false,false,$extras); + if ($arrayOfOne) { + $this->$name = $arrayOfOne[0]; + return $arrayOfOne[0]; + } + } + } + if(!empty($table->_hasMany[$name])) + { + $obj = $table->_hasMany[$name]; + $key = reset($table->keys); + $id = @$this->$key; + if (!is_numeric($id)) { + $db = $this->DB(); + $id = $db->qstr($id); + } + $objs = $obj->Find($obj->foreignKey.'='.$id. ' '.$whereOrderBy,false,false,$extras); + if (!$objs) $objs = array(); + $this->$name = $objs; + return $objs; + } + + return array(); + } + ////////////////////////////////// + + // update metadata + function UpdateActiveTable($pkeys=false,$forceUpdate=false) + { + global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; + global $ADODB_ACTIVE_DEFVALS,$ADODB_FETCH_MODE; + + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + + $table = $this->_table; + $tables = $activedb->tables; + $tableat = $this->_tableat; + if (!$forceUpdate && !empty($tables[$tableat])) { + + $acttab = $tables[$tableat]; + foreach($acttab->flds as $name => $fld) { + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) + $this->$name = $fld->default_value; + else + $this->$name = null; + } + return; + } + $db = $activedb->db; + $fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache'; + if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) { + $fp = fopen($fname,'r'); + @flock($fp, LOCK_SH); + $acttab = unserialize(fread($fp,100000)); + fclose($fp); + if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { + // abs(rand()) randomizes deletion, reducing contention to delete/refresh file + // ideally, you should cache at least 32 secs + + foreach($acttab->flds as $name => $fld) { + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) + $this->$name = $fld->default_value; + else + $this->$name = null; + } + + $activedb->tables[$table] = $acttab; + + //if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname"); + return; + } else if ($db->debug) { + ADOConnection::outp("Refreshing cached active record file: $fname"); + } + } + $activetab = new ADODB_Active_Table(); + $activetab->name = $table; + + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; + if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false); + + $cols = $db->MetaColumns($table); + + if (isset($savem)) $db->SetFetchMode($savem); + $ADODB_FETCH_MODE = $save; + + if (!$cols) { + $this->Error("Invalid table name: $table",'UpdateActiveTable'); + return false; + } + $fld = reset($cols); + if (!$pkeys) { + if (isset($fld->primary_key)) { + $pkeys = array(); + foreach($cols as $name => $fld) { + if (!empty($fld->primary_key)) $pkeys[] = $name; + } + } else + $pkeys = $this->GetPrimaryKeys($db, $table); + } + if (empty($pkeys)) { + $this->Error("No primary key found for table $table",'UpdateActiveTable'); + return false; + } + + $attr = array(); + $keys = array(); + + switch($ADODB_ASSOC_CASE) { + case 0: + foreach($cols as $name => $fldobj) { + $name = strtolower($name); + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) + $this->$name = $fldobj->default_value; + else + $this->$name = null; + $attr[$name] = $fldobj; + } + foreach($pkeys as $k => $name) { + $keys[strtolower($name)] = strtolower($name); + } + break; + + case 1: + foreach($cols as $name => $fldobj) { + $name = strtoupper($name); + + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) + $this->$name = $fldobj->default_value; + else + $this->$name = null; + $attr[$name] = $fldobj; + } + + foreach($pkeys as $k => $name) { + $keys[strtoupper($name)] = strtoupper($name); + } + break; + default: + foreach($cols as $name => $fldobj) { + $name = ($fldobj->name); + + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) + $this->$name = $fldobj->default_value; + else + $this->$name = null; + $attr[$name] = $fldobj; + } + foreach($pkeys as $k => $name) { + $keys[$name] = $cols[$name]->name; + } + break; + } + + $activetab->keys = $keys; + $activetab->flds = $attr; + + if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) { + $activetab->_created = time(); + $s = serialize($activetab); + if (!function_exists('adodb_write_file')) include(ADODB_DIR.'/adodb-csvlib.inc.php'); + adodb_write_file($fname,$s); + } + if (isset($activedb->tables[$table])) { + $oldtab = $activedb->tables[$table]; + + if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo; + if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany; + } + $activedb->tables[$table] = $activetab; + } + + function GetPrimaryKeys(&$db, $table) + { + return $db->MetaPrimaryKeys($table); + } + + // error handler for both PHP4+5. + function Error($err,$fn) + { + global $_ADODB_ACTIVE_DBS; + + $fn = get_class($this).'::'.$fn; + $this->_lasterr = $fn.': '.$err; + + if ($this->_dbat < 0) $db = false; + else { + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $db = $activedb->db; + } + + if (function_exists('adodb_throw')) { + if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false); + else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db); + } else + if (!$db || $db->debug) ADOConnection::outp($this->_lasterr); + + } + + // return last error message + function ErrorMsg() + { + if (!function_exists('adodb_throw')) { + if ($this->_dbat < 0) $db = false; + else $db = $this->DB(); + + // last error could be database error too + if ($db && $db->ErrorMsg()) return $db->ErrorMsg(); + } + return $this->_lasterr; + } + + function ErrorNo() + { + if ($this->_dbat < 0) return -9999; // no database connection... + $db = $this->DB(); + + return (int) $db->ErrorNo(); + } + + + // retrieve ADOConnection from _ADODB_Active_DBs + function DB() + { + global $_ADODB_ACTIVE_DBS; + + if ($this->_dbat < 0) { + $false = false; + $this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB"); + return $false; + } + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $db = $activedb->db; + return $db; + } + + // retrieve ADODB_Active_Table + function &TableInfo() + { + global $_ADODB_ACTIVE_DBS; + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $table = $activedb->tables[$this->_tableat]; + return $table; + } + + + // I have an ON INSERT trigger on a table that sets other columns in the table. + // So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook + function Reload() + { + $db =& $this->DB(); if (!$db) return false; + $table =& $this->TableInfo(); + $where = $this->GenWhere($db, $table); + return($this->Load($where)); + } + + + // set a numeric array (using natural table field ordering) as object properties + function Set(&$row) + { + global $ACTIVE_RECORD_SAFETY; + + $db = $this->DB(); + + if (!$row) { + $this->_saved = false; + return false; + } + + $this->_saved = true; + + $table = $this->TableInfo(); + if ($ACTIVE_RECORD_SAFETY && sizeof($table->flds) != sizeof($row)) { + # + $bad_size = TRUE; + if (sizeof($row) == 2 * sizeof($table->flds)) { + // Only keep string keys + $keys = array_filter(array_keys($row), 'is_string'); + if (sizeof($keys) == sizeof($table->flds)) + $bad_size = FALSE; + } + if ($bad_size) { + $this->Error("Table structure of $this->_table has changed","Load"); + return false; + } + # + } + else + $keys = array_keys($row); + + # + reset($keys); + $this->_original = array(); + foreach($table->flds as $name=>$fld) { + $value = $row[current($keys)]; + $this->$name = $value; + $this->_original[] = $value; + next($keys); + } + + # + return true; + } + + // get last inserted id for INSERT + function LastInsertID(&$db,$fieldname) + { + if ($db->hasInsertID) + $val = $db->Insert_ID($this->_table,$fieldname); + else + $val = false; + + if (is_null($val) || $val === false) { + // this might not work reliably in multi-user environment + return $db->GetOne("select max(".$fieldname.") from ".$this->_table); + } + return $val; + } + + // quote data in where clause + function doquote(&$db, $val,$t) + { + switch($t) { + case 'L': + if (strpos($db->databaseType,'postgres') !== false) return $db->qstr($val); + case 'D': + case 'T': + if (empty($val)) return 'null'; + + case 'B': + case 'N': + case 'C': + case 'X': + if (is_null($val)) return 'null'; + + if (strlen($val)>1 && + (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { + return $db->qstr($val); + break; + } + default: + return $val; + break; + } + } + + // generate where clause for an UPDATE/SELECT + function GenWhere(&$db, &$table) + { + $keys = $table->keys; + $parr = array(); + + foreach($keys as $k) { + $f = $table->flds[$k]; + if ($f) { + $parr[] = $k.' = '.$this->doquote($db,$this->$k,$db->MetaType($f->type)); + } + } + return implode(' and ', $parr); + } + + + function _QName($n,$db=false) + { + if (!ADODB_Active_Record::$_quoteNames) return $n; + if (!$db) $db = $this->DB(); if (!$db) return false; + return $db->nameQuote.$n.$db->nameQuote; + } + + //------------------------------------------------------------ Public functions below + + function Load($where=null,$bindarr=false) + { + global $ADODB_FETCH_MODE; + + $db = $this->DB(); if (!$db) return false; + $this->_where = $where; + + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false); + + $qry = "select * from ".$this->_table; + + if($where) { + $qry .= ' WHERE '.$where; + } + $row = $db->GetRow($qry,$bindarr); + + if (isset($savem)) $db->SetFetchMode($savem); + $ADODB_FETCH_MODE = $save; + + return $this->Set($row); + } + + # useful for multiple record inserts + # see http://phplens.com/lens/lensforum/msgs.php?id=17795 + function Reset() + { + $this->_where=null; + $this->_saved = false; + $this->_lasterr = false; + $this->_original = false; + $vars=get_object_vars($this); + foreach($vars as $k=>$v){ + if(substr($k,0,1)!=='_'){ + $this->{$k}=null; + } + } + $this->foreignName=strtolower(get_class($this)); + return true; + } + + // false on error + function Save() + { + if ($this->_saved) $ok = $this->Update(); + else $ok = $this->Insert(); + + return $ok; + } + + + // false on error + function Insert() + { + $db = $this->DB(); if (!$db) return false; + $cnt = 0; + $table = $this->TableInfo(); + + $valarr = array(); + $names = array(); + $valstr = array(); + + foreach($table->flds as $name=>$fld) { + $val = $this->$name; + if(!is_array($val) || !is_null($val) || !array_key_exists($name, $table->keys)) { + $valarr[] = $val; + $names[] = $this->_QName($name,$db); + $valstr[] = $db->Param($cnt); + $cnt += 1; + } + } + + if (empty($names)){ + foreach($table->flds as $name=>$fld) { + $valarr[] = null; + $names[] = $name; + $valstr[] = $db->Param($cnt); + $cnt += 1; + } + } + $sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')'; + $ok = $db->Execute($sql,$valarr); + + if ($ok) { + $this->_saved = true; + $autoinc = false; + foreach($table->keys as $k) { + if (is_null($this->$k)) { + $autoinc = true; + break; + } + } + if ($autoinc && sizeof($table->keys) == 1) { + $k = reset($table->keys); + $this->$k = $this->LastInsertID($db,$k); + } + } + + $this->_original = $valarr; + return !empty($ok); + } + + function Delete() + { + $db = $this->DB(); if (!$db) return false; + $table = $this->TableInfo(); + + $where = $this->GenWhere($db,$table); + $sql = 'DELETE FROM '.$this->_table.' WHERE '.$where; + $ok = $db->Execute($sql); + + return $ok ? true : false; + } + + // returns an array of active record objects + function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()) + { + $db = $this->DB(); if (!$db || empty($this->_table)) return false; + $arr = $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr,$extra); + return $arr; + } + + // returns 0 on error, 1 on update, 2 on insert + function Replace() + { + global $ADODB_ASSOC_CASE; + + $db = $this->DB(); if (!$db) return false; + $table = $this->TableInfo(); + + $pkey = $table->keys; + + foreach($table->flds as $name=>$fld) { + $val = $this->$name; + /* + if (is_null($val)) { + if (isset($fld->not_null) && $fld->not_null) { + if (isset($fld->default_value) && strlen($fld->default_value)) continue; + else { + $this->Error("Cannot update null into $name","Replace"); + return false; + } + } + }*/ + if (is_null($val) && !empty($fld->auto_increment)) { + continue; + } + + if (is_array($val)) continue; + + $t = $db->MetaType($fld->type); + $arr[$name] = $this->doquote($db,$val,$t); + $valarr[] = $val; + } + + if (!is_array($pkey)) $pkey = array($pkey); + + + if ($ADODB_ASSOC_CASE == 0) + foreach($pkey as $k => $v) + $pkey[$k] = strtolower($v); + elseif ($ADODB_ASSOC_CASE == 1) + foreach($pkey as $k => $v) + $pkey[$k] = strtoupper($v); + + $ok = $db->Replace($this->_table,$arr,$pkey); + if ($ok) { + $this->_saved = true; // 1= update 2=insert + if ($ok == 2) { + $autoinc = false; + foreach($table->keys as $k) { + if (is_null($this->$k)) { + $autoinc = true; + break; + } + } + if ($autoinc && sizeof($table->keys) == 1) { + $k = reset($table->keys); + $this->$k = $this->LastInsertID($db,$k); + } + } + + $this->_original = $valarr; + } + return $ok; + } + + // returns 0 on error, 1 on update, -1 if no change in data (no update) + function Update() + { + $db = $this->DB(); if (!$db) return false; + $table = $this->TableInfo(); + + $where = $this->GenWhere($db, $table); + + if (!$where) { + $this->error("Where missing for table $table", "Update"); + return false; + } + $valarr = array(); + $neworig = array(); + $pairs = array(); + $i = -1; + $cnt = 0; + foreach($table->flds as $name=>$fld) { + $i += 1; + $val = $this->$name; + $neworig[] = $val; + + if (isset($table->keys[$name]) || is_array($val)) + continue; + + if (is_null($val)) { + if (isset($fld->not_null) && $fld->not_null) { + if (isset($fld->default_value) && strlen($fld->default_value)) continue; + else { + $this->Error("Cannot set field $name to NULL","Update"); + return false; + } + } + } + + if (isset($this->_original[$i]) && strcmp($val,$this->_original[$i]) == 0) { + continue; + } + $valarr[] = $val; + $pairs[] = $this->_QName($name,$db).'='.$db->Param($cnt); + $cnt += 1; + } + + + if (!$cnt) return -1; + $sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where; + $ok = $db->Execute($sql,$valarr); + if ($ok) { + $this->_original = $neworig; + return 1; + } + return 0; + } + + function GetAttributeNames() + { + $table = $this->TableInfo(); + if (!$table) return false; + return array_keys($table->flds); + } + +}; + +function adodb_GetActiveRecordsClass(&$db, $class, $table,$whereOrderBy,$bindarr, $primkeyArr, + $extra) +{ +global $_ADODB_ACTIVE_DBS; + + + $save = $db->SetFetchMode(ADODB_FETCH_NUM); + $qry = "select * from ".$table; + + if (!empty($whereOrderBy)) + $qry .= ' WHERE '.$whereOrderBy; + if(isset($extra['limit'])) + { + $rows = false; + if(isset($extra['offset'])) { + $rs = $db->SelectLimit($qry, $extra['limit'], $extra['offset'],$bindarr); + } else { + $rs = $db->SelectLimit($qry, $extra['limit'],-1,$bindarr); + } + if ($rs) { + while (!$rs->EOF) { + $rows[] = $rs->fields; + $rs->MoveNext(); + } + } + } else + $rows = $db->GetAll($qry,$bindarr); + + $db->SetFetchMode($save); + + $false = false; + + if ($rows === false) { + return $false; + } + + + if (!class_exists($class)) { + $db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); + return $false; + } + $arr = array(); + // arrRef will be the structure that knows about our objects. + // It is an associative array. + // We will, however, return arr, preserving regular 0.. order so that + // obj[0] can be used by app developpers. + $arrRef = array(); + $bTos = array(); // Will store belongTo's indices if any + foreach($rows as $row) { + + $obj = new $class($table,$primkeyArr,$db); + if ($obj->ErrorNo()){ + $db->_errorMsg = $obj->ErrorMsg(); + return $false; + } + $obj->Set($row); + $arr[] = $obj; + } // foreach($rows as $row) + + return $arr; +} +?> \ No newline at end of file diff --git a/adodb/adodb-active-recordx.inc.php b/adodb/adodb-active-recordx.inc.php new file mode 100644 index 0000000..9b526ad --- /dev/null +++ b/adodb/adodb-active-recordx.inc.php @@ -0,0 +1,1421 @@ +_dbat +$_ADODB_ACTIVE_DBS = array(); +$ACTIVE_RECORD_SAFETY = true; // CFR: disabled while playing with relations +$ADODB_ACTIVE_DEFVALS = false; + +class ADODB_Active_DB { + var $db; // ADOConnection + var $tables; // assoc array of ADODB_Active_Table objects, indexed by tablename +} + +class ADODB_Active_Table { + var $name; // table name + var $flds; // assoc array of adofieldobjs, indexed by fieldname + var $keys; // assoc array of primary keys, indexed by fieldname + var $_created; // only used when stored as a cached file + var $_belongsTo = array(); + var $_hasMany = array(); + var $_colsCount; // total columns count, including relations + + function updateColsCount() + { + $this->_colsCount = sizeof($this->flds); + foreach($this->_belongsTo as $foreignTable) + $this->_colsCount += sizeof($foreignTable->TableInfo()->flds); + foreach($this->_hasMany as $foreignTable) + $this->_colsCount += sizeof($foreignTable->TableInfo()->flds); + } +} + +// returns index into $_ADODB_ACTIVE_DBS +function ADODB_SetDatabaseAdapter(&$db) +{ + global $_ADODB_ACTIVE_DBS; + + foreach($_ADODB_ACTIVE_DBS as $k => $d) { + if (PHP_VERSION >= 5) { + if ($d->db === $db) return $k; + } else { + if ($d->db->_connectionID === $db->_connectionID && $db->database == $d->db->database) + return $k; + } + } + + $obj = new ADODB_Active_DB(); + $obj->db = $db; + $obj->tables = array(); + + $_ADODB_ACTIVE_DBS[] = $obj; + + return sizeof($_ADODB_ACTIVE_DBS)-1; +} + + +class ADODB_Active_Record { + static $_changeNames = true; // dynamically pluralize table names + static $_foreignSuffix = '_id'; // + var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat] + var $_table; // tablename, if set in class definition then use it as table name + var $_sTable; // singularized table name + var $_pTable; // pluralized table name + var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat] + var $_where; // where clause set in Load() + var $_saved = false; // indicates whether data is already inserted. + var $_lasterr = false; // last error message + var $_original = false; // the original values loaded or inserted, refreshed on update + + var $foreignName; // CFR: class name when in a relationship + + static function UseDefaultValues($bool=null) + { + global $ADODB_ACTIVE_DEFVALS; + if (isset($bool)) $ADODB_ACTIVE_DEFVALS = $bool; + return $ADODB_ACTIVE_DEFVALS; + } + + // should be static + static function SetDatabaseAdapter(&$db) + { + return ADODB_SetDatabaseAdapter($db); + } + + + public function __set($name, $value) + { + $name = str_replace(' ', '_', $name); + $this->$name = $value; + } + + // php5 constructor + // Note: if $table is defined, then we will use it as our table name + // Otherwise we will use our classname... + // In our database, table names are pluralized (because there can be + // more than one row!) + // Similarly, if $table is defined here, it has to be plural form. + // + // $options is an array that allows us to tweak the constructor's behaviour + // if $options['refresh'] is true, we re-scan our metadata information + // if $options['new'] is true, we forget all relations + function __construct($table = false, $pkeyarr=false, $db=false, $options=array()) + { + global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS; + + if ($db == false && is_object($pkeyarr)) { + $db = $pkeyarr; + $pkeyarr = false; + } + + if($table) + { + // table argument exists. It is expected to be + // already plural form. + $this->_pTable = $table; + $this->_sTable = $this->_singularize($this->_pTable); + } + else + { + // We will use current classname as table name. + // We need to pluralize it for the real table name. + $this->_sTable = strtolower(get_class($this)); + $this->_pTable = $this->_pluralize($this->_sTable); + } + $this->_table = &$this->_pTable; + + $this->foreignName = $this->_sTable; // CFR: default foreign name (singular) + + if ($db) { + $this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db); + } else + $this->_dbat = sizeof($_ADODB_ACTIVE_DBS)-1; + + + if ($this->_dbat < 0) $this->Error("No database connection set; use ADOdb_Active_Record::SetDatabaseAdapter(\$db)",'ADODB_Active_Record::__constructor'); + + $this->_tableat = $this->_table; # reserved for setting the assoc value to a non-table name, eg. the sql string in future + + // CFR: Just added this option because UpdateActiveTable() can refresh its information + // but there was no way to ask it to do that. + $forceUpdate = (isset($options['refresh']) && true === $options['refresh']); + $this->UpdateActiveTable($pkeyarr, $forceUpdate); + if(isset($options['new']) && true === $options['new']) + { + $table =& $this->TableInfo(); + unset($table->_hasMany); + unset($table->_belongsTo); + $table->_hasMany = array(); + $table->_belongsTo = array(); + } + } + + function __wakeup() + { + $class = get_class($this); + new $class; + } + + // CFR: Constants found in Rails + static $IrregularP = array( + 'PERSON' => 'people', + 'MAN' => 'men', + 'WOMAN' => 'women', + 'CHILD' => 'children', + 'COW' => 'kine', + ); + + static $IrregularS = array( + 'PEOPLE' => 'PERSON', + 'MEN' => 'man', + 'WOMEN' => 'woman', + 'CHILDREN' => 'child', + 'KINE' => 'cow', + ); + + static $WeIsI = array( + 'EQUIPMENT' => true, + 'INFORMATION' => true, + 'RICE' => true, + 'MONEY' => true, + 'SPECIES' => true, + 'SERIES' => true, + 'FISH' => true, + 'SHEEP' => true, + ); + + function _pluralize($table) + { + if (!ADODB_Active_Record::$_changeNames) return $table; + + $ut = strtoupper($table); + if(isset(self::$WeIsI[$ut])) + { + return $table; + } + if(isset(self::$IrregularP[$ut])) + { + return self::$IrregularP[$ut]; + } + $len = strlen($table); + $lastc = $ut[$len-1]; + $lastc2 = substr($ut,$len-2); + switch ($lastc) { + case 'S': + return $table.'es'; + case 'Y': + return substr($table,0,$len-1).'ies'; + case 'X': + return $table.'es'; + case 'H': + if ($lastc2 == 'CH' || $lastc2 == 'SH') + return $table.'es'; + default: + return $table.'s'; + } + } + + // CFR Lamest singular inflector ever - @todo Make it real! + // Note: There is an assumption here...and it is that the argument's length >= 4 + function _singularize($table) + { + + if (!ADODB_Active_Record::$_changeNames) return $table; + + $ut = strtoupper($table); + if(isset(self::$WeIsI[$ut])) + { + return $table; + } + if(isset(self::$IrregularS[$ut])) + { + return self::$IrregularS[$ut]; + } + $len = strlen($table); + if($ut[$len-1] != 'S') + return $table; // I know...forget oxen + if($ut[$len-2] != 'E') + return substr($table, 0, $len-1); + switch($ut[$len-3]) + { + case 'S': + case 'X': + return substr($table, 0, $len-2); + case 'I': + return substr($table, 0, $len-3) . 'y'; + case 'H'; + if($ut[$len-4] == 'C' || $ut[$len-4] == 'S') + return substr($table, 0, $len-2); + default: + return substr($table, 0, $len-1); // ? + } + } + + /* + * ar->foreignName will contain the name of the tables associated with this table because + * these other tables' rows may also be referenced by this table using theirname_id or the provided + * foreign keys (this index name is stored in ar->foreignKey) + * + * this-table.id = other-table-#1.this-table_id + * = other-table-#2.this-table_id + */ + function hasMany($foreignRef,$foreignKey=false) + { + $ar = new ADODB_Active_Record($foreignRef); + $ar->foreignName = $foreignRef; + $ar->UpdateActiveTable(); + $ar->foreignKey = ($foreignKey) ? $foreignKey : strtolower(get_class($this)) . self::$_foreignSuffix; + + $table =& $this->TableInfo(); + if(!isset($table->_hasMany[$foreignRef])) + { + $table->_hasMany[$foreignRef] = $ar; + $table->updateColsCount(); + } +# @todo Can I make this guy be lazy? + $this->$foreignRef = $table->_hasMany[$foreignRef]; // WATCHME Removed assignment by ref. to please __get() + } + + /** + * ar->foreignName will contain the name of the tables associated with this table because + * this table's rows may also be referenced by those tables using thistable_id or the provided + * foreign keys (this index name is stored in ar->foreignKey) + * + * this-table.other-table_id = other-table.id + */ + function belongsTo($foreignRef,$foreignKey=false) + { + global $inflector; + + $ar = new ADODB_Active_Record($this->_pluralize($foreignRef)); + $ar->foreignName = $foreignRef; + $ar->UpdateActiveTable(); + $ar->foreignKey = ($foreignKey) ? $foreignKey : $ar->foreignName . self::$_foreignSuffix; + + $table =& $this->TableInfo(); + if(!isset($table->_belongsTo[$foreignRef])) + { + $table->_belongsTo[$foreignRef] = $ar; + $table->updateColsCount(); + } + $this->$foreignRef = $table->_belongsTo[$foreignRef]; + } + + /** + * __get Access properties - used for lazy loading + * + * @param mixed $name + * @access protected + * @return void + */ + function __get($name) + { + return $this->LoadRelations($name, '', -1. -1); + } + + function LoadRelations($name, $whereOrderBy, $offset=-1, $limit=-1) + { + $extras = array(); + if($offset >= 0) $extras['offset'] = $offset; + if($limit >= 0) $extras['limit'] = $limit; + $table =& $this->TableInfo(); + + if (strlen($whereOrderBy)) + if (!preg_match('/^[ \n\r]*AND/i',$whereOrderBy)) + if (!preg_match('/^[ \n\r]*ORDER[ \n\r]/i',$whereOrderBy)) + $whereOrderBy = 'AND '.$whereOrderBy; + + if(!empty($table->_belongsTo[$name])) + { + $obj = $table->_belongsTo[$name]; + $columnName = $obj->foreignKey; + if(empty($this->$columnName)) + $this->$name = null; + else + { + if(($k = reset($obj->TableInfo()->keys))) + $belongsToId = $k; + else + $belongsToId = 'id'; + + $arrayOfOne = + $obj->Find( + $belongsToId.'='.$this->$columnName.' '.$whereOrderBy, false, false, $extras); + $this->$name = $arrayOfOne[0]; + } + return $this->$name; + } + if(!empty($table->_hasMany[$name])) + { + $obj = $table->_hasMany[$name]; + if(($k = reset($table->keys))) + $hasManyId = $k; + else + $hasManyId = 'id'; + + $this->$name = + $obj->Find( + $obj->foreignKey.'='.$this->$hasManyId.' '.$whereOrderBy, false, false, $extras); + return $this->$name; + } + } + ////////////////////////////////// + + // update metadata + function UpdateActiveTable($pkeys=false,$forceUpdate=false) + { + global $ADODB_ASSOC_CASE,$_ADODB_ACTIVE_DBS , $ADODB_CACHE_DIR, $ADODB_ACTIVE_CACHESECS; + global $ADODB_ACTIVE_DEFVALS, $ADODB_FETCH_MODE; + + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + + $table = $this->_table; + $tables = $activedb->tables; + $tableat = $this->_tableat; + if (!$forceUpdate && !empty($tables[$tableat])) { + + $tobj = $tables[$tableat]; + foreach($tobj->flds as $name => $fld) { + if ($ADODB_ACTIVE_DEFVALS && isset($fld->default_value)) + $this->$name = $fld->default_value; + else + $this->$name = null; + } + return; + } + + $db = $activedb->db; + $fname = $ADODB_CACHE_DIR . '/adodb_' . $db->databaseType . '_active_'. $table . '.cache'; + if (!$forceUpdate && $ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR && file_exists($fname)) { + $fp = fopen($fname,'r'); + @flock($fp, LOCK_SH); + $acttab = unserialize(fread($fp,100000)); + fclose($fp); + if ($acttab->_created + $ADODB_ACTIVE_CACHESECS - (abs(rand()) % 16) > time()) { + // abs(rand()) randomizes deletion, reducing contention to delete/refresh file + // ideally, you should cache at least 32 secs + $activedb->tables[$table] = $acttab; + + //if ($db->debug) ADOConnection::outp("Reading cached active record file: $fname"); + return; + } else if ($db->debug) { + ADOConnection::outp("Refreshing cached active record file: $fname"); + } + } + $activetab = new ADODB_Active_Table(); + $activetab->name = $table; + + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; + if ($db->fetchMode !== false) $savem = $db->SetFetchMode(false); + + $cols = $db->MetaColumns($table); + + if (isset($savem)) $db->SetFetchMode($savem); + $ADODB_FETCH_MODE = $save; + + if (!$cols) { + $this->Error("Invalid table name: $table",'UpdateActiveTable'); + return false; + } + $fld = reset($cols); + if (!$pkeys) { + if (isset($fld->primary_key)) { + $pkeys = array(); + foreach($cols as $name => $fld) { + if (!empty($fld->primary_key)) $pkeys[] = $name; + } + } else + $pkeys = $this->GetPrimaryKeys($db, $table); + } + if (empty($pkeys)) { + $this->Error("No primary key found for table $table",'UpdateActiveTable'); + return false; + } + + $attr = array(); + $keys = array(); + + switch($ADODB_ASSOC_CASE) { + case 0: + foreach($cols as $name => $fldobj) { + $name = strtolower($name); + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) + $this->$name = $fldobj->default_value; + else + $this->$name = null; + $attr[$name] = $fldobj; + } + foreach($pkeys as $k => $name) { + $keys[strtolower($name)] = strtolower($name); + } + break; + + case 1: + foreach($cols as $name => $fldobj) { + $name = strtoupper($name); + + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) + $this->$name = $fldobj->default_value; + else + $this->$name = null; + $attr[$name] = $fldobj; + } + + foreach($pkeys as $k => $name) { + $keys[strtoupper($name)] = strtoupper($name); + } + break; + default: + foreach($cols as $name => $fldobj) { + $name = ($fldobj->name); + + if ($ADODB_ACTIVE_DEFVALS && isset($fldobj->default_value)) + $this->$name = $fldobj->default_value; + else + $this->$name = null; + $attr[$name] = $fldobj; + } + foreach($pkeys as $k => $name) { + $keys[$name] = $cols[$name]->name; + } + break; + } + + $activetab->keys = $keys; + $activetab->flds = $attr; + $activetab->updateColsCount(); + + if ($ADODB_ACTIVE_CACHESECS && $ADODB_CACHE_DIR) { + $activetab->_created = time(); + $s = serialize($activetab); + if (!function_exists('adodb_write_file')) include(ADODB_DIR.'/adodb-csvlib.inc.php'); + adodb_write_file($fname,$s); + } + if (isset($activedb->tables[$table])) { + $oldtab = $activedb->tables[$table]; + + if ($oldtab) $activetab->_belongsTo = $oldtab->_belongsTo; + if ($oldtab) $activetab->_hasMany = $oldtab->_hasMany; + } + $activedb->tables[$table] = $activetab; + } + + function GetPrimaryKeys(&$db, $table) + { + return $db->MetaPrimaryKeys($table); + } + + // error handler for both PHP4+5. + function Error($err,$fn) + { + global $_ADODB_ACTIVE_DBS; + + $fn = get_class($this).'::'.$fn; + $this->_lasterr = $fn.': '.$err; + + if ($this->_dbat < 0) $db = false; + else { + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $db = $activedb->db; + } + + if (function_exists('adodb_throw')) { + if (!$db) adodb_throw('ADOdb_Active_Record', $fn, -1, $err, 0, 0, false); + else adodb_throw($db->databaseType, $fn, -1, $err, 0, 0, $db); + } else + if (!$db || $db->debug) ADOConnection::outp($this->_lasterr); + + } + + // return last error message + function ErrorMsg() + { + if (!function_exists('adodb_throw')) { + if ($this->_dbat < 0) $db = false; + else $db = $this->DB(); + + // last error could be database error too + if ($db && $db->ErrorMsg()) return $db->ErrorMsg(); + } + return $this->_lasterr; + } + + function ErrorNo() + { + if ($this->_dbat < 0) return -9999; // no database connection... + $db = $this->DB(); + + return (int) $db->ErrorNo(); + } + + + // retrieve ADOConnection from _ADODB_Active_DBs + function DB() + { + global $_ADODB_ACTIVE_DBS; + + if ($this->_dbat < 0) { + $false = false; + $this->Error("No database connection set: use ADOdb_Active_Record::SetDatabaseAdaptor(\$db)", "DB"); + return $false; + } + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $db = $activedb->db; + return $db; + } + + // retrieve ADODB_Active_Table + function &TableInfo() + { + global $_ADODB_ACTIVE_DBS; + + $activedb = $_ADODB_ACTIVE_DBS[$this->_dbat]; + $table = $activedb->tables[$this->_tableat]; + return $table; + } + + + // I have an ON INSERT trigger on a table that sets other columns in the table. + // So, I find that for myTable, I want to reload an active record after saving it. -- Malcolm Cook + function Reload() + { + $db =& $this->DB(); if (!$db) return false; + $table =& $this->TableInfo(); + $where = $this->GenWhere($db, $table); + return($this->Load($where)); + } + + + // set a numeric array (using natural table field ordering) as object properties + function Set(&$row) + { + global $ACTIVE_RECORD_SAFETY; + + $db = $this->DB(); + + if (!$row) { + $this->_saved = false; + return false; + } + + $this->_saved = true; + + $table = $this->TableInfo(); + $sizeofFlds = sizeof($table->flds); + $sizeofRow = sizeof($row); + if ($ACTIVE_RECORD_SAFETY && $table->_colsCount != $sizeofRow && $sizeofFlds != $sizeofRow) { + # + $bad_size = TRUE; + if($sizeofRow == 2 * $table->_colsCount || $sizeofRow == 2 * $sizeofFlds) { + // Only keep string keys + $keys = array_filter(array_keys($row), 'is_string'); + if (sizeof($keys) == sizeof($table->flds)) + $bad_size = FALSE; + } + if ($bad_size) { + $this->Error("Table structure of $this->_table has changed","Load"); + return false; + } + # + } + else + $keys = array_keys($row); + # + reset($keys); + $this->_original = array(); + foreach($table->flds as $name=>$fld) + { + $value = $row[current($keys)]; + $this->$name = $value; + $this->_original[] = $value; + if(!next($keys)) break; + } + $table =& $this->TableInfo(); + foreach($table->_belongsTo as $foreignTable) + { + $ft = $foreignTable->TableInfo(); + $propertyName = $ft->name; + foreach($ft->flds as $name=>$fld) + { + $value = $row[current($keys)]; + $foreignTable->$name = $value; + $foreignTable->_original[] = $value; + if(!next($keys)) break; + } + } + foreach($table->_hasMany as $foreignTable) + { + $ft = $foreignTable->TableInfo(); + foreach($ft->flds as $name=>$fld) + { + $value = $row[current($keys)]; + $foreignTable->$name = $value; + $foreignTable->_original[] = $value; + if(!next($keys)) break; + } + } + # + return true; + } + + // get last inserted id for INSERT + function LastInsertID(&$db,$fieldname) + { + if ($db->hasInsertID) + $val = $db->Insert_ID($this->_table,$fieldname); + else + $val = false; + + if (is_null($val) || $val === false) { + // this might not work reliably in multi-user environment + return $db->GetOne("select max(".$fieldname.") from ".$this->_table); + } + return $val; + } + + // quote data in where clause + function doquote(&$db, $val,$t) + { + switch($t) { + case 'D': + case 'T': + if (empty($val)) return 'null'; + + case 'C': + case 'X': + if (is_null($val)) return 'null'; + + if (strlen($val)>1 && + (strncmp($val,"'",1) != 0 || substr($val,strlen($val)-1,1) != "'")) { + return $db->qstr($val); + break; + } + default: + return $val; + break; + } + } + + // generate where clause for an UPDATE/SELECT + function GenWhere(&$db, &$table) + { + $keys = $table->keys; + $parr = array(); + + foreach($keys as $k) { + $f = $table->flds[$k]; + if ($f) { + $parr[] = $k.' = '.$this->doquote($db,$this->$k,$db->MetaType($f->type)); + } + } + return implode(' and ', $parr); + } + + + //------------------------------------------------------------ Public functions below + + function Load($where=null,$bindarr=false) + { + $db = $this->DB(); if (!$db) return false; + $this->_where = $where; + + $save = $db->SetFetchMode(ADODB_FETCH_NUM); + $qry = "select * from ".$this->_table; + $table =& $this->TableInfo(); + + if(($k = reset($table->keys))) + $hasManyId = $k; + else + $hasManyId = 'id'; + + foreach($table->_belongsTo as $foreignTable) + { + if(($k = reset($foreignTable->TableInfo()->keys))) + { + $belongsToId = $k; + } + else + { + $belongsToId = 'id'; + } + $qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '. + $this->_table.'.'.$foreignTable->foreignKey.'='. + $foreignTable->_table.'.'.$belongsToId; + } + foreach($table->_hasMany as $foreignTable) + { + $qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '. + $this->_table.'.'.$hasManyId.'='. + $foreignTable->_table.'.'.$foreignTable->foreignKey; + } + if($where) + $qry .= ' WHERE '.$where; + + // Simple case: no relations. Load row and return. + if((count($table->_hasMany) + count($table->_belongsTo)) < 1) + { + $row = $db->GetRow($qry,$bindarr); + if(!$row) + return false; + $db->SetFetchMode($save); + return $this->Set($row); + } + + // More complex case when relations have to be collated + $rows = $db->GetAll($qry,$bindarr); + if(!$rows) + return false; + $db->SetFetchMode($save); + if(count($rows) < 1) + return false; + $class = get_class($this); + $isFirstRow = true; + + if(($k = reset($this->TableInfo()->keys))) + $myId = $k; + else + $myId = 'id'; + $index = 0; $found = false; + /** @todo Improve by storing once and for all in table metadata */ + /** @todo Also re-use info for hasManyId */ + foreach($this->TableInfo()->flds as $fld) + { + if($fld->name == $myId) + { + $found = true; + break; + } + $index++; + } + if(!$found) + $this->outp_throw("Unable to locate key $myId for $class in Load()",'Load'); + + foreach($rows as $row) + { + $rowId = intval($row[$index]); + if($rowId > 0) + { + if($isFirstRow) + { + $isFirstRow = false; + if(!$this->Set($row)) + return false; + } + $obj = new $class($table,false,$db); + $obj->Set($row); + // TODO Copy/paste code below: bad! + if(count($table->_hasMany) > 0) + { + foreach($table->_hasMany as $foreignTable) + { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) + { + if(!is_array($this->$foreignName)) + { + $foreignObj = $this->$foreignName; + $this->$foreignName = array(clone($foreignObj)); + } + else + { + $foreignObj = $obj->$foreignName; + array_push($this->$foreignName, clone($foreignObj)); + } + } + } + } + if(count($table->_belongsTo) > 0) + { + foreach($table->_belongsTo as $foreignTable) + { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) + { + if(!is_array($this->$foreignName)) + { + $foreignObj = $this->$foreignName; + $this->$foreignName = array(clone($foreignObj)); + } + else + { + $foreignObj = $obj->$foreignName; + array_push($this->$foreignName, clone($foreignObj)); + } + } + } + } + } + } + return true; + } + + // false on error + function Save() + { + if ($this->_saved) $ok = $this->Update(); + else $ok = $this->Insert(); + + return $ok; + } + + // CFR: Sometimes we may wish to consider that an object is not to be replaced but inserted. + // Sample use case: an 'undo' command object (after a delete()) + function Dirty() + { + $this->_saved = false; + } + + // false on error + function Insert() + { + $db = $this->DB(); if (!$db) return false; + $cnt = 0; + $table = $this->TableInfo(); + + $valarr = array(); + $names = array(); + $valstr = array(); + + foreach($table->flds as $name=>$fld) { + $val = $this->$name; + if(!is_null($val) || !array_key_exists($name, $table->keys)) { + $valarr[] = $val; + $names[] = $name; + $valstr[] = $db->Param($cnt); + $cnt += 1; + } + } + + if (empty($names)){ + foreach($table->flds as $name=>$fld) { + $valarr[] = null; + $names[] = $name; + $valstr[] = $db->Param($cnt); + $cnt += 1; + } + } + $sql = 'INSERT INTO '.$this->_table."(".implode(',',$names).') VALUES ('.implode(',',$valstr).')'; + $ok = $db->Execute($sql,$valarr); + + if ($ok) { + $this->_saved = true; + $autoinc = false; + foreach($table->keys as $k) { + if (is_null($this->$k)) { + $autoinc = true; + break; + } + } + if ($autoinc && sizeof($table->keys) == 1) { + $k = reset($table->keys); + $this->$k = $this->LastInsertID($db,$k); + } + } + + $this->_original = $valarr; + return !empty($ok); + } + + function Delete() + { + $db = $this->DB(); if (!$db) return false; + $table = $this->TableInfo(); + + $where = $this->GenWhere($db,$table); + $sql = 'DELETE FROM '.$this->_table.' WHERE '.$where; + $ok = $db->Execute($sql); + + return $ok ? true : false; + } + + // returns an array of active record objects + function Find($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()) + { + $db = $this->DB(); if (!$db || empty($this->_table)) return false; + $table =& $this->TableInfo(); + $arr = $db->GetActiveRecordsClass(get_class($this),$this, $whereOrderBy,$bindarr,$pkeysArr,$extra, + array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany)); + return $arr; + } + + // CFR: In introduced this method to ensure that inner workings are not disturbed by + // subclasses...for instance when GetActiveRecordsClass invokes Find() + // Why am I not invoking parent::Find? + // Shockingly because I want to preserve PHP4 compatibility. + function packageFind($whereOrderBy,$bindarr=false,$pkeysArr=false,$extra=array()) + { + $db = $this->DB(); if (!$db || empty($this->_table)) return false; + $table =& $this->TableInfo(); + $arr = $db->GetActiveRecordsClass(get_class($this),$this, $whereOrderBy,$bindarr,$pkeysArr,$extra, + array('foreignName'=>$this->foreignName, 'belongsTo'=>$table->_belongsTo, 'hasMany'=>$table->_hasMany)); + return $arr; + } + + // returns 0 on error, 1 on update, 2 on insert + function Replace() + { + global $ADODB_ASSOC_CASE; + + $db = $this->DB(); if (!$db) return false; + $table = $this->TableInfo(); + + $pkey = $table->keys; + + foreach($table->flds as $name=>$fld) { + $val = $this->$name; + /* + if (is_null($val)) { + if (isset($fld->not_null) && $fld->not_null) { + if (isset($fld->default_value) && strlen($fld->default_value)) continue; + else { + $this->Error("Cannot update null into $name","Replace"); + return false; + } + } + }*/ + if (is_null($val) && !empty($fld->auto_increment)) { + continue; + } + $t = $db->MetaType($fld->type); + $arr[$name] = $this->doquote($db,$val,$t); + $valarr[] = $val; + } + + if (!is_array($pkey)) $pkey = array($pkey); + + + if ($ADODB_ASSOC_CASE == 0) + foreach($pkey as $k => $v) + $pkey[$k] = strtolower($v); + elseif ($ADODB_ASSOC_CASE == 1) + foreach($pkey as $k => $v) + $pkey[$k] = strtoupper($v); + + $ok = $db->Replace($this->_table,$arr,$pkey); + if ($ok) { + $this->_saved = true; // 1= update 2=insert + if ($ok == 2) { + $autoinc = false; + foreach($table->keys as $k) { + if (is_null($this->$k)) { + $autoinc = true; + break; + } + } + if ($autoinc && sizeof($table->keys) == 1) { + $k = reset($table->keys); + $this->$k = $this->LastInsertID($db,$k); + } + } + + $this->_original = $valarr; + } + return $ok; + } + + // returns 0 on error, 1 on update, -1 if no change in data (no update) + function Update() + { + $db = $this->DB(); if (!$db) return false; + $table = $this->TableInfo(); + + $where = $this->GenWhere($db, $table); + + if (!$where) { + $this->error("Where missing for table $table", "Update"); + return false; + } + $valarr = array(); + $neworig = array(); + $pairs = array(); + $i = -1; + $cnt = 0; + foreach($table->flds as $name=>$fld) { + $i += 1; + $val = $this->$name; + $neworig[] = $val; + + if (isset($table->keys[$name])) { + continue; + } + + if (is_null($val)) { + if (isset($fld->not_null) && $fld->not_null) { + if (isset($fld->default_value) && strlen($fld->default_value)) continue; + else { + $this->Error("Cannot set field $name to NULL","Update"); + return false; + } + } + } + + if (isset($this->_original[$i]) && $val == $this->_original[$i]) { + continue; + } + $valarr[] = $val; + $pairs[] = $name.'='.$db->Param($cnt); + $cnt += 1; + } + + + if (!$cnt) return -1; + $sql = 'UPDATE '.$this->_table." SET ".implode(",",$pairs)." WHERE ".$where; + $ok = $db->Execute($sql,$valarr); + if ($ok) { + $this->_original = $neworig; + return 1; + } + return 0; + } + + function GetAttributeNames() + { + $table = $this->TableInfo(); + if (!$table) return false; + return array_keys($table->flds); + } + +}; + +function adodb_GetActiveRecordsClass(&$db, $class, $tableObj,$whereOrderBy,$bindarr, $primkeyArr, + $extra, $relations) +{ + global $_ADODB_ACTIVE_DBS; + + if (empty($extra['loading'])) $extra['loading'] = ADODB_LAZY_AR; + + $save = $db->SetFetchMode(ADODB_FETCH_NUM); + $table = &$tableObj->_table; + $tableInfo =& $tableObj->TableInfo(); + if(($k = reset($tableInfo->keys))) + $myId = $k; + else + $myId = 'id'; + $index = 0; $found = false; + /** @todo Improve by storing once and for all in table metadata */ + /** @todo Also re-use info for hasManyId */ + foreach($tableInfo->flds as $fld) + { + if($fld->name == $myId) + { + $found = true; + break; + } + $index++; + } + if(!$found) + $db->outp_throw("Unable to locate key $myId for $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); + + $qry = "select * from ".$table; + if(ADODB_JOIN_AR == $extra['loading']) + { + if(!empty($relations['belongsTo'])) + { + foreach($relations['belongsTo'] as $foreignTable) + { + if(($k = reset($foreignTable->TableInfo()->keys))) + { + $belongsToId = $k; + } + else + { + $belongsToId = 'id'; + } + + $qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '. + $table.'.'.$foreignTable->foreignKey.'='. + $foreignTable->_table.'.'.$belongsToId; + } + } + if(!empty($relations['hasMany'])) + { + if(empty($relations['foreignName'])) + $db->outp_throw("Missing foreignName is relation specification in GetActiveRecordsClass()",'GetActiveRecordsClass'); + if(($k = reset($tableInfo->keys))) + $hasManyId = $k; + else + $hasManyId = 'id'; + + foreach($relations['hasMany'] as $foreignTable) + { + $qry .= ' LEFT JOIN '.$foreignTable->_table.' ON '. + $table.'.'.$hasManyId.'='. + $foreignTable->_table.'.'.$foreignTable->foreignKey; + } + } + } + if (!empty($whereOrderBy)) + $qry .= ' WHERE '.$whereOrderBy; + if(isset($extra['limit'])) + { + $rows = false; + if(isset($extra['offset'])) { + $rs = $db->SelectLimit($qry, $extra['limit'], $extra['offset']); + } else { + $rs = $db->SelectLimit($qry, $extra['limit']); + } + if ($rs) { + while (!$rs->EOF) { + $rows[] = $rs->fields; + $rs->MoveNext(); + } + } + } else + $rows = $db->GetAll($qry,$bindarr); + + $db->SetFetchMode($save); + + $false = false; + + if ($rows === false) { + return $false; + } + + + if (!isset($_ADODB_ACTIVE_DBS)) { + include(ADODB_DIR.'/adodb-active-record.inc.php'); + } + if (!class_exists($class)) { + $db->outp_throw("Unknown class $class in GetActiveRecordsClass()",'GetActiveRecordsClass'); + return $false; + } + $uniqArr = array(); // CFR Keep track of records for relations + $arr = array(); + // arrRef will be the structure that knows about our objects. + // It is an associative array. + // We will, however, return arr, preserving regular 0.. order so that + // obj[0] can be used by app developpers. + $arrRef = array(); + $bTos = array(); // Will store belongTo's indices if any + foreach($rows as $row) { + + $obj = new $class($table,$primkeyArr,$db); + if ($obj->ErrorNo()){ + $db->_errorMsg = $obj->ErrorMsg(); + return $false; + } + $obj->Set($row); + // CFR: FIXME: Insane assumption here: + // If the first column returned is an integer, then it's a 'id' field + // And to make things a bit worse, I use intval() rather than is_int() because, in fact, + // $row[0] is not an integer. + // + // So, what does this whole block do? + // When relationships are found, we perform JOINs. This is fast. But not accurate: + // instead of returning n objects with their n' associated cousins, + // we get n*n' objects. This code fixes this. + // Note: to-many relationships mess around with the 'limit' parameter + $rowId = intval($row[$index]); + + if(ADODB_WORK_AR == $extra['loading']) + { + $arrRef[$rowId] = $obj; + $arr[] = &$arrRef[$rowId]; + if(!isset($indices)) + $indices = $rowId; + else + $indices .= ','.$rowId; + if(!empty($relations['belongsTo'])) + { + foreach($relations['belongsTo'] as $foreignTable) + { + $foreignTableRef = $foreignTable->foreignKey; + // First array: list of foreign ids we are looking for + if(empty($bTos[$foreignTableRef])) + $bTos[$foreignTableRef] = array(); + // Second array: list of ids found + if(empty($obj->$foreignTableRef)) + continue; + if(empty($bTos[$foreignTableRef][$obj->$foreignTableRef])) + $bTos[$foreignTableRef][$obj->$foreignTableRef] = array(); + $bTos[$foreignTableRef][$obj->$foreignTableRef][] = $obj; + } + } + continue; + } + + if($rowId>0) + { + if(ADODB_JOIN_AR == $extra['loading']) + { + $isNewObj = !isset($uniqArr['_'.$row[0]]); + if($isNewObj) + $uniqArr['_'.$row[0]] = $obj; + + // TODO Copy/paste code below: bad! + if(!empty($relations['hasMany'])) + { + foreach($relations['hasMany'] as $foreignTable) + { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) + { + $masterObj = &$uniqArr['_'.$row[0]]; + // Assumption: this property exists in every object since they are instances of the same class + if(!is_array($masterObj->$foreignName)) + { + // Pluck! + $foreignObj = $masterObj->$foreignName; + $masterObj->$foreignName = array(clone($foreignObj)); + } + else + { + // Pluck pluck! + $foreignObj = $obj->$foreignName; + array_push($masterObj->$foreignName, clone($foreignObj)); + } + } + } + } + if(!empty($relations['belongsTo'])) + { + foreach($relations['belongsTo'] as $foreignTable) + { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) + { + $masterObj = &$uniqArr['_'.$row[0]]; + // Assumption: this property exists in every object since they are instances of the same class + if(!is_array($masterObj->$foreignName)) + { + // Pluck! + $foreignObj = $masterObj->$foreignName; + $masterObj->$foreignName = array(clone($foreignObj)); + } + else + { + // Pluck pluck! + $foreignObj = $obj->$foreignName; + array_push($masterObj->$foreignName, clone($foreignObj)); + } + } + } + } + if(!$isNewObj) + unset($obj); // We do not need this object itself anymore and do not want it re-added to the main array + } + else if(ADODB_LAZY_AR == $extra['loading']) + { + // Lazy loading: we need to give AdoDb a hint that we have not really loaded + // anything, all the while keeping enough information on what we wish to load. + // Let's do this by keeping the relevant info in our relationship arrays + // but get rid of the actual properties. + // We will then use PHP's __get to load these properties on-demand. + if(!empty($relations['hasMany'])) + { + foreach($relations['hasMany'] as $foreignTable) + { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) + { + unset($obj->$foreignName); + } + } + } + if(!empty($relations['belongsTo'])) + { + foreach($relations['belongsTo'] as $foreignTable) + { + $foreignName = $foreignTable->foreignName; + if(!empty($obj->$foreignName)) + { + unset($obj->$foreignName); + } + } + } + } + } + + if(isset($obj)) + $arr[] = $obj; + } + + if(ADODB_WORK_AR == $extra['loading']) + { + // The best of both worlds? + // Here, the number of queries is constant: 1 + n*relationship. + // The second query will allow us to perform a good join + // while preserving LIMIT etc. + if(!empty($relations['hasMany'])) + { + foreach($relations['hasMany'] as $foreignTable) + { + $foreignName = $foreignTable->foreignName; + $className = ucfirst($foreignTable->_singularize($foreignName)); + $obj = new $className(); + $dbClassRef = $foreignTable->foreignKey; + $objs = $obj->packageFind($dbClassRef.' IN ('.$indices.')'); + foreach($objs as $obj) + { + if(!is_array($arrRef[$obj->$dbClassRef]->$foreignName)) + $arrRef[$obj->$dbClassRef]->$foreignName = array(); + array_push($arrRef[$obj->$dbClassRef]->$foreignName, $obj); + } + } + + } + if(!empty($relations['belongsTo'])) + { + foreach($relations['belongsTo'] as $foreignTable) + { + $foreignTableRef = $foreignTable->foreignKey; + if(empty($bTos[$foreignTableRef])) + continue; + if(($k = reset($foreignTable->TableInfo()->keys))) + { + $belongsToId = $k; + } + else + { + $belongsToId = 'id'; + } + $origObjsArr = $bTos[$foreignTableRef]; + $bTosString = implode(',', array_keys($bTos[$foreignTableRef])); + $foreignName = $foreignTable->foreignName; + $className = ucfirst($foreignTable->_singularize($foreignName)); + $obj = new $className(); + $objs = $obj->packageFind($belongsToId.' IN ('.$bTosString.')'); + foreach($objs as $obj) + { + foreach($origObjsArr[$obj->$belongsToId] as $idx=>$origObj) + { + $origObj->$foreignName = $obj; + } + } + } + } + } + + return $arr; +} +?> diff --git a/adodb/adodb-csvlib.inc.php b/adodb/adodb-csvlib.inc.php new file mode 100644 index 0000000..1c0d081 --- /dev/null +++ b/adodb/adodb-csvlib.inc.php @@ -0,0 +1,318 @@ +FieldCount() : 0; + + if ($sql) $sql = urlencode($sql); + // metadata setup + + if ($max <= 0 || $rs->dataProvider == 'empty') { // is insert/update/delete + if (is_object($conn)) { + $sql .= ','.$conn->Affected_Rows(); + $sql .= ','.$conn->Insert_ID(); + } else + $sql .= ',,'; + + $text = "====-1,0,$sql\n"; + return $text; + } + $tt = ($rs->timeCreated) ? $rs->timeCreated : time(); + + ## changed format from ====0 to ====1 + $line = "====1,$tt,$sql\n"; + + if ($rs->databaseType == 'array') { + $rows = $rs->_array; + } else { + $rows = array(); + while (!$rs->EOF) { + $rows[] = $rs->fields; + $rs->MoveNext(); + } + } + + for($i=0; $i < $max; $i++) { + $o = $rs->FetchField($i); + $flds[] = $o; + } + + $savefetch = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode; + $class = $rs->connection->arrayClass; + $rs2 = new $class(); + $rs2->timeCreated = $rs->timeCreated; # memcache fix + $rs2->sql = $rs->sql; + $rs2->oldProvider = $rs->dataProvider; + $rs2->InitArrayFields($rows,$flds); + $rs2->fetchMode = $savefetch; + return $line.serialize($rs2); + } + + +/** +* Open CSV file and convert it into Data. +* +* @param url file/ftp/http url +* @param err returns the error message +* @param timeout dispose if recordset has been alive for $timeout secs +* +* @return recordset, or false if error occured. If no +* error occurred in sql INSERT/UPDATE/DELETE, +* empty recordset is returned +*/ + function csv2rs($url,&$err,$timeout=0, $rsclass='ADORecordSet_array') + { + $false = false; + $err = false; + $fp = @fopen($url,'rb'); + if (!$fp) { + $err = $url.' file/URL not found'; + return $false; + } + @flock($fp, LOCK_SH); + $arr = array(); + $ttl = 0; + + if ($meta = fgetcsv($fp, 32000, ",")) { + // check if error message + if (strncmp($meta[0],'****',4) === 0) { + $err = trim(substr($meta[0],4,1024)); + fclose($fp); + return $false; + } + // check for meta data + // $meta[0] is -1 means return an empty recordset + // $meta[1] contains a time + + if (strncmp($meta[0], '====',4) === 0) { + + if ($meta[0] == "====-1") { + if (sizeof($meta) < 5) { + $err = "Corrupt first line for format -1"; + fclose($fp); + return $false; + } + fclose($fp); + + if ($timeout > 0) { + $err = " Illegal Timeout $timeout "; + return $false; + } + + $rs = new $rsclass($val=true); + $rs->fields = array(); + $rs->timeCreated = $meta[1]; + $rs->EOF = true; + $rs->_numOfFields = 0; + $rs->sql = urldecode($meta[2]); + $rs->affectedrows = (integer)$meta[3]; + $rs->insertid = $meta[4]; + return $rs; + } + # Under high volume loads, we want only 1 thread/process to _write_file + # so that we don't have 50 processes queueing to write the same data. + # We use probabilistic timeout, ahead of time. + # + # -4 sec before timeout, give processes 1/32 chance of timing out + # -2 sec before timeout, give processes 1/16 chance of timing out + # -1 sec after timeout give processes 1/4 chance of timing out + # +0 sec after timeout, give processes 100% chance of timing out + if (sizeof($meta) > 1) { + if($timeout >0){ + $tdiff = (integer)( $meta[1]+$timeout - time()); + if ($tdiff <= 2) { + switch($tdiff) { + case 4: + case 3: + if ((rand() & 31) == 0) { + fclose($fp); + $err = "Timeout 3"; + return $false; + } + break; + case 2: + if ((rand() & 15) == 0) { + fclose($fp); + $err = "Timeout 2"; + return $false; + } + break; + case 1: + if ((rand() & 3) == 0) { + fclose($fp); + $err = "Timeout 1"; + return $false; + } + break; + default: + fclose($fp); + $err = "Timeout 0"; + return $false; + } // switch + + } // if check flush cache + }// (timeout>0) + $ttl = $meta[1]; + } + //================================================ + // new cache format - use serialize extensively... + if ($meta[0] === '====1') { + // slurp in the data + $MAXSIZE = 128000; + + $text = fread($fp,$MAXSIZE); + if (strlen($text)) { + while ($txt = fread($fp,$MAXSIZE)) { + $text .= $txt; + } + } + fclose($fp); + $rs = unserialize($text); + if (is_object($rs)) $rs->timeCreated = $ttl; + else { + $err = "Unable to unserialize recordset"; + //echo htmlspecialchars($text),' !--END--!

'; + } + return $rs; + } + + $meta = false; + $meta = fgetcsv($fp, 32000, ","); + if (!$meta) { + fclose($fp); + $err = "Unexpected EOF 1"; + return $false; + } + } + + // Get Column definitions + $flds = array(); + foreach($meta as $o) { + $o2 = explode(':',$o); + if (sizeof($o2)!=3) { + $arr[] = $meta; + $flds = false; + break; + } + $fld = new ADOFieldObject(); + $fld->name = urldecode($o2[0]); + $fld->type = $o2[1]; + $fld->max_length = $o2[2]; + $flds[] = $fld; + } + } else { + fclose($fp); + $err = "Recordset had unexpected EOF 2"; + return $false; + } + + // slurp in the data + $MAXSIZE = 128000; + + $text = ''; + while ($txt = fread($fp,$MAXSIZE)) { + $text .= $txt; + } + + fclose($fp); + @$arr = unserialize($text); + //var_dump($arr); + if (!is_array($arr)) { + $err = "Recordset had unexpected EOF (in serialized recordset)"; + if (get_magic_quotes_runtime()) $err .= ". Magic Quotes Runtime should be disabled!"; + return $false; + } + $rs = new $rsclass(); + $rs->timeCreated = $ttl; + $rs->InitArrayFields($arr,$flds); + return $rs; + } + + + /** + * Save a file $filename and its $contents (normally for caching) with file locking + * Returns true if ok, false if fopen/fwrite error, 0 if rename error (eg. file is locked) + */ + function adodb_write_file($filename, $contents,$debug=false) + { + # http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows + # So to simulate locking, we assume that rename is an atomic operation. + # First we delete $filename, then we create a $tempfile write to it and + # rename to the desired $filename. If the rename works, then we successfully + # modified the file exclusively. + # What a stupid need - having to simulate locking. + # Risks: + # 1. $tempfile name is not unique -- very very low + # 2. unlink($filename) fails -- ok, rename will fail + # 3. adodb reads stale file because unlink fails -- ok, $rs timeout occurs + # 4. another process creates $filename between unlink() and rename() -- ok, rename() fails and cache updated + if (strncmp(PHP_OS,'WIN',3) === 0) { + // skip the decimal place + $mtime = substr(str_replace(' ','_',microtime()),2); + // getmypid() actually returns 0 on Win98 - never mind! + $tmpname = $filename.uniqid($mtime).getmypid(); + if (!($fd = @fopen($tmpname,'w'))) return false; + if (fwrite($fd,$contents)) $ok = true; + else $ok = false; + fclose($fd); + + if ($ok) { + @chmod($tmpname,0644); + // the tricky moment + @unlink($filename); + if (!@rename($tmpname,$filename)) { + unlink($tmpname); + $ok = 0; + } + if (!$ok) { + if ($debug) ADOConnection::outp( " Rename $tmpname ".($ok? 'ok' : 'failed')); + } + } + return $ok; + } + if (!($fd = @fopen($filename, 'a'))) return false; + if (flock($fd, LOCK_EX) && ftruncate($fd, 0)) { + if (fwrite( $fd, $contents )) $ok = true; + else $ok = false; + fclose($fd); + @chmod($filename,0644); + }else { + fclose($fd); + if ($debug)ADOConnection::outp( " Failed acquiring lock for $filename
\n"); + $ok = false; + } + + return $ok; + } +?> \ No newline at end of file diff --git a/adodb/adodb-datadict.inc.php b/adodb/adodb-datadict.inc.php new file mode 100644 index 0000000..69060c5 --- /dev/null +++ b/adodb/adodb-datadict.inc.php @@ -0,0 +1,1032 @@ +$str

"; +$a= Lens_ParseArgs($str); +print "
";
+print_r($a);
+print "
"; +} + + +if (!function_exists('ctype_alnum')) { + function ctype_alnum($text) { + return preg_match('/^[a-z0-9]*$/i', $text); + } +} + +//Lens_ParseTest(); + +/** + Parse arguments, treat "text" (text) and 'text' as quotation marks. + To escape, use "" or '' or )) + + Will read in "abc def" sans quotes, as: abc def + Same with 'abc def'. + However if `abc def`, then will read in as `abc def` + + @param endstmtchar Character that indicates end of statement + @param tokenchars Include the following characters in tokens apart from A-Z and 0-9 + @returns 2 dimensional array containing parsed tokens. +*/ +function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-') +{ + $pos = 0; + $intoken = false; + $stmtno = 0; + $endquote = false; + $tokens = array(); + $tokens[$stmtno] = array(); + $max = strlen($args); + $quoted = false; + $tokarr = array(); + + while ($pos < $max) { + $ch = substr($args,$pos,1); + switch($ch) { + case ' ': + case "\t": + case "\n": + case "\r": + if (!$quoted) { + if ($intoken) { + $intoken = false; + $tokens[$stmtno][] = implode('',$tokarr); + } + break; + } + + $tokarr[] = $ch; + break; + + case '`': + if ($intoken) $tokarr[] = $ch; + case '(': + case ')': + case '"': + case "'": + + if ($intoken) { + if (empty($endquote)) { + $tokens[$stmtno][] = implode('',$tokarr); + if ($ch == '(') $endquote = ')'; + else $endquote = $ch; + $quoted = true; + $intoken = true; + $tokarr = array(); + } else if ($endquote == $ch) { + $ch2 = substr($args,$pos+1,1); + if ($ch2 == $endquote) { + $pos += 1; + $tokarr[] = $ch2; + } else { + $quoted = false; + $intoken = false; + $tokens[$stmtno][] = implode('',$tokarr); + $endquote = ''; + } + } else + $tokarr[] = $ch; + + }else { + + if ($ch == '(') $endquote = ')'; + else $endquote = $ch; + $quoted = true; + $intoken = true; + $tokarr = array(); + if ($ch == '`') $tokarr[] = '`'; + } + break; + + default: + + if (!$intoken) { + if ($ch == $endstmtchar) { + $stmtno += 1; + $tokens[$stmtno] = array(); + break; + } + + $intoken = true; + $quoted = false; + $endquote = false; + $tokarr = array(); + + } + + if ($quoted) $tokarr[] = $ch; + else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch; + else { + if ($ch == $endstmtchar) { + $tokens[$stmtno][] = implode('',$tokarr); + $stmtno += 1; + $tokens[$stmtno] = array(); + $intoken = false; + $tokarr = array(); + break; + } + $tokens[$stmtno][] = implode('',$tokarr); + $tokens[$stmtno][] = $ch; + $intoken = false; + } + } + $pos += 1; + } + if ($intoken) $tokens[$stmtno][] = implode('',$tokarr); + + return $tokens; +} + + +class ADODB_DataDict { + var $connection; + var $debug = false; + var $dropTable = 'DROP TABLE %s'; + var $renameTable = 'RENAME TABLE %s TO %s'; + var $dropIndex = 'DROP INDEX %s'; + var $addCol = ' ADD'; + var $alterCol = ' ALTER COLUMN'; + var $dropCol = ' DROP COLUMN'; + var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s'; // table, old-column, new-column, column-definitions (not used by default) + var $nameRegex = '\w'; + var $nameRegexBrackets = 'a-zA-Z0-9_\(\)'; + var $schema = false; + var $serverInfo = array(); + var $autoIncrement = false; + var $dataProvider; + var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql + var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob + /// in other words, we use a text area for editting. + + function GetCommentSQL($table,$col) + { + return false; + } + + function SetCommentSQL($table,$col,$cmt) + { + return false; + } + + function MetaTables() + { + if (!$this->connection->IsConnected()) return array(); + return $this->connection->MetaTables(); + } + + function MetaColumns($tab, $upper=true, $schema=false) + { + if (!$this->connection->IsConnected()) return array(); + return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema); + } + + function MetaPrimaryKeys($tab,$owner=false,$intkey=false) + { + if (!$this->connection->IsConnected()) return array(); + return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey); + } + + function MetaIndexes($table, $primary = false, $owner = false) + { + if (!$this->connection->IsConnected()) return array(); + return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner); + } + + function MetaType($t,$len=-1,$fieldobj=false) + { + static $typeMap = array( + 'VARCHAR' => 'C', + 'VARCHAR2' => 'C', + 'CHAR' => 'C', + 'C' => 'C', + 'STRING' => 'C', + 'NCHAR' => 'C', + 'NVARCHAR' => 'C', + 'VARYING' => 'C', + 'BPCHAR' => 'C', + 'CHARACTER' => 'C', + 'INTERVAL' => 'C', # Postgres + 'MACADDR' => 'C', # postgres + 'VAR_STRING' => 'C', # mysql + ## + 'LONGCHAR' => 'X', + 'TEXT' => 'X', + 'NTEXT' => 'X', + 'M' => 'X', + 'X' => 'X', + 'CLOB' => 'X', + 'NCLOB' => 'X', + 'LVARCHAR' => 'X', + ## + 'BLOB' => 'B', + 'IMAGE' => 'B', + 'BINARY' => 'B', + 'VARBINARY' => 'B', + 'LONGBINARY' => 'B', + 'B' => 'B', + ## + 'YEAR' => 'D', // mysql + 'DATE' => 'D', + 'D' => 'D', + ## + 'UNIQUEIDENTIFIER' => 'C', # MS SQL Server + ## + 'TIME' => 'T', + 'TIMESTAMP' => 'T', + 'DATETIME' => 'T', + 'TIMESTAMPTZ' => 'T', + 'SMALLDATETIME' => 'T', + 'T' => 'T', + 'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql + ## + 'BOOL' => 'L', + 'BOOLEAN' => 'L', + 'BIT' => 'L', + 'L' => 'L', + ## + 'COUNTER' => 'R', + 'R' => 'R', + 'SERIAL' => 'R', // ifx + 'INT IDENTITY' => 'R', + ## + 'INT' => 'I', + 'INT2' => 'I', + 'INT4' => 'I', + 'INT8' => 'I', + 'INTEGER' => 'I', + 'INTEGER UNSIGNED' => 'I', + 'SHORT' => 'I', + 'TINYINT' => 'I', + 'SMALLINT' => 'I', + 'I' => 'I', + ## + 'LONG' => 'N', // interbase is numeric, oci8 is blob + 'BIGINT' => 'N', // this is bigger than PHP 32-bit integers + 'DECIMAL' => 'N', + 'DEC' => 'N', + 'REAL' => 'N', + 'DOUBLE' => 'N', + 'DOUBLE PRECISION' => 'N', + 'SMALLFLOAT' => 'N', + 'FLOAT' => 'N', + 'NUMBER' => 'N', + 'NUM' => 'N', + 'NUMERIC' => 'N', + 'MONEY' => 'N', + + ## informix 9.2 + 'SQLINT' => 'I', + 'SQLSERIAL' => 'I', + 'SQLSMINT' => 'I', + 'SQLSMFLOAT' => 'N', + 'SQLFLOAT' => 'N', + 'SQLMONEY' => 'N', + 'SQLDECIMAL' => 'N', + 'SQLDATE' => 'D', + 'SQLVCHAR' => 'C', + 'SQLCHAR' => 'C', + 'SQLDTIME' => 'T', + 'SQLINTERVAL' => 'N', + 'SQLBYTES' => 'B', + 'SQLTEXT' => 'X', + ## informix 10 + "SQLINT8" => 'I8', + "SQLSERIAL8" => 'I8', + "SQLNCHAR" => 'C', + "SQLNVCHAR" => 'C', + "SQLLVARCHAR" => 'X', + "SQLBOOL" => 'L' + ); + + if (!$this->connection->IsConnected()) { + $t = strtoupper($t); + if (isset($typeMap[$t])) return $typeMap[$t]; + return 'N'; + } + return $this->connection->MetaType($t,$len,$fieldobj); + } + + function NameQuote($name = NULL,$allowBrackets=false) + { + if (!is_string($name)) { + return FALSE; + } + + $name = trim($name); + + if ( !is_object($this->connection) ) { + return $name; + } + + $quote = $this->connection->nameQuote; + + // if name is of the form `name`, quote it + if ( preg_match('/^`(.+)`$/', $name, $matches) ) { + return $quote . $matches[1] . $quote; + } + + // if name contains special characters, quote it + $regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex; + + if ( !preg_match('/^[' . $regex . ']+$/', $name) ) { + return $quote . $name . $quote; + } + + return $name; + } + + function TableName($name) + { + if ( $this->schema ) { + return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name); + } + return $this->NameQuote($name); + } + + // Executes the sql array returned by GetTableSQL and GetIndexSQL + function ExecuteSQLArray($sql, $continueOnError = true) + { + $rez = 2; + $conn = $this->connection; + $saved = $conn->debug; + foreach($sql as $line) { + + if ($this->debug) $conn->debug = true; + $ok = $conn->Execute($line); + $conn->debug = $saved; + if (!$ok) { + if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); + if (!$continueOnError) return 0; + $rez = 1; + } + } + return $rez; + } + + /** + Returns the actual type given a character code. + + C: varchar + X: CLOB (character large object) or largest varchar size if CLOB is not supported + C2: Multibyte varchar + X2: Multibyte CLOB + + B: BLOB (binary large object) + + D: Date + T: Date-time + L: Integer field suitable for storing booleans (0 or 1) + I: Integer + F: Floating point number + N: Numeric or decimal number + */ + + function ActualType($meta) + { + return $meta; + } + + function CreateDatabase($dbname,$options=false) + { + $options = $this->_Options($options); + $sql = array(); + + $s = 'CREATE DATABASE ' . $this->NameQuote($dbname); + if (isset($options[$this->upperName])) + $s .= ' '.$options[$this->upperName]; + + $sql[] = $s; + return $sql; + } + + /* + Generates the SQL to create index. Returns an array of sql strings. + */ + function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false) + { + if (!is_array($flds)) { + $flds = explode(',',$flds); + } + + foreach($flds as $key => $fld) { + # some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32) + $flds[$key] = $this->NameQuote($fld,$allowBrackets=true); + } + + return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions)); + } + + function DropIndexSQL ($idxname, $tabname = NULL) + { + return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname))); + } + + function SetSchema($schema) + { + $this->schema = $schema; + } + + function AddColumnSQL($tabname, $flds) + { + $tabname = $this->TableName ($tabname); + $sql = array(); + list($lines,$pkey,$idxs) = $this->_GenFields($flds); + // genfields can return FALSE at times + if ($lines == null) $lines = array(); + $alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' '; + foreach($lines as $v) { + $sql[] = $alter . $v; + } + if (is_array($idxs)) { + foreach($idxs as $idx => $idxdef) { + $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql = array_merge($sql, $sql_idxs); + } + } + return $sql; + } + + /** + * Change the definition of one column + * + * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table, + * to allow, recreating the table and copying the content over to the new table + * @param string $tabname table-name + * @param string $flds column-name and type for the changed column + * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' + * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' + * @return array with SQL strings + */ + function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') + { + $tabname = $this->TableName ($tabname); + $sql = array(); + list($lines,$pkey,$idxs) = $this->_GenFields($flds); + // genfields can return FALSE at times + if ($lines == null) $lines = array(); + $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; + foreach($lines as $v) { + $sql[] = $alter . $v; + } + if (is_array($idxs)) { + foreach($idxs as $idx => $idxdef) { + $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql = array_merge($sql, $sql_idxs); + } + + } + return $sql; + } + + /** + * Rename one column + * + * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql) + * @param string $tabname table-name + * @param string $oldcolumn column-name to be renamed + * @param string $newcolumn new column-name + * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default='' + * @return array with SQL strings + */ + function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='') + { + $tabname = $this->TableName ($tabname); + if ($flds) { + list($lines,$pkey,$idxs) = $this->_GenFields($flds); + // genfields can return FALSE at times + if ($lines == null) $lines = array(); + list(,$first) = each($lines); + list(,$column_def) = preg_split("/[\t ]+/",$first,2); + } + return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def)); + } + + /** + * Drop one column + * + * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table, + * to allow, recreating the table and copying the content over to the new table + * @param string $tabname table-name + * @param string $flds column-name and type for the changed column + * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default '' + * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default '' + * @return array with SQL strings + */ + function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') + { + $tabname = $this->TableName ($tabname); + if (!is_array($flds)) $flds = explode(',',$flds); + $sql = array(); + $alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' '; + foreach($flds as $v) { + $sql[] = $alter . $this->NameQuote($v); + } + return $sql; + } + + function DropTableSQL($tabname) + { + return array (sprintf($this->dropTable, $this->TableName($tabname))); + } + + function RenameTableSQL($tabname,$newname) + { + return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname))); + } + + /** + Generate the SQL to create table. Returns an array of sql strings. + */ + function CreateTableSQL($tabname, $flds, $tableoptions=array()) + { + list($lines,$pkey,$idxs) = $this->_GenFields($flds, true); + // genfields can return FALSE at times + if ($lines == null) $lines = array(); + + $taboptions = $this->_Options($tableoptions); + $tabname = $this->TableName ($tabname); + $sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions); + + // ggiunta - 2006/10/12 - KLUDGE: + // if we are on autoincrement, and table options includes REPLACE, the + // autoincrement sequence has already been dropped on table creation sql, so + // we avoid passing REPLACE to trigger creation code. This prevents + // creating sql that double-drops the sequence + if ($this->autoIncrement && isset($taboptions['REPLACE'])) + unset($taboptions['REPLACE']); + $tsql = $this->_Triggers($tabname,$taboptions); + foreach($tsql as $s) $sql[] = $s; + + if (is_array($idxs)) { + foreach($idxs as $idx => $idxdef) { + $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql = array_merge($sql, $sql_idxs); + } + } + + return $sql; + } + + + + function _GenFields($flds,$widespacing=false) + { + if (is_string($flds)) { + $padding = ' '; + $txt = $flds.$padding; + $flds = array(); + $flds0 = Lens_ParseArgs($txt,','); + $hasparam = false; + foreach($flds0 as $f0) { + $f1 = array(); + foreach($f0 as $token) { + switch (strtoupper($token)) { + case 'INDEX': + $f1['INDEX'] = ''; + // fall through intentionally + case 'CONSTRAINT': + case 'DEFAULT': + $hasparam = $token; + break; + default: + if ($hasparam) $f1[$hasparam] = $token; + else $f1[] = $token; + $hasparam = false; + break; + } + } + // 'index' token without a name means single column index: name it after column + if (array_key_exists('INDEX', $f1) && $f1['INDEX'] == '') { + $f1['INDEX'] = isset($f0['NAME']) ? $f0['NAME'] : $f0[0]; + // check if column name used to create an index name was quoted + if (($f1['INDEX'][0] == '"' || $f1['INDEX'][0] == "'" || $f1['INDEX'][0] == "`") && + ($f1['INDEX'][0] == substr($f1['INDEX'], -1))) { + $f1['INDEX'] = $f1['INDEX'][0].'idx_'.substr($f1['INDEX'], 1, -1).$f1['INDEX'][0]; + } + else + $f1['INDEX'] = 'idx_'.$f1['INDEX']; + } + // reset it, so we don't get next field 1st token as INDEX... + $hasparam = false; + + $flds[] = $f1; + + } + } + $this->autoIncrement = false; + $lines = array(); + $pkey = array(); + $idxs = array(); + foreach($flds as $fld) { + $fld = _array_change_key_case($fld); + + $fname = false; + $fdefault = false; + $fautoinc = false; + $ftype = false; + $fsize = false; + $fprec = false; + $fprimary = false; + $fnoquote = false; + $fdefts = false; + $fdefdate = false; + $fconstraint = false; + $fnotnull = false; + $funsigned = false; + $findex = ''; + $funiqueindex = false; + + //----------------- + // Parse attributes + foreach($fld as $attr => $v) { + if ($attr == 2 && is_numeric($v)) $attr = 'SIZE'; + else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v); + + switch($attr) { + case '0': + case 'NAME': $fname = $v; break; + case '1': + case 'TYPE': $ty = $v; $ftype = $this->ActualType(strtoupper($v)); break; + + case 'SIZE': + $dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,','); + if ($dotat === false) $fsize = $v; + else { + $fsize = substr($v,0,$dotat); + $fprec = substr($v,$dotat+1); + } + break; + case 'UNSIGNED': $funsigned = true; break; + case 'AUTOINCREMENT': + case 'AUTO': $fautoinc = true; $fnotnull = true; break; + case 'KEY': + // a primary key col can be non unique in itself (if key spans many cols...) + case 'PRIMARY': $fprimary = $v; $fnotnull = true; /*$funiqueindex = true;*/ break; + case 'DEF': + case 'DEFAULT': $fdefault = $v; break; + case 'NOTNULL': $fnotnull = $v; break; + case 'NOQUOTE': $fnoquote = $v; break; + case 'DEFDATE': $fdefdate = $v; break; + case 'DEFTIMESTAMP': $fdefts = $v; break; + case 'CONSTRAINT': $fconstraint = $v; break; + // let INDEX keyword create a 'very standard' index on column + case 'INDEX': $findex = $v; break; + case 'UNIQUE': $funiqueindex = true; break; + } //switch + } // foreach $fld + + //-------------------- + // VALIDATE FIELD INFO + if (!strlen($fname)) { + if ($this->debug) ADOConnection::outp("Undefined NAME"); + return false; + } + + $fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname)); + $fname = $this->NameQuote($fname); + + if (!strlen($ftype)) { + if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'"); + return false; + } else { + $ftype = strtoupper($ftype); + } + + $ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec); + + if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls + + if ($fprimary) $pkey[] = $fname; + + // some databases do not allow blobs to have defaults + if ($ty == 'X') $fdefault = false; + + // build list of indexes + if ($findex != '') { + if (array_key_exists($findex, $idxs)) { + $idxs[$findex]['cols'][] = ($fname); + if (in_array('UNIQUE', $idxs[$findex]['opts']) != $funiqueindex) { + if ($this->debug) ADOConnection::outp("Index $findex defined once UNIQUE and once not"); + } + if ($funiqueindex && !in_array('UNIQUE', $idxs[$findex]['opts'])) + $idxs[$findex]['opts'][] = 'UNIQUE'; + } + else + { + $idxs[$findex] = array(); + $idxs[$findex]['cols'] = array($fname); + if ($funiqueindex) + $idxs[$findex]['opts'] = array('UNIQUE'); + else + $idxs[$findex]['opts'] = array(); + } + } + + //-------------------- + // CONSTRUCT FIELD SQL + if ($fdefts) { + if (substr($this->connection->databaseType,0,5) == 'mysql') { + $ftype = 'TIMESTAMP'; + } else { + $fdefault = $this->connection->sysTimeStamp; + } + } else if ($fdefdate) { + if (substr($this->connection->databaseType,0,5) == 'mysql') { + $ftype = 'TIMESTAMP'; + } else { + $fdefault = $this->connection->sysDate; + } + } else if ($fdefault !== false && !$fnoquote) { + if ($ty == 'C' or $ty == 'X' or + ( substr($fdefault,0,1) != "'" && !is_numeric($fdefault))) { + + if (($ty == 'D' || $ty == 'T') && strtolower($fdefault) != 'null') { + // convert default date into database-aware code + if ($ty == 'T') + { + $fdefault = $this->connection->DBTimeStamp($fdefault); + } + else + { + $fdefault = $this->connection->DBDate($fdefault); + } + } + else + if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') + $fdefault = trim($fdefault); + else if (strtolower($fdefault) != 'null') + $fdefault = $this->connection->qstr($fdefault); + } + } + $suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned); + + // add index creation + if ($widespacing) $fname = str_pad($fname,24); + + // check for field names appearing twice + if (array_key_exists($fid, $lines)) { + ADOConnection::outp("Field '$fname' defined twice"); + } + + $lines[$fid] = $fname.' '.$ftype.$suffix; + + if ($fautoinc) $this->autoIncrement = true; + } // foreach $flds + + return array($lines,$pkey,$idxs); + } + + /** + GENERATE THE SIZE PART OF THE DATATYPE + $ftype is the actual type + $ty is the type defined originally in the DDL + */ + function _GetSize($ftype, $ty, $fsize, $fprec) + { + if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) { + $ftype .= "(".$fsize; + if (strlen($fprec)) $ftype .= ",".$fprec; + $ftype .= ')'; + } + return $ftype; + } + + + // return string must begin with space + function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned) + { + $suffix = ''; + if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault"; + if ($fnotnull) $suffix .= ' NOT NULL'; + if ($fconstraint) $suffix .= ' '.$fconstraint; + return $suffix; + } + + function _IndexSQL($idxname, $tabname, $flds, $idxoptions) + { + $sql = array(); + + if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) { + $sql[] = sprintf ($this->dropIndex, $idxname); + if ( isset($idxoptions['DROP']) ) + return $sql; + } + + if ( empty ($flds) ) { + return $sql; + } + + $unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : ''; + + $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' '; + + if ( isset($idxoptions[$this->upperName]) ) + $s .= $idxoptions[$this->upperName]; + + if ( is_array($flds) ) + $flds = implode(', ',$flds); + $s .= '(' . $flds . ')'; + $sql[] = $s; + + return $sql; + } + + function _DropAutoIncrement($tabname) + { + return false; + } + + function _TableSQL($tabname,$lines,$pkey,$tableoptions) + { + $sql = array(); + + if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) { + $sql[] = sprintf($this->dropTable,$tabname); + if ($this->autoIncrement) { + $sInc = $this->_DropAutoIncrement($tabname); + if ($sInc) $sql[] = $sInc; + } + if ( isset ($tableoptions['DROP']) ) { + return $sql; + } + } + $s = "CREATE TABLE $tabname (\n"; + $s .= implode(",\n", $lines); + if (sizeof($pkey)>0) { + $s .= ",\n PRIMARY KEY ("; + $s .= implode(", ",$pkey).")"; + } + if (isset($tableoptions['CONSTRAINTS'])) + $s .= "\n".$tableoptions['CONSTRAINTS']; + + if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) + $s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; + + $s .= "\n)"; + if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName]; + $sql[] = $s; + + return $sql; + } + + /** + GENERATE TRIGGERS IF NEEDED + used when table has auto-incrementing field that is emulated using triggers + */ + function _Triggers($tabname,$taboptions) + { + return array(); + } + + /** + Sanitize options, so that array elements with no keys are promoted to keys + */ + function _Options($opts) + { + if (!is_array($opts)) return array(); + $newopts = array(); + foreach($opts as $k => $v) { + if (is_numeric($k)) $newopts[strtoupper($v)] = $v; + else $newopts[strtoupper($k)] = $v; + } + return $newopts; + } + + + function _getSizePrec($size) + { + $fsize = false; + $fprec = false; + $dotat = strpos($size,'.'); + if ($dotat === false) $dotat = strpos($size,','); + if ($dotat === false) $fsize = $size; + else { + $fsize = substr($size,0,$dotat); + $fprec = substr($size,$dotat+1); + } + return array($fsize, $fprec); + } + + /** + "Florian Buzin [ easywe ]" + + This function changes/adds new fields to your table. You don't + have to know if the col is new or not. It will check on its own. + */ + function ChangeTableSQL($tablename, $flds, $tableoptions = false, $dropOldFlds=false) + { + global $ADODB_FETCH_MODE; + + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; + if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false); + + // check table exists + $save_handler = $this->connection->raiseErrorFn; + $this->connection->raiseErrorFn = ''; + $cols = $this->MetaColumns($tablename); + $this->connection->raiseErrorFn = $save_handler; + + if (isset($savem)) $this->connection->SetFetchMode($savem); + $ADODB_FETCH_MODE = $save; + + if ( empty($cols)) { + return $this->CreateTableSQL($tablename, $flds, $tableoptions); + } + + if (is_array($flds)) { + // Cycle through the update fields, comparing + // existing fields to fields to update. + // if the Metatype and size is exactly the + // same, ignore - by Mark Newham + $holdflds = array(); + foreach($flds as $k=>$v) { + if ( isset($cols[$k]) && is_object($cols[$k]) ) { + // If already not allowing nulls, then don't change + $obj = $cols[$k]; + if (isset($obj->not_null) && $obj->not_null) + $v = str_replace('NOT NULL','',$v); + if (isset($obj->auto_increment) && $obj->auto_increment && empty($v['AUTOINCREMENT'])) + $v = str_replace('AUTOINCREMENT','',$v); + + $c = $cols[$k]; + $ml = $c->max_length; + $mt = $this->MetaType($c->type,$ml); + + if (isset($c->scale)) $sc = $c->scale; + else $sc = 99; // always force change if scale not known. + + if ($sc == -1) $sc = false; + list($fsize, $fprec) = $this->_getSizePrec($v['SIZE']); + + if ($ml == -1) $ml = ''; + if ($mt == 'X') $ml = $v['SIZE']; + if (($mt != $v['TYPE']) || ($ml != $fsize || $sc != $fprec) || (isset($v['AUTOINCREMENT']) && $v['AUTOINCREMENT'] != $obj->auto_increment)) { + $holdflds[$k] = $v; + } + } else { + $holdflds[$k] = $v; + } + } + $flds = $holdflds; + } + + + // already exists, alter table instead + list($lines,$pkey,$idxs) = $this->_GenFields($flds); + // genfields can return FALSE at times + if ($lines == null) $lines = array(); + $alter = 'ALTER TABLE ' . $this->TableName($tablename); + $sql = array(); + + foreach ( $lines as $id => $v ) { + if ( isset($cols[$id]) && is_object($cols[$id]) ) { + + $flds = Lens_ParseArgs($v,','); + + // We are trying to change the size of the field, if not allowed, simply ignore the request. + // $flds[1] holds the type, $flds[2] holds the size -postnuke addition + if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4) + && (isset($flds[0][2]) && is_numeric($flds[0][2]))) { + if ($this->debug) ADOConnection::outp(sprintf("

%s cannot be changed to %s currently

", $flds[0][0], $flds[0][1])); + #echo "

$this->alterCol cannot be changed to $flds currently

"; + continue; + } + $sql[] = $alter . $this->alterCol . ' ' . $v; + } else { + $sql[] = $alter . $this->addCol . ' ' . $v; + } + } + + if ($dropOldFlds) { + foreach ( $cols as $id => $v ) + if ( !isset($lines[$id]) ) + $sql[] = $alter . $this->dropCol . ' ' . $v->name; + } + return $sql; + } +} // class +?> \ No newline at end of file diff --git a/adodb/adodb-error.inc.php b/adodb/adodb-error.inc.php new file mode 100644 index 0000000..6ec614d --- /dev/null +++ b/adodb/adodb-error.inc.php @@ -0,0 +1,258 @@ + DB_ERROR_NOSUCHTABLE, + '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/i' => DB_ERROR_ALREADY_EXISTS, + '/divide by zero$/i' => DB_ERROR_DIVZERO, + '/pg_atoi: error in .*: can\'t parse /i' => DB_ERROR_INVALID_NUMBER, + '/ttribute [\"\'].*[\"\'] not found|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/i' => DB_ERROR_NOSUCHFIELD, + '/parser: parse error at or near \"/i' => DB_ERROR_SYNTAX, + '/referential integrity violation/i' => DB_ERROR_CONSTRAINT, + '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*|duplicate key.*violates unique constraint/i' + => DB_ERROR_ALREADY_EXISTS + ); + reset($error_regexps); + while (list($regexp,$code) = each($error_regexps)) { + if (preg_match($regexp, $errormsg)) { + return $code; + } + } + // Fall back to DB_ERROR if there was no mapping. + return DB_ERROR; +} + +function adodb_error_odbc() +{ +static $MAP = array( + '01004' => DB_ERROR_TRUNCATED, + '07001' => DB_ERROR_MISMATCH, + '21S01' => DB_ERROR_MISMATCH, + '21S02' => DB_ERROR_MISMATCH, + '22003' => DB_ERROR_INVALID_NUMBER, + '22008' => DB_ERROR_INVALID_DATE, + '22012' => DB_ERROR_DIVZERO, + '23000' => DB_ERROR_CONSTRAINT, + '24000' => DB_ERROR_INVALID, + '34000' => DB_ERROR_INVALID, + '37000' => DB_ERROR_SYNTAX, + '42000' => DB_ERROR_SYNTAX, + 'IM001' => DB_ERROR_UNSUPPORTED, + 'S0000' => DB_ERROR_NOSUCHTABLE, + 'S0001' => DB_ERROR_NOT_FOUND, + 'S0002' => DB_ERROR_NOSUCHTABLE, + 'S0011' => DB_ERROR_ALREADY_EXISTS, + 'S0012' => DB_ERROR_NOT_FOUND, + 'S0021' => DB_ERROR_ALREADY_EXISTS, + 'S0022' => DB_ERROR_NOT_FOUND, + 'S1000' => DB_ERROR_NOSUCHTABLE, + 'S1009' => DB_ERROR_INVALID, + 'S1090' => DB_ERROR_INVALID, + 'S1C00' => DB_ERROR_NOT_CAPABLE + ); + return $MAP; +} + +function adodb_error_ibase() +{ +static $MAP = array( + -104 => DB_ERROR_SYNTAX, + -150 => DB_ERROR_ACCESS_VIOLATION, + -151 => DB_ERROR_ACCESS_VIOLATION, + -155 => DB_ERROR_NOSUCHTABLE, + -157 => DB_ERROR_NOSUCHFIELD, + -158 => DB_ERROR_VALUE_COUNT_ON_ROW, + -170 => DB_ERROR_MISMATCH, + -171 => DB_ERROR_MISMATCH, + -172 => DB_ERROR_INVALID, + -204 => DB_ERROR_INVALID, + -205 => DB_ERROR_NOSUCHFIELD, + -206 => DB_ERROR_NOSUCHFIELD, + -208 => DB_ERROR_INVALID, + -219 => DB_ERROR_NOSUCHTABLE, + -297 => DB_ERROR_CONSTRAINT, + -530 => DB_ERROR_CONSTRAINT, + -803 => DB_ERROR_CONSTRAINT, + -551 => DB_ERROR_ACCESS_VIOLATION, + -552 => DB_ERROR_ACCESS_VIOLATION, + -922 => DB_ERROR_NOSUCHDB, + -923 => DB_ERROR_CONNECT_FAILED, + -924 => DB_ERROR_CONNECT_FAILED + ); + + return $MAP; +} + +function adodb_error_ifx() +{ +static $MAP = array( + '-201' => DB_ERROR_SYNTAX, + '-206' => DB_ERROR_NOSUCHTABLE, + '-217' => DB_ERROR_NOSUCHFIELD, + '-329' => DB_ERROR_NODBSELECTED, + '-1204' => DB_ERROR_INVALID_DATE, + '-1205' => DB_ERROR_INVALID_DATE, + '-1206' => DB_ERROR_INVALID_DATE, + '-1209' => DB_ERROR_INVALID_DATE, + '-1210' => DB_ERROR_INVALID_DATE, + '-1212' => DB_ERROR_INVALID_DATE + ); + + return $MAP; +} + +function adodb_error_oci8() +{ +static $MAP = array( + 1 => DB_ERROR_ALREADY_EXISTS, + 900 => DB_ERROR_SYNTAX, + 904 => DB_ERROR_NOSUCHFIELD, + 923 => DB_ERROR_SYNTAX, + 942 => DB_ERROR_NOSUCHTABLE, + 955 => DB_ERROR_ALREADY_EXISTS, + 1476 => DB_ERROR_DIVZERO, + 1722 => DB_ERROR_INVALID_NUMBER, + 2289 => DB_ERROR_NOSUCHTABLE, + 2291 => DB_ERROR_CONSTRAINT, + 2449 => DB_ERROR_CONSTRAINT + ); + + return $MAP; +} + +function adodb_error_mssql() +{ +static $MAP = array( + 208 => DB_ERROR_NOSUCHTABLE, + 2601 => DB_ERROR_ALREADY_EXISTS + ); + + return $MAP; +} + +function adodb_error_sqlite() +{ +static $MAP = array( + 1 => DB_ERROR_SYNTAX + ); + + return $MAP; +} + +function adodb_error_mysql() +{ +static $MAP = array( + 1004 => DB_ERROR_CANNOT_CREATE, + 1005 => DB_ERROR_CANNOT_CREATE, + 1006 => DB_ERROR_CANNOT_CREATE, + 1007 => DB_ERROR_ALREADY_EXISTS, + 1008 => DB_ERROR_CANNOT_DROP, + 1045 => DB_ERROR_ACCESS_VIOLATION, + 1046 => DB_ERROR_NODBSELECTED, + 1049 => DB_ERROR_NOSUCHDB, + 1050 => DB_ERROR_ALREADY_EXISTS, + 1051 => DB_ERROR_NOSUCHTABLE, + 1054 => DB_ERROR_NOSUCHFIELD, + 1062 => DB_ERROR_ALREADY_EXISTS, + 1064 => DB_ERROR_SYNTAX, + 1100 => DB_ERROR_NOT_LOCKED, + 1136 => DB_ERROR_VALUE_COUNT_ON_ROW, + 1146 => DB_ERROR_NOSUCHTABLE, + 1048 => DB_ERROR_CONSTRAINT, + 2002 => DB_ERROR_CONNECT_FAILED, + 2005 => DB_ERROR_CONNECT_FAILED + ); + + return $MAP; +} +?> \ No newline at end of file diff --git a/adodb/adodb-errorhandler.inc.php b/adodb/adodb-errorhandler.inc.php new file mode 100644 index 0000000..b760089 --- /dev/null +++ b/adodb/adodb-errorhandler.inc.php @@ -0,0 +1,79 @@ +$s

"; + trigger_error($s,ADODB_ERROR_HANDLER_TYPE); +} +?> diff --git a/adodb/adodb-errorpear.inc.php b/adodb/adodb-errorpear.inc.php new file mode 100644 index 0000000..6882e0a --- /dev/null +++ b/adodb/adodb-errorpear.inc.php @@ -0,0 +1,88 @@ +!$s

"; +} + +/** +* Returns last PEAR_Error object. This error might be for an error that +* occured several sql statements ago. +*/ +function ADODB_PEAR_Error() +{ +global $ADODB_Last_PEAR_Error; + + return $ADODB_Last_PEAR_Error; +} + +?> \ No newline at end of file diff --git a/adodb/adodb-exceptions.inc.php b/adodb/adodb-exceptions.inc.php new file mode 100644 index 0000000..65f8943 --- /dev/null +++ b/adodb/adodb-exceptions.inc.php @@ -0,0 +1,82 @@ +sql = $p1; + $this->params = $p2; + $s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n"; + break; + + case 'PCONNECT': + case 'CONNECT': + $user = $thisConnection->user; + $s = "$dbms error: [$errno: $errmsg] in $fn($p1, '$user', '****', $p2)\n"; + break; + default: + $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n"; + break; + } + + $this->dbms = $dbms; + if ($thisConnection) { + $this->host = $thisConnection->host; + $this->database = $thisConnection->database; + } + $this->fn = $fn; + $this->msg = $errmsg; + + if (!is_numeric($errno)) $errno = -1; + parent::__construct($s,$errno); + } +} + +/** +* Default Error Handler. This will be called with the following params +* +* @param $dbms the RDBMS you are connecting to +* @param $fn the name of the calling function (in uppercase) +* @param $errno the native error number from the database +* @param $errmsg the native error msg from the database +* @param $p1 $fn specific parameter - see below +* @param $P2 $fn specific parameter - see below +*/ + +function adodb_throw($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection) +{ +global $ADODB_EXCEPTION; + + if (error_reporting() == 0) return; // obey @ protocol + if (is_string($ADODB_EXCEPTION)) $errfn = $ADODB_EXCEPTION; + else $errfn = 'ADODB_EXCEPTION'; + throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection); +} + + +?> \ No newline at end of file diff --git a/adodb/adodb-iterator.inc.php b/adodb/adodb-iterator.inc.php new file mode 100644 index 0000000..e8b5e57 --- /dev/null +++ b/adodb/adodb-iterator.inc.php @@ -0,0 +1,30 @@ +Execute("select * from adoxyz"); + foreach($rs as $k => $v) { + echo $k; print_r($v); echo "
"; + } + + + Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2 + + + Moved to adodb.inc.php to improve performance. + */ + + + + + +?> \ No newline at end of file diff --git a/adodb/adodb-lib.inc.php b/adodb/adodb-lib.inc.php new file mode 100644 index 0000000..6b2e891 --- /dev/null +++ b/adodb/adodb-lib.inc.php @@ -0,0 +1,1197 @@ + sizeof($array)) $max = sizeof($array); + else $max = $probe; + + + for ($j=0;$j < $max; $j++) { + $row = $array[$j]; + if (!$row) break; + $i = -1; + foreach($row as $v) { + $i += 1; + + if (isset($types[$i]) && $types[$i]=='C') continue; + + //print " ($i ".$types[$i]. "$v) "; + $v = trim($v); + + if (!preg_match('/^[+-]{0,1}[0-9\.]+$/',$v)) { + $types[$i] = 'C'; // once C, always C + + continue; + } + if ($j == 0) { + // If empty string, we presume is character + // test for integer for 1st row only + // after that it is up to testing other rows to prove + // that it is not an integer + if (strlen($v) == 0) $types[$i] = 'C'; + if (strpos($v,'.') !== false) $types[$i] = 'N'; + else $types[$i] = 'I'; + continue; + } + + if (strpos($v,'.') !== false) $types[$i] = 'N'; + + } + } + +} + +function adodb_transpose(&$arr, &$newarr, &$hdr, &$fobjs) +{ + $oldX = sizeof(reset($arr)); + $oldY = sizeof($arr); + + if ($hdr) { + $startx = 1; + $hdr = array('Fields'); + for ($y = 0; $y < $oldY; $y++) { + $hdr[] = $arr[$y][0]; + } + } else + $startx = 0; + + for ($x = $startx; $x < $oldX; $x++) { + if ($fobjs) { + $o = $fobjs[$x]; + $newarr[] = array($o->name); + } else + $newarr[] = array(); + + for ($y = 0; $y < $oldY; $y++) { + $newarr[$x-$startx][] = $arr[$y][$x]; + } + } +} + +// Force key to upper. +// See also http://www.php.net/manual/en/function.array-change-key-case.php +function _array_change_key_case($an_array) +{ + if (is_array($an_array)) { + $new_array = array(); + foreach($an_array as $key=>$value) + $new_array[strtoupper($key)] = $value; + + return $new_array; + } + + return $an_array; +} + +function _adodb_replace(&$zthis, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc) +{ + if (count($fieldArray) == 0) return 0; + $first = true; + $uSet = ''; + + if (!is_array($keyCol)) { + $keyCol = array($keyCol); + } + foreach($fieldArray as $k => $v) { + if ($v === null) { + $v = 'NULL'; + $fieldArray[$k] = $v; + } else if ($autoQuote && /*!is_numeric($v) /*and strncmp($v,"'",1) !== 0 -- sql injection risk*/ strcasecmp($v,$zthis->null2null)!=0) { + $v = $zthis->qstr($v); + $fieldArray[$k] = $v; + } + if (in_array($k,$keyCol)) continue; // skip UPDATE if is key + + if ($first) { + $first = false; + $uSet = "$k=$v"; + } else + $uSet .= ",$k=$v"; + } + + $where = false; + foreach ($keyCol as $v) { + if (isset($fieldArray[$v])) { + if ($where) $where .= ' and '.$v.'='.$fieldArray[$v]; + else $where = $v.'='.$fieldArray[$v]; + } + } + + if ($uSet && $where) { + $update = "UPDATE $table SET $uSet WHERE $where"; + + $rs = $zthis->Execute($update); + + + if ($rs) { + if ($zthis->poorAffectedRows) { + /* + The Select count(*) wipes out any errors that the update would have returned. + http://phplens.com/lens/lensforum/msgs.php?id=5696 + */ + if ($zthis->ErrorNo()<>0) return 0; + + # affected_rows == 0 if update field values identical to old values + # for mysql - which is silly. + + $cnt = $zthis->GetOne("select count(*) from $table where $where"); + if ($cnt > 0) return 1; // record already exists + } else { + if (($zthis->Affected_Rows()>0)) return 1; + } + } else + return 0; + } + + // print "

Error=".$this->ErrorNo().'

'; + $first = true; + foreach($fieldArray as $k => $v) { + if ($has_autoinc && in_array($k,$keyCol)) continue; // skip autoinc col + + if ($first) { + $first = false; + $iCols = "$k"; + $iVals = "$v"; + } else { + $iCols .= ",$k"; + $iVals .= ",$v"; + } + } + $insert = "INSERT INTO $table ($iCols) VALUES ($iVals)"; + $rs = $zthis->Execute($insert); + return ($rs) ? 2 : 0; +} + +// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM +function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, + $size=0, $selectAttr='',$compareFields0=true) +{ + $hasvalue = false; + + if ($multiple or is_array($defstr)) { + if ($size==0) $size=5; + $attr = ' multiple size="'.$size.'"'; + if (!strpos($name,'[]')) $name .= '[]'; + } else if ($size) $attr = ' size="'.$size.'"'; + else $attr =''; + + $s = '\n"; +} + +// Requires $ADODB_FETCH_MODE = ADODB_FETCH_NUM +function _adodb_getmenu_gp(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=false, + $size=0, $selectAttr='',$compareFields0=true) +{ + $hasvalue = false; + + if ($multiple or is_array($defstr)) { + if ($size==0) $size=5; + $attr = ' multiple size="'.$size.'"'; + if (!strpos($name,'[]')) $name .= '[]'; + } else if ($size) $attr = ' size="'.$size.'"'; + else $attr =''; + + $s = '\n"; +} + + +/* + Count the number of records this sql statement will return by using + query rewriting heuristics... + + Does not work with UNIONs, except with postgresql and oracle. + + Usage: + + $conn->Connect(...); + $cnt = _adodb_getcount($conn, $sql); + +*/ +function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0) +{ + $qryRecs = 0; + + if (!empty($zthis->_nestedSQL) || preg_match("/^\s*SELECT\s+DISTINCT/is", $sql) || + preg_match('/\s+GROUP\s+BY\s+/is',$sql) || + preg_match('/\s+UNION\s+/is',$sql)) { + + $rewritesql = adodb_strip_order_by($sql); + + // ok, has SELECT DISTINCT or GROUP BY so see if we can use a table alias + // but this is only supported by oracle and postgresql... + if ($zthis->dataProvider == 'oci8') { + // Allow Oracle hints to be used for query optimization, Chris Wrye + if (preg_match('#/\\*+.*?\\*\\/#', $sql, $hint)) { + $rewritesql = "SELECT ".$hint[0]." COUNT(*) FROM (".$rewritesql.")"; + } else + $rewritesql = "SELECT COUNT(*) FROM (".$rewritesql.")"; + + } else if (strncmp($zthis->databaseType,'postgres',8) == 0 || strncmp($zthis->databaseType,'mysql',5) == 0) { + $rewritesql = "SELECT COUNT(*) FROM ($rewritesql) _ADODB_ALIAS_"; + } else { + $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)"; + } + } else { + // now replace SELECT ... FROM with SELECT COUNT(*) FROM + $rewritesql = preg_replace( + '/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql); + // fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails + // with mssql, access and postgresql. Also a good speedup optimization - skips sorting! + // also see http://phplens.com/lens/lensforum/msgs.php?id=12752 + $rewritesql = adodb_strip_order_by($rewritesql); + } + + if (isset($rewritesql) && $rewritesql != $sql) { + if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0]; + + if ($secs2cache) { + // we only use half the time of secs2cache because the count can quickly + // become inaccurate if new records are added + $qryRecs = $zthis->CacheGetOne($secs2cache/2,$rewritesql,$inputarr); + + } else { + $qryRecs = $zthis->GetOne($rewritesql,$inputarr); + } + if ($qryRecs !== false) return $qryRecs; + } + //-------------------------------------------- + // query rewrite failed - so try slower way... + + + // strip off unneeded ORDER BY if no UNION + if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql; + else $rewritesql = $rewritesql = adodb_strip_order_by($sql); + + if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0]; + + if ($secs2cache) { + $rstest = $zthis->CacheExecute($secs2cache,$rewritesql,$inputarr); + if (!$rstest) $rstest = $zthis->CacheExecute($secs2cache,$sql,$inputarr); + } else { + $rstest = $zthis->Execute($rewritesql,$inputarr); + if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr); + } + if ($rstest) { + $qryRecs = $rstest->RecordCount(); + if ($qryRecs == -1) { + global $ADODB_EXTENSION; + // some databases will return -1 on MoveLast() - change to MoveNext() + if ($ADODB_EXTENSION) { + while(!$rstest->EOF) { + adodb_movenext($rstest); + } + } else { + while(!$rstest->EOF) { + $rstest->MoveNext(); + } + } + $qryRecs = $rstest->_currentRow; + } + $rstest->Close(); + if ($qryRecs == -1) return 0; + } + return $qryRecs; +} + +/* + Code originally from "Cornel G" + + This code might not work with SQL that has UNION in it + + Also if you are using CachePageExecute(), there is a strong possibility that + data will get out of synch. use CachePageExecute() only with tables that + rarely change. +*/ +function _adodb_pageexecute_all_rows(&$zthis, $sql, $nrows, $page, + $inputarr=false, $secs2cache=0) +{ + $atfirstpage = false; + $atlastpage = false; + $lastpageno=1; + + // If an invalid nrows is supplied, + // we assume a default value of 10 rows per page + if (!isset($nrows) || $nrows <= 0) $nrows = 10; + + $qryRecs = false; //count records for no offset + + $qryRecs = _adodb_getcount($zthis,$sql,$inputarr,$secs2cache); + $lastpageno = (int) ceil($qryRecs / $nrows); + $zthis->_maxRecordCount = $qryRecs; + + + + // ***** Here we check whether $page is the last page or + // whether we are trying to retrieve + // a page number greater than the last page number. + if ($page >= $lastpageno) { + $page = $lastpageno; + $atlastpage = true; + } + + // If page number <= 1, then we are at the first page + if (empty($page) || $page <= 1) { + $page = 1; + $atfirstpage = true; + } + + // We get the data we want + $offset = $nrows * ($page-1); + if ($secs2cache > 0) + $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); + else + $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); + + + // Before returning the RecordSet, we set the pagination properties we need + if ($rsreturn) { + $rsreturn->_maxRecordCount = $qryRecs; + $rsreturn->rowsPerPage = $nrows; + $rsreturn->AbsolutePage($page); + $rsreturn->AtFirstPage($atfirstpage); + $rsreturn->AtLastPage($atlastpage); + $rsreturn->LastPageNo($lastpageno); + } + return $rsreturn; +} + +// Ivn Oliva version +function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0) +{ + + $atfirstpage = false; + $atlastpage = false; + + if (!isset($page) || $page <= 1) { // If page number <= 1, then we are at the first page + $page = 1; + $atfirstpage = true; + } + if ($nrows <= 0) $nrows = 10; // If an invalid nrows is supplied, we assume a default value of 10 rows per page + + // ***** Here we check whether $page is the last page or whether we are trying to retrieve a page number greater than + // the last page number. + $pagecounter = $page + 1; + $pagecounteroffset = ($pagecounter * $nrows) - $nrows; + if ($secs2cache>0) $rstest = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr); + else $rstest = $zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache); + if ($rstest) { + while ($rstest && $rstest->EOF && $pagecounter>0) { + $atlastpage = true; + $pagecounter--; + $pagecounteroffset = $nrows * ($pagecounter - 1); + $rstest->Close(); + if ($secs2cache>0) $rstest = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $pagecounteroffset, $inputarr); + else $rstest = $zthis->SelectLimit($sql, $nrows, $pagecounteroffset, $inputarr, $secs2cache); + } + if ($rstest) $rstest->Close(); + } + if ($atlastpage) { // If we are at the last page or beyond it, we are going to retrieve it + $page = $pagecounter; + if ($page == 1) $atfirstpage = true; // We have to do this again in case the last page is the same as the first + //... page, that is, the recordset has only 1 page. + } + + // We get the data we want + $offset = $nrows * ($page-1); + if ($secs2cache > 0) $rsreturn = $zthis->CacheSelectLimit($secs2cache, $sql, $nrows, $offset, $inputarr); + else $rsreturn = $zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); + + // Before returning the RecordSet, we set the pagination properties we need + if ($rsreturn) { + $rsreturn->rowsPerPage = $nrows; + $rsreturn->AbsolutePage($page); + $rsreturn->AtFirstPage($atfirstpage); + $rsreturn->AtLastPage($atlastpage); + } + return $rsreturn; +} + +function _adodb_getupdatesql(&$zthis,&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=2) +{ + global $ADODB_QUOTE_FIELDNAMES; + + if (!$rs) { + printf(ADODB_BAD_RS,'GetUpdateSQL'); + return false; + } + + $fieldUpdatedCount = 0; + $arrFields = _array_change_key_case($arrFields); + + $hasnumeric = isset($rs->fields[0]); + $setFields = ''; + + // Loop through all of the fields in the recordset + for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) { + // Get the field from the recordset + $field = $rs->FetchField($i); + + // If the recordset field is one + // of the fields passed in then process. + $upperfname = strtoupper($field->name); + if (adodb_key_exists($upperfname,$arrFields,$force)) { + + // If the existing field value in the recordset + // is different from the value passed in then + // go ahead and append the field name and new value to + // the update query. + + if ($hasnumeric) $val = $rs->fields[$i]; + else if (isset($rs->fields[$upperfname])) $val = $rs->fields[$upperfname]; + else if (isset($rs->fields[$field->name])) $val = $rs->fields[$field->name]; + else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)]; + else $val = ''; + + + if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) { + // Set the counter for the number of fields that will be updated. + $fieldUpdatedCount++; + + // Based on the datatype of the field + // Format the value properly for the database + $type = $rs->MetaType($field->type); + + + if ($type == 'null') { + $type = 'C'; + } + + if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) + $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote; + else + $fnameq = $upperfname; + + + // is_null requires php 4.0.4 + //********************************************************// + if (is_null($arrFields[$upperfname]) + || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0) + || $arrFields[$upperfname] === $zthis->null2null + ) + { + switch ($force) { + + //case 0: + // //Ignore empty values. This is allready handled in "adodb_key_exists" function. + //break; + + case 1: + //Set null + $setFields .= $field->name . " = null, "; + break; + + case 2: + //Set empty + $arrFields[$upperfname] = ""; + $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq); + break; + default: + case 3: + //Set the value that was given in array, so you can give both null and empty values + if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { + $setFields .= $field->name . " = null, "; + } else { + $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq,$arrFields, $magicq); + } + break; + } + //********************************************************// + } else { + //we do this so each driver can customize the sql for + //DB specific column types. + //Oracle needs BLOB types to be handled with a returning clause + //postgres has special needs as well + $setFields .= _adodb_column_sql($zthis, 'U', $type, $upperfname, $fnameq, + $arrFields, $magicq); + } + } + } + } + + // If there were any modified fields then build the rest of the update query. + if ($fieldUpdatedCount > 0 || $forceUpdate) { + // Get the table name from the existing query. + if (!empty($rs->tableName)) $tableName = $rs->tableName; + else { + preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName); + $tableName = $tableName[1]; + } + // Get the full where clause excluding the word "WHERE" from + // the existing query. + preg_match('/\sWHERE\s(.*)/is', $rs->sql, $whereClause); + + $discard = false; + // not a good hack, improvements? + if ($whereClause) { + #var_dump($whereClause); + if (preg_match('/\s(ORDER\s.*)/is', $whereClause[1], $discard)); + else if (preg_match('/\s(LIMIT\s.*)/is', $whereClause[1], $discard)); + else if (preg_match('/\s(FOR UPDATE.*)/is', $whereClause[1], $discard)); + else preg_match('/\s.*(\) WHERE .*)/is', $whereClause[1], $discard); # see http://sourceforge.net/tracker/index.php?func=detail&aid=1379638&group_id=42718&atid=433976 + } else + $whereClause = array(false,false); + + if ($discard) + $whereClause[1] = substr($whereClause[1], 0, strlen($whereClause[1]) - strlen($discard[1])); + + $sql = 'UPDATE '.$tableName.' SET '.substr($setFields, 0, -2); + if (strlen($whereClause[1]) > 0) + $sql .= ' WHERE '.$whereClause[1]; + + return $sql; + + } else { + return false; + } +} + +function adodb_key_exists($key, &$arr,$force=2) +{ + if ($force<=0) { + // the following is the old behaviour where null or empty fields are ignored + return (!empty($arr[$key])) || (isset($arr[$key]) && strlen($arr[$key])>0); + } + + if (isset($arr[$key])) return true; + ## null check below + if (ADODB_PHPVER >= 0x4010) return array_key_exists($key,$arr); + return false; +} + +/** + * There is a special case of this function for the oci8 driver. + * The proper way to handle an insert w/ a blob in oracle requires + * a returning clause with bind variables and a descriptor blob. + * + * + */ +function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false,$force=2) +{ +static $cacheRS = false; +static $cacheSig = 0; +static $cacheCols; + global $ADODB_QUOTE_FIELDNAMES; + + $tableName = ''; + $values = ''; + $fields = ''; + $recordSet = null; + $arrFields = _array_change_key_case($arrFields); + $fieldInsertedCount = 0; + + if (is_string($rs)) { + //ok we have a table name + //try and get the column info ourself. + $tableName = $rs; + + //we need an object for the recordSet + //because we have to call MetaType. + //php can't do a $rsclass::MetaType() + $rsclass = $zthis->rsPrefix.$zthis->databaseType; + $recordSet = new $rsclass(-1,$zthis->fetchMode); + $recordSet->connection = $zthis; + + if (is_string($cacheRS) && $cacheRS == $rs) { + $columns = $cacheCols; + } else { + $columns = $zthis->MetaColumns( $tableName ); + $cacheRS = $tableName; + $cacheCols = $columns; + } + } else if (is_subclass_of($rs, 'adorecordset')) { + if (isset($rs->insertSig) && is_integer($cacheRS) && $cacheRS == $rs->insertSig) { + $columns = $cacheCols; + } else { + for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) + $columns[] = $rs->FetchField($i); + $cacheRS = $cacheSig; + $cacheCols = $columns; + $rs->insertSig = $cacheSig++; + } + $recordSet = $rs; + + } else { + printf(ADODB_BAD_RS,'GetInsertSQL'); + return false; + } + + // Loop through all of the fields in the recordset + foreach( $columns as $field ) { + $upperfname = strtoupper($field->name); + if (adodb_key_exists($upperfname,$arrFields,$force)) { + $bad = false; + if ((strpos($upperfname,' ') !== false) || ($ADODB_QUOTE_FIELDNAMES)) + $fnameq = $zthis->nameQuote.$upperfname.$zthis->nameQuote; + else + $fnameq = $upperfname; + + $type = $recordSet->MetaType($field->type); + + /********************************************************/ + if (is_null($arrFields[$upperfname]) + || (empty($arrFields[$upperfname]) && strlen($arrFields[$upperfname]) == 0) + || $arrFields[$upperfname] === $zthis->null2null + ) + { + switch ($force) { + + case 0: // we must always set null if missing + $bad = true; + break; + + case 1: + $values .= "null, "; + break; + + case 2: + //Set empty + $arrFields[$upperfname] = ""; + $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq,$arrFields, $magicq); + break; + + default: + case 3: + //Set the value that was given in array, so you can give both null and empty values + if (is_null($arrFields[$upperfname]) || $arrFields[$upperfname] === $zthis->null2null) { + $values .= "null, "; + } else { + $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, $arrFields, $magicq); + } + break; + } // switch + + /*********************************************************/ + } else { + //we do this so each driver can customize the sql for + //DB specific column types. + //Oracle needs BLOB types to be handled with a returning clause + //postgres has special needs as well + $values .= _adodb_column_sql($zthis, 'I', $type, $upperfname, $fnameq, + $arrFields, $magicq); + } + + if ($bad) continue; + // Set the counter for the number of fields that will be inserted. + $fieldInsertedCount++; + + + // Get the name of the fields to insert + $fields .= $fnameq . ", "; + } + } + + + // If there were any inserted fields then build the rest of the insert query. + if ($fieldInsertedCount <= 0) return false; + + // Get the table name from the existing query. + if (!$tableName) { + if (!empty($rs->tableName)) $tableName = $rs->tableName; + else if (preg_match("/FROM\s+".ADODB_TABLE_REGEX."/is", $rs->sql, $tableName)) + $tableName = $tableName[1]; + else + return false; + } + + // Strip off the comma and space on the end of both the fields + // and their values. + $fields = substr($fields, 0, -2); + $values = substr($values, 0, -2); + + // Append the fields and their values to the insert query. + return 'INSERT INTO '.$tableName.' ( '.$fields.' ) VALUES ( '.$values.' )'; +} + + +/** + * This private method is used to help construct + * the update/sql which is generated by GetInsertSQL and GetUpdateSQL. + * It handles the string construction of 1 column -> sql string based on + * the column type. We want to do 'safe' handling of BLOBs + * + * @param string the type of sql we are trying to create + * 'I' or 'U'. + * @param string column data type from the db::MetaType() method + * @param string the column name + * @param array the column value + * + * @return string + * + */ +function _adodb_column_sql_oci8(&$zthis,$action, $type, $fname, $fnameq, $arrFields, $magicq) +{ + $sql = ''; + + // Based on the datatype of the field + // Format the value properly for the database + switch($type) { + case 'B': + //in order to handle Blobs correctly, we need + //to do some magic for Oracle + + //we need to create a new descriptor to handle + //this properly + if (!empty($zthis->hasReturningInto)) { + if ($action == 'I') { + $sql = 'empty_blob(), '; + } else { + $sql = $fnameq. '=empty_blob(), '; + } + //add the variable to the returning clause array + //so the user can build this later in + //case they want to add more to it + $zthis->_returningArray[$fname] = ':xx'.$fname.'xx'; + } else if (empty($arrFields[$fname])){ + if ($action == 'I') { + $sql = 'empty_blob(), '; + } else { + $sql = $fnameq. '=empty_blob(), '; + } + } else { + //this is to maintain compatibility + //with older adodb versions. + $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); + } + break; + + case "X": + //we need to do some more magic here for long variables + //to handle these correctly in oracle. + + //create a safe bind var name + //to avoid conflicts w/ dupes. + if (!empty($zthis->hasReturningInto)) { + if ($action == 'I') { + $sql = ':xx'.$fname.'xx, '; + } else { + $sql = $fnameq.'=:xx'.$fname.'xx, '; + } + //add the variable to the returning clause array + //so the user can build this later in + //case they want to add more to it + $zthis->_returningArray[$fname] = ':xx'.$fname.'xx'; + } else { + //this is to maintain compatibility + //with older adodb versions. + $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); + } + break; + + default: + $sql = _adodb_column_sql($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq,false); + break; + } + + return $sql; +} + +function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq, $recurse=true) +{ + + if ($recurse) { + switch($zthis->dataProvider) { + case 'postgres': + if ($type == 'L') $type = 'C'; + break; + case 'oci8': + return _adodb_column_sql_oci8($zthis, $action, $type, $fname, $fnameq, $arrFields, $magicq); + + } + } + + switch($type) { + case "C": + case "X": + case 'B': + $val = $zthis->qstr($arrFields[$fname],$magicq); + break; + + case "D": + $val = $zthis->DBDate($arrFields[$fname]); + break; + + case "T": + $val = $zthis->DBTimeStamp($arrFields[$fname]); + break; + + case "N": + $val = $arrFields[$fname]; + if (!is_numeric($val)) $val = str_replace(',', '.', (float)$val); + break; + + case "I": + case "R": + $val = $arrFields[$fname]; + if (!is_numeric($val)) $val = (integer) $val; + break; + + default: + $val = str_replace(array("'"," ","("),"",$arrFields[$fname]); // basic sql injection defence + if (empty($val)) $val = '0'; + break; + } + + if ($action == 'I') return $val . ", "; + + + return $fnameq . "=" . $val . ", "; + +} + + + +function _adodb_debug_execute(&$zthis, $sql, $inputarr) +{ + $ss = ''; + if ($inputarr) { + foreach($inputarr as $kk=>$vv) { + if (is_string($vv) && strlen($vv)>64) $vv = substr($vv,0,64).'...'; + if (is_null($vv)) $ss .= "($kk=>null) "; + else $ss .= "($kk=>'$vv') "; + } + $ss = "[ $ss ]"; + } + $sqlTxt = is_array($sql) ? $sql[0] : $sql; + /*str_replace(', ','##1#__^LF',is_array($sql) ? $sql[0] : $sql); + $sqlTxt = str_replace(',',', ',$sqlTxt); + $sqlTxt = str_replace('##1#__^LF', ', ' ,$sqlTxt); + */ + // check if running from browser or command-line + $inBrowser = isset($_SERVER['HTTP_USER_AGENT']); + + $dbt = $zthis->databaseType; + if (isset($zthis->dsnType)) $dbt .= '-'.$zthis->dsnType; + if ($inBrowser) { + if ($ss) { + $ss = ''.htmlspecialchars($ss).''; + } + if ($zthis->debug === -1) + ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); + else if ($zthis->debug !== -99) + ADOConnection::outp( "

\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); + } else { + $ss = "\n ".$ss; + if ($zthis->debug !== -99) + ADOConnection::outp("-----
\n($dbt): ".$sqlTxt." $ss\n-----
\n",false); + } + + $qID = $zthis->_query($sql,$inputarr); + + /* + Alexios Fakios notes that ErrorMsg() must be called before ErrorNo() for mssql + because ErrorNo() calls Execute('SELECT @ERROR'), causing recursion + */ + if ($zthis->databaseType == 'mssql') { + // ErrorNo is a slow function call in mssql, and not reliable in PHP 4.0.6 + + if($emsg = $zthis->ErrorMsg()) { + if ($err = $zthis->ErrorNo()) { + if ($zthis->debug === -99) + ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); + + ADOConnection::outp($err.': '.$emsg); + } + } + } else if (!$qID) { + + if ($zthis->debug === -99) + if ($inBrowser) ADOConnection::outp( "
\n($dbt): ".htmlspecialchars($sqlTxt)."   $ss\n
\n",false); + else ADOConnection::outp("-----
\n($dbt): ".$sqlTxt."$ss\n-----
\n",false); + + ADOConnection::outp($zthis->ErrorNo() .': '. $zthis->ErrorMsg()); + } + + if ($zthis->debug === 99) _adodb_backtrace(true,9999,2); + return $qID; +} + +# pretty print the debug_backtrace function +function _adodb_backtrace($printOrArr=true,$levels=9999,$skippy=0,$ishtml=null) +{ + if (!function_exists('debug_backtrace')) return ''; + + if ($ishtml === null) $html = (isset($_SERVER['HTTP_USER_AGENT'])); + else $html = $ishtml; + + $fmt = ($html) ? " %% line %4d, file: %s" : "%% line %4d, file: %s"; + + $MAXSTRLEN = 128; + + $s = ($html) ? '
' : '';
+	
+	if (is_array($printOrArr)) $traceArr = $printOrArr;
+	else $traceArr = debug_backtrace();
+	array_shift($traceArr);
+	array_shift($traceArr);
+	$tabs = sizeof($traceArr)-2;
+	
+	foreach ($traceArr as $arr) {
+		if ($skippy) {$skippy -= 1; continue;}
+		$levels -= 1;
+		if ($levels < 0) break;
+		
+		$args = array();
+		for ($i=0; $i < $tabs; $i++) $s .=  ($html) ? '   ' : "\t";
+		$tabs -= 1;
+		if ($html) $s .= '';
+		if (isset($arr['class'])) $s .= $arr['class'].'.';
+		if (isset($arr['args']))
+		 foreach($arr['args'] as $v) {
+			if (is_null($v)) $args[] = 'null';
+			else if (is_array($v)) $args[] = 'Array['.sizeof($v).']';
+			else if (is_object($v)) $args[] = 'Object:'.get_class($v);
+			else if (is_bool($v)) $args[] = $v ? 'true' : 'false';
+			else {
+				$v = (string) @$v;
+				$str = htmlspecialchars(str_replace(array("\r","\n"),' ',substr($v,0,$MAXSTRLEN)));
+				if (strlen($v) > $MAXSTRLEN) $str .= '...';
+				$args[] = $str;
+			}
+		}
+		$s .= $arr['function'].'('.implode(', ',$args).')';
+		
+		
+		$s .= @sprintf($fmt, $arr['line'],$arr['file'],basename($arr['file']));
+			
+		$s .= "\n";
+	}	
+	if ($html) $s .= '
'; + if ($printOrArr) print $s; + + return $s; +} +/* +function _adodb_find_from($sql) +{ + + $sql = str_replace(array("\n","\r"), ' ', $sql); + $charCount = strlen($sql); + + $inString = false; + $quote = ''; + $parentheseCount = 0; + $prevChars = ''; + $nextChars = ''; + + + for($i = 0; $i < $charCount; $i++) { + + $char = substr($sql,$i,1); + $prevChars = substr($sql,0,$i); + $nextChars = substr($sql,$i+1); + + if((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === false) { + $quote = $char; + $inString = true; + } + + elseif((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === true && $quote == $char) { + $quote = ""; + $inString = false; + } + + elseif($char == "(" && $inString === false) + $parentheseCount++; + + elseif($char == ")" && $inString === false && $parentheseCount > 0) + $parentheseCount--; + + elseif($parentheseCount <= 0 && $inString === false && $char == " " && strtoupper(substr($prevChars,-5,5)) == " FROM") + return $i; + + } +} +*/ + +?> \ No newline at end of file diff --git a/adodb/adodb-memcache.lib.inc.php b/adodb/adodb-memcache.lib.inc.php new file mode 100644 index 0000000..e666d56 --- /dev/null +++ b/adodb/adodb-memcache.lib.inc.php @@ -0,0 +1,190 @@ +memCache = true; /// should we use memCache instead of caching in files +$db->memCacheHost = array($ip1, $ip2, $ip3); +$db->memCachePort = 11211; /// this is default memCache port +$db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib) + +$db->Connect(...); +$db->CacheExecute($sql); + + Note the memcache class is shared by all connections, is created during the first call to Connect/PConnect. + + Class instance is stored in $ADODB_CACHE +*/ + + class ADODB_Cache_MemCache { + var $createdir = false; // create caching directory structure? + + //----------------------------- + // memcache specific variables + + var $hosts; // array of hosts + var $port = 11211; + var $compress = false; // memcache compression with zlib + + var $_connected = false; + var $_memcache = false; + + function ADODB_Cache_MemCache(&$obj) + { + $this->hosts = $obj->memCacheHost; + $this->port = $obj->memCachePort; + $this->compress = $obj->memCacheCompress; + } + + // implement as lazy connection. The connection only occurs on CacheExecute call + function connect(&$err) + { + if (!function_exists('memcache_pconnect')) { + $err = 'Memcache module PECL extension not found!'; + return false; + } + + $memcache = new MemCache; + + if (!is_array($this->hosts)) $this->hosts = array($this->hosts); + + $failcnt = 0; + foreach($this->hosts as $host) { + if (!@$memcache->addServer($host,$this->port,true)) { + $failcnt += 1; + } + } + if ($failcnt == sizeof($this->hosts)) { + $err = 'Can\'t connect to any memcache server'; + return false; + } + $this->_connected = true; + $this->_memcache = $memcache; + return true; + } + + // returns true or false. true if successful save + function writecache($filename, $contents, $debug, $secs2cache) + { + if (!$this->_connected) { + $err = ''; + if (!$this->connect($err) && $debug) ADOConnection::outp($err); + } + if (!$this->_memcache) return false; + + if (!$this->_memcache->set($filename, $contents, $this->compress, $secs2cache)) { + if ($debug) ADOConnection::outp(" Failed to save data at the memcached server!
\n"); + return false; + } + + return true; + } + + // returns a recordset + function readcache($filename, &$err, $secs2cache, $rsClass) + { + $false = false; + if (!$this->_connected) $this->connect($err); + if (!$this->_memcache) return $false; + + $rs = $this->_memcache->get($filename); + if (!$rs) { + $err = 'Item with such key doesn\'t exists on the memcached server.'; + return $false; + } + + // hack, should actually use _csv2rs + $rs = explode("\n", $rs); + unset($rs[0]); + $rs = join("\n", $rs); + $rs = unserialize($rs); + if (! is_object($rs)) { + $err = 'Unable to unserialize $rs'; + return $false; + } + if ($rs->timeCreated == 0) return $rs; // apparently have been reports that timeCreated was set to 0 somewhere + + $tdiff = intval($rs->timeCreated+$secs2cache - time()); + if ($tdiff <= 2) { + switch($tdiff) { + case 2: + if ((rand() & 15) == 0) { + $err = "Timeout 2"; + return $false; + } + break; + case 1: + if ((rand() & 3) == 0) { + $err = "Timeout 1"; + return $false; + } + break; + default: + $err = "Timeout 0"; + return $false; + } + } + return $rs; + } + + function flushall($debug=false) + { + if (!$this->_connected) { + $err = ''; + if (!$this->connect($err) && $debug) ADOConnection::outp($err); + } + if (!$this->_memcache) return false; + + $del = $this->_memcache->flush(); + + if ($debug) + if (!$del) ADOConnection::outp("flushall: failed!
\n"); + else ADOConnection::outp("flushall: succeeded!
\n"); + + return $del; + } + + function flushcache($filename, $debug=false) + { + if (!$this->_connected) { + $err = ''; + if (!$this->connect($err) && $debug) ADOConnection::outp($err); + } + if (!$this->_memcache) return false; + + $del = $this->_memcache->delete($filename); + + if ($debug) + if (!$del) ADOConnection::outp("flushcache: $key entry doesn't exist on memcached server!
\n"); + else ADOConnection::outp("flushcache: $key entry flushed from memcached server!
\n"); + + return $del; + } + + // not used for memcache + function createdir($dir, $hash) + { + return true; + } + } + +?> \ No newline at end of file diff --git a/adodb/adodb-pager.inc.php b/adodb/adodb-pager.inc.php new file mode 100644 index 0000000..b57ee95 --- /dev/null +++ b/adodb/adodb-pager.inc.php @@ -0,0 +1,290 @@ + implemented Render_PageLinks(). + + Please note, this class is entirely unsupported, + and no free support requests except for bug reports + will be entertained by the author. + +*/ +class ADODB_Pager { + var $id; // unique id for pager (defaults to 'adodb') + var $db; // ADODB connection object + var $sql; // sql used + var $rs; // recordset generated + var $curr_page; // current page number before Render() called, calculated in constructor + var $rows; // number of rows per page + var $linksPerPage=10; // number of links per page in navigation bar + var $showPageLinks; + + var $gridAttributes = 'width=100% border=1 bgcolor=white'; + + // Localize text strings here + var $first = '|<'; + var $prev = '<<'; + var $next = '>>'; + var $last = '>|'; + var $moreLinks = '...'; + var $startLinks = '...'; + var $gridHeader = false; + var $htmlSpecialChars = true; + var $page = 'Page'; + var $linkSelectedColor = 'red'; + var $cache = 0; #secs to cache with CachePageExecute() + + //---------------------------------------------- + // constructor + // + // $db adodb connection object + // $sql sql statement + // $id optional id to identify which pager, + // if you have multiple on 1 page. + // $id should be only be [a-z0-9]* + // + function ADODB_Pager(&$db,$sql,$id = 'adodb', $showPageLinks = false) + { + global $PHP_SELF; + + $curr_page = $id.'_curr_page'; + if (!empty($PHP_SELF)) $PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']); // htmlspecialchars() to prevent XSS attacks + + $this->sql = $sql; + $this->id = $id; + $this->db = $db; + $this->showPageLinks = $showPageLinks; + + $next_page = $id.'_next_page'; + + if (isset($_GET[$next_page])) { + $_SESSION[$curr_page] = (integer) $_GET[$next_page]; + } + if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page + + $this->curr_page = $_SESSION[$curr_page]; + + } + + //--------------------------- + // Display link to first page + function Render_First($anchor=true) + { + global $PHP_SELF; + if ($anchor) { + ?> + first;?>   + first   "; + } + } + + //-------------------------- + // Display link to next page + function render_next($anchor=true) + { + global $PHP_SELF; + + if ($anchor) { + ?> + next;?>   + next   "; + } + } + + //------------------ + // Link to last page + // + // for better performance with large recordsets, you can set + // $this->db->pageExecuteCountRows = false, which disables + // last page counting. + function render_last($anchor=true) + { + global $PHP_SELF; + + if (!$this->db->pageExecuteCountRows) return; + + if ($anchor) { + ?> + last;?>   + last   "; + } + } + + //--------------------------------------------------- + // original code by "Pablo Costa" + function render_pagelinks() + { + global $PHP_SELF; + $pages = $this->rs->LastPageNo(); + $linksperpage = $this->linksPerPage ? $this->linksPerPage : $pages; + for($i=1; $i <= $pages; $i+=$linksperpage) + { + if($this->rs->AbsolutePage() >= $i) + { + $start = $i; + } + } + $numbers = ''; + $end = $start+$linksperpage-1; + $link = $this->id . "_next_page"; + if($end > $pages) $end = $pages; + + + if ($this->startLinks && $start > 1) { + $pos = $start - 1; + $numbers .= "$this->startLinks "; + } + + for($i=$start; $i <= $end; $i++) { + if ($this->rs->AbsolutePage() == $i) + $numbers .= "linkSelectedColor>$i "; + else + $numbers .= "$i "; + + } + if ($this->moreLinks && $end < $pages) + $numbers .= "$this->moreLinks "; + print $numbers . '   '; + } + // Link to previous page + function render_prev($anchor=true) + { + global $PHP_SELF; + if ($anchor) { + ?> + prev;?>   + prev   "; + } + } + + //-------------------------------------------------------- + // Simply rendering of grid. You should override this for + // better control over the format of the grid + // + // We use output buffering to keep code clean and readable. + function RenderGrid() + { + global $gSQLBlockRows; // used by rs2html to indicate how many rows to display + include_once(ADODB_DIR.'/tohtml.inc.php'); + ob_start(); + $gSQLBlockRows = $this->rows; + rs2html($this->rs,$this->gridAttributes,$this->gridHeader,$this->htmlSpecialChars); + $s = ob_get_contents(); + ob_end_clean(); + return $s; + } + + //------------------------------------------------------- + // Navigation bar + // + // we use output buffering to keep the code easy to read. + function RenderNav() + { + ob_start(); + if (!$this->rs->AtFirstPage()) { + $this->Render_First(); + $this->Render_Prev(); + } else { + $this->Render_First(false); + $this->Render_Prev(false); + } + if ($this->showPageLinks){ + $this->Render_PageLinks(); + } + if (!$this->rs->AtLastPage()) { + $this->Render_Next(); + $this->Render_Last(); + } else { + $this->Render_Next(false); + $this->Render_Last(false); + } + $s = ob_get_contents(); + ob_end_clean(); + return $s; + } + + //------------------- + // This is the footer + function RenderPageCount() + { + if (!$this->db->pageExecuteCountRows) return ''; + $lastPage = $this->rs->LastPageNo(); + if ($lastPage == -1) $lastPage = 1; // check for empty rs. + if ($this->curr_page > $lastPage) $this->curr_page = 1; + return "$this->page ".$this->curr_page."/".$lastPage.""; + } + + //----------------------------------- + // Call this class to draw everything. + function Render($rows=10) + { + global $ADODB_COUNTRECS; + + $this->rows = $rows; + + if ($this->db->dataProvider == 'informix') $this->db->cursorType = IFX_SCROLL; + + $savec = $ADODB_COUNTRECS; + if ($this->db->pageExecuteCountRows) $ADODB_COUNTRECS = true; + if ($this->cache) + $rs = $this->db->CachePageExecute($this->cache,$this->sql,$rows,$this->curr_page); + else + $rs = $this->db->PageExecute($this->sql,$rows,$this->curr_page); + $ADODB_COUNTRECS = $savec; + + $this->rs = $rs; + if (!$rs) { + print "

Query failed: $this->sql

"; + return; + } + + if (!$rs->EOF && (!$rs->AtFirstPage() || !$rs->AtLastPage())) + $header = $this->RenderNav(); + else + $header = " "; + + $grid = $this->RenderGrid(); + $footer = $this->RenderPageCount(); + + $this->RenderLayout($header,$grid,$footer); + + $rs->Close(); + $this->rs = false; + } + + //------------------------------------------------------ + // override this to control overall layout and formating + function RenderLayout($header,$grid,$footer,$attributes='border=1 bgcolor=beige') + { + echo "
", + $header, + "
", + $grid, + "
", + $footer, + "
"; + } +} + + +?> \ No newline at end of file diff --git a/adodb/adodb-pear.inc.php b/adodb/adodb-pear.inc.php new file mode 100644 index 0000000..04441a7 --- /dev/null +++ b/adodb/adodb-pear.inc.php @@ -0,0 +1,374 @@ + | + * and Tomas V.V.Cox . Portions (c)1997-2002 The PHP Group. + */ + + /* + We support: + + DB_Common + --------- + query - returns PEAR_Error on error + limitQuery - return PEAR_Error on error + prepare - does not return PEAR_Error on error + execute - does not return PEAR_Error on error + setFetchMode - supports ASSOC and ORDERED + errorNative + quote + nextID + disconnect + + getOne + getAssoc + getRow + getCol + getAll + + DB_Result + --------- + numRows - returns -1 if not supported + numCols + fetchInto - does not support passing of fetchmode + fetchRows - does not support passing of fetchmode + free + */ + +define('ADODB_PEAR',dirname(__FILE__)); +include_once "PEAR.php"; +include_once ADODB_PEAR."/adodb-errorpear.inc.php"; +include_once ADODB_PEAR."/adodb.inc.php"; + +if (!defined('DB_OK')) { +define("DB_OK", 1); +define("DB_ERROR",-1); + +// autoExecute constants +define('DB_AUTOQUERY_INSERT', 1); +define('DB_AUTOQUERY_UPDATE', 2); + +/** + * This is a special constant that tells DB the user hasn't specified + * any particular get mode, so the default should be used. + */ + +define('DB_FETCHMODE_DEFAULT', 0); + +/** + * Column data indexed by numbers, ordered from 0 and up + */ + +define('DB_FETCHMODE_ORDERED', 1); + +/** + * Column data indexed by column names + */ + +define('DB_FETCHMODE_ASSOC', 2); + +/* for compatibility */ + +define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED); +define('DB_GETMODE_ASSOC', DB_FETCHMODE_ASSOC); + +/** + * these are constants for the tableInfo-function + * they are bitwised or'ed. so if there are more constants to be defined + * in the future, adjust DB_TABLEINFO_FULL accordingly + */ + +define('DB_TABLEINFO_ORDER', 1); +define('DB_TABLEINFO_ORDERTABLE', 2); +define('DB_TABLEINFO_FULL', 3); +} + +/** + * The main "DB" class is simply a container class with some static + * methods for creating DB objects as well as some utility functions + * common to all parts of DB. + * + */ + +class DB +{ + /** + * Create a new DB object for the specified database type + * + * @param $type string database type, for example "mysql" + * + * @return object a newly created DB object, or a DB error code on + * error + */ + + function factory($type) + { + include_once(ADODB_DIR."/drivers/adodb-$type.inc.php"); + $obj = NewADOConnection($type); + if (!is_object($obj)) $obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1); + return $obj; + } + + /** + * Create a new DB object and connect to the specified database + * + * @param $dsn mixed "data source name", see the DB::parseDSN + * method for a description of the dsn format. Can also be + * specified as an array of the format returned by DB::parseDSN. + * + * @param $options mixed if boolean (or scalar), tells whether + * this connection should be persistent (for backends that support + * this). This parameter can also be an array of options, see + * DB_common::setOption for more information on connection + * options. + * + * @return object a newly created DB connection object, or a DB + * error object on error + * + * @see DB::parseDSN + * @see DB::isError + */ + function connect($dsn, $options = false) + { + if (is_array($dsn)) { + $dsninfo = $dsn; + } else { + $dsninfo = DB::parseDSN($dsn); + } + switch ($dsninfo["phptype"]) { + case 'pgsql': $type = 'postgres7'; break; + case 'ifx': $type = 'informix9'; break; + default: $type = $dsninfo["phptype"]; break; + } + + if (is_array($options) && isset($options["debug"]) && + $options["debug"] >= 2) { + // expose php errors with sufficient debug level + @include_once("adodb-$type.inc.php"); + } else { + @include_once("adodb-$type.inc.php"); + } + + @$obj = NewADOConnection($type); + if (!is_object($obj)) { + $obj = new PEAR_Error('Unknown Database Driver: '.$dsninfo['phptype'],-1); + return $obj; + } + if (is_array($options)) { + foreach($options as $k => $v) { + switch(strtolower($k)) { + case 'persist': + case 'persistent': $persist = $v; break; + #ibase + case 'dialect': $obj->dialect = $v; break; + case 'charset': $obj->charset = $v; break; + case 'buffers': $obj->buffers = $v; break; + #ado + case 'charpage': $obj->charPage = $v; break; + #mysql + case 'clientflags': $obj->clientFlags = $v; break; + } + } + } else { + $persist = false; + } + + if (isset($dsninfo['socket'])) $dsninfo['hostspec'] .= ':'.$dsninfo['socket']; + else if (isset($dsninfo['port'])) $dsninfo['hostspec'] .= ':'.$dsninfo['port']; + + if($persist) $ok = $obj->PConnect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); + else $ok = $obj->Connect($dsninfo['hostspec'], $dsninfo['username'],$dsninfo['password'],$dsninfo['database']); + + if (!$ok) $obj = ADODB_PEAR_Error(); + return $obj; + } + + /** + * Return the DB API version + * + * @return int the DB API version number + */ + function apiVersion() + { + return 2; + } + + /** + * Tell whether a result code from a DB method is an error + * + * @param $value int result code + * + * @return bool whether $value is an error + */ + function isError($value) + { + if (!is_object($value)) return false; + $class = strtolower(get_class($value)); + return $class == 'pear_error' || is_subclass_of($value, 'pear_error') || + $class == 'db_error' || is_subclass_of($value, 'db_error'); + } + + + /** + * Tell whether a result code from a DB method is a warning. + * Warnings differ from errors in that they are generated by DB, + * and are not fatal. + * + * @param $value mixed result value + * + * @return bool whether $value is a warning + */ + function isWarning($value) + { + return false; + /* + return is_object($value) && + (get_class( $value ) == "db_warning" || + is_subclass_of($value, "db_warning"));*/ + } + + /** + * Parse a data source name + * + * @param $dsn string Data Source Name to be parsed + * + * @return array an associative array with the following keys: + * + * phptype: Database backend used in PHP (mysql, odbc etc.) + * dbsyntax: Database used with regards to SQL syntax etc. + * protocol: Communication protocol to use (tcp, unix etc.) + * hostspec: Host specification (hostname[:port]) + * database: Database to use on the DBMS server + * username: User name for login + * password: Password for login + * + * The format of the supplied DSN is in its fullest form: + * + * phptype(dbsyntax)://username:password@protocol+hostspec/database + * + * Most variations are allowed: + * + * phptype://username:password@protocol+hostspec:110//usr/db_file.db + * phptype://username:password@hostspec/database_name + * phptype://username:password@hostspec + * phptype://username@hostspec + * phptype://hostspec/database + * phptype://hostspec + * phptype(dbsyntax) + * phptype + * + * @author Tomas V.V.Cox + */ + function parseDSN($dsn) + { + if (is_array($dsn)) { + return $dsn; + } + + $parsed = array( + 'phptype' => false, + 'dbsyntax' => false, + 'protocol' => false, + 'hostspec' => false, + 'database' => false, + 'username' => false, + 'password' => false + ); + + // Find phptype and dbsyntax + if (($pos = strpos($dsn, '://')) !== false) { + $str = substr($dsn, 0, $pos); + $dsn = substr($dsn, $pos + 3); + } else { + $str = $dsn; + $dsn = NULL; + } + + // Get phptype and dbsyntax + // $str => phptype(dbsyntax) + if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) { + $parsed['phptype'] = $arr[1]; + $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2]; + } else { + $parsed['phptype'] = $str; + $parsed['dbsyntax'] = $str; + } + + if (empty($dsn)) { + return $parsed; + } + + // Get (if found): username and password + // $dsn => username:password@protocol+hostspec/database + if (($at = strpos($dsn,'@')) !== false) { + $str = substr($dsn, 0, $at); + $dsn = substr($dsn, $at + 1); + if (($pos = strpos($str, ':')) !== false) { + $parsed['username'] = urldecode(substr($str, 0, $pos)); + $parsed['password'] = urldecode(substr($str, $pos + 1)); + } else { + $parsed['username'] = urldecode($str); + } + } + + // Find protocol and hostspec + // $dsn => protocol+hostspec/database + if (($pos=strpos($dsn, '/')) !== false) { + $str = substr($dsn, 0, $pos); + $dsn = substr($dsn, $pos + 1); + } else { + $str = $dsn; + $dsn = NULL; + } + + // Get protocol + hostspec + // $str => protocol+hostspec + if (($pos=strpos($str, '+')) !== false) { + $parsed['protocol'] = substr($str, 0, $pos); + $parsed['hostspec'] = urldecode(substr($str, $pos + 1)); + } else { + $parsed['hostspec'] = urldecode($str); + } + + // Get dabase if any + // $dsn => database + if (!empty($dsn)) { + $parsed['database'] = $dsn; + } + + return $parsed; + } + + /** + * Load a PHP database extension if it is not loaded already. + * + * @access public + * + * @param $name the base name of the extension (without the .so or + * .dll suffix) + * + * @return bool true if the extension was already or successfully + * loaded, false if it could not be loaded + */ + function assertExtension($name) + { + if (!extension_loaded($name)) { + $dlext = (strncmp(PHP_OS,'WIN',3) === 0) ? '.dll' : '.so'; + @dl($name . $dlext); + } + if (!extension_loaded($name)) { + return false; + } + return true; + } +} + +?> \ No newline at end of file diff --git a/adodb/adodb-perf.inc.php b/adodb/adodb-perf.inc.php new file mode 100644 index 0000000..d1a86eb --- /dev/null +++ b/adodb/adodb-perf.inc.php @@ -0,0 +1,1099 @@ += minimum number of secs to run + + +// returns in K the memory of current process, or 0 if not known +function adodb_getmem() +{ + if (function_exists('memory_get_usage')) + return (integer) ((memory_get_usage()+512)/1024); + + $pid = getmypid(); + + if ( strncmp(strtoupper(PHP_OS),'WIN',3)==0) { + $output = array(); + + exec('tasklist /FI "PID eq ' . $pid. '" /FO LIST', $output); + return substr($output[5], strpos($output[5], ':') + 1); + } + + /* Hopefully UNIX */ + exec("ps --pid $pid --no-headers -o%mem,size", $output); + if (sizeof($output) == 0) return 0; + + $memarr = explode(' ',$output[0]); + if (sizeof($memarr)>=2) return (integer) $memarr[1]; + + return 0; +} + +// avoids localization problems where , is used instead of . +function adodb_round($n,$prec) +{ + return number_format($n, $prec, '.', ''); +} + +/* obsolete: return microtime value as a float. Retained for backward compat */ +function adodb_microtime() +{ + return microtime(true); +} + +/* sql code timing */ +function adodb_log_sql(&$connx,$sql,$inputarr) +{ + $perf_table = adodb_perf::table(); + $connx->fnExecute = false; + $a0 = microtime(true); + $rs = $connx->Execute($sql,$inputarr); + $a1 = microtime(true); + + if (!empty($connx->_logsql) && (empty($connx->_logsqlErrors) || !$rs)) { + global $ADODB_LOG_CONN; + + if (!empty($ADODB_LOG_CONN)) { + $conn = $ADODB_LOG_CONN; + if ($conn->databaseType != $connx->databaseType) + $prefix = '/*dbx='.$connx->databaseType .'*/ '; + else + $prefix = ''; + } else { + $conn = $connx; + $prefix = ''; + } + + $conn->_logsql = false; // disable logsql error simulation + $dbT = $conn->databaseType; + + $time = $a1 - $a0; + + if (!$rs) { + $errM = $connx->ErrorMsg(); + $errN = $connx->ErrorNo(); + $conn->lastInsID = 0; + $tracer = substr('ERROR: '.htmlspecialchars($errM),0,250); + } else { + $tracer = ''; + $errM = ''; + $errN = 0; + $dbg = $conn->debug; + $conn->debug = false; + if (!is_object($rs) || $rs->dataProvider == 'empty') + $conn->_affected = $conn->affected_rows(true); + $conn->lastInsID = @$conn->Insert_ID(); + $conn->debug = $dbg; + } + if (isset($_SERVER['HTTP_HOST'])) { + $tracer .= '
'.$_SERVER['HTTP_HOST']; + if (isset($_SERVER['PHP_SELF'])) $tracer .= htmlspecialchars($_SERVER['PHP_SELF']); + } else + if (isset($_SERVER['PHP_SELF'])) $tracer .= '
'.htmlspecialchars($_SERVER['PHP_SELF']); + //$tracer .= (string) adodb_backtrace(false); + + $tracer = (string) substr($tracer,0,500); + + if (is_array($inputarr)) { + if (is_array(reset($inputarr))) $params = 'Array sizeof='.sizeof($inputarr); + else { + // Quote string parameters so we can see them in the + // performance stats. This helps spot disabled indexes. + $xar_params = $inputarr; + foreach ($xar_params as $xar_param_key => $xar_param) { + if (gettype($xar_param) == 'string') + $xar_params[$xar_param_key] = '"' . $xar_param . '"'; + } + $params = implode(', ', $xar_params); + if (strlen($params) >= 3000) $params = substr($params, 0, 3000); + } + } else { + $params = ''; + } + + if (is_array($sql)) $sql = $sql[0]; + if ($prefix) $sql = $prefix.$sql; + $arr = array('b'=>strlen($sql).'.'.crc32($sql), + 'c'=>substr($sql,0,3900), 'd'=>$params,'e'=>$tracer,'f'=>adodb_round($time,6)); + //var_dump($arr); + $saved = $conn->debug; + $conn->debug = 0; + + $d = $conn->sysTimeStamp; + if (empty($d)) $d = date("'Y-m-d H:i:s'"); + if ($conn->dataProvider == 'oci8' && $dbT != 'oci8po') { + $isql = "insert into $perf_table values($d,:b,:c,:d,:e,:f)"; + } else if ($dbT == 'odbc_mssql' || $dbT == 'informix' || strncmp($dbT,'odbtp',4)==0) { + $timer = $arr['f']; + if ($dbT == 'informix') $sql2 = substr($sql2,0,230); + + $sql1 = $conn->qstr($arr['b']); + $sql2 = $conn->qstr($arr['c']); + $params = $conn->qstr($arr['d']); + $tracer = $conn->qstr($arr['e']); + + $isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values($d,$sql1,$sql2,$params,$tracer,$timer)"; + if ($dbT == 'informix') $isql = str_replace(chr(10),' ',$isql); + $arr = false; + } else { + if ($dbT == 'db2') $arr['f'] = (float) $arr['f']; + $isql = "insert into $perf_table (created,sql0,sql1,params,tracer,timer) values( $d,?,?,?,?,?)"; + } + + global $ADODB_PERF_MIN; + if ($errN != 0 || $time >= $ADODB_PERF_MIN) { + $ok = $conn->Execute($isql,$arr); + } else + $ok = true; + + $conn->debug = $saved; + + if ($ok) { + $conn->_logsql = true; + } else { + $err2 = $conn->ErrorMsg(); + $conn->_logsql = true; // enable logsql error simulation + $perf = NewPerfMonitor($conn); + if ($perf) { + if ($perf->CreateLogTable()) $ok = $conn->Execute($isql,$arr); + } else { + $ok = $conn->Execute("create table $perf_table ( + created varchar(50), + sql0 varchar(250), + sql1 varchar(4000), + params varchar(3000), + tracer varchar(500), + timer decimal(16,6))"); + } + if (!$ok) { + ADOConnection::outp( "

LOGSQL Insert Failed: $isql
$err2

"); + $conn->_logsql = false; + } + } + $connx->_errorMsg = $errM; + $connx->_errorCode = $errN; + } + $connx->fnExecute = 'adodb_log_sql'; + return $rs; +} + + +/* +The settings data structure is an associative array that database parameter per element. + +Each database parameter element in the array is itself an array consisting of: + +0: category code, used to group related db parameters +1: either + a. sql string to retrieve value, eg. "select value from v\$parameter where name='db_block_size'", + b. array holding sql string and field to look for, e.g. array('show variables','table_cache'), + c. a string prefixed by =, then a PHP method of the class is invoked, + e.g. to invoke $this->GetIndexValue(), set this array element to '=GetIndexValue', +2: description of the database parameter +*/ + +class adodb_perf { + var $conn; + var $color = '#F0F0F0'; + var $table = ''; + var $titles = ''; + var $warnRatio = 90; + var $tablesSQL = false; + var $cliFormat = "%32s => %s \r\n"; + var $sql1 = 'sql1'; // used for casting sql1 to text for mssql + var $explain = true; + var $helpurl = "LogSQL help"; + var $createTableSQL = false; + var $maxLength = 2000; + + // Sets the tablename to be used + static function table($newtable = false) + { + static $_table; + + if (!empty($newtable)) $_table = $newtable; + if (empty($_table)) $_table = 'adodb_logsql'; + return $_table; + } + + // returns array with info to calculate CPU Load + function _CPULoad() + { +/* + +cpu 524152 2662 2515228 336057010 +cpu0 264339 1408 1257951 168025827 +cpu1 259813 1254 1257277 168031181 +page 622307 25475680 +swap 24 1891 +intr 890153570 868093576 6 0 4 4 0 6 1 2 0 0 0 124 0 8098760 2 13961053 0 0 0 0 0 0 0 0 0 0 0 0 0 16 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +disk_io: (3,0):(3144904,54369,610378,3090535,50936192) (3,1):(3630212,54097,633016,3576115,50951320) +ctxt 66155838 +btime 1062315585 +processes 69293 + +*/ + // Algorithm is taken from + // http://social.technet.microsoft.com/Forums/en-US/winservergen/thread/414b0e1b-499c-411e-8a02-6a12e339c0f1/ + if (strncmp(PHP_OS,'WIN',3)==0) { + if (PHP_VERSION == '5.0.0') return false; + if (PHP_VERSION == '5.0.1') return false; + if (PHP_VERSION == '5.0.2') return false; + if (PHP_VERSION == '5.0.3') return false; + if (PHP_VERSION == '4.3.10') return false; # see http://bugs.php.net/bug.php?id=31737 + + static $FAIL = false; + if ($FAIL) return false; + + $objName = "winmgmts:{impersonationLevel=impersonate}!\\\\.\\root\\CIMV2"; + $myQuery = "SELECT * FROM Win32_PerfFormattedData_PerfOS_Processor WHERE Name = '_Total'"; + + try { + @$objWMIService = new COM($objName); + if (!$objWMIService) { + $FAIL = true; + return false; + } + + $info[0] = -1; + $info[1] = 0; + $info[2] = 0; + $info[3] = 0; + foreach($objWMIService->ExecQuery($myQuery) as $objItem) { + $info[0] = $objItem->PercentProcessorTime(); + } + + } catch(Exception $e) { + $FAIL = true; + echo $e->getMessage(); + return false; + } + + return $info; + } + + // Algorithm - Steve Blinch (BlitzAffe Online, http://www.blitzaffe.com) + $statfile = '/proc/stat'; + if (!file_exists($statfile)) return false; + + $fd = fopen($statfile,"r"); + if (!$fd) return false; + + $statinfo = explode("\n",fgets($fd, 1024)); + fclose($fd); + foreach($statinfo as $line) { + $info = explode(" ",$line); + if($info[0]=="cpu") { + array_shift($info); // pop off "cpu" + if(!$info[0]) array_shift($info); // pop off blank space (if any) + return $info; + } + } + + return false; + + } + + /* NOT IMPLEMENTED */ + function MemInfo() + { + /* + + total: used: free: shared: buffers: cached: +Mem: 1055289344 917299200 137990144 0 165437440 599773184 +Swap: 2146775040 11055104 2135719936 +MemTotal: 1030556 kB +MemFree: 134756 kB +MemShared: 0 kB +Buffers: 161560 kB +Cached: 581384 kB +SwapCached: 4332 kB +Active: 494468 kB +Inact_dirty: 322856 kB +Inact_clean: 24256 kB +Inact_target: 168316 kB +HighTotal: 131064 kB +HighFree: 1024 kB +LowTotal: 899492 kB +LowFree: 133732 kB +SwapTotal: 2096460 kB +SwapFree: 2085664 kB +Committed_AS: 348732 kB + */ + } + + + /* + Remember that this is client load, not db server load! + */ + var $_lastLoad; + function CPULoad() + { + $info = $this->_CPULoad(); + if (!$info) return false; + + if (strncmp(PHP_OS,'WIN',3)==0) { + return (integer) $info[0]; + }else { + if (empty($this->_lastLoad)) { + sleep(1); + $this->_lastLoad = $info; + $info = $this->_CPULoad(); + } + + $last = $this->_lastLoad; + $this->_lastLoad = $info; + + $d_user = $info[0] - $last[0]; + $d_nice = $info[1] - $last[1]; + $d_system = $info[2] - $last[2]; + $d_idle = $info[3] - $last[3]; + + //printf("Delta - User: %f Nice: %f System: %f Idle: %f
",$d_user,$d_nice,$d_system,$d_idle); + + $total=$d_user+$d_nice+$d_system+$d_idle; + if ($total<1) $total=1; + return 100*($d_user+$d_nice+$d_system)/$total; + } + } + + function Tracer($sql) + { + $perf_table = adodb_perf::table(); + $saveE = $this->conn->fnExecute; + $this->conn->fnExecute = false; + + global $ADODB_FETCH_MODE; + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); + + $sqlq = $this->conn->qstr($sql); + $arr = $this->conn->GetArray( +"select count(*),tracer + from $perf_table where sql1=$sqlq + group by tracer + order by 1 desc"); + $s = ''; + if ($arr) { + $s .= '

Scripts Affected

'; + foreach($arr as $k) { + $s .= sprintf("%4d",$k[0]).'   '.strip_tags($k[1]).'
'; + } + } + + if (isset($savem)) $this->conn->SetFetchMode($savem); + $ADODB_CACHE_MODE = $save; + $this->conn->fnExecute = $saveE; + return $s; + } + + /* + Explain Plan for $sql. + If only a snippet of the $sql is passed in, then $partial will hold the crc32 of the + actual sql. + */ + function Explain($sql,$partial=false) + { + return false; + } + + function InvalidSQL($numsql = 10) + { + + if (isset($_GET['sql'])) return; + $s = '

Invalid SQL

'; + $saveE = $this->conn->fnExecute; + $this->conn->fnExecute = false; + $perf_table = adodb_perf::table(); + $rs = $this->conn->SelectLimit("select distinct count(*),sql1,tracer as error_msg from $perf_table where tracer like 'ERROR:%' group by sql1,tracer order by 1 desc",$numsql);//,$numsql); + $this->conn->fnExecute = $saveE; + if ($rs) { + $s .= rs2html($rs,false,false,false,false); + } else + return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; + + return $s; + } + + + /* + This script identifies the longest running SQL + */ + function _SuspiciousSQL($numsql = 10) + { + global $ADODB_FETCH_MODE; + + $perf_table = adodb_perf::table(); + $saveE = $this->conn->fnExecute; + $this->conn->fnExecute = false; + + if (isset($_GET['exps']) && isset($_GET['sql'])) { + $partial = !empty($_GET['part']); + echo "".$this->Explain($_GET['sql'],$partial)."\n"; + } + + if (isset($_GET['sql'])) return; + $sql1 = $this->sql1; + + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); + //$this->conn->debug=1; + $rs = $this->conn->SelectLimit( + "select avg(timer) as avg_timer,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer + from $perf_table + where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT') + and (tracer is null or tracer not like 'ERROR:%') + group by sql1 + order by 1 desc",$numsql); + if (isset($savem)) $this->conn->SetFetchMode($savem); + $ADODB_FETCH_MODE = $save; + $this->conn->fnExecute = $saveE; + + if (!$rs) return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; + $s = "

Suspicious SQL

+The following SQL have high average execution times
+
ParameterValueDescription
\n"; + $max = $this->maxLength; + while (!$rs->EOF) { + $sql = $rs->fields[1]; + $raw = urlencode($sql); + if (strlen($raw)>$max-100) { + $sql2 = substr($sql,0,$max-500); + $raw = urlencode($sql2).'&part='.crc32($sql); + } + $prefix = ""; + $suffix = ""; + if ($this->explain == false || strlen($prefix)>$max) { + $suffix = ' ... String too long for GET parameter: '.strlen($prefix).''; + $prefix = ''; + } + $s .= ""; + $rs->MoveNext(); + } + return $s."
Avg TimeCountSQLMaxMin
".adodb_round($rs->fields[0],6)."".$rs->fields[2]."".$prefix.htmlspecialchars($sql).$suffix."". + "".$rs->fields[3]."".$rs->fields[4]."
"; + + } + + function CheckMemory() + { + return ''; + } + + + function SuspiciousSQL($numsql=10) + { + return adodb_perf::_SuspiciousSQL($numsql); + } + + function ExpensiveSQL($numsql=10) + { + return adodb_perf::_ExpensiveSQL($numsql); + } + + + /* + This reports the percentage of load on the instance due to the most + expensive few SQL statements. Tuning these statements can often + make huge improvements in overall system performance. + */ + function _ExpensiveSQL($numsql = 10) + { + global $ADODB_FETCH_MODE; + + $perf_table = adodb_perf::table(); + $saveE = $this->conn->fnExecute; + $this->conn->fnExecute = false; + + if (isset($_GET['expe']) && isset($_GET['sql'])) { + $partial = !empty($_GET['part']); + echo "".$this->Explain($_GET['sql'],$partial)."\n"; + } + + if (isset($_GET['sql'])) return; + + $sql1 = $this->sql1; + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); + + $rs = $this->conn->SelectLimit( + "select sum(timer) as total,$sql1,count(*),max(timer) as max_timer,min(timer) as min_timer + from $perf_table + where {$this->conn->upperCase}({$this->conn->substr}(sql0,1,5)) not in ('DROP ','INSER','COMMI','CREAT') + and (tracer is null or tracer not like 'ERROR:%') + group by sql1 + having count(*)>1 + order by 1 desc",$numsql); + if (isset($savem)) $this->conn->SetFetchMode($savem); + $this->conn->fnExecute = $saveE; + $ADODB_FETCH_MODE = $save; + if (!$rs) return "

$this->helpurl. ".$this->conn->ErrorMsg()."

"; + $s = "

Expensive SQL

+Tuning the following SQL could reduce the server load substantially
+\n"; + $max = $this->maxLength; + while (!$rs->EOF) { + $sql = $rs->fields[1]; + $raw = urlencode($sql); + if (strlen($raw)>$max-100) { + $sql2 = substr($sql,0,$max-500); + $raw = urlencode($sql2).'&part='.crc32($sql); + } + $prefix = ""; + $suffix = ""; + if($this->explain == false || strlen($prefix>$max)) { + $prefix = ''; + $suffix = ''; + } + $s .= ""; + $rs->MoveNext(); + } + return $s."
LoadCountSQLMaxMin
".adodb_round($rs->fields[0],6)."".$rs->fields[2]."".$prefix.htmlspecialchars($sql).$suffix."". + "".$rs->fields[3]."".$rs->fields[4]."
"; + } + + /* + Raw function to return parameter value from $settings. + */ + function DBParameter($param) + { + if (empty($this->settings[$param])) return false; + $sql = $this->settings[$param][1]; + return $this->_DBParameter($sql); + } + + /* + Raw function returning array of poll paramters + */ + function PollParameters() + { + $arr[0] = (float)$this->DBParameter('data cache hit ratio'); + $arr[1] = (float)$this->DBParameter('data reads'); + $arr[2] = (float)$this->DBParameter('data writes'); + $arr[3] = (integer) $this->DBParameter('current connections'); + return $arr; + } + + /* + Low-level Get Database Parameter + */ + function _DBParameter($sql) + { + $savelog = $this->conn->LogSQL(false); + if (is_array($sql)) { + global $ADODB_FETCH_MODE; + + $sql1 = $sql[0]; + $key = $sql[1]; + if (sizeof($sql)>2) $pos = $sql[2]; + else $pos = 1; + if (sizeof($sql)>3) $coef = $sql[3]; + else $coef = false; + $ret = false; + $save = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false); + + $rs = $this->conn->Execute($sql1); + + if (isset($savem)) $this->conn->SetFetchMode($savem); + $ADODB_FETCH_MODE = $save; + if ($rs) { + while (!$rs->EOF) { + $keyf = reset($rs->fields); + if (trim($keyf) == $key) { + $ret = $rs->fields[$pos]; + if ($coef) $ret *= $coef; + break; + } + $rs->MoveNext(); + } + $rs->Close(); + } + $this->conn->LogSQL($savelog); + return $ret; + } else { + if (strncmp($sql,'=',1) == 0) { + $fn = substr($sql,1); + return $this->$fn(); + } + $sql = str_replace('$DATABASE',$this->conn->database,$sql); + $ret = $this->conn->GetOne($sql); + $this->conn->LogSQL($savelog); + + return $ret; + } + } + + /* + Warn if cache ratio falls below threshold. Displayed in "Description" column. + */ + function WarnCacheRatio($val) + { + if ($val < $this->warnRatio) + return 'Cache ratio should be at least '.$this->warnRatio.'%'; + else return ''; + } + + function clearsql() + { + $perf_table = adodb_perf::table(); + $this->conn->Execute("delete from $perf_table where created<".$this->conn->sysTimeStamp); + } + /***********************************************************************************************/ + // HIGH LEVEL UI FUNCTIONS + /***********************************************************************************************/ + + + function UI($pollsecs=5) + { + global $ADODB_LOG_CONN; + + $perf_table = adodb_perf::table(); + $conn = $this->conn; + + $app = $conn->host; + if ($conn->host && $conn->database) $app .= ', db='; + $app .= $conn->database; + + if ($app) $app .= ', '; + $savelog = $this->conn->LogSQL(false); + $info = $conn->ServerInfo(); + if (isset($_GET['clearsql'])) { + $this->clearsql(); + } + $this->conn->LogSQL($savelog); + + // magic quotes + + if (isset($_GET['sql']) && get_magic_quotes_gpc()) { + $_GET['sql'] = $_GET['sql'] = str_replace(array("\\'",'\"'),array("'",'"'),$_GET['sql']); + } + + if (!isset($_SESSION['ADODB_PERF_SQL'])) $nsql = $_SESSION['ADODB_PERF_SQL'] = 10; + else $nsql = $_SESSION['ADODB_PERF_SQL']; + + $app .= $info['description']; + + + if (isset($_GET['do'])) $do = $_GET['do']; + else if (isset($_POST['do'])) $do = $_POST['do']; + else if (isset($_GET['sql'])) $do = 'viewsql'; + else $do = 'stats'; + + if (isset($_GET['nsql'])) { + if ($_GET['nsql'] > 0) $nsql = $_SESSION['ADODB_PERF_SQL'] = (integer) $_GET['nsql']; + } + echo "ADOdb Performance Monitor on $app"; + if ($do == 'viewsql') $form = "
# SQL:
"; + else $form = " "; + + $allowsql = !defined('ADODB_PERF_NO_RUN_SQL'); + global $ADODB_PERF_MIN; + $app .= " (Min sql timing \$ADODB_PERF_MIN=$ADODB_PERF_MIN secs)"; + + if (empty($_GET['hidem'])) + echo "
+ ADOdb Performance Monitor for $app
+ Performance Stats   View SQL +   View Tables   Poll Stats", + $allowsql ? '   Run SQL' : '', + "$form", + "
"; + + + switch ($do) { + default: + case 'stats': + if (empty($ADODB_LOG_CONN)) + echo "

  Clear SQL Log
"; + echo $this->HealthCheck(); + //$this->conn->debug=1; + echo $this->CheckMemory(); + break; + case 'poll': + $self = htmlspecialchars($_SERVER['PHP_SELF']); + echo ""; + break; + case 'poll2': + echo "

";
+			$this->Poll($pollsecs);
+			break;
+		
+		case 'dosql':
+			if (!$allowsql) break;
+			
+			$this->DoSQLForm();
+			break;
+		case 'viewsql':
+			if (empty($_GET['hidem']))
+				echo "  Clear SQL Log
";
+			echo($this->SuspiciousSQL($nsql));
+			echo($this->ExpensiveSQL($nsql));
+			echo($this->InvalidSQL($nsql));
+			break;
+		case 'tables': 
+			echo $this->Tables(); break;
+		}
+		global $ADODB_vers;
+		echo "
$ADODB_vers Sponsored by phpLens
";
+	}
+	
+	/*
+		Runs in infinite loop, returning real-time statistics
+	*/
+	function Poll($secs=5)
+	{
+		$this->conn->fnExecute = false;
+		//$this->conn->debug=1;
+		if ($secs <= 1) $secs = 1;
+		echo "Accumulating statistics, every $secs seconds...\n";flush();
+		$arro = $this->PollParameters();
+		$cnt = 0;
+		set_time_limit(0);
+		sleep($secs);
+		while (1) {
+
+			$arr = $this->PollParameters();
+			
+			$hits   = sprintf('%2.2f',$arr[0]);
+			$reads  = sprintf('%12.4f',($arr[1]-$arro[1])/$secs);
+			$writes = sprintf('%12.4f',($arr[2]-$arro[2])/$secs);
+			$sess = sprintf('%5d',$arr[3]);
+			
+			$load = $this->CPULoad();
+			if ($load !== false) {
+				$oslabel = 'WS-CPU%';
+				$osval = sprintf(" %2.1f  ",(float) $load);
+			}else {
+				$oslabel = '';
+				$osval = '';
+			}
+			if ($cnt % 10 == 0) echo " Time   ".$oslabel."   Hit%   Sess           Reads/s          Writes/s\n"; 
+			$cnt += 1;
+			echo date('H:i:s').'  '.$osval."$hits  $sess $reads $writes\n";
+			flush();
+			
+			if (connection_aborted()) return;
+			
+			sleep($secs);
+			$arro = $arr;
+		}
+	}
+	
+	/*
+		Returns basic health check in a command line interface
+	*/
+	function HealthCheckCLI()
+	{
+		return $this->HealthCheck(true);
+	}
+	
+		
+	/*
+		Returns basic health check as HTML
+	*/
+	function HealthCheck($cli=false)
+	{
+		$saveE = $this->conn->fnExecute;
+		$this->conn->fnExecute = false;	
+		if ($cli) $html = '';
+		else $html = $this->table.'
'.$this->conn->databaseType.'
'.$this->titles;
+		
+		$oldc = false;
+		$bgc = '';
+		foreach($this->settings as $name => $arr) {
+			if ($arr === false) break;
+			
+			if (!is_string($name)) {
+				if ($cli) $html .= " -- $arr -- \n";
+				else $html .= "color>$arr  ";
+				continue;
+			}
+			
+			if (!is_array($arr)) break;
+			$category = $arr[0];
+			$how = $arr[1];
+			if (sizeof($arr)>2) $desc = $arr[2];
+			else $desc = '   ';
+			
+			
+			if ($category == 'HIDE') continue;
+			
+			$val = $this->_DBParameter($how);
+			
+			if ($desc && strncmp($desc,"=",1) === 0) {
+				$fn = substr($desc,1);
+				$desc = $this->$fn($val);
+			}
+			
+			if ($val === false) {
+				$m = $this->conn->ErrorMsg();
+				$val = "Error: $m"; 
+			} else {
+				if (is_numeric($val) && $val >= 256*1024) {
+					if ($val % (1024*1024) == 0) {
+						$val /= (1024*1024);
+						$val .= 'M';
+					} else if ($val % 1024 == 0) {
+						$val /= 1024;
+						$val .= 'K';
+					}
+					//$val = htmlspecialchars($val);
+				}
+			}
+			if ($category != $oldc) {
+				$oldc = $category;
+				//$bgc = ($bgc == ' bgcolor='.$this->color) ? ' bgcolor=white' : ' bgcolor='.$this->color;
+			}
+			if (strlen($desc)==0) $desc = ' ';
+			if (strlen($val)==0) $val = ' ';
+			if ($cli) {
+				$html  .= str_replace(' ','',sprintf($this->cliFormat,strip_tags($name),strip_tags($val),strip_tags($desc)));
+				
+			}else {
+				$html .= "".$name.''.$val.''.$desc."\n";
+			}
+		}
+		
+		if (!$cli) $html .= "\n";
+		$this->conn->fnExecute = $saveE;
+			
+		return $html;	
+	}
+	
+	function Tables($orderby='1')
+	{
+		if (!$this->tablesSQL) return false;
+		
+		$savelog = $this->conn->LogSQL(false);
+		$rs = $this->conn->Execute($this->tablesSQL.' order by '.$orderby);
+		$this->conn->LogSQL($savelog);
+		$html = rs2html($rs,false,false,false,false);
+		return $html;
+	}
+	
+
+	function CreateLogTable()
+	{
+		if (!$this->createTableSQL) return false;
+		
+		$table = $this->table();
+		$sql = str_replace('adodb_logsql',$table,$this->createTableSQL);
+		$savelog = $this->conn->LogSQL(false);
+		$ok = $this->conn->Execute($sql);
+		$this->conn->LogSQL($savelog);
+		return ($ok) ? true : false;
+	}
+	
+	function DoSQLForm()
+	{
+	
+		
+		$PHP_SELF = htmlspecialchars($_SERVER['PHP_SELF']);
+		$sql = isset($_REQUEST['sql']) ? $_REQUEST['sql'] : '';
+
+		if (isset($_SESSION['phplens_sqlrows'])) $rows = $_SESSION['phplens_sqlrows'];
+		else $rows = 3;
+		
+		if (isset($_REQUEST['SMALLER'])) {
+			$rows /= 2;
+			if ($rows < 3) $rows = 3;
+			$_SESSION['phplens_sqlrows'] = $rows;
+		}
+		if (isset($_REQUEST['BIGGER'])) {
+			$rows *= 2;
+			$_SESSION['phplens_sqlrows'] = $rows;
+		}
+		
+?>
+
+

+
+
+
+  
+  
+  
+ 
 Form size: 
+
+
+

+  

+

+
+undomq(trim($sql));
+		if (substr($sql,strlen($sql)-1) === ';') {
+			$print = true;
+			$sqla = $this->SplitSQL($sql);
+		} else  {
+			$print = false;
+			$sqla = array($sql);
+		}
+		foreach($sqla as $sqls) {
+
+			if (!$sqls) continue;
+			
+			if ($print) {
+				print "
".htmlspecialchars($sqls)."
";
+				flush();
+			}
+			$savelog = $this->conn->LogSQL(false);
+			$rs = $this->conn->Execute($sqls);
+			$this->conn->LogSQL($savelog);
+			if ($rs && is_object($rs) && !$rs->EOF) {
+				rs2html($rs);
+				while ($rs->NextRecordSet()) {
+					print "
 
";
+					rs2html($rs);
+				}
+			} else {
+				$e1 = (integer) $this->conn->ErrorNo();
+				$e2 = $this->conn->ErrorMsg();
+				if (($e1) || ($e2)) {
+					if (empty($e1)) $e1 = '-1'; // postgresql fix
+					print '   '.$e1.': '.$e2;
+				} else {
+					print "
No Recordset returned
";
+				}
+			}
+		} // foreach
+	}
+	
+	function SplitSQL($sql)
+	{
+		$arr = explode(';',$sql);
+		return $arr;
+	}
+	
+	function undomq($m) 
+	{
+	if (get_magic_quotes_gpc()) {
+		// undo the damage
+		$m = str_replace('\\\\','\\',$m);
+		$m = str_replace('\"','"',$m);
+		$m = str_replace('\\\'','\'',$m);
+	}
+	return $m;
+}
+
+    
+   /************************************************************************/
+   
+    /** 
+     * Reorganise multiple table-indices/statistics/..
+     * OptimizeMode could be given by last Parameter
+     * 
+     * @example
+     *      
+     *          optimizeTables( 'tableA');
+     *      

+     *      
+     *          optimizeTables( 'tableA', 'tableB', 'tableC');
+     *      

+     *      
+     *          optimizeTables( 'tableA', 'tableB', ADODB_OPT_LOW);
+     *      

+     * 
+     * @param string table name of the table to optimize
+     * @param int mode optimization-mode
+     *      ADODB_OPT_HIGH for full optimization 
+     *      ADODB_OPT_LOW for CPU-less optimization
+     *      Default is LOW ADODB_OPT_LOW 
+     * @author Markus Staab
+     * @return Returns true on success and false on error
+     */
+    function OptimizeTables()
+    {
+        $args = func_get_args();
+        $numArgs = func_num_args();
+        
+        if ( $numArgs == 0) return false;
+        
+        $mode = ADODB_OPT_LOW; 
+        $lastArg = $args[ $numArgs - 1];
+        if ( !is_string($lastArg)) {
+            $mode = $lastArg;
+            unset( $args[ $numArgs - 1]);
+        }
+        
+        foreach( $args as $table) {
+            $this->optimizeTable( $table, $mode);
+        }
+	}
+
+    /** 
+     * Reorganise the table-indices/statistics/.. depending on the given mode.
+     * Default Implementation throws an error.
+     * 
+     * @param string table name of the table to optimize
+     * @param int mode optimization-mode
+     *      ADODB_OPT_HIGH for full optimization 
+     *      ADODB_OPT_LOW for CPU-less optimization
+     *      Default is LOW ADODB_OPT_LOW 
+     * @author Markus Staab
+     * @return Returns true on success and false on error
+     */
+    function OptimizeTable( $table, $mode = ADODB_OPT_LOW) 
+    {
+        ADOConnection::outp( sprintf( "
%s: '%s' not implemented for driver '%s'
", __CLASS__, __FUNCTION__, $this->conn->databaseType));
+        return false;
+    }
+    
+    /** 
+     * Reorganise current database.
+     * Default implementation loops over all MetaTables() and 
+     * optimize each using optmizeTable()
+     * 
+     * @author Markus Staab
+     * @return Returns true on success and false on error
+     */
+    function optimizeDatabase() 
+    {
+        $conn = $this->conn;
+        if ( !$conn) return false;
+        
+        $tables = $conn->MetaTables( 'TABLES');
+        if ( !$tables ) return false;
+
+        foreach( $tables as $table) {
+            if ( !$this->optimizeTable( $table)) {
+                return false;
+            }
+        }
+      
+        return true;
+    }
+    // end hack 
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/adodb-php4.inc.php b/adodb/adodb-php4.inc.php
new file mode 100644
index 0000000..e46a74d
--- /dev/null
+++ b/adodb/adodb-php4.inc.php
@@ -0,0 +1,16 @@
+
\ No newline at end of file
diff --git a/adodb/adodb-time.inc.php b/adodb/adodb-time.inc.php
new file mode 100644
index 0000000..d62f678
--- /dev/null
+++ b/adodb/adodb-time.inc.php
@@ -0,0 +1,1429 @@
+ 4 digit year conversion. The maximum is billions of years in the 
+future, but this is a theoretical limit as the computation of that year 
+would take too long with the current implementation of adodb_mktime().
+
+This library replaces native functions as follows:
+
+
	
+	getdate()  with  adodb_getdate()
+	date()     with  adodb_date() 
+	gmdate()   with  adodb_gmdate()
+	mktime()   with  adodb_mktime()
+	gmmktime() with  adodb_gmmktime()
+	strftime() with  adodb_strftime()
+	strftime() with  adodb_gmstrftime()
+

+	
+The parameters are identical, except that adodb_date() accepts a subset
+of date()'s field formats. Mktime() will convert from local time to GMT, 
+and date() will convert from GMT to local time, but daylight savings is 
+not handled currently.
+
+This library is independant of the rest of ADOdb, and can be used
+as standalone code.
+
+PERFORMANCE
+
+For high speed, this library uses the native date functions where
+possible, and only switches to PHP code when the dates fall outside 
+the 32-bit signed integer range.
+
+GREGORIAN CORRECTION
+
+Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, 
+October 4, 1582 (Julian) was followed immediately by Friday, October 15, 
+1582 (Gregorian). 
+
+Since 0.06, we handle this correctly, so:
+
+adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) 
+	== 24 * 3600 (1 day)
+
+=============================================================================
+
+COPYRIGHT
+
+(c) 2003-2005 John Lim and released under BSD-style license except for code by 
+jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
+and originally found at http://www.php.net/manual/en/function.mktime.php
+
+=============================================================================
+
+BUG REPORTS
+
+These should be posted to the ADOdb forums at
+
+	http://phplens.com/lens/lensforum/topics.php?id=4
+
+=============================================================================
+
+FUNCTION DESCRIPTIONS
+
+
+** FUNCTION adodb_getdate($date=false)
+
+Returns an array containing date information, as getdate(), but supports
+dates greater than 1901 to 2038. The local date/time format is derived from a 
+heuristic the first time adodb_getdate is called. 
+	 
+	 
+** FUNCTION adodb_date($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted local date. If $timestamp is not defined, the
+current timestamp is used. Unlike the function date(), it supports dates
+outside the 1901 to 2038 range.
+
+The format fields that adodb_date supports:
+
+
+	a - "am" or "pm" 
+	A - "AM" or "PM" 
+	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" 
+	D - day of the week, textual, 3 letters; e.g. "Fri" 
+	F - month, textual, long; e.g. "January" 
+	g - hour, 12-hour format without leading zeros; i.e. "1" to "12" 
+	G - hour, 24-hour format without leading zeros; i.e. "0" to "23" 
+	h - hour, 12-hour format; i.e. "01" to "12" 
+	H - hour, 24-hour format; i.e. "00" to "23" 
+	i - minutes; i.e. "00" to "59" 
+	j - day of the month without leading zeros; i.e. "1" to "31" 
+	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"  
+	L - boolean for whether it is a leap year; i.e. "0" or "1" 
+	m - month; i.e. "01" to "12" 
+	M - month, textual, 3 letters; e.g. "Jan" 
+	n - month without leading zeros; i.e. "1" to "12" 
+	O - Difference to Greenwich time in hours; e.g. "+0200" 
+	Q - Quarter, as in 1, 2, 3, 4 
+	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" 
+	s - seconds; i.e. "00" to "59" 
+	S - English ordinal suffix for the day of the month, 2 characters; 
+	   			i.e. "st", "nd", "rd" or "th" 
+	t - number of days in the given month; i.e. "28" to "31"
+	T - Timezone setting of this machine; e.g. "EST" or "MDT" 
+	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)  
+	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) 
+	Y - year, 4 digits; e.g. "1999" 
+	y - year, 2 digits; e.g. "99" 
+	z - day of the year; i.e. "0" to "365" 
+	Z - timezone offset in seconds (i.e. "-43200" to "43200"). 
+	   			The offset for timezones west of UTC is always negative, 
+				and for those east of UTC is always positive. 
+

+
+Unsupported:
+
+	B - Swatch Internet time 
+	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
+	W - ISO-8601 week number of year, weeks starting on Monday 
+
+

+
+
+** FUNCTION adodb_date2($fmt, $isoDateString = false)
+Same as adodb_date, but 2nd parameter accepts iso date, eg.
+
+  adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
+
+  
+** FUNCTION adodb_gmdate($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
+current timestamp is used. Unlike the function date(), it supports dates
+outside the 1901 to 2038 range.
+
+
+** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
+
+Converts a local date to a unix timestamp.  Unlike the function mktime(), it supports
+dates outside the 1901 to 2038 range. All parameters are optional.
+
+
+** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
+
+Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it supports
+dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters
+are currently compulsory.
+
+** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
+Convert a timestamp to a formatted GMT date.
+
+** FUNCTION adodb_strftime($fmt, $timestamp = false)
+
+Convert a timestamp to a formatted local date. Internally converts $fmt into 
+adodb_date format, then echo result.
+
+For best results, you can define the local date format yourself. Define a global
+variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
+adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
+
+    eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
+	
+	Supported format codes:
+
+
+	%a - abbreviated weekday name according to the current locale 
+	%A - full weekday name according to the current locale 
+	%b - abbreviated month name according to the current locale 
+	%B - full month name according to the current locale 
+	%c - preferred date and time representation for the current locale 
+	%d - day of the month as a decimal number (range 01 to 31) 
+	%D - same as %m/%d/%y 
+	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') 
+	%h - same as %b
+	%H - hour as a decimal number using a 24-hour clock (range 00 to 23) 
+	%I - hour as a decimal number using a 12-hour clock (range 01 to 12) 
+	%m - month as a decimal number (range 01 to 12) 
+	%M - minute as a decimal number 
+	%n - newline character 
+	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale 
+	%r - time in a.m. and p.m. notation 
+	%R - time in 24 hour notation 
+	%S - second as a decimal number 
+	%t - tab character 
+	%T - current time, equal to %H:%M:%S 
+	%x - preferred date representation for the current locale without the time 
+	%X - preferred time representation for the current locale without the date 
+	%y - year as a decimal number without a century (range 00 to 99) 
+	%Y - year as a decimal number including the century 
+	%Z - time zone or name or abbreviation 
+	%% - a literal `%' character 
+
	
+
+	Unsupported codes:
+
+	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) 
+	%g - like %G, but without the century. 
+	%G - The 4-digit year corresponding to the ISO week number (see %V). 
+	     This has the same format and value as %Y, except that if the ISO week number belongs 
+		 to the previous or next year, that year is used instead. 
+	%j - day of the year as a decimal number (range 001 to 366) 
+	%u - weekday as a decimal number [1,7], with 1 representing Monday 
+	%U - week number of the current year as a decimal number, starting 
+	    with the first Sunday as the first day of the first week 
+	%V - The ISO 8601:1988 week number of the current year as a decimal number, 
+	     range 01 to 53, where week 1 is the first week that has at least 4 days in the 
+		 current year, and with Monday as the first day of the week. (Use %G or %g for 
+		 the year component that corresponds to the week number for the specified timestamp.) 
+	%w - day of the week as a decimal, Sunday being 0 
+	%W - week number of the current year as a decimal number, starting with the 
+	     first Monday as the first day of the first week 
+

+
+=============================================================================
+
+NOTES
+
+Useful url for generating test timestamps:
+	http://www.4webhelp.net/us/timestamp.php
+
+Possible future optimizations include 
+
+a. Using an algorithm similar to Plauger's in "The Standard C Library" 
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not 
+work outside 32-bit signed range, so i decided not to implement it.
+
+b. Implement daylight savings, which looks awfully complicated, see
+	http://webexhibits.org/daylightsaving/
+
+
+CHANGELOG
+
+- 11 Feb 2008 0.33
+* Bug in 0.32 fix for hour handling. Fixed.
+
+- 1 Feb 2008 0.32
+* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly. 
+
+- 10 Jan 2008 0.31
+* Now adodb_mktime(0,0,0,24,1,2037) works correctly.
+
+- 15 July 2007 0.30
+Added PHP 5.2.0 compatability fixes. 
+ * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
+ * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
+ * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but 
+   in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
+ * 
+ 
+- 19 March 2006 0.24
+Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
+
+- 10 Feb 2006 0.23
+PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000. 
+	In PHP4, we will still use -0000 for 100% compat with PHP4.
+
+- 08 Sept 2005 0.22
+In adodb_date2(), $is_gmt not supported properly. Fixed.
+
+- 18 July  2005 0.21
+In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. Changed for compat.
+Added support for negative months in adodb_mktime().
+
+- 24 Feb 2005 0.20
+Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
+
+- 21 Dec 2004 0.17
+In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false. 
+Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
+
+- 17 Nov 2004 0.16
+Removed intval typecast in adodb_mktime() for secs, allowing:
+	 adodb_mktime(0,0,0 + 2236672153,1,1,1934);
+Suggested by Ryan.
+
+- 18 July 2004 0.15
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory. 
+This brings it more in line with mktime (still not identical).
+
+- 23 June 2004 0.14
+
+Allow you to define your own daylights savings function, adodb_daylight_sv.
+If the function is defined (somewhere in an include), then you can correct for daylights savings.
+
+In this example, we apply daylights savings in June or July, adding one hour. This is extremely
+unrealistic as it does not take into account time-zone, geographic location, current year.
+
+function adodb_daylight_sv(&$arr, $is_gmt)
+{
+	if ($is_gmt) return;
+	$m = $arr['mon'];
+	if ($m == 6 || $m == 7) $arr['hours'] += 1;
+}
+
+This is only called by adodb_date() and not by adodb_mktime(). 
+
+The format of $arr is
+Array ( 
+   [seconds] => 0 
+   [minutes] => 0 
+   [hours] => 0 
+   [mday] => 1      # day of month, eg 1st day of the month
+   [mon] => 2       # month (eg. Feb)
+   [year] => 2102 
+   [yday] => 31     # days in current year
+   [leap] =>        # true if leap year
+   [ndays] => 28    # no of days in current month
+   ) 
+   
+
+- 28 Apr 2004 0.13
+Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
+
+- 20 Mar 2004 0.12
+Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
+
+- 26 Oct 2003 0.11
+Because of daylight savings problems (some systems apply daylight savings to 
+January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
+
+- 9 Aug 2003 0.10
+Fixed bug with dates after 2038. 
+See http://phplens.com/lens/lensforum/msgs.php?id=6980
+
+- 1 July 2003 0.09
+Added support for Q (Quarter).
+Added adodb_date2(), which accepts ISO date in 2nd param
+
+- 3 March 2003 0.08
+Added support for 'S' adodb_date() format char. Added constant ADODB_ALLOW_NEGATIVE_TS
+if you want PHP to handle negative timestamps between 1901 to 1969.
+
+- 27 Feb 2003 0.07
+All negative numbers handled by adodb now because of RH 7.3+ problems.
+See http://bugs.php.net/bug.php?id=20048&edit=2
+
+- 4 Feb 2003 0.06
+Fixed a typo, 1852 changed to 1582! This means that pre-1852 dates
+are now correctly handled.
+
+- 29 Jan 2003 0.05
+
+Leap year checking differs under Julian calendar (pre 1582). Also
+leap year code optimized by checking for most common case first.
+
+We also handle month overflow correctly in mktime (eg month set to 13).
+
+Day overflow for less than one month's days is supported.
+
+- 28 Jan 2003 0.04
+
+Gregorian correction handled. In PHP5, we might throw an error if 
+mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
+Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
+
+- 27 Jan 2003 0.03
+
+Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
+Fixed calculation of days since start of year for <1970. 
+
+- 27 Jan 2003 0.02
+
+Changed _adodb_getdate() to inline leap year checking for better performance.
+Fixed problem with time-zones west of GMT +0000.
+
+- 24 Jan 2003 0.01
+
+First implementation.
+*/
+
+
+/* Initialization */
+
+/*
+	Version Number
+*/
+define('ADODB_DATE_VERSION',0.33);
+
+$ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
+
+/*
+	This code was originally for windows. But apparently this problem happens 
+	also with Linux, RH 7.3 and later!
+	
+	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
+	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
+	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
+	
+	References:
+	 http://bugs.php.net/bug.php?id=20048&edit=2
+	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
+*/
+
+if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+
+function adodb_date_test_date($y1,$m,$d=13)
+{
+	$h = round(rand()% 24);
+	$t = adodb_mktime($h,0,0,$m,$d,$y1);
+	$rez = adodb_date('Y-n-j H:i:s',$t);
+	if ($h == 0) $h = '00';
+	else if ($h < 10) $h = '0'.$h;
+	if ("$y1-$m-$d $h:00:00" != $rez) {
+		print "$y1 error, expected=$y1-$m-$d $h:00:00, adodb=$rez
";
+		return false;
+	}
+	return true;
+}
+
+function adodb_date_test_strftime($fmt)
+{
+	$s1 = strftime($fmt);
+	$s2 = adodb_strftime($fmt);
+	
+	if ($s1 == $s2) return true;
+	
+	echo "error for $fmt,  strftime=$s1, adodb=$s2
";
+	return false;
+}
+
+/**
+	 Test Suite
+*/	
+function adodb_date_test()
+{
+	
+	for ($m=-24; $m<=24; $m++)
+		echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"
";
+	
+	error_reporting(E_ALL);
+	print "
Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."
";
+	@set_time_limit(0);
+	$fail = false;
+	
+	// This flag disables calling of PHP native functions, so we can properly test the code
+	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
+	
+	$t = time();
+	
+	
+	$fmt = 'Y-m-d H:i:s';
+	echo '
';
+	echo 'adodb: ',adodb_date($fmt,$t),'
';
+	echo 'php  : ',date($fmt,$t),'
';
+	echo '
';
+	
+	adodb_date_test_strftime('%Y %m %x %X');
+	adodb_date_test_strftime("%A %d %B %Y");
+	adodb_date_test_strftime("%H %M S");
+	
+	$t = adodb_mktime(0,0,0);
+	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'
';
+	
+	$t = adodb_mktime(0,0,0,6,1,2102);
+	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'
';
+	
+	$t = adodb_mktime(0,0,0,2,1,2102);
+	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'
';
+	
+	
+	print "
Testing gregorian <=> julian conversion
";
+	$t = adodb_mktime(0,0,0,10,11,1492);
+	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
+	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing
';
+	
+	$t = adodb_mktime(0,0,0,2,29,1500);
+	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years
';
+	
+	$t = adodb_mktime(0,0,0,2,29,1700);
+	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years
';
+	
+	print  adodb_mktime(0,0,0,10,4,1582).' ';
+	print adodb_mktime(0,0,0,10,15,1582);
+	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
+	if ($diff != 3600*24) print " Error in gregorian correction = ".($diff/3600/24)." days 
";
+		
+	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : 'Error')."
";
+	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : 'Error')."
";
+	
+	print "
Testing overflow
";
+	
+	$t = adodb_mktime(0,0,0,3,33,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 
';
+	$t = adodb_mktime(0,0,0,4,33,1971);
+	if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day overflow 2 
';
+	$t = adodb_mktime(0,0,0,1,60,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' 
';
+	$t = adodb_mktime(0,0,0,12,32,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' 
';
+	$t = adodb_mktime(0,0,0,12,63,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' 
';
+	$t = adodb_mktime(0,0,0,13,3,1965);
+	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 
';
+	
+	print "Testing 2-digit => 4-digit year conversion
";
+	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000
";
+	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010
";
+	if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020
";
+	if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030
";
+	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940
";
+	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950
";
+	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990
";
+	
+	// Test string formating
+	print "
Testing date formating
";
+	
+	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
+	$s1 = date($fmt,0);
+	$s2 = adodb_date($fmt,0);
+	if ($s1 != $s2) {
+		print " date() 0 failed
$s1
$s2
";
+	}
+	flush();
+	for ($i=100; --$i > 0; ) {
+
+		$ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
+		$s1 = date($fmt,$ts);
+		$s2 = adodb_date($fmt,$ts);
+		//print "$s1 
$s2 
";
+		$pos = strcmp($s1,$s2);
+
+		if (($s1) != ($s2)) {
+			for ($j=0,$k=strlen($s1); $j < $k; $j++) {
+				if ($s1[$j] != $s2[$j]) {
+					print substr($s1,$j).' ';
+					break;
+				}
+			}
+			print "Error date(): $ts
 
+  \"$s1\" (date len=".strlen($s1).")
+  \"$s2\" (adodb_date len=".strlen($s2).")

";
+			$fail = true;
+		}
+		
+		$a1 = getdate($ts);
+		$a2 = adodb_getdate($ts);
+		$rez = array_diff($a1,$a2);
+		if (sizeof($rez)>0) {
+			print "Error getdate() $ts
";
+				print_r($a1);
+			print "
";
+				print_r($a2);
+			print "
";
+			$fail = true;
+		}
+	}
+	
+	// Test generation of dates outside 1901-2038
+	print "
Testing random dates between 100 and 4000
";
+	adodb_date_test_date(100,1);
+	for ($i=100; --$i >= 0;) {
+		$y1 = 100+rand(0,1970-100);
+		$m = rand(1,12);
+		adodb_date_test_date($y1,$m);
+		
+		$y1 = 3000-rand(0,3000-1970);
+		adodb_date_test_date($y1,$m);
+	}
+	print '
';
+	$start = 1960+rand(0,10);
+	$yrs = 12;
+	$i = 365.25*86400*($start-1970);
+	$offset = 36000+rand(10000,60000);
+	$max = 365*$yrs*86400;
+	$lastyear = 0;
+	
+	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
+	// and check if the roundtrip broke the original timestamp value.
+	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
+	$cnt = 0;
+	for ($max += $i; $i < $max; $i += $offset) {
+		$ret = adodb_date('m,d,Y,H,i,s',$i);
+		$arr = explode(',',$ret);
+		if ($lastyear != $arr[2]) {
+			$lastyear = $arr[2];
+			print " $lastyear ";
+			flush();
+		}
+		$newi = adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
+		if ($i != $newi) {
+			print "Error at $i, adodb_mktime returned $newi ($ret)";
+			$fail = true;
+			break;
+		}
+		$cnt += 1;
+	}
+	echo "Tested $cnt dates
";
+	if (!$fail) print "
Passed !
";
+	else print "
Failed :-(
";
+}
+
+/**
+	Returns day of week, 0 = Sunday,... 6=Saturday. 
+	Algorithm from PEAR::Date_Calc
+*/
+function adodb_dow($year, $month, $day)
+{
+/*
+Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and 
+proclaimed that from that time onwards 3 days would be dropped from the calendar 
+every 400 years.
+
+Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian). 
+*/
+	if ($year <= 1582) {
+		if ($year < 1582 || 
+			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
+		 else
+			$greg_correction = 0;
+	} else
+		$greg_correction = 0;
+	
+	if($month > 2)
+	    $month -= 2;
+	else {
+	    $month += 10;
+	    $year--;
+	}
+	
+	$day =  floor((13 * $month - 1) / 5) +
+	        $day + ($year % 100) +
+	        floor(($year % 100) / 4) +
+	        floor(($year / 100) / 4) - 2 *
+	        floor($year / 100) + 77 + $greg_correction;
+	
+	return $day - 7 * floor($day / 7);
+}
+
+
+/**
+ Checks for leap year, returns true if it is. No 2-digit year check. Also 
+ handles julian calendar correctly.
+*/
+function _adodb_is_leap_year($year) 
+{
+	if ($year % 4 != 0) return false;
+	
+	if ($year % 400 == 0) {
+		return true;
+	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
+	} else if ($year > 1582 && $year % 100 == 0 ) {
+		return false;
+	} 
+	
+	return true;
+}
+
+
+/**
+ checks for leap year, returns true if it is. Has 2-digit year check
+*/
+function adodb_is_leap_year($year) 
+{
+	return  _adodb_is_leap_year(adodb_year_digit_check($year));
+}
+
+/**
+	Fix 2-digit years. Works for any century.
+ 	Assumes that if 2-digit is more than 30 years in future, then previous century.
+*/
+function adodb_year_digit_check($y) 
+{
+	if ($y < 100) {
+	
+		$yr = (integer) date("Y");
+		$century = (integer) ($yr /100);
+		
+		if ($yr%100 > 50) {
+			$c1 = $century + 1;
+			$c0 = $century;
+		} else {
+			$c1 = $century;
+			$c0 = $century - 1;
+		}
+		$c1 *= 100;
+		// if 2-digit year is less than 30 years in future, set it to this century
+		// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
+		if (($y + $c1) < $yr+30) $y = $y + $c1;
+		else $y = $y + $c0*100;
+	}
+	return $y;
+}
+
+function adodb_get_gmt_diff_ts($ts) 
+{
+	if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
+		$arr = getdate($ts);
+		$y = $arr['year'];
+		$m = $arr['mon'];
+		$d = $arr['mday'];
+		return adodb_get_gmt_diff($y,$m,$d);	
+	} else {
+		return adodb_get_gmt_diff(false,false,false);
+	}
+	
+}
+
+/**
+ get local time zone offset from GMT. Does not handle historical timezones before 1970.
+*/
+function adodb_get_gmt_diff($y,$m,$d) 
+{
+static $TZ,$tzo;
+global $ADODB_DATETIME_CLASS;
+
+	if (!defined('ADODB_TEST_DATES')) $y = false;
+	else if ($y < 1970 || $y >= 2038) $y = false;
+
+	if ($ADODB_DATETIME_CLASS && $y !== false) {
+		$dt = new DateTime();
+		$dt->setISODate($y,$m,$d);
+		if (empty($tzo)) {
+			$tzo = new DateTimeZone(date_default_timezone_get());
+		#	$tzt = timezone_transitions_get( $tzo );
+		}
+		return -$tzo->getOffset($dt);
+	} else {
+		if (isset($TZ)) return $TZ;
+		$y = date('Y');
+		$TZ = mktime(0,0,0,12,2,$y,0) - gmmktime(0,0,0,12,2,$y,0);
+	}
+	
+	return $TZ;
+}
+
+/**
+	Returns an array with date info.
+*/
+function adodb_getdate($d=false,$fast=false)
+{
+	if ($d === false) return getdate();
+	if (!defined('ADODB_TEST_DATES')) {
+		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
+				return @getdate($d);
+		}
+	}
+	return _adodb_getdate($d);
+}
+
+/*
+// generate $YRS table for _adodb_getdate()
+function adodb_date_gentable($out=true)
+{
+
+	for ($i=1970; $i >= 1600; $i-=10) {
+		$s = adodb_gmmktime(0,0,0,1,1,$i);
+		echo "$i => $s,
";	
+	}
+}
+adodb_date_gentable();
+
+for ($i=1970; $i > 1500; $i--) {
+
+echo "
$i ";
+	adodb_date_test_date($i,1,1);
+}
+
+*/
+
+
+$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	
+function adodb_validdate($y,$m,$d)
+{
+global $_month_table_normal,$_month_table_leaf;
+
+	if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
+	else $marr = $_month_table_normal;
+	
+	if ($m > 12 || $m < 1) return false;
+	
+	if ($d > 31 || $d < 1) return false;
+	
+	if ($marr[$m] < $d) return false;
+	
+	if ($y < 1000 && $y > 3000) return false;
+	
+	return true;
+}
+
+/**
+	Low-level function that returns the getdate() array. We have a special
+	$fast flag, which if set to true, will return fewer array values,
+	and is much faster as it does not calculate dow, etc.
+*/
+function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
+{
+static $YRS;
+global $_month_table_normal,$_month_table_leaf;
+
+	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff_ts($origd));
+	$_day_power = 86400;
+	$_hour_power = 3600;
+	$_min_power = 60;
+	
+	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction 
+	
+	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	
+	$d366 = $_day_power * 366;
+	$d365 = $_day_power * 365;
+	
+	if ($d < 0) {
+		
+		if (empty($YRS)) $YRS = array(
+			1970 => 0,
+			1960 => -315619200,
+			1950 => -631152000,
+			1940 => -946771200,
+			1930 => -1262304000,
+			1920 => -1577923200,
+			1910 => -1893456000,
+			1900 => -2208988800,
+			1890 => -2524521600,
+			1880 => -2840140800,
+			1870 => -3155673600,
+			1860 => -3471292800,
+			1850 => -3786825600,
+			1840 => -4102444800,
+			1830 => -4417977600,
+			1820 => -4733596800,
+			1810 => -5049129600,
+			1800 => -5364662400,
+			1790 => -5680195200,
+			1780 => -5995814400,
+			1770 => -6311347200,
+			1760 => -6626966400,
+			1750 => -6942499200,
+			1740 => -7258118400,
+			1730 => -7573651200,
+			1720 => -7889270400,
+			1710 => -8204803200,
+			1700 => -8520336000,
+			1690 => -8835868800,
+			1680 => -9151488000,
+			1670 => -9467020800,
+			1660 => -9782640000,
+			1650 => -10098172800,
+			1640 => -10413792000,
+			1630 => -10729324800,
+			1620 => -11044944000,
+			1610 => -11360476800,
+			1600 => -11676096000);
+
+		if ($is_gmt) $origd = $d;
+		// The valid range of a 32bit signed timestamp is typically from 
+		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
+		//
+		
+		# old algorithm iterates through all years. new algorithm does it in
+		# 10 year blocks
+		
+		/*
+		# old algo
+		for ($a = 1970 ; --$a >= 0;) {
+			$lastd = $d;
+			
+			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
+			else $d += $d365;
+			
+			if ($d >= 0) {
+				$year = $a;
+				break;
+			}
+		}
+		*/
+		
+		$lastsecs = 0;
+		$lastyear = 1970;
+		foreach($YRS as $year => $secs) {
+			if ($d >= $secs) {
+				$a = $lastyear;
+				break;
+			}
+			$lastsecs = $secs;
+			$lastyear = $year;
+		}
+		
+		$d -= $lastsecs;
+		if (!isset($a)) $a = $lastyear;
+		
+		//echo ' yr=',$a,' ', $d,'.';
+		
+		for (; --$a >= 0;) {
+			$lastd = $d;
+			
+			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
+			else $d += $d365;
+			
+			if ($d >= 0) {
+				$year = $a;
+				break;
+			}
+		}
+		/**/
+		
+		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
+		
+		$d = $lastd;
+		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
+		for ($a = 13 ; --$a > 0;) {
+			$lastd = $d;
+			$d += $mtab[$a] * $_day_power;
+			if ($d >= 0) {
+				$month = $a;
+				$ndays = $mtab[$a];
+				break;
+			}
+		}
+		
+		$d = $lastd;
+		$day = $ndays + ceil(($d+1) / ($_day_power));
+
+		$d += ($ndays - $day+1)* $_day_power;
+		$hour = floor($d/$_hour_power);
+	
+	} else {
+		for ($a = 1970 ;; $a++) {
+			$lastd = $d;
+			
+			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
+			else $d -= $d365;
+			if ($d < 0) {
+				$year = $a;
+				break;
+			}
+		}
+		$secsInYear = $lastd;
+		$d = $lastd;
+		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
+		for ($a = 1 ; $a <= 12; $a++) {
+			$lastd = $d;
+			$d -= $mtab[$a] * $_day_power;
+			if ($d < 0) {
+				$month = $a;
+				$ndays = $mtab[$a];
+				break;
+			}
+		}
+		$d = $lastd;
+		$day = ceil(($d+1) / $_day_power);
+		$d = $d - ($day-1) * $_day_power;
+		$hour = floor($d /$_hour_power);
+	}
+	
+	$d -= $hour * $_hour_power;
+	$min = floor($d/$_min_power);
+	$secs = $d - $min * $_min_power;
+	if ($fast) {
+		return array(
+		'seconds' => $secs,
+		'minutes' => $min,
+		'hours' => $hour,
+		'mday' => $day,
+		'mon' => $month,
+		'year' => $year,
+		'yday' => floor($secsInYear/$_day_power),
+		'leap' => $leaf,
+		'ndays' => $ndays
+		);
+	}
+	
+	
+	$dow = adodb_dow($year,$month,$day);
+
+	return array(
+		'seconds' => $secs,
+		'minutes' => $min,
+		'hours' => $hour,
+		'mday' => $day,
+		'wday' => $dow,
+		'mon' => $month,
+		'year' => $year,
+		'yday' => floor($secsInYear/$_day_power),
+		'weekday' => gmdate('l',$_day_power*(3+$dow)),
+		'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
+		0 => $origd
+	);
+}
+/*
+		if ($isphp5)
+				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+			else
+				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+			break;*/
+function adodb_tz_offset($gmt,$isphp5)
+{
+	$zhrs = abs($gmt)/3600;
+	$hrs = floor($zhrs);
+	if ($isphp5) 
+		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+	else
+		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+}
+
+
+function adodb_gmdate($fmt,$d=false)
+{
+	return adodb_date($fmt,$d,true);
+}
+
+// accepts unix timestamp and iso date format in $d
+function adodb_date2($fmt, $d=false, $is_gmt=false)
+{
+	if ($d !== false) {
+		if (!preg_match( 
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
+
+		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
+	
+		// h-m-s-MM-DD-YY
+		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
+		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
+	}
+	
+	return adodb_date($fmt,$d,$is_gmt);
+}
+
+
+/**
+	Return formatted date based on timestamp $d
+*/
+function adodb_date($fmt,$d=false,$is_gmt=false)
+{
+static $daylight;
+global $ADODB_DATETIME_CLASS;
+
+	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
+	if (!defined('ADODB_TEST_DATES')) {
+		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
+				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
+
+		}
+	}
+	$_day_power = 86400;
+	
+	$arr = _adodb_getdate($d,true,$is_gmt);
+	
+	if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
+	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
+	
+	$year = $arr['year'];
+	$month = $arr['mon'];
+	$day = $arr['mday'];
+	$hour = $arr['hours'];
+	$min = $arr['minutes'];
+	$secs = $arr['seconds'];
+	
+	$max = strlen($fmt);
+	$dates = '';
+	
+	$isphp5 = PHP_VERSION >= 5;
+	
+	/*
+		at this point, we have the following integer vars to manipulate:
+		$year, $month, $day, $hour, $min, $secs
+	*/
+	for ($i=0; $i < $max; $i++) {
+		switch($fmt[$i]) {
+		case 'e':
+			$dates .= date('e');
+			break;
+		case 'T': 
+			if ($ADODB_DATETIME_CLASS) {
+				$dt = new DateTime();
+				$dt->SetDate($year,$month,$day);
+				$dates .= $dt->Format('T');
+			} else
+				$dates .= date('T');
+			break;
+		// YEAR
+		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
+		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
+		
+			// 4.3.11 uses '04 Jun 2004'
+			// 4.3.8 uses  ' 4 Jun 2004'
+			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '		
+				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
+			
+			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour; 
+			
+			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
+			
+			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
+			
+			$gmt = adodb_get_gmt_diff($year,$month,$day);
+			
+			$dates .= ' '.adodb_tz_offset($gmt,$isphp5);
+			break;
+			
+		case 'Y': $dates .= $year; break;
+		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
+		// MONTH
+		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
+		case 'Q': $dates .= ($month+3)>>2; break;
+		case 'n': $dates .= $month; break;
+		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
+		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
+		// DAY
+		case 't': $dates .= $arr['ndays']; break;
+		case 'z': $dates .= $arr['yday']; break;
+		case 'w': $dates .= adodb_dow($year,$month,$day); break;
+		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+		case 'j': $dates .= $day; break;
+		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
+		case 'S': 
+			$d10 = $day % 10;
+			if ($d10 == 1) $dates .= 'st';
+			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
+			else if ($d10 == 3) $dates .= 'rd';
+			else $dates .= 'th';
+			break;
+			
+		// HOUR
+		case 'Z':
+			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
+		case 'O': 
+			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
+			
+			$dates .= adodb_tz_offset($gmt,$isphp5);
+			break;
+			
+		case 'H': 
+			if ($hour < 10) $dates .= '0'.$hour; 
+			else $dates .= $hour; 
+			break;
+		case 'h': 
+			if ($hour > 12) $hh = $hour - 12; 
+			else {
+				if ($hour == 0) $hh = '12'; 
+				else $hh = $hour;
+			}
+			
+			if ($hh < 10) $dates .= '0'.$hh;
+			else $dates .= $hh;
+			break;
+			
+		case 'G': 
+			$dates .= $hour;
+			break;
+			
+		case 'g':
+			if ($hour > 12) $hh = $hour - 12; 
+			else {
+				if ($hour == 0) $hh = '12'; 
+				else $hh = $hour; 
+			}
+			$dates .= $hh;
+			break;
+		// MINUTES
+		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
+		// SECONDS
+		case 'U': $dates .= $d; break;
+		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
+		// AM/PM
+		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
+		case 'a':
+			if ($hour>=12) $dates .= 'pm';
+			else $dates .= 'am';
+			break;
+		case 'A':
+			if ($hour>=12) $dates .= 'PM';
+			else $dates .= 'AM';
+			break;
+		default:
+			$dates .= $fmt[$i]; break;
+		// ESCAPE
+		case "\\": 
+			$i++;
+			if ($i < $max) $dates .= $fmt[$i];
+			break;
+		}
+	}
+	return $dates;
+}
+
+/**
+	Returns a timestamp given a GMT/UTC time. 
+	Note that $is_dst is not implemented and is ignored.
+*/
+function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
+{
+	return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);
+}
+
+/**
+	Return a timestamp given a local time. Originally by jackbbs.
+	Note that $is_dst is not implemented and is ignored.
+	
+	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
+*/
+function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false) 
+{
+	if (!defined('ADODB_TEST_DATES')) {
+
+		if ($mon === false) {
+			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
+		}
+		
+		// for windows, we don't check 1970 because with timezone differences, 
+		// 1 Jan 1970 could generate negative timestamp, which is illegal
+		$usephpfns = (1970 < $year && $year < 2038
+			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
+			); 
+			
+		
+		if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
+			
+		if ($usephpfns) {
+				return $is_gmt ?
+					@gmmktime($hr,$min,$sec,$mon,$day,$year):
+					@mktime($hr,$min,$sec,$mon,$day,$year);
+		}
+	}
+	
+	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
+
+	/*
+	# disabled because some people place large values in $sec.
+	# however we need it for $mon because we use an array...
+	$hr = intval($hr);
+	$min = intval($min);
+	$sec = intval($sec);
+	*/
+	$mon = intval($mon);
+	$day = intval($day);
+	$year = intval($year);
+	
+	
+	$year = adodb_year_digit_check($year);
+
+	if ($mon > 12) {
+		$y = floor(($mon-1)/ 12);
+		$year += $y;
+		$mon -= $y*12;
+	} else if ($mon < 1) {
+		$y = ceil((1-$mon) / 12);
+		$year -= $y;
+		$mon += $y*12;
+	}
+	
+	$_day_power = 86400;
+	$_hour_power = 3600;
+	$_min_power = 60;
+	
+	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
+	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	
+	$_total_date = 0;
+	if ($year >= 1970) {
+		for ($a = 1970 ; $a <= $year; $a++) {
+			$leaf = _adodb_is_leap_year($a);
+			if ($leaf == true) {
+				$loop_table = $_month_table_leaf;
+				$_add_date = 366;
+			} else {
+				$loop_table = $_month_table_normal;
+				$_add_date = 365;
+			}
+			if ($a < $year) { 
+				$_total_date += $_add_date;
+			} else {
+				for($b=1;$b<$mon;$b++) {
+					$_total_date += $loop_table[$b];
+				}
+			}
+		}
+		$_total_date +=$day-1;
+		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
+	
+	} else {
+		for ($a = 1969 ; $a >= $year; $a--) {
+			$leaf = _adodb_is_leap_year($a);
+			if ($leaf == true) {
+				$loop_table = $_month_table_leaf;
+				$_add_date = 366;
+			} else {
+				$loop_table = $_month_table_normal;
+				$_add_date = 365;
+			}
+			if ($a > $year) { $_total_date += $_add_date;
+			} else {
+				for($b=12;$b>$mon;$b--) {
+					$_total_date += $loop_table[$b];
+				}
+			}
+		}
+		$_total_date += $loop_table[$mon] - $day;
+		
+		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
+		$_day_time = $_day_power - $_day_time;
+		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
+		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
+		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
+	} 
+	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
+	return $ret;
+}
+
+function adodb_gmstrftime($fmt, $ts=false)
+{
+	return adodb_strftime($fmt,$ts,true);
+}
+
+// hack - convert to adodb_date
+function adodb_strftime($fmt, $ts=false,$is_gmt=false)
+{
+global $ADODB_DATE_LOCALE;
+
+	if (!defined('ADODB_TEST_DATES')) {
+		if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
+			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if windows, must be +ve integer
+				return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
+
+		}
+	}
+	
+	if (empty($ADODB_DATE_LOCALE)) {
+	/*
+		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
+		$sep = substr($tstr,2,1);
+		$hasAM = strrpos($tstr,'M') !== false;
+	*/
+		# see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24
+		$dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am
+		$sep = substr($dstr,2,1);
+		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
+		$hasAM = strrpos($tstr,'M') !== false;
+		
+		$ADODB_DATE_LOCALE = array();
+		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';	
+		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
+			
+	}
+	$inpct = false;
+	$fmtdate = '';
+	for ($i=0,$max = strlen($fmt); $i < $max; $i++) {
+		$ch = $fmt[$i];
+		if ($ch == '%') {
+			if ($inpct) {
+				$fmtdate .= '%';
+				$inpct = false;
+			} else
+				$inpct = true;
+		} else if ($inpct) {
+		
+			$inpct = false;
+			switch($ch) {
+			case '0':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9':
+			case 'E':
+			case 'O':
+				/* ignore format modifiers */
+				$inpct = true; 
+				break;
+				
+			case 'a': $fmtdate .= 'D'; break;
+			case 'A': $fmtdate .= 'l'; break;
+			case 'h':
+			case 'b': $fmtdate .= 'M'; break;
+			case 'B': $fmtdate .= 'F'; break;
+			case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
+			case 'C': $fmtdate .= '\C?'; break; // century
+			case 'd': $fmtdate .= 'd'; break;
+			case 'D': $fmtdate .= 'm/d/y'; break;
+			case 'e': $fmtdate .= 'j'; break;
+			case 'g': $fmtdate .= '\g?'; break; //?
+			case 'G': $fmtdate .= '\G?'; break; //?
+			case 'H': $fmtdate .= 'H'; break;
+			case 'I': $fmtdate .= 'h'; break;
+			case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
+			case 'm': $fmtdate .= 'm'; break;
+			case 'M': $fmtdate .= 'i'; break;
+			case 'n': $fmtdate .= "\n"; break;
+			case 'p': $fmtdate .= 'a'; break;
+			case 'r': $fmtdate .= 'h:i:s a'; break;
+			case 'R': $fmtdate .= 'H:i:s'; break;
+			case 'S': $fmtdate .= 's'; break;
+			case 't': $fmtdate .= "\t"; break;
+			case 'T': $fmtdate .= 'H:i:s'; break;
+			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-based
+			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
+			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
+			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-based
+			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+			case 'y': $fmtdate .= 'y'; break;
+			case 'Y': $fmtdate .= 'Y'; break;
+			case 'Z': $fmtdate .= 'T'; break;
+			}
+		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
+			$fmtdate .= "\\".$ch;
+		else
+			$fmtdate .= $ch;
+	}
+	//echo "fmt=",$fmtdate,"
";
+	if ($ts === false) $ts = time();
+	$ret = adodb_date($fmtdate, $ts, $is_gmt);
+	return $ret;
+}
+
+
+?>
\ No newline at end of file
diff --git a/adodb/adodb-xmlschema.inc.php b/adodb/adodb-xmlschema.inc.php
new file mode 100644
index 0000000..706126e
--- /dev/null
+++ b/adodb/adodb-xmlschema.inc.php
@@ -0,0 +1,2225 @@
+parent = $parent;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	function create(&$xmls) {
+		return array();
+	}
+	
+	/**
+	* Destroys the object
+	*/
+	function destroy() {
+		unset( $this );
+	}
+	
+	/**
+	* Checks whether the specified RDBMS is supported by the current
+	* database object or its ranking ancestor.
+	*
+	* @param string $platform RDBMS platform name (from ADODB platform list).
+	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
+	}
+	
+	/**
+	* Returns the prefix set by the ranking ancestor of the database object.
+	*
+	* @param string $name Prefix string.
+	* @return string Prefix.
+	*/
+	function prefix( $name = '' ) {
+		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
+	}
+	
+	/**
+	* Extracts a field ID from the specified field.
+	*
+	* @param string $field Field.
+	* @return string Field ID.
+	*/
+	function FieldID( $field ) {
+		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
+	}
+}
+
+/**
+* Creates a table object in ADOdb's datadict format
+*
+* This class stores information about a database table. As charactaristics
+* of the table are loaded from the external source, methods and properties
+* of this class are used to build up the table description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbTable extends dbObject {
+	
+	/**
+	* @var string Table name
+	*/
+	var $name;
+	
+	/**
+	* @var array Field specifier: Meta-information about each field
+	*/
+	var $fields = array();
+	
+	/**
+	* @var array List of table indexes.
+	*/
+	var $indexes = array();
+	
+	/**
+	* @var array Table options: Table-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var string Field index: Keeps track of which field is currently being processed
+	*/
+	var $current_field;
+	
+	/**
+	* @var boolean Mark table for destruction
+	* @access private
+	*/
+	var $drop_table;
+	
+	/**
+	* @var boolean Mark field for destruction (not yet implemented)
+	* @access private
+	*/
+	var $drop_field = array();
+	
+	/**
+	* Iniitializes a new table object.
+	*
+	* @param string $prefix DB Object prefix
+	* @param array $attributes Array of table attributes.
+	*/
+	function dbTable( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+		$this->name = $this->prefix($attributes['NAME']);
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'INDEX':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					xml_set_object( $parser, $this->addIndex( $attributes ) );
+				}
+				break;
+			case 'DATA':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					xml_set_object( $parser, $this->addData( $attributes ) );
+				}
+				break;
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'FIELD':
+				// Add a field
+				$fieldName = $attributes['NAME'];
+				$fieldType = $attributes['TYPE'];
+				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
+				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
+				
+				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
+				break;
+			case 'KEY':
+			case 'NOTNULL':
+			case 'AUTOINCREMENT':
+				// Add a field option
+				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				break;
+			case 'DEFAULT':
+				// Add a field option to the table object
+				
+				// Work around ADOdb datadict issue that misinterprets empty strings.
+				if( $attributes['VALUE'] == '' ) {
+					$attributes['VALUE'] = " '' ";
+				}
+				
+				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
+				break;
+			case 'DEFDATE':
+			case 'DEFTIMESTAMP':
+				// Add a field option to the table object
+				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Table constraint
+			case 'CONSTRAINT':
+				if( isset( $this->current_field ) ) {
+					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
+				} else {
+					$this->addTableOpt( $cdata );
+				}
+				break;
+			// Table option
+			case 'OPT':
+				$this->addTableOpt( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			case 'FIELD':
+				unset($this->current_field);
+				break;
+
+		}
+	}
+	
+	/**
+	* Adds an index to a table object
+	*
+	* @param array $attributes Index attributes
+	* @return object dbIndex object
+	*/
+	function addIndex( $attributes ) {
+		$name = strtoupper( $attributes['NAME'] );
+		$this->indexes[$name] = new dbIndex( $this, $attributes );
+		return $this->indexes[$name];
+	}
+	
+	/**
+	* Adds data to a table object
+	*
+	* @param array $attributes Data attributes
+	* @return object dbData object
+	*/
+	function addData( $attributes ) {
+		if( !isset( $this->data ) ) {
+			$this->data = new dbData( $this, $attributes );
+		}
+		return $this->data;
+	}
+	
+	/**
+	* Adds a field to a table object
+	*
+	* $name is the name of the table to which the field should be added. 
+	* $type is an ADODB datadict field type. The following field types
+	* are supported as of ADODB 3.40:
+	* 	- C:  varchar
+	*	- X:  CLOB (character large object) or largest varchar size
+	*	   if CLOB is not supported
+	*	- C2: Multibyte varchar
+	*	- X2: Multibyte CLOB
+	*	- B:  BLOB (binary large object)
+	*	- D:  Date (some databases do not support this, and we return a datetime type)
+	*	- T:  Datetime or Timestamp
+	*	- L:  Integer field suitable for storing booleans (0 or 1)
+	*	- I:  Integer (mapped to I4)
+	*	- I1: 1-byte integer
+	*	- I2: 2-byte integer
+	*	- I4: 4-byte integer
+	*	- I8: 8-byte integer
+	*	- F:  Floating point number
+	*	- N:  Numeric or decimal number
+	*
+	* @param string $name Name of the table to which the field will be added.
+	* @param string $type	ADODB datadict field type.
+	* @param string $size	Field size
+	* @param array $opts	Field options array
+	* @return array Field specifier array
+	*/
+	function addField( $name, $type, $size = NULL, $opts = NULL ) {
+		$field_id = $this->FieldID( $name );
+		
+		// Set the field index so we know where we are
+		$this->current_field = $field_id;
+		
+		// Set the field name (required)
+		$this->fields[$field_id]['NAME'] = $name;
+		
+		// Set the field type (required)
+		$this->fields[$field_id]['TYPE'] = $type;
+		
+		// Set the field size (optional)
+		if( isset( $size ) ) {
+			$this->fields[$field_id]['SIZE'] = $size;
+		}
+		
+		// Set the field options
+		if( isset( $opts ) ) {
+			$this->fields[$field_id]['OPTS'][] = $opts;
+		}
+	}
+	
+	/**
+	* Adds a field option to the current field specifier
+	*
+	* This method adds a field option allowed by the ADOdb datadict 
+	* and appends it to the given field.
+	*
+	* @param string $field	Field name
+	* @param string $opt ADOdb field option
+	* @param mixed $value Field option value
+	* @return array Field specifier array
+	*/
+	function addFieldOpt( $field, $opt, $value = NULL ) {
+		if( !isset( $value ) ) {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
+		// Add the option and value
+		} else {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
+		}
+	}
+	
+	/**
+	* Adds an option to the table
+	*
+	* This method takes a comma-separated list of table-level options
+	* and appends them to the table object.
+	*
+	* @param string $opt Table option
+	* @return array Options
+	*/
+	function addTableOpt( $opt ) {
+		if(isset($this->currentPlatform)) {
+			$this->opts[$this->parent->db->databaseType] = $opt;
+		}
+		return $this->opts;
+	}
+
+	
+	/**
+	* Generates the SQL that will create the table in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing table creation SQL
+	*/
+	function create( &$xmls ) {
+		$sql = array();
+		
+		// drop any existing indexes
+		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
+			foreach( $legacy_indexes as $index => $index_details ) {
+				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
+			}
+		}
+		
+		// remove fields to be dropped from table object
+		foreach( $this->drop_field as $field ) {
+			unset( $this->fields[$field] );
+		}
+		
+		// if table exists
+		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
+			// drop table
+			if( $this->drop_table ) {
+				$sql[] = $xmls->dict->DropTableSQL( $this->name );
+				
+				return $sql;
+			}
+			
+			// drop any existing fields not in schema
+			foreach( $legacy_fields as $field_id => $field ) {
+				if( !isset( $this->fields[$field_id] ) ) {
+					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
+				}
+			}
+		// if table doesn't exist
+		} else {
+			if( $this->drop_table ) {
+				return $sql;
+			}
+			
+			$legacy_fields = array();
+		}
+		
+		// Loop through the field specifier array, building the associative array for the field options
+		$fldarray = array();
+		
+		foreach( $this->fields as $field_id => $finfo ) {
+			// Set an empty size if it isn't supplied
+			if( !isset( $finfo['SIZE'] ) ) {
+				$finfo['SIZE'] = '';
+			}
+			
+			// Initialize the field array with the type and size
+			$fldarray[$field_id] = array(
+				'NAME' => $finfo['NAME'],
+				'TYPE' => $finfo['TYPE'],
+				'SIZE' => $finfo['SIZE']
+			);
+			
+			// Loop through the options array and add the field options. 
+			if( isset( $finfo['OPTS'] ) ) {
+				foreach( $finfo['OPTS'] as $opt ) {
+					// Option has an argument.
+					if( is_array( $opt ) ) {
+						$key = key( $opt );
+						$value = $opt[key( $opt )];
+						@$fldarray[$field_id][$key] .= $value;
+					// Option doesn't have arguments
+					} else {
+						$fldarray[$field_id][$opt] = $opt;
+					}
+				}
+			}
+		}
+		
+		if( empty( $legacy_fields ) ) {
+			// Create the new table
+			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+			logMsg( end( $sql ), 'Generated CreateTableSQL' );
+		} else {
+			// Upgrade an existing table
+			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
+			switch( $xmls->upgrade ) {
+				// Use ChangeTableSQL
+				case 'ALTER':
+					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
+					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
+					break;
+				case 'REPLACE':
+					logMsg( 'Doing upgrade REPLACE (testing)' );
+					$sql[] = $xmls->dict->DropTableSQL( $this->name );
+					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+					break;
+				// ignore table
+				default:
+					return array();
+			}
+		}
+		
+		foreach( $this->indexes as $index ) {
+			$sql[] = $index->create( $xmls );
+		}
+		
+		if( isset( $this->data ) ) {
+			$sql[] = $this->data->create( $xmls );
+		}
+		
+		return $sql;
+	}
+	
+	/**
+	* Marks a field or table for destruction
+	*/
+	function drop() {
+		if( isset( $this->current_field ) ) {
+			// Drop the current field
+			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
+			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
+			$this->drop_field[$this->current_field] = $this->current_field;
+		} else {
+			// Drop the current table
+			logMsg( "Dropping table '{$this->name}'" );
+			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
+			$this->drop_table = TRUE;
+		}
+	}
+}
+
+/**
+* Creates an index object in ADOdb's datadict format
+*
+* This class stores information about a database index. As charactaristics
+* of the index are loaded from the external source, methods and properties
+* of this class are used to build up the index description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbIndex extends dbObject {
+	
+	/**
+	* @var string	Index name
+	*/
+	var $name;
+	
+	/**
+	* @var array	Index options: Index-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var array	Indexed fields: Table columns included in this index
+	*/
+	var $columns = array();
+	
+	/**
+	* @var boolean Mark index for destruction
+	* @access private
+	*/
+	var $drop = FALSE;
+	
+	/**
+	* Initializes the new dbIndex object.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*
+	* @internal
+	*/
+	function dbIndex( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+		
+		$this->name = $this->prefix ($attributes['NAME']);
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'CLUSTERED':
+			case 'BITMAP':
+			case 'UNIQUE':
+			case 'FULLTEXT':
+			case 'HASH':
+				// Add index Option
+				$this->addIndexOpt( $this->currentElement );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'COL':
+				$this->addField( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'INDEX':
+				xml_set_object( $parser, $this->parent );
+				break;
+		}
+	}
+	
+	/**
+	* Adds a field to the index
+	*
+	* @param string $name Field name
+	* @return string Field list
+	*/
+	function addField( $name ) {
+		$this->columns[$this->FieldID( $name )] = $name;
+		
+		// Return the field list
+		return $this->columns;
+	}
+	
+	/**
+	* Adds options to the index
+	*
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
+	*/
+	function addIndexOpt( $opt ) {
+		$this->opts[] = $opt;
+		
+		// Return the options list
+		return $this->opts;
+	}
+	
+	/**
+	* Generates the SQL that will create the index in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
+	*/
+	function create( &$xmls ) {
+		if( $this->drop ) {
+			return NULL;
+		}
+		
+		// eliminate any columns that aren't in the table
+		foreach( $this->columns as $id => $col ) {
+			if( !isset( $this->parent->fields[$id] ) ) {
+				unset( $this->columns[$id] );
+			}
+		}
+		
+		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
+	}
+	
+	/**
+	* Marks an index for destruction
+	*/
+	function drop() {
+		$this->drop = TRUE;
+	}
+}
+
+/**
+* Creates a data object in ADOdb's datadict format
+*
+* This class stores information about table data.
+*
+* @package axmls
+* @access private
+*/
+class dbData extends dbObject {
+	
+	var $data = array();
+	
+	var $row;
+	
+	/**
+	* Initializes the new dbIndex object.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*
+	* @internal
+	*/
+	function dbData( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'ROW':
+				$this->row = count( $this->data );
+				$this->data[$this->row] = array();
+				break;
+			case 'F':
+				$this->addField($attributes);
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'F':
+				$this->addData( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'DATA':
+				xml_set_object( $parser, $this->parent );
+				break;
+		}
+	}
+	
+	/**
+	* Adds a field to the index
+	*
+	* @param string $name Field name
+	* @return string Field list
+	*/
+	function addField( $attributes ) {
+		if( isset( $attributes['NAME'] ) ) {
+			$name = $attributes['NAME'];
+		} else {
+			$name = count($this->data[$this->row]);
+		}
+		
+		// Set the field index so we know where we are
+		$this->current_field = $this->FieldID( $name );
+	}
+	
+	/**
+	* Adds options to the index
+	*
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
+	*/
+	function addData( $cdata ) {
+		if( !isset( $this->data[$this->row] ) ) {
+			$this->data[$this->row] = array();
+		}
+		
+		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
+			$this->data[$this->row][$this->current_field] = '';
+		}
+		
+		$this->data[$this->row][$this->current_field] .= $cdata;
+	}
+	
+	/**
+	* Generates the SQL that will create the index in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
+	*/
+	function create( &$xmls ) {
+		$table = $xmls->dict->TableName($this->parent->name);
+		$table_field_count = count($this->parent->fields);
+		$sql = array();
+		
+		// eliminate any columns that aren't in the table
+		foreach( $this->data as $row ) {
+			$table_fields = $this->parent->fields;
+			$fields = array();
+			
+			foreach( $row as $field_id => $field_data ) {
+				if( !array_key_exists( $field_id, $table_fields ) ) {
+					if( is_numeric( $field_id ) ) {
+						$field_id = reset( array_keys( $table_fields ) );
+					} else {
+						continue;
+					}
+				}
+				
+				$name = $table_fields[$field_id]['NAME'];
+				
+				switch( $table_fields[$field_id]['TYPE'] ) {
+					case 'C':
+					case 'C2':
+					case 'X':
+					case 'X2':
+						$fields[$name] = $xmls->db->qstr( $field_data );
+						break;
+					case 'I':
+					case 'I1':
+					case 'I2':
+					case 'I4':
+					case 'I8':
+						$fields[$name] = intval($field_data);
+						break;
+					default:
+						$fields[$name] = $field_data;
+				}
+				
+				unset($table_fields[$field_id]);
+			}
+			
+			// check that at least 1 column is specified
+			if( empty( $fields ) ) {
+				continue;
+			}
+			
+			// check that no required columns are missing
+			if( count( $fields ) < $table_field_count ) {
+				foreach( $table_fields as $field ) {
+					if (isset( $field['OPTS'] ))
+						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
+							continue(2);
+						}
+				}
+			}
+			
+			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
+		}
+		
+		return $sql;
+	}
+}
+
+/**
+* Creates the SQL to execute a list of provided SQL queries
+*
+* @package axmls
+* @access private
+*/
+class dbQuerySet extends dbObject {
+	
+	/**
+	* @var array	List of SQL queries
+	*/
+	var $queries = array();
+	
+	/**
+	* @var string	String used to build of a query line by line
+	*/
+	var $query;
+	
+	/**
+	* @var string	Query prefix key
+	*/
+	var $prefixKey = '';
+	
+	/**
+	* @var boolean	Auto prefix enable (TRUE)
+	*/
+	var $prefixMethod = 'AUTO';
+	
+	/**
+	* Initializes the query set.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*/
+	function dbQuerySet( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+			
+		// Overrides the manual prefix key
+		if( isset( $attributes['KEY'] ) ) {
+			$this->prefixKey = $attributes['KEY'];
+		}
+		
+		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
+		
+		// Enables or disables automatic prefix prepending
+		switch( $prefixMethod ) {
+			case 'AUTO':
+				$this->prefixMethod = 'AUTO';
+				break;
+			case 'MANUAL':
+				$this->prefixMethod = 'MANUAL';
+				break;
+			case 'NONE':
+				$this->prefixMethod = 'NONE';
+				break;
+		}
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: QUERY. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'QUERY':
+				// Create a new query in a SQL queryset.
+				// Ignore this query set if a platform is specified and it's different than the 
+				// current connection platform.
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->newQuery();
+				} else {
+					$this->discardQuery();
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Line of queryset SQL data
+			case 'QUERY':
+				$this->buildQuery( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'QUERY':
+				// Add the finished query to the open query set.
+				$this->addQuery();
+				break;
+			case 'SQL':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* Re-initializes the query.
+	*
+	* @return boolean TRUE
+	*/
+	function newQuery() {
+		$this->query = '';
+		
+		return TRUE;
+	}
+	
+	/**
+	* Discards the existing query.
+	*
+	* @return boolean TRUE
+	*/
+	function discardQuery() {
+		unset( $this->query );
+		
+		return TRUE;
+	}
+	
+	/** 
+	* Appends a line to a query that is being built line by line
+	*
+	* @param string $data Line of SQL data or NULL to initialize a new query
+	* @return string SQL query string.
+	*/
+	function buildQuery( $sql = NULL ) {
+		if( !isset( $this->query ) OR empty( $sql ) ) {
+			return FALSE;
+		}
+		
+		$this->query .= $sql;
+		
+		return $this->query;
+	}
+	
+	/**
+	* Adds a completed query to the query list
+	*
+	* @return string	SQL of added query
+	*/
+	function addQuery() {
+		if( !isset( $this->query ) ) {
+			return FALSE;
+		}
+		
+		$this->queries[] = $return = trim($this->query);
+		
+		unset( $this->query );
+		
+		return $return;
+	}
+	
+	/**
+	* Creates and returns the current query set
+	*
+	* @param object $xmls adoSchema object
+	* @return array Query set
+	*/
+	function create( &$xmls ) {
+		foreach( $this->queries as $id => $query ) {
+			switch( $this->prefixMethod ) {
+				case 'AUTO':
+					// Enable auto prefix replacement
+					
+					// Process object prefix.
+					// Evaluate SQL statements to prepend prefix to objects
+					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					
+					// SELECT statements aren't working yet
+					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
+					
+				case 'MANUAL':
+					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
+					// If prefixKey is not set, we use the default constant XMLS_PREFIX
+					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
+						// Enable prefix override
+						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
+					} else {
+						// Use default replacement
+						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
+					}
+			}
+			
+			$this->queries[$id] = trim( $query );
+		}
+		
+		// Return the query set array
+		return $this->queries;
+	}
+	
+	/**
+	* Rebuilds the query with the prefix attached to any objects
+	*
+	* @param string $regex Regex used to add prefix
+	* @param string $query SQL query string
+	* @param string $prefix Prefix to be appended to tables, indices, etc.
+	* @return string Prefixed SQL query string.
+	*/
+	function prefixQuery( $regex, $query, $prefix = NULL ) {
+		if( !isset( $prefix ) ) {
+			return $query;
+		}
+		
+		if( preg_match( $regex, $query, $match ) ) {
+			$preamble = $match[1];
+			$postamble = $match[5];
+			$objectList = explode( ',', $match[3] );
+			// $prefix = $prefix . '_';
+			
+			$prefixedList = '';
+			
+			foreach( $objectList as $object ) {
+				if( $prefixedList !== '' ) {
+					$prefixedList .= ', ';
+				}
+				
+				$prefixedList .= $prefix . trim( $object );
+			}
+			
+			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
+		}
+		
+		return $query;
+	}
+}
+
+/**
+* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
+* 
+* This class is used to load and parse the XML file, to create an array of SQL statements
+* that can be used to build a database, and to build the database using the SQL array.
+*
+* @tutorial getting_started.pkg
+*
+* @author Richard Tango-Lowy & Dan Cech
+* @version $Revision: 1.12 $
+*
+* @package axmls
+*/
+class adoSchema {
+	
+	/**
+	* @var array	Array containing SQL queries to generate all objects
+	* @access private
+	*/
+	var $sqlArray;
+	
+	/**
+	* @var object	ADOdb connection object
+	* @access private
+	*/
+	var $db;
+	
+	/**
+	* @var object	ADOdb Data Dictionary
+	* @access private
+	*/
+	var $dict;
+	
+	/**
+	* @var string Current XML element
+	* @access private
+	*/
+	var $currentElement = '';
+	
+	/**
+	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
+	* @access private
+	*/
+	var $upgrade = '';
+	
+	/**
+	* @var string Optional object prefix
+	* @access private
+	*/
+	var $objectPrefix = '';
+	
+	/**
+	* @var long	Original Magic Quotes Runtime value
+	* @access private
+	*/
+	var $mgq;
+	
+	/**
+	* @var long	System debug
+	* @access private
+	*/
+	var $debug;
+	
+	/**
+	* @var string Regular expression to find schema version
+	* @access private
+	*/
+	var $versionRegex = '//';
+	
+	/**
+	* @var string Current schema version
+	* @access private
+	*/
+	var $schemaVersion;
+	
+	/**
+	* @var int	Success of last Schema execution
+	*/
+	var $success;
+	
+	/**
+	* @var bool	Execute SQL inline as it is generated
+	*/
+	var $executeInline;
+	
+	/**
+	* @var bool	Continue SQL execution if errors occur
+	*/
+	var $continueOnError;
+	
+	/**
+	* Creates an adoSchema object
+	*
+	* Creating an adoSchema object is the first step in processing an XML schema.
+	* The only parameter is an ADOdb database connection object, which must already
+	* have been created.
+	*
+	* @param object $db ADOdb database connection object.
+	*/
+	function adoSchema( $db ) {
+		// Initialize the environment
+		$this->mgq = get_magic_quotes_runtime();
+		ini_set("magic_quotes_runtime", 0);
+		#set_magic_quotes_runtime(0);
+		
+		$this->db = $db;
+		$this->debug = $this->db->debug;
+		$this->dict = NewDataDictionary( $this->db );
+		$this->sqlArray = array();
+		$this->schemaVersion = XMLS_SCHEMA_VERSION;
+		$this->executeInline( XMLS_EXECUTE_INLINE );
+		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
+		$this->setUpgradeMethod();
+	}
+	
+	/**
+	* Sets the method to be used for upgrading an existing database
+	*
+	* Use this method to specify how existing database objects should be upgraded.
+	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
+	* alter each database object directly, REPLACE attempts to rebuild each object
+	* from scratch, BEST attempts to determine the best upgrade method for each
+	* object, and NONE disables upgrading.
+	*
+	* This method is not yet used by AXMLS, but exists for backward compatibility.
+	* The ALTER method is automatically assumed when the adoSchema object is
+	* instantiated; other upgrade methods are not currently supported.
+	*
+	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
+	* @returns string Upgrade method used
+	*/
+	function SetUpgradeMethod( $method = '' ) {
+		if( !is_string( $method ) ) {
+			return FALSE;
+		}
+		
+		$method = strtoupper( $method );
+		
+		// Handle the upgrade methods
+		switch( $method ) {
+			case 'ALTER':
+				$this->upgrade = $method;
+				break;
+			case 'REPLACE':
+				$this->upgrade = $method;
+				break;
+			case 'BEST':
+				$this->upgrade = 'ALTER';
+				break;
+			case 'NONE':
+				$this->upgrade = 'NONE';
+				break;
+			default:
+				// Use default if no legitimate method is passed.
+				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
+		}
+		
+		return $this->upgrade;
+	}
+	
+	/**
+	* Enables/disables inline SQL execution.
+	*
+	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
+	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
+	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
+	* to apply the schema to the database.
+	*
+	* @param bool $mode execute
+	* @return bool current execution mode
+	*
+	* @see ParseSchema(), ExecuteSchema()
+	*/
+	function ExecuteInline( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->executeInline = $mode;
+		}
+		
+		return $this->executeInline;
+	}
+	
+	/**
+	* Enables/disables SQL continue on error.
+	*
+	* Call this method to enable or disable continuation of SQL execution if an error occurs.
+	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
+	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
+	* of the schema will continue.
+	*
+	* @param bool $mode execute
+	* @return bool current continueOnError mode
+	*
+	* @see addSQL(), ExecuteSchema()
+	*/
+	function ContinueOnError( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->continueOnError = $mode;
+		}
+		
+		return $this->continueOnError;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to create the database described. 
+	* @see ParseSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function ParseSchema( $filename, $returnSchema = FALSE ) {
+		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
+	* and generate the SQL necessary to create the database described by the schema.
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*
+	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
+	* @see ParseSchema(), ParseSchemaString()
+	*/
+	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
+			return FALSE;
+		}
+		
+		if ( $returnSchema )
+		{
+			$xmlstring = '';
+			while( $data = fread( $fp, 100000 ) ) {
+				$xmlstring .= $data;
+			}
+			return $xmlstring;
+		}
+		
+		$this->success = 2;
+		
+		$xmlParser = $this->create_parser();
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
+				die( sprintf(
+					"XML error: %s at line %d",
+					xml_error_string( xml_get_error_code( $xmlParser) ),
+					xml_get_current_line_number( $xmlParser)
+				) );
+			}
+		}
+		
+		xml_parser_free( $xmlParser );
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Converts an XML schema string to SQL.
+	*
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to create the database described by the schema. 
+	* @see ParseSchema()
+	*
+	* @param string $xmlstring XML schema string.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*/
+	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
+			return FALSE;
+		}
+		
+		if ( $returnSchema )
+		{
+			return $xmlstring;
+		}
+		
+		$this->success = 2;
+		
+		$xmlParser = $this->create_parser();
+		
+		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
+			die( sprintf(
+				"XML error: %s at line %d",
+				xml_error_string( xml_get_error_code( $xmlParser) ),
+				xml_get_current_line_number( $xmlParser)
+			) );
+		}
+		
+		xml_parser_free( $xmlParser );
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to uninstallation SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to remove the database described.
+	* @see RemoveSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function RemoveSchema( $filename, $returnSchema = FALSE ) {
+		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	}
+	
+	/**
+	* Converts an XML schema string to uninstallation SQL.
+	*
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to uninstall the database described by the schema. 
+	* @see RemoveSchema()
+	*
+	* @param string $schema XML schema string.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*/
+	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
+	}
+	
+	/**
+	* Applies the current XML schema to the database (post execution).
+	*
+	* Call this method to apply the current schema (generally created by calling 
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* and executing other SQL specified in the schema) after parsing.
+	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
+	*
+	* @param array $sqlArray Array of SQL statements that will be applied rather than
+	*		the current schema.
+	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
+	* @returns integer 0 if failure, 1 if errors, 2 if successful.
+	*/
+	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
+		if( !is_bool( $continueOnErr ) ) {
+			$continueOnErr = $this->ContinueOnError();
+		}
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			$this->success = 0;
+		} else {
+			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
+		}
+		
+		return $this->success;
+	}
+	
+	/**
+	* Returns the current SQL array. 
+	*
+	* Call this method to fetch the array of SQL queries resulting from 
+	* ParseSchema() or ParseSchemaString(). 
+	*
+	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
+	* @return array Array of SQL statements or FALSE if an error occurs
+	*/
+	function PrintSQL( $format = 'NONE' ) {
+		$sqlArray = null;
+		return $this->getSQL( $format, $sqlArray );
+	}
+	
+	/**
+	* Saves the current SQL array to the local filesystem as a list of SQL queries.
+	*
+	* Call this method to save the array of SQL queries (generally resulting from a
+	* parsed XML schema) to the filesystem.
+	*
+	* @param string $filename Path and name where the file should be saved.
+	* @return boolean TRUE if save is successful, else FALSE. 
+	*/
+	function SaveSQL( $filename = './schema.sql' ) {
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		if( !isset( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		$fp = fopen( $filename, "w" );
+		
+		foreach( $sqlArray as $key => $query ) {
+			fwrite( $fp, $query . ";\n" );
+		}
+		fclose( $fp );
+	}
+	
+	/**
+	* Create an xml parser
+	*
+	* @return object PHP XML parser object
+	*
+	* @access private
+	*/
+	function create_parser() {
+		// Create the parser
+		$xmlParser = xml_parser_create();
+		xml_set_object( $xmlParser, $this );
+		
+		// Initialize the XML callback functions
+		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
+		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
+		
+		return $xmlParser;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->obj = new dbTable( $this, $attributes );
+				xml_set_object( $parser, $this->obj );
+				break;
+			case 'SQL':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->obj = new dbQuerySet( $this, $attributes );
+					xml_set_object( $parser, $this->obj );
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+		
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	* @internal
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	/**
+	* Converts an XML schema string to the specified DTD version.
+	*
+	* Call this method to convert a string containing an XML schema to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaFile()
+	*
+	* @param string $schema String containing XML schema that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = $schema;
+		} else {
+			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
+		}
+		
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite( $fp, $result );
+			fclose( $fp );
+		}
+		
+		return $result;
+	}
+	
+	// compat for pre-4.3 - jlim
+	function _file_get_contents($path)
+	{
+		if (function_exists('file_get_contents')) return file_get_contents($path);
+		return join('',file($path));
+	}
+	
+	/**
+	* Converts an XML schema file to the specified DTD version.
+	*
+	* Call this method to convert the specified XML schema file to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaString()
+	*
+	* @param string $filename Name of XML schema file that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = _file_get_contents( $filename );
+			
+			// remove unicode BOM if present
+			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
+				$result = substr( $result, 3 );
+			}
+		} else {
+			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
+		}
+		
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite( $fp, $result );
+			fclose( $fp );
+		}
+		
+		return $result;
+	}
+	
+	function TransformSchema( $schema, $xsl, $schematype='string' )
+	{
+		// Fail if XSLT extension is not available
+		if( ! function_exists( 'xslt_create' ) ) {
+			return FALSE;
+		}
+		
+		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
+		
+		// look for xsl
+		if( !is_readable( $xsl_file ) ) {
+			return FALSE;
+		}
+		
+		switch( $schematype )
+		{
+			case 'file':
+				if( !is_readable( $schema ) ) {
+					return FALSE;
+				}
+				
+				$schema = _file_get_contents( $schema );
+				break;
+			case 'string':
+			default:
+				if( !is_string( $schema ) ) {
+					return FALSE;
+				}
+		}
+		
+		$arguments = array (
+			'/_xml' => $schema,
+			'/_xsl' => _file_get_contents( $xsl_file )
+		);
+		
+		// create an XSLT processor
+		$xh = xslt_create ();
+		
+		// set error handler
+		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
+		
+		// process the schema
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
+		
+		xslt_free ($xh);
+		
+		return $result;
+	}
+	
+	/**
+	* Processes XSLT transformation errors
+	*
+	* @param object $parser XML parser object
+	* @param integer $errno Error number
+	* @param integer $level Error level
+	* @param array $fields Error information fields
+	*
+	* @access private
+	*/
+	function xslt_error_handler( $parser, $errno, $level, $fields ) {
+		if( is_array( $fields ) ) {
+			$msg = array(
+				'Message Type' => ucfirst( $fields['msgtype'] ),
+				'Message Code' => $fields['code'],
+				'Message' => $fields['msg'],
+				'Error Number' => $errno,
+				'Level' => $level
+			);
+			
+			switch( $fields['URI'] ) {
+				case 'arg:/_xml':
+					$msg['Input'] = 'XML';
+					break;
+				case 'arg:/_xsl':
+					$msg['Input'] = 'XSL';
+					break;
+				default:
+					$msg['Input'] = $fields['URI'];
+			}
+			
+			$msg['Line'] = $fields['line'];
+		} else {
+			$msg = array(
+				'Message Type' => 'Error',
+				'Error Number' => $errno,
+				'Level' => $level,
+				'Fields' => var_export( $fields, TRUE )
+			);
+		}
+		
+		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
+					   . '' . "\n";
+		
+		foreach( $msg as $label => $details ) {
+			$error_details .= '' . "\n";
+		}
+		
+		$error_details .= '
' . $label . ': ' . htmlentities( $details ) . '
';
+		
+		trigger_error( $error_details, E_USER_ERROR );
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the requested XML schema file.
+	*
+	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
+	* @see SchemaStringVersion()
+	*
+	* @param string $filename AXMLS schema file
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaFileVersion( $filename ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( preg_match( $this->versionRegex, $data, $matches ) ) {
+				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+			}
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the provided XML schema string.
+	*
+	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
+	* @see SchemaFileVersion()
+	*
+	* @param string $xmlstring XML schema string
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaStringVersion( $xmlstring ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
+		
+		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
+			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Extracts an XML schema from an existing database.
+	*
+	* Call this method to create an XML schema string from an existing database.
+	* If the data parameter is set to TRUE, AXMLS will include the data from the database
+	* in the schema. 
+	*
+	* @param boolean $data Include data in schema dump
+	* @return string Generated XML schema
+	*/
+	function ExtractSchema( $data = FALSE ) {
+		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
+		
+		$schema = '' . "\n"
+				. '' . "\n";
+		
+		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
+			foreach( $tables as $table ) {
+				$schema .= '	' . "\n";
+				
+				// grab details from database
+				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
+				$fields = $this->db->MetaColumns( $table );
+				$indexes = $this->db->MetaIndexes( $table );
+				
+				if( is_array( $fields ) ) {
+					foreach( $fields as $details ) {
+						$extra = '';
+						$content = array();
+						
+						if( $details->max_length > 0 ) {
+							$extra .= ' size="' . $details->max_length . '"';
+						}
+						
+						if( $details->primary_key ) {
+							$content[] = '';
+						} elseif( $details->not_null ) {
+							$content[] = '';
+						}
+						
+						if( $details->has_default ) {
+							$content[] = '';
+						}
+						
+						if( $details->auto_increment ) {
+							$content[] = '';
+						}
+						
+						// this stops the creation of 'R' columns,
+						// AUTOINCREMENT is used to create auto columns
+						$details->primary_key = 0;
+						$type = $rs->MetaType( $details );
+						
+						$schema .= '		';
+						
+						if( !empty( $content ) ) {
+							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
+						}
+						
+						$schema .= '' . "\n";
+					}
+				}
+				
+				if( is_array( $indexes ) ) {
+					foreach( $indexes as $index => $details ) {
+						$schema .= '		' . "\n";
+						
+						if( $details['unique'] ) {
+							$schema .= '			' . "\n";
+						}
+						
+						foreach( $details['columns'] as $column ) {
+							$schema .= '			' . $column . '' . "\n";
+						}
+						
+						$schema .= '		' . "\n";
+					}
+				}
+				
+				if( $data ) {
+					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
+					
+					if( is_object( $rs ) ) {
+						$schema .= '		' . "\n";
+						
+						while( $row = $rs->FetchRow() ) {
+							foreach( $row as $key => $val ) {
+								$row[$key] = htmlentities($val);
+							}
+							
+							$schema .= '			' . implode( '', $row ) . '' . "\n";
+						}
+						
+						$schema .= '		' . "\n";
+					}
+				}
+				
+				$schema .= '	
' . "\n";
+			}
+		}
+		
+		$this->db->SetFetchMode( $old_mode );
+		
+		$schema .= '';
+		return $schema;
+	}
+	
+	/**
+	* Sets a prefix for database objects
+	*
+	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
+	*
+	* @param string $prefix Prefix that will be prepended.
+	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
+	* @return boolean TRUE if successful, else FALSE
+	*/
+	function SetPrefix( $prefix = '', $underscore = TRUE ) {
+		switch( TRUE ) {
+			// clear prefix
+			case empty( $prefix ):
+				logMsg( 'Cleared prefix' );
+				$this->objectPrefix = '';
+				return TRUE;
+			// prefix too long
+			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
+			// prefix contains invalid characters
+			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
+				logMsg( 'Invalid prefix: ' . $prefix );
+				return FALSE;
+		}
+		
+		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+			$prefix .= '_';
+		}
+		
+		// prefix valid
+		logMsg( 'Set prefix: ' . $prefix );
+		$this->objectPrefix = $prefix;
+		return TRUE;
+	}
+	
+	/**
+	* Returns an object name with the current prefix prepended.
+	*
+	* @param string	$name Name
+	* @return string	Prefixed name
+	*
+	* @access private
+	*/
+	function prefix( $name = '' ) {
+		// if prefix is set
+		if( !empty( $this->objectPrefix ) ) {
+			// Prepend the object prefix to the table name
+			// prepend after quote if used
+			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
+		}
+		
+		// No prefix set. Use name provided.
+		return $name;
+	}
+	
+	/**
+	* Checks if element references a specific platform
+	*
+	* @param string $platform Requested platform
+	* @returns boolean TRUE if platform check succeeds
+	*
+	* @access private
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
+		
+		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
+			logMsg( "Platform $platform is supported" );
+			return TRUE;
+		} else {
+			logMsg( "Platform $platform is NOT supported" );
+			return FALSE;
+		}
+	}
+	
+	/**
+	* Clears the array of generated SQL.
+	*
+	* @access private
+	*/
+	function clearSQL() {
+		$this->sqlArray = array();
+	}
+	
+	/**
+	* Adds SQL into the SQL array.
+	*
+	* @param mixed $sql SQL to Add
+	* @return boolean TRUE if successful, else FALSE.
+	*
+	* @access private
+	*/	
+	function addSQL( $sql = NULL ) {
+		if( is_array( $sql ) ) {
+			foreach( $sql as $line ) {
+				$this->addSQL( $line );
+			}
+			
+			return TRUE;
+		}
+		
+		if( is_string( $sql ) ) {
+			$this->sqlArray[] = $sql;
+			
+			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
+			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
+				$saved = $this->db->debug;
+				$this->db->debug = $this->debug;
+				$ok = $this->db->Execute( $sql );
+				$this->db->debug = $saved;
+				
+				if( !$ok ) {
+					if( $this->debug ) {
+						ADOConnection::outp( $this->db->ErrorMsg() );
+					}
+					
+					$this->success = 1;
+				}
+			}
+			
+			return TRUE;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Gets the SQL array in the specified format.
+	*
+	* @param string $format Format
+	* @return mixed SQL
+	*	
+	* @access private
+	*/
+	function getSQL( $format = NULL, $sqlArray = NULL ) {
+		if( !is_array( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		switch( strtolower( $format ) ) {
+			case 'string':
+			case 'text':
+				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
+			case'html':
+				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
+		}
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Destroys an adoSchema object.
+	*
+	* Call this method to clean up after an adoSchema object that is no longer in use.
+	* @deprecated adoSchema now cleans up automatically.
+	*/
+	function Destroy() {
+		ini_set("magic_quotes_runtime", $this->mgq );
+		#set_magic_quotes_runtime( $this->mgq );
+		unset( $this );
+	}
+}
+
+/**
+* Message logging function
+*
+* @access private
+*/
+function logMsg( $msg, $title = NULL, $force = FALSE ) {
+	if( XMLS_DEBUG or $force ) {
+		echo '
';
+		
+		if( isset( $title ) ) {
+			echo '
' . htmlentities( $title ) . '
';
+		}
+		
+		if( is_object( $this ) ) {
+			echo '[' . get_class( $this ) . '] ';
+		}
+		
+		print_r( $msg );
+		
+		echo '
';
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/adodb-xmlschema03.inc.php b/adodb/adodb-xmlschema03.inc.php
new file mode 100644
index 0000000..6e9ff35
--- /dev/null
+++ b/adodb/adodb-xmlschema03.inc.php
@@ -0,0 +1,2406 @@
+parent = $parent;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	function create(&$xmls) {
+		return array();
+	}
+	
+	/**
+	* Destroys the object
+	*/
+	function destroy() {
+		unset( $this );
+	}
+	
+	/**
+	* Checks whether the specified RDBMS is supported by the current
+	* database object or its ranking ancestor.
+	*
+	* @param string $platform RDBMS platform name (from ADODB platform list).
+	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
+	}
+	
+	/**
+	* Returns the prefix set by the ranking ancestor of the database object.
+	*
+	* @param string $name Prefix string.
+	* @return string Prefix.
+	*/
+	function prefix( $name = '' ) {
+		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
+	}
+	
+	/**
+	* Extracts a field ID from the specified field.
+	*
+	* @param string $field Field.
+	* @return string Field ID.
+	*/
+	function FieldID( $field ) {
+		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
+	}
+}
+
+/**
+* Creates a table object in ADOdb's datadict format
+*
+* This class stores information about a database table. As charactaristics
+* of the table are loaded from the external source, methods and properties
+* of this class are used to build up the table description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbTable extends dbObject {
+	
+	/**
+	* @var string Table name
+	*/
+	var $name;
+	
+	/**
+	* @var array Field specifier: Meta-information about each field
+	*/
+	var $fields = array();
+	
+	/**
+	* @var array List of table indexes.
+	*/
+	var $indexes = array();
+	
+	/**
+	* @var array Table options: Table-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var string Field index: Keeps track of which field is currently being processed
+	*/
+	var $current_field;
+	
+	/**
+	* @var boolean Mark table for destruction
+	* @access private
+	*/
+	var $drop_table;
+	
+	/**
+	* @var boolean Mark field for destruction (not yet implemented)
+	* @access private
+	*/
+	var $drop_field = array();
+	
+	/**
+	* @var array Platform-specific options
+	* @access private
+	*/
+	var $currentPlatform = true;
+	
+	
+	/**
+	* Iniitializes a new table object.
+	*
+	* @param string $prefix DB Object prefix
+	* @param array $attributes Array of table attributes.
+	*/
+	function dbTable( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+		$this->name = $this->prefix($attributes['NAME']);
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'INDEX':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					xml_set_object( $parser, $this->addIndex( $attributes ) );
+				}
+				break;
+			case 'DATA':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					xml_set_object( $parser, $this->addData( $attributes ) );
+				}
+				break;
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'FIELD':
+				// Add a field
+				$fieldName = $attributes['NAME'];
+				$fieldType = $attributes['TYPE'];
+				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
+				$fieldOpts = !empty( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
+				
+				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
+				break;
+			case 'KEY':
+			case 'NOTNULL':
+			case 'AUTOINCREMENT':
+			case 'DEFDATE':
+			case 'DEFTIMESTAMP':
+			case 'UNSIGNED':
+				// Add a field option
+				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				break;
+			case 'DEFAULT':
+				// Add a field option to the table object
+				
+				// Work around ADOdb datadict issue that misinterprets empty strings.
+				if( $attributes['VALUE'] == '' ) {
+					$attributes['VALUE'] = " '' ";
+				}
+				
+				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
+				break;
+			case 'OPT':
+			case 'CONSTRAINT':
+				// Accept platform-specific options
+				$this->currentPlatform = ( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Table/field constraint
+			case 'CONSTRAINT':
+				if( isset( $this->current_field ) ) {
+					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
+				} else {
+					$this->addTableOpt( $cdata );
+				}
+				break;
+			// Table/field option
+			case 'OPT':
+				if( isset( $this->current_field ) ) {
+					$this->addFieldOpt( $this->current_field, $cdata );
+				} else {
+				$this->addTableOpt( $cdata );
+				}
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			case 'FIELD':
+				unset($this->current_field);
+				break;
+			case 'OPT':
+			case 'CONSTRAINT':
+				$this->currentPlatform = true;
+				break;
+			default:
+
+		}
+	}
+	
+	/**
+	* Adds an index to a table object
+	*
+	* @param array $attributes Index attributes
+	* @return object dbIndex object
+	*/
+	function addIndex( $attributes ) {
+		$name = strtoupper( $attributes['NAME'] );
+		$this->indexes[$name] = new dbIndex( $this, $attributes );
+		return $this->indexes[$name];
+	}
+	
+	/**
+	* Adds data to a table object
+	*
+	* @param array $attributes Data attributes
+	* @return object dbData object
+	*/
+	function addData( $attributes ) {
+		if( !isset( $this->data ) ) {
+			$this->data = new dbData( $this, $attributes );
+		}
+		return $this->data;
+	}
+	
+	/**
+	* Adds a field to a table object
+	*
+	* $name is the name of the table to which the field should be added. 
+	* $type is an ADODB datadict field type. The following field types
+	* are supported as of ADODB 3.40:
+	* 	- C:  varchar
+	*	- X:  CLOB (character large object) or largest varchar size
+	*	   if CLOB is not supported
+	*	- C2: Multibyte varchar
+	*	- X2: Multibyte CLOB
+	*	- B:  BLOB (binary large object)
+	*	- D:  Date (some databases do not support this, and we return a datetime type)
+	*	- T:  Datetime or Timestamp
+	*	- L:  Integer field suitable for storing booleans (0 or 1)
+	*	- I:  Integer (mapped to I4)
+	*	- I1: 1-byte integer
+	*	- I2: 2-byte integer
+	*	- I4: 4-byte integer
+	*	- I8: 8-byte integer
+	*	- F:  Floating point number
+	*	- N:  Numeric or decimal number
+	*
+	* @param string $name Name of the table to which the field will be added.
+	* @param string $type	ADODB datadict field type.
+	* @param string $size	Field size
+	* @param array $opts	Field options array
+	* @return array Field specifier array
+	*/
+	function addField( $name, $type, $size = NULL, $opts = NULL ) {
+		$field_id = $this->FieldID( $name );
+		
+		// Set the field index so we know where we are
+		$this->current_field = $field_id;
+		
+		// Set the field name (required)
+		$this->fields[$field_id]['NAME'] = $name;
+		
+		// Set the field type (required)
+		$this->fields[$field_id]['TYPE'] = $type;
+		
+		// Set the field size (optional)
+		if( isset( $size ) ) {
+			$this->fields[$field_id]['SIZE'] = $size;
+		}
+		
+		// Set the field options
+		if( isset( $opts ) ) {
+			$this->fields[$field_id]['OPTS'] = array($opts);
+		} else {
+			$this->fields[$field_id]['OPTS'] = array();
+		}
+	}
+	
+	/**
+	* Adds a field option to the current field specifier
+	*
+	* This method adds a field option allowed by the ADOdb datadict 
+	* and appends it to the given field.
+	*
+	* @param string $field	Field name
+	* @param string $opt ADOdb field option
+	* @param mixed $value Field option value
+	* @return array Field specifier array
+	*/
+	function addFieldOpt( $field, $opt, $value = NULL ) {
+		if( $this->currentPlatform ) {
+		if( !isset( $value ) ) {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
+		// Add the option and value
+		} else {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
+		}
+	}
+	}
+	
+	/**
+	* Adds an option to the table
+	*
+	* This method takes a comma-separated list of table-level options
+	* and appends them to the table object.
+	*
+	* @param string $opt Table option
+	* @return array Options
+	*/
+	function addTableOpt( $opt ) {
+		if(isset($this->currentPlatform)) {
+			$this->opts[$this->parent->db->databaseType] = $opt;
+		}
+		return $this->opts;
+	}
+
+	
+	/**
+	* Generates the SQL that will create the table in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing table creation SQL
+	*/
+	function create( &$xmls ) {
+		$sql = array();
+		
+		// drop any existing indexes
+		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
+			foreach( $legacy_indexes as $index => $index_details ) {
+				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
+			}
+		}
+		
+		// remove fields to be dropped from table object
+		foreach( $this->drop_field as $field ) {
+			unset( $this->fields[$field] );
+		}
+		
+		// if table exists
+		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
+			// drop table
+			if( $this->drop_table ) {
+				$sql[] = $xmls->dict->DropTableSQL( $this->name );
+				
+				return $sql;
+			}
+			
+			// drop any existing fields not in schema
+			foreach( $legacy_fields as $field_id => $field ) {
+				if( !isset( $this->fields[$field_id] ) ) {
+					$sql[] = $xmls->dict->DropColumnSQL( $this->name, $field->name );
+				}
+			}
+		// if table doesn't exist
+		} else {
+			if( $this->drop_table ) {
+				return $sql;
+			}
+			
+			$legacy_fields = array();
+		}
+		
+		// Loop through the field specifier array, building the associative array for the field options
+		$fldarray = array();
+		
+		foreach( $this->fields as $field_id => $finfo ) {
+			// Set an empty size if it isn't supplied
+			if( !isset( $finfo['SIZE'] ) ) {
+				$finfo['SIZE'] = '';
+			}
+			
+			// Initialize the field array with the type and size
+			$fldarray[$field_id] = array(
+				'NAME' => $finfo['NAME'],
+				'TYPE' => $finfo['TYPE'],
+				'SIZE' => $finfo['SIZE']
+			);
+			
+			// Loop through the options array and add the field options. 
+			if( isset( $finfo['OPTS'] ) ) {
+				foreach( $finfo['OPTS'] as $opt ) {
+					// Option has an argument.
+					if( is_array( $opt ) ) {
+						$key = key( $opt );
+						$value = $opt[key( $opt )];
+						@$fldarray[$field_id][$key] .= $value;
+					// Option doesn't have arguments
+					} else {
+						$fldarray[$field_id][$opt] = $opt;
+					}
+				}
+			}
+		}
+		
+		if( empty( $legacy_fields ) ) {
+			// Create the new table
+			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+			logMsg( end( $sql ), 'Generated CreateTableSQL' );
+		} else {
+			// Upgrade an existing table
+			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
+			switch( $xmls->upgrade ) {
+				// Use ChangeTableSQL
+				case 'ALTER':
+					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
+					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
+					break;
+				case 'REPLACE':
+					logMsg( 'Doing upgrade REPLACE (testing)' );
+					$sql[] = $xmls->dict->DropTableSQL( $this->name );
+					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+					break;
+				// ignore table
+				default:
+					return array();
+			}
+		}
+		
+		foreach( $this->indexes as $index ) {
+			$sql[] = $index->create( $xmls );
+		}
+		
+		if( isset( $this->data ) ) {
+			$sql[] = $this->data->create( $xmls );
+		}
+		
+		return $sql;
+	}
+	
+	/**
+	* Marks a field or table for destruction
+	*/
+	function drop() {
+		if( isset( $this->current_field ) ) {
+			// Drop the current field
+			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
+			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
+			$this->drop_field[$this->current_field] = $this->current_field;
+		} else {
+			// Drop the current table
+			logMsg( "Dropping table '{$this->name}'" );
+			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
+			$this->drop_table = TRUE;
+		}
+	}
+}
+
+/**
+* Creates an index object in ADOdb's datadict format
+*
+* This class stores information about a database index. As charactaristics
+* of the index are loaded from the external source, methods and properties
+* of this class are used to build up the index description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbIndex extends dbObject {
+	
+	/**
+	* @var string	Index name
+	*/
+	var $name;
+	
+	/**
+	* @var array	Index options: Index-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var array	Indexed fields: Table columns included in this index
+	*/
+	var $columns = array();
+	
+	/**
+	* @var boolean Mark index for destruction
+	* @access private
+	*/
+	var $drop = FALSE;
+	
+	/**
+	* Initializes the new dbIndex object.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*
+	* @internal
+	*/
+	function dbIndex( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+		
+		$this->name = $this->prefix ($attributes['NAME']);
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'CLUSTERED':
+			case 'BITMAP':
+			case 'UNIQUE':
+			case 'FULLTEXT':
+			case 'HASH':
+				// Add index Option
+				$this->addIndexOpt( $this->currentElement );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'COL':
+				$this->addField( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'INDEX':
+				xml_set_object( $parser, $this->parent );
+				break;
+		}
+	}
+	
+	/**
+	* Adds a field to the index
+	*
+	* @param string $name Field name
+	* @return string Field list
+	*/
+	function addField( $name ) {
+		$this->columns[$this->FieldID( $name )] = $name;
+		
+		// Return the field list
+		return $this->columns;
+	}
+	
+	/**
+	* Adds options to the index
+	*
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
+	*/
+	function addIndexOpt( $opt ) {
+		$this->opts[] = $opt;
+		
+		// Return the options list
+		return $this->opts;
+	}
+	
+	/**
+	* Generates the SQL that will create the index in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
+	*/
+	function create( &$xmls ) {
+		if( $this->drop ) {
+			return NULL;
+		}
+		
+		// eliminate any columns that aren't in the table
+		foreach( $this->columns as $id => $col ) {
+			if( !isset( $this->parent->fields[$id] ) ) {
+				unset( $this->columns[$id] );
+			}
+		}
+		
+		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
+	}
+	
+	/**
+	* Marks an index for destruction
+	*/
+	function drop() {
+		$this->drop = TRUE;
+	}
+}
+
+/**
+* Creates a data object in ADOdb's datadict format
+*
+* This class stores information about table data, and is called
+* when we need to load field data into a table.
+*
+* @package axmls
+* @access private
+*/
+class dbData extends dbObject {
+	
+	var $data = array();
+	
+	var $row;
+	
+	/**
+	* Initializes the new dbData object.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*
+	* @internal
+	*/
+	function dbData( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: ROW and F (field). 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'ROW':
+				$this->row = count( $this->data );
+				$this->data[$this->row] = array();
+				break;
+			case 'F':
+				$this->addField($attributes);
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'F':
+				$this->addData( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'DATA':
+				xml_set_object( $parser, $this->parent );
+				break;
+		}
+	}
+	
+	/**
+	* Adds a field to the insert
+	*
+	* @param string $name Field name
+	* @return string Field list
+	*/
+	function addField( $attributes ) {
+		// check we're in a valid row
+		if( !isset( $this->row ) || !isset( $this->data[$this->row] ) ) {
+			return;
+		}
+		
+		// Set the field index so we know where we are
+		if( isset( $attributes['NAME'] ) ) {
+			$this->current_field = $this->FieldID( $attributes['NAME'] );
+		} else {
+			$this->current_field = count( $this->data[$this->row] );
+		}
+		
+		// initialise data
+		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
+			$this->data[$this->row][$this->current_field] = '';
+		}
+	}
+	
+	/**
+	* Adds options to the index
+	*
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
+	*/
+	function addData( $cdata ) {
+		// check we're in a valid field
+		if ( isset( $this->data[$this->row][$this->current_field] ) ) {
+			// add data to field
+			$this->data[$this->row][$this->current_field] .= $cdata;
+		}
+	}
+	
+	/**
+	* Generates the SQL that will add/update the data in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
+	*/
+	function create( &$xmls ) {
+		$table = $xmls->dict->TableName($this->parent->name);
+		$table_field_count = count($this->parent->fields);
+		$tables = $xmls->db->MetaTables(); 
+		$sql = array();
+		
+		$ukeys = $xmls->db->MetaPrimaryKeys( $table );
+		if( !empty( $this->parent->indexes ) and !empty( $ukeys ) ) {
+			foreach( $this->parent->indexes as $indexObj ) {
+				if( !in_array( $indexObj->name, $ukeys ) ) $ukeys[] = $indexObj->name;
+			}
+		}
+		
+		// eliminate any columns that aren't in the table
+		foreach( $this->data as $row ) {
+			$table_fields = $this->parent->fields;
+			$fields = array();
+			$rawfields = array(); // Need to keep some of the unprocessed data on hand.
+			
+			foreach( $row as $field_id => $field_data ) {
+				if( !array_key_exists( $field_id, $table_fields ) ) {
+					if( is_numeric( $field_id ) ) {
+						$field_id = reset( array_keys( $table_fields ) );
+					} else {
+						continue;
+					}
+				}
+				
+				$name = $table_fields[$field_id]['NAME'];
+				
+				switch( $table_fields[$field_id]['TYPE'] ) {
+					case 'I':
+					case 'I1':
+					case 'I2':
+					case 'I4':
+					case 'I8':
+						$fields[$name] = intval($field_data);
+						break;
+					case 'C':
+					case 'C2':
+					case 'X':
+					case 'X2':
+					default:
+						$fields[$name] = $xmls->db->qstr( $field_data );
+						$rawfields[$name] = $field_data;
+				}
+				
+				unset($table_fields[$field_id]);
+				
+			}
+			
+			// check that at least 1 column is specified
+			if( empty( $fields ) ) {
+				continue;
+			}
+			
+			// check that no required columns are missing
+			if( count( $fields ) < $table_field_count ) {
+				foreach( $table_fields as $field ) {
+					if( isset( $field['OPTS'] ) and ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
+							continue(2);
+						}
+				}
+			}
+			
+			// The rest of this method deals with updating existing data records.
+			
+			if( !in_array( $table, $tables ) or ( $mode = $xmls->existingData() ) == XMLS_MODE_INSERT ) {
+				// Table doesn't yet exist, so it's safe to insert.
+				logMsg( "$table doesn't exist, inserting or mode is INSERT" );
+			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
+				continue;
+		}
+		
+			// Prepare to test for potential violations. Get primary keys and unique indexes
+			$mfields = array_merge( $fields, $rawfields );
+			$keyFields = array_intersect( $ukeys, array_keys( $mfields ) );
+			
+			if( empty( $ukeys ) or count( $keyFields ) == 0 ) {
+				// No unique keys in schema, so safe to insert
+				logMsg( "Either schema or data has no unique keys, so safe to insert" );
+				$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
+				continue;
+			}
+			
+			// Select record containing matching unique keys.
+			$where = '';
+			foreach( $ukeys as $key ) {
+				if( isset( $mfields[$key] ) and $mfields[$key] ) {
+					if( $where ) $where .= ' AND ';
+					$where .= $key . ' = ' . $xmls->db->qstr( $mfields[$key] );
+				}
+			}
+			$records = $xmls->db->Execute( 'SELECT * FROM ' . $table . ' WHERE ' . $where );
+			switch( $records->RecordCount() ) {
+				case 0:
+					// No matching record, so safe to insert.
+					logMsg( "No matching records. Inserting new row with unique data" );
+					$sql[] = $xmls->db->GetInsertSQL( $records, $mfields );
+					break;
+				case 1:
+					// Exactly one matching record, so we can update if the mode permits.
+					logMsg( "One matching record..." );
+					if( $mode == XMLS_MODE_UPDATE ) {
+						logMsg( "...Updating existing row from unique data" );
+						$sql[] = $xmls->db->GetUpdateSQL( $records, $mfields );
+					}
+					break;
+				default:
+					// More than one matching record; the result is ambiguous, so we must ignore the row.
+					logMsg( "More than one matching record. Ignoring row." );
+			}
+		}
+		return $sql;
+	}
+}
+
+/**
+* Creates the SQL to execute a list of provided SQL queries
+*
+* @package axmls
+* @access private
+*/
+class dbQuerySet extends dbObject {
+	
+	/**
+	* @var array	List of SQL queries
+	*/
+	var $queries = array();
+	
+	/**
+	* @var string	String used to build of a query line by line
+	*/
+	var $query;
+	
+	/**
+	* @var string	Query prefix key
+	*/
+	var $prefixKey = '';
+	
+	/**
+	* @var boolean	Auto prefix enable (TRUE)
+	*/
+	var $prefixMethod = 'AUTO';
+	
+	/**
+	* Initializes the query set.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*/
+	function dbQuerySet( &$parent, $attributes = NULL ) {
+		$this->parent = $parent;
+			
+		// Overrides the manual prefix key
+		if( isset( $attributes['KEY'] ) ) {
+			$this->prefixKey = $attributes['KEY'];
+		}
+		
+		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
+		
+		// Enables or disables automatic prefix prepending
+		switch( $prefixMethod ) {
+			case 'AUTO':
+				$this->prefixMethod = 'AUTO';
+				break;
+			case 'MANUAL':
+				$this->prefixMethod = 'MANUAL';
+				break;
+			case 'NONE':
+				$this->prefixMethod = 'NONE';
+				break;
+		}
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: QUERY. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'QUERY':
+				// Create a new query in a SQL queryset.
+				// Ignore this query set if a platform is specified and it's different than the 
+				// current connection platform.
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->newQuery();
+				} else {
+					$this->discardQuery();
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Line of queryset SQL data
+			case 'QUERY':
+				$this->buildQuery( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'QUERY':
+				// Add the finished query to the open query set.
+				$this->addQuery();
+				break;
+			case 'SQL':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* Re-initializes the query.
+	*
+	* @return boolean TRUE
+	*/
+	function newQuery() {
+		$this->query = '';
+		
+		return TRUE;
+	}
+	
+	/**
+	* Discards the existing query.
+	*
+	* @return boolean TRUE
+	*/
+	function discardQuery() {
+		unset( $this->query );
+		
+		return TRUE;
+	}
+	
+	/** 
+	* Appends a line to a query that is being built line by line
+	*
+	* @param string $data Line of SQL data or NULL to initialize a new query
+	* @return string SQL query string.
+	*/
+	function buildQuery( $sql = NULL ) {
+		if( !isset( $this->query ) OR empty( $sql ) ) {
+			return FALSE;
+		}
+		
+		$this->query .= $sql;
+		
+		return $this->query;
+	}
+	
+	/**
+	* Adds a completed query to the query list
+	*
+	* @return string	SQL of added query
+	*/
+	function addQuery() {
+		if( !isset( $this->query ) ) {
+			return FALSE;
+		}
+		
+		$this->queries[] = $return = trim($this->query);
+		
+		unset( $this->query );
+		
+		return $return;
+	}
+	
+	/**
+	* Creates and returns the current query set
+	*
+	* @param object $xmls adoSchema object
+	* @return array Query set
+	*/
+	function create( &$xmls ) {
+		foreach( $this->queries as $id => $query ) {
+			switch( $this->prefixMethod ) {
+				case 'AUTO':
+					// Enable auto prefix replacement
+					
+					// Process object prefix.
+					// Evaluate SQL statements to prepend prefix to objects
+					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					
+					// SELECT statements aren't working yet
+					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
+					
+				case 'MANUAL':
+					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
+					// If prefixKey is not set, we use the default constant XMLS_PREFIX
+					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
+						// Enable prefix override
+						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
+					} else {
+						// Use default replacement
+						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
+					}
+			}
+			
+			$this->queries[$id] = trim( $query );
+		}
+		
+		// Return the query set array
+		return $this->queries;
+	}
+	
+	/**
+	* Rebuilds the query with the prefix attached to any objects
+	*
+	* @param string $regex Regex used to add prefix
+	* @param string $query SQL query string
+	* @param string $prefix Prefix to be appended to tables, indices, etc.
+	* @return string Prefixed SQL query string.
+	*/
+	function prefixQuery( $regex, $query, $prefix = NULL ) {
+		if( !isset( $prefix ) ) {
+			return $query;
+		}
+		
+		if( preg_match( $regex, $query, $match ) ) {
+			$preamble = $match[1];
+			$postamble = $match[5];
+			$objectList = explode( ',', $match[3] );
+			// $prefix = $prefix . '_';
+			
+			$prefixedList = '';
+			
+			foreach( $objectList as $object ) {
+				if( $prefixedList !== '' ) {
+					$prefixedList .= ', ';
+				}
+				
+				$prefixedList .= $prefix . trim( $object );
+			}
+			
+			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
+		}
+		
+		return $query;
+	}
+}
+
+/**
+* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
+* 
+* This class is used to load and parse the XML file, to create an array of SQL statements
+* that can be used to build a database, and to build the database using the SQL array.
+*
+* @tutorial getting_started.pkg
+*
+* @author Richard Tango-Lowy & Dan Cech
+* @version $Revision: 1.62 $
+*
+* @package axmls
+*/
+class adoSchema {
+	
+	/**
+	* @var array	Array containing SQL queries to generate all objects
+	* @access private
+	*/
+	var $sqlArray;
+	
+	/**
+	* @var object	ADOdb connection object
+	* @access private
+	*/
+	var $db;
+	
+	/**
+	* @var object	ADOdb Data Dictionary
+	* @access private
+	*/
+	var $dict;
+	
+	/**
+	* @var string Current XML element
+	* @access private
+	*/
+	var $currentElement = '';
+	
+	/**
+	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
+	* @access private
+	*/
+	var $upgrade = '';
+	
+	/**
+	* @var string Optional object prefix
+	* @access private
+	*/
+	var $objectPrefix = '';
+	
+	/**
+	* @var long	Original Magic Quotes Runtime value
+	* @access private
+	*/
+	var $mgq;
+	
+	/**
+	* @var long	System debug
+	* @access private
+	*/
+	var $debug;
+	
+	/**
+	* @var string Regular expression to find schema version
+	* @access private
+	*/
+	var $versionRegex = '//';
+	
+	/**
+	* @var string Current schema version
+	* @access private
+	*/
+	var $schemaVersion;
+	
+	/**
+	* @var int	Success of last Schema execution
+	*/
+	var $success;
+	
+	/**
+	* @var bool	Execute SQL inline as it is generated
+	*/
+	var $executeInline;
+	
+	/**
+	* @var bool	Continue SQL execution if errors occur
+	*/
+	var $continueOnError;
+	
+	/**
+	* @var int	How to handle existing data rows (insert, update, or ignore)
+	*/
+	var $existingData;
+	
+	/**
+	* Creates an adoSchema object
+	*
+	* Creating an adoSchema object is the first step in processing an XML schema.
+	* The only parameter is an ADOdb database connection object, which must already
+	* have been created.
+	*
+	* @param object $db ADOdb database connection object.
+	*/
+	function adoSchema( $db ) {
+		// Initialize the environment
+		$this->mgq = get_magic_quotes_runtime();
+		#set_magic_quotes_runtime(0);
+		ini_set("magic_quotes_runtime", 0);
+		
+		$this->db = $db;
+		$this->debug = $this->db->debug;
+		$this->dict = NewDataDictionary( $this->db );
+		$this->sqlArray = array();
+		$this->schemaVersion = XMLS_SCHEMA_VERSION;
+		$this->executeInline( XMLS_EXECUTE_INLINE );
+		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
+		$this->existingData( XMLS_EXISTING_DATA );
+		$this->setUpgradeMethod();
+	}
+	
+	/**
+	* Sets the method to be used for upgrading an existing database
+	*
+	* Use this method to specify how existing database objects should be upgraded.
+	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
+	* alter each database object directly, REPLACE attempts to rebuild each object
+	* from scratch, BEST attempts to determine the best upgrade method for each
+	* object, and NONE disables upgrading.
+	*
+	* This method is not yet used by AXMLS, but exists for backward compatibility.
+	* The ALTER method is automatically assumed when the adoSchema object is
+	* instantiated; other upgrade methods are not currently supported.
+	*
+	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
+	* @returns string Upgrade method used
+	*/
+	function SetUpgradeMethod( $method = '' ) {
+		if( !is_string( $method ) ) {
+			return FALSE;
+		}
+		
+		$method = strtoupper( $method );
+		
+		// Handle the upgrade methods
+		switch( $method ) {
+			case 'ALTER':
+				$this->upgrade = $method;
+				break;
+			case 'REPLACE':
+				$this->upgrade = $method;
+				break;
+			case 'BEST':
+				$this->upgrade = 'ALTER';
+				break;
+			case 'NONE':
+				$this->upgrade = 'NONE';
+				break;
+			default:
+				// Use default if no legitimate method is passed.
+				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
+		}
+		
+		return $this->upgrade;
+	}
+	
+	/**
+	* Specifies how to handle existing data row when there is a unique key conflict.
+	*
+	* The existingData setting specifies how the parser should handle existing rows
+	* when a unique key violation occurs during the insert. This can happen when inserting
+	* data into an existing table with one or more primary keys or unique indexes.
+	* The existingData method takes one of three options: XMLS_MODE_INSERT attempts
+	* to always insert the data as a new row. In the event of a unique key violation,
+	* the database will generate an error.  XMLS_MODE_UPDATE attempts to update the 
+	* any existing rows with the new data based upon primary or unique key fields in
+	* the schema. If the data row in the schema specifies no unique fields, the row
+	* data will be inserted as a new row. XMLS_MODE_IGNORE specifies that any data rows
+	* that would result in a unique key violation be ignored; no inserts or updates will
+	* take place. For backward compatibility, the default setting is XMLS_MODE_INSERT,
+	* but XMLS_MODE_UPDATE will generally be the most appropriate setting.
+	*
+	* @param int $mode XMLS_MODE_INSERT, XMLS_MODE_UPDATE, or XMLS_MODE_IGNORE
+	* @return int current mode
+	*/
+	function ExistingData( $mode = NULL ) {
+		if( is_int( $mode ) ) {
+			switch( $mode ) {
+				case XMLS_MODE_UPDATE:
+					$mode = XMLS_MODE_UPDATE;
+					break;
+				case XMLS_MODE_IGNORE:
+					$mode = XMLS_MODE_IGNORE;
+					break;
+				case XMLS_MODE_INSERT:
+					$mode = XMLS_MODE_INSERT;
+					break;
+				default:
+					$mode = XMLS_EXISTING_DATA;
+					break;
+			}
+			$this->existingData = $mode;
+		}
+		
+		return $this->existingData;
+	}
+	
+	/**
+	* Enables/disables inline SQL execution.
+	*
+	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
+	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
+	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
+	* to apply the schema to the database.
+	*
+	* @param bool $mode execute
+	* @return bool current execution mode
+	*
+	* @see ParseSchema(), ExecuteSchema()
+	*/
+	function ExecuteInline( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->executeInline = $mode;
+		}
+		
+		return $this->executeInline;
+	}
+	
+	/**
+	* Enables/disables SQL continue on error.
+	*
+	* Call this method to enable or disable continuation of SQL execution if an error occurs.
+	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
+	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
+	* of the schema will continue.
+	*
+	* @param bool $mode execute
+	* @return bool current continueOnError mode
+	*
+	* @see addSQL(), ExecuteSchema()
+	*/
+	function ContinueOnError( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->continueOnError = $mode;
+		}
+		
+		return $this->continueOnError;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to create the database
+	* described. This method automatically converts the schema to the latest
+	* axmls schema version.
+	* @see ParseSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function ParseSchema( $filename, $returnSchema = FALSE ) {
+		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema directly from a file (see
+	* the DTD for the proper format) and generate the SQL necessary to create
+	* the database described by the schema. Use this method when you are dealing
+	* with large schema files. Otherwise, ParseSchema() is faster.
+	* This method does not automatically convert the schema to the latest axmls
+	* schema version. You must convert the schema manually using either the
+	* ConvertSchemaFile() or ConvertSchemaString() method.
+	* @see ParseSchema()
+	* @see ConvertSchemaFile()
+	* @see ConvertSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*
+	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
+	* @see ParseSchema(), ParseSchemaString()
+	*/
+	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			logMsg( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
+			logMsg( 'Invalid Schema Version' );
+			return FALSE;
+		}
+		
+		if( $returnSchema ) {
+			$xmlstring = '';
+			while( $data = fread( $fp, 4096 ) ) {
+				$xmlstring .= $data . "\n";
+			}
+			return $xmlstring;
+		}
+		
+		$this->success = 2;
+		
+		$xmlParser = $this->create_parser();
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
+				die( sprintf(
+					"XML error: %s at line %d",
+					xml_error_string( xml_get_error_code( $xmlParser) ),
+					xml_get_current_line_number( $xmlParser)
+				) );
+			}
+		}
+		
+		xml_parser_free( $xmlParser );
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Converts an XML schema string to SQL.
+	*
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to create the database described by the schema. 
+	* @see ParseSchema()
+	*
+	* @param string $xmlstring XML schema string.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*/
+	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			logMsg( 'Empty or Invalid Schema' );
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
+			logMsg( 'Invalid Schema Version' );
+			return FALSE;
+		}
+		
+		if( $returnSchema ) {
+			return $xmlstring;
+		}
+		
+		$this->success = 2;
+		
+		$xmlParser = $this->create_parser();
+		
+		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
+			die( sprintf(
+				"XML error: %s at line %d",
+				xml_error_string( xml_get_error_code( $xmlParser) ),
+				xml_get_current_line_number( $xmlParser)
+			) );
+		}
+		
+		xml_parser_free( $xmlParser );
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to uninstallation SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to remove the database described.
+	* @see RemoveSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function RemoveSchema( $filename, $returnSchema = FALSE ) {
+		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	}
+	
+	/**
+	* Converts an XML schema string to uninstallation SQL.
+	*
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to uninstall the database described by the schema. 
+	* @see RemoveSchema()
+	*
+	* @param string $schema XML schema string.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*/
+	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
+	}
+	
+	/**
+	* Applies the current XML schema to the database (post execution).
+	*
+	* Call this method to apply the current schema (generally created by calling 
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* and executing other SQL specified in the schema) after parsing.
+	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
+	*
+	* @param array $sqlArray Array of SQL statements that will be applied rather than
+	*		the current schema.
+	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
+	* @returns integer 0 if failure, 1 if errors, 2 if successful.
+	*/
+	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
+		if( !is_bool( $continueOnErr ) ) {
+			$continueOnErr = $this->ContinueOnError();
+		}
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			$this->success = 0;
+		} else {
+			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
+		}
+		
+		return $this->success;
+	}
+	
+	/**
+	* Returns the current SQL array. 
+	*
+	* Call this method to fetch the array of SQL queries resulting from 
+	* ParseSchema() or ParseSchemaString(). 
+	*
+	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
+	* @return array Array of SQL statements or FALSE if an error occurs
+	*/
+	function PrintSQL( $format = 'NONE' ) {
+		$sqlArray = null;
+		return $this->getSQL( $format, $sqlArray );
+	}
+	
+	/**
+	* Saves the current SQL array to the local filesystem as a list of SQL queries.
+	*
+	* Call this method to save the array of SQL queries (generally resulting from a
+	* parsed XML schema) to the filesystem.
+	*
+	* @param string $filename Path and name where the file should be saved.
+	* @return boolean TRUE if save is successful, else FALSE. 
+	*/
+	function SaveSQL( $filename = './schema.sql' ) {
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		if( !isset( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		$fp = fopen( $filename, "w" );
+		
+		foreach( $sqlArray as $key => $query ) {
+			fwrite( $fp, $query . ";\n" );
+		}
+		fclose( $fp );
+	}
+	
+	/**
+	* Create an xml parser
+	*
+	* @return object PHP XML parser object
+	*
+	* @access private
+	*/
+	function create_parser() {
+		// Create the parser
+		$xmlParser = xml_parser_create();
+		xml_set_object( $xmlParser, $this );
+		
+		// Initialize the XML callback functions
+		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
+		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
+		
+		return $xmlParser;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+				$this->obj = new dbTable( $this, $attributes );
+				xml_set_object( $parser, $this->obj );
+				}
+				break;
+			case 'SQL':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->obj = new dbQuerySet( $this, $attributes );
+					xml_set_object( $parser, $this->obj );
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+		
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	* @internal
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	/**
+	* Converts an XML schema string to the specified DTD version.
+	*
+	* Call this method to convert a string containing an XML schema to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaFile()
+	*
+	* @param string $schema String containing XML schema that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = $schema;
+		} else {
+			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
+		}
+		
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite( $fp, $result );
+			fclose( $fp );
+		}
+		
+		return $result;
+	}
+
+	/*
+	// compat for pre-4.3 - jlim
+	function _file_get_contents($path)
+	{
+		if (function_exists('file_get_contents')) return file_get_contents($path);
+		return join('',file($path));
+	}*/
+	
+	/**
+	* Converts an XML schema file to the specified DTD version.
+	*
+	* Call this method to convert the specified XML schema file to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaString()
+	*
+	* @param string $filename Name of XML schema file that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = _file_get_contents( $filename );
+			
+			// remove unicode BOM if present
+			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
+				$result = substr( $result, 3 );
+			}
+		} else {
+			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
+		}
+		
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite( $fp, $result );
+			fclose( $fp );
+		}
+		
+		return $result;
+	}
+	
+	function TransformSchema( $schema, $xsl, $schematype='string' )
+	{
+		// Fail if XSLT extension is not available
+		if( ! function_exists( 'xslt_create' ) ) {
+			return FALSE;
+		}
+		
+		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
+		
+		// look for xsl
+		if( !is_readable( $xsl_file ) ) {
+			return FALSE;
+		}
+		
+		switch( $schematype )
+		{
+			case 'file':
+				if( !is_readable( $schema ) ) {
+					return FALSE;
+				}
+				
+				$schema = _file_get_contents( $schema );
+				break;
+			case 'string':
+			default:
+				if( !is_string( $schema ) ) {
+					return FALSE;
+				}
+		}
+		
+		$arguments = array (
+			'/_xml' => $schema,
+			'/_xsl' => _file_get_contents( $xsl_file )
+		);
+		
+		// create an XSLT processor
+		$xh = xslt_create ();
+		
+		// set error handler
+		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
+		
+		// process the schema
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
+		
+		xslt_free ($xh);
+		
+		return $result;
+	}
+	
+	/**
+	* Processes XSLT transformation errors
+	*
+	* @param object $parser XML parser object
+	* @param integer $errno Error number
+	* @param integer $level Error level
+	* @param array $fields Error information fields
+	*
+	* @access private
+	*/
+	function xslt_error_handler( $parser, $errno, $level, $fields ) {
+		if( is_array( $fields ) ) {
+			$msg = array(
+				'Message Type' => ucfirst( $fields['msgtype'] ),
+				'Message Code' => $fields['code'],
+				'Message' => $fields['msg'],
+				'Error Number' => $errno,
+				'Level' => $level
+			);
+			
+			switch( $fields['URI'] ) {
+				case 'arg:/_xml':
+					$msg['Input'] = 'XML';
+					break;
+				case 'arg:/_xsl':
+					$msg['Input'] = 'XSL';
+					break;
+				default:
+					$msg['Input'] = $fields['URI'];
+			}
+			
+			$msg['Line'] = $fields['line'];
+		} else {
+			$msg = array(
+				'Message Type' => 'Error',
+				'Error Number' => $errno,
+				'Level' => $level,
+				'Fields' => var_export( $fields, TRUE )
+			);
+		}
+		
+		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
+					   . '' . "\n";
+		
+		foreach( $msg as $label => $details ) {
+			$error_details .= '' . "\n";
+		}
+		
+		$error_details .= '
' . $label . ': ' . htmlentities( $details ) . '
';
+		
+		trigger_error( $error_details, E_USER_ERROR );
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the requested XML schema file.
+	*
+	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
+	* @see SchemaStringVersion()
+	*
+	* @param string $filename AXMLS schema file
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaFileVersion( $filename ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( preg_match( $this->versionRegex, $data, $matches ) ) {
+				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+			}
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the provided XML schema string.
+	*
+	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
+	* @see SchemaFileVersion()
+	*
+	* @param string $xmlstring XML schema string
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaStringVersion( $xmlstring ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
+		
+		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
+			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Extracts an XML schema from an existing database.
+	*
+	* Call this method to create an XML schema string from an existing database.
+	* If the data parameter is set to TRUE, AXMLS will include the data from the database
+	* in the schema. 
+	*
+	* @param boolean $data Include data in schema dump
+	* @indent string indentation to use
+	* @prefix string extract only tables with given prefix
+	* @stripprefix strip prefix string when storing in XML schema
+	* @return string Generated XML schema
+	*/
+	function ExtractSchema( $data = FALSE, $indent = '  ', $prefix = '' , $stripprefix=false) {
+		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
+		
+		$schema = '' . "\n"
+				. '' . "\n";
+		
+		if( is_array( $tables = $this->db->MetaTables( 'TABLES' , ($prefix) ? $prefix.'%' : '') ) ) {
+			foreach( $tables as $table ) {
+				if ($stripprefix) $table = str_replace(str_replace('\\_', '_', $pfx ), '', $table);
+				$schema .= $indent . '' . "\n";
+				
+				// grab details from database
+				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE -1' );
+				$fields = $this->db->MetaColumns( $table );
+				$indexes = $this->db->MetaIndexes( $table );
+				
+				if( is_array( $fields ) ) {
+					foreach( $fields as $details ) {
+						$extra = '';
+						$content = array();
+						
+						if( isset($details->max_length) && $details->max_length > 0 ) {
+							$extra .= ' size="' . $details->max_length . '"';
+						}
+						
+						if( isset($details->primary_key) && $details->primary_key ) {
+							$content[] = '';
+						} elseif( isset($details->not_null) && $details->not_null ) {
+							$content[] = '';
+						}
+						
+						if( isset($details->has_default) && $details->has_default ) {
+							$content[] = '';
+						}
+						
+						if( isset($details->auto_increment) && $details->auto_increment ) {
+							$content[] = '';
+						}
+						
+						if( isset($details->unsigned) && $details->unsigned ) {
+							$content[] = '';
+						}
+						
+						// this stops the creation of 'R' columns,
+						// AUTOINCREMENT is used to create auto columns
+						$details->primary_key = 0;
+						$type = $rs->MetaType( $details );
+						
+						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
+						} else {
+							$schema .= "/>\n";
+						}
+					}
+				}
+				
+				if( is_array( $indexes ) ) {
+					foreach( $indexes as $index => $details ) {
+						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
+						
+						if( $details['unique'] ) {
+							$schema .= str_repeat( $indent, 3 ) . '' . "\n";
+						}
+						
+						foreach( $details['columns'] as $column ) {
+							$schema .= str_repeat( $indent, 3 ) . '' . htmlentities( $column ) . '' . "\n";
+						}
+						
+						$schema .= str_repeat( $indent, 2 ) . '' . "\n";
+					}
+				}
+				
+				if( $data ) {
+					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
+					
+					if( is_object( $rs ) && !$rs->EOF ) {
+						$schema .= str_repeat( $indent, 2 ) . "\n";
+						
+						while( $row = $rs->FetchRow() ) {
+							foreach( $row as $key => $val ) {
+								if ( $val != htmlentities( $val ) ) {
+									$row[$key] = '';
+								}
+							}
+							
+							$schema .= str_repeat( $indent, 3 ) . '' . implode( '', $row ) . "\n";
+						}
+						
+						$schema .= str_repeat( $indent, 2 ) . "\n";
+					}
+				}
+				
+				$schema .= $indent . "
\n";
+			}
+		}
+		
+		$this->db->SetFetchMode( $old_mode );
+		
+		$schema .= '';
+		return $schema;
+	}
+	
+	/**
+	* Sets a prefix for database objects
+	*
+	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
+	*
+	* @param string $prefix Prefix that will be prepended.
+	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
+	* @return boolean TRUE if successful, else FALSE
+	*/
+	function SetPrefix( $prefix = '', $underscore = TRUE ) {
+		switch( TRUE ) {
+			// clear prefix
+			case empty( $prefix ):
+				logMsg( 'Cleared prefix' );
+				$this->objectPrefix = '';
+				return TRUE;
+			// prefix too long
+			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
+			// prefix contains invalid characters
+			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
+				logMsg( 'Invalid prefix: ' . $prefix );
+				return FALSE;
+		}
+		
+		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+			$prefix .= '_';
+		}
+		
+		// prefix valid
+		logMsg( 'Set prefix: ' . $prefix );
+		$this->objectPrefix = $prefix;
+		return TRUE;
+	}
+	
+	/**
+	* Returns an object name with the current prefix prepended.
+	*
+	* @param string	$name Name
+	* @return string	Prefixed name
+	*
+	* @access private
+	*/
+	function prefix( $name = '' ) {
+		// if prefix is set
+		if( !empty( $this->objectPrefix ) ) {
+			// Prepend the object prefix to the table name
+			// prepend after quote if used
+			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
+		}
+		
+		// No prefix set. Use name provided.
+		return $name;
+	}
+	
+	/**
+	* Checks if element references a specific platform
+	*
+	* @param string $platform Requested platform
+	* @returns boolean TRUE if platform check succeeds
+	*
+	* @access private
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		if( !empty( $platform ) ) {
+			$regex = '/(^|\|)' . $this->db->databaseType . '(\||$)/i';
+		
+			if( preg_match( '/^- /', $platform ) ) {
+				if (preg_match ( $regex, substr( $platform, 2 ) ) ) {
+					logMsg( 'Platform ' . $platform . ' is NOT supported' );
+					return FALSE;
+				}
+		} else {
+				if( !preg_match ( $regex, $platform ) ) {
+					logMsg( 'Platform ' . $platform . ' is NOT supported' );
+			return FALSE;
+		}
+	}
+		}
+		
+		logMsg( 'Platform ' . $platform . ' is supported' );
+		return TRUE;
+	}
+	
+	/**
+	* Clears the array of generated SQL.
+	*
+	* @access private
+	*/
+	function clearSQL() {
+		$this->sqlArray = array();
+	}
+	
+	/**
+	* Adds SQL into the SQL array.
+	*
+	* @param mixed $sql SQL to Add
+	* @return boolean TRUE if successful, else FALSE.
+	*
+	* @access private
+	*/	
+	function addSQL( $sql = NULL ) {
+		if( is_array( $sql ) ) {
+			foreach( $sql as $line ) {
+				$this->addSQL( $line );
+			}
+			
+			return TRUE;
+		}
+		
+		if( is_string( $sql ) ) {
+			$this->sqlArray[] = $sql;
+			
+			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
+			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
+				$saved = $this->db->debug;
+				$this->db->debug = $this->debug;
+				$ok = $this->db->Execute( $sql );
+				$this->db->debug = $saved;
+				
+				if( !$ok ) {
+					if( $this->debug ) {
+						ADOConnection::outp( $this->db->ErrorMsg() );
+					}
+					
+					$this->success = 1;
+				}
+			}
+			
+			return TRUE;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Gets the SQL array in the specified format.
+	*
+	* @param string $format Format
+	* @return mixed SQL
+	*	
+	* @access private
+	*/
+	function getSQL( $format = NULL, $sqlArray = NULL ) {
+		if( !is_array( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		switch( strtolower( $format ) ) {
+			case 'string':
+			case 'text':
+				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
+			case'html':
+				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
+		}
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Destroys an adoSchema object.
+	*
+	* Call this method to clean up after an adoSchema object that is no longer in use.
+	* @deprecated adoSchema now cleans up automatically.
+	*/
+	function Destroy() {
+		ini_set("magic_quotes_runtime", $this->mgq );
+		#set_magic_quotes_runtime( $this->mgq );
+		unset( $this );
+	}
+}
+
+/**
+* Message logging function
+*
+* @access private
+*/
+function logMsg( $msg, $title = NULL, $force = FALSE ) {
+	if( XMLS_DEBUG or $force ) {
+		echo '
';
+		
+		if( isset( $title ) ) {
+			echo '
' . htmlentities( $title ) . '
';
+		}
+		
+		if( @is_object( $this ) ) {
+			echo '[' . get_class( $this ) . '] ';
+		}
+		
+		print_r( $msg );
+		
+		echo '
';
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/adodb.inc.php b/adodb/adodb.inc.php
new file mode 100644
index 0000000..2da3777
--- /dev/null
+++ b/adodb/adodb.inc.php
@@ -0,0 +1,4416 @@
+fields is available on EOF
+	 	$ADODB_FETCH_MODE,	// DEFAULT, NUM, ASSOC or BOTH. Default follows native driver default...
+		$ADODB_GETONE_EOF,
+		$ADODB_QUOTE_FIELDNAMES; // Allows you to force quotes (backticks) around field names in queries generated by getinsertsql and getupdatesql.	
+	
+	//==============================================================================================	
+	// GLOBAL SETUP
+	//==============================================================================================	
+	
+	$ADODB_EXTENSION = defined('ADODB_EXTENSION');
+	
+	//********************************************************//
+	/*
+	Controls $ADODB_FORCE_TYPE mode. Default is ADODB_FORCE_VALUE (3).
+	Used in GetUpdateSql and GetInsertSql functions. Thx to Niko, nuko#mbnet.fi
+
+ 		0 = ignore empty fields. All empty fields in array are ignored.
+		1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
+		2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
+		3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and empty fields '' are set to empty '' sql values.
+	*/
+        define('ADODB_FORCE_IGNORE',0);
+        define('ADODB_FORCE_NULL',1);
+        define('ADODB_FORCE_EMPTY',2);
+        define('ADODB_FORCE_VALUE',3);
+    //********************************************************//
+
+
+	if (!$ADODB_EXTENSION || ADODB_EXTENSION < 4.0) {
+		
+		define('ADODB_BAD_RS','
Bad $rs in %s. Connection or SQL invalid. Try using $connection->debug=true;
');
+	
+	// allow [ ] @ ` " and . in table names
+		define('ADODB_TABLE_REGEX','([]0-9a-z_\:\"\`\.\@\[-]*)');
+	
+	// prefetching used by oracle
+		if (!defined('ADODB_PREFETCH_ROWS')) define('ADODB_PREFETCH_ROWS',10);
+	
+	
+	/*
+	Controls ADODB_FETCH_ASSOC field-name case. Default is 2, use native case-names.
+	This currently works only with mssql, odbc, oci8po and ibase derived drivers.
+	
+ 		0 = assoc lowercase field names. $rs->fields['orderid']
+		1 = assoc uppercase field names. $rs->fields['ORDERID']
+		2 = use native-case field names. $rs->fields['OrderID']
+	*/
+	
+		define('ADODB_FETCH_DEFAULT',0);
+		define('ADODB_FETCH_NUM',1);
+		define('ADODB_FETCH_ASSOC',2);
+		define('ADODB_FETCH_BOTH',3);
+		
+		if (!defined('TIMESTAMP_FIRST_YEAR')) define('TIMESTAMP_FIRST_YEAR',100);
+	
+		// PHP's version scheme makes converting to numbers difficult - workaround
+		$_adodb_ver = (float) PHP_VERSION;
+		if ($_adodb_ver >= 5.2) {
+			define('ADODB_PHPVER',0x5200);
+		} else if ($_adodb_ver >= 5.0) {
+			define('ADODB_PHPVER',0x5000);
+		} else 
+			die("PHP5 or later required. You are running ".PHP_VERSION);
+	}
+	
+	
+	//if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
+
+	
+	/**
+	 	Accepts $src and $dest arrays, replacing string $data
+	*/
+	function ADODB_str_replace($src, $dest, $data)
+	{
+		if (ADODB_PHPVER >= 0x4050) return str_replace($src,$dest,$data);
+		
+		$s = reset($src);
+		$d = reset($dest);
+		while ($s !== false) {
+			$data = str_replace($s,$d,$data);
+			$s = next($src);
+			$d = next($dest);
+		}
+		return $data;
+	}
+	
+	function ADODB_Setup()
+	{
+	GLOBAL 
+		$ADODB_vers, 		// database version
+		$ADODB_COUNTRECS,	// count number of records returned - slows down query
+		$ADODB_CACHE_DIR,	// directory to cache recordsets
+	 	$ADODB_FETCH_MODE,
+		$ADODB_CACHE,
+		$ADODB_CACHE_CLASS,
+		$ADODB_FORCE_TYPE,
+		$ADODB_GETONE_EOF,
+		$ADODB_QUOTE_FIELDNAMES;
+		
+		if (empty($ADODB_CACHE_CLASS)) $ADODB_CACHE_CLASS =  'ADODB_Cache_File' ;
+		$ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT;
+		$ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
+		$ADODB_GETONE_EOF = null;
+
+		if (!isset($ADODB_CACHE_DIR)) {
+			$ADODB_CACHE_DIR = '/tmp'; //(isset($_ENV['TMP'])) ? $_ENV['TMP'] : '/tmp';
+		} else {
+			// do not accept url based paths, eg. http:/ or ftp:/
+			if (strpos($ADODB_CACHE_DIR,'://') !== false) 
+				die("Illegal path http:// or ftp://");
+		}
+		
+			
+		// Initialize random number generator for randomizing cache flushes
+		// -- note Since PHP 4.2.0, the seed  becomes optional and defaults to a random value if omitted.
+		 srand(((double)microtime())*1000000);
+		
+		/**
+		 * ADODB version as a string.
+		 */
+		$ADODB_vers = 'V5.11 5 May 2010  (c) 2000-2010 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
+	
+		/**
+		 * Determines whether recordset->RecordCount() is used. 
+		 * Set to false for highest performance -- RecordCount() will always return -1 then
+		 * for databases that provide "virtual" recordcounts...
+		 */
+		if (!isset($ADODB_COUNTRECS)) $ADODB_COUNTRECS = true; 
+	}
+	
+	
+	//==============================================================================================	
+	// CHANGE NOTHING BELOW UNLESS YOU ARE DESIGNING ADODB
+	//==============================================================================================	
+	
+	ADODB_Setup();
+
+	//==============================================================================================	
+	// CLASS ADOFieldObject
+	//==============================================================================================	
+	/**
+	 * Helper class for FetchFields -- holds info on a column
+	 */
+	class ADOFieldObject { 
+		var $name = '';
+		var $max_length=0;
+		var $type="";
+/*
+		// additional fields by dannym... (danny_milo@yahoo.com)
+		var $not_null = false; 
+		// actually, this has already been built-in in the postgres, fbsql AND mysql module? ^-^
+		// so we can as well make not_null standard (leaving it at "false" does not harm anyways)
+
+		var $has_default = false; // this one I have done only in mysql and postgres for now ... 
+			// others to come (dannym)
+		var $default_value; // default, if any, and supported. Check has_default first.
+*/
+	}
+	
+	// for transaction handling
+	
+	function ADODB_TransMonitor($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
+	{
+		//print "Errorno ($fn errno=$errno m=$errmsg) ";
+		$thisConnection->_transOK = false;
+		if ($thisConnection->_oldRaiseFn) {
+			$fn = $thisConnection->_oldRaiseFn;
+			$fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection);
+		}
+	}
+	
+	//------------------
+	// class for caching
+	class ADODB_Cache_File {
+	
+		var $createdir = true; // requires creation of temp dirs
+		
+		function ADODB_Cache_File()
+		{
+		global $ADODB_INCLUDED_CSV;
+			if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
+		}
+		
+		// write serialised recordset to cache item/file
+		function writecache($filename, $contents,  $debug, $secs2cache)
+		{
+			return adodb_write_file($filename, $contents,$debug);
+		}
+		
+		// load serialised recordset and unserialise it
+		function &readcache($filename, &$err, $secs2cache, $rsClass)
+		{
+			$rs = csv2rs($filename,$err,$secs2cache,$rsClass);
+			return $rs;
+		}
+		
+		// flush all items in cache
+		function flushall($debug=false)
+		{
+		global $ADODB_CACHE_DIR;
+
+		$rez = false;
+		
+			if (strlen($ADODB_CACHE_DIR) > 1) {
+				$rez = $this->_dirFlush($ADODB_CACHE_DIR);
+	         	if ($debug) ADOConnection::outp( "flushall: $dir
\n". $rez."
");
+	   		}
+			return $rez;
+		}
+		
+		// flush one file in cache
+		function flushcache($f, $debug=false)
+		{
+			if (!@unlink($f)) {
+		   		if ($debug) ADOConnection::outp( "flushcache: failed for $f");
+			}
+		}
+		
+		function getdirname($hash)
+		{
+		global $ADODB_CACHE_DIR;
+			if (!isset($this->notSafeMode)) $this->notSafeMode = !ini_get('safe_mode');
+			return ($this->notSafeMode) ? $ADODB_CACHE_DIR.'/'.substr($hash,0,2) : $ADODB_CACHE_DIR;
+		}
+		
+		// create temp directories
+		function createdir($hash, $debug)
+		{
+			$dir = $this->getdirname($hash);
+			if ($this->notSafeMode && !file_exists($dir)) {
+				$oldu = umask(0);
+				if (!@mkdir($dir,0771)) if(!is_dir($dir) && $debug) ADOConnection::outp("Cannot create $dir");
+				umask($oldu);
+			}
+		
+			return $dir;
+		}
+		
+		/**
+		* Private function to erase all of the files and subdirectories in a directory.
+		*
+		* Just specify the directory, and tell it if you want to delete the directory or just clear it out.
+		* Note: $kill_top_level is used internally in the function to flush subdirectories.
+		*/
+		function _dirFlush($dir, $kill_top_level = false) 
+		{
+		   if(!$dh = @opendir($dir)) return;
+		   
+		   while (($obj = readdir($dh))) {
+		   		if($obj=='.' || $obj=='..') continue;
+				$f = $dir.'/'.$obj;
+		
+				if (strpos($obj,'.cache')) @unlink($f);
+				if (is_dir($f)) $this->_dirFlush($f, true);
+		   }
+		   if ($kill_top_level === true) @rmdir($dir);
+		   return true;
+		}
+	}
+	
+	//==============================================================================================	
+	// CLASS ADOConnection
+	//==============================================================================================	
+	
+	/**
+	 * Connection object. For connecting to databases, and executing queries.
+	 */ 
+	class ADOConnection {
+	//
+	// PUBLIC VARS 
+	//
+	var $dataProvider = 'native';
+	var $databaseType = '';		/// RDBMS currently in use, eg. odbc, mysql, mssql					
+	var $database = '';			/// Name of database to be used.	
+	var $host = ''; 			/// The hostname of the database server	
+	var $user = ''; 			/// The username which is used to connect to the database server. 
+	var $password = ''; 		/// Password for the username. For security, we no longer store it.
+	var $debug = false; 		/// if set to true will output sql statements
+	var $maxblobsize = 262144; 	/// maximum size of blobs or large text fields (262144 = 256K)-- some db's die otherwise like foxpro
+	var $concat_operator = '+'; /// default concat operator -- change to || for Oracle/Interbase	
+	var $substr = 'substr';		/// substring operator
+	var $length = 'length';		/// string length ofperator
+	var $random = 'rand()';		/// random function
+	var $upperCase = 'upper';		/// uppercase function
+	var $fmtDate = "'Y-m-d'";	/// used by DBDate() as the default date format used by the database
+	var $fmtTimeStamp = "'Y-m-d, h:i:s A'"; /// used by DBTimeStamp as the default timestamp fmt.
+	var $true = '1'; 			/// string that represents TRUE for a database
+	var $false = '0'; 			/// string that represents FALSE for a database
+	var $replaceQuote = "\\'"; 	/// string to use to replace quotes
+	var $nameQuote = '"';		/// string to use to quote identifiers and names
+	var $charSet=false; 		/// character set to use - only for interbase, postgres and oci8
+	var $metaDatabasesSQL = '';
+	var $metaTablesSQL = '';
+	var $uniqueOrderBy = false; /// All order by columns have to be unique
+	var $emptyDate = ' ';
+	var $emptyTimeStamp = ' ';
+	var $lastInsID = false;
+	//--
+	var $hasInsertID = false; 		/// supports autoincrement ID?
+	var $hasAffectedRows = false; 	/// supports affected rows for update/delete?
+	var $hasTop = false;			/// support mssql/access SELECT TOP 10 * FROM TABLE
+	var $hasLimit = false;			/// support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	var $readOnly = false; 			/// this is a readonly database - used by phpLens
+	var $hasMoveFirst = false;  /// has ability to run MoveFirst(), scrolling backwards
+	var $hasGenID = false; 		/// can generate sequences using GenID();
+	var $hasTransactions = true; /// has transactions
+	//--
+	var $genID = 0; 			/// sequence id used by GenID();
+	var $raiseErrorFn = false; 	/// error function to call
+	var $isoDates = false; /// accepts dates in ISO format
+	var $cacheSecs = 3600; /// cache for 1 hour
+
+	// memcache
+	var $memCache = false; /// should we use memCache instead of caching in files
+	var $memCacheHost; /// memCache host
+	var $memCachePort = 11211; /// memCache port
+	var $memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
+
+	var $sysDate = false; /// name of function that returns the current date
+	var $sysTimeStamp = false; /// name of function that returns the current timestamp
+	var $sysUTimeStamp = false; // name of function that returns the current timestamp accurate to the microsecond or nearest fraction
+	var $arrayClass = 'ADORecordSet_array'; /// name of class used to generate array recordsets, which are pre-downloaded recordsets
+	
+	var $noNullStrings = false; /// oracle specific stuff - if true ensures that '' is converted to ' '
+	var $numCacheHits = 0; 
+	var $numCacheMisses = 0;
+	var $pageExecuteCountRows = true;
+	var $uniqueSort = false; /// indicates that all fields in order by must be unique
+	var $leftOuter = false; /// operator to use for left outer join in WHERE clause
+	var $rightOuter = false; /// operator to use for right outer join in WHERE clause
+	var $ansiOuter = false; /// whether ansi outer join syntax supported
+	var $autoRollback = false; // autoRollback on PConnect().
+	var $poorAffectedRows = false; // affectedRows not working or unreliable
+	
+	var $fnExecute = false;
+	var $fnCacheExecute = false;
+	var $blobEncodeType = false; // false=not required, 'I'=encode to integer, 'C'=encode to char
+	var $rsPrefix = "ADORecordSet_";
+	
+	var $autoCommit = true; 	/// do not modify this yourself - actually private
+	var $transOff = 0; 			/// temporarily disable transactions
+	var $transCnt = 0; 			/// count of nested transactions
+	
+	var $fetchMode=false;
+	
+	var $null2null = 'null'; // in autoexecute/getinsertsql/getupdatesql, this value will be converted to a null
+	var $bulkBind = false; // enable 2D Execute array
+	 //
+	 // PRIVATE VARS
+	 //
+	var $_oldRaiseFn =  false;
+	var $_transOK = null;
+	var $_connectionID	= false;	/// The returned link identifier whenever a successful database connection is made.	
+	var $_errorMsg = false;		/// A variable which was used to keep the returned last error message.  The value will
+								/// then returned by the errorMsg() function	
+	var $_errorCode = false;	/// Last error code, not guaranteed to be used - only by oci8					
+	var $_queryID = false;		/// This variable keeps the last created result link identifier
+	
+	var $_isPersistentConnection = false;	/// A boolean variable to state whether its a persistent connection or normal connection.	*/
+	var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
+	var $_evalAll = false;
+	var $_affected = false;
+	var $_logsql = false;
+	var $_transmode = ''; // transaction mode
+	
+
+	
+	/**
+	 * Constructor
+	 */
+	function ADOConnection()			
+	{
+		die('Virtual Class -- cannot instantiate');
+	}
+	
+	static function Version()
+	{
+	global $ADODB_vers;
+	
+		$ok = preg_match( '/^[Vv]([0-9\.]+)/', $ADODB_vers, $matches );
+		if (!$ok) return (float) substr($ADODB_vers,1);
+		else return $matches[1];
+	}
+	
+	/**
+		Get server version info...
+		
+		@returns An array with 2 elements: $arr['string'] is the description string, 
+			and $arr[version] is the version (also a string).
+	*/
+	function ServerInfo()
+	{
+		return array('description' => '', 'version' => '');
+	}
+	
+	function IsConnected()
+	{
+    	return !empty($this->_connectionID);
+	}
+	
+	function _findvers($str)
+	{
+		if (preg_match('/([0-9]+\.([0-9\.])+)/',$str, $arr)) return $arr[1];
+		else return '';
+	}
+	
+	/**
+	* All error messages go through this bottleneck function.
+	* You can define your own handler by defining the function name in ADODB_OUTP.
+	*/
+	static function outp($msg,$newline=true)
+	{
+	global $ADODB_FLUSH,$ADODB_OUTP;
+	
+		if (defined('ADODB_OUTP')) {
+			$fn = ADODB_OUTP;
+			$fn($msg,$newline);
+			return;
+		} else if (isset($ADODB_OUTP)) {
+			$fn = $ADODB_OUTP;
+			$fn($msg,$newline);
+			return;
+		}
+		
+		if ($newline) $msg .= "
\n";
+		
+		if (isset($_SERVER['HTTP_USER_AGENT']) || !$newline) echo $msg;
+		else echo strip_tags($msg);
+	
+		
+		if (!empty($ADODB_FLUSH) && ob_get_length() !== false) flush(); //  do not flush if output buffering enabled - useless - thx to Jesse Mullan 
+		
+	}
+	
+	function Time()
+	{
+		$rs = $this->_Execute("select $this->sysTimeStamp");
+		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
+		
+		return false;
+	}
+	
+	/**
+	 * Connect to database
+	 *
+	 * @param [argHostname]		Host to connect to
+	 * @param [argUsername]		Userid to login
+	 * @param [argPassword]		Associated password
+	 * @param [argDatabaseName]	database
+	 * @param [forceNew]		force new connection
+	 *
+	 * @return true or false
+	 */	  
+	function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false) 
+	{
+		if ($argHostname != "") $this->host = $argHostname;
+		if ($argUsername != "") $this->user = $argUsername;
+		if ($argPassword != "") $this->password = 'not stored'; // not stored for security reasons
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
+		
+		$this->_isPersistentConnection = false;	
+			
+		if ($forceNew) {
+			if ($rez=$this->_nconnect($this->host, $this->user, $argPassword, $this->database)) return true;
+		} else {
+			 if ($rez=$this->_connect($this->host, $this->user, $argPassword, $this->database)) return true;
+		}
+		if (isset($rez)) {
+			$err = $this->ErrorMsg();
+			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
+			$ret = false;
+		} else {
+			$err = "Missing extension for ".$this->dataProvider;
+			$ret = 0;
+		}
+		if ($fn = $this->raiseErrorFn) 
+			$fn($this->databaseType,'CONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
+		
+		
+		$this->_connectionID = false;
+		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
+		return $ret;
+	}	
+	
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
+	}
+	
+	
+	/**
+	 * Always force a new connection to database - currently only works with oracle
+	 *
+	 * @param [argHostname]		Host to connect to
+	 * @param [argUsername]		Userid to login
+	 * @param [argPassword]		Associated password
+	 * @param [argDatabaseName]	database
+	 *
+	 * @return true or false
+	 */	  
+	function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "") 
+	{
+		return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
+	}
+	
+	/**
+	 * Establish persistent connect to database
+	 *
+	 * @param [argHostname]		Host to connect to
+	 * @param [argUsername]		Userid to login
+	 * @param [argPassword]		Associated password
+	 * @param [argDatabaseName]	database
+	 *
+	 * @return return true or false
+	 */	
+	function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
+	{
+		
+		if (defined('ADODB_NEVER_PERSIST')) 
+			return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
+		
+		if ($argHostname != "") $this->host = $argHostname;
+		if ($argUsername != "") $this->user = $argUsername;
+		if ($argPassword != "") $this->password = 'not stored';
+		if ($argDatabaseName != "") $this->database = $argDatabaseName;		
+			
+		$this->_isPersistentConnection = true;	
+		
+		if ($rez = $this->_pconnect($this->host, $this->user, $argPassword, $this->database)) return true;
+		if (isset($rez)) {
+			$err = $this->ErrorMsg();
+			if (empty($err)) $err = "Connection error to server '$argHostname' with user '$argUsername'";
+			$ret = false;
+		} else {
+			$err = "Missing extension for ".$this->dataProvider;
+			$ret = 0;
+		}
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType,'PCONNECT',$this->ErrorNo(),$err,$this->host,$this->database,$this);
+		}
+		
+		$this->_connectionID = false;
+		if ($this->debug) ADOConnection::outp( $this->host.': '.$err);
+		return $ret;
+	}
+
+	function outp_throw($msg,$src='WARN',$sql='')
+	{
+		if (defined('ADODB_ERROR_HANDLER') &&  ADODB_ERROR_HANDLER == 'adodb_throw') {
+			adodb_throw($this->databaseType,$src,-9999,$msg,$sql,false,$this);
+			return;
+		} 
+		ADOConnection::outp($msg);
+	}
+	
+	// create cache class. Code is backward compat with old memcache implementation
+	function _CreateCache()
+	{
+	global $ADODB_CACHE, $ADODB_CACHE_CLASS;
+	
+		if ($this->memCache) {
+		global $ADODB_INCLUDED_MEMCACHE;
+		
+			if (empty($ADODB_INCLUDED_MEMCACHE)) include(ADODB_DIR.'/adodb-memcache.lib.inc.php');
+				$ADODB_CACHE = new ADODB_Cache_MemCache($this);
+		} else
+				$ADODB_CACHE = new $ADODB_CACHE_CLASS($this);
+		
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysDate;
+		return $col; // child class implement
+	}
+	
+	/**
+	 * Should prepare the sql statement and return the stmt resource.
+	 * For databases that do not support this, we return the $sql. To ensure
+	 * compatibility with databases that do not support prepare:
+	 *
+	 *   $stmt = $db->Prepare("insert into table (id, name) values (?,?)");
+	 *   $db->Execute($stmt,array(1,'Jill')) or die('insert failed');
+	 *   $db->Execute($stmt,array(2,'Joe')) or die('insert failed');
+	 *
+	 * @param sql	SQL to send to database
+	 *
+	 * @return return FALSE, or the prepared statement, or the original sql if
+	 * 			if the database does not support prepare.
+	 *
+	 */	
+	function Prepare($sql)
+	{
+		return $sql;
+	}
+
+	/**
+	 * Some databases, eg. mssql require a different function for preparing
+	 * stored procedures. So we cannot use Prepare().
+	 *
+	 * Should prepare the stored procedure  and return the stmt resource.
+	 * For databases that do not support this, we return the $sql. To ensure
+	 * compatibility with databases that do not support prepare:
+	 *
+	 * @param sql	SQL to send to database
+	 *
+	 * @return return FALSE, or the prepared statement, or the original sql if
+	 * 			if the database does not support prepare.
+	 *
+	 */	
+	function PrepareSP($sql,$param=true)
+	{
+		return $this->Prepare($sql,$param);
+	}
+
+	/**
+	* PEAR DB Compat
+	*/
+	function Quote($s)
+	{
+		return $this->qstr($s,false);
+	}
+	
+	/**
+	 Requested by "Karsten Dambekalns" 
+	*/
+	function QMagic($s)
+	{
+		return $this->qstr($s,get_magic_quotes_gpc());
+	}
+
+	function q(&$s)
+	{
+		#if (!empty($this->qNull)) if ($s == 'null') return $s;
+		$s = $this->qstr($s,false);
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function ErrorNative()
+	{
+		return $this->ErrorNo();
+	}
+
+	
+   /**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function nextId($seq_name)
+	{
+		return $this->GenID($seq_name);
+	}
+
+	/**
+	*	 Lock a row, will escalate and lock the table if row locking not supported
+	*	will normally free the lock at the end of the transaction
+	*
+	*  @param $table	name of table to lock
+	*  @param $where	where clause to use, eg: "WHERE row=12". If left empty, will escalate to table lock
+	*/
+	function RowLock($table,$where,$col='1 as adodbignore')
+	{
+		return false;
+	}
+	
+	function CommitLock($table)
+	{
+		return $this->CommitTrans();
+	}
+	
+	function RollbackLock($table)
+	{
+		return $this->RollbackTrans();
+	}
+	
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*
+	* The fetch modes for NUMERIC and ASSOC for PEAR DB and ADODB are identical
+	* 	for easy porting :-)
+	*
+	* @param mode	The fetchmode ADODB_FETCH_ASSOC or ADODB_FETCH_NUM
+	* @returns		The previous fetch mode
+	*/
+	function SetFetchMode($mode)
+	{	
+		$old = $this->fetchMode;
+		$this->fetchMode = $mode;
+		
+		if ($old === false) {
+		global $ADODB_FETCH_MODE;
+			return $ADODB_FETCH_MODE;
+		}
+		return $old;
+	}
+	
+
+	/**
+	* PEAR DB Compat - do not use internally. 
+	*/
+	function Query($sql, $inputarr=false)
+	{
+		$rs = $this->Execute($sql, $inputarr);
+		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+		return $rs;
+	}
+
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function LimitQuery($sql, $offset, $count, $params=false)
+	{
+		$rs = $this->SelectLimit($sql, $count, $offset, $params); 
+		if (!$rs && defined('ADODB_PEAR')) return ADODB_PEAR_Error();
+		return $rs;
+	}
+
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function Disconnect()
+	{
+		return $this->Close();
+	}
+	
+	/*
+		 Returns placeholder for parameter, eg.
+		 $DB->Param('a')
+		 
+		 will return ':a' for Oracle, and '?' for most other databases...
+		 
+		 For databases that require positioned params, eg $1, $2, $3 for postgresql,
+		 	pass in Param(false) before setting the first parameter.
+	*/
+	function Param($name,$type='C')
+	{
+		return '?';
+	}
+	
+	/*
+		InParameter and OutParameter are self-documenting versions of Parameter().
+	*/
+	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+	{
+		return $this->Parameter($stmt,$var,$name,false,$maxLen,$type);
+	}
+	
+	/*
+	*/
+	function OutParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+	{
+		return $this->Parameter($stmt,$var,$name,true,$maxLen,$type);
+	
+	}
+
+	
+	/* 
+	Usage in oracle
+		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
+		$db->Parameter($stmt,$id,'myid');
+		$db->Parameter($stmt,$group,'group',64);
+		$db->Execute();
+		
+		@param $stmt Statement returned by Prepare() or PrepareSP().
+		@param $var PHP variable to bind to
+		@param $name Name of stored procedure variable name to bind to.
+		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
+		@param [$maxLen] Holds an maximum length of the variable.
+		@param [$type] The data type of $var. Legal values depend on driver.
+
+	*/
+	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
+	{
+		return false;
+	}
+	
+	
+	function IgnoreErrors($saveErrs=false)
+	{
+		if (!$saveErrs) {
+			$saveErrs = array($this->raiseErrorFn,$this->_transOK);
+			$this->raiseErrorFn = false;
+			return $saveErrs;
+		} else {
+			$this->raiseErrorFn = $saveErrs[0];
+			$this->_transOK = $saveErrs[1];
+		}
+	}
+	
+	/**
+		Improved method of initiating a transaction. Used together with CompleteTrans().
+		Advantages include:
+		
+		a. StartTrans/CompleteTrans is nestable, unlike BeginTrans/CommitTrans/RollbackTrans.
+		   Only the outermost block is treated as a transaction.

+		b. CompleteTrans auto-detects SQL errors, and will rollback on errors, commit otherwise.

+		c. All BeginTrans/CommitTrans/RollbackTrans inside a StartTrans/CompleteTrans block
+		   are disabled, making it backward compatible.
+	*/
+	function StartTrans($errfn = 'ADODB_TransMonitor')
+	{
+		if ($this->transOff > 0) {
+			$this->transOff += 1;
+			return true;
+		}
+		
+		$this->_oldRaiseFn = $this->raiseErrorFn;
+		$this->raiseErrorFn = $errfn;
+		$this->_transOK = true;
+		
+		if ($this->debug && $this->transCnt > 0) ADOConnection::outp("Bad Transaction: StartTrans called within BeginTrans");
+		$ok = $this->BeginTrans();
+		$this->transOff = 1;
+		return $ok;
+	}
+	
+	
+	/**
+		Used together with StartTrans() to end a transaction. Monitors connection
+		for sql errors, and will commit or rollback as appropriate.
+		
+		@autoComplete if true, monitor sql errors and commit and rollback as appropriate, 
+		and if set to false force rollback even if no SQL error detected.
+		@returns true on commit, false on rollback.
+	*/
+	function CompleteTrans($autoComplete = true)
+	{
+		if ($this->transOff > 1) {
+			$this->transOff -= 1;
+			return true;
+		}
+		$this->raiseErrorFn = $this->_oldRaiseFn;
+		
+		$this->transOff = 0;
+		if ($this->_transOK && $autoComplete) {
+			if (!$this->CommitTrans()) {
+				$this->_transOK = false;
+				if ($this->debug) ADOConnection::outp("Smart Commit failed");
+			} else
+				if ($this->debug) ADOConnection::outp("Smart Commit occurred");
+		} else {
+			$this->_transOK = false;
+			$this->RollbackTrans();
+			if ($this->debug) ADOCOnnection::outp("Smart Rollback occurred");
+		}
+		
+		return $this->_transOK;
+	}
+	
+	/*
+		At the end of a StartTrans/CompleteTrans block, perform a rollback.
+	*/
+	function FailTrans()
+	{
+		if ($this->debug) 
+			if ($this->transOff == 0) {
+				ADOConnection::outp("FailTrans outside StartTrans/CompleteTrans");
+			} else {
+				ADOConnection::outp("FailTrans was called");
+				adodb_backtrace();
+			}
+		$this->_transOK = false;
+	}
+	
+	/**
+		Check if transaction has failed, only for Smart Transactions.
+	*/
+	function HasFailedTrans()
+	{
+		if ($this->transOff > 0) return $this->_transOK == false;
+		return false;
+	}
+	
+	/**
+	 * Execute SQL 
+	 *
+	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
+	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
+	 * @return 		RecordSet or false
+	 */
+	function Execute($sql,$inputarr=false) 
+	{
+		if ($this->fnExecute) {
+			$fn = $this->fnExecute;
+			$ret = $fn($this,$sql,$inputarr);
+			if (isset($ret)) return $ret;
+		}
+		if ($inputarr) {
+			if (!is_array($inputarr)) $inputarr = array($inputarr);
+			
+			$element0 = reset($inputarr);
+			# is_object check because oci8 descriptors can be passed in
+			$array_2d = $this->bulkBind && is_array($element0) && !is_object(reset($element0));
+			//remove extra memory copy of input -mikefedyk
+			unset($element0);
+			
+			if (!is_array($sql) && !$this->_bindInputArray) {
+				$sqlarr = explode('?',$sql);
+				$nparams = sizeof($sqlarr)-1;
+				if (!$array_2d) $inputarr = array($inputarr);
+				foreach($inputarr as $arr) {
+					$sql = ''; $i = 0;
+					//Use each() instead of foreach to reduce memory usage -mikefedyk
+					while(list(, $v) = each($arr)) {
+						$sql .= $sqlarr[$i];
+						// from Ron Baldwin 
+						// Only quote string types	
+						$typ = gettype($v);
+						if ($typ == 'string')
+							//New memory copy of input created here -mikefedyk
+							$sql .= $this->qstr($v);
+						else if ($typ == 'double')
+							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
+						else if ($typ == 'boolean')
+							$sql .= $v ? $this->true : $this->false;
+						else if ($typ == 'object') {
+							if (method_exists($v, '__toString')) $sql .= $this->qstr($v->__toString());
+							else $sql .= $this->qstr((string) $v);
+						} else if ($v === null)
+							$sql .= 'NULL';
+						else
+							$sql .= $v;
+						$i += 1;
+						
+						if ($i == $nparams) break;
+					} // while
+					if (isset($sqlarr[$i])) {
+						$sql .= $sqlarr[$i];
+						if ($i+1 != sizeof($sqlarr)) $this->outp_throw( "Input Array does not match ?: ".htmlspecialchars($sql),'Execute');
+					} else if ($i != sizeof($sqlarr))	
+						$this->outp_throw( "Input array does not match ?: ".htmlspecialchars($sql),'Execute');
+		
+					$ret = $this->_Execute($sql);
+					if (!$ret) return $ret;
+				}	
+			} else {
+				if ($array_2d) {
+					if (is_string($sql))
+						$stmt = $this->Prepare($sql);
+					else
+						$stmt = $sql;
+						
+					foreach($inputarr as $arr) {
+						$ret = $this->_Execute($stmt,$arr);
+						if (!$ret) return $ret;
+					}
+				} else {
+					$ret = $this->_Execute($sql,$inputarr);
+				}
+			}
+		} else {
+			$ret = $this->_Execute($sql,false);
+		}
+
+		return $ret;
+	}
+	
+	
+	function _Execute($sql,$inputarr=false)
+	{
+		if ($this->debug) {
+			global $ADODB_INCLUDED_LIB;
+			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+			$this->_queryID = _adodb_debug_execute($this, $sql,$inputarr);
+		} else {
+			$this->_queryID = @$this->_query($sql,$inputarr);
+		}
+		
+		/************************
+		// OK, query executed
+		*************************/
+
+		if ($this->_queryID === false) { // error handling if query fails
+			if ($this->debug == 99) adodb_backtrace(true,5);	
+			$fn = $this->raiseErrorFn;
+			if ($fn) {
+				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr,$this);
+			} 
+			$false = false;
+			return $false;
+		} 
+		
+		if ($this->_queryID === true) { // return simplified recordset for inserts/updates/deletes with lower overhead
+			$rsclass = $this->rsPrefix.'empty';
+			$rs = (class_exists($rsclass)) ? new $rsclass():  new ADORecordSet_empty();
+			
+			return $rs;
+		}
+		
+		// return real recordset from select statement
+		$rsclass = $this->rsPrefix.$this->databaseType;
+		$rs = new $rsclass($this->_queryID,$this->fetchMode);
+		$rs->connection = $this; // Pablo suggestion
+		$rs->Init();
+		if (is_array($sql)) $rs->sql = $sql[0];
+		else $rs->sql = $sql;
+		if ($rs->_numOfRows <= 0) {
+		global $ADODB_COUNTRECS;
+			if ($ADODB_COUNTRECS) {
+				if (!$rs->EOF) { 
+					$rs = $this->_rs2rs($rs,-1,-1,!is_array($sql));
+					$rs->_queryID = $this->_queryID;
+				} else
+					$rs->_numOfRows = 0;
+			}
+		}
+		return $rs;
+	}
+
+	function CreateSequence($seqname='adodbseq',$startID=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
+	}
+
+	function DropSequence($seqname='adodbseq')
+	{
+		if (empty($this->_dropSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+
+	/**
+	 * Generates a sequence id and stores it in $this->genID;
+	 * GenID is only available if $this->hasGenID = true;
+	 *
+	 * @param seqname		name of sequence to use
+	 * @param startID		if sequence does not exist, start at this ID
+	 * @return		0 if not supported, otherwise a sequence id
+	 */
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		if (!$this->hasGenID) {
+			return 0; // formerly returns false pre 1.60
+		}
+		
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		
+		$holdtransOK = $this->_transOK;
+		
+		$save_handler = $this->raiseErrorFn;
+		$this->raiseErrorFn = '';
+		@($rs = $this->Execute($getnext));
+		$this->raiseErrorFn = $save_handler;
+		
+		if (!$rs) {
+			$this->_transOK = $holdtransOK; //if the status was ok before reset
+			$createseq = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$startID));
+			$rs = $this->Execute($getnext);
+		}
+		if ($rs && !$rs->EOF) $this->genID = reset($rs->fields);
+		else $this->genID = 0; // false
+	
+		if ($rs) $rs->Close();
+
+		return $this->genID;
+	}	
+
+	/**
+	 * @param $table string name of the table, not needed by all databases (eg. mysql), default ''
+	 * @param $column string name of the column, not needed by all databases (eg. mysql), default ''
+	 * @return  the last inserted ID. Not all databases support this.
+	 */ 
+	function Insert_ID($table='',$column='')
+	{
+		if ($this->_logsql && $this->lastInsID) return $this->lastInsID;
+		if ($this->hasInsertID) return $this->_insertid($table,$column);
+		if ($this->debug) {
+			ADOConnection::outp( '
Insert_ID error
');
+			adodb_backtrace();
+		}
+		return false;
+	}
+
+
+	/**
+	 * Portable Insert ID. Pablo Roca 
+	 *
+	 * @return  the last inserted ID. All databases support this. But aware possible
+	 * problems in multiuser environments. Heavy test this before deploying.
+	 */ 
+	function PO_Insert_ID($table="", $id="") 
+	{
+	   if ($this->hasInsertID){
+		   return $this->Insert_ID($table,$id);
+	   } else {
+		   return $this->GetOne("SELECT MAX($id) FROM $table");
+	   }
+	}
+
+	/**
+	* @return # rows affected by UPDATE/DELETE
+	*/ 
+	function Affected_Rows()
+	{
+		if ($this->hasAffectedRows) {
+			if ($this->fnExecute === 'adodb_log_sql') {
+				if ($this->_logsql && $this->_affected !== false) return $this->_affected;
+			}
+			$val = $this->_affectedrows();
+			return ($val < 0) ? false : $val;
+		}
+				  
+		if ($this->debug) ADOConnection::outp( '
Affected_Rows error
',false);
+		return false;
+	}
+	
+	
+	/**
+	 * @return  the last error message
+	 */
+	function ErrorMsg()
+	{
+		if ($this->_errorMsg) return '!! '.strtoupper($this->dataProvider.' '.$this->databaseType).': '.$this->_errorMsg;
+		else return '';
+	}
+	
+	
+	/**
+	 * @return the last error number. Normally 0 means no error.
+	 */
+	function ErrorNo() 
+	{
+		return ($this->_errorMsg) ? -1 : 0;
+	}
+	
+	function MetaError($err=false)
+	{
+		include_once(ADODB_DIR."/adodb-error.inc.php");
+		if ($err === false) $err = $this->ErrorNo();
+		return adodb_error($this->dataProvider,$this->databaseType,$err);
+	}
+	
+	function MetaErrorMsg($errno)
+	{
+		include_once(ADODB_DIR."/adodb-error.inc.php");
+		return adodb_errormsg($errno);
+	}
+	
+	/**
+	 * @returns an array with the primary key columns in it.
+	 */
+	function MetaPrimaryKeys($table, $owner=false)
+	{
+	// owner not used in base class - see oci8
+		$p = array();
+		$objs = $this->MetaColumns($table);
+		if ($objs) {
+			foreach($objs as $v) {
+				if (!empty($v->primary_key))
+					$p[] = $v->name;
+			}
+		}
+		if (sizeof($p)) return $p;
+		if (function_exists('ADODB_VIEW_PRIMARYKEYS'))
+			return ADODB_VIEW_PRIMARYKEYS($this->databaseType, $this->database, $table, $owner);
+		return false;
+	}
+	
+	/**
+	 * @returns assoc array where keys are tables, and values are foreign keys
+	 */
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+		return false;
+	}
+	/**
+	 * Choose a database to connect to. Many databases do not support this.
+	 *
+	 * @param dbName 	is the name of the database to select
+	 * @return 		true or false
+	 */
+	function SelectDB($dbName) 
+	{return false;}
+	
+	
+	/**
+	* Will select, getting rows from $offset (1-based), for $nrows. 
+	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	* eg. 
+	*  SelectLimit('select * from table',3); will return rows 1 to 3 (1-based)
+	*  SelectLimit('select * from table',3,2); will return rows 3 to 5 (1-based)
+	*
+	* Uses SELECT TOP for Microsoft databases (when $this->hasTop is set)
+	* BUG: Currently SelectLimit fails with $sql with LIMIT or TOP clause already set
+	*
+	* @param sql
+	* @param [offset]	is the row to start calculations from (1-based)
+	* @param [nrows]		is the number of rows to get
+	* @param [inputarr]	array of bind variables
+	* @param [secs2cache]		is a private parameter only used by jlim
+	* @return		the recordset ($rs->databaseType == 'array')
+ 	*/
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		if ($this->hasTop && $nrows > 0) {
+		// suggested by Reinhard Balling. Access requires top after distinct 
+		 // Informix requires first before distinct - F Riosa
+			$ismssql = (strpos($this->databaseType,'mssql') !== false);
+			if ($ismssql) $isaccess = false;
+			else $isaccess = (strpos($this->databaseType,'access') !== false);
+			
+			if ($offset <= 	0) {
+				
+					// access includes ties in result
+					if ($isaccess) {
+						$sql = preg_replace(
+						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+
+						if ($secs2cache != 0) {
+							$ret = $this->CacheExecute($secs2cache, $sql,$inputarr);
+						} else {
+							$ret = $this->Execute($sql,$inputarr);
+						}
+						return $ret; // PHP5 fix
+					} else if ($ismssql){
+						$sql = preg_replace(
+						'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+					} else {
+						$sql = preg_replace(
+						'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.((integer)$nrows).' ',$sql);
+					}
+			} else {
+				$nn = $nrows + $offset;
+				if ($isaccess || $ismssql) {
+					$sql = preg_replace(
+					'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
+				} else {
+					$sql = preg_replace(
+					'/(^\s*select\s)/i','\\1 '.$this->hasTop.' '.$nn.' ',$sql);
+				}
+			}
+		}
+		
+		// if $offset>0, we want to skip rows, and $ADODB_COUNTRECS is set, we buffer  rows
+		// 0 to offset-1 which will be discarded anyway. So we disable $ADODB_COUNTRECS.
+		global $ADODB_COUNTRECS;
+		
+		$savec = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+			
+
+		if ($secs2cache != 0) $rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
+		else $rs = $this->Execute($sql,$inputarr);
+		
+		$ADODB_COUNTRECS = $savec;
+		if ($rs && !$rs->EOF) {
+			$rs = $this->_rs2rs($rs,$nrows,$offset);
+		}
+		//print_r($rs);
+		return $rs;
+	}
+	
+	/**
+	* Create serializable recordset. Breaks rs link to connection.
+	*
+	* @param rs			the recordset to serialize
+	*/
+	function SerializableRS(&$rs)
+	{
+		$rs2 = $this->_rs2rs($rs);
+		$ignore = false;
+		$rs2->connection = $ignore;
+		
+		return $rs2;
+	}
+	
+	/**
+	* Convert database recordset to an array recordset
+	* input recordset's cursor should be at beginning, and
+	* old $rs will be closed.
+	*
+	* @param rs			the recordset to copy
+	* @param [nrows]  	number of rows to retrieve (optional)
+	* @param [offset] 	offset by number of rows (optional)
+	* @return 			the new recordset
+	*/
+	function &_rs2rs(&$rs,$nrows=-1,$offset=-1,$close=true)
+	{
+		if (! $rs) {
+			$false = false;
+			return $false;
+		}
+		$dbtype = $rs->databaseType;
+		if (!$dbtype) {
+			$rs = $rs;  // required to prevent crashing in 4.2.1, but does not happen in 4.3.1 -- why ?
+			return $rs;
+		}
+		if (($dbtype == 'array' || $dbtype == 'csv') && $nrows == -1 && $offset == -1) {
+			$rs->MoveFirst();
+			$rs = $rs; // required to prevent crashing in 4.2.1, but does not happen in 4.3.1-- why ?
+			return $rs;
+		}
+		$flds = array();
+		for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++) {
+			$flds[] = $rs->FetchField($i);
+		}
+
+		$arr = $rs->GetArrayLimit($nrows,$offset);
+		//print_r($arr);
+		if ($close) $rs->Close();
+		
+		$arrayClass = $this->arrayClass;
+		
+		$rs2 = new $arrayClass();
+		$rs2->connection = $this;
+		$rs2->sql = $rs->sql;
+		$rs2->dataProvider = $this->dataProvider;
+		$rs2->InitArrayFields($arr,$flds);
+		$rs2->fetchMode = isset($rs->adodbFetchMode) ? $rs->adodbFetchMode : $rs->fetchMode;
+		return $rs2;
+	}
+	
+	/*
+	* Return all rows. Compat with PEAR DB
+	*/
+	function GetAll($sql, $inputarr=false)
+	{
+		$arr = $this->GetArray($sql,$inputarr);
+		return $arr;
+	}
+	
+	function GetAssoc($sql, $inputarr=false,$force_array = false, $first2cols = false)
+	{
+		$rs = $this->Execute($sql, $inputarr);
+		if (!$rs) {
+			$false = false;
+			return $false;
+		}
+		$arr = $rs->GetAssoc($force_array,$first2cols);
+		return $arr;
+	}
+	
+	function CacheGetAssoc($secs2cache, $sql=false, $inputarr=false,$force_array = false, $first2cols = false)
+	{
+		if (!is_numeric($secs2cache)) {
+			$first2cols = $force_array;
+			$force_array = $inputarr;
+		}
+		$rs = $this->CacheExecute($secs2cache, $sql, $inputarr);
+		if (!$rs) {
+			$false = false;
+			return $false;
+		}
+		$arr = $rs->GetAssoc($force_array,$first2cols);
+		return $arr;
+	}
+	
+	/**
+	* Return first element of first row of sql statement. Recordset is disposed
+	* for you.
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function GetOne($sql,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS,$ADODB_GETONE_EOF;
+		$crecs = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+		
+		$ret = false;
+		$rs = $this->Execute($sql,$inputarr);
+		if ($rs) {	
+			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
+			else $ret = reset($rs->fields);
+			
+			$rs->Close();
+		}
+		$ADODB_COUNTRECS = $crecs;
+		return $ret;
+	}
+	
+	// $where should include 'WHERE fld=value'
+	function GetMedian($table, $field,$where = '')
+	{
+		$total = $this->GetOne("select count(*) from $table $where");
+		if (!$total) return false;
+	
+		$midrow = (integer) ($total/2);
+		$rs = $this->SelectLimit("select $field from $table $where order by 1",1,$midrow);
+		if ($rs && !$rs->EOF) return reset($rs->fields);
+		return false;
+	}
+	
+	
+	function CacheGetOne($secs2cache,$sql=false,$inputarr=false)
+	{
+	global $ADODB_GETONE_EOF;
+		$ret = false;
+		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
+		if ($rs) {
+			if ($rs->EOF) $ret = $ADODB_GETONE_EOF;
+			else $ret = reset($rs->fields);
+			$rs->Close();
+		} 
+		
+		return $ret;
+	}
+	
+	function GetCol($sql, $inputarr = false, $trim = false)
+	{
+	  	
+	  	$rs = $this->Execute($sql, $inputarr);
+	  	if ($rs) {
+			$rv = array();
+	   		if ($trim) {
+				while (!$rs->EOF) {
+					$rv[] = trim(reset($rs->fields));
+					$rs->MoveNext();
+		   		}
+			} else {
+				while (!$rs->EOF) {
+					$rv[] = reset($rs->fields);
+					$rs->MoveNext();
+		   		}
+			}
+	   		$rs->Close();
+	  	} else
+			$rv = false;
+	  	return $rv;
+	}
+	
+	function CacheGetCol($secs, $sql = false, $inputarr = false,$trim=false)
+	{
+	  	$rs = $this->CacheExecute($secs, $sql, $inputarr);
+	  	if ($rs) {
+			$rv = array();
+			if ($trim) {
+				while (!$rs->EOF) {
+					$rv[] = trim(reset($rs->fields));
+					$rs->MoveNext();
+		   		}
+			} else {
+				while (!$rs->EOF) {
+					$rv[] = reset($rs->fields);
+					$rs->MoveNext();
+		   		}
+			}
+	   		$rs->Close();
+	  	} else
+			$rv = false;
+			
+	  	return $rv;
+	}
+	
+	function Transpose(&$rs,$addfieldnames=true)
+	{
+		$rs2 = $this->_rs2rs($rs);
+		$false = false;
+		if (!$rs2) return $false;
+		
+		$rs2->_transpose($addfieldnames);
+		return $rs2;
+	}
+ 
+	/*
+		Calculate the offset of a date for a particular database and generate
+			appropriate SQL. Useful for calculating future/past dates and storing
+			in a database.
+			
+		If dayFraction=1.5 means 1.5 days from now, 1.0/24 for 1 hour.
+	*/
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) $date = $this->sysDate;
+		return  '('.$date.'+'.$dayFraction.')';
+	}
+	
+	
+	/**
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function GetArray($sql,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+		
+		$savec = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+		$rs = $this->Execute($sql,$inputarr);
+		$ADODB_COUNTRECS = $savec;
+		if (!$rs) 
+			if (defined('ADODB_PEAR')) {
+				$cls = ADODB_PEAR_Error();
+				return $cls;
+			} else {
+				$false = false;
+				return $false;
+			}
+		$arr = $rs->GetArray();
+		$rs->Close();
+		return $arr;
+	}
+	
+	function CacheGetAll($secs2cache,$sql=false,$inputarr=false)
+	{
+		$arr = $this->CacheGetArray($secs2cache,$sql,$inputarr);
+		return $arr;
+	}
+	
+	function CacheGetArray($secs2cache,$sql=false,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+		
+		$savec = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
+		$ADODB_COUNTRECS = $savec;
+		
+		if (!$rs) 
+			if (defined('ADODB_PEAR')) {
+				$cls = ADODB_PEAR_Error();
+				return $cls;
+			} else {
+				$false = false;
+				return $false;
+			}
+		$arr = $rs->GetArray();
+		$rs->Close();
+		return $arr;
+	}
+	
+	function GetRandRow($sql, $arr= false)
+	{
+		$rezarr = $this->GetAll($sql, $arr);
+		$sz = sizeof($rezarr);
+		return $rezarr[abs(rand()) % $sz];
+	}
+	
+	/**
+	* Return one row of sql statement. Recordset is disposed for you.
+	*
+	* @param sql			SQL statement
+	* @param [inputarr]		input bind array
+	*/
+	function GetRow($sql,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+		$crecs = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = false;
+		
+		$rs = $this->Execute($sql,$inputarr);
+		
+		$ADODB_COUNTRECS = $crecs;
+		if ($rs) {
+			if (!$rs->EOF) $arr = $rs->fields;
+			else $arr = array();
+			$rs->Close();
+			return $arr;
+		}
+		
+		$false = false;
+		return $false;
+	}
+	
+	function CacheGetRow($secs2cache,$sql=false,$inputarr=false)
+	{
+		$rs = $this->CacheExecute($secs2cache,$sql,$inputarr);
+		if ($rs) {
+			if (!$rs->EOF) $arr = $rs->fields;
+			else $arr = array();
+			
+			$rs->Close();
+			return $arr;
+		}
+		$false = false;
+		return $false;
+	}
+	
+	/**
+	* Insert or replace a single record. Note: this is not the same as MySQL's replace. 
+	* ADOdb's Replace() uses update-insert semantics, not insert-delete-duplicates of MySQL.
+	* Also note that no table locking is done currently, so it is possible that the
+	* record be inserted twice by two programs...
+	*
+	* $this->Replace('products', array('prodname' =>"'Nails'","price" => 3.99), 'prodname');
+	*
+	* $table		table name
+	* $fieldArray	associative array of data (you must quote strings yourself).
+	* $keyCol		the primary key field name or if compound key, array of field names
+	* autoQuote		set to true to use a hueristic to quote strings. Works with nulls and numbers
+	*					but does not work with dates nor SQL functions.
+	* has_autoinc	the primary key is an auto-inc field, so skip in insert.
+	*
+	* Currently blob replace not supported
+	*
+	* returns 0 = fail, 1 = update, 2 = insert 
+	*/
+	
+	function Replace($table, $fieldArray, $keyCol, $autoQuote=false, $has_autoinc=false)
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+		
+		return _adodb_replace($this, $table, $fieldArray, $keyCol, $autoQuote, $has_autoinc);
+	}
+	
+	
+	/**
+	* Will select, getting rows from $offset (1-based), for $nrows. 
+	* This simulates the MySQL "select * from table limit $offset,$nrows" , and
+	* the PostgreSQL "select * from table limit $nrows offset $offset". Note that
+	* MySQL and PostgreSQL parameter ordering is the opposite of the other.
+	* eg. 
+	*  CacheSelectLimit(15,'select * from table',3); will return rows 1 to 3 (1-based)
+	*  CacheSelectLimit(15,'select * from table',3,2); will return rows 3 to 5 (1-based)
+	*
+	* BUG: Currently CacheSelectLimit fails with $sql with LIMIT or TOP clause already set
+	*
+	* @param [secs2cache]	seconds to cache data, set to 0 to force query. This is optional
+	* @param sql
+	* @param [offset]	is the row to start calculations from (1-based)
+	* @param [nrows]	is the number of rows to get
+	* @param [inputarr]	array of bind variables
+	* @return		the recordset ($rs->databaseType == 'array')
+ 	*/
+	function CacheSelectLimit($secs2cache,$sql,$nrows=-1,$offset=-1,$inputarr=false)
+	{	
+		if (!is_numeric($secs2cache)) {
+			if ($sql === false) $sql = -1;
+			if ($offset == -1) $offset = false;
+									  // sql,	nrows, offset,inputarr
+			$rs = $this->SelectLimit($secs2cache,$sql,$nrows,$offset,$this->cacheSecs);
+		} else {
+			if ($sql === false) $this->outp_throw("Warning: \$sql missing from CacheSelectLimit()",'CacheSelectLimit');
+			$rs = $this->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		}
+		return $rs;
+	}
+	
+	
+	/**
+	* Flush cached recordsets that match a particular $sql statement. 
+	* If $sql == false, then we purge all files in the cache.
+ 	*/
+	
+	/**
+   * Flush cached recordsets that match a particular $sql statement. 
+   * If $sql == false, then we purge all files in the cache.
+    */
+	function CacheFlush($sql=false,$inputarr=false)
+	{
+	global $ADODB_CACHE_DIR, $ADODB_CACHE;
+		
+		if (empty($ADODB_CACHE)) return false;
+		
+		if (!$sql) {
+			 $ADODB_CACHE->flushall($this->debug);
+	         return;
+	    }
+		
+		$f = $this->_gencachename($sql.serialize($inputarr),false);
+		return $ADODB_CACHE->flushcache($f, $this->debug);
+	}
+   
+	
+	/**
+	* Private function to generate filename for caching.
+	* Filename is generated based on:
+	*
+	*  - sql statement
+	*  - database type (oci8, ibase, ifx, etc)
+	*  - database name
+	*  - userid
+	*  - setFetchMode (adodb 4.23)
+	*
+	* When not in safe mode, we create 256 sub-directories in the cache directory ($ADODB_CACHE_DIR). 
+	* Assuming that we can have 50,000 files per directory with good performance, 
+	* then we can scale to 12.8 million unique cached recordsets. Wow!
+ 	*/
+	function _gencachename($sql,$createdir)
+	{
+	global $ADODB_CACHE, $ADODB_CACHE_DIR;
+		
+		if ($this->fetchMode === false) { 
+		global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		} else {
+			$mode = $this->fetchMode;
+		}
+		$m = md5($sql.$this->databaseType.$this->database.$this->user.$mode);
+		if (!$ADODB_CACHE->createdir) return $m;
+		if (!$createdir) $dir = $ADODB_CACHE->getdirname($m);
+		else $dir = $ADODB_CACHE->createdir($m, $this->debug);
+		
+		return $dir.'/adodb_'.$m.'.cache';
+	}
+	
+	
+	/**
+	 * Execute SQL, caching recordsets.
+	 *
+	 * @param [secs2cache]	seconds to cache data, set to 0 to force query. 
+	 *					  This is an optional parameter.
+	 * @param sql		SQL statement to execute
+	 * @param [inputarr]	holds the input data  to bind to
+	 * @return 		RecordSet or false
+	 */
+	function CacheExecute($secs2cache,$sql=false,$inputarr=false)
+	{
+	global $ADODB_CACHE;
+	
+		if (empty($ADODB_CACHE)) $this->_CreateCache();
+		
+		if (!is_numeric($secs2cache)) {
+			$inputarr = $sql;
+			$sql = $secs2cache;
+			$secs2cache = $this->cacheSecs;
+		}
+		
+		if (is_array($sql)) {
+			$sqlparam = $sql;
+			$sql = $sql[0];
+		} else
+			$sqlparam = $sql;
+			
+		
+		$md5file = $this->_gencachename($sql.serialize($inputarr),true);
+		$err = '';
+		
+		if ($secs2cache > 0){
+			$rs = $ADODB_CACHE->readcache($md5file,$err,$secs2cache,$this->arrayClass);
+			$this->numCacheHits += 1;
+		} else {
+			$err='Timeout 1';
+			$rs = false;
+			$this->numCacheMisses += 1;
+		}
+		
+		if (!$rs) {
+		// no cached rs found
+			if ($this->debug) {
+				if (get_magic_quotes_runtime() && !$this->memCache) {
+					ADOConnection::outp("Please disable magic_quotes_runtime - it corrupts cache files :(");
+				}
+				if ($this->debug !== -1) ADOConnection::outp( " $md5file cache failure: $err (see sql below)");
+			}
+			
+			$rs = $this->Execute($sqlparam,$inputarr);
+
+			if ($rs) {
+
+				$eof = $rs->EOF;
+				$rs = $this->_rs2rs($rs); // read entire recordset into memory immediately
+				$rs->timeCreated = time(); // used by caching
+				$txt = _rs2serialize($rs,false,$sql); // serialize
+	
+				$ok = $ADODB_CACHE->writecache($md5file,$txt,$this->debug, $secs2cache);
+				if (!$ok) {
+					if ($ok === false) {
+						$em = 'Cache write error';
+						$en = -32000;
+						
+						if ($fn = $this->raiseErrorFn) {
+							$fn($this->databaseType,'CacheExecute', $en, $em, $md5file,$sql,$this);
+						}
+					} else {
+						$em = 'Cache file locked warning';
+						$en = -32001;
+						// do not call error handling for just a warning
+					}
+					
+					if ($this->debug) ADOConnection::outp( " ".$em);
+				}
+				if ($rs->EOF && !$eof) {
+					$rs->MoveFirst();
+					//$rs = csv2rs($md5file,$err);		
+					$rs->connection = $this; // Pablo suggestion
+				}  
+				
+			} else if (!$this->memCache)
+				$ADODB_CACHE->flushcache($md5file);
+		} else {
+			$this->_errorMsg = '';
+			$this->_errorCode = 0;
+			
+			if ($this->fnCacheExecute) {
+				$fn = $this->fnCacheExecute;
+				$fn($this, $secs2cache, $sql, $inputarr);
+			}
+		// ok, set cached object found
+			$rs->connection = $this; // Pablo suggestion
+			if ($this->debug){ 			
+				if ($this->debug == 99) adodb_backtrace();
+				$inBrowser = isset($_SERVER['HTTP_USER_AGENT']);
+				$ttl = $rs->timeCreated + $secs2cache - time();
+				$s = is_array($sql) ? $sql[0] : $sql;
+				if ($inBrowser) $s = ''.htmlspecialchars($s).'';
+				
+				ADOConnection::outp( " $md5file reloaded, ttl=$ttl [ $s ]");
+			}
+		}
+		return $rs;
+	}
+	
+	
+	/* 
+		Similar to PEAR DB's autoExecute(), except that 
+		$mode can be 'INSERT' or 'UPDATE' or DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
+		If $mode == 'UPDATE', then $where is compulsory as a safety measure.
+		
+		$forceUpdate means that even if the data has not changed, perform update.
+	 */
+	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
+	{
+		$false = false;
+		$sql = 'SELECT * FROM '.$table;  
+		if ($where!==FALSE) $sql .= ' WHERE '.$where;
+		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
+			$this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause','AutoExecute');
+			return $false;
+		}
+
+		$rs = $this->SelectLimit($sql,1);
+		if (!$rs) return $false; // table does not exist
+		$rs->tableName = $table;
+		$rs->sql = $sql;
+		
+		switch((string) $mode) {
+		case 'UPDATE':
+		case '2':
+			$sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq);
+			break;
+		case 'INSERT':
+		case '1':
+			$sql = $this->GetInsertSQL($rs, $fields_values, $magicq);
+			break;
+		default:
+			$this->outp_throw("AutoExecute: Unknown mode=$mode",'AutoExecute');
+			return $false;
+		}
+		$ret = false;
+		if ($sql) $ret = $this->Execute($sql);
+		if ($ret) $ret = true;
+		return $ret;
+	}
+	
+	
+	/**
+	 * Generates an Update Query based on an existing recordset.
+	 * $arrFields is an associative array of fields with the value
+	 * that should be assigned.
+	 *
+	 * Note: This function should only be used on a recordset
+	 *	   that is run against a single table and sql should only 
+	 *		 be a simple select stmt with no groupby/orderby/limit
+	 *
+	 * "Jonathan Younger" 
+  	 */
+	function GetUpdateSQL(&$rs, $arrFields,$forceUpdate=false,$magicq=false,$force=null)
+	{
+		global $ADODB_INCLUDED_LIB;
+
+        //********************************************************//
+        //This is here to maintain compatibility
+        //with older adodb versions. Sets force type to force nulls if $forcenulls is set.
+		if (!isset($force)) {
+				global $ADODB_FORCE_TYPE;
+			    $force = $ADODB_FORCE_TYPE;
+		}
+		//********************************************************//
+
+		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force);
+	}
+
+	/**
+	 * Generates an Insert Query based on an existing recordset.
+	 * $arrFields is an associative array of fields with the value
+	 * that should be assigned.
+	 *
+	 * Note: This function should only be used on a recordset
+	 *	   that is run against a single table.
+  	 */
+	function GetInsertSQL(&$rs, $arrFields,$magicq=false,$force=null)
+	{	
+		global $ADODB_INCLUDED_LIB;
+		if (!isset($force)) {
+			global $ADODB_FORCE_TYPE;
+			$force = $ADODB_FORCE_TYPE;
+			
+		}
+		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_getinsertsql($this,$rs,$arrFields,$magicq,$force);
+	}
+	
+
+	/**
+	* Update a blob column, given a where clause. There are more sophisticated
+	* blob handling functions that we could have implemented, but all require
+	* a very complex API. Instead we have chosen something that is extremely
+	* simple to understand and use. 
+	*
+	* Note: $blobtype supports 'BLOB' and 'CLOB', default is BLOB of course.
+	*
+	* Usage to update a $blobvalue which has a primary key blob_id=1 into a 
+	* field blobtable.blobcolumn:
+	*
+	*	UpdateBlob('blobtable', 'blobcolumn', $blobvalue, 'blob_id=1');
+	*
+	* Insert example:
+	*
+	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+	*	$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+	*/
+	
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
+	}
+
+	/**
+	* Usage:
+	*	UpdateBlob('TABLE', 'COLUMN', '/path/to/file', 'ID=1');
+	*	
+	*	$blobtype supports 'BLOB' and 'CLOB'
+	*
+	*	$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+	*	$conn->UpdateBlob('blobtable','blobcol',$blobpath,'id=1');
+	*/
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
+	{
+		$fd = fopen($path,'rb');
+		if ($fd === false) return false;
+		$val = fread($fd,filesize($path));
+		fclose($fd);
+		return $this->UpdateBlob($table,$column,$val,$where,$blobtype);
+	}
+	
+	function BlobDecode($blob)
+	{
+		return $blob;
+	}
+	
+	function BlobEncode($blob)
+	{
+		return $blob;
+	}
+	
+	function SetCharSet($charset)
+	{
+		return false;
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
+	}
+	
+	function LogSQL($enable=true)
+	{
+		include_once(ADODB_DIR.'/adodb-perf.inc.php');
+		
+		if ($enable) $this->fnExecute = 'adodb_log_sql';
+		else $this->fnExecute = false;
+		
+		$old = $this->_logsql;	
+		$this->_logsql = $enable;
+		if ($enable && !$old) $this->_affected = false;
+		return $old;
+	}
+	
+	function GetCharSet()
+	{
+		return false;
+	}
+	
+	/**
+	* Usage:
+	*	UpdateClob('TABLE', 'COLUMN', $var, 'ID=1', 'CLOB');
+	*
+	*	$conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
+	*	$conn->UpdateClob('clobtable','clobcol',$clob,'id=1');
+	*/
+	function UpdateClob($table,$column,$val,$where)
+	{
+		return $this->UpdateBlob($table,$column,$val,$where,'CLOB');
+	}
+	
+	// not the fastest implementation - quick and dirty - jlim
+	// for best performance, use the actual $rs->MetaType().
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		
+		if (empty($this->_metars)) {
+			$rsclass = $this->rsPrefix.$this->databaseType;
+			$this->_metars = new $rsclass(false,$this->fetchMode); 
+			$this->_metars->connection = $this;
+		}
+		return $this->_metars->MetaType($t,$len,$fieldobj);
+	}
+	
+	
+	/**
+	*  Change the SQL connection locale to a specified locale.
+	*  This is used to get the date formats written depending on the client locale.
+	*/
+	function SetDateLocale($locale = 'En')
+	{
+		$this->locale = $locale;
+		switch (strtoupper($locale))
+		{
+			case 'EN':
+				$this->fmtDate="'Y-m-d'";
+				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
+				break;
+				
+			case 'US':
+				$this->fmtDate = "'m-d-Y'";
+				$this->fmtTimeStamp = "'m-d-Y H:i:s'";
+				break;
+				
+			case 'PT_BR': 	
+			case 'NL':
+			case 'FR':
+			case 'RO':
+			case 'IT':
+				$this->fmtDate="'d-m-Y'";
+				$this->fmtTimeStamp = "'d-m-Y H:i:s'";
+				break;
+				
+			case 'GE':
+				$this->fmtDate="'d.m.Y'";
+				$this->fmtTimeStamp = "'d.m.Y H:i:s'";
+				break;
+				
+			default:
+				$this->fmtDate="'Y-m-d'";
+				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
+				break;
+		}
+	}
+
+	/**
+	 * GetActiveRecordsClass Performs an 'ALL' query 
+	 * 
+	 * @param mixed $class This string represents the class of the current active record
+	 * @param mixed $table Table used by the active record object
+	 * @param mixed $whereOrderBy Where, order, by clauses
+	 * @param mixed $bindarr 
+	 * @param mixed $primkeyArr 
+	 * @param array $extra Query extras: limit, offset...
+	 * @param mixed $relations Associative array: table's foreign name, "hasMany", "belongsTo"
+	 * @access public
+	 * @return void
+	 */
+	function GetActiveRecordsClass(
+			$class, $table,$whereOrderBy=false,$bindarr=false, $primkeyArr=false,
+			$extra=array(),
+			$relations=array())
+	{
+	global $_ADODB_ACTIVE_DBS;
+		## reduce overhead of adodb.inc.php -- moved to adodb-active-record.inc.php
+		## if adodb-active-recordx is loaded -- should be no issue as they will probably use Find()
+		if (!isset($_ADODB_ACTIVE_DBS))include_once(ADODB_DIR.'/adodb-active-record.inc.php');
+		return adodb_GetActiveRecordsClass($this, $class, $table, $whereOrderBy, $bindarr, $primkeyArr, $extra, $relations);
+	}
+	
+	function GetActiveRecords($table,$where=false,$bindarr=false,$primkeyArr=false)
+	{
+		$arr = $this->GetActiveRecordsClass('ADODB_Active_Record', $table, $where, $bindarr, $primkeyArr);
+		return $arr;
+	}
+	
+	/**
+	 * Close Connection
+	 */
+	function Close()
+	{
+		$rez = $this->_close();
+		$this->_connectionID = false;
+		return $rez;
+	}
+	
+	/**
+	 * Begin a Transaction. Must be followed by CommitTrans() or RollbackTrans().
+	 *
+	 * @return true if succeeded or false if database does not support transactions
+	 */
+	function BeginTrans() 
+	{
+		if ($this->debug) ADOConnection::outp("BeginTrans: Transactions not supported for this driver");
+		return false;
+	}
+	
+	/* set transaction mode */
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
+		$this->_transmode  = $transaction_mode;
+	}
+/*
+http://msdn2.microsoft.com/en-US/ms173763.aspx
+http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
+http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
+http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
+*/
+	function MetaTransaction($mode,$db)
+	{
+		$mode = strtoupper($mode);
+		$mode = str_replace('ISOLATION LEVEL ','',$mode);
+		
+		switch($mode) {
+
+		case 'READ UNCOMMITTED':
+			switch($db) { 
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			default:
+				return 'ISOLATION LEVEL READ UNCOMMITTED';
+			}
+			break;
+					
+		case 'READ COMMITTED':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			break;
+			
+		case 'REPEATABLE READ':
+			switch($db) {
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			default:
+				return 'ISOLATION LEVEL REPEATABLE READ';
+			}
+			break;
+			
+		case 'SERIALIZABLE':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			break;
+			
+		default:
+			return $mode;
+		}
+	}
+	
+	/**
+	 * If database does not support transactions, always return true as data always commited
+	 *
+	 * @param $ok  set to false to rollback transaction, true to commit
+	 *
+	 * @return true/false.
+	 */
+	function CommitTrans($ok=true) 
+	{ return true;}
+	
+	
+	/**
+	 * If database does not support transactions, rollbacks always fail, so return false
+	 *
+	 * @return true/false.
+	 */
+	function RollbackTrans() 
+	{ return false;}
+
+
+	/**
+	 * return the databases that the driver can connect to. 
+	 * Some databases will return an empty array.
+	 *
+	 * @return an array of database names.
+	 */
+		function MetaDatabases() 
+		{
+		global $ADODB_FETCH_MODE;
+		
+			if ($this->metaDatabasesSQL) {
+				$save = $ADODB_FETCH_MODE; 
+				$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
+				
+				if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+				
+				$arr = $this->GetCol($this->metaDatabasesSQL);
+				if (isset($savem)) $this->SetFetchMode($savem);
+				$ADODB_FETCH_MODE = $save; 
+			
+				return $arr;
+			}
+			
+			return false;
+		}
+	
+		
+	/**
+	 * @param ttype can either be 'VIEW' or 'TABLE' or false. 
+	 * 		If false, both views and tables are returned.
+	 *		"VIEW" returns only views
+	 *		"TABLE" returns only tables
+	 * @param showSchema returns the schema/user with the table name, eg. USER.TABLE
+	 * @param mask  is the input mask - only supported by oci8 and postgresql
+	 *
+	 * @return  array of tables for current database.
+	 */ 
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+	global $ADODB_FETCH_MODE;
+	
+		
+		$false = false;
+		if ($mask) {
+			return $false;
+		}
+		if ($this->metaTablesSQL) {
+			$save = $ADODB_FETCH_MODE; 
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM; 
+			
+			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+			
+			$rs = $this->Execute($this->metaTablesSQL);
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save; 
+			
+			if ($rs === false) return $false;
+			$arr = $rs->GetArray();
+			$arr2 = array();
+			
+			if ($hast = ($ttype && isset($arr[0][1]))) { 
+				$showt = strncmp($ttype,'T',1);
+			}
+			
+			for ($i=0; $i < sizeof($arr); $i++) {
+				if ($hast) {
+					if ($showt == 0) {
+						if (strncmp($arr[$i][1],'T',1) == 0) $arr2[] = trim($arr[$i][0]);
+					} else {
+						if (strncmp($arr[$i][1],'V',1) == 0) $arr2[] = trim($arr[$i][0]);
+					}
+				} else
+					$arr2[] = trim($arr[$i][0]);
+			}
+			$rs->Close();
+			return $arr2;
+		}
+		return $false;
+	}
+	
+	
+	function _findschema(&$table,&$schema)
+	{
+		if (!$schema && ($at = strpos($table,'.')) !== false) {
+			$schema = substr($table,0,$at);
+			$table = substr($table,$at+1);
+		}
+	}
+	
+	/**
+	 * List columns in a database as an array of ADOFieldObjects. 
+	 * See top of file for definition of object.
+	 *
+	 * @param $table	table name to query
+	 * @param $normalize	makes table name case-insensitive (required by some databases)
+	 * @schema is optional database schema to use - not supported by all databases.
+	 *
+	 * @return  array of ADOFieldObjects for current table.
+	 */
+	function MetaColumns($table,$normalize=true) 
+	{
+	global $ADODB_FETCH_MODE;
+		
+		$false = false;
+		
+		if (!empty($this->metaColumnsSQL)) {
+		
+			$schema = false;
+			$this->_findschema($table,$schema);
+		
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,($normalize)?strtoupper($table):$table));
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			if ($rs === false || $rs->EOF) return $false;
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+				if (isset($rs->fields[3]) && $rs->fields[3]) {
+					if ($rs->fields[3]>0) $fld->max_length = $rs->fields[3];
+					$fld->scale = $rs->fields[4];
+					if ($fld->scale>0) $fld->max_length += 1;
+				} else
+					$fld->max_length = $rs->fields[2];
+					
+				if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+				else $retarr[strtoupper($fld->name)] = $fld;
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return $false;
+	}
+	
+    /**
+      * List indexes on a table as an array.
+      * @param table  table name to query
+      * @param primary true to only show primary keys. Not actually used for most databases
+	  *
+      * @return array of indexes on current table. Each element represents an index, and is itself an associative array.
+	  
+		 Array (
+		    [name_of_index] => Array
+		      (
+	          [unique] => true or false
+	          [columns] => Array
+	          (
+	          	[0] => firstname
+		      	[1] => lastname
+	          )
+		)		
+      */
+     function MetaIndexes($table, $primary = false, $owner = false)
+     {
+	 		$false = false;
+            return $false;
+     }
+
+	/**
+	 * List columns names in a table as an array. 
+	 * @param table	table name to query
+	 *
+	 * @return  array of column names for current table.
+	 */ 
+	function MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
+	{
+		$objarr = $this->MetaColumns($table);
+		if (!is_array($objarr)) {
+			$false = false;
+			return $false;
+		}
+		$arr = array();
+		if ($numIndexes) {
+			$i = 0;
+			if ($useattnum) {
+				foreach($objarr as $v) 
+					$arr[$v->attnum] = $v->name;
+				
+			} else
+				foreach($objarr as $v) $arr[$i++] = $v->name;
+		} else
+			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
+		
+		return $arr;
+	}
+			
+	/**
+	 * Different SQL databases used different methods to combine strings together.
+	 * This function provides a wrapper. 
+	 * 
+	 * param s	variable number of string parameters
+	 *
+	 * Usage: $db->Concat($str1,$str2);
+	 * 
+	 * @return concatenated string
+	 */ 	 
+	function Concat()
+	{	
+		$arr = func_get_args();
+		return implode($this->concat_operator, $arr);
+	}
+	
+	
+	/**
+	 * Converts a date "d" to a string that the database can understand.
+	 *
+	 * @param d	a date in Unix date time format.
+	 *
+	 * @return  date string in database date format
+	 */
+	function DBDate($d, $isfld=false)
+	{
+		if (empty($d) && $d !== 0) return 'null';
+		if ($isfld) return $d;
+		
+		if (is_object($d)) return $d->format($this->fmtDate);
+		
+		
+		if (is_string($d) && !is_numeric($d)) {
+			if ($d === 'null' || strncmp($d,"'",1) === 0) return $d;
+			if ($this->isoDates) return "'$d'";
+			$d = ADOConnection::UnixDate($d);
+		}
+
+		return adodb_date($this->fmtDate,$d);
+	}
+	
+	function BindDate($d)
+	{
+		$d = $this->DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = $this->DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	
+	/**
+	 * Converts a timestamp "ts" to a string that the database can understand.
+	 *
+	 * @param ts	a timestamp in Unix date time format.
+	 *
+	 * @return  timestamp string in database timestamp format
+	 */
+	function DBTimeStamp($ts,$isfld=false)
+	{
+		if (empty($ts) && $ts !== 0) return 'null';
+		if ($isfld) return $ts;
+		if (is_object($ts)) return $ts->format($this->fmtTimeStamp);
+		
+		# strlen(14) allows YYYYMMDDHHMMSS format
+		if (!is_string($ts) || (is_numeric($ts) && strlen($ts)<14)) 
+			return adodb_date($this->fmtTimeStamp,$ts);
+		
+		if ($ts === 'null') return $ts;
+		if ($this->isoDates && strlen($ts) !== 14) return "'$ts'";
+		
+		$ts = ADOConnection::UnixTimeStamp($ts);
+		return adodb_date($this->fmtTimeStamp,$ts);
+	}
+	
+	/**
+	 * Also in ADORecordSet.
+	 * @param $v is a date string in YYYY-MM-DD format
+	 *
+	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
+	 */
+	static function UnixDate($v)
+	{
+		if (is_object($v)) {
+		// odbtp support
+		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
+			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
+		}
+	
+		if (is_numeric($v) && strlen($v) !== 8) return $v;
+		if (!preg_match( "|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})|", 
+			($v), $rr)) return false;
+
+		if ($rr[1] <= TIMESTAMP_FIRST_YEAR) return 0;
+		// h-m-s-MM-DD-YY
+		return @adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+	}
+	
+
+	/**
+	 * Also in ADORecordSet.
+	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
+	 *
+	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
+	 */
+	static function UnixTimeStamp($v)
+	{
+		if (is_object($v)) {
+		// odbtp support
+		//( [year] => 2004 [month] => 9 [day] => 4 [hour] => 12 [minute] => 44 [second] => 8 [fraction] => 0 )
+			return adodb_mktime($v->hour,$v->minute,$v->second,$v->month,$v->day, $v->year);
+		}
+		
+		if (!preg_match( 
+			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ ,-]*(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|", 
+			($v), $rr)) return false;
+			
+		if ($rr[1] <= TIMESTAMP_FIRST_YEAR && $rr[2]<= 1) return 0;
+	
+		// h-m-s-MM-DD-YY
+		if (!isset($rr[5])) return  adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1]);
+		return  @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1]);
+	}
+	
+	/**
+	 * Also in ADORecordSet.
+	 *
+	 * Format database date based on user defined format.
+	 *
+	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a date formated as user desires
+	 */
+	 
+	function UserDate($v,$fmt='Y-m-d',$gmt=false)
+	{
+		$tt = $this->UnixDate($v);
+
+		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		else if ($tt == 0) return $this->emptyDate;
+		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
+		}
+		
+		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
+	
+	}
+	
+		/**
+	 *
+	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a timestamp formated as user desires
+	 */
+	function UserTimeStamp($v,$fmt='Y-m-d H:i:s',$gmt=false)
+	{
+		if (!isset($v)) return $this->emptyTimeStamp;
+		# strlen(14) allows YYYYMMDDHHMMSS format
+		if (is_numeric($v) && strlen($v)<14) return ($gmt) ? adodb_gmdate($fmt,$v) : adodb_date($fmt,$v);
+		$tt = $this->UnixTimeStamp($v);
+		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		if ($tt == 0) return $this->emptyTimeStamp;
+		return ($gmt) ? adodb_gmdate($fmt,$tt) : adodb_date($fmt,$tt);
+	}
+	
+	function escape($s,$magic_quotes=false)
+	{
+		return $this->addq($s,$magic_quotes);
+	}
+	
+	/**
+	* Quotes a string, without prefixing nor appending quotes. 
+	*/
+	function addq($s,$magic_quotes=false)
+	{
+		if (!$magic_quotes) {
+		
+			if ($this->replaceQuote[0] == '\\'){
+				// only since php 4.0.5
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
+			}
+			return  str_replace("'",$this->replaceQuote,$s);
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		
+		if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase'))  // ' already quoted, no need to change anything
+			return $s;
+		else {// change \' to '' for sybase/mssql
+			$s = str_replace('\\\\','\\',$s);
+			return str_replace("\\'",$this->replaceQuote,$s);
+		}
+	}
+	
+	/**
+	 * Correctly quotes a string so that all strings are escaped. We prefix and append
+	 * to the string single-quotes.
+	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
+	 * 
+	 * @param s			the string to quote
+	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
+	 *				This undoes the stupidity of magic quotes for GPC.
+	 *
+	 * @return  quoted string to be sent back to database
+	 */
+	function qstr($s,$magic_quotes=false)
+	{	
+		if (!$magic_quotes) {
+		
+			if ($this->replaceQuote[0] == '\\'){
+				// only since php 4.0.5
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+				//$s = str_replace("\0","\\\0", str_replace('\\','\\\\',$s));
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		
+		if ($this->replaceQuote == "\\'" || ini_get('magic_quotes_sybase'))  // ' already quoted, no need to change anything
+			return "'$s'";
+		else {// change \' to '' for sybase/mssql
+			$s = str_replace('\\\\','\\',$s);
+			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+		}
+	}
+	
+	
+	/**
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
+	* and/or last one of the recordset. Added by Ivn Oliva to provide recordset pagination.
+	*
+	* See readme.htm#ex8 for an example of usage.
+	*
+	* @param sql
+	* @param nrows		is the number of rows per page to get
+	* @param page		is the page number to get (1-based)
+	* @param [inputarr]	array of bind variables
+	* @param [secs2cache]		is a private parameter only used by jlim
+	* @return		the recordset ($rs->databaseType == 'array')
+	*
+	* NOTE: phpLens uses a different algorithm and does not use PageExecute().
+	*
+	*/
+	function PageExecute($sql, $nrows, $page, $inputarr=false, $secs2cache=0) 
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+		if ($this->pageExecuteCountRows) $rs = _adodb_pageexecute_all_rows($this, $sql, $nrows, $page, $inputarr, $secs2cache);
+		else $rs = _adodb_pageexecute_no_last_page($this, $sql, $nrows, $page, $inputarr, $secs2cache);
+		return $rs;
+	}
+	
+		
+	/**
+	* Will select the supplied $page number from a recordset, given that it is paginated in pages of 
+	* $nrows rows per page. It also saves two boolean values saying if the given page is the first 
+	* and/or last one of the recordset. Added by Ivn Oliva to provide recordset pagination.
+	*
+	* @param secs2cache	seconds to cache data, set to 0 to force query
+	* @param sql
+	* @param nrows		is the number of rows per page to get
+	* @param page		is the page number to get (1-based)
+	* @param [inputarr]	array of bind variables
+	* @return		the recordset ($rs->databaseType == 'array')
+	*/
+	function CachePageExecute($secs2cache, $sql, $nrows, $page,$inputarr=false) 
+	{
+		/*switch($this->dataProvider) {
+		case 'postgres':
+		case 'mysql': 
+			break;
+		default: $secs2cache = 0; break;
+		}*/
+		$rs = $this->PageExecute($sql,$nrows,$page,$inputarr,$secs2cache);
+		return $rs;
+	}
+
+} // end class ADOConnection
+	
+	
+	
+	//==============================================================================================	
+	// CLASS ADOFetchObj
+	//==============================================================================================	
+		
+	/**
+	* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
+	*/
+	class ADOFetchObj {
+	};
+	
+	//==============================================================================================	
+	// CLASS ADORecordSet_empty
+	//==============================================================================================	
+	
+	class ADODB_Iterator_empty implements Iterator {
+	
+	    private $rs;
+	
+	    function __construct($rs) 
+		{
+	        $this->rs = $rs;
+	    }
+	    function rewind() 
+		{
+	    }
+	
+		function valid() 
+		{
+	        return !$this->rs->EOF;
+	    }
+		
+	    function key() 
+		{
+	        return false;
+	    }
+		
+	    function current() 
+		{
+	        return false;
+	    }
+		
+	    function next() 
+		{
+	    }
+		
+		function __call($func, $params)
+		{
+			return call_user_func_array(array($this->rs, $func), $params);
+		}
+		
+		function hasMore()
+		{
+			return false;
+		}
+	
+	}
+
+	
+	/**
+	* Lightweight recordset when there are no records to be returned
+	*/
+	class ADORecordSet_empty implements IteratorAggregate
+	{
+		var $dataProvider = 'empty';
+		var $databaseType = false;
+		var $EOF = true;
+		var $_numOfRows = 0;
+		var $fields = false;
+		var $connection = false;
+		function RowCount() {return 0;}
+		function RecordCount() {return 0;}
+		function PO_RecordCount(){return 0;}
+		function Close(){return true;}
+		function FetchRow() {return false;}
+		function FieldCount(){ return 0;}
+		function Init() {}
+		function getIterator() {return new ADODB_Iterator_empty($this);}
+	}
+	
+	//==============================================================================================	
+	// DATE AND TIME FUNCTIONS
+	//==============================================================================================	
+	if (!defined('ADODB_DATE_VERSION')) include(ADODB_DIR.'/adodb-time.inc.php');
+	
+	//==============================================================================================	
+	// CLASS ADORecordSet
+	//==============================================================================================	
+
+	class ADODB_Iterator implements Iterator {
+	
+	    private $rs;
+	
+	    function __construct($rs) 
+		{
+	        $this->rs = $rs;
+	    }
+	    function rewind() 
+		{
+	        $this->rs->MoveFirst();
+	    }
+	
+		function valid() 
+		{
+	        return !$this->rs->EOF;
+	    }
+		
+	    function key() 
+		{
+	        return $this->rs->_currentRow;
+	    }
+		
+	    function current() 
+		{
+	        return $this->rs->fields;
+	    }
+		
+	    function next() 
+		{
+	        $this->rs->MoveNext();
+	    }
+		
+		function __call($func, $params)
+		{
+			return call_user_func_array(array($this->rs, $func), $params);
+		}
+	
+		
+		function hasMore()
+		{
+			return !$this->rs->EOF;
+		}
+	
+	}
+
+
+
+   /**
+	 * RecordSet class that represents the dataset returned by the database.
+	 * To keep memory overhead low, this class holds only the current row in memory.
+	 * No prefetching of data is done, so the RecordCount() can return -1 ( which
+	 * means recordcount not known).
+	 */
+	class ADORecordSet implements IteratorAggregate {
+	/*
+	 * public variables	
+	 */
+	var $dataProvider = "native";
+	var $fields = false; 	/// holds the current row data
+	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
+							/// in other words, we use a text area for editing.
+	var $canSeek = false; 	/// indicates that seek is supported
+	var $sql; 				/// sql text
+	var $EOF = false;		/// Indicates that the current record position is after the last record in a Recordset object. 
+	
+	var $emptyTimeStamp = ' '; /// what to display when $time==0
+	var $emptyDate = ' '; /// what to display when $time==0
+	var $debug = false;
+	var $timeCreated=0; 	/// datetime in Unix format rs created -- for cached recordsets
+
+	var $bind = false; 		/// used by Fields() to hold array - should be private?
+	var $fetchMode;			/// default fetch mode
+	var $connection = false; /// the parent connection
+	/*
+	 *	private variables	
+	 */
+	var $_numOfRows = -1;	/** number of rows, or -1 */
+	var $_numOfFields = -1;	/** number of fields in recordset */
+	var $_queryID = -1;		/** This variable keeps the result link identifier.	*/
+	var $_currentRow = -1;	/** This variable keeps the current row in the Recordset.	*/
+	var $_closed = false; 	/** has recordset been closed */
+	var $_inited = false; 	/** Init() should only be called once */
+	var $_obj; 				/** Used by FetchObj */
+	var $_names;			/** Used by FetchObj */
+	
+	var $_currentPage = -1;	/** Added by Ivn Oliva to implement recordset pagination */
+	var $_atFirstPage = false;	/** Added by Ivn Oliva to implement recordset pagination */
+	var $_atLastPage = false;	/** Added by Ivn Oliva to implement recordset pagination */
+	var $_lastPageNo = -1; 
+	var $_maxRecordCount = 0;
+	var $datetime = false;
+	
+	/**
+	 * Constructor
+	 *
+	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
+	 *
+	 */
+	function ADORecordSet($queryID) 
+	{
+		$this->_queryID = $queryID;
+	}
+	
+	function getIterator() 
+	{
+        return new ADODB_Iterator($this);
+    }
+	
+	/* this is experimental - i don't really know what to return... */
+	function __toString()
+	{
+		include_once(ADODB_DIR.'/toexport.inc.php');
+		return _adodb_export($this,',',',',false,true);
+	}
+	
+	
+	function Init()
+	{
+		if ($this->_inited) return;
+		$this->_inited = true;
+		if ($this->_queryID) @$this->_initrs();
+		else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+		}
+		if ($this->_numOfRows != 0 && $this->_numOfFields && $this->_currentRow == -1) {
+			
+			$this->_currentRow = 0;
+			if ($this->EOF = ($this->_fetch() === false)) {
+				$this->_numOfRows = 0; // _numOfRows could be -1
+			}
+		} else {
+			$this->EOF = true;
+		}
+	}
+	
+	
+	/**
+	 * Generate a SELECT tag string from a recordset, and return the string.
+	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * the text to display to the user, and 2nd col as the return value. Default
+	 * strings are compared with the FIRST column.
+	 *
+	 * @param name  		name of SELECT tag
+	 * @param [defstr]		the value to hilite. Use an array for multiple hilites for listbox.
+	 * @param [blank1stItem]	true to leave the 1st item in list empty
+	 * @param [multiple]		true for listbox, false for popup
+	 * @param [size]		#rows to show for listbox. not used by popup
+	 * @param [selectAttr]		additional attributes to defined for SELECT tag.
+	 *				useful for holding javascript onChange='...' handlers.
+	 & @param [compareFields0]	when we have 2 cols in recordset, we compare the defstr with 
+	 *				column 0 (1st col) if this is true. This is not documented.
+	 *
+	 * @return HTML
+	 *
+	 * changes by glen.davies@cce.ac.nz to support multiple hilited items
+	 */
+	function GetMenu($name,$defstr='',$blank1stItem=true,$multiple=false,
+			$size=0, $selectAttr='',$compareFields0=true)
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_getmenu($this, $name,$defstr,$blank1stItem,$multiple,
+			$size, $selectAttr,$compareFields0);
+	}
+	
+
+	
+	/**
+	 * Generate a SELECT tag string from a recordset, and return the string.
+	 * If the recordset has 2 cols, we treat the 1st col as the containing 
+	 * the text to display to the user, and 2nd col as the return value. Default
+	 * strings are compared with the SECOND column.
+	 *
+	 */
+	function GetMenu2($name,$defstr='',$blank1stItem=true,$multiple=false,$size=0, $selectAttr='')	
+	{
+		return $this->GetMenu($name,$defstr,$blank1stItem,$multiple,
+			$size, $selectAttr,false);
+	}
+	
+	/*
+		Grouped Menu
+	*/
+	function GetMenu3($name,$defstr='',$blank1stItem=true,$multiple=false,
+			$size=0, $selectAttr='')
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_getmenu_gp($this, $name,$defstr,$blank1stItem,$multiple,
+			$size, $selectAttr,false);
+	}
+
+	/**
+	 * return recordset as a 2-dimensional array.
+	 *
+	 * @param [nRows]  is the number of rows to return. -1 means every row.
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function GetArray($nRows = -1) 
+	{
+	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) {
+		$results = adodb_getall($this,$nRows);
+		return $results;
+	}
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nRows != $cnt) {
+			$results[] = $this->fields;
+			$this->MoveNext();
+			$cnt++;
+		}
+		return $results;
+	}
+	
+	function GetAll($nRows = -1)
+	{
+		$arr = $this->GetArray($nRows);
+		return $arr;
+	}
+	
+	/*
+	* Some databases allow multiple recordsets to be returned. This function
+	* will return true if there is a next recordset, or false if no more.
+	*/
+	function NextRecordSet()
+	{
+		return false;
+	}
+	
+	/**
+	 * return recordset as a 2-dimensional array. 
+	 * Helper function for ADOConnection->SelectLimit()
+	 *
+	 * @param offset	is the row to start calculations from (1-based)
+	 * @param [nrows]	is the number of rows to return
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function GetArrayLimit($nrows,$offset=-1) 
+	{	
+		if ($offset <= 0) {
+			$arr = $this->GetArray($nrows);
+			return $arr;
+		} 
+		
+		$this->Move($offset);
+		
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+	
+	
+	/**
+	 * Synonym for GetArray() for compatibility with ADO.
+	 *
+	 * @param [nRows]  is the number of rows to return. -1 means every row.
+	 *
+	 * @return an array indexed by the rows (0-based) from the recordset
+	 */
+	function GetRows($nRows = -1) 
+	{
+		$arr = $this->GetArray($nRows);
+		return $arr;
+	}
+	
+	/**
+	 * return whole recordset as a 2-dimensional associative array if there are more than 2 columns. 
+	 * The first column is treated as the key and is not included in the array. 
+	 * If there is only 2 columns, it will return a 1 dimensional array of key-value pairs unless
+	 * $force_array == true.
+	 *
+	 * @param [force_array] has only meaning if we have 2 data columns. If false, a 1 dimensional
+	 * 	array is returned, otherwise a 2 dimensional array is returned. If this sounds confusing,
+	 * 	read the source.
+	 *
+	 * @param [first2cols] means if there are more than 2 cols, ignore the remaining cols and 
+	 * instead of returning array[col0] => array(remaining cols), return array[col0] => col1
+	 *
+	 * @return an associative array indexed by the first column of the array, 
+	 * 	or false if the  data has less than 2 cols.
+	 */
+	function GetAssoc($force_array = false, $first2cols = false) 
+	{
+	global $ADODB_EXTENSION;
+	
+		$cols = $this->_numOfFields;
+		if ($cols < 2) {
+			$false = false;
+			return $false;
+		}
+		$numIndex = isset($this->fields[0]);
+		$results = array();
+		
+		if (!$first2cols && ($cols > 2 || $force_array)) {
+			if ($ADODB_EXTENSION) {
+				if ($numIndex) {
+					while (!$this->EOF) {
+						$results[trim($this->fields[0])] = array_slice($this->fields, 1);
+						adodb_movenext($this);
+					}
+				} else {
+					while (!$this->EOF) {
+					// Fix for array_slice re-numbering numeric associative keys
+						$keys = array_slice(array_keys($this->fields), 1);
+						$sliced_array = array();
+
+						foreach($keys as $key) {
+							$sliced_array[$key] = $this->fields[$key];
+						}
+						
+						$results[trim(reset($this->fields))] = $sliced_array;
+						adodb_movenext($this);
+					}
+				}
+			} else {
+				if ($numIndex) {
+					while (!$this->EOF) {
+						$results[trim($this->fields[0])] = array_slice($this->fields, 1);
+						$this->MoveNext();
+					}
+				} else {
+					while (!$this->EOF) {
+					// Fix for array_slice re-numbering numeric associative keys
+						$keys = array_slice(array_keys($this->fields), 1);
+						$sliced_array = array();
+
+						foreach($keys as $key) {
+							$sliced_array[$key] = $this->fields[$key];
+						}
+						
+						$results[trim(reset($this->fields))] = $sliced_array;
+						$this->MoveNext();
+					}
+				}
+			}
+		} else {
+			if ($ADODB_EXTENSION) {
+				// return scalar values
+				if ($numIndex) {
+					while (!$this->EOF) {
+					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
+						$results[trim(($this->fields[0]))] = $this->fields[1];
+						adodb_movenext($this);
+					}
+				} else {
+					while (!$this->EOF) {
+					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
+						$v1 = trim(reset($this->fields));
+						$v2 = ''.next($this->fields); 
+						$results[$v1] = $v2;
+						adodb_movenext($this);
+					}
+				}
+			} else {
+				if ($numIndex) {
+					while (!$this->EOF) {
+					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
+						$results[trim(($this->fields[0]))] = $this->fields[1];
+						$this->MoveNext();
+					}
+				} else {
+					while (!$this->EOF) {
+					// some bug in mssql PHP 4.02 -- doesn't handle references properly so we FORCE creating a new string
+						$v1 = trim(reset($this->fields));
+						$v2 = ''.next($this->fields); 
+						$results[$v1] = $v2;
+						$this->MoveNext();
+					}
+				}
+			}
+		}
+		
+		$ref = $results; # workaround accelerator incompat with PHP 4.4 :(
+		return $ref; 
+	}
+	
+	
+	/**
+	 *
+	 * @param v  	is the character timestamp in YYYY-MM-DD hh:mm:ss format
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a timestamp formated as user desires
+	 */
+	function UserTimeStamp($v,$fmt='Y-m-d H:i:s')
+	{
+		if (is_numeric($v) && strlen($v)<14) return adodb_date($fmt,$v);
+		$tt = $this->UnixTimeStamp($v);
+		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		if ($tt === 0) return $this->emptyTimeStamp;
+		return adodb_date($fmt,$tt);
+	}
+	
+	
+	/**
+	 * @param v  	is the character date in YYYY-MM-DD format, returned by database
+	 * @param fmt 	is the format to apply to it, using date()
+	 *
+	 * @return a date formated as user desires
+	 */
+	function UserDate($v,$fmt='Y-m-d')
+	{
+		$tt = $this->UnixDate($v);
+		// $tt == -1 if pre TIMESTAMP_FIRST_YEAR
+		if (($tt === false || $tt == -1) && $v != false) return $v;
+		else if ($tt == 0) return $this->emptyDate;
+		else if ($tt == -1) { // pre-TIMESTAMP_FIRST_YEAR
+		}
+		return adodb_date($fmt,$tt);
+	}
+	
+	
+	/**
+	 * @param $v is a date string in YYYY-MM-DD format
+	 *
+	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
+	 */
+	static function UnixDate($v)
+	{
+		return ADOConnection::UnixDate($v);
+	}
+	
+
+	/**
+	 * @param $v is a timestamp string in YYYY-MM-DD HH-NN-SS format
+	 *
+	 * @return date in unix timestamp format, or 0 if before TIMESTAMP_FIRST_YEAR, or false if invalid date format
+	 */
+	static function UnixTimeStamp($v)
+	{
+		return ADOConnection::UnixTimeStamp($v);
+	}
+	
+	
+	/**
+	* PEAR DB Compat - do not use internally
+	*/
+	function Free()
+	{
+		return $this->Close();
+	}
+	
+	
+	/**
+	* PEAR DB compat, number of rows
+	*/
+	function NumRows()
+	{
+		return $this->_numOfRows;
+	}
+	
+	
+	/**
+	* PEAR DB compat, number of cols
+	*/
+	function NumCols()
+	{
+		return $this->_numOfFields;
+	}
+	
+	/**
+	* Fetch a row, returning false if no more rows. 
+	* This is PEAR DB compat mode.
+	*
+	* @return false or array containing the current record
+	*/
+	function FetchRow()
+	{
+		if ($this->EOF) {
+			$false = false;
+			return $false;
+		}
+		$arr = $this->fields;
+		$this->_currentRow++;
+		if (!$this->_fetch()) $this->EOF = true;
+		return $arr;
+	}
+	
+	
+	/**
+	* Fetch a row, returning PEAR_Error if no more rows. 
+	* This is PEAR DB compat mode.
+	*
+	* @return DB_OK or error object
+	*/
+	function FetchInto(&$arr)
+	{
+		if ($this->EOF) return (defined('PEAR_ERROR_RETURN')) ? new PEAR_Error('EOF',-1): false;
+		$arr = $this->fields;
+		$this->MoveNext();
+		return 1; // DB_OK
+	}
+	
+	
+	/**
+	 * Move to the first row in the recordset. Many databases do NOT support this.
+	 *
+	 * @return true or false
+	 */
+	function MoveFirst() 
+	{
+		if ($this->_currentRow == 0) return true;
+		return $this->Move(0);			
+	}			
+
+	
+	/**
+	 * Move to the last row in the recordset. 
+	 *
+	 * @return true or false
+	 */
+	function MoveLast() 
+	{
+		if ($this->_numOfRows >= 0) return $this->Move($this->_numOfRows-1);
+		if ($this->EOF) return false;
+		while (!$this->EOF) {
+			$f = $this->fields;
+			$this->MoveNext();
+		}
+		$this->fields = $f;
+		$this->EOF = false;
+		return true;
+	}
+	
+	
+	/**
+	 * Move to next record in the recordset.
+	 *
+	 * @return true if there still rows available, or false if there are no more rows (EOF).
+	 */
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_fetch()) return true;
+		}
+		$this->EOF = true;
+		/* -- tested error handling when scrolling cursor -- seems useless.
+		$conn = $this->connection;
+		if ($conn && $conn->raiseErrorFn && ($errno = $conn->ErrorNo())) {
+			$fn = $conn->raiseErrorFn;
+			$fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' ('.$this->sql.')',$conn->host,$conn->database);
+		}
+		*/
+		return false;
+	}
+	
+	
+	/**
+	 * Random access to a specific row in the recordset. Some databases do not support
+	 * access to previous rows in the databases (no scrolling backwards).
+	 *
+	 * @param rowNumber is the row to move to (0-based)
+	 *
+	 * @return true if there still rows available, or false if there are no more rows (EOF).
+	 */
+	function Move($rowNumber = 0) 
+	{
+		$this->EOF = false;
+		if ($rowNumber == $this->_currentRow) return true;
+		if ($rowNumber >= $this->_numOfRows)
+	   		if ($this->_numOfRows != -1) $rowNumber = $this->_numOfRows-2;
+  				
+		if ($this->canSeek) { 
+	
+			if ($this->_seek($rowNumber)) {
+				$this->_currentRow = $rowNumber;
+				if ($this->_fetch()) {
+					return true;
+				}
+			} else {
+				$this->EOF = true;
+				return false;
+			}
+		} else {
+			if ($rowNumber < $this->_currentRow) return false;
+			global $ADODB_EXTENSION;
+			if ($ADODB_EXTENSION) {
+				while (!$this->EOF && $this->_currentRow < $rowNumber) {
+					adodb_movenext($this);
+				}
+			} else {
+			
+				while (! $this->EOF && $this->_currentRow < $rowNumber) {
+					$this->_currentRow++;
+					
+					if (!$this->_fetch()) $this->EOF = true;
+				}
+			}
+			return !($this->EOF);
+		}
+		
+		$this->fields = false;	
+		$this->EOF = true;
+		return false;
+	}
+	
+		
+	/**
+	 * Get the value of a field in the current row by column name.
+	 * Will not work if ADODB_FETCH_MODE is set to ADODB_FETCH_NUM.
+	 * 
+	 * @param colname  is the field to access
+	 *
+	 * @return the value of $colname column
+	 */
+	function Fields($colname)
+	{
+		return $this->fields[$colname];
+	}
+	
+	function GetAssocKeys($upper=true)
+	{
+		$this->bind = array();
+		for ($i=0; $i < $this->_numOfFields; $i++) {
+			$o = $this->FetchField($i);
+			if ($upper === 2) $this->bind[$o->name] = $i;
+			else $this->bind[($upper) ? strtoupper($o->name) : strtolower($o->name)] = $i;
+		}
+	}
+	
+  /**
+   * Use associative array to get fields array for databases that do not support
+   * associative arrays. Submitted by Paolo S. Asioli paolo.asioli#libero.it
+   *
+   * If you don't want uppercase cols, set $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC
+   * before you execute your SQL statement, and access $rs->fields['col'] directly.
+   *
+   * $upper  0 = lowercase, 1 = uppercase, 2 = whatever is returned by FetchField
+   */
+	function GetRowAssoc($upper=1)
+	{
+		$record = array();
+	 //	if (!$this->fields) return $record;
+		
+	   	if (!$this->bind) {
+			$this->GetAssocKeys($upper);
+		}
+		
+		foreach($this->bind as $k => $v) {
+			$record[$k] = $this->fields[$v];
+		}
+
+		return $record;
+	}
+	
+	
+	/**
+	 * Clean up recordset
+	 *
+	 * @return true or false
+	 */
+	function Close() 
+	{
+		// free connection object - this seems to globally free the object
+		// and not merely the reference, so don't do this...
+		// $this->connection = false; 
+		if (!$this->_closed) {
+			$this->_closed = true;
+			return $this->_close();		
+		} else
+			return true;
+	}
+	
+	/**
+	 * synonyms RecordCount and RowCount	
+	 *
+	 * @return the number of rows or -1 if this is not supported
+	 */
+	function RecordCount() {return $this->_numOfRows;}
+	
+	
+	/*
+	* If we are using PageExecute(), this will return the maximum possible rows
+	* that can be returned when paging a recordset.
+	*/
+	function MaxRecordCount()
+	{
+		return ($this->_maxRecordCount) ? $this->_maxRecordCount : $this->RecordCount();
+	}
+	
+	/**
+	 * synonyms RecordCount and RowCount	
+	 *
+	 * @return the number of rows or -1 if this is not supported
+	 */
+	function RowCount() {return $this->_numOfRows;} 
+	
+
+	 /**
+	 * Portable RecordCount. Pablo Roca 
+	 *
+	 * @return  the number of records from a previous SELECT. All databases support this.
+	 *
+	 * But aware possible problems in multiuser environments. For better speed the table
+	 * must be indexed by the condition. Heavy test this before deploying.
+	 */ 
+	function PO_RecordCount($table="", $condition="") {
+		
+		$lnumrows = $this->_numOfRows;
+		// the database doesn't support native recordcount, so we do a workaround
+		if ($lnumrows == -1 && $this->connection) {
+			IF ($table) {
+				if ($condition) $condition = " WHERE " . $condition; 
+				$resultrows = $this->connection->Execute("SELECT COUNT(*) FROM $table $condition");
+				if ($resultrows) $lnumrows = reset($resultrows->fields);
+			}
+		}
+		return $lnumrows;
+	}
+	
+	
+	/**
+	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
+	 */
+	function CurrentRow() {return $this->_currentRow;}
+	
+	/**
+	 * synonym for CurrentRow -- for ADO compat
+	 *
+	 * @return the current row in the recordset. If at EOF, will return the last row. 0-based.
+	 */
+	function AbsolutePosition() {return $this->_currentRow;}
+	
+	/**
+	 * @return the number of columns in the recordset. Some databases will set this to 0
+	 * if no records are returned, others will return the number of columns in the query.
+	 */
+	function FieldCount() {return $this->_numOfFields;}   
+
+
+	/**
+	 * Get the ADOFieldObject of a specific column.
+	 *
+	 * @param fieldoffset	is the column position to access(0-based).
+	 *
+	 * @return the ADOFieldObject for that column, or false.
+	 */
+	function FetchField($fieldoffset = -1) 
+	{
+		// must be defined by child class
+		
+		$false = false;
+		return $false;
+	}	
+	
+	/**
+	 * Get the ADOFieldObjects of all columns in an array.
+	 *
+	 */
+	function FieldTypesArray()
+	{
+		$arr = array();
+		for ($i=0, $max=$this->_numOfFields; $i < $max; $i++) 
+			$arr[] = $this->FetchField($i);
+		return $arr;
+	}
+	
+	/**
+	* Return the fields array of the current row as an object for convenience.
+	* The default case is lowercase field names.
+	*
+	* @return the object with the properties set to the fields of the current row
+	*/
+	function FetchObj()
+	{
+		$o = $this->FetchObject(false);
+		return $o;
+	}
+	
+	/**
+	* Return the fields array of the current row as an object for convenience.
+	* The default case is uppercase.
+	* 
+	* @param $isupper to set the object property names to uppercase
+	*
+	* @return the object with the properties set to the fields of the current row
+	*/
+	function FetchObject($isupper=true)
+	{
+		if (empty($this->_obj)) {
+			$this->_obj = new ADOFetchObj();
+			$this->_names = array();
+			for ($i=0; $i <$this->_numOfFields; $i++) {
+				$f = $this->FetchField($i);
+				$this->_names[] = $f->name;
+			}
+		}
+		$i = 0;
+		if (PHP_VERSION >= 5) $o = clone($this->_obj);
+		else $o = $this->_obj;
+	
+		for ($i=0; $i <$this->_numOfFields; $i++) {
+			$name = $this->_names[$i];
+			if ($isupper) $n = strtoupper($name);
+			else $n = $name;
+			
+			$o->$n = $this->Fields($name);
+		}
+		return $o;
+	}
+	
+	/**
+	* Return the fields array of the current row as an object for convenience.
+	* The default is lower-case field names.
+	* 
+	* @return the object with the properties set to the fields of the current row,
+	* 	or false if EOF
+	*
+	* Fixed bug reported by tim@orotech.net
+	*/
+	function FetchNextObj()
+	{
+		$o = $this->FetchNextObject(false);
+		return $o;
+	}
+	
+	
+	/**
+	* Return the fields array of the current row as an object for convenience. 
+	* The default is upper case field names.
+	* 
+	* @param $isupper to set the object property names to uppercase
+	*
+	* @return the object with the properties set to the fields of the current row,
+	* 	or false if EOF
+	*
+	* Fixed bug reported by tim@orotech.net
+	*/
+	function FetchNextObject($isupper=true)
+	{
+		$o = false;
+		if ($this->_numOfRows != 0 && !$this->EOF) {
+			$o = $this->FetchObject($isupper);	
+			$this->_currentRow++;
+			if ($this->_fetch()) return $o;
+		}
+		$this->EOF = true;
+		return $o;
+	}
+	
+	/**
+	 * Get the metatype of the column. This is used for formatting. This is because
+	 * many databases use different names for the same type, so we transform the original
+	 * type to our standardised version which uses 1 character codes:
+	 *
+	 * @param t  is the type passed in. Normally is ADOFieldObject->type.
+	 * @param len is the maximum length of that field. This is because we treat character
+	 * 	fields bigger than a certain size as a 'B' (blob).
+	 * @param fieldobj is the field object returned by the database driver. Can hold
+	 *	additional info (eg. primary_key for mysql).
+	 * 
+	 * @return the general type of the data: 
+	 *	C for character < 250 chars
+	 *	X for teXt (>= 250 chars)
+	 *	B for Binary
+	 * 	N for numeric or floating point
+	 *	D for date
+	 *	T for timestamp
+	 * 	L for logical/Boolean
+	 *	I for integer
+	 *	R for autoincrement counter/integer
+	 * 
+	 *
+	*/
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+	// changed in 2.32 to hashing instead of switch stmt for speed...
+	static $typeMap = array(
+		'VARCHAR' => 'C',
+		'VARCHAR2' => 'C',
+		'CHAR' => 'C',
+		'C' => 'C',
+		'STRING' => 'C',
+		'NCHAR' => 'C',
+		'NVARCHAR' => 'C',
+		'VARYING' => 'C',
+		'BPCHAR' => 'C',
+		'CHARACTER' => 'C',
+		'INTERVAL' => 'C',  # Postgres
+		'MACADDR' => 'C', # postgres
+		'VAR_STRING' => 'C', # mysql
+		##
+		'LONGCHAR' => 'X',
+		'TEXT' => 'X',
+		'NTEXT' => 'X',
+		'M' => 'X',
+		'X' => 'X',
+		'CLOB' => 'X',
+		'NCLOB' => 'X',
+		'LVARCHAR' => 'X',
+		##
+		'BLOB' => 'B',
+		'IMAGE' => 'B',
+		'BINARY' => 'B',
+		'VARBINARY' => 'B',
+		'LONGBINARY' => 'B',
+		'B' => 'B',
+		##
+		'YEAR' => 'D', // mysql
+		'DATE' => 'D',
+		'D' => 'D',
+		##
+		'UNIQUEIDENTIFIER' => 'C', # MS SQL Server
+		##
+		'SMALLDATETIME' => 'T',
+		'TIME' => 'T',
+		'TIMESTAMP' => 'T',
+		'DATETIME' => 'T',
+		'TIMESTAMPTZ' => 'T',
+		'T' => 'T',
+		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
+		##
+		'BOOL' => 'L',
+		'BOOLEAN' => 'L', 
+		'BIT' => 'L',
+		'L' => 'L',
+		##
+		'COUNTER' => 'R',
+		'R' => 'R',
+		'SERIAL' => 'R', // ifx
+		'INT IDENTITY' => 'R',
+		##
+		'INT' => 'I',
+		'INT2' => 'I',
+		'INT4' => 'I',
+		'INT8' => 'I',
+		'INTEGER' => 'I',
+		'INTEGER UNSIGNED' => 'I',
+		'SHORT' => 'I',
+		'TINYINT' => 'I',
+		'SMALLINT' => 'I',
+		'I' => 'I',
+		##
+		'LONG' => 'N', // interbase is numeric, oci8 is blob
+		'BIGINT' => 'N', // this is bigger than PHP 32-bit integers
+		'DECIMAL' => 'N',
+		'DEC' => 'N',
+		'REAL' => 'N',
+		'DOUBLE' => 'N',
+		'DOUBLE PRECISION' => 'N',
+		'SMALLFLOAT' => 'N',
+		'FLOAT' => 'N',
+		'NUMBER' => 'N',
+		'NUM' => 'N',
+		'NUMERIC' => 'N',
+		'MONEY' => 'N',
+		
+		## informix 9.2
+		'SQLINT' => 'I', 
+		'SQLSERIAL' => 'I', 
+		'SQLSMINT' => 'I', 
+		'SQLSMFLOAT' => 'N', 
+		'SQLFLOAT' => 'N', 
+		'SQLMONEY' => 'N', 
+		'SQLDECIMAL' => 'N', 
+		'SQLDATE' => 'D', 
+		'SQLVCHAR' => 'C', 
+		'SQLCHAR' => 'C', 
+		'SQLDTIME' => 'T', 
+		'SQLINTERVAL' => 'N', 
+		'SQLBYTES' => 'B', 
+		'SQLTEXT' => 'X',
+		 ## informix 10
+		"SQLINT8" => 'I8',
+		"SQLSERIAL8" => 'I8',
+		"SQLNCHAR" => 'C',
+		"SQLNVCHAR" => 'C',
+		"SQLLVARCHAR" => 'X',
+		"SQLBOOL" => 'L'
+		);
+		
+		$tmap = false;
+		$t = strtoupper($t);
+		$tmap = (isset($typeMap[$t])) ? $typeMap[$t] : 'N';
+		switch ($tmap) {
+		case 'C':
+		
+			// is the char field is too long, return as text field... 
+			if ($this->blobSize >= 0) {
+				if ($len > $this->blobSize) return 'X';
+			} else if ($len > 250) {
+				return 'X';
+			}
+			return 'C';
+			
+		case 'I':
+			if (!empty($fieldobj->primary_key)) return 'R';
+			return 'I';
+		
+		case false:
+			return 'N';
+			
+		case 'B':
+			 if (isset($fieldobj->binary)) 
+				 return ($fieldobj->binary) ? 'B' : 'X';
+			return 'B';
+		
+		case 'D':
+			if (!empty($this->connection) && !empty($this->connection->datetime)) return 'T';
+			return 'D';
+			
+		default: 
+			if ($t == 'LONG' && $this->dataProvider == 'oci8') return 'B';
+			return $tmap;
+		}
+	}
+	
+	
+	function _close() {}
+	
+	/**
+	 * set/returns the current recordset page when paginating
+	 */
+	function AbsolutePage($page=-1)
+	{
+		if ($page != -1) $this->_currentPage = $page;
+		return $this->_currentPage;
+	}
+	
+	/**
+	 * set/returns the status of the atFirstPage flag when paginating
+	 */
+	function AtFirstPage($status=false)
+	{
+		if ($status != false) $this->_atFirstPage = $status;
+		return $this->_atFirstPage;
+	}
+	
+	function LastPageNo($page = false)
+	{
+		if ($page != false) $this->_lastPageNo = $page;
+		return $this->_lastPageNo;
+	}
+	
+	/**
+	 * set/returns the status of the atLastPage flag when paginating
+	 */
+	function AtLastPage($status=false)
+	{
+		if ($status != false) $this->_atLastPage = $status;
+		return $this->_atLastPage;
+	}
+	
+} // end class ADORecordSet
+	
+	//==============================================================================================	
+	// CLASS ADORecordSet_array
+	//==============================================================================================	
+	
+	/**
+	 * This class encapsulates the concept of a recordset created in memory
+	 * as an array. This is useful for the creation of cached recordsets.
+	 * 
+	 * Note that the constructor is different from the standard ADORecordSet
+	 */
+	
+	class ADORecordSet_array extends ADORecordSet
+	{
+		var $databaseType = 'array';
+
+		var $_array; 	// holds the 2-dimensional data array
+		var $_types;	// the array of types of each column (C B I L M)
+		var $_colnames;	// names of each column in array
+		var $_skiprow1;	// skip 1st row because it holds column names
+		var $_fieldobjects; // holds array of field objects
+		var $canSeek = true;
+		var $affectedrows = false;
+		var $insertid = false;
+		var $sql = '';
+		var $compat = false;
+		/**
+		 * Constructor
+		 *
+		 */
+		function ADORecordSet_array($fakeid=1)
+		{
+		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
+		
+			// fetch() on EOF does not delete $this->fields
+			$this->compat = !empty($ADODB_COMPAT_FETCH);
+			$this->ADORecordSet($fakeid); // fake queryID		
+			$this->fetchMode = $ADODB_FETCH_MODE;
+		}
+		
+		function _transpose($addfieldnames=true)
+		{
+		global $ADODB_INCLUDED_LIB;
+			
+			if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+			$hdr = true;
+			
+			$fobjs = $addfieldnames ? $this->_fieldobjects : false;
+			adodb_transpose($this->_array, $newarr, $hdr, $fobjs);
+			//adodb_pr($newarr);
+			
+			$this->_skiprow1 = false;
+			$this->_array = $newarr;
+			$this->_colnames = $hdr;
+			
+			adodb_probetypes($newarr,$this->_types);
+		
+			$this->_fieldobjects = array();
+			
+			foreach($hdr as $k => $name) {
+				$f = new ADOFieldObject();
+				$f->name = $name;
+				$f->type = $this->_types[$k];
+				$f->max_length = -1;
+				$this->_fieldobjects[] = $f;
+			}
+			$this->fields = reset($this->_array);
+			
+			$this->_initrs();
+			
+		}
+		
+		/**
+		 * Setup the array.
+		 *
+		 * @param array		is a 2-dimensional array holding the data.
+		 *			The first row should hold the column names 
+		 *			unless paramter $colnames is used.
+		 * @param typearr	holds an array of types. These are the same types 
+		 *			used in MetaTypes (C,B,L,I,N).
+		 * @param [colnames]	array of column names. If set, then the first row of
+		 *			$array should not hold the column names.
+		 */
+		function InitArray($array,$typearr,$colnames=false)
+		{
+			$this->_array = $array;
+			$this->_types = $typearr;	
+			if ($colnames) {
+				$this->_skiprow1 = false;
+				$this->_colnames = $colnames;
+			} else  {
+				$this->_skiprow1 = true;
+				$this->_colnames = $array[0];
+			}
+			$this->Init();
+		}
+		/**
+		 * Setup the Array and datatype file objects
+		 *
+		 * @param array		is a 2-dimensional array holding the data.
+		 *			The first row should hold the column names 
+		 *			unless paramter $colnames is used.
+		 * @param fieldarr	holds an array of ADOFieldObject's.
+		 */
+		function InitArrayFields(&$array,&$fieldarr)
+		{
+			$this->_array = $array;
+			$this->_skiprow1= false;
+			if ($fieldarr) {
+				$this->_fieldobjects = $fieldarr;
+			} 
+			$this->Init();
+		}
+		
+		function GetArray($nRows=-1)
+		{
+			if ($nRows == -1 && $this->_currentRow <= 0 && !$this->_skiprow1) {
+				return $this->_array;
+			} else {
+				$arr = ADORecordSet::GetArray($nRows);
+				return $arr;
+			}
+		}
+		
+		function _initrs()
+		{
+			$this->_numOfRows =  sizeof($this->_array);
+			if ($this->_skiprow1) $this->_numOfRows -= 1;
+		
+			$this->_numOfFields =(isset($this->_fieldobjects)) ?
+				 sizeof($this->_fieldobjects):sizeof($this->_types);
+		}
+		
+		/* Use associative array to get fields array */
+		function Fields($colname)
+		{
+			$mode = isset($this->adodbFetchMode) ? $this->adodbFetchMode : $this->fetchMode;
+			
+			if ($mode & ADODB_FETCH_ASSOC) {
+				if (!isset($this->fields[$colname]) && !is_null($this->fields[$colname])) $colname = strtolower($colname);
+				return $this->fields[$colname];
+			}
+			if (!$this->bind) {
+				$this->bind = array();
+				for ($i=0; $i < $this->_numOfFields; $i++) {
+					$o = $this->FetchField($i);
+					$this->bind[strtoupper($o->name)] = $i;
+				}
+			}
+			return $this->fields[$this->bind[strtoupper($colname)]];
+		}
+		
+		function FetchField($fieldOffset = -1) 
+		{
+			if (isset($this->_fieldobjects)) {
+				return $this->_fieldobjects[$fieldOffset];
+			}
+			$o =  new ADOFieldObject();
+			$o->name = $this->_colnames[$fieldOffset];
+			$o->type =  $this->_types[$fieldOffset];
+			$o->max_length = -1; // length not known
+			
+			return $o;
+		}
+			
+		function _seek($row)
+		{
+			if (sizeof($this->_array) && 0 <= $row && $row < $this->_numOfRows) {
+				$this->_currentRow = $row;
+				if ($this->_skiprow1) $row += 1;
+				$this->fields = $this->_array[$row];
+				return true;
+			}
+			return false;
+		}
+		
+		function MoveNext() 
+		{
+			if (!$this->EOF) {		
+				$this->_currentRow++;
+				
+				$pos = $this->_currentRow;
+				
+				if ($this->_numOfRows <= $pos) {
+					if (!$this->compat) $this->fields = false;
+				} else {
+					if ($this->_skiprow1) $pos += 1;
+					$this->fields = $this->_array[$pos];
+					return true;
+				}		
+				$this->EOF = true;
+			}
+			
+			return false;
+		}	
+	
+		function _fetch()
+		{
+			$pos = $this->_currentRow;
+			
+			if ($this->_numOfRows <= $pos) {
+				if (!$this->compat) $this->fields = false;
+				return false;
+			}
+			if ($this->_skiprow1) $pos += 1;
+			$this->fields = $this->_array[$pos];
+			return true;
+		}
+		
+		function _close() 
+		{
+			return true;	
+		}
+	
+	} // ADORecordSet_array
+
+	//==============================================================================================	
+	// HELPER FUNCTIONS
+	//==============================================================================================			
+	
+	/**
+	 * Synonym for ADOLoadCode. Private function. Do not use.
+	 *
+	 * @deprecated
+	 */
+	function ADOLoadDB($dbType) 
+	{ 
+		return ADOLoadCode($dbType);
+	}
+		
+	/**
+	 * Load the code for a specific database driver. Private function. Do not use.
+	 */
+	function ADOLoadCode($dbType) 
+	{
+	global $ADODB_LASTDB;
+	
+		if (!$dbType) return false;
+		$db = strtolower($dbType);
+		switch ($db) {
+			case 'ado': 
+				if (PHP_VERSION >= 5) $db = 'ado5';
+				$class = 'ado'; 
+				break;
+			case 'ifx':
+			case 'maxsql': $class = $db = 'mysqlt'; break;
+			case 'postgres':
+			case 'postgres8':
+			case 'pgsql': $class = $db = 'postgres7'; break;
+			default:
+				$class = $db; break;
+		}
+		
+		$file = ADODB_DIR."/drivers/adodb-".$db.".inc.php";
+		@include_once($file);
+		$ADODB_LASTDB = $class;
+		if (class_exists("ADODB_" . $class)) return $class;
+		
+		//ADOConnection::outp(adodb_pr(get_declared_classes(),true));
+		if (!file_exists($file)) ADOConnection::outp("Missing file: $file");
+		else ADOConnection::outp("Syntax error in file: $file");
+		return false;
+	}
+
+	/**
+	 * synonym for ADONewConnection for people like me who cannot remember the correct name
+	 */
+	function NewADOConnection($db='')
+	{
+		$tmp = ADONewConnection($db);
+		return $tmp;
+	}
+	
+	/**
+	 * Instantiate a new Connection class for a specific database driver.
+	 *
+	 * @param [db]  is the database Connection object to create. If undefined,
+	 * 	use the last database driver that was loaded by ADOLoadCode().
+	 *
+	 * @return the freshly created instance of the Connection class.
+	 */
+	function ADONewConnection($db='')
+	{
+	GLOBAL $ADODB_NEWCONNECTION, $ADODB_LASTDB;
+		
+		if (!defined('ADODB_ASSOC_CASE')) define('ADODB_ASSOC_CASE',2);
+		$errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
+		$false = false;
+		if (($at = strpos($db,'://')) !== FALSE) {
+			$origdsn = $db;
+			$fakedsn = 'fake'.substr($origdsn,$at);
+			if (($at2 = strpos($origdsn,'@/')) !== FALSE) {
+				// special handling of oracle, which might not have host
+				$fakedsn = str_replace('@/','@adodb-fakehost/',$fakedsn);
+			}
+			
+			 if ((strpos($origdsn, 'sqlite')) !== FALSE) {
+             // special handling for SQLite, it only might have the path to the database file.
+             // If you try to connect to a SQLite database using a dsn like 'sqlite:///path/to/database', the 'parse_url' php function
+             // will throw you an exception with a message such as "unable to parse url"
+                list($scheme, $path) = explode('://', $origdsn);
+                $dsna['scheme'] = $scheme;
+				if ($qmark = strpos($path,'?')) {
+					$dsn['query'] = substr($path,$qmark+1);
+					$path = substr($path,0,$qmark);
+				}
+            	$dsna['path'] = '/' . urlencode($path);
+			} else
+				$dsna = @parse_url($fakedsn);
+				
+			if (!$dsna) {
+				return $false;
+			}
+			$dsna['scheme'] = substr($origdsn,0,$at);
+			if ($at2 !== FALSE) {
+				$dsna['host'] = '';
+			}
+			
+			if (strncmp($origdsn,'pdo',3) == 0) {
+				$sch = explode('_',$dsna['scheme']);
+				if (sizeof($sch)>1) {
+				
+					$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
+					if ($sch[1] == 'sqlite')
+						$dsna['host'] = rawurlencode($sch[1].':'.rawurldecode($dsna['host']));
+					else
+						$dsna['host'] = rawurlencode($sch[1].':host='.rawurldecode($dsna['host']));
+					$dsna['scheme'] = 'pdo';
+				}
+			}
+			
+			$db = @$dsna['scheme'];
+			if (!$db) return $false;
+			$dsna['host'] = isset($dsna['host']) ? rawurldecode($dsna['host']) : '';
+			$dsna['user'] = isset($dsna['user']) ? rawurldecode($dsna['user']) : '';
+			$dsna['pass'] = isset($dsna['pass']) ? rawurldecode($dsna['pass']) : '';
+			$dsna['path'] = isset($dsna['path']) ? rawurldecode(substr($dsna['path'],1)) : ''; # strip off initial /
+			
+			if (isset($dsna['query'])) {
+				$opt1 = explode('&',$dsna['query']);
+				foreach($opt1 as $k => $v) {
+					$arr = explode('=',$v);
+					$opt[$arr[0]] = isset($arr[1]) ? rawurldecode($arr[1]) : 1;
+				}
+			} else $opt = array();
+		}
+	/*
+	 *  phptype: Database backend used in PHP (mysql, odbc etc.)
+	 *  dbsyntax: Database used with regards to SQL syntax etc.
+	 *  protocol: Communication protocol to use (tcp, unix etc.)
+	 *  hostspec: Host specification (hostname[:port])
+	 *  database: Database to use on the DBMS server
+	 *  username: User name for login
+	 *  password: Password for login
+	 */
+		if (!empty($ADODB_NEWCONNECTION)) {
+			$obj = $ADODB_NEWCONNECTION($db);
+
+		} 
+		
+		if(empty($obj)) {
+		
+			if (!isset($ADODB_LASTDB)) $ADODB_LASTDB = '';
+			if (empty($db)) $db = $ADODB_LASTDB;
+			
+			if ($db != $ADODB_LASTDB) $db = ADOLoadCode($db);
+			
+			if (!$db) {
+				if (isset($origdsn)) $db = $origdsn;
+				if ($errorfn) {
+					// raise an error
+					$ignore = false;
+					$errorfn('ADONewConnection', 'ADONewConnection', -998,
+							 "could not load the database driver for '$db'",
+							 $db,false,$ignore);
+				} else
+					 ADOConnection::outp( "
ADONewConnection: Unable to load database driver '$db'
",false);
+					
+				return $false;
+			}
+			
+			$cls = 'ADODB_'.$db;
+			if (!class_exists($cls)) {
+				adodb_backtrace();
+				return $false;
+			}
+			
+			$obj = new $cls();
+		}
+		
+		# constructor should not fail
+		if ($obj) {
+			if ($errorfn)  $obj->raiseErrorFn = $errorfn;
+			if (isset($dsna)) {
+				if (isset($dsna['port'])) $obj->port = $dsna['port'];
+				foreach($opt as $k => $v) {
+					switch(strtolower($k)) {
+					case 'new':
+										$nconnect = true; $persist = true; break;
+					case 'persist':
+					case 'persistent': 	$persist = $v; break;
+					case 'debug':		$obj->debug = (integer) $v; break;
+					#ibase
+					case 'role':		$obj->role = $v; break;
+					case 'dialect': 	$obj->dialect = (integer) $v; break;
+					case 'charset':		$obj->charset = $v; $obj->charSet=$v; break;
+					case 'buffers':		$obj->buffers = $v; break;
+					case 'fetchmode':   $obj->SetFetchMode($v); break;
+					#ado
+					case 'charpage':	$obj->charPage = $v; break;
+					#mysql, mysqli
+					case 'clientflags': $obj->clientFlags = $v; break;
+					#mysql, mysqli, postgres
+					case 'port': $obj->port = $v; break;
+					#mysqli
+					case 'socket': $obj->socket = $v; break;
+					#oci8
+					case 'nls_date_format': $obj->NLS_DATE_FORMAT = $v; break;
+					case 'cachesecs': $obj->cacheSecs = $v; break;
+					case 'memcache': 
+						$varr = explode(':',$v);
+						$vlen = sizeof($varr);
+						if ($vlen == 0) break;	
+						$obj->memCache = true;
+						$obj->memCacheHost = explode(',',$varr[0]);
+						if ($vlen == 1) break;	
+						$obj->memCachePort = $varr[1];
+						if ($vlen == 2) break;	
+						$obj->memCacheCompress = $varr[2] ?  true : false;
+						break;
+					}
+				}
+				if (empty($persist))
+					$ok = $obj->Connect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
+				else if (empty($nconnect))
+					$ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
+				else
+					$ok = $obj->NConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']);
+					
+				if (!$ok) return $false;
+			}
+		}
+		return $obj;
+	}
+	
+	
+	
+	// $perf == true means called by NewPerfMonitor(), otherwise for data dictionary
+	function _adodb_getdriver($provider,$drivername,$perf=false)
+	{
+		switch ($provider) {
+		case 'odbtp':   if (strncmp('odbtp_',$drivername,6)==0) return substr($drivername,6); 
+		case 'odbc' :   if (strncmp('odbc_',$drivername,5)==0) return substr($drivername,5); 
+		case 'ado'  :   if (strncmp('ado_',$drivername,4)==0) return substr($drivername,4);
+		case 'native':  break;
+		default:
+			return $provider;
+		}
+		
+		switch($drivername) {
+		case 'mysqlt':
+		case 'mysqli': 
+				$drivername='mysql'; 
+				break;
+		case 'postgres7':
+		case 'postgres8':
+				$drivername = 'postgres'; 
+				break;	
+		case 'firebird15': $drivername = 'firebird'; break;
+		case 'oracle': $drivername = 'oci8'; break;
+		case 'access': if ($perf) $drivername = ''; break;
+		case 'db2'   : break;
+		case 'sapdb' : break;
+		default:
+			$drivername = 'generic';
+			break;
+		}
+		return $drivername;
+	}
+	
+	function NewPerfMonitor(&$conn)
+	{
+		$false = false;
+		$drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType,true);
+		if (!$drivername || $drivername == 'generic') return $false;
+		include_once(ADODB_DIR.'/adodb-perf.inc.php');
+		@include_once(ADODB_DIR."/perf/perf-$drivername.inc.php");
+		$class = "Perf_$drivername";
+		if (!class_exists($class)) return $false;
+		$perf = new $class($conn);
+		
+		return $perf;
+	}
+	
+	function NewDataDictionary(&$conn,$drivername=false)
+	{
+		$false = false;
+		if (!$drivername) $drivername = _adodb_getdriver($conn->dataProvider,$conn->databaseType);
+
+		include_once(ADODB_DIR.'/adodb-lib.inc.php');
+		include_once(ADODB_DIR.'/adodb-datadict.inc.php');
+		$path = ADODB_DIR."/datadict/datadict-$drivername.inc.php";
+
+		if (!file_exists($path)) {
+			ADOConnection::outp("Dictionary driver '$path' not available");
+			return $false;
+		}
+		include_once($path);
+		$class = "ADODB2_$drivername";
+		$dict = new $class();
+		$dict->dataProvider = $conn->dataProvider;
+		$dict->connection = $conn;
+		$dict->upperName = strtoupper($drivername);
+		$dict->quote = $conn->nameQuote;
+		if (!empty($conn->_connectionID))
+			$dict->serverInfo = $conn->ServerInfo();
+		
+		return $dict;
+	}
+
+
+	
+	/*
+		Perform a print_r, with pre tags for better formatting.
+	*/
+	function adodb_pr($var,$as_string=false)
+	{
+		if ($as_string) ob_start();
+		
+		if (isset($_SERVER['HTTP_USER_AGENT'])) { 
+			echo " 
\n";print_r($var);echo "
\n";
+		} else
+			print_r($var);
+			
+		if ($as_string) {
+			$s = ob_get_contents();
+			ob_end_clean();
+			return $s;
+		}
+	}
+	
+	/*
+		Perform a stack-crawl and pretty print it.
+		
+		@param printOrArr  Pass in a boolean to indicate print, or an $exception->trace array (assumes that print is true then).
+		@param levels Number of levels to display
+	*/
+	function adodb_backtrace($printOrArr=true,$levels=9999,$ishtml=null)
+	{
+		global $ADODB_INCLUDED_LIB;
+		if (empty($ADODB_INCLUDED_LIB)) include(ADODB_DIR.'/adodb-lib.inc.php');
+		return _adodb_backtrace($printOrArr,$levels,0,$ishtml);
+	}
+
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/contrib/toxmlrpc.inc.php b/adodb/contrib/toxmlrpc.inc.php
new file mode 100644
index 0000000..030d60a
--- /dev/null
+++ b/adodb/contrib/toxmlrpc.inc.php
@@ -0,0 +1,183 @@
+GetArray()) would work with:
+    *       - ADODB_FETCH_BOTH
+    *       - null values
+    */
+
+    /**
+    * Include the main libraries
+    */    
+    require_once('xmlrpc.inc');
+    if (!defined('ADODB_DIR')) require_once('adodb.inc.php');
+            
+    /**
+    * Builds an xmlrpc struct value out of an AdoDB recordset
+    */
+    function rs2xmlrpcval(&$adodbrs) {
+
+        $header = rs2xmlrpcval_header($adodbrs);
+        $body = rs2xmlrpcval_body($adodbrs);
+
+        // put it all together and build final xmlrpc struct
+        $xmlrpcrs = new xmlrpcval ( array(
+                "header" => $header,
+                "body" => $body,
+                ), "struct");
+
+        return $xmlrpcrs;
+
+    }
+
+    /**
+    * Builds an xmlrpc struct value describing an AdoDB recordset
+    */
+    function rs2xmlrpcval_header($adodbrs)
+    {
+        $numfields = $adodbrs->FieldCount();
+        $numrecords = $adodbrs->RecordCount();
+
+        // build structure holding recordset information
+        $fieldstruct = array();
+        for ($i = 0; $i < $numfields; $i++) {
+            $fld = $adodbrs->FetchField($i);
+            $fieldarray = array();
+            if (isset($fld->name))
+                $fieldarray["name"] = new xmlrpcval ($fld->name);
+            if (isset($fld->type))
+                $fieldarray["type"] = new xmlrpcval ($fld->type);
+            if (isset($fld->max_length))
+                $fieldarray["max_length"] = new xmlrpcval ($fld->max_length, "int");
+            if (isset($fld->not_null))
+                $fieldarray["not_null"] = new xmlrpcval ($fld->not_null, "boolean");
+            if (isset($fld->has_default))
+                $fieldarray["has_default"] = new xmlrpcval ($fld->has_default, "boolean");
+            if (isset($fld->default_value))
+                $fieldarray["default_value"] = new xmlrpcval ($fld->default_value);
+            $fieldstruct[$i] = new xmlrpcval ($fieldarray, "struct");
+        }
+        $fieldcount = new xmlrpcval ($numfields, "int");
+        $recordcount = new xmlrpcval ($numrecords, "int");
+        $sql = new xmlrpcval ($adodbrs->sql);
+        $fieldinfo = new xmlrpcval ($fieldstruct, "array");
+
+        $header = new xmlrpcval ( array(
+                "fieldcount" => $fieldcount,
+                "recordcount" => $recordcount,
+                "sql" => $sql,
+                "fieldinfo" => $fieldinfo
+                ), "struct");
+
+        return $header;
+    }
+
+    /**
+    * Builds an xmlrpc struct value out of an AdoDB recordset
+    * (data values only, no data definition)
+    */
+    function rs2xmlrpcval_body($adodbrs)
+    {
+        $numfields = $adodbrs->FieldCount();
+
+        // build structure containing recordset data
+        $adodbrs->MoveFirst();
+        $rows = array();
+        while (!$adodbrs->EOF) {
+            $columns = array();
+            // This should work on all cases of fetch mode: assoc, num, both or default
+            if ($adodbrs->fetchMode == 'ADODB_FETCH_BOTH' || count($adodbrs->fields) == 2 * $adodbrs->FieldCount())
+                for ($i = 0; $i < $numfields; $i++)
+                    if ($adodbrs->fields[$i] === null)
+                        $columns[$i] = new xmlrpcval ('');
+                    else
+                        $columns[$i] = xmlrpc_encode ($adodbrs->fields[$i]);
+            else
+                foreach ($adodbrs->fields as $val)
+                    if ($val === null)
+                        $columns[] = new xmlrpcval ('');
+                    else
+                        $columns[] = xmlrpc_encode ($val);
+
+            $rows[] = new xmlrpcval ($columns, "array");
+
+            $adodbrs->MoveNext();
+        }
+        $body = new xmlrpcval ($rows, "array");
+
+        return $body;    
+    }
+    
+    /**
+    * Returns an xmlrpc struct value as string out of an AdoDB recordset
+    */    
+    function rs2xmlrpcstring (&$adodbrs) {
+        $xmlrpc = rs2xmlrpcval ($adodbrs);
+        if ($xmlrpc)
+          return $xmlrpc->serialize();
+        else
+          return null;
+    }
+
+    /**
+    * Given a well-formed xmlrpc struct object returns an AdoDB object
+    * 
+    * @todo add some error checking on the input value
+    */
+    function xmlrpcval2rs (&$xmlrpcval) {
+
+        $fields_array = array();
+        $data_array = array();
+ 
+        // rebuild column information  
+        $header = $xmlrpcval->structmem('header');
+        
+        $numfields = $header->structmem('fieldcount');
+        $numfields = $numfields->scalarval();
+        $numrecords = $header->structmem('recordcount');
+        $numrecords = $numrecords->scalarval();
+        $sqlstring = $header->structmem('sql');
+        $sqlstring = $sqlstring->scalarval();
+        
+        $fieldinfo = $header->structmem('fieldinfo');
+        for ($i = 0; $i < $numfields; $i++) {
+            $temp = $fieldinfo->arraymem($i);
+            $fld = new ADOFieldObject();
+            while (list($key,$value) = $temp->structeach()) {
+                if ($key == "name") $fld->name = $value->scalarval();
+                if ($key == "type") $fld->type = $value->scalarval();
+                if ($key == "max_length") $fld->max_length = $value->scalarval();
+                if ($key == "not_null") $fld->not_null = $value->scalarval();
+                if ($key == "has_default") $fld->has_default = $value->scalarval();
+                if ($key == "default_value") $fld->default_value = $value->scalarval();
+            } // while
+            $fields_array[] = $fld;
+        } // for
+
+        // fetch recordset information into php array
+        $body = $xmlrpcval->structmem('body');
+        for ($i = 0; $i < $numrecords; $i++) {
+            $data_array[$i]= array();
+            $xmlrpcrs_row = $body->arraymem($i);
+            for ($j = 0; $j < $numfields; $j++) {
+                $temp = $xmlrpcrs_row->arraymem($j);
+                $data_array[$i][$j] = $temp->scalarval();
+            } // for j
+        } // for i
+
+        // finally build in-memory recordset object and return it
+        $rs = new ADORecordSet_array();
+        $rs->InitArrayFields($data_array,$fields_array);
+        return $rs;
+
+    }
+
+?>
\ No newline at end of file
diff --git a/adodb/cute_icons_for_site/adodb.gif b/adodb/cute_icons_for_site/adodb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c5e8dfc6db2d41dfcdd1beaf338ad60bc8375587
GIT binary patch
literal 1091
zcmb7<{WIHl0DwOUc@N?x-e2-H64Owrwi9hvoYw2H%QrbkEDm9?CJ@p9h|bB8i9};DF}E-nu8&VKlPQ^+TA|VS1j3czU?Biulaoss8J!Ts
zYim>Uczu?Z+_AA$2BXQzDHnj#?_luvIsX&rtvSLD_yg*D@BI@%nkK8u<)Ibft?jup
znZYf(?&GWgZ>sABvVO@9()Sm}`b*{vZ=B*&F9lTrGZ^P;?EcTibFcm}m6R4^Fpw*e
z7=|WYq*9@qwU9d&ix$<^iR-*c4Yed6YYz`+_m&oyx@O3`uDij^3}s<~b|H`<#Qx0Zy
zM5&dzEm-tEQItP$xl*zQ1@sj=e1abg>0jztUh!k=?>ldPnd6aEsrB=JB)><;@~cOf
ziOLmMa+SkLdEXON^ReiWo-F;14%!D3i;H{ufzKD*TyTdwEY-j|EBReup8T)JXC0b_
zH23V;2{)6hD(EfTEN!{@6v=r5CRRk4cxSdx=5w#k7X7S2Y+G&phnomHi<*Sc+&S
zwsGRNkSpfK{Xm9&J@{>iBx79Id6ynmPLW(WP;|BA+V5^iO5o4B?s7d3tSbzfC`wZ)
zGMLi-J(g$a$UI2z?i2;Hqz%;<4-D;hrlVxiE*{ILz5RD-_t7Dm%{QGgd$F{q=;?aJ$*2EiPh`WLqT
B&Itej

literal 0
HcmV?d00001

diff --git a/adodb/cute_icons_for_site/adodb2.gif b/adodb/cute_icons_for_site/adodb2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f12ae2037ee14b11d8cc0f00a31ba088ef755119
GIT binary patch
literal 1458
zcma)%{Xf%r0Kh++S@STy8>OwtRIg)EqO#F-9)>lg*;Sk)BR4Xap**$p9Yd5hwrdr#
zErn4eAxDke5jyLYh{~qsQf}Su)x*`f+SPw>@7Md+_Yd#T?I9FuJO^w54*)QkOh)6o
zxw$!=&Y;me8yy`T8X6iHc&t`Wb#&ZsZPnD**DDl*a`~^7mA%qaX{DuI1qJOe4Cm#w
zq^GO6+)Igx%BZL+7E2ZuCJ7G@4+tpt^)01Rk8j*qxNaTn>Y7g?(g&2eJ=h4`zZ74d0NUjL6OZmr
z6b;p7+)4F9Xc~62A$olzyr=bg2$sD;N!8vk+JL}smrf)*O2;46tt^r5!
zxlA;_kd>7!WR}5ke4Hmsw0>RR%BRqV*=W(;mEt2v59)1z&vp(kDY
zI)#|tqaXIcAU;TUQ)p**MK{Zfv$eyor08@7`v(aapY;&}}o3R5xQ
z!&^G#x6J2q!F&mBM7Bws(1)={1u>#9;9_qXcG}S7s?Z(HcGVUQMjX)RY7m$;buyX-
z)75_!{~iL&LQehxF!b>whnCe-GhqTqY>qCLXB`1Mnrk-q1zLGv;&mzEQA}+f;Drj0
z1!IzDad#1r0PsNPajoR{gr+tu*^`lq
zBpe)`ht8-POx$(`KbM4i6=JCdxbYQz6^|?;kd0={Rs?#}-n`l-v&j?^xAo@Yi*6-Z
z;b9(<_>i;~;s4U5@jE$r;qYzZ)>JS>U36EbElaN}r=h0ih-MTxgO6pW*8TENaZJmg
zldehIui0Xa4|PgqN8w4=T4M1r<`5sdFN`{2OzpRv#2TjmrGAMPHt_?S}r$H~Aepajnz)S^9Wy(`5OI
zePfG;lP$mHOevGXyA3^KhFo0Rh8n*GShkPyh!Z!{@%TdIwhu;{y~x4P%wpL(5>HYX~Mxh5K{y@~50*Cnp
z)U$Z}2@d@>aoSi+8CBS19}jXcii4L31y*~+$j?~`eTNb+YZx$d5yQ;XXb1qm{{VnR
Bbn*ZI

literal 0
HcmV?d00001

diff --git a/adodb/datadict/datadict-access.inc.php b/adodb/datadict/datadict-access.inc.php
new file mode 100644
index 0000000..294b8ae
--- /dev/null
+++ b/adodb/datadict/datadict-access.inc.php
@@ -0,0 +1,96 @@
+debug) ADOConnection::outp("Warning: Access does not supported DEFAULT values (field $fname)");
+		}
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	function CreateDatabase($dbname,$options=false)
+	{
+		return array();
+	}
+	
+	
+	function SetSchema($schema)
+	{
+	}
+
+	function AlterColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-db2.inc.php b/adodb/datadict/datadict-db2.inc.php
new file mode 100644
index 0000000..2aec30f
--- /dev/null
+++ b/adodb/datadict/datadict-db2.inc.php
@@ -0,0 +1,144 @@
+debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
+	{
+		
+		/**
+		  Allow basic table changes to DB2 databases
+		  DB2 will fatally reject changes to non character columns 
+
+		*/
+		
+		$validTypes = array("CHAR","VARC");
+		$invalidTypes = array("BIGI","BLOB","CLOB","DATE", "DECI","DOUB", "INTE", "REAL","SMAL", "TIME");
+		// check table exists
+		$cols = $this->MetaColumns($tablename);
+		if ( empty($cols)) { 
+			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
+		}
+		
+		// already exists, alter table instead
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
+		$sql = array();
+		
+		foreach ( $lines as $id => $v ) {
+			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+				/**
+				  If the first field of $v is the fieldname, and
+				  the second is the field type/size, we assume its an
+				  attempt to modify the column size, so check that it is allowed
+				  $v can have an indeterminate number of blanks between the
+				  fields, so account for that too
+				 */
+				$vargs = explode(' ' , $v);
+				// assume that $vargs[0] is the field name.
+				$i=0;
+				// Find the next non-blank value;
+				for ($i=1;$ialterCol . ' ' . $v;
+			} else {
+				$sql[] = $alter . $this->addCol . ' ' . $v;
+			}
+		}
+		
+		return $sql;
+	}
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-firebird.inc.php b/adodb/datadict/datadict-firebird.inc.php
new file mode 100644
index 0000000..1f1d252
--- /dev/null
+++ b/adodb/datadict/datadict-firebird.inc.php
@@ -0,0 +1,152 @@
+connection) ) {
+			return $name;
+		}
+		
+		$quote = $this->connection->nameQuote;
+		
+		// if name is of the form `name`, quote it
+		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
+			return $quote . $matches[1] . $quote;
+		}
+		
+		// if name contains special characters, quote it
+		if ( !preg_match('/^[' . $this->nameRegex . ']+$/', $name) ) {
+			return $quote . $name . $quote;
+		}
+		
+		return $quote . $name . $quote;
+	}
+
+	function CreateDatabase($dbname, $options=false)
+	{
+		$options = $this->_Options($options);
+		$sql = array();
+		
+		$sql[] = "DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) RETURNS CSTRING(80) FREE_IT ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf'";
+		
+		return $sql;
+	}
+	
+	function _DropAutoIncrement($t)
+	{
+		if (strpos($t,'.') !== false) {
+			$tarr = explode('.',$t);
+			return 'DROP GENERATOR '.$tarr[0].'."gen_'.$tarr[1].'"';
+		}
+		return 'DROP GENERATOR "GEN_'.$t;
+	}
+	
+
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		$suffix = '';
+		
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fautoinc) $this->seqField = $fname;
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		
+		return $suffix;
+	}
+	
+/*
+CREATE or replace TRIGGER jaddress_insert
+before insert on jaddress
+for each row
+begin
+IF ( NEW."seqField" IS NULL OR NEW."seqField" = 0 ) THEN
+  NEW."seqField" = GEN_ID("GEN_tabname", 1);
+end;
+*/
+	function _Triggers($tabname,$tableoptions)
+	{	
+		if (!$this->seqField) return array();
+		
+		$tab1 = preg_replace( '/"/', '', $tabname );
+		if ($this->schema) {
+			$t = strpos($tab1,'.');
+			if ($t !== false) $tab = substr($tab1,$t+1);
+			else $tab = $tab1;
+			$seqField = $this->seqField;
+			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
+			$trigname = $this->schema.'.trig_'.$this->seqPrefix.$tab;
+		} else {
+			$seqField = $this->seqField;
+			$seqname = $this->seqPrefix.$tab1;
+			$trigname = 'trig_'.$seqname;
+		}
+		if (isset($tableoptions['REPLACE']))
+		{ $sql[] = "DROP GENERATOR \"$seqname\"";
+		  $sql[] = "CREATE GENERATOR \"$seqname\"";
+		  $sql[] = "ALTER TRIGGER \"$trigname\" BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
+		}
+		else
+		{ $sql[] = "CREATE GENERATOR \"$seqname\"";
+		  $sql[] = "CREATE TRIGGER \"$trigname\" FOR $tabname BEFORE INSERT OR UPDATE AS BEGIN IF ( NEW.$seqField IS NULL OR NEW.$seqField = 0 ) THEN NEW.$seqField = GEN_ID(\"$seqname\", 1); END";
+		}
+		
+		$this->seqField = false;
+		return $sql;
+	}
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-generic.inc.php b/adodb/datadict/datadict-generic.inc.php
new file mode 100644
index 0000000..b6e10ab
--- /dev/null
+++ b/adodb/datadict/datadict-generic.inc.php
@@ -0,0 +1,126 @@
+debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+/*
+//db2
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'X': return 'VARCHAR'; 
+		
+		case 'C2': return 'VARCHAR'; // up to 32K
+		case 'X2': return 'VARCHAR';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'DOUBLE';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+	
+// ifx
+function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';// 255
+		case 'X': return 'TEXT'; 
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'TEXT';
+		
+		case 'B': return 'BLOB';
+			
+		case 'D': return 'DATE';
+		case 'T': return 'DATETIME';
+		
+		case 'L': return 'SMALLINT';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INTEGER';
+		case 'I8': return 'DECIMAL(20)';
+		
+		case 'F': return 'FLOAT';
+		case 'N': return 'DECIMAL';
+		default:
+			return $meta;
+		}
+	}
+*/
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-ibase.inc.php b/adodb/datadict/datadict-ibase.inc.php
new file mode 100644
index 0000000..e86b4a5
--- /dev/null
+++ b/adodb/datadict/datadict-ibase.inc.php
@@ -0,0 +1,68 @@
+debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-informix.inc.php b/adodb/datadict/datadict-informix.inc.php
new file mode 100644
index 0000000..4ab60d3
--- /dev/null
+++ b/adodb/datadict/datadict-informix.inc.php
@@ -0,0 +1,81 @@
+debug) ADOConnection::outp("AlterColumnSQL not supported");
+		return array();
+	}
+	
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported");
+		return array();
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		if ($fautoinc) {
+			$ftype = 'SERIAL';
+			return '';
+		}
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-mssql.inc.php b/adodb/datadict/datadict-mssql.inc.php
new file mode 100644
index 0000000..b35284f
--- /dev/null
+++ b/adodb/datadict/datadict-mssql.inc.php
@@ -0,0 +1,284 @@
+type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'R':
+		case 'INT': 
+		case 'INTEGER': return  'I';
+		case 'BIT':
+		case 'TINYINT': return  'I1';
+		case 'SMALLINT': return 'I2';
+		case 'BIGINT':  return  'I8';
+		case 'SMALLDATETIME': return 'T';
+		case 'REAL':
+		case 'FLOAT': return 'F';
+		default: return parent::MetaType($t,$len,$fieldobj);
+		}
+	}
+	
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+
+		case 'C': return 'VARCHAR';
+		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
+		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+		
+		case 'B': return 'IMAGE';
+			
+		case 'D': return 'DATETIME';
+		
+		case 'TS':
+		case 'T': return 'DATETIME';
+		case 'L': return 'BIT';
+		
+		case 'R':		
+		case 'I': return 'INT'; 
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	/*
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		foreach($lines as $v) {
+			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+		}
+
+		return $sql;
+	}
+	*/
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds))
+			$flds = explode(',',$flds);
+		$f = array();
+		$s = 'ALTER TABLE ' . $tabname;
+		foreach($flds as $v) {
+			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+	*/
+	
+	/*
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+		[ WITH < index_option > [ ,...n] ] 
+		[ ON filegroup ]
+		< index_option > :: = 
+		    { PAD_INDEX | 
+		        FILLFACTOR = fillfactor | 
+		        IGNORE_DUP_KEY | 
+		        DROP_EXISTING | 
+		    STATISTICS_NORECOMPUTE | 
+		    SORT_IN_TEMPDB  
+		}
+*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		switch ($ftype) {
+		case 'INT':
+		case 'SMALLINT':
+		case 'TINYINT':
+		case 'BIGINT':
+			return $ftype;
+		}
+    	if ($ty == 'T') return $ftype;
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-mssqlnative.inc.php b/adodb/datadict/datadict-mssqlnative.inc.php
new file mode 100644
index 0000000..8e43420
--- /dev/null
+++ b/adodb/datadict/datadict-mssqlnative.inc.php
@@ -0,0 +1,282 @@
+type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'R':
+		case 'INT': 
+		case 'INTEGER': return  'I';
+		case 'BIT':
+		case 'TINYINT': return  'I1';
+		case 'SMALLINT': return 'I2';
+		case 'BIGINT':  return  'I8';
+		
+		case 'REAL':
+		case 'FLOAT': return 'F';
+		default: return parent::MetaType($t,$len,$fieldobj);
+		}
+	}
+	
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+
+		case 'C': return 'VARCHAR';
+		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
+		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+		
+		case 'B': return 'IMAGE';
+			
+		case 'D': return 'DATETIME';
+		case 'T': return 'DATETIME';
+		case 'L': return 'BIT';
+		
+		case 'R':		
+		case 'I': return 'INT'; 
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	/*
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		foreach($lines as $v) {
+			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+		}
+
+		return $sql;
+	}
+	*/
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds))
+			$flds = explode(',',$flds);
+		$f = array();
+		$s = 'ALTER TABLE ' . $tabname;
+		foreach($flds as $v) {
+			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' IDENTITY(1,1)';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+	*/
+	
+	/*
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+		[ WITH < index_option > [ ,...n] ] 
+		[ ON filegroup ]
+		< index_option > :: = 
+		    { PAD_INDEX | 
+		        FILLFACTOR = fillfactor | 
+		        IGNORE_DUP_KEY | 
+		        DROP_EXISTING | 
+		    STATISTICS_NORECOMPUTE | 
+		    SORT_IN_TEMPDB  
+		}
+*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		switch ($ftype) {
+		case 'INT':
+		case 'SMALLINT':
+		case 'TINYINT':
+		case 'BIGINT':
+			return $ftype;
+		}
+    	if ($ty == 'T') return $ftype;
+    	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    
+
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-mysql.inc.php b/adodb/datadict/datadict-mysql.inc.php
new file mode 100644
index 0000000..82b1af6
--- /dev/null
+++ b/adodb/datadict/datadict-mysql.inc.php
@@ -0,0 +1,182 @@
+type;
+			$len = $fieldobj->max_length;
+		}
+		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->auto_increment;
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'STRING': 
+		case 'CHAR':
+		case 'VARCHAR': 
+		case 'TINYBLOB': 
+		case 'TINYTEXT': 
+		case 'ENUM': 
+		case 'SET':
+			if ($len <= $this->blobSize) return 'C';
+			
+		case 'TEXT':
+		case 'LONGTEXT': 
+		case 'MEDIUMTEXT':
+			return 'X';
+			
+		// php_mysql extension always returns 'blob' even if 'text'
+		// so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+			return !empty($fieldobj->binary) ? 'B' : 'X';
+			
+		case 'YEAR':
+		case 'DATE': return 'D';
+		
+		case 'TIME':
+		case 'DATETIME':
+		case 'TIMESTAMP': return 'T';
+		
+		case 'FLOAT':
+		case 'DOUBLE':
+			return 'F';
+			
+		case 'INT': 
+		case 'INTEGER': return $is_serial ? 'R' : 'I';
+		case 'TINYINT': return $is_serial ? 'R' : 'I1';
+		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
+		case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
+		case 'BIGINT':  return $is_serial ? 'R' : 'I8';
+		default: return 'N';
+		}
+	}
+
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+		case 'C': return 'VARCHAR';
+		case 'XL':return 'LONGTEXT';
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'VARCHAR';
+		case 'X2': return 'LONGTEXT';
+		
+		case 'B': return 'LONGBLOB';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'DATETIME';
+		case 'L': return 'TINYINT';
+		
+		case 'R':
+		case 'I4':
+		case 'I': return 'INTEGER';
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'DOUBLE';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if ($funsigned) $suffix .= ' UNSIGNED';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' AUTO_INCREMENT';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
+		[table_options] [select_statement]
+		create_definition:
+		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
+		[PRIMARY KEY] [reference_definition]
+		or PRIMARY KEY (index_col_name,...)
+		or KEY [index_name] (index_col_name,...)
+		or INDEX [index_name] (index_col_name,...)
+		or UNIQUE [INDEX] [index_name] (index_col_name,...)
+		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
+		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
+		[reference_definition]
+		or CHECK (expr)
+	*/
+	
+	/*
+	CREATE [UNIQUE|FULLTEXT] INDEX index_name
+		ON tbl_name (col_name[(length)],... )
+	*/
+	
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			if ($this->alterTableAddIndex) $sql[] = "ALTER TABLE $tabname DROP INDEX $idxname";
+			else $sql[] = sprintf($this->dropIndex, $idxname, $tabname);
+
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		if (isset($idxoptions['FULLTEXT'])) {
+			$unique = ' FULLTEXT';
+		} elseif (isset($idxoptions['UNIQUE'])) {
+			$unique = ' UNIQUE';
+		} else {
+			$unique = '';
+		}
+		
+		if ( is_array($flds) ) $flds = implode(', ',$flds);
+		
+		if ($this->alterTableAddIndex) $s = "ALTER TABLE $tabname ADD $unique INDEX $idxname ";
+		else $s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname;
+		
+		$s .= ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		$sql[] = $s;
+		
+		return $sql;
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-oci8.inc.php b/adodb/datadict/datadict-oci8.inc.php
new file mode 100644
index 0000000..7f6ccc4
--- /dev/null
+++ b/adodb/datadict/datadict-oci8.inc.php
@@ -0,0 +1,297 @@
+type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+	 	case 'VARCHAR':
+	 	case 'VARCHAR2':
+		case 'CHAR':
+		case 'VARBINARY':
+		case 'BINARY':
+			if (isset($this) && $len <= $this->blobSize) return 'C';
+			return 'X';
+		
+		case 'NCHAR':
+		case 'NVARCHAR2':
+		case 'NVARCHAR':
+			if (isset($this) && $len <= $this->blobSize) return 'C2';
+			return 'X2';
+			
+		case 'NCLOB':
+		case 'CLOB':
+			return 'XL';
+		
+		case 'LONG RAW':
+		case 'LONG VARBINARY':
+		case 'BLOB':
+			return 'B';
+		
+		case 'TIMESTAMP':
+			return 'TS';
+			
+		case 'DATE': 
+			return 'T';
+		
+		case 'INT': 
+		case 'SMALLINT':
+		case 'INTEGER': 
+			return 'I';
+			
+		default:
+			return 'N';
+		}
+	}
+	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'X': return $this->typeX;
+		case 'XL': return $this->typeXL;
+		
+		case 'C2': return 'NVARCHAR2';
+		case 'X2': return 'NVARCHAR2(4000)';
+		
+		case 'B': return 'BLOB';
+		
+		case 'TS':
+				return 'TIMESTAMP';
+				
+		case 'D': 
+		case 'T': return 'DATE';
+		case 'L': return 'NUMBER(1)';
+		case 'I1': return 'NUMBER(3)';
+		case 'I2': return 'NUMBER(5)';
+		case 'I':
+		case 'I4': return 'NUMBER(10)';
+		
+		case 'I8': return 'NUMBER(20)';
+		case 'F': return 'NUMBER';
+		case 'N': return 'NUMBER';
+		case 'R': return 'NUMBER(20)';
+		default:
+			return $meta;
+		}	
+	}
+	
+	function CreateDatabase($dbname, $options=false)
+	{
+		$options = $this->_Options($options);
+		$password = isset($options['PASSWORD']) ? $options['PASSWORD'] : 'tiger';
+		$tablespace = isset($options["TABLESPACE"]) ? " DEFAULT TABLESPACE ".$options["TABLESPACE"] : '';
+		$sql[] = "CREATE USER ".$dbname." IDENTIFIED BY ".$password.$tablespace;
+		$sql[] = "GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO $dbname";
+		
+		return $sql;
+	}
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname ADD (";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		
+		$s .= implode(', ',$f).')';
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname MODIFY(";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f).')';
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);
+		
+		$sql = array();
+		$s = "ALTER TABLE $tabname DROP(";
+		$s .= implode(', ',$flds).') CASCADE CONSTRAINTS';
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function _DropAutoIncrement($t)
+	{
+		if (strpos($t,'.') !== false) {
+			$tarr = explode('.',$t);
+			return "drop sequence ".$tarr[0].".seq_".$tarr[1];
+		}
+		return "drop sequence seq_".$t;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		$suffix = '';
+		
+		if ($fdefault == "''" && $fnotnull) {// this is null in oracle
+			$fnotnull = false;
+			if ($this->debug) ADOConnection::outp("NOT NULL and DEFAULT='' illegal in Oracle");
+		}
+		
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		
+		if ($fautoinc) $this->seqField = $fname;
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		
+		return $suffix;
+	}
+	
+/*
+CREATE or replace TRIGGER jaddress_insert
+before insert on jaddress
+for each row
+begin
+select seqaddress.nextval into :new.A_ID from dual;
+end;
+*/
+	function _Triggers($tabname,$tableoptions)
+	{
+		if (!$this->seqField) return array();
+		
+		if ($this->schema) {
+			$t = strpos($tabname,'.');
+			if ($t !== false) $tab = substr($tabname,$t+1);
+			else $tab = $tabname;
+			$seqname = $this->schema.'.'.$this->seqPrefix.$tab;
+			$trigname = $this->schema.'.'.$this->trigPrefix.$this->seqPrefix.$tab;
+		} else {
+			$seqname = $this->seqPrefix.$tabname;
+			$trigname = $this->trigPrefix.$seqname;
+		}
+		
+		if (strlen($seqname) > 30) {
+			$seqname = $this->seqPrefix.uniqid('');
+		} // end if
+		if (strlen($trigname) > 30) {
+			$trigname = $this->trigPrefix.uniqid('');
+		} // end if
+
+		if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
+		$seqCache = '';
+		if (isset($tableoptions['SEQUENCE_CACHE'])){$seqCache = $tableoptions['SEQUENCE_CACHE'];}
+		$seqIncr = '';
+		if (isset($tableoptions['SEQUENCE_INCREMENT'])){$seqIncr = ' INCREMENT BY '.$tableoptions['SEQUENCE_INCREMENT'];}
+		$seqStart = '';
+		if (isset($tableoptions['SEQUENCE_START'])){$seqIncr = ' START WITH '.$tableoptions['SEQUENCE_START'];}
+		$sql[] = "CREATE SEQUENCE $seqname $seqStart $seqIncr $seqCache";
+		$sql[] = "CREATE OR REPLACE TRIGGER $trigname BEFORE insert ON $tabname FOR EACH ROW WHEN (NEW.$this->seqField IS NULL OR NEW.$this->seqField = 0) BEGIN select $seqname.nextval into :new.$this->seqField from dual; END;";
+		
+		$this->seqField = false;
+		return $sql;
+	}
+	
+	/*
+	CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)]
+		[table_options] [select_statement]
+		create_definition:
+		col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
+		[PRIMARY KEY] [reference_definition]
+		or PRIMARY KEY (index_col_name,...)
+		or KEY [index_name] (index_col_name,...)
+		or INDEX [index_name] (index_col_name,...)
+		or UNIQUE [INDEX] [index_name] (index_col_name,...)
+		or FULLTEXT [INDEX] [index_name] (index_col_name,...)
+		or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...)
+		[reference_definition]
+		or CHECK (expr)
+	*/
+	
+
+	
+	function _IndexSQL($idxname, $tabname, $flds,$idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		if (isset($idxoptions['BITMAP'])) {
+			$unique = ' BITMAP'; 
+		} elseif (isset($idxoptions['UNIQUE'])) {
+			$unique = ' UNIQUE';
+		} else {
+			$unique = '';
+		}
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if (isset($idxoptions['oci8']))
+			$s .= $idxoptions['oci8'];
+		
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function GetCommentSQL($table,$col)
+	{
+		$table = $this->connection->qstr($table);
+		$col = $this->connection->qstr($col);	
+		return "select comments from USER_COL_COMMENTS where TABLE_NAME=$table and COLUMN_NAME=$col";
+	}
+	
+	function SetCommentSQL($table,$col,$cmt)
+	{
+		$cmt = $this->connection->qstr($cmt);
+		return  "COMMENT ON COLUMN $table.$col IS $cmt";
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-postgres.inc.php b/adodb/datadict/datadict-postgres.inc.php
new file mode 100644
index 0000000..dfeb98c
--- /dev/null
+++ b/adodb/datadict/datadict-postgres.inc.php
@@ -0,0 +1,448 @@
+type;
+			$len = $fieldobj->max_length;
+		}
+		$is_serial = is_object($fieldobj) && $fieldobj->primary_key && $fieldobj->unique && 
+			$fieldobj->has_default && substr($fieldobj->default_value,0,8) == 'nextval(';
+		
+		switch (strtoupper($t)) {
+			case 'INTERVAL':
+			case 'CHAR':
+			case 'CHARACTER':
+			case 'VARCHAR':
+			case 'NAME':
+	   		case 'BPCHAR':
+				if ($len <= $this->blobSize) return 'C';
+			
+			case 'TEXT':
+				return 'X';
+	
+			case 'IMAGE': // user defined type
+			case 'BLOB': // user defined type
+			case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
+			case 'VARBIT':
+			case 'BYTEA':
+				return 'B';
+			
+			case 'BOOL':
+			case 'BOOLEAN':
+				return 'L';
+			
+			case 'DATE':
+				return 'D';
+			
+			case 'TIME':
+			case 'DATETIME':
+			case 'TIMESTAMP':
+			case 'TIMESTAMPTZ':
+				return 'T';
+			
+			case 'INTEGER': return !$is_serial ? 'I' : 'R';
+			case 'SMALLINT': 
+			case 'INT2': return !$is_serial ? 'I2' : 'R';
+			case 'INT4': return !$is_serial ? 'I4' : 'R';
+			case 'BIGINT': 
+			case 'INT8': return !$is_serial ? 'I8' : 'R';
+				
+			case 'OID':
+			case 'SERIAL':
+				return 'R';
+			
+			case 'FLOAT4':
+			case 'FLOAT8':
+			case 'DOUBLE PRECISION':
+			case 'REAL':
+				return 'F';
+				
+			 default:
+			 	return 'N';
+		}
+	}
+ 	
+ 	function ActualType($meta)
+	{
+		switch($meta) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'VARCHAR';
+		case 'X2': return 'TEXT';
+		
+		case 'B': return 'BYTEA';
+			
+		case 'D': return 'DATE';
+		case 'TS':
+		case 'T': return 'TIMESTAMP';
+		
+		case 'L': return 'BOOLEAN';
+		case 'I': return 'INTEGER';
+		case 'I1': return 'SMALLINT';
+		case 'I2': return 'INT2';
+		case 'I4': return 'INT4';
+		case 'I8': return 'INT8';
+		
+		case 'F': return 'FLOAT8';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	/**
+	 * Adding a new Column 
+	 *
+	 * reimplementation of the default function as postgres does NOT allow to set the default in the same statement
+	 *
+	 * @param string $tabname table-name
+	 * @param string $flds column-names and types for the changed columns
+	 * @return array with SQL strings
+	 */
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
+		foreach($lines as $v) {
+			if (($not_null = preg_match('/NOT NULL/i',$v))) {
+				$v = preg_replace('/NOT NULL/i','',$v);
+			}
+			if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
+				list(,$colname,$default) = $matches;
+				$sql[] = $alter . str_replace('DEFAULT '.$default,'',$v);
+				$sql[] = 'UPDATE '.$tabname.' SET '.$colname.'='.$default;
+				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
+			} else {				
+				$sql[] = $alter . $v;
+			}
+			if ($not_null) {
+				list($colname) = explode(' ',$v);
+				$sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
+			}
+		}
+		return $sql;
+	}
+
+
+	function DropIndexSQL ($idxname, $tabname = NULL)
+	{
+	   return array(sprintf($this->dropIndex, $this->TableName($idxname), $this->TableName($tabname)));
+	}
+	
+	/**
+	 * Change the definition of one column
+	 *
+	 * Postgres can't do that on it's own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	 /*
+	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		if (!$tableflds) {
+			if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+			return array();
+		}
+		return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+	}*/
+	
+	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+	   // Check if alter single column datatype available - works with 8.0+
+	   $has_alter_column = 8.0 <= (float) @$this->serverInfo['version'];
+	
+	   if ($has_alter_column) {
+	      $tabname = $this->TableName($tabname);
+	      $sql = array();
+	      list($lines,$pkey) = $this->_GenFields($flds);
+	      $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+	      foreach($lines as $v) {
+	         if ($not_null = preg_match('/NOT NULL/i',$v)) {
+	            $v = preg_replace('/NOT NULL/i','',$v);
+	         }
+	         // this next block doesn't work - there is no way that I can see to 
+	         // explicitly ask a column to be null using $flds
+	         else if ($set_null = preg_match('/NULL/i',$v)) {
+	            // if they didn't specify not null, see if they explicitely asked for null
+	            $v = preg_replace('/\sNULL/i','',$v);
+	         }
+	         
+	         if (preg_match('/^([^ ]+) .*DEFAULT ([^ ]+)/',$v,$matches)) {
+	            list(,$colname,$default) = $matches;
+	            $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v);
+	            $sql[] = $alter . $colname . ' TYPE ' . str_replace('DEFAULT '.$default,'',$v);
+	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET DEFAULT ' . $default;
+	         } 
+	         else {
+	            // drop default?
+	            preg_match ('/^\s*(\S+)\s+(.*)$/',$v,$matches);
+	            list (,$colname,$rest) = $matches;
+	            $sql[] = $alter . $colname . ' TYPE ' . $rest;
+	         }
+	
+	         list($colname) = explode(' ',$v);
+	         if ($not_null) {
+	            // this does not error out if the column is already not null
+	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' SET NOT NULL';
+	         }
+	         if ($set_null) {
+	            // this does not error out if the column is already null
+	            $sql[] = 'ALTER TABLE '.$tabname.' ALTER COLUMN '.$colname.' DROP NOT NULL';
+	         }
+	      }
+	      return $sql;
+	   }
+	
+	   // does not have alter column
+	   if (!$tableflds) {
+	      if ($this->debug) ADOConnection::outp("AlterColumnSQL needs a complete table-definiton for PostgreSQL");
+	      return array();
+	   }
+	   return $this->_recreate_copy_table($tabname,False,$tableflds,$tableoptions);
+	}
+	
+	/**
+	 * Drop one column
+	 *
+	 * Postgres < 7.3 can't do that on it's own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/ $tableoptions options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$has_drop_column = 7.3 <= (float) @$this->serverInfo['version'];
+		if (!$has_drop_column && !$tableflds) {
+			if ($this->debug) ADOConnection::outp("DropColumnSQL needs complete table-definiton for PostgreSQL < 7.3");
+		return array();
+	}
+		if ($has_drop_column) {
+			return ADODB_DataDict::DropColumnSQL($tabname, $flds);
+		}
+		return $this->_recreate_copy_table($tabname,$flds,$tableflds,$tableoptions);
+	}
+	
+	/**
+	 * Save the content into a temp. table, drop and recreate the original table and copy the content back in
+	 *
+	 * We also take care to set the values of the sequenz and recreate the indexes.
+	 * All this is done in a transaction, to not loose the content of the table, if something went wrong!
+	 * @internal
+	 * @param string $tabname table-name
+	 * @param string $dropflds column-names to drop
+	 * @param string $tableflds complete defintion of the new table, eg. for postgres
+	 * @param array/string $tableoptions options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function _recreate_copy_table($tabname,$dropflds,$tableflds,$tableoptions='')
+	{
+		if ($dropflds && !is_array($dropflds)) $dropflds = explode(',',$dropflds);
+		$copyflds = array();
+		foreach($this->MetaColumns($tabname) as $fld) {
+			if (!$dropflds || !in_array($fld->name,$dropflds)) {
+				// we need to explicit convert varchar to a number to be able to do an AlterColumn of a char column to a nummeric one
+				if (preg_match('/'.$fld->name.' (I|I2|I4|I8|N|F)/i',$tableflds,$matches) && 
+					in_array($fld->type,array('varchar','char','text','bytea'))) {
+					$copyflds[] = "to_number($fld->name,'S9999999999999D99')";
+				} else {
+					$copyflds[] = $fld->name;
+				}
+				// identify the sequence name and the fld its on
+				if ($fld->primary_key && $fld->has_default && 
+					preg_match("/nextval\('([^']+)'::text\)/",$fld->default_value,$matches)) {
+					$seq_name = $matches[1];
+					$seq_fld = $fld->name;
+				}
+			}
+		}
+		$copyflds = implode(', ',$copyflds);
+		
+		$tempname = $tabname.'_tmp';
+		$aSql[] = 'BEGIN';		// we use a transaction, to make sure not to loose the content of the table
+		$aSql[] = "SELECT * INTO TEMPORARY TABLE $tempname FROM $tabname";
+		$aSql = array_merge($aSql,$this->DropTableSQL($tabname));
+		$aSql = array_merge($aSql,$this->CreateTableSQL($tabname,$tableflds,$tableoptions));
+		$aSql[] = "INSERT INTO $tabname SELECT $copyflds FROM $tempname";
+		if ($seq_name && $seq_fld) {	// if we have a sequence we need to set it again
+			$seq_name = $tabname.'_'.$seq_fld.'_seq';	// has to be the name of the new implicit sequence
+			$aSql[] = "SELECT setval('$seq_name',MAX($seq_fld)) FROM $tabname";
+		}
+		$aSql[] = "DROP TABLE $tempname";
+		// recreate the indexes, if they not contain one of the droped columns
+		foreach($this->MetaIndexes($tabname) as $idx_name => $idx_data)
+		{
+			if (substr($idx_name,-5) != '_pkey' && (!$dropflds || !count(array_intersect($dropflds,$idx_data['columns'])))) {
+				$aSql = array_merge($aSql,$this->CreateIndexSQL($idx_name,$tabname,$idx_data['columns'],
+					$idx_data['unique'] ? array('UNIQUE') : False));
+			}
+		}
+		$aSql[] = 'COMMIT';
+		return $aSql;
+	}
+	
+	function DropTableSQL($tabname)
+	{
+		$sql = ADODB_DataDict::DropTableSQL($tabname);
+		
+		$drop_seq = $this->_DropAutoIncrement($tabname);
+		if ($drop_seq) $sql[] = $drop_seq;
+		
+		return $sql;
+	}
+
+	// return string must begin with space
+	function _CreateSuffix($fname, &$ftype, $fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{
+		if ($fautoinc) {
+			$ftype = 'SERIAL';
+			return '';
+		}
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	// search for a sequece for the given table (asumes the seqence-name contains the table-name!)
+	// if yes return sql to drop it
+	// this is still necessary if postgres < 7.3 or the SERIAL was created on an earlier version!!!
+	function _DropAutoIncrement($tabname)
+	{
+		$tabname = $this->connection->quote('%'.$tabname.'%');
+
+		$seq = $this->connection->GetOne("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE $tabname AND relkind='S'");
+
+		// check if a tables depends on the sequenz and it therefor cant and dont need to be droped separatly
+		if (!$seq || $this->connection->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'")) {
+			return False;
+		}
+		return "DROP SEQUENCE ".$seq;
+	}
+	
+	function RenameTableSQL($tabname,$newname)
+	{
+		if (!empty($this->schema)) {
+			$rename_from = $this->TableName($tabname);
+			$schema_save = $this->schema;
+			$this->schema = false;
+			$rename_to = $this->TableName($newname);
+			$this->schema = $schema_save;
+			return array (sprintf($this->renameTable, $rename_from, $rename_to));
+		}
+
+		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
+	}
+	
+	/*
+	CREATE [ [ LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (
+	{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [, ... ] ]
+	| table_constraint } [, ... ]
+	)
+	[ INHERITS ( parent_table [, ... ] ) ]
+	[ WITH OIDS | WITHOUT OIDS ]
+	where column_constraint is:
+	[ CONSTRAINT constraint_name ]
+	{ NOT NULL | NULL | UNIQUE | PRIMARY KEY |
+	CHECK (expression) |
+	REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL ]
+	[ ON DELETE action ] [ ON UPDATE action ] }
+	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+	and table_constraint is:
+	[ CONSTRAINT constraint_name ]
+	{ UNIQUE ( column_name [, ... ] ) |
+	PRIMARY KEY ( column_name [, ... ] ) |
+	CHECK ( expression ) |
+	FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]
+	[ MATCH FULL | MATCH PARTIAL ] [ ON DELETE action ] [ ON UPDATE action ] }
+	[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+	*/
+	
+	
+	/*
+	CREATE [ UNIQUE ] INDEX index_name ON table
+[ USING acc_method ] ( column [ ops_name ] [, ...] )
+[ WHERE predicate ]
+CREATE [ UNIQUE ] INDEX index_name ON table
+[ USING acc_method ] ( func_name( column [, ... ]) [ ops_name ] )
+[ WHERE predicate ]
+	*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
+		
+		if (isset($idxoptions['HASH']))
+			$s .= 'USING HASH ';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s .= '(' . $flds . ')';
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && $ty  != 'I' && strpos($ftype,'(') === false) {
+			$ftype .= "(".$fsize;
+			if (strlen($fprec)) $ftype .= ",".$fprec;
+			$ftype .= ')';
+		}
+		return $ftype;
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-sapdb.inc.php b/adodb/datadict/datadict-sapdb.inc.php
new file mode 100644
index 0000000..888922b
--- /dev/null
+++ b/adodb/datadict/datadict-sapdb.inc.php
@@ -0,0 +1,122 @@
+type;
+			$len = $fieldobj->max_length;
+		}
+		static $maxdb_type2adodb = array(
+			'VARCHAR'	=> 'C',
+			'CHARACTER'	=> 'C',
+			'LONG'		=> 'X',		// no way to differ between 'X' and 'B' :-(
+			'DATE'		=> 'D',
+			'TIMESTAMP'	=> 'T',
+			'BOOLEAN'	=> 'L',
+			'INTEGER'	=> 'I4',
+			'SMALLINT'	=> 'I2',
+			'FLOAT'		=> 'F',
+			'FIXED'		=> 'N',
+		);
+		$type = isset($maxdb_type2adodb[$t]) ? $maxdb_type2adodb[$t] : 'C';
+
+		// convert integer-types simulated with fixed back to integer
+		if ($t == 'FIXED' && !$fieldobj->scale && ($len == 20 || $len == 3)) {
+			$type = $len == 20 ? 'I8' : 'I1';
+		}
+		if ($fieldobj->auto_increment) $type = 'R';
+
+		return $type;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if ($funsigned) $suffix .= ' UNSIGNED';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fautoinc) $suffix .= ' DEFAULT SERIAL';
+		elseif (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		return array( 'ALTER TABLE ' . $tabname . ' ADD (' . implode(', ',$lines) . ')' );
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		return array( 'ALTER TABLE ' . $tabname . ' MODIFY (' . implode(', ',$lines) . ')' );
+	}
+
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		foreach($flds as $k => $v) {
+			$flds[$k] = $this->NameQuote($v);
+		}
+		return array( 'ALTER TABLE ' . $tabname . ' DROP (' . implode(', ',$flds) . ')' );
+	}	
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/datadict/datadict-sqlite.inc.php b/adodb/datadict/datadict-sqlite.inc.php
new file mode 100644
index 0000000..c53d977
--- /dev/null
+++ b/adodb/datadict/datadict-sqlite.inc.php
@@ -0,0 +1,89 @@
+debug) ADOConnection::outp("AlterColumnSQL not supported natively by SQLite");
+		return array();
+	}
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		if ($this->debug) ADOConnection::outp("DropColumnSQL not supported natively by SQLite");
+		return array();
+	}
+	
+	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
+	{
+		if ($this->debug) ADOConnection::outp("RenameColumnSQL not supported natively by SQLite");
+		return array();	
+	}
+	
+}
+?>
diff --git a/adodb/datadict/datadict-sybase.inc.php b/adodb/datadict/datadict-sybase.inc.php
new file mode 100644
index 0000000..fea2d98
--- /dev/null
+++ b/adodb/datadict/datadict-sybase.inc.php
@@ -0,0 +1,229 @@
+type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+
+		case 'INT': 
+		case 'INTEGER': return  'I';
+		case 'BIT':
+		case 'TINYINT': return  'I1';
+		case 'SMALLINT': return 'I2';
+		case 'BIGINT':  return  'I8';
+		
+		case 'REAL':
+		case 'FLOAT': return 'F';
+		default: return parent::MetaType($t,$len,$fieldobj);
+		}
+	}
+	
+	function ActualType($meta)
+	{
+		switch(strtoupper($meta)) {
+		case 'C': return 'VARCHAR';
+		case 'XL':
+		case 'X': return 'TEXT';
+		
+		case 'C2': return 'NVARCHAR';
+		case 'X2': return 'NTEXT';
+		
+		case 'B': return 'IMAGE';
+			
+		case 'D': return 'DATETIME';
+		case 'TS':
+		case 'T': return 'DATETIME';
+		case 'L': return 'BIT';
+		
+		case 'I': return 'INT'; 
+		case 'I1': return 'TINYINT';
+		case 'I2': return 'SMALLINT';
+		case 'I4': return 'INT';
+		case 'I8': return 'BIGINT';
+		
+		case 'F': return 'REAL';
+		case 'N': return 'NUMERIC';
+		default:
+			return $meta;
+		}
+	}
+	
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$f = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$s = "ALTER TABLE $tabname $this->addCol";
+		foreach($lines as $v) {
+			$f[] = "\n $v";
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	function AlterColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		foreach($lines as $v) {
+			$sql[] = "ALTER TABLE $tabname $this->alterCol $v";
+		}
+
+		return $sql;
+	}
+	
+	function DropColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName($tabname);
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		$f = array();
+		$s = "ALTER TABLE $tabname";
+		foreach($flds as $v) {
+			$f[] = "\n$this->dropCol ".$this->NameQuote($v);
+		}
+		$s .= implode(', ',$f);
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,&$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fautoinc) $suffix .= ' DEFAULT AUTOINCREMENT';
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		else if ($suffix == '') $suffix .= ' NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	/*
+CREATE TABLE 
+    [ database_name.[ owner ] . | owner. ] table_name 
+    ( { < column_definition > 
+        | column_name AS computed_column_expression 
+        | < table_constraint > ::= [ CONSTRAINT constraint_name ] }
+
+            | [ { PRIMARY KEY | UNIQUE } [ ,...n ] 
+    ) 
+
+[ ON { filegroup | DEFAULT } ] 
+[ TEXTIMAGE_ON { filegroup | DEFAULT } ] 
+
+< column_definition > ::= { column_name data_type } 
+    [ COLLATE < collation_name > ] 
+    [ [ DEFAULT constant_expression ] 
+        | [ IDENTITY [ ( seed , increment ) [ NOT FOR REPLICATION ] ] ]
+    ] 
+    [ ROWGUIDCOL] 
+    [ < column_constraint > ] [ ...n ] 
+
+< column_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ NULL | NOT NULL ] 
+        | [ { PRIMARY KEY | UNIQUE } 
+            [ CLUSTERED | NONCLUSTERED ] 
+            [ WITH FILLFACTOR = fillfactor ] 
+            [ON {filegroup | DEFAULT} ] ] 
+        ] 
+        | [ [ FOREIGN KEY ] 
+            REFERENCES ref_table [ ( ref_column ) ] 
+            [ ON DELETE { CASCADE | NO ACTION } ] 
+            [ ON UPDATE { CASCADE | NO ACTION } ] 
+            [ NOT FOR REPLICATION ] 
+        ] 
+        | CHECK [ NOT FOR REPLICATION ] 
+        ( logical_expression ) 
+    } 
+
+< table_constraint > ::= [ CONSTRAINT constraint_name ] 
+    { [ { PRIMARY KEY | UNIQUE } 
+        [ CLUSTERED | NONCLUSTERED ] 
+        { ( column [ ASC | DESC ] [ ,...n ] ) } 
+        [ WITH FILLFACTOR = fillfactor ] 
+        [ ON { filegroup | DEFAULT } ] 
+    ] 
+    | FOREIGN KEY 
+        [ ( column [ ,...n ] ) ] 
+        REFERENCES ref_table [ ( ref_column [ ,...n ] ) ] 
+        [ ON DELETE { CASCADE | NO ACTION } ] 
+        [ ON UPDATE { CASCADE | NO ACTION } ] 
+        [ NOT FOR REPLICATION ] 
+    | CHECK [ NOT FOR REPLICATION ] 
+        ( search_conditions ) 
+    } 
+
+
+	*/
+	
+	/*
+	CREATE [ UNIQUE ] [ CLUSTERED | NONCLUSTERED ] INDEX index_name 
+    ON { table | view } ( column [ ASC | DESC ] [ ,...n ] ) 
+		[ WITH < index_option > [ ,...n] ] 
+		[ ON filegroup ]
+		< index_option > :: = 
+		    { PAD_INDEX | 
+		        FILLFACTOR = fillfactor | 
+		        IGNORE_DUP_KEY | 
+		        DROP_EXISTING | 
+		    STATISTICS_NORECOMPUTE | 
+		    SORT_IN_TEMPDB  
+		}
+*/
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname, $tabname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+		$clustered = isset($idxoptions['CLUSTERED']) ? ' CLUSTERED' : '';
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s = 'CREATE' . $unique . $clustered . ' INDEX ' . $idxname . ' ON ' . $tabname . ' (' . $flds . ')';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+
+		$sql[] = $s;
+		
+		return $sql;
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/docs/docs-active-record.htm b/adodb/docs/docs-active-record.htm
new file mode 100644
index 0000000..88b6ee5
--- /dev/null
+++ b/adodb/docs/docs-active-record.htm
@@ -0,0 +1,1090 @@
+
+
+ADOdb Active Record
+
+
ADOdb Active Record

+
 (c) 2000-2010 John Lim (jlim#natsoft.com)

+
This software is dual licensed using BSD-Style and LGPL. This 
+  means you can use it in compiled proprietary and commercial products.

+

+
    
+
+
  1. Introduction
    2. 
+
    
+ADOdb_Active_Record is an Object Relation Mapping (ORM) implementation using PHP. In an ORM system, the tables and rows of the database are abstracted into native PHP objects. This allows the programmer to focus more on manipulating the data and less on writing SQL queries.
+
    
+This implementation differs from Zend Framework's implementation in the following ways:
+
      
+
    • Works with PHP4 and PHP5 and provides equivalent functionality in both versions of PHP.
      
+
    • ADOdb_Active_Record works when you are connected to multiple databases. Zend's only works when connected to a default database.
      
+
    • Support for $ADODB_ASSOC_CASE. The field names are upper-cased, lower-cased or left in natural case depending on this setting.
      
+
    • No field name conversion to camel-caps style, unlike Zend's implementation which will convert field names such as 'first_name' to 'firstName'.
      
+
    • NewADOConnection::GetActiveRecords() and ADOConnection::GetActiveRecordsClass() functions in adodb.inc.php.
      
+
    • Caching of table metadata so it is only queried once per table, no matter how many Active Records are created.
      
+
    • PHP5 version of ADOdb_Active_Record now supports one-to-many relationships.
      
+
    • New adodb-active-recordx.inc.php, which is an Active Record eXtended implementation that support JOINs for higher performance when loading children, and other nice features.
      
+
    • Lots of  additional functionality.
       
+
    
+
    
+ADOdb_Active_Record is designed upon the principles of the "ActiveRecord" design pattern, which was first described by Martin Fowler. The ActiveRecord pattern has been implemented in many forms across the spectrum of programming languages. ADOdb_Active_Record attempts to represent the database as closely to native PHP objects as possible.
+
    
+ADOdb_Active_Record maps a database table to a PHP class, and each instance of that class represents a table row. Relations between tables can also be defined, allowing the ADOdb_Active_Record objects to be nested.
+
    
+
+
  2. Setting the Database Connection
    3. 
+
    
+The first step to using  ADOdb_Active_Record is to set the default connection that an ADOdb_Active_Record objects will use to connect to a database. 
+
+
    +require_once('adodb/adodb-active-record.inc.php');
+
+$db = NewADOConnection('mysql://root:pwd@localhost/dbname');
+ADOdb_Active_Record::SetDatabaseAdapter($db);
+
            
+
+
  3. Table Rows as Objects
    4. 
+
    
+First, let's create a temporary table in our MySQL database that we can use for demonstrative purposes throughout the rest of this tutorial. We can do this by sending a CREATE query:
+
+
    +$db->Execute("CREATE TEMPORARY TABLE `persons` (
+                `id` int(10) unsigned NOT NULL auto_increment,
+                `name_first` varchar(100) NOT NULL default '',
+                `name_last` varchar(100) NOT NULL default '',
+                `favorite_color` varchar(100) NOT NULL default '',
+                PRIMARY KEY  (`id`)
+            ) ENGINE=MyISAM;
+           ");
+ 
       
+
    
+ADOdb_Active_Records are object representations of table rows. Each table in the database is represented by a class in PHP. To begin working with a table as a ADOdb_Active_Record, a class that extends ADOdb_Active_Record needs to be created for it.
+
+
    +class person extends ADOdb_Active_Record{}
+$person = new person();
+
       
+
+
    
+In the above example, a new ADOdb_Active_Record object $person was created to access the "persons" table. Zend_Db_DataObject takes the name of the class, pluralizes it (according to American English rules), and assumes that this is the name of the table in the database. Also note that with MySQL, table names are case-sensitive, so your class name must match the table name's case. With other databases with case-insensitive tables, your class can be capitalized differently.
+
    
+This kind of behavior is typical of ADOdb_Active_Record. It will assume as much as possible by convention rather than explicit configuration. In situations where it isn't possible to use the conventions that ADOdb_Active_Record expects, options can be overridden as we'll see later.
+
+
  4. Table Columns as Object Properties
    5. 
+
    
+When the $person object was instantiated, ADOdb_Active_Record read the table metadata from the database itself, and then exposed the table's columns (fields) as object properties.
+
    
+Our "persons" table has three fields: "name_first", "name_last", and "favorite_color". Each of these fields is now a property of the $person object. To see all these properties, use the ADOdb_Active_Record::getAttributeNames() method:
+
    +var_dump($person->getAttributeNames());
+
+/**
+ * Outputs the following:
+ * array(4) {
+ *    [0]=>
+ *    string(2) "id"
+ *    [1]=>
+ *    string(9) "name_first"
+ *    [2]=>
+ *    string(8) "name_last"
+ *    [3]=>
+ *    string(13) "favorite_color"
+ *  }
+ */
+    
       
+
    
+One big difference between ADOdb and Zend's implementation is we do not automatically convert to camelCaps style.
+
    
+
  5. Inserting and Updating a Record
    6. 
+
+An ADOdb_Active_Record object is a representation of a single table row. However, when our $person object is instantiated, it does not reference any particular row. It is a blank record that does not yet exist in the database. An ADOdb_Active_Record object is considered blank when its primary key is NULL. The primary key in our persons table is "id".
+
    
+To insert a new record into the database, change the object's properties and then call the ADOdb_Active_Record::save() method:
+
    +$person = new person();
+$person->name_first = 'Andi';
+$person->name_last  = 'Gutmans';
+$person->save();
+ 
       
+
    
+Oh, no! The above code snippet does not insert a new record into the database. Instead, outputs an error:
+
    +1048: Column 'favorite_color' cannot be null
+ 
       
+
    
+This error occurred because MySQL rejected the INSERT query that was generated by ADOdb_Active_Record. If exceptions are enabled in ADOdb and you are using PHP5, an error will be thrown. In the definition of our table, we specified all of the fields as NOT NULL; i.e., they must contain a value.
+
    
+ADOdb_Active_Records are bound by the same contraints as the database tables they represent. If the field in the database cannot be NULL, the corresponding property in the ADOdb_Active_Record also cannot be NULL. In the example above, we failed to set the property $person->favoriteColor, which caused the INSERT to be rejected by MySQL.
+
    
+To insert a new ADOdb_Active_Record in the database, populate all of ADOdb_Active_Record's properties so that they satisfy the constraints of the database table, and then call the save() method:
+
    +/**
+ * Calling the save() method will successfully INSERT
+ * this $person into the database table.
+ */
+$person = new person();
+$person->name_first     = 'Andi';
+$person->name_last      = 'Gutmans';
+$person->favorite_color = 'blue';
+$person->save();
+
    
+
    
+Once this $person has been INSERTed into the database by calling save(), the primary key can now be read as a property. Since this is the first row inserted into our temporary table, its "id" will be 1:
+
    +var_dump($person->id);
+
+/**
+ * Outputs the following:
+ * string(1)
+ */
+ 
           
+
    
+From this point on, updating it is simply a matter of changing the object's properties and calling the save() method again:
+
+
    +$person->favorite_color = 'red';
+$person->save();
+   
    
+
    
+The code snippet above will change the favorite color to red, and then UPDATE the record in the database.
+
+
+
    ADOdb Specific Functionality
    
+
  6. Setting the Table Name
    7. 
+
    The default behaviour on creating an ADOdb_Active_Record is to "pluralize" the class name and
+ use that as the table name. Often, this is not the case. For example, the person class could be reading 
+ from the "People" table. 
+
    We provide two ways to define your own table:
+
    1. Use a constructor parameter to override the default table naming behaviour.
+
    +	class person extends ADOdb_Active_Record{}
+	$person = new person('People');
+
    
+
    2. Define it in a class declaration:
+
    +	class person extends ADOdb_Active_Record
+	{
+	var $_table = 'People';
+	}
+	$person = new person();
+
    
+
+
  7. $ADODB_ASSOC_CASE
    8. 
+
    This allows you to control the case of field names and properties. For example, all field names in Oracle are upper-case by default. So you 
+can force field names to be lowercase using $ADODB_ASSOC_CASE. Legal values are as follows:
+
    + 0: lower-case
+ 1: upper-case
+ 2: native-case
+
    
+
    So to force all Oracle field names to lower-case, use
+
    +$ADODB_ASSOC_CASE = 0;
+$person = new person('People');
+$person->name = 'Lily';
+$ADODB_ASSOC_CASE = 2;
+$person2 = new person('People');
+$person2->NAME = 'Lily'; 
+
    
+
+
    Also see $ADODB_ASSOC_CASE.
+
+
  8. ADOdb_Active_Record::Save()
    9. 
+
    
+Saves a record by executing an INSERT or UPDATE SQL statement as appropriate. 
+
    Returns false on  unsuccessful INSERT, true if successsful INSERT.
+
    Returns 0 on failed UPDATE, and 1 on UPDATE if data has changed, and -1 if no data was changed, so no UPDATE statement was executed.
+
+
  9. ADOdb_Active_Record::Replace()
    10. 
+
    
+ADOdb supports replace functionality, whereby the record is inserted if it does not exists, or updated otherwise.
+
    +$rec = new ADOdb_Active_Record("product");
+$rec->name = 'John';
+$rec->tel_no = '34111145';
+$ok = $rec->replace(); // 0=failure, 1=update, 2=insert
+
    
+
+
+
  10. ADOdb_Active_Record::Load($where)
    11. 
+
    Sometimes, we want to load a single record into an Active Record. We can do so using:
+
    +$person->load("id=3");
+
+// or using bind parameters
+
+$person->load("id=?", array(3));
+
    
+
    Returns false if an error occurs.
+
+
  11. ADOdb_Active_Record::Find($whereOrderBy, $bindarr=false, $pkeyArr=false)
    12. 
+
    We want to retrieve an array of active records based on some search criteria. For example:
+
    +class person extends ADOdb_Active_Record {
+var $_table = 'people';
+}
+
+$person = new person();
+$peopleArray = $person->Find("name like ? order by age", array('Sm%'));
+
    
+
+
  12. Quoting Identifiers
    13. 
+
    You can force column names to be quoted in INSERT and UPDATE statements, typically because you are using reserved words as column names by setting
+
    +ADODB_Active_Record::$_quoteNames = true;
+
    
+
    Default is false.
+
+
  13. Error Handling and Debugging
    14. 
+
    
+In PHP5, if adodb-exceptions.inc.php is included, then errors are thrown. Otherwise errors are handled by returning a value. False by default means an error has occurred. You can get the last error message using the ErrorMsg() function. 
+
    
+To check for errors in ADOdb_Active_Record, do not poll ErrorMsg() as the last error message will always be returned, even if it occurred several operations ago. Do this instead:
+
    +# right!
+$ok = $rec->Save();
+if (!$ok) $err = $rec->ErrorMsg();
+
+# wrong :(
+$rec->Save();
+if ($rec->ErrorMsg()) echo "Wrong way to detect error";
+
    
+
    The ADOConnection::Debug property is obeyed. So
+if $db->debug is enabled, then ADOdb_Active_Record errors are also outputted to standard output and written to the browser.
+
+
  14. ADOdb_Active_Record::Set()
    15. 
+
    You can convert an array to an ADOdb_Active_Record using Set(). The array must be numerically indexed, and have all fields of the table defined in the array. The elements of the array must be in the table's natural order too.
+
    +$row = $db->GetRow("select * from tablex where id=$id");
+
+# PHP4 or PHP5 without enabling exceptions
+$obj = new ADOdb_Active_Record('Products');
+if ($obj->ErrorMsg()){
+	echo $obj->ErrorMsg();
+} else {
+	$obj->Set($row);
+}
+
+# in PHP5, with exceptions enabled:
+
+include('adodb-exceptions.inc.php');
+try {
+	$obj = new ADOdb_Active_Record('Products');
+	$obj->Set($row);
+} catch(exceptions $e) {
+	echo $e->getMessage();
+}
+
    
+
    
+
  15. Primary Keys
    16. 
+
    
+ADOdb_Active_Record does not require the table to have a primary key. You can insert records for such a table, but you will not be able to update nor delete. 
+
    Sometimes you are retrieving data from a view or table that has no primary key, but has a unique index. You can dynamically set the primary key of a table through the constructor:
+
    +	$pkeys = array('category','prodcode');
+	
+	// set primary key using constructor
+	$rec = new ADOdb_Active_Record('Products', $pkeys);
+	
+	// or define a new class
+	class Product extends ADOdb_Active_Record {
+		function __construct()
+		{
+			parent::__construct('Products', array('prodid'));
+		}
+	}
+	
+	$rec = new Product();
+
    
+
+
+
  16. Retrieval of Auto-incrementing ID
    17. 
+When creating a new record, the retrieval of the last auto-incrementing ID is not reliable for databases that do not support the Insert_ID() function call (check $connection->hasInsertID). In this case we perform a SELECT MAX($primarykey) FROM $table, which will not work reliably in a multi-user environment. You can override the ADOdb_Active_Record::LastInsertID() function in this case.
+
+
  17. Dealing with Multiple Databases
    18. 
+
    
+Sometimes we want to load data from one database and insert it into another using ActiveRecords. This can be done using the optional parameter of the ADOdb_Active_Record constructor. In the following example, we read data from db.table1 and store it in db2.table2:
+
    +$db = NewADOConnection(...);
+$db2 = NewADOConnection(...);
+
+ADOdb_Active_Record::SetDatabaseAdapter($db2);
+
+$activeRecs = $db->GetActiveRecords('table1');
+
+foreach($activeRecs as $rec) {
+	$rec2 = new ADOdb_Active_Record('table2',$db2);
+	$rec2->id = $rec->id;
+	$rec2->name = $rec->name;
+	
+	$rec2->Save();
+}
+
    
+
    
+If you have to pass in a primary key called "id" and the 2nd db connection in the constructor, you can do so too:
+
    +$rec = new ADOdb_Active_Record("table1",array("id"),$db2);
+
    
+
    You can now give a named label in SetDatabaseAdapter, allowing to determine in your class definition which database to load, using var $_dbat.
+
    +$db1 = NewADOConnection(...); // some ADOdb DB
+ADOdb_Active_Record::SetDatabaseAdapter($db1, 'mysql');
+$db2 = NewADOConnection(...); // some ADOdb DB
+ADOdb_Active_Record::SetDatabaseAdapter($db2, 'oracle');
+
+class FooRecord extends ADOdb_Active_Record
+{
+var $_dbat = 'mysql';  // uses 'mysql' connection
+...
+}
+
    
+
  18. $ADODB_ACTIVE_CACHESECS
    19. 
+
    You can cache the table metadata (field names, types, and other info such primary keys) in $ADODB_CACHE_DIR (which defaults to /tmp) by setting
+the global variable $ADODB_ACTIVE_CACHESECS to a value greater than 0. This will be the number of seconds to cache.
+ You should set this to a value of 30 seconds or greater for optimal performance.
+
+
  19. Active Record Considered Bad?
    20. 
+
    Although the Active Record concept is useful, you have to be aware of some pitfalls when using Active Record. The level of granularity of Active Record is individual records. It encourages code like the following, used to increase the price of all furniture products by 10%:
+
    + $recs = $db->GetActiveRecords("Products","category='Furniture'");
+ foreach($recs as $rec) {
+    $rec->price *= 1.1; // increase price by 10% for all Furniture products
+    $rec->save();
+ }
+
    
+Of course an UPDATE statement is superior because it's simpler and much more efficient (probably by a factor of x10 or more):
+
    +   $db->Execute("update Products set price = price * 1.1 where category='Furniture'");
+
    
+
    For performance sensitive code, using direct SQL will always be faster than using Active Records due to overhead and the fact that all fields in a row are retrieved (rather than only the subset you need) whenever an Active Record is loaded.
+
+
  20. Transactions
    21. 
+
    
+The default transaction mode in ADOdb is autocommit. So that is the default with active record too. 
+The general rules for managing transactions still apply. Active Record to the database is a set of insert/update/delete statements, and the db has no knowledge of active records.
+
    
+Smart transactions, that does an auto-rollback if an error occurs, is still the best method to multiple activities (inserts/updates/deletes) that need to be treated as a single transaction:
+
    +$conn->StartTrans();
+$parent->save();
+$child->save();
+$conn->CompleteTrans();
+
    
+
+
+
    One to Many Relations
    
+
    Since ADOdb 5.06, we support parent child relationships. This is done using the ClassBelongsTo() and ClassHasMany() functions. 
+
+
  21. ClassHasMany
    22. 
+
    To globally define a one-to-many relationship we use the static function ADODB_Active_Record::ClassHasMany($class, $relation, $foreignKey = '', $foreignClass = 'ADODB_Active_Record'). For example, we have 2 tables, persons (parent table) and children (child table)
+linked by persons.id = children.person_id. The variable $person->children is an array that holds the children. To define this relationship:
+
    +	class person extends ADOdb_Active_Record{}
+	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
+	
+	$person = new person();
+	$person->Load("id=1");
+	foreach($person->children as $c) {
+		echo " $c->name_first ";
+		$c->name_first .= ' K.';
+		$c->Save();  ## each child record must be saved individually
+	}
+
    
+
    If no data is loaded, then children is set to an empty array:
+
    +	$person2 = new person();
+	$p = $person2->children;  ## $p is an empty array()
+
    
+
    By default, data returned by HasMany() is unsorted. To define an order by clause (or define a SELECT LIMIT window), see LoadRelations() below. Another point is that all children are loaded only when the child member is accessed (in __get), and not when the Load() function of the parent object is called. This helps to conserve memory.
+
+
    To create and save new parent and child records:
+
    +
+	class person extends ADOdb_Active_Record{}
+	class children extends ADOdb_Active_Record{}
+	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
+	
+	$person = new person();
+	
+	for ($i=0; $i<10; $i++) 
+		$person->children[0] = new children('children');
+	 
+	 // modify fields of $person, then...
+	$person->save();
+	
+	foreach($person->children as $c) {
+		// modify fields of $c then...
+		$c->save();
+	}
+
    
+
    You can have multiple relationships (warning: relations are case-sensitive, 'Children' !== 'children'):
+
    +	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
+	ADODB_Active_Record::ClassHasMany('person', 'siblings','person_id');
+	$person = new person();
+	$person->Load('id=1');
+	var_dump($person->children);
+	var_dump($person->siblings);
+
    
+
    By default, the child class is ADOdb_Active_Record. Sometimes you might want the child class to be based on your own class which has additional functions. You can do so using the last parameter:
+
    +	class person extends ADOdb_Active_Record{}
+	class child extends ADOdb_Active_Record { .... some modifications here ... }
+	ADODB_Active_Record::ClassHasMany('person', 'children','person_id', 'child');
+
    
+
    Lastly some troubleshooting issues. We use the __get() method to set 
+$p->children below. So once $p->children is defined by accessing it, we don't change the child reference, as shown below:
+
    +	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
+	$p = new person();
+	$p->Load('id=1');
+	# $p->children points to person_id = 1
+	var_dump($p->children);
+	
+	$p->Load('id=2');
+	# $p->children still points to person_id = 1
+	var_dump($p->children); 
+
    
+
    The solution to the above is to unset($p->children) before $p->Load('id=2').
+
  22. TableHasMany
    23. 
+For some classes, the mapping between class name and table name (which is the pluralised version) might not match. For example, 
+the class name might be person, but the table name might be people. So we have 2 tables, people (parent table) and children (child table)
+linked by people.id = children.person_id.
+
    Then you use the following static function
+ ADODB_Active_Record::TableHasMany($table, $relation, $foreignKey = '', $foreignClass = 'ADODB_Active_Record') like this:
+
    +ADODB_Active_Record::TableHasMany('people', 'children', 'person_id')
+
    
+
  23. TableKeyHasMany
    24. 
+For some classes, the mapping between class name and table name (which is the pluralised version) might not match or the primary key is not the default id. For example, 
+the class name might be person, but the table name might be people. So we have 2 tables, people (parent table) and children (child table)
+linked by people.pid = children.person_id.
+
    Then you use the following static function
+ ADODB_Active_Record::TableKeyHasMany($table, $tablePKey, $relation, $foreignKey = '', $foreignClass = 'ADODB_Active_Record') like this:
+
    +ADODB_Active_Record::TableKeyHasMany('people', 'pid', 'children', 'person_id')
+
    
+
+
+
  24. A Complete ClassHasMany example
    25. 
+
    Here is sample usage using mysql:
+
    +	include_once('../adodb.inc.php');
+	include_once('../adodb-active-record.inc.php');
+
+	$db = NewADOConnection('mysql://root@localhost/northwind');
+	ADOdb_Active_Record::SetDatabaseAdapter($db);
+
+	$db->Execute("CREATE TEMPORARY TABLE `persons` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_color` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+			   
+	$db->Execute("CREATE TEMPORARY TABLE `children` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+					`person_id` int(10) unsigned NOT NULL,
+					`gender` varchar(10) default 'F',
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_pet` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+			   
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Jill','Lim')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
+			   
+	class person extends ADOdb_Active_Record{}
+	ADODB_Active_Record::ClassHasMany('person', 'children','person_id');	
+	
+	$person = new person();
+	
+	$person->name_first     = 'John';
+	$person->name_last      = 'Lim';
+	$person->favorite_color = 'lavender';
+	$person->save(); // this save will perform an INSERT successfully
+	
+	$person2 = new person(); # no need to define HasMany() again, adodb remembers definition
+	$person2->Load('id=1');
+	
+	$c = $person2->children;
+	if (is_array($c) && sizeof($c) == 3 && $c[0]->name_first=='Jill' && $c[1]->name_first=='Joan'
+		&& $c[2]->name_first == 'JAMIE') echo "OK Loaded HasMany<br>";
+	else {
+		echo "Error loading hasMany should have 3 array elements Jill Joan Jamie<br>";
+	}
+
    
+
+
  25. HasMany
    26. 
+
    This older method is deprecated and ClassHasMany/TableHasMany/TableKeyHasMany should be used. 
+
    The older way to define a one-to-many relationship is to use $parentobj->HasMany($relation, $foreignKey = ''). For example, we have 2 tables, persons (parent table) and children (child table)
+linked by persons.id = children.person_id. The variable $person->children is an array that holds the children. To define this relationship:
+
    +	class person extends ADOdb_Active_Record{}
+	
+	$person = new person();
+	$person->HasMany('children','person_id');
+	$person->Load("id=1");
+	foreach($person->children as $c) {
+		echo " $c->name_first ";
+		$c->name_first .= ' K.';
+		$c->Save();  ## each child record must be saved individually
+	}
+
    
+
    This HasMany() definition is global for the current script. This means that you only need to define it once. In the following example, $person2 knows about children.
+
    +	$person = new person();
+	$person->HasMany('children','person_id');
+	
+	$person2 = new person();
+	$person->Load("id=1");
+	$p = $person2->children;
+
    
+
+
+
  26. ClassBelongsTo
    27. 
+
    You can define the parent of the current object using ADODB_Active_Record::ClassBelongsTo($class, $relationName, $foreignKey, $parentPrimaryKey = 'id', $parentClass = 'ADODB_Active_Record'). In the example below,
+we have a child table kids, and a parent table person. We have a link kids.person_id = persons.id. We create a child first, then link it to the parent:
+
    +	class kid extends ADOdb_Active_Record{};
+	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id'); 
+
+	$ch = new kid(); // default tablename will be 'kids', with primary key 'id' 
+	$ch->Load('id=1');
+	$p = $ch->person;
+	if (!$p || $p->name_first != 'John') echo "Error loading belongsTo<br>";
+	else echo "OK loading BelongTo<br>";
+
    
+
    
+
    Note that relationships are case-sensitive, so ClassBelongsTo('kid','PARENT', 'parent_id') and ClassBelongsTo('kid', 'parent', 'parent_id') are not the same. 
+
    Also if no data is loaded into the child instance, then $p will return null;
+
    +	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id'); 
+	
+	$ch = new kid();
+	$p = $ch->person; # $p is null
+
    
+
    Another way to define the class of the parent (which otherwise defaults to ADODB_Active_Record) as follows:
+
    +
+	class kid extends ADOdb_Active_Record{};
+	class person extends ADOdb_Active_Record{... your modifications ... };
+	ADODB_Active_Record::ClassBelongsTo('kid','person','person_id','id', 'person'); 
+
    
+
  27. TableBelongsTo
    28. 
+
    If the child table differs from the convention that the child table name is the plural of the child class name, use this function:
+ADODB_Active_Record::TableBelongsTo($childTable, $relationName, $foreignKey, $parentPrimaryKey = 'id', $parentClass = 'ADODB_Active_Record').
+
    E.g. the class is child, but the table name is children, and the link between the two tables is children.person_id = person.id:
+
    +	ADODB_Active_Record::TableBelongsTo('children','person','person_id','id');
+
    
+
  28. TableKeyBelongsTo
    29. 
+
    If the child table differs from the convention that the child table name is the plural of the child class name or the primary key is not 'id', use this function:
+ADODB_Active_Record::TableKeyBelongsTo($childTable, $childKey, $relationName, $foreignKey, $parentPrimaryKey = 'id', $parentClass = 'ADODB_Active_Record').
+
    E.g. the class is child, but the table name is children and primary key is ch_id, and the link between the two tables is children.person_id = person.id:
+
    +	ADODB_Active_Record::TableKeyBelongsTo('children','ch_id', 'person','person_id','id');
+
    
+
  29. BelongsTo
    30. 
+
    The following is deprecated. Use ClassBelongsTo/TableBelongsTo/TableKeyBelongsTo instead.
+
    The older way to define the parent of the current object is using BelongsTo($relationName, $foreignKey, $parentPrimaryKey = 'id'). In the example below,
+we have a child table children, and a parent table person. We have a link children.person_id = persons.id. We create a child first, then link it to the parent:
+
    +	class Child extends ADOdb_Active_Record{};
+	$ch = new Child('children',array('id'));
+	$ch->BelongsTo('person','person_id','id');  ## this can be simplified to $ch->BelongsTo('person')
+	                                            ## as foreign key defaults to $table.'_id' and 
+	                                            ## parent pkey defaults to 'id' 
+	$ch->Load('id=1');
+	$p = $ch->person;
+	if (!$p || $p->name_first != 'John') echo "Error loading belongsTo<br>";
+	else echo "OK loading BelongTo<br>";
+
    
+
    You only need to define BelongsTo() once in a script as it is global for all instances. 
+
+
  30. LoadRelations
    31. 
+
    Sometimes you want to load only a subset of data in a relationship. For example, you could load all female children sorted by children.name
+using LoadRelations($relation, $whereOrderBy = '', $offset = -1, $limit = -1):
+
    +	# assume this has been called: 
+	#   ADODB_Active_Record::ClassHasMany('person', 'children','person_id');
+	$person = new person(); 
+	$person->Load('id=23');  
+	# Load doesn't load children until $person->children is accessed or LoadRelations is called:
+	$person->LoadRelations('children',"gender='F' order by name");
+
    
+
    Lastly, if you have lots of child data, you can define a window of data of records to load. In the following
+example, we load a window of 100 records at a time:
+
    +
+	# assume this has been called: 
+	#  ADODB_Active_Record::ClassHasMany('Account', 'transactions','account_id'); 
+	$acc = new Account();
+	$acc->Load('id=23');
+	
+	$start = 0;
+	while(true) {
+		$acc->LoadRelations('transactions',"tx_done=0 order by trxdate", $start, $start+100);
+		if (!$acc->transactions) break;
+		foreach ($acc->transactions as $k => $trx) {
+			## process
+			$trx->tx_done = 1;
+			$trx->save();
+		}
+		$start += 100;
+		unset($acc->transactions);
+
+
+	}
+
    
+
    The $offset is 0-based, and $limit is the number of records to retrieve. The default is to ignore $offset (-1) and $limit (-1).
+
  31. Acknowledgements
    32. 
+
    Thanks to Chris Ravenscroft for original one-to-many code (chris#voilaweb.com).
+
    ADOConnection Supplement
    
+
+
  32. ADOConnection::GetActiveRecords()
    33. 
+
    
+This allows you to retrieve an array of ADOdb_Active_Records. Returns false if an error occurs.
+
    +$table = 'products';
+$whereOrderBy = "name LIKE 'A%' ORDER BY Name";
+$activeRecArr = $db->GetActiveRecords($table, $whereOrderBy);
+foreach($activeRecArr as $rec) {
+	$rec->id = rand();
+	$rec->save();
+}
+
    
+
    
+And to retrieve all records ordered by specific fields:
+
    +$whereOrderBy = "1=1 ORDER BY Name";
+$activeRecArr = $db->GetActiveRecords($table);
+
    
+
    
+To use bind variables (assuming ? is the place-holder for your database):
+
    +$activeRecArr = $db->GetActiveRecords($tableName, 'name LIKE ?',
+						array('A%'));
+
    
+
    You can also define the primary keys of the table by passing an array of field names:
+
    +$activeRecArr = $db->GetActiveRecords($tableName, 'name LIKE ?',
+						array('A%'), array('id'));
+
    
+
+
  33. ADOConnection::GetActiveRecordsClass()
    34. 
+
    
+This allows you to retrieve an array of objects derived from ADOdb_Active_Records. Returns false if an error occurs.
+
    +class Product extends ADOdb_Active_Record{};
+$table = 'products';
+$whereOrderBy = "name LIKE 'A%' ORDER BY Name";
+$activeRecArr = $db->GetActiveRecordsClass('Product',$table, $whereOrderBy);
+
+# the objects in $activeRecArr are of class 'Product'
+foreach($activeRecArr as $rec) {
+	$rec->id = rand();
+	$rec->save();
+}
+
    
+
    
+To use bind variables (assuming ? is the place-holder for your database):
+
    +$activeRecArr = $db->GetActiveRecordsClass($className,$tableName, 'name LIKE ?',
+						array('A%'));
+
    
+
    You can also define the primary keys of the table by passing an array of field names:
+
    +$activeRecArr = $db->GetActiveRecordsClass($className,$tableName, 'name LIKE ?',
+						array('A%'), array('id'));
+
    
+
+

+
+
  • ADOConnection::ErrorMsg()
    • 
+
    Returns last error message.
+
  • ADOConnection::ErrorNo()
    • 
+
    Returns last error number.
+
+
    ActiveRecord Code Sample
    
+
    The following works with PHP4 and PHP5
+
    +include('../adodb.inc.php');
+include('../adodb-active-record.inc.php');
+
+// uncomment the following if you want to test exceptions
+#if (PHP_VERSION >= 5) include('../adodb-exceptions.inc.php');
+
+$db = NewADOConnection('mysql://root@localhost/northwind');
+$db->debug=1;
+ADOdb_Active_Record::SetDatabaseAdapter($db);
+
+$db->Execute("CREATE TEMPORARY TABLE `persons` (
+                `id` int(10) unsigned NOT NULL auto_increment,
+                `name_first` varchar(100) NOT NULL default '',
+                `name_last` varchar(100) NOT NULL default '',
+                `favorite_color` varchar(100) NOT NULL default '',
+                PRIMARY KEY  (`id`)
+            ) ENGINE=MyISAM;
+           ");
+		   
+class person extends ADOdb_Active_Record{}
+$person = new person();
+
+echo "<p>Output of getAttributeNames: ";
+var_dump($person->getAttributeNames());
+
+/**
+ * Outputs the following:
+ * array(4) {
+ *    [0]=>
+ *    string(2) "id"
+ *    [1]=>
+ *    string(9) "name_first"
+ *    [2]=>
+ *    string(8) "name_last"
+ *    [3]=>
+ *    string(13) "favorite_color"
+ *  }
+ */
+
+$person = new person();
+$person->name_first = 'Andi';
+$person->name_last  = 'Gutmans';
+$person->save(); // this save() will fail on INSERT as favorite_color is a must fill...
+
+
+$person = new person();
+$person->name_first     = 'Andi';
+$person->name_last      = 'Gutmans';
+$person->favorite_color = 'blue';
+$person->save(); // this save will perform an INSERT successfully
+
+echo "<p>The Insert ID generated:"; print_r($person->id);
+
+$person->favorite_color = 'red';
+$person->save(); // this save() will perform an UPDATE
+
+$person = new person();
+$person->name_first     = 'John';
+$person->name_last      = 'Lim';
+$person->favorite_color = 'lavender';
+$person->save(); // this save will perform an INSERT successfully
+
+// load record where id=2 into a new ADOdb_Active_Record
+$person2 = new person();
+$person2->Load('id=2');
+var_dump($person2);
+
+// retrieve an array of records
+$activeArr = $db->GetActiveRecordsClass($class = "person",$table = "persons","id=".$db->Param(0),array(2));
+$person2 = $activeArr[0];
+echo "<p>Name first (should be John): ",$person->name_first, "<br>Class = ",get_class($person2);	
+
    
+
+
+
+    
+
    Active Record eXtended
    
+
    This is the original one-to-many Active Record implementation submitted by
+Chris Ravenscroft  (chris#voilaweb.com). The reason why we are offering both versions is that the Extended version
+is more powerful but more complex. My personal preference is to keep it simpler, but your view may vary. 
+
    To use, just include adodb-active-recordx.inc.php instead of adodb-active-record.inc.php.
+
    It provides a new function called Find() that is quite intuitive to use as shown in the example below. It also supports loading all relationships using a single query (using joins).
+
    +<?php
+	function ar_assert($obj, $cond)
+	{
+		global $err_count;
+		$res = var_export($obj, true);
+		return (strpos($res, $cond));
+	}
+
+	include_once('../adodb.inc.php');
+	include_once('../adodb-active-recordx.inc.php');
+	
+
+	$db = NewADOConnection('mysql://root@localhost/northwind');
+	$db->debug=0;
+	ADOdb_Active_Record::SetDatabaseAdapter($db);
+	echo "<pre>\n";
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "Preparing database using SQL queries (creating 'people', 'children')\n";
+
+	$db->Execute("DROP TABLE `people`");
+	$db->Execute("DROP TABLE `children`");
+
+	$db->Execute("CREATE TABLE `people` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_color` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+	$db->Execute("CREATE TABLE `children` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+					`person_id` int(10) unsigned NOT NULL,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_pet` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+			   
+	
+	$db->Execute("insert into children (person_id,name_first,name_last,favorite_pet) values (1,'Jill','Lim','tortoise')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
+			   
+	// This class _implicitely_ relies on the 'people' table (pluralized form of 'person')
+	class Person extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct();
+			$this->hasMany('children');
+		}
+	}
+	// This class _implicitely_ relies on the 'children' table
+	class Child extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct();
+			$this->belongsTo('person');
+		}
+	}
+	// This class _explicitely_ relies on the 'children' table and shares its metadata with Child
+	class Kid extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct('children');
+			$this->belongsTo('person');
+		}
+	}
+	// This class _explicitely_ relies on the 'children' table but does not share its metadata
+	class Rugrat extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct('children', false, false, array('new' => true));
+		}
+	}
+	
+	echo "Inserting person in 'people' table ('John Lim, he likes lavender')\n";
+	echo "---------------------------------------------------------------------------\n";
+	$person = new Person();
+	$person->name_first     = 'John';
+	$person->name_last      = 'Lim';
+	$person->favorite_color = 'lavender';
+	$person->save(); // this save will perform an INSERT successfully
+
+	$err_count = 0;
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "person->Find('id=1') [Lazy Method]\n";
+	echo "person is loaded but its children will be loaded on-demand later on\n";
+	echo "---------------------------------------------------------------------------\n";
+	$person5 = new Person();
+	$people5 = $person5->Find('id=1');
+	echo (ar_assert($people5, "'name_first' => 'John'")) ? "[OK] Found John\n" : "[!!] Find failed\n";
+	echo (ar_assert($people5, "'favorite_pet' => 'tortoise'")) ? "[!!] Found relation when I shouldn't\n" : "[OK] No relation yet\n";
+	foreach($people5 as $person)
+	{
+		foreach($person->children as $child)
+		{
+			if($child->name_first);
+		}
+	}
+	echo (ar_assert($people5, "'favorite_pet' => 'tortoise'")) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n";
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "person->Find('id=1' ... ADODB_WORK_AR) [Worker Method]\n";
+	echo "person is loaded, and so are its children\n";
+	echo "---------------------------------------------------------------------------\n";
+	$person6 = new Person();
+	$people6 = $person6->Find('id=1', false, false, array('loading' => ADODB_WORK_AR));
+	echo (ar_assert($people6, "'name_first' => 'John'")) ? "[OK] Found John\n" : "[!!] Find failed\n";
+	echo (ar_assert($people6, "'favorite_pet' => 'tortoise'")) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n";
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "person->Find('id=1' ... ADODB_JOIN_AR) [Join Method]\n";
+	echo "person and its children are loaded using a single query\n";
+	echo "---------------------------------------------------------------------------\n";
+	$person7 = new Person();
+	// When I specifically ask for a join, I have to specify which table id I am looking up
+	// otherwise the SQL parser will wonder which table's id that would be.
+	$people7 = $person7->Find('people.id=1', false, false, array('loading' => ADODB_JOIN_AR));
+	echo (ar_assert($people7, "'name_first' => 'John'")) ? "[OK] Found John\n" : "[!!] Find failed\n";
+	echo (ar_assert($people7, "'favorite_pet' => 'tortoise'")) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n";
+	
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "person->Load('people.id=1') [Join Method]\n";
+	echo "Load() always uses the join method since it returns only one row\n";
+	echo "---------------------------------------------------------------------------\n";
+	$person2 = new Person();
+	// Under the hood, Load(), since it returns only one row, always perform a join
+	// Therefore we need to clarify which id we are talking about.
+	$person2->Load('people.id=1');
+	echo (ar_assert($person2, "'name_first' => 'John'")) ? "[OK] Found John\n" : "[!!] Find failed\n";
+	echo (ar_assert($person2, "'favorite_pet' => 'tortoise'")) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n";
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "child->Load('children.id=1') [Join Method]\n";
+	echo "We are now loading from the 'children' table, not from 'people'\n";
+	echo "---------------------------------------------------------------------------\n";
+	$ch = new Child();
+	$ch->Load('children.id=1');
+	echo (ar_assert($ch, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
+	echo (ar_assert($ch, "'favorite_color' => 'lavender'")) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n";
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "child->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
+	echo "---------------------------------------------------------------------------\n";
+	$ch2 = new Child();
+	$ach2 = $ch2->Find('id=1', false, false, array('loading' => ADODB_WORK_AR));
+	echo (ar_assert($ach2, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
+	echo (ar_assert($ach2, "'favorite_color' => 'lavender'")) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n";
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "kid->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
+	echo "Where we see that kid shares relationships with child because they are stored\n";
+	echo "in the common table's metadata structure.\n";
+	echo "---------------------------------------------------------------------------\n";
+	$ch3 = new Kid('children');
+	$ach3 = $ch3->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
+	echo (ar_assert($ach3, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
+	echo (ar_assert($ach3, "'favorite_color' => 'lavender'")) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n";
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "kid->Find('children.id=1' ... ADODB_LAZY_AR) [Lazy Method]\n";
+	echo "Of course, lazy loading also retrieve medata information...\n";
+	echo "---------------------------------------------------------------------------\n";
+	$ch32 = new Kid('children');
+	$ach32 = $ch32->Find('children.id=1', false, false, array('loading' => ADODB_LAZY_AR));
+	echo (ar_assert($ach32, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
+	echo (ar_assert($ach32, "'favorite_color' => 'lavender'")) ? "[!!] Found relation when I shouldn't\n" : "[OK] No relation yet\n";
+	foreach($ach32 as $akid)
+	{
+		if($akid->person);
+	}
+	echo (ar_assert($ach32, "'favorite_color' => 'lavender'")) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n";
+	
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
+	echo "In rugrat's constructor it is specified that\nit must forget any existing relation\n";
+	echo "---------------------------------------------------------------------------\n";
+	$ch4 = new Rugrat('children');
+	$ach4 = $ch4->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
+	echo (ar_assert($ach4, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
+	echo (ar_assert($ach4, "'favorite_color' => 'lavender'")) ? "[!!] Found relation when I shouldn't\n" : "[OK] No relation found\n";
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "kid->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
+	echo "Note how only rugrat forgot its relations - kid is fine.\n";
+	echo "---------------------------------------------------------------------------\n";
+	$ch5 = new Kid('children');
+	$ach5 = $ch5->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
+	echo (ar_assert($ach5, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
+	echo (ar_assert($ach5, "'favorite_color' => 'lavender'")) ? "[OK] I did not forget relation: person\n" : "[!!] I should not have forgotten relation: person\n";
+	
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n";
+	echo "---------------------------------------------------------------------------\n";
+	$ch6 = new Rugrat('children');
+	$ch6s = $ch6->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
+	$ach6 = $ch6s[0];
+	echo (ar_assert($ach6, "'name_first' => 'Jill'")) ? "[OK] Found Jill\n" : "[!!] Find failed\n";
+	echo (ar_assert($ach6, "'favorite_color' => 'lavender'")) ? "[!!] Found relation when I shouldn't\n" : "[OK] No relation yet\n";
+	echo "\nLoading relations:\n";
+	$ach6->belongsTo('person');
+	$ach6->LoadRelations('person', 'order by id', 0, 2);
+	echo (ar_assert($ach6, "'favorite_color' => 'lavender'")) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n";
+
+	echo "\n\n---------------------------------------------------------------------------\n";
+	echo "Test suite complete.\n";
+	echo "---------------------------------------------------------------------------\n";
+?>
+
    
+ 
    Todo (Code Contributions welcome)
    
+ 
    Check _original and current field values before update, only update changes. Also if the primary key value is changed, then on update, we should save and use the original primary key values in the WHERE clause!
+
+ 
    PHP5 specific:  Make GetActiveRecords*() return an Iterator.
+ 
    PHP5 specific: Change PHP5 implementation of Active Record to use __get() and __set() for better performance.
+
+
     Change Log
    
+
    0.93
+
    You can force column names to be quoted in INSERT and UPDATE statements, typically because you are using reserved words as column names by setting
+ADODB_Active_Record::$_quoteNames = true;
+
+
    0.92
+
    Fixed some issues with incompatible fetch modes (ADODB_FETCH_ASSOC) causing problems in UpdateActiveTable.
+
    Added support for functions that support predefining one-to-many relationships:
     
+  ClassHasMany ClassBelongsTo TableHasMany TableBelongsTo TableKeyHasMany TableKeyBelongsTo. 
    
+
    You can also define your child/parent class in these functions, instead of the default ADODB_Active_Record.
+
+
    0.91
+
    HasMany hardcoded primary key field name to "id". Fixed.
+
+
    0.90
+
    Support for belongsTo and hasMany. Thanks to Chris Ravenscroft (chris#voilaweb.com).
+
    Added LoadRelations().
+
+
    0.08
+Added support for assoc arrays in Set().
+
+
    0.07
+
    $ADODB_ASSOC_CASE=2 did not work properly. Fixed.
+
    Added === check in ADODB_SetDatabaseAdapter for $db, adodb-active-record.inc.php. Thx Christian Affolter.
+
+
    0.06
+
    Added ErrorNo().
+
    Fixed php 5.2.0 compat issues.
+ 
+
    0.05
+
    If inserting a record and the value of a primary key field is null, then we do not insert that field in as
+we assume it is an auto-increment field. Needed by mssql.
+
+
    0.04 5 June 2006 
    
+
    Added support for declaring table name in $_table in class declaration. Thx Bill Dueber for idea.
+
    Added find($where,$bindarr=false) method to retrieve an array of active record objects.
+
+
    0.03 
    
+- Now we only update fields that have changed, using $this->_original.
    
+- We do not include auto_increment fields in replace(). Thx Travis Cline
    
+- Added ADODB_ACTIVE_CACHESECS.
    
+
+
    0.02 
    
+- Much better error handling. ErrorMsg() implemented. Throw implemented if adodb-exceptions.inc.php detected.
    
+- You can now define the primary keys of the view or table you are accessing manually.
    
+- The Active Record allows you to create an object which does not have a primary key. You can INSERT but not UPDATE in this case.
+- Set() documented.
    
+- Fixed _pluralize bug with y suffix.
+
+
    
+ 0.01 6 Mar 2006
    
+- Fixed handling of nulls when saving (it didn't save nulls, saved them as '').
    
+- Better error handling messages.
    
+- Factored out a new method GetPrimaryKeys().
    
+ 
    
+ 0.00 5 Mar 2006
    
+ 1st release
+
+
\ No newline at end of file
diff --git a/adodb/docs/docs-adodb.htm b/adodb/docs/docs-adodb.htm
new file mode 100644
index 0000000..7ade9d8
--- /dev/null
+++ b/adodb/docs/docs-adodb.htm
@@ -0,0 +1,7796 @@
+
+
+
+
+
+
+
+
+
+
+ADODB Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
+
    ADOdb Library for PHP
    
+
+
    V5.11 5 May 2010 (c) 2000-2010 John Lim (jlim#natsoft.com)
    
+
+
    This software is dual licensed using BSD-Style
+and LGPL. This means you can use it in compiled proprietary and commercial
+products.
    
+
+
    Useful ADOdb links: Download
+  Other Docs 
    
+
+
    Introduction
    
+Unique Features
    
+How People are using ADOdb
    
+Feature Requests and Bug Reports
    
+Installation
    
+Minimum Install
    
+Initializing Code and Connectioning to Databases
    
+      Data Source
+Name (DSN) Support   Connection Examples
+
    
+High Speed ADOdb - tuning tips
    
+Hacking and Modifying ADOdb Safely
    
+PHP5 Features
    
+foreach iterators exceptions
    
+Supported Databases
    
+Tutorials
    
+Example 1: Select
    
+Example 2: Advanced Select
    
+Example 3: Insert
    
+Example 4: Debugging  rs2html
+example
    
+Example 5: MySQL and Menus
    
+Example 6: Connecting to Multiple Databases at once 
    
+Example 7: Generating Update and Insert SQL 
    
+Example 8: Implementing Scrolling with Next and Previous
    
+Example 9: Exporting in CSV or Tab-Delimited Format 
    
+Example 10: Custom filters
    
+Example 11: Smart Transactions
    
+
    
+Using Custom Error Handlers and PEAR_Error
    
+Data Source Names
    
+Caching
    
+    MemCache
    
+    Caching API
    
+Pivot Tables 
    
+
+
    REFERENCE 
    
+
+
    Variables: $ADODB_COUNTRECS
+$ADODB_ANSI_PADDING_OFF $ADODB_CACHE_DIR 
    
+        $ADODB_FORCE_TYPE $ADODB_FETCH_MODE $ADODB_LANG
+ADODB_QUOTE_FIELDNAMES 
    
+Constants: ADODB_ASSOC_CASE 
    
+ADOConnection
    
+Connections: Connect PConnect NConnect IsConnected
    
+Executing SQL: Execute CacheExecute
+SelectLimit CacheSelectLimit
+Param Prepare PrepareSP
+InParameter OutParameter
+AutoExecute 
    
+              GetOne CacheGetOne GetRow CacheGetRow GetAll CacheGetAll GetCol CacheGetCol GetAssoc CacheGetAssoc
+Replace GetMedian 
    
+               ExecuteCursor (oci8 only)
    
+Generates SQL strings: GetUpdateSQL GetInsertSQL Concat IfNull length random
+substr qstr Param
+OffsetDate SQLDate DBDate DBTimeStamp BindDate BindTimeStamp 
    
+Blobs: UpdateBlob UpdateClob
+UpdateBlobFile BlobEncode
+BlobDecode
    
+Paging/Scrolling: PageExecute CachePageExecute
    
+Cleanup: CacheFlush Close
    
+Transactions: StartTrans CompleteTrans
+FailTrans HasFailedTrans
+BeginTrans CommitTrans RollbackTrans SetTransactionMode
    
+Fetching Data: SetFetchMode
    
+Strings: concat length qstr quote substr
    
+Dates: DBDate DBTimeStamp UnixDate BindDate BindTimeStamp UnixTimeStamp
+OffsetDate SQLDate 
    
+Row Management: Affected_Rows Insert_ID RowLock GenID CreateSequence DropSequence 
    
+Error Handling: ErrorMsg ErrorNo
+MetaError MetaErrorMsg IgnoreErrors
    
+Data Dictionary (metadata): MetaDatabases MetaTables MetaColumns MetaColumnNames MetaPrimaryKeys
+MetaForeignKeys ServerInfo
+
    
+Statistics and Query-Rewriting: LogSQL fnExecute and fnCacheExecute
    
+Deprecated: Bind BlankRecordSet
+Parameter     
    
+ADORecordSet
    
+Returns one field: Fields
    
+Returns one row:FetchRow FetchInto
+FetchObject FetchNextObject
+FetchObj FetchNextObj GetRowAssoc 
    
+Returns all rows:GetArray GetRows
+GetAssoc
    
+Scrolling:Move MoveNext MoveFirst MoveLast AbsolutePosition CurrentRow AtFirstPage AtLastPage AbsolutePage 
    
+Menu generation:GetMenu GetMenu2
    
+Dates:UserDate UserTimeStamp
+UnixDate UnixTimeStamp
    
+    Recordset Info:RecordCount PO_RecordCount NextRecordSet
    
+Field Info:FieldCount FetchField
+MetaType
    
+Cleanup: Close     
    
+
+
    rs2html  example
    
+Differences between ADOdb and ADO
    
+Database Driver Guide
    
+    Change Log
    
+
+
    Introduction
    
+
+
    PHP's database access functions are not standardised. This creates a need
+for a database class library to hide the differences between the different
+database API's (encapsulate the differences) so we can easily switch databases.
+PHP 4.0.5 or later is now required (because we use array-based str_replace).
    
+
+
    We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL
+Anywhere, Informix, PostgreSQL, FrontBase, SQLite, Interbase (Firebird and
+Borland variants), Foxpro, Access, ADO,
+DB2, SAP DB and ODBC. We have had successful reports of connecting to Progress
+and CacheLite via ODBC. We hope more people will contribute drivers to support
+other databases.
    
+
+
    PHP4 supports session variables. You can store your session information
+using ADOdb for true portability and scalability. See adodb-session.php for
+more information.
    
+
+
    Also read tips_portable_sql.htm
+for tips on writing portable SQL.
    
+
+
    Unique Features of ADOdb
    
+
+
      
+ 
    • Easy for Windows
+     programmers to adapt to because many of the conventions are similar to
+     Microsoft's ADO.
      • 
+ 
    • Unlike other PHP database
+     classes which focus only on select statements, we provide support code
+     to handle inserts and updates which can be adapted to multiple databases
+     quickly. Methods are provided for date handling, string concatenation
+     and string quoting characters for differing databases.
      • 
+ 
    • A metatype system is
+     built in so that we can figure out that types such as CHAR, TEXT and
+     STRING are equivalent in different databases.
      • 
+ 
    • Easy to port because
+     all the database dependant code are stored in stub functions. You do not
+     need to port the core logic of the classes.
      • 
+ 
    • Portable table and index
+     creation with the datadict classes. 
      • 
+ 
    • Database performance
+     monitoring and SQL tuning with the performance
+     monitoring classes. 
      • 
+ 
    • Database-backed sessions
+     with the session management classes.
+     Supports session expiry notification. 
      • 
+ 
    • Object-Relational
+     Mapping using ADOdb_Active_Record
+     classes. 
      • 
+
    
+
+
    How People are using ADOdb
    
+
+
    Here are some examples of how people are using ADOdb (for a
+much longer list, visit adodb-cool-apps): 
    
+
+
      
+ 
    • PhpLens is a commercial data grid component
+     that allows both cool Web designers and serious unshaved programmers to
+     develop and maintain databases on the Web easily. Developed by the author
+     of ADOdb.
      • 
+ 
    • PHAkt: PHP Extension for DreamWeaver
+     Ultradev allows you to script PHP in the popular Web page editor.
+     Database handling provided by ADOdb.
      • 
+ 
    • Analysis
+     Console for Intrusion Databases (ACID): PHP-based analysis engine to
+     search and process a database of security incidents generated by
+     security-related software such as IDSes and firewalls (e.g. Snort,
+     ipchains). By Roman Danyliw.
      • 
+ 
    • PostNuke is a very popular free
+     content management system and weblog system. It offers full CSS support,
+     HTML 4.01 transitional compliance throughout, an advanced blocks system,
+     and is fully multi-lingual enabled. 
      • 
+ 
    • EasyPublish
+     CMS is another free content management system for managing information
+     and integrated modules on your internet, intranet- and extranet-sites.
+     From Norway.
      • 
+ 
    • NOLA is a full featured accounting,
+     inventory, and job tracking application. It is licensed under the GPL, and
+     developed by Noguska. 
      • 
+
    
+
+
    Feature Requests and Bug Reports
    
+
+
    Feature requests and bug reports can be emailed to jlim#natsoft.com or posted to the ADOdb Help
+forums at http://phplens.com/lens/lensforum/topics.php?id=4.
    
+
+
    Installation Guide
    
+
+
    Make sure you are running PHP 4.0.5 or later. Unpack all the files into a
+directory accessible by your webserver.
    
+
+
    To test, try modifying some of the tutorial examples. Make sure you
+customize the connection settings correctly. You can debug using $db->debug
+= true as shown below:
    
+
+
    <?php
    
+ include('adodb/adodb.inc.php');
    
+ $db = ADONewConnection($dbdriver); # eg 'mysql' or 'postgres'
    
+ $db->debug = true;
    
+ $db->Connect($server, $user, $password, $database);
    
+ $rs = $db->Execute('select * from some_small_table');
    
+ print "<pre>";
    
+ print_r($rs->GetRows());
    
+ print "</pre>";
    
+?>
    
+
+
    Minimum Install
    
+
+
    For developers who want to release a minimal install of ADOdb, you will
+need: 
    
+
+
      
+ 
    • adodb.inc.php 
      • 
+ 
    • adodb-lib.inc.php 
      • 
+ 
    • adodb-time.inc.php 
      • 
+ 
    • drivers/adodb-$database.inc.php
+     
      • 
+ 
    • license.txt (for legal
+     reasons) 
      • 
+ 
    • adodb-php4.inc.php 
      • 
+ 
    • adodb-iterator.inc.php
+     (php5 functionality) 
      • 
+
    
+
+
    Optional: 
    
+
+
      
+ 
    • adodb-error.inc.php and
+     lang/adodb-$lang.inc.php (if you use MetaError()) 
      • 
+ 
    • adodb-csvlib.inc.php (if
+     you use cached recordsets - CacheExecute(), etc) 
      • 
+ 
    • adodb-exceptions.inc.php
+     and adodb-errorhandler.inc.php (if you use adodb error handler or php5
+     exceptions). 
      • 
+ 
    • adodb-active-record.inc.php
+     if you use Active Records. 
      • 
+
    
+
+
    Code Initialization Examples
    
+
+
    When running ADOdb, at least two files are loaded. First is
+adodb/adodb.inc.php, which contains all functions used by all database classes.
+The code specific to a particular database is in the
+adodb/driver/adodb-????.inc.php file.
    
+
+
    For example, to connect to a mysql database:
    
+
+
    include('/path/to/set/here/adodb.inc.php');
    
+$conn = &ADONewConnection('mysql');
    
+
+
    Whenever you need to connect to a database, you create a Connection object
+using the ADONewConnection($driver) function. NewADOConnection($driver)
+is an alternative name for the same function.
    
+
+
    At this point, you are not connected to the database (no longer true if you
+pass in a dsn). You will first need to decide whether
+to use persistent or non-persistent connections. The advantage of
+persistent connections is that they are faster, as the database
+connection is never closed (even when you call Close()). Non-persistent connections
+take up much fewer resources though, reducing the risk of your database and
+your web-server becoming overloaded. 
    
+
+
    For persistent connections, use $conn->PConnect(),
+or $conn->Connect() for non-persistent connections.
+Some database drivers also support NConnect(), which
+forces the creation of a new connection. 
    
+
+
    Connection Gotcha: If you create two connections, but both use the
+same userid and password, PHP will share the same connection. This can cause
+problems if the connections are meant to different databases. The solution is
+to always use different userid's for different databases, or use NConnect(). 
    
+
+
    Data Source Name (DSN) Support
    
+
+
    Since ADOdb 4.51, you can connect to a database by passing a dsn to
+NewADOConnection() (or ADONewConnection, which is the same function). The dsn
+format is: 
    
+
+
     $driver://$username:$password@hostname/$database?options[=value]
    
+
+
    NewADOConnection() calls Connect() or PConnect() internally for you. If the
+connection fails, false is returned. 
    
+
+
     # non-persistent connection
     $dsn = 'mysql://root:pwd@localhost/mydb'; 
     $db = NewADOConnection($dsn);
     if (!$db) die("Connection failed"); 
     
     # no need to call connect/pconnect!
     $arr = $db->GetArray("select * from table");
     
     # persistent connection
    
+
     $dsn2 = 'mysql://root:pwd@localhost/mydb?persist'; 
+
    
+
             # non-persistent connection on port 3000
    
+
             $dsn2 = 'mysqli://root:pwd@localhost/mydb?persist=0&port=3000';
    
+
    
+
+
    If you have special characters such as /:?_ in your dsn, then you need to
+rawurlencode them first: 
    
+
+
     $pwd = rawurlencode($pwd);
    
+ $dsn = "mysql://root:$pwd@localhost/mydb";
     $dsn2=rawurlencode("sybase_ase")."://user:pass@host/path?query";
    
+
+
    Legal options are: 
    
+
+
    
+
+
+ 
+  
+  
+ 
+ 
+  
+  
+ 
+ 
+  
+  
+ 
+ 
+  
+  
+ 
+ 
+  
+  
+ 
+ 
+  
+  
+ 
+
    
+  
    For all drivers
    
+      		
+  
    'persist', 'persistent', 'debug', 'fetchmode', 'new' , 'cachesecs', 'memcache'
    
+  
    
+  
    Interbase/Firebird 
    
+      		
+  
    'dialect','charset','buffers','role' 
    
+  
    
+  
    M'soft ADO
    
+      		
+  
    'charpage' 
    
+  
    
+  
    MySQL
    
+      		
+  
    'clientflags' 
    
+  
    
+  
    MySQLi
    
+      		
+  
    'port', 'socket', 'clientflags' 
    
+  
    
+  
    Oci8
    
+      		
+  
    'nls_date_format','charset' 
    
+  
    
+
+
    
+
+
    For all drivers, when the options persist or persistent are
+set, a persistent connection is forced; similarly, when new is set, then
+a new connection will be created using NConnect if the underlying driver
+supports it. The debug option enables debugging. The fetchmode
+calls SetFetchMode(). If no value is defined for an
+option, then the value is set to 1. 
    
+
+
    Since ADOdb 5.09, we added 2 new parameters:
    
+
      
+
    • cachesecs which globally determines how many seconds to cache recordsets (default is 3600 secs if not defined) when
+CacheExecute() and CacheSelectLimit() are called and no cache-time parameter is passed into these functions.
+
    • memcache which defines the memcache host, port and whether to use compression. For example:
+
      +	# we have a memcache server at 10.1.1.22 using default port 11211, no compression
+	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=10.1.1.22'; 
+	
+	# we have a memcache server 10.1.1.22 port 8888, compression=on
+	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=10.1.1.22:8888:1';
+	 	
+	# we have a memcache servers mem1,mem2 on port 8888, compression=off
+	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=mem1,mem2:8888:0'; 
+	
+	# we have a memcache servers mem1,mem2 on port 8888, compression=off and cachesecs=120
+	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=mem1,mem2:8888:0&cachesecs=120';
+
      
+
    
+
+
    ADOdb DSN's are compatible with version 1.0 of PEAR DB's DSN format. 
    
+
+
    Examples of Connecting to Databases
    
+
+
    MySQL and Most Other Database Drivers
    
+
+
    MySQL connections are very
+straightforward, and the parameters are identical to mysql_connect:
    
+
+
     $conn = &ADONewConnection('mysql'); 
    
+ $conn->PConnect('localhost','userid','password','database');
    
+ 
    
+     # or dsn 
     $dsn = 'mysql://user:pwd@localhost/mydb'; 
     $conn = ADONewConnection($dsn); # no need for Connect()
     
     # or persistent dsn
     $dsn = 'mysql://user:pwd@localhost/mydb?persist'; 
     $conn = ADONewConnection($dsn); # no need for PConnect()
     
     # a more complex example:
     $pwd = urlencode($pwd);
     $flags = MYSQL_CLIENT_COMPRESS;
     $dsn = "mysql://user:$pwd@localhost/mydb?persist&clientflags=$flags";
     $conn = ADONewConnection($dsn); # no need for PConnect()
     
    
+
+
    For most drivers, you can use the
+standard function: Connect($server, $user, $password, $database), or a DSN since ADOdb 4.51. Exceptions to this are listed
+below. 
    
+
+
    PDO
    
+
+
    PDO, which only works with PHP5, accepts a
+driver specific connection string: 
    
+
+
     
     $conn =& NewADConnection('pdo');
     $conn->Connect('mysql:host=localhost',$user,$pwd,$mydb);
     $conn->Connect('mysql:host=localhost;dbname=mydb',$user,$pwd);
     $conn->Connect("mysql:host=localhost;dbname=mydb;username=$user;password=$pwd");
    
+
+
    The DSN mechanism is also supported: 
    
+
+
     
     $conn =& NewADConnection("pdo_mysql://user:pwd@localhost/mydb?persist"); # persist is optional
    
+
+
    PostgreSQL
    
+
+
    PostgreSQL 7 and 8 accepts connections using:
+
    
+
+
    a. the standard connection string:
    
+
+
     $conn = &ADONewConnection('postgres'); 
    
+ $conn->PConnect('host=localhost port=5432 dbname=mary');
    
+
+
    b. the classical 4 parameters:
    
+
+
     $conn->PConnect('localhost','userid','password','database');
    
+
    
+
+
    c. dsn: 
    
+
+
     $dsn = 'postgres://user:pwd@localhost/mydb?persist'; # persist is optional
     $conn = ADONewConnection($dsn); # no need for Connect/PConnect
    
+
+
+
+
    LDAP
    
+
+
    Here is an example of querying a LDAP server. Thanks to Josh Eldridge for
+the driver and this example: 
    
+
+
     
    require('/path/to/adodb.inc.php');
     
    /* Make sure to set this BEFORE calling Connect() */
    $LDAP_CONNECT_OPTIONS = Array(
     Array ("OPTION_NAME"=>LDAP_OPT_DEREF, "OPTION_VALUE"=>2),
     Array ("OPTION_NAME"=>LDAP_OPT_SIZELIMIT,"OPTION_VALUE"=>100),
     Array ("OPTION_NAME"=>LDAP_OPT_TIMELIMIT,"OPTION_VALUE"=>30),
     Array ("OPTION_NAME"=>LDAP_OPT_PROTOCOL_VERSION,"OPTION_VALUE"=>3),
     Array ("OPTION_NAME"=>LDAP_OPT_ERROR_NUMBER,"OPTION_VALUE"=>13),
     Array ("OPTION_NAME"=>LDAP_OPT_REFERRALS,"OPTION_VALUE"=>FALSE),
     Array ("OPTION_NAME"=>LDAP_OPT_RESTART,"OPTION_VALUE"=>FALSE)
    );
    $host = 'ldap.baylor.edu';
    $ldapbase = 'ou=People,o=Baylor University,c=US';
     
    $ldap = NewADOConnection( 'ldap' );
    $ldap->Connect( $host, $user_name='', $password='', $ldapbase );
     
    echo "<pre>";
     
    print_r( $ldap->ServerInfo() );
    $ldap->SetFetchMode(ADODB_FETCH_ASSOC);
    $userName = 'eldridge';
    $filter="(|(CN=$userName*)(sn=$userName*)(givenname=$userName*)(uid=$userName*))";
     
    $rs = $ldap->Execute( $filter );
    if ($rs)
     while ($arr = $rs->FetchRow()) {
      print_r($arr); 
     }
     
    $rs = $ldap->Execute( $filter );
    if ($rs) 
     while (!$rs->EOF) {
      print_r($rs->fields); 
     $rs->MoveNext();
     } 
     
    print_r( $ldap->GetArray( $filter ) );
    print_r( $ldap->GetRow( $filter ) );
     
    $ldap->Close();
    echo "</pre>";
    
+
+
    Using DSN: 
    
+
+
     
    $dsn = "ldap://ldap.baylor.edu/ou=People,o=Baylor University,c=US";
    $db = NewADOConnection($dsn);
    
+
+
    Interbase/Firebird
    
+
+
    You define the database in the $host parameter: 
    
+
+
     $conn = &ADONewConnection('ibase'); 
    
+ $conn->PConnect('localhost:c:\ibase\employee.gdb','sysdba','masterkey');
    
+
+
    Or dsn: 
    
+
+
     $dsn = 'firebird://user:pwd@localhost/mydb?persist&dialect=3'; # persist is optional
    
+ $conn = ADONewConnection($dsn); # no need for Connect/PConnect
    
+
+
    SQLite
    
+
+
    Sqlite will create the database file if it does not exist. 
    
+
+
     $conn = &ADONewConnection('sqlite');
     $conn->PConnect('c:\path\to\sqlite.db'); # sqlite will create if does not exist
    
+
+
    Or dsn: 
    
+
+
     $path = urlencode('c:\path\to\sqlite.db');
     $dsn = "sqlite://$path/?persist"; # persist is optional
     $conn = ADONewConnection($dsn); # no need for Connect/PConnect
    
+
+
    Oracle (oci8)
    
+
+
    With oci8, you can connect in multiple ways. Note that oci8 works fine with
+newer versions of the Oracle, eg. 9i and 10g.
    
+
+
    a. PHP and Oracle reside on the same machine, use default SID.
    
+
+
     $conn->Connect(false, 'scott', 'tiger');
    
+
+
    b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS'
    
+
+
     $conn->PConnect(false, 'scott', 'tiger', 'myTNS');
    
+
+
    or
    
+
+
     $conn->PConnect('myTNS', 'scott', 'tiger');
    
+
+
    c. Host Address and SID
    
+
+
     
     # with adodb 5.06 or 4.991 and later
     $conn->Connect('192.168.0.1', 'scott', 'tiger', "SID=$SID");
     
     # OR with all versions of ADOdb
     $conn->connectSID = true;
     $conn->Connect('192.168.0.1', 'scott', 'tiger', $SID);
     
    
+
+
    d. Host Address and Service Name
    
+
+
     $conn->Connect('192.168.0.1', 'scott', 'tiger', 'servicename');
    
+
+
    e. Oracle connection string: 
    
+
+
     $cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
    
+ (CONNECT_DATA=(SID=$sid)))";
    
+ $conn->Connect($cstr, 'scott', 'tiger');
    
+
+
    f. ADOdb dsn: 
    
+
+
     $dsn = 'oci8://user:pwd@tnsname/?persist'; # persist is optional
    
+ $conn = ADONewConnection($dsn); # no need for Connect/PConnect
    
+ 
    
+ $dsn = 'oci8://user:pwd@host/sid';
    
+ $conn = ADONewConnection($dsn);
    
+ 
    
+ $dsn = 'oci8://user:pwd@/'; # oracle on local machine
    
+ $conn = ADONewConnection($dsn);
    
+
+
    You can also set the charSet for Oracle 9.2 and later, supported since PHP
+4.3.2, ADOdb 4.54: 
    
+
+
     $conn->charSet = 'we8iso8859p1';
    
+ $conn->Connect(...);
    
+ 
    
+ # or
    
+ $dsn = 'oci8://user:pwd@tnsname/?charset=WE8MSWIN1252';
    
+ $db = ADONewConnection($dsn);
    
+
+
    DSN-less ODBC ( Access, MSSQL and DB2 examples)
    
+
+
    ODBC DSN's can be created in the ODBC control panel, or you can use a
+DSN-less connection.To use DSN-less connections with ODBC you need PHP 4.3 or
+later. 
    
+
+
    For Microsoft Access:
    
+
+
     $db =& ADONewConnection('access');
    
+ $dsn = "Driver={Microsoft Access Driver (*.mdb)};Dbq=d:\\northwind.mdb;Uid=Admin;Pwd=;";
     $db->Connect($dsn);
    
+
+
    For Microsoft SQL Server: 
    
+
+
     $db =& ADONewConnection('odbc_mssql');
    
+ $dsn = "Driver={SQL Server};Server=localhost;Database=northwind;";
    
+ $db->Connect($dsn,'userid','password');
    
+
+
    or if you prefer to use the mssql extension (which is
+limited to mssql 6.5 functionality): 
    
+
+
     $db =& ADONewConnection('mssql');
    
+ $db->Execute('localhost', 'userid', 'password', 'northwind');
    
+
+
    For DB2: 
    
+
+
     
     $dbms = 'db2'; # or 'odbc_db2' if db2 extension not available
     $db =& ADONewConnection($dbms);
     $dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP;".
     "uid=root; pwd=secret";
    
+ $db->Connect($dsn);
    
+		  # or connect and set schema
+		  $db->Connect($dsn,null,null,$schema);
    
+
    
+
+
    DSN-less Connections with ADO
    
+If you are using versions of PHP earlier than PHP 4.3.0, DSN-less connections
+only work with Microsoft's ADO,
+which is Microsoft's COM based API. An example using the ADOdb library and
+Microsoft's ADO:
+
    
+
+
    <?php
    
+ include('adodb.inc.php'); 
    
+ $db = &ADONewConnection("ado_mssql");
    
+ print "<h1>Connecting DSN-less $db->databaseType...</h1>";
    
+ 
    
+ $myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
    
+ . "SERVER=flipper;DATABASE=ai;UID=sa;PWD=;" ;
     $db->Connect($myDSN);
     
     $rs = $db->Execute("select * from table");
     $arr = $rs->GetArray();
     print_r($arr);
    ?>
    
+
+
    High Speed ADOdb - tuning tips
    
+
+
    ADOdb is a big class library, yet it consistently
+beats all other PHP class libraries in performance. This is because it is
+designed in a layered fashion, like an onion, with the fastest functions in the
+innermost layer. Stick to the following functions for best performance:
    
+
+
    
+
+
+ 
+  
+ 
+ 
+  
+ 
+
    
+  
    Innermost Layer
    
+  
    
+  
    Connect, PConnect, NConnect
    
+  Execute, CacheExecute
    
+  SelectLimit, CacheSelectLimit
    
+  MoveNext, Close 
    
+  qstr, Affected_Rows, Insert_ID
    
+  
    
+
+
    
+
+
    The fastest way to access the field data is by accessing the array
+$recordset->fields directly. Also set the global variables $ADODB_FETCH_MODE = ADODB_FETCH_NUM, and (for
+oci8, ibase/firebird and odbc) $ADODB_COUNTRECS
+= false before you connect to your database.
    
+
+
    Consider using bind parameters if your database supports it, as it improves
+query plan reuse. Use ADOdb's performance tuning system to identify bottlenecks
+quickly. At the time of writing (Dec 2003), this means oci8 and odbc drivers.
    
+
+
    Lastly make sure you have a PHP accelerator cache installed such as APC,
+Turck MMCache, Zend Accelerator or ionCube.
    
+
+
    Some examples:
    
+
+
    
+
+
+ 
+  
+  
+ 
+ 
+  
+  
+ 
+
    
+  
    Fastest data retrieval using PHP
    
+      		
+  
    Fastest data retrieval using ADOdb extension
    
+  
    
+  
    $rs =& $rs->Execute($sql);
    
+while (!$rs->EOF) {
    
+   var_dump($rs->fields);
    
+   $rs->MoveNext();
    
+}
    
+      		
+  
    $rs =& $rs->Execute($sql);
    
+$array = adodb_getall($rs);
    
+var_dump($array);
    
+  
    
+  
    
+  
    
+
+
    
+
+
    Advanced Tips 
    
+
+
    If you have the ADOdb C
+extension installed, you can replace your calls to $rs->MoveNext() with
+adodb_movenext($rs). This doubles the speed of this operation. For retrieving
+entire recordsets at once, use GetArray(), which uses the high speed extension
+function adodb_getall($rs) internally. 
    
+
+
    Execute() is the default way to run queries. You can use the low-level
+functions _Execute() and _query() to reduce query overhead. Both these
+functions share the same parameters as Execute(). 
    
+
+
    If you do not have any bind parameters or your database supports binding
+(without emulation), then you can call _Execute() directly. Calling this
+function bypasses bind emulation. Debugging is still supported in _Execute(). 
    
+
+
    If you do not require debugging facilities nor emulated binding, and do not
+require a recordset to be returned, then you can call _query. This is great for
+inserts, updates and deletes. Calling this function bypasses emulated binding,
+debugging, and recordset handling. Either the resultid, true or false are
+returned by _query(). 
    
+
+
    For Informix, you can disable scrollable cursors with $db->cursorType =
+0. 
    
+
+
    Hacking ADOdb Safely
    
+
+
    You might want to modify ADOdb for your own purposes. Luckily you can still
+maintain backward compatibility by sub-classing ADOdb and using the
+$ADODB_NEWCONNECTION variable. $ADODB_NEWCONNECTION allows you to override the
+behaviour of ADONewConnection(). ADOConnection() checks for this variable and
+will call the function-name stored in this variable if it is defined. 
    
+
+
    In the following example, new functionality for the connection object is
+placed in the hack_mysql and hack_postgres7 classes. The
+recordset class naming convention can be controlled using $rsPrefix. Here we
+set it to 'hack_rs_', which will make ADOdb use hack_rs_mysql and hack_rs_postgres7
+as the recordset classes. 
    
+
+
    class hack_mysql extends adodb_mysql {
    
+var $rsPrefix = 'hack_rs_';
    
+ /* Your mods here */
    
+}
    
+
    
+class hack_rs_mysql extends ADORecordSet_mysql {
    
+ /* Your mods here */
    
+}
    
+
    
+class hack_postgres7 extends adodb_postgres7 {
    
+var $rsPrefix = 'hack_rs_';
    
+ /* Your mods here */
    
+}
    
+
    
+class hack_rs_postgres7 extends ADORecordSet_postgres7 {
    
+/* Your mods here */
    
+}
    
+
    
+$ADODB_NEWCONNECTION = 'hack_factory';
    
+
    
+function& hack_factory($driver)
    
+{
    
+ if ($driver !== 'mysql' && $driver !== 'postgres7') return false;
    
+ 
    
+ $driver = 'hack_'.$driver;
    
+ $obj = new $driver();
    
+ return $obj;
    
+}
    
+
    
+include_once('adodb.inc.php');
    
+
+
    Don't forget to call the constructor of the parent class in your
+constructor. If you want to use the default ADOdb drivers return false in the
+above hack_factory() function. Also you can define your own
+ADORecordSet_empty() class, by defining a class $$this->rsPrefix.'empty'
+since 4.96/5.02. 
    
+
+
    PHP5 Features
    
+
+
    ADOdb 4.02 or later will transparently determine which
+version of PHP you are using. If PHP5 is detected, the following features become
+available: 
    
+
+
      
+ 
    • PDO: PDO drivers
+     are available. See the connection examples. Currently
+     PDO drivers are not as powerful as native drivers, and should be treated
+     as experimental.
      • 
+ 
    • Foreach iterators:
+     This is a very natural way of going through a recordset: 
      • 
+
    
+
+
     $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
    
+ $rs = $db->Execute($sql);
    
+ foreach($rs as $k => $row) {
    
+ echo "r1=".$row[0]." r2=".$row[1]."<br>";
    
+ }
    
+
+
      
+ 
    • Exceptions:
+     Just include adodb-exceptions.inc.php and you can now catch
+     exceptions on errors as they occur. 
      • 
+
    
+
+
     include("../adodb-exceptions.inc.php"); 
    
+ include("../adodb.inc.php");  
    
+ try { 
    
+ $db = NewADOConnection("oci8"); 
    
+ $db->Connect('','scott','bad-password'); 
    
+ } catch (exception $e) { 
    
+ var_dump($e); 
    
+ adodb_backtrace($e->gettrace());
    
+ } 
    
+
+
    Note that reaching EOF is not considered
+an error nor an exception. 
    
+
+
    Databases Supported
    
+
+
    The name below is the value you pass to
+NewADOConnection($name) to create a connection object for that database. 
    
+
+
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+
    
+  
    Name
    
+      		
+  
    Tested
    
+      		
+  
    Database
    
+      		
+  
    RecordCount() usable
    
+      		
+  
    Prerequisites
    
+      		
+  
    Operating Systems
    
+  
    
+  
    access
    
+      		
+  
    B
    
+      		
+  
    Microsoft Access/Jet. You
+  need to create an ODBC DSN.
    
+      		
+  
    Y/N
    
+      		
+  
    ODBC 
    
+      		
+  
    Windows only
    
+  
    
+  
    ado
    
+      		
+  
    B
    
+      		
+  
    Generic ADO, not tuned for specific databases.
+  Allows DSN-less connections. For best performance, use an OLEDB provider.
+  This is the base class for all ado drivers.
    
+  
    You can set $db->codePage before
+  connecting.
    
+      		
+  
    ? depends on database
    
+      		
+  
    ADO or OLEDB provider
    
+      		
+  
    Windows only
    
+  
    
+  
    ado_access
    
+      		
+  
    B
    
+      		
+  
    Microsoft Access/Jet using ADO. Allows DSN-less
+  connections. For best performance, use an OLEDB provider.
    
+      		
+  
    Y/N
    
+      		
+  
    ADO or OLEDB provider
    
+      		
+  
    Windows only
    
+  
    
+  
    ado_mssql
    
+      		
+  
    B
    
+      		
+  
    Microsoft SQL Server using ADO. Allows DSN-less
+  connections. For best performance, use an OLEDB provider.
    
+      		
+  
    Y/N
    
+      		
+  
    ADO or OLEDB provider
    
+      		
+  
    Windows only
    
+  
    
+  
    db2
    
+      		
+  
    B
    
+      		
+  
    Uses PHP's db2-specific
+  extension for better performance.
    
+      		
+  
    Y/N
    
+      		
+  
    DB2 CLI/ODBC interface
    
+      		
+  
    Unix and Windows. Requires IBM DB2
+  Universal Database client.
    
+  
    
+  
    db2oci
    
+      		
+  
    C
    
+      		
+  
    Based on db2 driver. Allows use of oracle style :0, :1, :2 bind variables. Used with DB2 9.7 or later with PL/SQL mode turned on.
    
+      		
+  
    Y/N
    
+      		
+  
    DB2 CLI/ODBC interface
    
+      		
+  
    Unix and Windows. Requires IBM DB2
+  Universal Database client.
    
+  
    
+  
    odbc_db2
    
+      		
+  
    C
    
+      		
+  
    Connects to DB2 using
+  generic ODBC extension.
    
+      		
+  
    Y/N
    
+      		
+  
    DB2 CLI/ODBC interface
    
+      		
+  
    Unix and Windows. Unix
+  install hints. I have had reports that the $host and $database params
+  have to be reversed in Connect() when using the CLI interface.
    
+  
    
+  
    vfp
    
+      		
+  
    A
    
+      		
+  
    Microsoft Visual FoxPro.
+  You need to create an ODBC DSN.
    
+      		
+  
    Y/N
    
+      		
+  
    ODBC
    
+      		
+  
    Windows only
    
+  
    
+  
    fbsql
    
+      		
+  
    C
    
+      		
+  
    FrontBase. 
    
+      		
+  
    Y
    
+      		
+  
    ?
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    ibase
    
+      		
+  
    B
    
+      		
+  
    Interbase 6 or earlier.
+  Some users report you might need to use this
    
+  $db->PConnect('localhost:c:/ibase/employee.gdb', "sysdba",
+  "masterkey") to connect. Lacks Affected_Rows currently.
    
+  
    
+  You can set $db->role, $db->dialect, $db->buffers and
+  $db->charSet before connecting.
    
+      		
+  
    Y/N
    
+      		
+  
    Interbase client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    firebird
    
+      		
+  
    C
    
+      		
+  
    Firebird version of
+  interbase.
    
+      		
+  
    Y/N
    
+      		
+  
    Interbase client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    borland_ibase
    
+      		
+  
    C
    
+      		
+  
    Borland version of
+  Interbase 6.5 or later. Very sad that the forks differ.
    
+      		
+  
    Y/N
    
+      		
+  
    Interbase client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    informix
    
+      		
+  
    C
    
+      		
+  
    Generic informix driver.
+  Use this if you are using Informix 7.3 or later.
    
+      		
+  
    Y/N
    
+      		
+  
    Informix client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    informix72
    
+      		
+  
    C
    
+      		
+  
    Informix databases before
+  Informix 7.3 that do no support SELECT FIRST.
    
+      		
+  
    Y/N
    
+      		
+  
    Informix client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    ldap
    
+      		
+  
    C
    
+      		
+  
    LDAP driver. See this
+  example for usage information.
    
+      		
+  
     
    
+      		
+  
    LDAP extension
    
+      		
+  
    ?
    
+  
    
+  
    mssql
    
+      		
+  
    A
    
+      		
+  
    Microsoft SQL Server 7 and later. Works
+  with Microsoft SQL Server 2000 also. Note that date formating is problematic
+  with this driver. For example, the PHP mssql extension does not return the
+  seconds for datetime!
    
+      		
+  
    Y/N
    
+      		
+  
    Mssql client
    
+      		
+  
    Unix and Windows. 
    
+  Unix install
+  howto and another
+  one. 
    
+  
    
+  
    mssqlpo
    
+      		
+  
    A
    
+      		
+  
    Portable mssql driver. Identical to above mssql
+  driver, except that '||', the concatenation operator, is converted to '+'.
+  Useful for porting scripts from most other sql variants that use ||.
    
+      		
+  
    Y/N
    
+      		
+  
    Mssql client
    
+      		
+  
    Unix and Windows. 
    
+  Unix install howto    .
    
+  
    
+  
    mssqlnative
    
+      		
+  
    C
    
+      		
+  
    Native mssql driver from M'soft. 
    
+      		
+  
    ?
    
+      		
+  
    ?
    
+      		
+  
    Windows. Tq Garrett Serack of M'soft.
    
+  
    
+  
     
    
+      		
+  
     
    
+      		
+  
     
    
+      		
+  
     
    
+      		
+  
     
    
+      		
+  
     
    
+  
    
+  
    mysql
    
+      		
+  
    A
    
+      		
+  
    MySQL without transaction
+  support. You can also set $db->clientFlags before connecting.
    
+      		
+  
    Y
    
+      		
+  
    MySQL client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    mysqlt or maxsql
    
+      		
+  
    A
    
+      		
+  
    MySQL with transaction support. We
+  recommend using || as the concat operator for best portability. This can be
+  done by running MySQL using: 
    
+  mysqld --ansi or mysqld --sql-mode=PIPES_AS_CONCAT
    
+      		
+  
    Y/N
    
+      		
+  
    MySQL client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    oci8
    
+      		
+  
    A
    
+      		
+  
    Oracle 8/9. Has more
+  functionality than oracle driver (eg. Affected_Rows). You might have
+  to putenv('ORACLE_HOME=...') before Connect/PConnect. 
    
+  
    There are 2 ways of connecting - with
+  server IP and service name: 
    
+  PConnect('serverip:1521','scott','tiger','service')
    
+  or using an entry in TNSNAMES.ORA or ONAMES or HOSTNAMES: 
    
+  PConnect(false, 'scott', 'tiger', $oraname). 
    
+  
    Since 2.31, we support Oracle REF cursor
+  variables directly (see ExecuteCursor). 
    
+      		
+  
    Y/N
    
+      		
+  
    Oracle client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    oci805
    
+      		
+  
    C
    
+      		
+  
    Supports reduced Oracle
+  functionality for Oracle 8.0.5. SelectLimit is not as efficient as in the
+  oci8 or oci8po drivers.
    
+      		
+  
    Y/N
    
+      		
+  
    Oracle client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    oci8po
    
+      		
+  
    A
    
+      		
+  
    Oracle 8/9 portable driver.
+  This is nearly identical with the oci8 driver except (a) bind variables in
+  Prepare() use the ? convention, instead of :bindvar, (b) field names use the
+  more common PHP convention of lowercase names. 
    
+  
    Use this driver if porting from other
+  databases is important. Otherwise the oci8 driver offers better performance. 
    
+      		
+  
    Y/N
    
+      		
+  
    Oracle client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    odbc
    
+      		
+  
    A
    
+      		
+  
    Generic ODBC, not tuned for
+  specific databases. To connect, use 
    
+  PConnect('DSN','user','pwd'). This is the base class for all odbc derived
+  drivers.
    
+      		
+  
    ? depends on database
    
+      		
+  
    ODBC
    
+      		
+  
    Unix and Windows. Unix hints.
    
+  
    
+  
    odbc_mssql
    
+      		
+  
    C
    
+      		
+  
    Uses ODBC to connect to
+  MSSQL
    
+      		
+  
    Y/N
    
+      		
+  
    ODBC
    
+      		
+  
    Unix and Windows. 
    
+  
    
+  
    odbc_oracle
    
+      		
+  
    C
    
+      		
+  
    Uses ODBC to connect to
+  Oracle
    
+      		
+  
    Y/N
    
+      		
+  
    ODBC
    
+      		
+  
    Unix and Windows. 
    
+  
    
+  
    odbtp
    
+      		
+  
    C
    
+      		
+  
    Generic odbtp driver. Odbtp is a software for accessing
+  Windows ODBC data sources from other operating systems.
    
+      		
+  
    Y/N
    
+      		
+  
    odbtp
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    odbtp_unicode
    
+      		
+  
    C
    
+      		
+  
    Odtbp with unicode support
    
+      		
+  
    Y/N
    
+      		
+  
    odbtp
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    oracle
    
+      		
+  
    C
    
+      		
+  
    Implements old Oracle 7
+  client API. Use oci8 driver if possible for better performance.
    
+      		
+  
    Y/N
    
+      		
+  
    Oracle client
    
+      		
+  
    Unix and Windows
    
+  
    
+  
    netezza
    
+      		
+  
    C
    
+      		
+  
    Netezza driver. Netezza is
+  based on postgres code-base.
    
+      		
+  
    Y
    
+      		
+  
    ?
    
+      		
+  
    ?
    
+  
    
+  
    pdo
    
+      		
+  
    C
    
+      		
+  
    Generic PDO driver for
+  PHP5. 
    
+      		
+  
    Y
    
+      		
+  
    PDO extension and database
+  specific drivers
    
+      		
+  
    Unix and Windows. 
    
+  
    
+  
    postgres
    
+      		
+  
    A
    
+      		
+  
    Generic PostgreSQL driver.
+  Currently identical to postgres7 driver.
    
+      		
+  
    Y
    
+      		
+  
    PostgreSQL client
    
+      		
+  
    Unix and Windows. 
    
+  
    
+  
    postgres64
    
+      		
+  
    A
    
+      		
+  
    For PostgreSQL 6.4 and
+  earlier which does not support LIMIT internally.
    
+      		
+  
    Y
    
+      		
+  
    PostgreSQL client
    
+      		
+  
    Unix and Windows. 
    
+  
    
+  
    postgres7
    
+      		
+  
    A
    
+      		
+  
    PostgreSQL which supports
+  LIMIT and other version 7 functionality.
    
+      		
+  
    Y
    
+      		
+  
    PostgreSQL client
    
+      		
+  
    Unix and Windows. 
    
+  
    
+  
    postgres8
    
+      		
+  
    A
    
+      		
+  
    PostgreSQL which supports
+  version 8 functionality.
    
+      		
+  
    Y
    
+      		
+  
    PostgreSQL client
    
+      		
+  
    Unix and Windows. 
    
+  
    
+  
    sapdb
    
+      		
+  
    C
    
+      		
+  
    SAP DB. Should work
+  reliably as based on ODBC driver.
    
+      		
+  
    Y/N
    
+      		
+  
    SAP ODBC client
    
+      		
+  
    ?
    
+  
    
+  
    sqlanywhere
    
+      		
+  
    C
    
+      		
+  
    Sybase SQL Anywhere. Should
+  work reliably as based on ODBC driver.
    
+      		
+  
    Y/N
    
+      		
+  
    SQL Anywhere ODBC client
    
+      		
+  
    ?
    
+  
    
+  
    sqlite
    
+      		
+  
    B
    
+      		
+  
    SQLite.
    
+      		
+  
    Y
    
+      		
+  
    -
    
+      		
+  
    Unix and Windows.
    
+  
    
+  
    sqlitepo
    
+      		
+  
    B
    
+      		
+  
    Portable SQLite driver. This
+  is because assoc mode does not work like other drivers in sqlite. Namely,
+  when selecting (joining) multiple tables, the table names are included in the
+  assoc keys in the "sqlite" driver.
    
+  
    In "sqlitepo" driver, the table
+  names are stripped from the returned column names. When this results in a
+  conflict, the first field get preference. 
    
+      		
+  
    Y
    
+      		
+  
    -
    
+      		
+  
    Unix and Windows.
    
+  
    
+  
    sybase
    
+      		
+  
    C
    
+      		
+  
    Sybase. 
    
+      		
+  
    Y/N
    
+      		
+  
    Sybase client
    
+      		
+  
    Unix and Windows.
    
+  
    
+  
    sybase_ase
    
+      		
+  
    C
    
+      		
+  
    Sybase ASE. 
    
+      		
+  
    Y/N
    
+      		
+  
    Sybase client
    
+      		
+  
    Unix and Windows.
    
+  
    
+
+
    The "Tested" column indicates how extensively the code has been
+tested and used. 
    
+A = well tested and used by many people
    
+B = tested and usable, but some features might not be implemented
    
+C = user contributed or experimental driver. Might not fully support all of the
+latest features of ADOdb. 
    
+
+
    The column "RecordCount() usable" indicates whether RecordCount()
+return the number of rows, or returns -1 when a SELECT statement is executed.
+If this column displays Y/N then the RecordCount() is emulated when the global
+variable $ADODB_COUNTRECS=true (this is the default). Note that for large
+recordsets, it might be better to disable RecordCount() emulation because
+substantial amounts of memory are required to cache the recordset for counting.
+Also there is a speed penalty of 40-50% if emulation is required. This is
+emulated in most databases except for PostgreSQL and MySQL. This variable is
+checked every time a query is executed, so you can selectively choose which
+recordsets to count.
    
+
+
    
+
+
    
+
+
    
+
+
    Tutorials
    
+
+
    Example 1: Select Statement
    
+
+
    Task: Connect to the Access Northwind DSN, display the first 2 columns of
+each row.
    
+
+
    In this example, we create a ADOConnection object, which represents the
+connection to the database. The connection is initiated with PConnect, which is a persistent
+connection. Whenever we want to query the database, we call the ADOConnection.Execute()
+function. This returns an ADORecordSet object which is actually a cursor that
+holds the current row in the array fields[].
+We use MoveNext()
+to move from row to row.
    
+
+
    NB: A useful function that is not used in this example is SelectLimit,
+which allows us to limit the number of rows shown. 
    
+
+
    <?
    
+include('adodb.inc.php');  # load code common to ADOdb
    
+$conn = &ADONewConnection('access'); # create a connection
    
+$conn->PConnect('northwind'); # connect to MS-Access, northwind DSN
    
+$recordSet = &$conn->Execute('select * from products');
    
+if (!$recordSet) 
    
+ print $conn->ErrorMsg();
    
+else
    
+while (!$recordSet->EOF) {
    
+ print $recordSet->fields[0].' '.$recordSet->fields[1].'<BR>';
    
+ $recordSet->MoveNext();
    
+}
     
    $recordSet->Close(); # optional
    
+$conn->Close(); # optional
    
+
    
+
    ?>
    
+
+
    The $recordSet returned
+stores the current row in the $recordSet->fields
+array, indexed by column number (starting from zero). We use the MoveNext()
+function to move to the next row. The EOF
+property is set to true when end-of-file is reached. If an error occurs in
+Execute(), we return false instead of a recordset.
    
+
+
    The $recordSet->fields[]
+array is generated by the PHP database extension. Some database extensions only
+index by number and do not index the array by field name. To force indexing by
+name - that is associative arrays - use the SetFetchMode function. Each
+recordset saves and uses whatever fetch mode was set when the recordset was
+created in Execute() or SelectLimit(). 
    
+
+
     $db->SetFetchMode(ADODB_FETCH_NUM);
    
+ $rs1 = $db->Execute('select * from table');
    
+ $db->SetFetchMode(ADODB_FETCH_ASSOC);
    
+ $rs2 = $db->Execute('select * from table');
    
+ print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
     print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
    
+
+
    To get the number of rows in the select statement, you can use $recordSet->RecordCount().
+Note that it can return -1 if the number of rows returned cannot be determined.
    
+
+
    Example 2: Advanced Select with Field Objects
    
+
+
    Select a table, display the first two columns. If the second column is a
+date or timestamp, reformat the date to US format.
    
+
+
    <?
    
+include('adodb.inc.php');  # load code common to ADOdb
    
+$conn = &ADONewConnection('access'); # create a connection
    
+$conn->PConnect('northwind'); # connect to MS-Access, northwind dsn
    
+$recordSet = &$conn->Execute('select CustomerID,OrderDate from Orders');
    
+if (!$recordSet) 
    
+ print $conn->ErrorMsg();
    
+else
    
+while (!$recordSet->EOF) {
    
+ $fld = $recordSet->FetchField(1);
     $type = $recordSet->MetaType($fld->type);
    
+
    
+ if ( $type == 'D' || $type == 'T') 
    
+ print $recordSet->fields[0].' '.
    
+ $recordSet->UserDate($recordSet->fields[1],'m/d/Y').'<BR>';
    
+ else 
     print $recordSet->fields[0].' '.$recordSet->fields[1].'<BR>';
    
+
    
+ $recordSet->MoveNext();
    
+}
    $recordSet->Close(); # optional
    
+$conn->Close(); # optional
    
+
    
+
    ?>
    
+
+
    In this example, we check the field type of the second column using FetchField().
+This returns an object with at least 3 fields.
    
+
+
      
+ 
    • name: name of column
      • 
+ 
    • type: native field
+     type of column
      • 
+ 
    • max_length: maximum
+     length of field. Some databases such as MySQL do not return the maximum
+     length of the field correctly. In these cases max_length will be set to
+     -1.
      • 
+
    
+
+
    We then use MetaType()
+to translate the native type to a generic type. Currently the following generic
+types are defined:
    
+
+
      
+ 
    • C: character fields
+     that should be shown in a <input type="text"> tag.
      • 
+ 
    • X: TeXt, large text
+     fields that should be shown in a <textarea>
      • 
+ 
    • B: Blobs, or Binary
+     Large Objects. Typically images. 
      • 
+ 
    • D: Date field
      • 
+ 
    • T: Timestamp field
      • 
+ 
    • L: Logical field
+     (boolean or bit-field)
      • 
+ 
    • I:  Integer
+     field
      • 
+ 
    • N: Numeric field.
+     Includes autoincrement, numeric, floating point, real and integer. 
      • 
+ 
    • R: Serial field.
+     Includes serial, autoincrement integers. This works for selected
+     databases. 
      • 
+
    
+
+
    If the metatype is of type date or timestamp, then we print it using the
+user defined date format with UserDate(), which converts the PHP SQL date string
+format to a user defined one. Another use for MetaType() is data validation before doing an SQL
+insert or update.
    
+
+
    Example 3: Inserting
    
+
+
    Insert a row to the Orders table containing dates and strings that need to
+be quoted before they can be accepted by the database, eg: the single-quote in
+the word John's.
    
+
+
    <?
    
+include('adodb.inc.php');  # load code common to ADOdb
    
+$conn = &ADONewConnection('access'); # create a connection
    
+
    
+$conn->PConnect('northwind'); # connect to MS-Access, northwind dsn
    
+$shipto = $conn->qstr("John's Old Shoppe");
    
+
    
+$sql = "insert into orders (customerID,EmployeeID,OrderDate,ShipName) ";
    
+$sql .= "values ('ANATR',2,".$conn->DBDate(time()).",$shipto)";
    
+
    
+if ($conn->Execute($sql) === false) {
    
+ print 'error inserting: '.$conn->ErrorMsg().'<BR>';
    
+}
    
+?>
    
+
+
    In this example, we see the advanced date and quote handling facilities of
+ADOdb. The unix timestamp (which is a long integer) is appropriately formated
+for Access with DBDate(),
+and the right escape character is used for quoting the John's Old Shoppe,
+which is John''s Old Shoppe and not PHP's default John's
+Old Shoppe with qstr().
+
    
+
+
    Observe the error-handling of the Execute statement. False is returned by Execute() if
+an error occured. The error message for the last error that occurred is
+displayed in ErrorMsg().
+Note: php_track_errors might have to be enabled for error messages to be
+saved.
    
+
+
    Example 4: Debugging
    
+
+
    <?
    
+include('adodb.inc.php');  # load code common to ADOdb
    
+$conn = &ADONewConnection('access'); # create a connection
    
+$conn->PConnect('northwind'); # connect to MS-Access, northwind dsn
    
+$shipto = $conn->qstr("John's Old Shoppe");
    
+$sql = "insert into orders (customerID,EmployeeID,OrderDate,ShipName) ";
    
+$sql .= "values ('ANATR',2,".$conn->FormatDate(time()).",$shipto)";
    
+$conn->debug = true;
    if ($conn->Execute($sql) === false) print 'error inserting';
    ?>
    
+
+
    In the above example, we have turned on debugging by setting debug = true.
+This will display the SQL statement before execution, and also show any error
+messages. There is no need to call ErrorMsg() in this case. For displaying the
+recordset, see the rs2html()
+example.
    
+
+
    Also see the section on Custom Error Handlers.
    
+
+
    Example 5: MySQL and Menus
    
+
+
    Connect to MySQL database agora, and generate a <select> menu
+from an SQL statement where the <option> captions are in the 1st column,
+and the value to send back to the server is in the 2nd column.
    
+
+
    <?
    
+include('adodb.inc.php'); # load code common to ADOdb
    
+$conn = &ADONewConnection('mysql'); # create a connection
    
+$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
    
+$sql = 'select CustomerName, CustomerID from customers';
    
+$rs = $conn->Execute($sql);
    
+print $rs->GetMenu('GetCust','Mary Rosli');
    
+?>
    
+
+
    Here we define a menu named GetCust, with the menu option 'Mary Rosli'
+selected. See GetMenu(). We also have functions that return
+the recordset as an array: GetArray(), and as an associative array with the
+key being the first column: GetAssoc().
    
+
+
    Example 6: Connecting to 2 Databases At Once
    
+
+
    <?
    
+include('adodb.inc.php');  # load code common to ADOdb
    
+$conn1 = &ADONewConnection('mysql'); # create a mysql connection
    
+$conn2 = &ADONewConnection('oracle'); # create a oracle connection
    
+
    
+$conn1->PConnect($server, $userid, $password, $database);
    
+$conn2->PConnect(false, $ora_userid, $ora_pwd, $oraname);
    
+
    
+$conn1->Execute('insert ...');
    
+$conn2->Execute('update ...');
    
+?>
    
+
+
    Example 7: Generating Update and Insert SQL
    
+
+
    Since ADOdb 4.56, we support AutoExecute(),
+which simplifies things by providing an advanced wrapper for GetInsertSQL() and
+GetUpdateSQL(). For example, an INSERT can be carried out with: 
    
+
+
     
     $record["firstname"] = "Bob"; 
    $record["lastname"] = "Smith"; 
    $record["created"] = time(); 
    $insertSQL = $conn->AutoExecute($rs, $record, 'INSERT'); 
    
+
+
    and an UPDATE with: 
    
+
+
     
     $record["firstname"] = "Caroline"; 
    $record["lastname"] = "Smith"; # Update Caroline's lastname from Miranda to Smith 
    $insertSQL = $conn->AutoExecute($rs, $record, 'UPDATE', 'id = 1'); 
    
+
+
    The rest of this section is out-of-date: 
    
+
+
    ADOdb 1.31 and later supports two new recordset functions: GetUpdateSQL( )
+and GetInsertSQL( ). This allow you to perform a "SELECT * FROM table
+query WHERE...", make a copy of the $rs->fields, modify the fields, and
+then generate the SQL to update or insert into the table automatically. 
    
+
+
    We show how the functions can be used when accessing a table with the
+following fields: (ID, FirstName, LastName, Created). 
    
+
+
    Before these functions can be called, you need to initialize the recordset by
+performing a select on the table. Idea and code by Jonathan Younger
+jyounger#unilab.com. Since ADOdb 2.42, you can pass a table name instead of a
+recordset into GetInsertSQL (in $rs), and it will generate an insert statement
+for that table. 
    
+
+
    <?
    
+#==============================================
    
+# SAMPLE GetUpdateSQL() and GetInsertSQL() code
    
+#==============================================
    
+include('adodb.inc.php');
    
+include('tohtml.inc.php');
    
+
    
+#==========================
    
+# This code tests an insert
    
+
    
+$sql = "SELECT * FROM ADOXYZ WHERE id = -1"; 
    
+# Select an empty record from the database
    
+
    
+$conn = &ADONewConnection("mysql"); # create a connection
    
+$conn->debug=1;
    
+$conn->PConnect("localhost", "admin", "", "test"); # connect to MySQL, testdb
    
+$rs = $conn->Execute($sql); # Execute the query and get the empty recordset
    
+
    
+$record = array(); # Initialize an array to hold the record data to insert
    
+
    
+# Set the values for the fields in the record
    
+# Note that field names are case-insensitive
    
+$record["firstname"] = "Bob";
    
+$record["lastNamE"] = "Smith";
    
+$record["creaTed"] = time();
    
+
    
+# Pass the empty recordset and the array containing the data to insert
    
+# into the GetInsertSQL function. The function will process the data and return
    
+# a fully formatted insert sql statement.
    
+$insertSQL = $conn->GetInsertSQL($rs, $record);
    
+
    
+$conn->Execute($insertSQL); # Insert the record into the database
    
+
    
+#==========================
    
+# This code tests an update
    
+
    
+$sql = "SELECT * FROM ADOXYZ WHERE id = 1"; 
    
+# Select a record to update
    
+
    
+$rs = $conn->Execute($sql); # Execute the query and get the existing record to update
    
+
    
+$record = array(); # Initialize an array to hold the record data to update
    
+
    
+# Set the values for the fields in the record
    
+# Note that field names are case-insensitive
    
+$record["firstname"] = "Caroline";
    
+$record["LasTnAme"] = "Smith"; # Update Caroline's lastname from Miranda to Smith
    
+
    
+# Pass the single record recordset and the array containing the data to update
    
+# into the GetUpdateSQL function. The function will process the data and return
    
+# a fully formatted update sql statement with the correct WHERE clause.
    
+# If the data has not changed, no recordset is returned
    
+$updateSQL = $conn->GetUpdateSQL($rs, $record);
    
+
    
+$conn->Execute($updateSQL); # Update the record in the database
    
+$conn->Close();
    
+?>
    
+
+
    $ADODB_FORCE_TYPE
    
+
+
    The behaviour of AutoExecute(), GetUpdateSQL() and GetInsertSQL() when
+converting empty or null PHP variables to SQL is controlled by the global
+$ADODB_FORCE_TYPE variable. Set it to one of the values below. Default is
+ADODB_FORCE_VALUE (3): 
    
+
+
    0 = ignore empty fields. All empty fields in array are ignored.
    
+1 = force null. All empty, php null and string 'null' fields are changed to sql NULL values.
    
+2 = force empty. All empty, php null and string 'null' fields are changed to sql empty '' or 0 values.
    
+3 = force value. Value is left as it is. Php null and string 'null' are set to sql NULL values and 
    
+ empty fields '' are set to empty '' sql values.
    
+
    
+define('ADODB_FORCE_IGNORE',0);
    
+define('ADODB_FORCE_NULL',1);
    
+define('ADODB_FORCE_EMPTY',2);
    
+define('ADODB_FORCE_VALUE',3);
    
+
+
    Thanks to Niko (nuko#mbnet.fi) for the $ADODB_FORCE_TYPE code. 
    
+
+
    Note: the constant ADODB_FORCE_NULLS is obsolete since 4.52 and is ignored.
+Set $ADODB_FORCE_TYPE = ADODB_FORCE_NULL for equivalent behaviour. 
    
+
+
    Since 4.62, the table name to be used can be overridden by setting
+$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is
+called. 
    
+
+
    Example 8: Implementing Scrolling with Next and Previous
    
+
+
    The following code creates a very simple recordset pager, where you can
+scroll from page to page of a recordset.
    
+
+
    include_once('../adodb.inc.php');
    
+include_once('../adodb-pager.inc.php');
    
+session_start();
    
+
    
+$db = NewADOConnection('mysql');
    
+
    
+$db->Connect('localhost','root','','xphplens');
    
+
    
+$sql = "select * from adoxyz ";
    
+
    
+$pager = new ADODB_Pager($db,$sql);
    
+$pager->Render($rows_per_page=5);
    
+
+
    This will create a basic record pager that looks like this: 
    
+
+
+ 
+  
+ 
+ 
+  
+ 
+ 
+  
+ 
+
    
+  
    |<
+    <<
+    >>
+    >|
+    
    
+  
    
+  
+   
+    
+    
+    
+    
+   
+   
+    
+    
+    
+    
+   
+   
+    
+    
+    
+    
+   
+   
+    
+    
+    
+    
+   
+   
+    
+    
+    
+    
+   
+   
+    
+    
+    
+    
+   
+  
    
+    
    ID
    
+        		
+    
    First Name
    
+        		
+    
    Last Name
    
+        		
+    
    Date Created
    
+    
    
+    
    36 
    
+        		
+    
    Alan 
    
+        		
+    
    Turing 
    
+        		
+    
    Sat 06, Oct 2001 
    
+    
    
+    
    37 
    
+        		
+    
    Serena 
    
+        		
+    
    Williams 
    
+        		
+    
    Sat 06, Oct 2001 
    
+    
    
+    
    38 
    
+        		
+    
    Yat Sun 
    
+        		
+    
    Sun 
    
+        		
+    
    Sat 06, Oct 2001 
    
+    
    
+    
    39 
    
+        		
+    
    Wai Hun 
    
+        		
+    
    See 
    
+        		
+    
    Sat 06, Oct 2001 
    
+    
    
+    
    40 
    
+        		
+    
    Steven 
    
+        		
+    
    Oey 
    
+        		
+    
    Sat 06, Oct 2001 
    
+    
    
+  
    
+  
    
+  
    Page 8/10
    
+  
    
+
+
    The number of rows to display at one time is controled by the Render($rows)
+method. If you do not pass any value to Render(), ADODB_Pager will default to
+10 records per page. 
    
+
+
    You can control the column titles by modifying your SQL (supported by most
+databases): 
    
+
+
    $sql = 'select id as "ID", firstname as "First Name", 
    
+  lastname as "Last Name", created as "Date Created" 
    
+ from adoxyz';
    
+
+
    The above code can be found in the adodb/tests/testpaging.php example
+included with this release, and the class ADODB_Pager in adodb/adodb-pager.inc.php.
+The ADODB_Pager code can be adapted by a programmer so that the text links can
+be replaced by images, and the dull white background be replaced with more
+interesting colors. 
    
+
+
    You can also allow display of html by setting $pager->htmlSpecialChars =
+false. 
    
+
+
    Some of the code used here was contributed by Ivn Oliva and Cornel G. 
    
+
+
    Example 9: Exporting in CSV or Tab-Delimited Format
    
+
+
    We provide some helper functions to export in comma-separated-value (CSV)
+and tab-delimited formats:
    
+
+
    include_once('/path/to/adodb/toexport.inc.php');
    
+include_once('/path/to/adodb/adodb.inc.php');
    
+
    
+
    $db = &NewADOConnection('mysql');
    
+$db->Connect($server, $userid, $password, $database);
    
+
    
+$rs = $db->Execute('select fname as "First Name", surname as "Surname" from table');
    
+
    
+print "<pre>";
    
+print rs2csv($rs); # return a string, CSV format
    
+
+
    print '<hr>';
    
+
    
+$rs->MoveFirst(); # note, some databases do not support MoveFirst
    
+print rs2tab($rs,false); # return a string, tab-delimited
    
+ # false == suppress field names in first line
    
+
+
    print '<hr>';
    
+$rs->MoveFirst();
    
+rs2tabout($rs); # send to stdout directly (there is also an rs2csvout function)
    
+print "</pre>";
    
+
    
+$rs->MoveFirst();
    
+$fp = fopen($path, "w");
    
+if ($fp) {
    
+ rs2csvfile($rs, $fp); # write to file (there is also an rs2tabfile function)
    
+ fclose($fp);
    
+}
    
+
+
    Carriage-returns or newlines are converted to spaces. Field names are
+returned in the first line of text. Strings containing the delimiter character
+are quoted with double-quotes. Double-quotes are double-quoted again. This
+conforms to Excel import and export guide-lines. 
    
+
+
    All the above functions take as an optional last parameter, $addtitles which
+defaults to true. When set to false field names in the first line
+are suppressed. 
    
+
+
    Example 10: Recordset Filters
    
+
+
    Sometimes we want to pre-process all rows in a recordset before we use it.
+For example, we want to ucwords all text in recordset. 
    
+
+
    include_once('adodb/rsfilter.inc.php');
    
+include_once('adodb/adodb.inc.php');
    
+
    
+// ucwords() every element in the recordset
    
+function do_ucwords(&$arr,$rs)
    
+{
    
+ foreach($arr as $k => $v) {
    
+ $arr[$k] = ucwords($v);
    
+ }
    
+}
    
+
    
+$db = NewADOConnection('mysql');
    
+$db->PConnect('server','user','pwd','db');
    
+
    
+$rs = $db->Execute('select ... from table');
    
+$rs = RSFilter($rs,'do_ucwords');
    
+
+
    The RSFilter function takes 2 parameters, the recordset, and the name
+of the filter function. It returns the processed recordset scrolled to
+the first record. The filter function takes two parameters, the current
+row as an array, and the recordset object. For future compatibility, you should
+not use the original recordset object. 
    
+
+
    Example 11: Smart Transactions
    
+
+
    The old way of doing transactions required you to use 
    
+
+
    $conn->BeginTrans();
    
+$ok = $conn->Execute($sql);
    
+if ($ok) $ok = $conn->Execute($sql2);
    
+if (!$ok) $conn->RollbackTrans();
    
+else $conn->CommitTrans();
    
+
+
    This is very complicated for large projects because you have
+to track the error status. Smart Transactions is much simpler. You start a
+smart transaction by calling StartTrans(): 
    
+
+
    $conn->StartTrans();
    
+$conn->Execute($sql);
    
+$conn->Execute($Sql2);
    
+$conn->CompleteTrans();
    
+
+
    CompleteTrans() detects when an SQL error occurs, and will
+Rollback/Commit as appropriate. To specificly force a rollback even if no error
+occured, use FailTrans(). Note that the rollback is done in CompleteTrans(),
+and not in FailTrans(). 
    
+
+
    $conn->StartTrans();
    
+$conn->Execute($sql);
    
+if (!CheckRecords()) $conn->FailTrans();
    
+$conn->Execute($Sql2);
    
+$conn->CompleteTrans();
    
+
+
    You can also check if a transaction has failed, using HasFailedTrans(),
+which returns true if FailTrans() was called, or there was an error in the SQL
+execution. Make sure you call HasFailedTrans() before you call CompleteTrans(),
+as it is only works between StartTrans/CompleteTrans. 
    
+
+
    Lastly, StartTrans/CompleteTrans is nestable, and only the outermost block
+is executed. In contrast, BeginTrans/CommitTrans/RollbackTrans is NOT nestable.
+
    
+
+
    $conn->StartTrans();
    
+$conn->Execute($sql);
    
+ $conn->StartTrans(); # ignored
     if (!CheckRecords()) $conn->FailTrans();
     $conn->CompleteTrans(); # ignored
    $conn->Execute($Sql2);
    $conn->CompleteTrans();
    
+
+
    Note: Savepoints are currently not supported. 
    
+
+
    Using Custom Error Handlers and PEAR_Error
    
+
+
    ADOdb supports PHP5 exceptions. Just include adodb-exceptions.inc.php
+and you can now catch exceptions on errors as they occur. 
    
+
+
     include("../adodb-exceptions.inc.php"); 
    
+ include("../adodb.inc.php");  
    
+ try { 
    
+ $db = NewADOConnection("oci8://scott:bad-password@mytns/"); 
    
+ } catch (exception $e) { 
    
+ var_dump($e); 
    
+ adodb_backtrace($e->gettrace());
    
+ } 
    
+
+
    ADOdb also provides two custom handlers which you can modify for your needs.
+The first one is in the adodb-errorhandler.inc.php file. This makes use
+of the standard PHP functions error_reporting
+to control what error messages types to display, and trigger_error which invokes the default
+PHP error handler. 
    
+
+
    Including the above file will cause trigger_error($errorstring,E_USER_ERROR)
+to be called when
    
+(a) Connect() or PConnect() fails, or 
    
+(b) a function that executes SQL statements such as Execute() or SelectLimit()
+has an error.
    
+(c) GenID() appears to go into an infinite loop. 
    
+
+
    The $errorstring is generated by ADOdb and will contain useful debugging
+information similar to the error.log data generated below. This file
+adodb-errorhandler.inc.php should be included before you create any
+ADOConnection objects. 
    
+
+
    If you define error_reporting(0), no errors will be passed to the error
+handler. If you set error_reporting(E_ALL), all errors will be passed to the
+error handler. You still need to use ini_set("display_errors",
+"0" or "1") to control the display of errors. 
    
+
+
    <?php
    
+error_reporting(E_ALL); # pass any error messages triggered to error handler
    
+include('adodb-errorhandler.inc.php');
    include('adodb.inc.php');
    include('tohtml.inc.php');
    $c = NewADOConnection('mysql');
    $c->PConnect('localhost','root','','northwind');
    $rs=$c->Execute('select * from productsz'); #invalid table productsz');
    if ($rs) rs2html($rs);
    ?>
    
+
+
    If you want to log the error message, you can do so by defining the
+following optional constants ADODB_ERROR_LOG_TYPE and ADODB_ERROR_LOG_DEST.
+ADODB_ERROR_LOG_TYPE is the error log message type (see error_log in the PHP manual). In this case
+we set it to 3, which means log to the file defined by the constant
+ADODB_ERROR_LOG_DEST. 
    
+
+
    <?php
    
+error_reporting(E_ALL); # report all errors
    
+ini_set("display_errors", "0"); # but do not echo the errors
    
+define('ADODB_ERROR_LOG_TYPE',3);
    
+define('ADODB_ERROR_LOG_DEST','C:/errors.log');
    
+include('adodb-errorhandler.inc.php');
    include('adodb.inc.php');
    include('tohtml.inc.php');
     
    $c = NewADOConnection('mysql');
    $c->PConnect('localhost','root','','northwind');
    $rs=$c->Execute('select * from productsz'); ## invalid table productsz
    if ($rs) rs2html($rs);
    ?>
    
+
+
    The following message will be logged in the error.log file: 
    
+
+
    (2001-10-28 14:20:38) mysql error: [1146: Table 'northwind.productsz' doesn't exist] in
    
+EXECUTE("select * from productsz")
    
+
+
    PEAR_ERROR
    
+
+
    The second error handler is adodb-errorpear.inc.php.
+This will create a PEAR_Error derived object whenever an error occurs. The last
+PEAR_Error object created can be retrieved using ADODB_Pear_Error(). 
    
+
+
    <?php
    
+include('adodb-errorpear.inc.php');
    include('adodb.inc.php');
    include('tohtml.inc.php');
    $c = NewADOConnection('mysql');
    $c->PConnect('localhost','root','','northwind');
    $rs=$c->Execute('select * from productsz'); #invalid table productsz');
    if ($rs) rs2html($rs);
    else {
     $e = ADODB_Pear_Error();
    
+ echo '<p>',$e->message,'</p>';
    }
    ?>
    
+
+
    You can use a PEAR_Error derived class by defining the constant
+ADODB_PEAR_ERROR_CLASS before the adodb-errorpear.inc.php file is included. For
+easy debugging, you can set the default error handler in the beginning of the
+PHP script to PEAR_ERROR_DIE, which will cause an error message to be printed,
+then halt script execution: 
    
+
+
    include('PEAR.php');
    
+PEAR::setErrorHandling('PEAR_ERROR_DIE');
    
+
+
    Note that we do not explicitly return a PEAR_Error object to you when an
+error occurs. We return false instead. You have to call ADODB_Pear_Error() to
+get the last error or use the PEAR_ERROR_DIE technique. 
    
+
+
    MetaError and MetaErrMsg
    
+
+
    If you need error messages that work across multiple databases, then use MetaError(), which returns a virtualized error number,
+based on PEAR DB's error number system, and MetaErrMsg().
+
    
+
+
    Error Messages
    
+
+
    Error messages are outputted using the static method
+ADOConnnection::outp($msg,$newline=true). By default, it sends the messages to
+the client. You can override this to perform error-logging. 
    
+
+
    Data Source Names
    
+
+
    We now support connecting using PEAR style DSN's. A DSN is a connection
+string of the form:
    
+
+
    $dsn = "$driver://$username:$password@$hostname/$databasename";
    
+
+
    An example:
    
+
+
     $username = 'root';
    
+ $password = '';
    
+ $hostname = 'localhost';
    
+ $databasename = 'xphplens';
    
+ $driver = 'mysql';
    
+ $dsn = "$driver://$username:$password@$hostname/$databasename"
    
+ $db = NewADOConnection(); 
    
+ # DB::Connect($dsn) also works if you include 'adodb/adodb-pear.inc.php' at the top
    
+ $rs = $db->query('select firstname,lastname from adoxyz');
    
+ $cnt = 0;
    
+ while ($arr = $rs->fetchRow()) {
    
+ print_r($arr); print "<br>";
    
+ }
    
+
+
    More info and connection examples on the DSN
+format. 
    
+
+
    PEAR Compatibility
    
+
+
    We support DSN's (see above), and the following functions: 
    
+
+
    DB_Common
      query - returns PEAR_Error on error
     limitQuery - return PEAR_Error on error
     prepare - does not return PEAR_Error on error
     execute - does not return PEAR_Error on error
     setFetchMode - supports ASSOC and ORDERED
     errorNative
     quote
     nextID
     disconnect
     
     getOne
     getAssoc
     getRow
     getCol
     
     DB_Result
      numRows - returns -1 if not supported
     numCols
     fetchInto - does not support passing of fetchmode
     fetchRows - does not support passing of fetchmode
     free
    
+
+
    Caching of Recordsets
    
+
+
    ADOdb now supports caching of recordsets in the file system using the
+CacheExecute( ), CachePageExecute( ) and CacheSelectLimit( ) functions. There
+are similar to the non-cache functions, except that they take a new first
+parameter, $secs2cache. 
    
+
+
    An example: 
    
+
+
    include('adodb.inc.php'); # load code common to ADOdb
    
+$ADODB_CACHE_DIR = '/usr/ADODB_cache';
    
+$conn = &ADONewConnection('mysql'); # create a connection
    
+$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
    
+$sql = 'select CustomerName, CustomerID from customers';
    
+$rs = $conn->CacheExecute(15,$sql);
    
+
+
    The first parameter is the number of seconds to cache the query. Subsequent
+calls to that query will used the cached version stored in $ADODB_CACHE_DIR. To
+force a query to execute and flush the cache, call CacheExecute() with the
+first parameter set to zero. Alternatively, use the CacheFlush($sql) call. 
    
+
+
    For the sake of security, we recommend you set register_globals=off in
+php.ini if you are using $ADODB_CACHE_DIR.
    
+
+
    In ADOdb 1.80 onwards, the secs2cache parameter is optional in
+CacheSelectLimit() and CacheExecute(). If you leave it out, it will use the
+$connection->cacheSecs parameter, which defaults to 60 minutes. The following
+are equivalent: 
    
+
+
     
     # (1)
     $rs = $db->SelectLimit(30, 'select * from table', 10);
     
    # (2)
     $db->cacheSsecs = 30;
     $rs = $db->SelectLimit('select * from table', 10);
     
     $conn->Connect(...);
    
+ $conn->cacheSecs = 3600*24; # cache 24 hours
    
+ $rs = $conn->CacheExecute('select * from table');
    
+
+
    Please note that magic_quotes_runtime should be turned off. Do not change
+$ADODB_FETCH_MODE (or SetFetchMode) as the cached recordset will use the
+$ADODB_FETCH_MODE set when the query was executed. 
    
+
+
    MemCache support
    
+
+
    You can also share cached recordsets on
+a memcache server. The memcache API supports one or more pooled hosts. Only if
+none of the pooled servers can be contacted will a connect error be generated.
+Example below: 
    
+
+
     
    $db = NewADOConnection($driver='mysql');
    $db->memCache = true;
    $db->memCacheHost = array($ip1, $ip2, $ip3); /// $db->memCacheHost = $ip1; will work too
    $db->memCachePort = 11211; /// this is default memCache port
    $db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
     
    $db->Connect(...);
    $db->CacheExecute($sql);
    
+
+
    More info on memcache can be found at http://www.danga.com/memcached/. 
    
+
+
    Caching API
    
+
+
    There is also a caching API since
+4.99/5.05. Two implementations of the API are already available providing file
+and memcache support. 
    
+
+
    The new API for creating your custom
+caching class uses 2 globals: 
    
+
+
      
+ 
    • $ADODB_CACHE_CLASS: name of caching class 
      • 
+ 
    • $ADODB_CACHE: instance of $ADODB_CACHE_CLASS 
      • 
+
    
+
+
     
    include "/path/to/adodb.inc.php";
    $ADODB_CACHE_CLASS = 'MyCacheClass';
     
    class MyCacheClass extends ADODB_Cache_File
    {
     var $createdir = false; // do not set this to true unless you use temp directories in cache path
     function writecache($filename, $contents,$debug=false){...}
     function &readcache($filename, &$err, $secs2cache, $rsClass){ ...}
      :
    }
     
    $DB = NewADOConnection($driver);
    $DB->Connect(...); ## MyCacheClass created here and stored in $ADODB_CACHE global variable.
     
    $data = $rs->CacheGetOne($sql); ## MyCacheClass is used here for caching...
    
+
+
+
+
    Pivot Tables
    
+
+
    Since ADOdb 2.30, we support the generation of SQL to create pivot tables,
+also known as cross-tabulations. For further explanation read this DevShed Cross-Tabulation tutorial.
+We assume that your database supports the SQL case-when expression. 
    
+
+
    In this example, we will use the Northwind database from Microsoft. In the
+database, we have a products table, and we want to analyze this table by suppliers
+versus product categories. We will place the suppliers on each row, and
+pivot on categories. So from the table on the left, we generate the pivot-table
+on the right:
    
+
+
    
+
+
+ 
+  
+  
+  
+ 
+
    
+  
    
+  
+   
+    
+    
+   
+   
+    
+    
+   
+   
+    
+    
+   
+   
+    
+    
+   
+  
    
+    
    Supplier
    
+        		
+    
    Category
    
+    
    
+    
    supplier1
    
+        		
+    
    category1
    
+    
    
+    
    supplier2
    
+        		
+    
    category1
    
+    
    
+    
    supplier2
    
+        		
+    
    category2
    
+    
    
+  
    
+  
    
+      		
+  
    -->
    
+      		
+  
    
+  
+   
+    
+    
+    
+    
+   
+   
+    
+    
+    
+    
+   
+   
+    
+    
+    
+    
+   
+  
    
+    
     
    
+        		
+    
    category1
    
+        		
+    
    category2
    
+        		
+    
    total
    
+    
    
+    
    supplier1
    
+        		
+    
    1
    
+        		
+    
    0
    
+        		
+    
    1
    
+    
    
+    
    supplier2
    
+        		
+    
    1
    
+        		
+    
    1
    
+        		
+    
    2
    
+    
    
+  
    
+  
    
+  
    
+
+
    
+
+
    The following code will generate the SQL for a cross-tabulation: 
    
+
+
    # Query the main "product" table
    
+# Set the rows to SupplierName
    
+# and the columns to the values of Categories
    
+# and define the joins to link to lookup tables 
    
+# "categories" and "suppliers"
    
+#
    
+include "adodb/pivottable.inc.php";
    
+$sql = PivotTableSQL(
    
+ $gDB, # adodb connection
    
+ 'products p ,categories c ,suppliers s', # tables
    
+ 'SupplierName', # rows (multiple fields allowed)
    
+ 'CategoryName', # column to pivot on 
    
+ 'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
    
+);
    
+
+
    This will generate the following SQL:
    
+
+
    SELECT SupplierName, 
    
+SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS
+"Beverages", 
    
+SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS
+"Condiments", 
    
+SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS
+"Confections", 
    
+SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS
+"Dairy Products", 
    
+SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS
+"Grains/Cereals", 
    
+SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS
+"Meat/Poultry", 
    
+SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS
+"Produce", 
    
+SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS
+"Seafood", 
    
+SUM(1) as Total 
    
+FROM products p ,categories c ,suppliers s WHERE p.CategoryID =
+c.CategoryID and s.SupplierID= p.SupplierID 
    
+GROUP BY SupplierName
    
+
+
    You can also pivot on numerical columns and generate totals by
+using ranges. This code was revised in ADODB 2.41 and is not backward
+compatible. The second example shows this:
    
+
+
    $sql = PivotTableSQL(
    
+ $gDB, # adodb connection
    
+ 'products p ,categories c ,suppliers s', # tables
    
+ 'SupplierName', # rows (multiple fields allowed)
     array( # column ranges
     ' 0 ' => 'UnitsInStock <= 0',
     "1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
     "6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
     "11 to 15" => '10 < UnitsInStock and UnitsInStock <= 15',
     "16+" => '15 < UnitsInStock'
     ),
     ' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
     'UnitsInStock', # sum this field
     'Sum ' # sum label prefix
    );
    
+
+
    Which generates: 
    
+
+
    SELECT SupplierName, 
    
+SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS
+"Sum 0 ", 
    
+SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN
+UnitsInStock ELSE 0 END) AS "Sum 1 to 5",
    
+SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock
+ELSE 0 END) AS "Sum 6 to 10",
    
+SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN
+UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
    
+SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS
+"Sum 16+", 
    
+SUM(UnitsInStock) AS "Sum UnitsInStock", 
    
+SUM(1) as Total,
    
+FROM products p ,categories c ,suppliers s WHERE p.CategoryID =
+c.CategoryID and s.SupplierID= p.SupplierID 
    
+GROUP BY SupplierName
    
+
+
    
+
+
    
+
+
    
+
+
    Class Reference
    
+
+
    Function parameters with [ ] around them are optional.
    
+
+
    Global Variables
    
+
+
    $ADODB_COUNTRECS
    
+
+
    If the database driver API does not support counting the number of records
+returned in a SELECT statement, the function RecordCount() is emulated when the
+global variable $ADODB_COUNTRECS is set to true, which is the default. We
+emulate this by buffering the records, which can take up large amounts of
+memory for big recordsets. Set this variable to false for the best performance.
+This variable is checked every time a query is executed, so you can selectively
+choose which recordsets to count.
    
+
+
    $ADODB_CACHE_DIR
    
+
+
    If you are using recordset caching, this is the directory to save your
+recordsets in. Define this before you call any caching functions such as
+CacheExecute( ). We recommend setting register_globals=off in php.ini if
+you use this feature for security reasons.
    
+
+
    If you are using Unix and apache, you might need to set your cache directory
+permissions to something similar to the following:
    
+
+
    chown -R apache /path/to/adodb/cache
    
+chgrp -R apache /path/to/adodb/cache 
    
+
+
    $ADODB_ANSI_PADDING_OFF
    
+
+
    Determines whether to right trim CHAR fields (and also VARCHAR for
+ibase/firebird). Set to true to trim. Default is false. Currently works for
+oci8po, ibase and firebird drivers. Added in ADOdb 4.01. 
    
+
+
    $ADODB_LANG
    
+
+
    Determines the language used in MetaErrorMsg(). The default is 'en', for
+English. To find out what languages are supported, see the files in
+adodb/lang/adodb-$lang.inc.php, where $lang is the supported langauge. 
    
+
+
    $ADODB_FETCH_MODE
    
+
+
    This is a global variable that determines how arrays are retrieved by recordsets.
+The recordset saves this value on creation (eg. in Execute( ) or SelectLimit(
+)), and any subsequent changes to $ADODB_FETCH_MODE have no affect on existing
+recordsets, only on recordsets created in the future.
    
+
+
    The following constants are defined:
    
+
+
    define('ADODB_FETCH_DEFAULT',0);
    
+define('ADODB_FETCH_NUM',1);
    
+define('ADODB_FETCH_ASSOC',2);
    
+define('ADODB_FETCH_BOTH',3); 
    
+
+
    An example: 
    
+
+
     $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
    
+ $rs1 = $db->Execute('select * from table');
    
+ $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
    
+ $rs2 = $db->Execute('select * from table');
    
+ print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
     print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
    
+
+
    As you can see in the above example, both recordsets store and use different
+fetch modes based on the $ADODB_FETCH_MODE setting when the recordset was
+created by Execute().
    
+
+
    If no fetch mode is predefined, the fetch mode defaults to
+ADODB_FETCH_DEFAULT. The behaviour of this default mode varies from driver to
+driver, so do not rely on ADODB_FETCH_DEFAULT. For portability, we recommend
+sticking to ADODB_FETCH_NUM or ADODB_FETCH_ASSOC. Many drivers do not support
+ADODB_FETCH_BOTH.
    
+
+
    SetFetchMode Function
    
+
+
    If you have multiple connection objects, and want to have different fetch
+modes for each connection, then use SetFetchMode.
+Once this function is called for a connection object, that connection object
+will ignore the global variable $ADODB_FETCH_MODE and will use the internal
+fetchMode property exclusively.
    
+
+
     $db->SetFetchMode(ADODB_FETCH_NUM);
    
+ $rs1 = $db->Execute('select * from table');
    
+ $db->SetFetchMode(ADODB_FETCH_ASSOC);
    
+ $rs2 = $db->Execute('select * from table');
    
+ print_r($rs1->fields); # shows array([0]=>'v0',[1] =>'v1')
     print_r($rs2->fields); # shows array(['col1']=>'v0',['col2'] =>'v1')
    
+
+
    To retrieve the previous fetch mode, you can use check the $db->fetchMode
+property, or use the return value of SetFetchMode( ). 
    
+
+
    ADODB_ASSOC_CASE
    
+
+
    You can control the associative fetch case for certain drivers which behave
+differently. For the sybase, oci8po, mssql, odbc and ibase drivers and all
+drivers derived from them, ADODB_ASSOC_CASE will by default generate recordsets
+where the field name keys are lower-cased. Use the constant ADODB_ASSOC_CASE to
+change the case of the keys. There are 3 possible values:
    
+
+
    0 = assoc lowercase field names. $rs->fields['orderid']
    
+1 = assoc uppercase field names. $rs->fields['ORDERID']
    
+2 = use native-case field names. $rs->fields['OrderID'] -- this is the
+default since ADOdb 2.90
    
+
+
    To use it, declare it before you incldue adodb.inc.php.
    
+
+
    define('ADODB_ASSOC_CASE', 2); # use native-case for ADODB_FETCH_ASSOC
    
+include('adodb.inc.php'); 
    
+
+
    $ADODB_FORCE_TYPE
    
+
+
    See the GetUpdateSQL tutorial. 
    
+
+
    $ADODB_QUOTE_FIELDNAMES
    
+
+
    Auto-quotes field names when using AutoExecute() when set to true. 
    
+
+
     
    
+
+
    
+
+
    
+
+
    
+
+
    ADOConnection
    
+
+
    Object that performs the connection to the database, executes SQL statements
+and has a set of utility functions for standardising the format of SQL
+statements for issues such as concatenation and date formats.
    
+
+
    ADOConnection Fields
    
+
+
    databaseType: Name of the database system we are connecting to. Eg. odbc
+or mssql or mysql.
    
+
+
    dataProvider: The underlying mechanism used to connect to the
+database. Normally set to native, unless using odbc or ado.
    
+
+
    host: Name of server or data source name (DSN) to connect to.
    
+
+
    database: Name of the database or to connect to. If ado is used, it
+will hold the ado data provider.
    
+
+
    user: Login id to connect to database. Password is not saved for
+security reasons.
    
+
+
    raiseErrorFn: Allows you to define an error handling function. See
+adodb-errorhandler.inc.php for an example.
    
+
+
    debug: Set to true to make debug statements to appear.
    
+
+
    concat_operator: Set to '+' or '||' normally. The operator used to
+concatenate strings in SQL. Used by the Concat
+function.
    
+
+
    fmtDate: The format used by the DBDate
+function to send dates to the database. is '#Y-m-d#' for Microsoft Access, and
+''Y-m-d'' for MySQL.
    
+
+
    fmtTimeStamp: The format used by the DBTimeStamp
+function to send timestamps to the database. 
    
+
+
    true: The value used to represent true.Eg. '.T.'. for Foxpro, '1' for
+Microsoft SQL.
    
+
+
    false: The value used to represent false. Eg. '.F.'. for Foxpro, '0'
+for Microsoft SQL.
    
+
+
    replaceQuote: The string used to escape quotes. Eg. double
+single-quotes for Microsoft SQL, and backslash-quote for MySQL. Used by qstr.
    
+
+
    autoCommit: indicates whether automatic commit is enabled. Default is
+true.
    
+
+
    charSet: set the default charset to use. Currently only
+interbase/firebird supports this.
    
+
+
    dialect: set the default sql dialect to use. Currently only interbase/firebird
+supports this.
    
+
+
    role: set the role. Currently only interbase/firebird supports this.
    
+
+
    metaTablesSQL: SQL statement to return a list of available tables.
+Eg. SHOW TABLES in MySQL.
    
+
+
    genID: The latest id generated by GenID() if supported by the
+database.
    
+
+
    cacheSecs: The number of seconds to cache recordsets if
+CacheExecute() or CacheSelectLimit() omit the $secs2cache parameter. Defaults
+to 60 minutes.
    
+
+
    sysDate: String that holds the name of the database function to call
+to get the current date. Useful for inserts and updates.
    
+
+
    sysTimeStamp: String that holds the name of the database function to
+call to get the current timestamp/datetime value.
    
+
+
    leftOuter: String that holds operator for left outer join, if known.
+Otherwise set to false.
    
+
+
    rightOuter: String that holds operator for left outer join, if known.
+Otherwise set to false.
    
+
+
    ansiOuter: Boolean that if true indicates that ANSI style outer joins
+are permitted. Eg. select * from table1 left join table2 on p1=p2.
    
+
+
    connectSID: Boolean that indicates whether to treat the $database
+parameter in connects as the SID for the oci8 driver. Defaults to false. Useful
+for Oracle 8.0.5 and earlier.
    
+
+
    autoRollback: Persistent connections are auto-rollbacked in PConnect(
+) if this is set to true. Default is false.
    
+
+
    
+
+
    
+
+
    
+
+
    ADOConnection Main Functions
    
+
+
    ADOConnection( )
    
+
+
    Constructor function. Do not call this directly. Use ADONewConnection( )
+instead.
    
+
+
    Connect($host,[$user],[$password],[$database])
    
+
+
    Non-persistent connect to data source or server $host, using userid $user
+and password $password. If the server supports multiple databases,
+connect to database $database. 
    
+
+
    Returns true/false depending on connection success. Since 4.23, null is
+returned if the extension is not loaded.
    
+
+
    ADO Note: If
+you are using a Microsoft ADO and not OLEDB, you can set the $database
+parameter to the OLEDB data provider you are using.
    
+
+
    PostgreSQL: An alternative way of connecting to the database is to pass the
+standard PostgreSQL connection string in the first parameter $host, and the
+other parameters will be ignored.
    
+
+
    For Oracle and Oci8, there are two ways to connect. First is to use the TNS
+name defined in your local tnsnames.ora (or ONAMES or HOSTNAMES). Place the
+name in the $database field, and set the $host field to false. Alternatively,
+set $host to the server, and $database to the database SID, this bypassed
+tnsnames.ora. 
    
+
+
    Examples: 
    
+
+
    # $oraname in tnsnames.ora/ONAMES/HOSTNAMES
    
+$conn->Connect(false, 'scott', 'tiger', $oraname); 
    
+$conn->Connect('server:1521', 'scott', 'tiger', 'ServiceName'); # bypass tnsnames.ora
    
+
+
    There are many examples of connecting to a database. See Connection Examples for many examples. 
    
+
+
    PConnect($host,[$user],[$password],[$database])
    
+
+
    Persistent connect to data source or server $host, using userid $user
+and password $password. If the server supports multiple databases,
+connect to database $database.
    
+
+
    We now perform a rollback on persistent connection for selected databases
+since 2.21, as advised in the PHP manual. See change log or source code for
+which databases are affected. 
    
+
+
    Returns true/false depending on connection. Since 4.23, 0 is returned if the
+extension is not loaded. See Connect( ) above for more info.
    
+
+
    Since ADOdb 2.21, we also support autoRollback. If you set:
    
+
+
    $conn = &NewADOConnection('mysql');
    
+$conn->autoRollback = true; # default is false
    
+$conn->PConnect(...); # rollback here
    
+
+
    Then when doing a persistent connection with PConnect( ), ADOdb will perform
+a rollback first. This is because it is documented that PHP is not guaranteed
+to rollback existing failed transactions when persistent connections are used.
+This is implemented in Oracle, MySQL, PgSQL, MSSQL, ODBC currently. 
    
+
+
    Since ADOdb 3.11, you can force non-persistent connections even if PConnect
+is called by defining the constant ADODB_NEVER_PERSIST before you call
+PConnect. 
    
+
+
    Since 4.23, null is returned if the extension is not loaded. 
    
+
+
    NConnect($host,[$user],[$password],[$database])
    
+
+
    Always force a new connection. In contrast, PHP sometimes reuses connections
+when you use Connect() or PConnect(). Currently works only on mysql (PHP 4.3.0
+or later), postgresql and oci8-derived drivers. For other drivers, NConnect()
+works like Connect().
    
+
+
    IsConnected( )
    
+
+
    Returns true if connected to database. Added in 4.53. 
    
+
+
    Execute($sql,$inputarr=false)
    
+
+
    Execute SQL statement $sql and return derived class of ADORecordSet
+if successful. Note that a record set is always returned on success, even if we
+are executing an insert or update statement. You can also pass in $sql a
+statement prepared in Prepare().
    
+
+
    Returns derived class of ADORecordSet. Eg. if connecting via mysql, then
+ADORecordSet_mysql would be returned. False is returned if there was an error
+in executing the sql.
    
+
+
    The $inputarr parameter can be used for binding variables to parameters.
+Below is an Oracle example:
    
+
+
    $conn->Execute("SELECT * FROM TABLE WHERE COND=:val", array('val'=> $val));
    
+
    
+
+
    Another example, using ODBC,which uses the ? convention:
    
+
+
     $conn->Execute("SELECT * FROM TABLE WHERE COND=?", array($val));
    
+
+
    Binding variables
    
+
+
    Variable binding speeds the compilation and caching of SQL statements,
+leading to higher performance. Currently Oracle, Interbase and ODBC supports
+variable binding. Interbase/ODBC style ? binding is emulated in databases that
+do not support binding. Note that you do not have to quote strings if you use
+binding. 
    
+
+
    Variable binding in the odbc, interbase and oci8po drivers. 
    
+
+
    $rs = $db->Execute('select * from table where val=?', array('10'));
    
+
+
    Variable binding in the oci8 driver: 
    
+
+
    $rs = $db->Execute('select name from table where val=:key', 
    
+ array('key' => 10));
    
+
+
    Bulk binding 
    
+
+
    Since ADOdb 3.80, we support bulk binding in Execute(), in which you pass in
+a 2-dimensional array to be bound to an INSERT/UPDATE or DELETE statement. And since ADOdb 5.11 this is
+disabled by default due to security issues. To enable, set $conn->bulkBind = true. 
    
+
+
    $arr = array(
    
+ array('Ahmad',32),
    
+ array('Zulkifli', 24),
    
+ array('Rosnah', 21)
    
+ );
    
+$ok = $db->Execute('insert into table (name,age) values (?,?)',$arr);
    
+
+
    This provides very high performance as the SQL statement is prepared first.
+The prepared statement is executed repeatedly for each array row until all rows
+are completed, or until the first error. Very useful for importing data. 
    
+
+
    CacheExecute([$secs2cache,]$sql,$inputarr=false)
    
+
+
    Similar to Execute, except that the recordset is cached for $secs2cache
+seconds in the $ADODB_CACHE_DIR directory, and $inputarr only accepts
+1-dimensional arrays. If CacheExecute() is called again with the same $sql,
+$inputarr, and also the same database, same userid, and the cached recordset
+has not expired, the cached recordset is returned. 
    
+
+
     include('adodb.inc.php'); 
    
+ include('tohtml.inc.php');
    
+ $ADODB_CACHE_DIR = '/usr/local/ADOdbcache';
    
+ $conn = &ADONewConnection('mysql'); 
    
+ $conn->PConnect('localhost','userid','password','database');
    
+ $rs = $conn->CacheExecute(15, 'select * from table'); # cache 15 secs
    
+ rs2html($rs); /* recordset to html table */ 
    
+
+
    Alternatively, since ADOdb 1.80, the $secs2cache parameter is optional:
    
+
+
     $conn->Connect(...);
    
+  $conn->cacheSecs = 3600*24; // cache 24 hours
    
+ $rs = $conn->CacheExecute('select * from table');
    
+
+
    If $secs2cache is omitted, we use the value in
+$connection->cacheSecs (default is 3600 seconds, or 1 hour). Use
+CacheExecute() only with SELECT statements. 
    
+
+
    Performance note: I have done some benchmarks and found that they vary so
+greatly that it's better to talk about when caching is of benefit. When your
+database server is much slower than your Web server or the database is very
+overloaded then ADOdb's caching is good because it reduces the load on your
+database server. If your database server is lightly loaded or much faster than
+your Web server, then caching could actually reduce performance. 
    
+
+
    ExecuteCursor($sql,$cursorName='rs',$parameters=false)
    
+
+
    Execute an Oracle stored procedure, and returns an Oracle REF cursor
+variable as a regular ADOdb recordset. Does not work with any other database
+except oci8. Thanks to Robert Tuttle for the design. 
    
+
+
     $db = ADONewConnection("oci8"); 
    
+ $db->Connect("foo.com:1521", "uid", "pwd", "FOO"); 
    
+ $rs = $db->ExecuteCursor("begin :cursorvar := getdata(:param1); end;", 
    
+ 'cursorvar',
    
+ array('param1'=>10)); 
    
+ # $rs is now just like any other ADOdb recordset object
    
+ rs2html($rs);
    
+
+
    ExecuteCursor() is a helper function that does the following internally: 
    
+
+
     $stmt = $db->Prepare("begin :cursorvar := getdata(:param1); end;", true); 
    
+ $db->Parameter($stmt, $cur, 'cursorvar', false, -1, OCI_B_CURSOR);
    
+ $rs = $db->Execute($stmt,$bindarr);
    
+
+
    ExecuteCursor only accepts 1 out parameter. So if you have 2 out parameters,
+use: 
    
+
+
     $vv = 'A%';
    
+ $stmt = $db->PrepareSP("BEGIN list_tabs(:crsr,:tt); END;");
    
+ $db->OutParameter($stmt, $cur, 'crsr', -1, OCI_B_CURSOR);
    
+ $db->OutParameter($stmt, $vv, 'tt', 32); # return varchar(32)
    
+ $arr = $db->GetArray($stmt);
    
+ print_r($arr);
    
+ echo " val = $vv"; ## outputs 'TEST'
    
+
+
    for the following PL/SQL: 
    
+
+
     TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
    
+
    
+ PROCEDURE list_tabs(tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) IS
    
+ BEGIN
    
+ OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
    
+ tablenames := 'TEST';
    
+ END list_tabs;
    
+
+
    SelectLimit($sql,$numrows=-1,$offset=-1,$inputarr=false)
    
+
+
    Returns a recordset if successful. Returns false otherwise. Performs a
+select statement, simulating PostgreSQL's SELECT statement, LIMIT $numrows
+OFFSET $offset clause.
    
+
+
    In PostgreSQL, SELECT * FROM TABLE LIMIT 3 will return the first 3 records
+only. The equivalent is $connection->SelectLimit('SELECT
+* FROM TABLE',3). This functionality is simulated for databases
+that do not possess this feature.
    
+
+
    And SELECT * FROM TABLE LIMIT 3 OFFSET 2 will return records 3, 4 and 5 (eg.
+after record 2, return 3 rows). The equivalent in ADOdb is $connection->SelectLimit('SELECT * FROM TABLE',3,2).
    
+
+
    Note that this is the opposite of MySQL's LIMIT clause. You can also
+set $connection->SelectLimit('SELECT *
+FROM TABLE',-1,10) to get rows 11 to the last row.
    
+
+
    The last parameter $inputarr is for databases that support variable binding
+such as Oracle oci8. This substantially reduces SQL compilation overhead. Below
+is an Oracle example:
    
+
+
    $conn->SelectLimit("SELECT * FROM TABLE WHERE COND=:val", 100,-1,array('val'=> $val));
    
+
    
+
+
    The oci8po driver (oracle portable driver) uses the more standard bind
+variable of ?: 
    
+
+
    $conn->SelectLimit("SELECT * FROM TABLE WHERE COND=?", 100,-1,array('val'=> $val));
    
+
+
    Ron Wilson reports that SelectLimit does not work with UNIONs. 
    
+
+
    CacheSelectLimit([$secs2cache,] $sql,
+$numrows=-1,$offset=-1,$inputarr=false)
    
+
+
    Similar to SelectLimit, except that the recordset returned is cached for
+$secs2cache seconds in the $ADODB_CACHE_DIR directory. 
    
+
+
    Since 1.80, $secs2cache has been optional, and you can define the caching
+time in $connection->cacheSecs.
    
+
+
     $conn->Connect(...);
    
+ $conn->cacheSecs = 3600*24; // cache 24 hours
    
+ $rs = $conn->CacheSelectLimit('select * from table',10);
    
+
+
    CacheFlush($sql=false,$inputarr=false)
    
+
+
    Flush (delete) any cached recordsets for the SQL statement $sql in
+$ADODB_CACHE_DIR. 
    
+
+
    If no parameter is passed in, then all adodb_*.cache files are deleted. 
    
+
+
    CacheSelectLimit() rewrites the SQL query, so you won't be able to pass the
+SQL to CacheFlush. In this case, to flush the cached SQL recordset returned by
+CacheSelectLimit(), set $secs2cache to -1: 
    
+
+
     
     $db->CacheSelectLimit(-1, $sql, $nrows);
    
+
+
    If you want to flush all cached recordsets manually, execute the following
+PHP code (works only under Unix): 
    
+  system("rm -f `find
+".$ADODB_CACHE_DIR." -name adodb_*.cache`");
    
+
+
    For general cleanup of all expired files, you should use crontab on Unix,
+or at.exe on Windows, and a shell script similar to the following:
    
+#------------------------------------------------------ 
    
+# This particular example deletes files in the TMPPATH 
    
+# directory with the string ".cache" in their name that 
    
+# are more than 7 days old. 
    
+#------------------------------------------------------ 
    
+AGED=7 
    
+find ${TMPPATH} -mtime +$AGED | grep "\.cache" | xargs rm -f 
    
+
+
    MetaError($errno=false)
    
+
+
    Returns a virtualized error number, based on PEAR DB's error number system.
+You might need to include adodb-error.inc.php before you call this function.
+The parameter $errno is the native error number you want to convert. If you do
+not pass any parameter, MetaError will call ErrorNo() for you and convert it.
+If the error number cannot be virtualized, MetaError will return -1 (DB_ERROR).
    
+
+
    MetaErrorMsg($errno)
    
+
+
    Pass the error number returned by MetaError() for the equivalent textual
+error message.
    
+
+
    ErrorMsg()
    
+
+
    Returns the last status or error message. The error message is reset after
+every call to Execute(). 
    
+
+
    This can return a string even if no error occurs. In general you do not need
+to call this function unless an ADOdb function returns false on an error. 
    
+
+
    Note: If debug is enabled, the SQL error message is always displayed
+when the Execute function is called.
    
+
+
    ErrorNo()
    
+
+
    Returns the last error number. The error number is reset after every call to
+Execute(). If 0 is returned, no error occurred. 
    
+
+
    Note that old versions of PHP (pre 4.0.6) do not support error number for
+ODBC. In general you do not need to call this function unless an ADOdb function
+returns false on an error.
    
+
+
    IgnoreErrors($saveErrHandlers)
    
+
+
    Allows you to ignore errors so that StartTrans()/CompleteTrans() is not
+affected, nor is the default error handler called if an error occurs. Useful
+when you want to check if a field or table exists in a database without
+invoking an error if it does not exist. 
    
+
+
    Usage: 
    
+
+
     
    $saveErrHandlers = $conn->IgnoreErrors();
    $rs = $conn->Execute("select field from some_table_that_might_not_exist");
    $conn->IgnoreErrors($saveErrHandlers);
    
+
+
    Warning: do not call StartTrans()/CompleteTrans() inside a code block that
+is using IgnoreErrors(). 
    
+
+
    SetFetchMode($mode)
    
+
+
    Sets the current fetch mode for the connection and stores it in
+$db->fetchMode. Legal modes are ADODB_FETCH_ASSOC and ADODB_FETCH_NUM. For
+more info, see $ADODB_FETCH_MODE.
    
+
+
    Returns the previous fetch mode, which could be false if SetFetchMode( ) has
+not been called before.
    
+
+
    CreateSequence($seqName = 'adodbseq',$startID=1)
    
+
+
    Create a sequence. The next time GenID( ) is called, the value returned will
+be $startID. Added in 2.60. 
    
+
+
    DropSequence($seqName = 'adodbseq')
    
+
+
    Delete a sequence. Added in 2.60. 
    
+
+
    GenID($seqName = 'adodbseq',$startID=1)
    
+
+
    Generate a sequence number . Works for interbase, mysql, postgresql, oci8,
+oci8po, mssql, ODBC based (access,vfp,db2,etc) drivers currently. Uses $seqName
+as the name of the sequence. GenID() will automatically create the sequence for
+you if it does not exist (provided the userid has permission to do so).
+Otherwise you will have to create the sequence yourself. 
    
+
+
    If your database driver emulates sequences, the name of the table is the
+sequence name. The table has one column, "id" which should be of type
+integer, or if you need something larger - numeric(16). 
    
+
+
    For ODBC and databases that do not support sequences natively (eg mssql,
+mysql), we create a table for each sequence. If the sequence has not been
+defined earlier, it is created with the starting value set in $startID.
    
+
+
    Note that the mssql driver's GenID() before 1.90 used to generate 16 byte
+GUID's.
    
+
+
    UpdateBlob($table,$column,$val,$where)
    
+
+
    Allows you to store a blob (in $val) into $table into
+$column in a row at $where. 
    
+
+
    Usage: 
    
+
+
     # for oracle
    
+ $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, empty_blob())');
    
+ $conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
    
+ 
    
+ # non oracle databases
    
+ $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
    
+ $conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
    
+
+
    Returns true if succesful, false otherwise. Supported by MySQL, PostgreSQL,
+Oci8, Oci8po and Interbase drivers. Other drivers might work, depending on the
+state of development.
    
+
+
    Note that when an Interbase blob is retrieved using SELECT, it still needs
+to be decoded using $connection->DecodeBlob($blob); to derive the original
+value in versions of PHP before 4.1.0. 
    
+
+
    For PostgreSQL, you can store your blob using blob oid's or as a bytea field.
+You can use bytea fields but not blob oid's currently with UpdateBlob( ).
+Conversely UpdateBlobFile( ) supports oid's, but not bytea data.
    
+
    
+If you do not pass in an oid, then UpdateBlob() assumes that you are storing in
+bytea fields. 
    
+
+
    If you do not have any blob fields, you can improve you can improve general
+SQL query performance by disabling blob handling with
+$connection->disableBlobs = true. 
    
+
+
    UpdateClob($table,$column,$val,$where)
    
+
+
    Allows you to store a clob (in $val) into $table into
+$column in a row at $where. Similar to UpdateBlob (see above), but for
+Character Large OBjects. 
    
+
+
    Usage: 
    
+
+
     # for oracle
    
+ $conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, empty_clob())');
    
+ $conn->UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');
    
+ 
    
+ # non oracle databases
    
+ $conn->Execute('INSERT INTO clobtable (id, clobcol) VALUES (1, null)');
    
+ $conn->UpdateBlob('clobtable','clobcol',$clobvalue,'id=1');
    
+
+
    UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB')
    
+
+
    Similar to UpdateBlob, except that we pass in a file path to where the blob
+resides. 
    
+
+
    For PostgreSQL, if you are using blob oid's, use this interface. This
+interface does not support bytea fields. 
    
+
+
    Returns true if successful, false otherwise. 
    
+
+
    BlobEncode($blob) 
    
+
+
    Some databases require blob's to be encoded manually before upload. Note if
+you use UpdateBlob( ) or UpdateBlobFile( ) the conversion is done automatically
+for you and you do not have to call this function. For PostgreSQL, currently,
+BlobEncode() can only be used for bytea fields. 
    
+
+
    Returns the encoded blob value. 
    
+
+
    Note that there is a connection property called blobEncodeType
+which has 3 legal values: 
    
+
+
    false - no need to perform encoding or decoding.
    
+'I' - blob encoding required, and returned encoded blob is a numeric value (no
+need to quote).
    
+'C' - blob encoding required, and returned encoded blob is a character value
+(requires quoting). 
    
+
+
    This is purely for documentation purposes, so that programs that accept
+multiple database drivers know what is the right thing to do when processing
+blobs. 
    
+
+
    BlobDecode($blob, $maxblobsize = false)
+
    
+
+
    Some databases require blob's to be decoded manually after doing a select
+statement. If the database does not require decoding, then this function will
+return the blob unchanged. Currently BlobDecode is only required for one
+database, PostgreSQL, and only if you are using blob oid's (if you are using
+bytea fields, we auto-decode for you). The default maxblobsize is set in
+$connection->maxblobsize, which is set to 256K in adodb 4.54. 
    
+
+
    In ADOdb 4.54 and later, the blob is the return value. In earlier versions,
+the blob data is sent to stdout.
    
+
+
    $rs = $db->Execute("select bloboid from postgres_table where id=$key");
    
+$blob = $db->BlobDecode( reset($rs->fields) );
    
+
+
    Replace($table, $arrFields,
+$keyCols,$autoQuote=false)
    
+
+
    Try to update a record, and if the record is not found, an insert statement
+is generated and executed. Returns 0 on failure, 1 if update statement worked,
+2 if no record was found and the insert was executed successfully. This differs
+from MySQL's replace which deletes the record and inserts a new record. This
+also means you cannot update the primary key. The only exception to this is
+Interbase and its derivitives, which uses delete and insert because of some
+Interbase API limitations. 
    
+
+
    The parameters are $table which is the table name, the $arrFields which is
+an associative array where the keys are the field names, and $keyCols is the
+name of the primary key, or an array of field names if it is a compound key. If
+$autoQuote is set to true, then Replace() will quote all values that are
+non-numeric; auto-quoting will not quote nulls. Note that auto-quoting will not
+work if you use SQL functions or operators. 
    
+
+
    Examples: 
    
+
+
    # single field primary key
    
+$ret = $db->Replace('atable', 
    
+ array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
    
+ 'id',$autoquote = true); 
    
+# generates UPDATE atable SET firstname='Harun',lastname='Al-Rashid' WHERE id=1000
    
+# or INSERT INTO atable (id,firstname,lastname) VALUES (1000,'Harun','Al-Rashid')
    
+
    
+# compound key
    
+$ret = $db->Replace('atable2', 
    
+ array('firstname'=>'Harun','lastname'=>'Al-Rashid', 'age' => 33, 'birthday' => 'null'),
    
+ array('lastname','firstname'),
    
+ $autoquote = true);
    
+
    
+# no auto-quoting
    
+$ret = $db->Replace('atable2', 
    
+ array('firstname'=>"'Harun'",'lastname'=>"'Al-Rashid'", 'age' => 'null'),
    
+ array('lastname','firstname')); 
    
+
+
    AutoExecute($table, $arrFields, $mode,
+$where=false, $forceUpdate=true,$magicq=false)
    
+
+
    Since ADOdb 4.56, you can automatically generate and execute INSERTs and
+UPDATEs on a given table with this function, which is a wrapper for
+GetInsertSQL() and GetUpdateSQL(). 
    
+
+
    AutoExecute() inserts or updates $table given an array of $arrFields, where
+the keys are the field names and the array values are the field values to
+store. Note that there is some overhead because the table is first queried to
+extract key information before the SQL is generated. We generate an INSERT or
+UPDATE based on $mode (see below). 
    
+
+
    Legal values for $mode are 
    
+
+
      
+ 
    • 'INSERT' or 1 or DB_AUTOQUERY_INSERT
+     
      • 
+ 
    • 'UPDATE' or 2 or
+     DB_AUTOQUERY_UPDATE 
      • 
+
    
+
+
    You have to define the constants DB_AUTOQUERY_UPDATE and DB_AUTOQUERY_INSERT
+yourself or include adodb-pear.inc.php. 
    
+
+
    The $where clause is required if $mode == 'UPDATE'. If $forceUpdate=false
+then we will query the database first and check if the field value returned by
+the query matches the current field value; only if they differ do we update
+that field. 
    
+
+
    Returns true on success, false on error. 
    
+
+
    An example of its use is: 
    
+
+
     
    $record["firstName"] = "Carol";
    $record["lasTname"] = "Smith"; 
    $conn->AutoExecute($table,$record,'INSERT');
    # executes "INSERT INTO $table (firstName,lasTname) values ('Carol',Smith')";
     
    $record["firstName"] = "Carol";
    $record["lasTname"] = "Jones"; 
    $conn->AutoExecute($table,$record,'UPDATE', "lastname like 'Sm%'");
    # executes "UPDATE $table SET firstName='Carol',lasTname='Jones' WHERE lastname like 'Sm%'";
    
+
+
    Note: One of the strengths of ADOdb's AutoExecute() is that only valid field
+names for $table are updated. If $arrFields contains keys that are invalid
+field names for $table, they are ignored. There is some overhead in doing this
+as we have to query the database to get the field names, but given that you are
+not directly coding the SQL yourself, you probably aren't interested in speed
+at all, but convenience. 
    
+
+
    Since 4.62, the table name to be used can be overridden by setting
+$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is
+called. 
    
+
+
    Since 4.94, setting the global variable $ADODB_QUOTE_FIELDNAMES to true will
+force field names to be auto-quoted in AutoExecute(), GetInsertSQL() and
+GetUpdateSQL(). 
    
+
+
    GetUpdateSQL(&$rs, $arrFields,
+$forceUpdate=false,$magicq=false, $force=null)
    
+
+
    Generate SQL to update a table given a recordset $rs, and the modified
+fields of the array $arrFields (which must be an associative array holding the
+column names and the new values) are compared with the current recordset. If
+$forceUpdate is true, then we also generate the SQL even if $arrFields is
+identical to $rs->fields. Requires the recordset to be associative. $magicq
+is used to indicate whether magic quotes are enabled (see qstr()). The field
+names in the array are case-insensitive.
    
+
+
    Since 4.52, we allow you to pass the $force type parameter, and this
+overrides the $ADODB_FORCE_TYPE global
+variable. 
    
+
+
    Since 4.62, the table name to be used can be overridden by setting
+$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is
+called. 
    
+
+
    GetInsertSQL(&$rs, $arrFields,$magicq=false,$force_type=false)
    
+
+
    Generate SQL to insert into a table given a recordset $rs. Requires the
+query to be associative. $magicq is used to indicate whether magic quotes are
+enabled (for qstr()). The field names in the array are case-insensitive.
    
+
+
    Since 2.42, you can pass a table name instead of a recordset into
+GetInsertSQL (in $rs), and it will generate an insert statement for that table.
+
    
+
+
    Since 4.52, we allow you to pass the $force_type parameter, and this
+overrides the $ADODB_FORCE_TYPE global
+variable. 
    
+
+
    Since 4.62, the table name to be used can be overridden by setting
+$rs->tableName before AutoExecute(), GetInsertSQL() or GetUpdateSQL() is
+called. 
    
+
+
    PageExecute($sql, $nrows, $page, $inputarr=false)
+
    
+
+
    Used for pagination of recordset. $page is 1-based. See Example
+8.
    
+
+
    CachePageExecute($secs2cache, $sql, $nrows,
+$page, $inputarr=false) 
    
+
+
    Used for pagination of recordset. $page is 1-based. See Example
+8. Caching version of PageExecute.
    
+
+
    Close( )
    
+
+
    Close the database connection. PHP4 proudly states that we no longer have to
+clean up at the end of the connection because the reference counting mechanism
+of PHP4 will automatically clean up for us.
    
+
+
    StartTrans( )
    
+
+
    Start a monitored transaction. As SQL statements are executed, ADOdb will
+monitor for SQL errors, and if any are detected, when CompleteTrans() is
+called, we auto-rollback. 
    
+
+
    To understand why StartTrans() is superior to BeginTrans(), let us examine a
+few ways of using BeginTrans(). The following is the wrong way to use
+transactions: 
    
+
+
    $DB->BeginTrans();
    
+$DB->Execute("update table1 set val=$val1 where id=$id");
    
+$DB->Execute("update table2 set val=$val2 where id=$id");
    
+$DB->CommitTrans();
    
+
+
    because you perform no error checking. It is possible to update table1 and
+for the update on table2 to fail. Here is a better way: 
    
+
+
    $DB->BeginTrans();
    
+$ok = $DB->Execute("update table1 set val=$val1 where id=$id");
    
+if ($ok) $ok = $DB->Execute("update table2 set val=$val2 where id=$id");
    
+if ($ok) $DB->CommitTrans();
    
+else $DB->RollbackTrans();
    
+
+
    Another way is (since ADOdb 2.0): 
    
+
+
    $DB->BeginTrans();
    
+$ok = $DB->Execute("update table1 set val=$val1 where id=$id");
    
+if ($ok) $ok = $DB->Execute("update table2 set val=$val2 where id=$id");
    
+$DB->CommitTrans($ok);
    
+
+
    Now it is a headache monitoring $ok all over the place. StartTrans() is an
+improvement because it monitors all SQL errors for you. This is particularly
+useful if you are calling black-box functions in which SQL queries might be
+executed. Also all BeginTrans, CommitTrans and RollbackTrans calls inside a
+StartTrans block will be disabled, so even if the black box function does a
+commit, it will be ignored. 
    
+
+
    $DB->StartTrans();
    
+CallBlackBox();
    
+$DB->Execute("update table1 set val=$val1 where id=$id");
    
+$DB->Execute("update table2 set val=$val2 where id=$id");
    
+$DB->CompleteTrans();
    
+
+
    Note that a StartTrans blocks are nestable, the inner blocks are ignored. 
    
+
+
    CompleteTrans($autoComplete=true)
    
+
+
    Complete a transaction called with StartTrans(). This function monitors for
+SQL errors, and will commit if no errors have occured, otherwise it will
+rollback. Returns true on commit, false on rollback. If the parameter
+$autoComplete is true monitor sql errors and commit and rollback as
+appropriate. Set $autoComplete to false to force rollback even if no SQL error
+detected. 
    
+
+
    FailTrans( )
    
+
+
    Fail a transaction started with StartTrans(). The rollback will only occur
+when CompleteTrans() is called. 
    
+
+
    HasFailedTrans( )
    
+
+
    Check whether smart transaction has failed, eg. returns true if there was an
+error in SQL execution or FailTrans() was called. If not within smart
+transaction, returns false. 
    
+
+
    BeginTrans( )
    
+
+
    Begin a transaction. Turns off autoCommit. Returns true if successful. Some
+databases will always return false if transaction support is not available. Any
+open transactions will be rolled back when the connection is closed. Among the
+databases that support transactions are Oracle, PostgreSQL, Interbase, MSSQL,
+certain versions of MySQL, DB2, Informix, Sybase, etc.
    
+
+
    Note that StartTrans() and CompleteTrans() is a
+superior method of handling transactions, available since ADOdb 3.40. For a
+explanation, see the StartTrans() documentation. 
    
+
+
    You can also use the ADOdb error handler to die
+and rollback your transactions for you transparently. Some buggy database
+extensions are known to commit all outstanding tranasactions, so you might want
+to explicitly do a $DB->RollbackTrans() in your error handler for safety. 
    
+
+
    Detecting Transactions
    
+
+
    Since ADOdb 2.50, you are able to detect when you are inside a transaction.
+Check that $connection->transCnt > 0. This variable is incremented whenever
+BeginTrans() is called, and decremented whenever RollbackTrans() or
+CommitTrans() is called. 
    
+
+
    CommitTrans($ok=true)
    
+
+
    End a transaction successfully. Returns true if successful. If the database
+does not support transactions, will return true also as data is always
+committed. 
    
+
+
    If you pass the parameter $ok=false, the data is rolled back. See example in
+BeginTrans().
    
+
+
    RollbackTrans( )
    
+
+
    End a transaction, rollback all changes. Returns true if successful. If the
+database does not support transactions, will return false as data is never
+rollbacked. 
    
+
+
    SetTransactionMode($mode )
    
+
+
    SetTransactionMode allows you to pass in the transaction mode to use for all
+subsequent transactions. Note: if you have persistent connections and using
+mssql or mysql, you might have to explicitly reset your transaction mode at the
+beginning of each page request. This is only supported in postgresql, mssql,
+mysql with InnoDB and oci8 currently. For example: 
    
+
+
     
    $db->SetTransactionMode("SERIALIZABLE");
    $db->BeginTrans();
    $db->Execute(...); $db->Execute(...);
    $db->CommiTrans();
     
    $db->SetTransactionMode(""); // restore to default
    $db->StartTrans();
    $db->Execute(...); $db->Execute(...);
    $db->CompleteTrans();
    
+
+
    Supported values to pass in: 
    
+
+
      
+ 
    • READ UNCOMMITTED (allows
+     dirty reads, but fastest) 
      • 
+ 
    • READ COMMITTED (default
+     postgres, mssql and oci8) 
      • 
+ 
    • REPEATABLE READ (default
+     mysql) 
      • 
+ 
    • SERIALIZABLE (slowest and
+     most restrictive) 
      • 
+
    
+
+
    You can also pass in database specific values such as 'SNAPSHOT' for mssql
+or 'READ ONLY' for oci8/postgres. 
    
+
+
    See transaction levels for PostgreSQL,
+Oracle,
+MySQL,
+and MS SQL Server.
+
    
+
+
    GetAssoc($sql,$inputarr=false,$force_array=false,$first2cols=false)
    
+
+
    Returns an associative array for the given query $sql with optional bind
+parameters in $inputarr. If the number of columns returned is greater to two, a
+2-dimensional array is returned, with the first column of the recordset becomes
+the keys to the rest of the rows. If the columns is equal to two, a 1-dimensional
+array is created, where the the keys directly map to the values (unless
+$force_array is set to true, when an array is created for each value). 
    
+
+
    Examples:
    
+
+
    We have the following data in a recordset:
    
+
+
    row1: Apple, Fruit, Edible
    
+row2: Cactus, Plant, Inedible
    
+row3: Rose, Flower, Edible
    
+
+
    GetAssoc will generate the following 2-dimensional associative array:
    
+
+
    Apple => array[Fruit, Edible]
    
+Cactus => array[Plant, Inedible]
    
+Rose => array[Flower,Edible]
    
+
+
    If the dataset is:
    
+
+
    row1: Apple, Fruit
    
+row2: Cactus, Plant
    
+row3: Rose, Flower 
    
+
+
    GetAssoc will generate the following 1-dimensional associative array (with
+$force_array==false):
    
+
+
    Apple => Fruit
    
+Cactus=>Plant
    
+Rose=>Flower 
    
+
+
    The function returns:
    
+
+
    The associative array, or false if an error occurs.
    
+
+
    CacheGetAssoc([$secs2cache,] $sql,$inputarr=false,$force_array=false,$first2cols=false)
    
+
+
    Caching version of GetAssoc function above. 
    
+
+
    GetMedian($table, $field, $where='')
    
+
+
    Returns the median value of $field for $table. The $where clause is
+optional. If used, make sure the WHERE is included, as in "WHERE name >
+'A'". If an error occurs, false is returned. Since ADOdb 5.06 and PHP
+4.991. 
    
+
+
    GetOne($sql,$inputarr=false)
    
+
+
    Executes the SQL and returns the first field of the first row. The recordset
+and remaining rows are discarded for you automatically. If an error occur,
+false is returned; use ErrorNo() or ErrorMsg() to get the error details. Since
+4.96/5.00, we return null if no records were found. And since 4.991/5.06, you
+can have change the return value if no records are found using the global
+variable $ADODB_GETONE_EOF: $ADODB_GETONE_EOF = false;
    
+
+
    GetRow($sql,$inputarr=false)
    
+
+
    Executes the SQL and returns the first row as an array. The recordset and
+remaining rows are discarded for you automatically. If no records are returned,
+an empty array is returned. If an error occurs, false is returned.
    
+
+
    GetAll($sql,$inputarr=false)
    
+
+
    Executes the SQL and returns the all the rows as a 2-dimensional array. The
+recordset is discarded for you automatically. If an error occurs, false is
+returned. GetArray is a synonym for GetAll.
    
+
+
    GetCol($sql,$inputarr=false,$trim=false)
    
+
+
    Executes the SQL and returns all elements of the first column as a
+1-dimensional array. The recordset is discarded for you automatically. If an
+error occurs, false is returned.
    
+
+
    CacheGetOne([$secs2cache,] $sql,$inputarr=false),
+CacheGetRow([$secs2cache,] $sql,$inputarr=false),
+CacheGetAll([$secs2cache,] $sql,$inputarr=false),
+CacheGetCol([$secs2cache,]
+$sql,$inputarr=false,$trim=false)
    
+
+
    Similar to above Get* functions, except that the recordset is serialized and
+cached in the $ADODB_CACHE_DIR directory for $secs2cache seconds. Good for
+speeding up queries on rarely changing data. Note that the $secs2cache
+parameter is optional. If omitted, we use the value in
+$connection->cacheSecs (default is 3600 seconds, or 1 hour). 
    
+
+
    Prepare($sql )
    
+
+
    Prepares (compiles) an SQL query for repeated execution. Bind parameters are
+denoted by ?, except for the oci8 driver, which uses the traditional Oracle
+:varname convention. 
    
+
+
    Returns an array containing the original sql statement in the first array
+element; the remaining elements of the array are driver dependent. If there is
+an error, or we are emulating Prepare( ), we return the original $sql string.
+This is because all error-handling has been centralized in Execute( ).
    
+
+
    Prepare( ) cannot be used with functions that use SQL query rewriting
+techniques, e.g. PageExecute( ) and SelectLimit( ).
    
+
+
    Example:
    
+
+
    $stmt = $DB->Prepare('insert into table (col1,col2) values (?,?)');
    
+for ($i=0; $i < $max; $i++)
    
+ $DB->Execute($stmt,array((string) rand(), $i));
    
+
+
    Also see InParameter(), OutParameter() and PrepareSP() below. Only supported
+internally by interbase, oci8 and selected ODBC-based drivers, otherwise it is
+emulated. There is no performance advantage to using Prepare() with emulation. 
    
+
+
    Important: Due to limitations or bugs in PHP, if you are getting errors when
+you using prepared queries, try setting $ADODB_COUNTRECS = false before
+preparing. This behaviour has been observed with ODBC. 
    
+
+
    IfNull($field, $nullReplacementValue)
    
+
+
    Portable IFNULL function (NVL in Oracle). Returns a string that represents
+the function that checks whether a $field is null for the given database, and
+if null, change the value returned to $nullReplacementValue. Eg.
    
+
+
    $sql = 'SELECT '.$db->IfNull('name', "'- unknown -'"). ' FROM table';
    
+
+
    length
    
+
+
    This is not a function, but a property. Some databases have
+"length" and others "len" as the function to measure the
+length of a string. To use this property: 
    
+
+
     $sql = "SELECT ".$db->length."(field) from table";
    
+ $rs = $db->Execute($sql);
    
+
+
    random
    
+
+
    This is not a function, but a property. This is a string that holds the sql
+to generate a random number between 0.0 and 1.0 inclusive. 
    
+
+
    substr
    
+
+
    This is not a function, but a property. Some databases have
+"substr" and others "substring" as the function to retrieve
+a sub-string. To use this property: 
    
+
+
     $sql = "SELECT ".$db->substr."(field, $offset, $length) from table";
    
+ $rs = $db->Execute($sql);
    
+
+
    For all databases, the 1st parameter of substr is the field, the 2nd
+is the offset (1-based) to the beginning of the sub-string, and the 3rd is the
+length of the sub-string. 
    
+
+
    Param($name)
    
+
+
    Generates a bind placeholder portably. For most databases, the bind
+placeholder is "?". However some databases use named bind parameters
+such as Oracle, eg ":somevar". This allows us to portably define an
+SQL statement with bind parameters: 
    
+
+
    $sql = 'insert into table (col1,col2) values ('.$DB->Param('a').','.$DB->Param('b').')';
    
+# generates 'insert into table (col1,col2) values (?,?)'
    
+# or 'insert into table (col1,col2) values (:a,:b)    '
    
+$stmt = $DB->Prepare($sql);
    
+$stmt = $DB->Execute($stmt,array('one','two'));
    
+
+
    PrepareSP($sql, $cursor=false )
    
+
+
    When calling stored procedures in mssql and oci8 (oracle), and you might
+want to directly bind to parameters that return values, or for special LOB
+handling. PrepareSP() allows you to do so. 
    
+
+
    Returns the same array or $sql string as Prepare( ) above. If you do not
+need to bind to return values, you should use Prepare( ) instead.
    
+
+
    The 2nd parameter, $cursor is not used except with oci8. Setting it to true
+will force OCINewCursor to be called; this is to support output REF CURSORs. 
    
+
+
    For examples of usage of PrepareSP( ), see InParameter( ) below. 
    
+
+
    Note: in the mssql driver, preparing stored procedures requires a special
+function call, mssql_init( ), which is called by this function. PrepareSP( ) is
+available in all other drivers, and is emulated by calling Prepare( ). 
    
+
+
    InParameter($stmt, $var, $name, $maxLen = 4000,
+$type = false )
    
+
+
    Binds a PHP variable as input to a stored procedure
+variable. The parameter $stmt is the value returned by PrepareSP(), $var
+is the PHP variable you want to bind, $name is the name of the stored procedure
+variable. Optional is $maxLen, the maximum length of the data to bind,
+and $type which is database dependant. Consult mssql_bind and ocibindbyname docs at php.net for more
+info on legal values for $type. 
    
+
+
    InParameter() is a wrapper function that calls Parameter() with
+$isOutput=false. The advantage of this function is that it is self-documenting,
+because the $isOutput parameter is no longer needed. Only for mssql and oci8
+currently. 
    
+
+
    Here is an example using oci8: 
    
+
+
    # For oracle, Prepare and PrepareSP are identical
    $stmt = $db->PrepareSP(
     "declare RETVAL integer; 
    
+ begin
    
+ :RETVAL := SP_RUNSOMETHING(:myid,:group);
    
+ end;"    );
    
+$db->InParameter($stmt,$id,'myid');
    
+$db->InParameter($stmt,$group,'group',64);
    
+$db->OutParameter($stmt,$ret,'RETVAL');
    
+$db->Execute($stmt);
    
+
+
    The same example using mssql:
    
+
+
    # @RETVAL = SP_RUNSOMETHING @myid,@group
    $stmt = $db->PrepareSP('SP_RUNSOMETHING'); 
    
+# note that the parameter name does not have @ in front!
    $db->InParameter($stmt,$id,'myid');
    $db->InParameter($stmt,$group,'group',64);
    # return value in mssql - RETVAL is hard-coded name 
    
+$db->OutParameter($stmt,$ret,'RETVAL');
    
+$db->Execute($stmt); 
    
+
+
    Note that the only difference between the oci8 and mssql implementations is
+$sql.
    
+
+
    If $type parameter is set to false, in mssql, $type will be dynamicly
+determined based on the type of the PHP variable passed (string => SQLCHAR, boolean =>SQLINT1, integer
+=>SQLINT4 or float/double=>SQLFLT8). 
    
+
+
    In oci8, $type can be set to OCI_B_FILE (Binary-File), OCI_B_CFILE
+(Character-File), OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and
+OCI_B_ROWID (ROWID). To pass in a null, use
+$db->Parameter($stmt, $null=null, 'param'). 
    
+
+
    OutParameter($stmt, $var, $name, $maxLen = 4000,
+$type = false )
    
+
+
    Binds a PHP variable as output from a stored procedure
+variable. The parameter $stmt is the value returned by PrepareSP(), $var
+is the PHP variable you want to bind, $name is the name of the stored
+procedure variable. Optional is $maxLen, the maximum length of the data
+to bind, and $type which is database dependant. 
    
+
+
    OutParameter() is a wrapper function that calls Parameter() with
+$isOutput=true. The advantage of this function is that it is self-documenting,
+because the $isOutput parameter is no longer needed. Only for mssql and oci8
+currently. 
    
+
+
    For an example, see InParameter. 
    
+
+
    Parameter($stmt, $var, $name, $isOutput=false,
+$maxLen = 4000, $type = false )
    
+
+
    Note: This function is deprecated, because of the new InParameter() and
+OutParameter() functions. These are superior because they are self-documenting,
+unlike Parameter(). 
    
+
+
    Adds a bind parameter suitable for return values or special data handling
+(eg. LOBs) after a statement has been prepared using PrepareSP(). Only for
+mssql and oci8 currently. The parameters are:
    
+
    
+$stmt Statement returned by Prepare() or PrepareSP().
    
+$var PHP variable to bind to. Make sure you pre-initialize it!
    
+$name Name of stored procedure variable name to bind to.
    
+[$isOutput] Indicates direction of parameter 0/false=IN 1=OUT 2=
+IN/OUT. This is ignored in oci8 as this driver auto-detects the direction.
    
+[$maxLen] Maximum length of the parameter variable.
    
+[$type] Consult mssql_bind and ocibindbyname docs at php.net for more
+info on legal values for type.
    
+
+
    Lastly, in oci8, bind parameters can be reused without calling PrepareSP( ) or
+Parameters again. This is not possible with mssql. An oci8 example:
    
+
+
    $id = 0; $i = 0;
    
+$stmt = $db->PrepareSP( "update table set val=:i where id=:id");
    
+$db->Parameter($stmt,$id,'id');
    
+$db->Parameter($stmt,$i, 'i');
    
+for ($cnt=0; $cnt < 1000; $cnt++) {
    
+ $id = $cnt; 
    
+ $i = $cnt * $cnt; # works with oci8!
     $db->Execute($stmt); 
    
+}
    
+
+
    Bind($stmt, $var, $size=4001, $type=false, $name=false)
    
+
+
    This is a low-level function supported only by the oci8 driver. Avoid
+using unless you only want to support Oracle. The Parameter( ) function is
+the recommended way to go with bind variables.
    
+
+
    Bind( ) allows you to use bind variables in your sql statement. This binds a
+PHP variable to a name defined in an Oracle sql statement that was previously
+prepared using Prepare(). Oracle named variables begin with a colon, and ADOdb
+requires the named variables be called :0, :1, :2, :3, etc. The first
+invocation of Bind() will match :0, the second invocation will match :1, etc.
+Binding can provide 100% speedups for insert, select and update statements. 
    
+
+
    The other variables, $size sets the buffer size for data storage, $type is
+the optional descriptor type OCI_B_FILE (Binary-File), OCI_B_CFILE
+(Character-File), OCI_B_CLOB (Character-LOB), OCI_B_BLOB (Binary-LOB) and
+OCI_B_ROWID (ROWID). Lastly, instead of using the default :0, :1, etc names,
+you can define your own bind-name using $name. 
    
+
+
    The following example shows 3 bind variables being used: p1, p2 and p3.
+These variables are bound to :0, :1 and :2.
    
+
+
    $stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
    
+$DB->Bind($stmt, $p1);
    
+$DB->Bind($stmt, $p2);
    
+$DB->Bind($stmt, $p3);
    
+for ($i = 0; $i < $max; $i++) { 
    
+ $p1 = ?; $p2 = ?; $p3 = ?;
    
+ $DB->Execute($stmt);
    
+}
    
+
+
    You can also use named variables:
    
+
+
    $stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:name0, :name1, :name2)");
    
+$DB->Bind($stmt, $p1, "name0");
    
+$DB->Bind($stmt, $p2, "name1");
    
+$DB->Bind($stmt, $p3, "name2");
    
+for ($i = 0; $i < $max; $i++) { 
    
+ $p1 = ?; $p2 = ?; $p3 = ?;
    
+ $DB->Execute($stmt);
    
+}
    
+
+
    LogSQL($enable=true)
    
+
+
    Call this method to install a SQL logging and timing
+function (using fnExecute). Then all SQL statements are logged into an
+adodb_logsql table in a database. If the adodb_logsql table does not exist,
+ADOdb will create the table if you have the appropriate permissions. Returns
+the previous logging value (true for enabled, false for disabled). Here are
+samples of the DDL for selected databases: 
    
+
+
     mysql:
     CREATE TABLE adodb_logsql (
      created datetime NOT NULL,
      sql0 varchar(250) NOT NULL,
      sql1 text NOT NULL,
      params text NOT NULL,
      tracer text NOT NULL,
      timer decimal(16,6) NOT NULL
     )
     
     postgres:
     CREATE TABLE adodb_logsql (
      created timestamp NOT NULL,
      sql0 varchar(250) NOT NULL,
      sql1 text NOT NULL,
      params text NOT NULL,
      tracer text NOT NULL,
      timer decimal(16,6) NOT NULL
     )
     
     mssql:
     CREATE TABLE adodb_logsql (
      created datetime NOT NULL,
      sql0 varchar(250) NOT NULL,
      sql1 varchar(4000) NOT NULL,
      params varchar(3000) NOT NULL,
      tracer varchar(500) NOT NULL,
      timer decimal(16,6) NOT NULL
     )
     
     oci8:
     CREATE TABLE adodb_logsql (
      created date NOT NULL,
      sql0 varchar(250) NOT NULL,
      sql1 varchar(4000) NOT NULL,
      params varchar(4000),
      tracer varchar(4000),
      timer decimal(16,6) NOT NULL
     )
    
+
+
    Usage: 
    
+
+
     $conn->LogSQL(); // turn on logging
    
+  :
    
+ $conn->Execute(...);
    
+  :
    
+ $conn->LogSQL(false); // turn off logging
    
+ 
    
+ # output summary of SQL logging results
    
+ $perf = NewPerfMonitor($conn);
    
+ echo $perf->SuspiciousSQL();
    
+ echo $perf->ExpensiveSQL();
    
+
+
    One limitation of logging is that rollback also prevents SQL from being
+logged. 
    
+
+
    If you prefer to use another name for the table used to store the SQL, you
+can override it by calling adodb_perf::table($tablename), where $tablename is
+the new table name (you will still need to manually create the table yourself).
+An example: 
    
+
+
     include('adodb.inc.php');
    
+ include('adodb-perf.inc.php');
    
+ adodb_perf::table('my_logsql_table');
    
+
+
    Also see Performance Monitor. 
    
+
+
    fnExecute and fnCacheExecute properties
    
+
+
    These two properties allow you to define bottleneck functions for all sql
+statements processed by ADOdb. This allows you to perform statistical analysis
+and query-rewriting of your sql. 
    
+
+
    Examples of fnExecute
    
+
+
    Here is an example of using fnExecute, to count all cached queries and
+non-cached queries, you can do this:
    
+
+
    # $db is the connection object
    function &CountExecs($db, $sql, $inputarray)
    {
    global $EXECS;
     
     if (!is_array(inputarray)) $EXECS++;
     # handle 2-dimensional input arrays
     else if (is_array(reset($inputarray))) $EXECS += sizeof($inputarray);
     else $EXECS++;
     
     # in PHP4.4 and PHP5, we need to return a value by reference
     $null = null;
     return $null;
    }
     
    # $db is the connection object
    function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
    {
    
+global $CACHED; $CACHED++;
    
+}
    
+
    
+$db = NewADOConnection('mysql');
    
+$db->Connect(...);
    
+$db->fnExecute = 'CountExecs';
    
+$db->fnCacheExecute = 'CountCachedExecs';
    
+:
    
+:
    
+# After many sql statements:`
    
+printf("<p>Total queries=%d; total cached=%d</p>",$EXECS+$CACHED, $CACHED);
    
+
+
    The fnExecute function is called before the sql is parsed and executed, so
+you can perform a query rewrite. If you are passing in a prepared statement,
+then $sql is an array (see Prepare). The fnCacheExecute
+function is only called if the recordset returned was cached. The function
+parameters match the Execute and CacheExecute functions respectively, except
+that $this (the connection object) is passed as the first parameter.
    
+
+
    Since ADOdb 3.91, the behaviour of fnExecute varies depending on whether the
+defined function returns a value. If it does not return a value, then the $sql
+is executed as before. This is useful for query rewriting or counting sql
+queries. 
    
+
+
    On the other hand, you might want to replace the Execute function with one
+of your own design. If this is the case, then have your function return a
+value. If a value is returned, that value is returned immediately, without any
+further processing. This is used internally by ADOdb to implement LogSQL()
+functionality. 
    
+
+
    
+
+
    
+
+
    
+
+
    ADOConnection Utility Functions
    
+
+
    BlankRecordSet([$queryid])
    
+
+
    No longer available - removed since 1.99.
    
+
+
    Concat($s1,$s2,....)
    
+
+
    Generates the sql string used to concatenate $s1, $s2, etc together. Uses
+the string in the concat_operator field to generate the concatenation. Override
+this function if a concatenation operator is not used, eg. MySQL.
    
+
+
    Returns the concatenated string.
    
+
+
    DBDate($date)
    
+
+
    Format the $date in the format the database accepts - the return
+string is also quoted. This is used when you are sending dates to the database
+(eg INSERT, UPDATE or where clause of SELECT statement). The $date
+parameter can be a PHP DateTime object (since ADOdb 5.09), a Unix integer timestamp or an ISO format Y-m-d. Uses the
+fmtDate field, which holds the format to use. If null or false or '' is passed
+in, it will be converted to an SQL null.
    
+
+
    Returns the date as a quoted string.
    
+
+
     
     $sql = "select * from atable where created > ".$db->DBDate("$year-$month-$day");
     $db->Execute($sql);
    
+
+
    Note to retrieve a date column in a specific format, use SQLDate.
+
    
+
+
    BindDate($date)
    
+
+
    Format the $date in the bind format the database accepts. Normally
+this means that the date string is not quoted, unlike DBDate, which quotes the
+string. 
    
+
+
     
     $sql = "select * from atable where created > ".$db->Param('0');
     // or
     $sql = "select * from atable where created > ?";
     $db->Execute($sql,array($db->BindDate("$year-$month-$day"));
    
+
+
    DBTimeStamp($ts)
    
+
+
    Format the timestamp $ts in the format the database accepts; this can
+be a PHP DateTime object (since ADOdb 5.09), a Unix integer timestamp or an ISO format Y-m-d H:i:s. Uses the fmtTimeStamp
+field, which holds the format to use. If null or false or '' is passed in, it
+will be converted to an SQL null.
    
+
+
    Returns the timestamp as a quoted string.
    
+
+
     
     $sql = "select * from atable where created > ".$db->DBTimeStamp("$year-$month-$day $hr:$min:$secs");
     $db->Execute($sql);
    
+
+
    BindTimeStamp($ts)
    
+
+
    Format the timestamp $ts in the bind format the database accepts.
+Normally this means that the timestamp string is not quoted, unlike
+DBTimeStamp, which quotes the string. 
    
+
+
     
     $sql = "select * from atable where created > ".$db->Param('0');
     // or
     $sql = "select * from atable where created > ?";
     $db->Execute($sql,array($db->BindTimeStamp("$year-$month-$day $hr:$min:$secs"));
    
+
+
    qstr($s,[$magic_quotes_enabled=false])
    
+
+
    Quotes a string to be sent to the database. The $magic_quotes_enabled
+parameter may look funny, but the idea is if you are quoting a string extracted
+from a POST/GET variable, then pass get_magic_quotes_gpc() as the second
+parameter. This will ensure that the variable is not quoted twice, once by qstr
+and once by the magic_quotes_gpc.
    
+
+
    Eg. $s = $db->qstr(HTTP_GET_VARS['name'],get_magic_quotes_gpc());
    
+
+
    Returns the quoted string.
    
+
+
    Quote($s)
    
+
+
    Quotes the string $s, escaping the database specific quote character as
+appropriate. Formerly checked magic quotes setting, but this was disabled since
+3.31 for compatibility with PEAR DB. 
    
+
+
    Affected_Rows( )
    
+
+
    Returns the number of rows affected by a update or delete statement. Returns
+false if function not supported.
    
+
+
    Not supported by interbase/firebird currently. 
    
+
+
    Insert_ID( )
    
+
+
    Returns the last autonumbering ID inserted. Returns false if function not
+supported. 
    
+
+
    Only supported by databases that support auto-increment or object id's, such
+as PostgreSQL, MySQL and MS SQL Server currently. PostgreSQL returns the OID,
+which can change on a database reload.
    
+
+
    RowLock($table,$where)
    
+
+
    Lock a table row for the duration of a transaction. For example to lock
+record $id in table1: 
    
+
+
     $DB->StartTrans();
    
+ $DB->RowLock("table1","rowid=$id");
    
+ $DB->Execute($sql1);
    
+ $DB->Execute($sql2);
    
+ $DB->CompleteTrans();
    
+
+
    Supported in db2, interbase, informix, mssql, oci8, postgres, sybase. 
    
+
+
    MetaDatabases()
    
+
+
    Returns a list of databases available on the server as an array. You have to
+connect to the server first. Only available for ODBC, MySQL and ADO.
    
+
+
    MetaTables($ttype = false, $showSchema = false,
+$mask=false)
    
+
+
    Returns an array of tables and views for the current database as an array.
+The array should exclude system catalog tables if possible. To only show
+tables, use $db->MetaTables('TABLES'). To show only views, use
+$db->MetaTables('VIEWS'). The $showSchema parameter currently works only for
+DB2, and when set to true, will add the schema name to the table, eg.
+"SCHEMA.TABLE". 
    
+
+
    You can define a mask for matching. For example, setting $mask = 'TMP%' will
+match all tables that begin with 'TMP'. Currently only mssql, oci8, odbc_mssql
+and postgres* support $mask. 
    
+
+
    MetaColumns($table,$notcasesensitive=true)
    
+
+
    Returns an array of ADOFieldObject's, one field object for every column of
+$table. A field object is a class instance with (name, type, max_length)
+defined. Currently Sybase does not recognise date types, and ADO cannot
+identify the correct data type (so we default to varchar). 
    
+
+
    The $notcasesensitive parameter determines whether we uppercase or lowercase
+the table name to normalize it (required for some databases). Does not work
+with MySQL ISAM tables. 
    
+
+
    For schema support, pass in the $table parameter,
+"$schema.$tablename". This is only supported for selected databases. 
    
+
+
    MetaColumnNames($table,$numericIndex=false)
    
+
+
    Returns an array of column names for $table. Since ADOdb 4.22, this is an
+associative array, with the keys in uppercase. Set $numericIndex=true if you
+want the old behaviour of numeric indexes (since 4.23). 
    
+
+
    e.g. array('FIELD1' => 'Field1', 'FIELD2'=>'Field2') 
    
+
+
    MetaPrimaryKeys($table, $owner=false) 
    
+
+
    Returns an array containing column names that are the primary keys of
+$table. Supported by mysql, odbc (including db2, odbc_mssql, etc), mssql,
+postgres, interbase/firebird, oci8 currently. 
    
+
+
    Views (and some tables) have primary keys, but sometimes this information is
+not available from the database. You can define a function
+ADODB_View_PrimaryKeys($databaseType, $database, $view, $owner) that should
+return an array containing the fields that make up the primary key. If that
+function exists, it will be called when MetaPrimaryKeys() cannot find a primary
+key for a table or view. 
    
+
+
    // In this example: dbtype = 'oci8', $db = 'mydb', $view = 'dataView', $owner = false 
    
+function ADODB_View_PrimaryKeys($dbtype,$db,$view,$owner)
    
+{
    
+ switch(strtoupper($view)) {
    
+ case 'DATAVIEW': return array('DATAID');
    
+ default: return false;
    
+ }
    
+}
    
+
    
+$db = NewADOConnection('oci8');
    
+$db->Connect('localhost','root','','mydb'); 
    
+$db->MetaPrimaryKeys('dataView');
    
+
+
    ServerInfo() 
    
+
+
    Returns an array of containing two elements 'description' and 'version'. The
+'description' element contains the string description of the database. The
+'version' naturally holds the version number (which is also a string).
    
+
+
    MetaForeignKeys($table, $owner=false,
+$upper=false) 
    
+
+
    Returns an associate array of foreign keys, or false if not supported. For
+example, if table employee has a foreign key where employee.deptkey points to
+dept_table.deptid, and employee.posn=posn_table.postionid and
+employee.poscategory=posn_table.category, then
+$conn->MetaForeignKeys('employee') will return 
    
+
+
     array(
    
+ 'dept_table' => array('deptkey=deptid'),
    
+ 'posn_table' => array('posn=positionid','poscategory=category')
    
+ )
    
+
+
    The optional schema or owner can be defined in $owner. If $upper is true,
+then the table names (array keys) are upper-cased. 
    
+
+
    
+
+
    
+
+
    
+
+
    ADORecordSet
    
+
+
    When an SQL statement successfully is executed by ADOConnection->Execute($sql),an ADORecordSet object is
+returned. This object contains a virtual cursor so we can move from row to row,
+functions to obtain information about the columns and column types, and helper
+functions to deal with formating the results to show to the user.
    
+
+
    ADORecordSet Fields
    
+
+
    fields: Array containing the current row. This is not associative,
+but is an indexed array from 0 to columns-1. See also the function Fields, which behaves like an associative array.
    
+
+
    dataProvider: The underlying mechanism used to connect to the
+database. Normally set to native, unless using odbc or ado.
    
+
+
    blobSize: Maximum size of a char, string or varchar object before it
+is treated as a Blob (Blob's should be shown with textarea's). See the MetaType function.
    
+
+
    sql: Holds the sql statement used to generate this record set.
    
+
+
    canSeek: Set to true if Move( ) function works.
    
+
+
    EOF: True if we have scrolled the cursor past the last record.
    
+
+
    ADORecordSet Functions
    
+
+
    ADORecordSet( )
    
+
+
    Constructer. Normally you never call this function yourself.
    
+
+
    GetAssoc([$force_array])
    
+
+
    Generates an associative array from the recordset. Note that is this
+function is also available in the connection object.
+More details can be found there.
    
+
+
    GetArray([$number_of_rows])
    
+
+
    Generate a 2-dimensional array of records from the current cursor position,
+indexed from 0 to $number_of_rows - 1. If $number_of_rows is undefined, till
+EOF.
    
+
+
    GetRows([$number_of_rows])
    
+
+
    Generate a 2-dimensional array of records from the current
+cursor position. Synonym for GetArray() for compatibility with Microsoft ADO. 
    
+
+
    GetMenu($name, [$default_str=''],
+[$blank1stItem=true], [$multiple_select=false], [$size=0], [$moreAttr=''])
    
+
+
    Generate a HTML menu
+(<select><option><option></select>). The first column
+of the recordset (fields[0]) will hold the string to display in the option
+tags. If the recordset has more than 1 column, the second column (fields[1]) is
+the value to send back to the web server.. The menu will be given the name $name.
+
    
+
+
    If $default_str is defined, then if $default_str == fields[0],
+that field is selected. If $blank1stItem is true, the first option is
+empty. You can also set the first option strings by setting $blank1stItem =
+"$value:$text".
    
+
+
    $Default_str can be array for a multiple select listbox.
    
+
+
    To get a listbox, set the $size to a non-zero value (or pass
+$default_str as an array). If $multiple_select is true then a listbox
+will be generated with $size items (or if $size==0, then 5 items)
+visible, and we will return an array to a server. Lastly use $moreAttr to
+add additional attributes such as javascript or styles. 
    
+
+
    Menu Example 1: GetMenu('menu1','A',true)
+will generate a menu: for
+the data (A,1), (B,2), (C,3). Also see example 5.
    
+
+
    Menu Example 2: For the same data, GetMenu('menu1',array('A','B'),false)
+will generate a menu with both A and B selected: 
    
+
    
+
+
    GetMenu2($name, [$default_str=''],
+[$blank1stItem=true], [$multiple_select=false], [$size=0], [$moreAttr=''])
    
+
+
    This is nearly identical to GetMenu, except that the $default_str is
+matched to fields[1] (the option values).
    
+
+
    Menu Example 3: Given the data in menu example 2, GetMenu2('menu1',array('1','2'),false)
+will generate a menu with both A and B selected in menu example 2, but this
+time the selection is based on the 2nd column, which holds the values to return
+to the Web server. 
    
+
+
    UserDate($str, [$fmt])
    
+
+
    Converts the date string $str to another format. The date format is
+Y-m-d, or Unix timestamp format. The default $fmt is Y-m-d.
    
+
+
    UserTimeStamp($str, [$fmt])
    
+
+
    Converts the timestamp string $str to another format. The timestamp
+format is Y-m-d H:i:s, as in '2002-02-28 23:00:12', or Unix timestamp format.
+UserTimeStamp calls UnixTimeStamp to parse $str, and $fmt
+defaults to Y-m-d H:i:s if not defined. 
    
+
+
    UnixDate($str)
    
+
+
    Parses the date string $str and returns it in unix mktime format (eg.
+a number indicating the seconds after January 1st, 1970). Expects the date to
+be in Y-m-d H:i:s format, except for Sybase and Microsoft SQL Server, where M d
+Y is also accepted (the 3 letter month strings are controlled by a global
+array, which might need localisation).
    
+
+
    This function is available in both ADORecordSet and ADOConnection since
+1.91.
    
+
+
    UnixTimeStamp($str)
    
+
+
    Parses the timestamp string $str and returns it in unix mktime format
+(eg. a number indicating the seconds after January 1st, 1970). Expects the date
+to be in "Y-m-d, H:i:s" (1970-12-24, 00:00:00) or "Y-m-d
+H:i:s" (1970-12-24 00:00:00) or "YmdHis" (19701225000000)
+format, except for Sybase and Microsoft SQL Server, where "M d Y
+h:i:sA" (Dec 25 1970 00:00:00AM) is also accepted (the 3 letter month
+strings are controlled by a global array, which might need localisation).
    
+
+
    This function is available in both ADORecordSet and ADOConnection since
+1.91. 
    
+
+
    OffsetDate($dayFraction, $basedate=false)
    
+
+
    Returns a string with the native SQL functions to calculate future and past
+dates based on $basedate in a portable fashion. If $basedate is not defined,
+then the current date (at 12 midnight) is used. Returns the SQL string that
+performs the calculation when passed to Execute(). 
    
+
+
    For example, in Oracle, to find the date and time that is 2.5 days from
+today, you can use:
    
+
+
    # get date one week from now
    
+$fld = $conn->OffsetDate(7); // returns "(trunc(sysdate)+7")
    # get date and time that is 60 hours from current date and time
    
+$fld = $conn->OffsetDate(2.5, $conn->sysTimeStamp); // returns "(sysdate+2.5)"
    
+
    
+$conn->Execute("UPDATE TABLE SET dodate=$fld WHERE ID=$id");
    
+
+
    This function is available for mysql, mssql, oracle, oci8 and postgresql
+drivers since 2.13. It might work with other drivers provided they allow
+performing numeric day arithmetic on dates.
    
+
+
    SQLDate($dateFormat, $basedate=false)
    
+
+
    Returns a string which contains the native SQL functions to
+format a date or date column $basedate. This is used when retrieving date
+columns in SELECT statements. For sending dates to the database (eg. in UPDATE,
+INSERT or the where clause of SELECT statements) use DBDate.
+It uses a case-sensitive $dateFormat, which supports: 
    
+
+
     Y: 4-digit Year
     Q: Quarter (1-4)
     M: Month (Jan-Dec)
     m: Month (01-12)
     d: Day (01-31)
     H: Hour (00-23)
     h: Hour (1-12)
     i: Minute (00-59)
     s: Second (00-60)
     A: AM/PM indicator
     w: day of week (0-6 or 1-7 depending on DB)
     l: day of week (as string - lowercase L)
     W: week in year (0..53 for MySQL, 1..53 for PostgreSQL and Oracle)
     
    
+
+
    All other characters are treated as strings. You can also use \ to escape
+characters. Available on selected databases, including mysql, postgresql,
+mssql, oci8 and DB2. 
    
+
+
    This is useful in writing portable sql statements that GROUP BY on dates.
+For example to display total cost of goods sold broken by quarter (dates are
+stored in a field called postdate): 
    
+
+
    $sqlfn = $db->SQLDate('Y-\QQ','postdate'); # get sql that formats postdate to output 2002-Q1
    
+$sql = "SELECT $sqlfn,SUM(cogs) FROM table GROUP BY $sqlfn ORDER BY 1 desc";
    
+
    
+
+
    MoveNext( )
    
+
+
    Move the internal cursor to the next row. The $this->fields array
+is automatically updated. Returns false if unable to do so (normally because
+EOF has been reached), otherwise true. 
    
+
+
    If EOF is reached, then the $this->fields array is set to false (this was
+only implemented consistently in ADOdb 3.30). For the pre-3.30 behaviour of
+$this->fields (at EOF), set the global variable $ADODB_COMPAT_FETCH = true.
    
+
+
    Example:
    
+
+
    $rs = $db->Execute($sql);
    
+if ($rs) 
    
+ while (!$rs->EOF) {
    
+ ProcessArray($rs->fields); 
    
+ $rs->MoveNext();
    
+ } 
    
+
+
    Move($to)
    
+
+
    Moves the internal cursor to a specific row $to. Rows are zero-based
+eg. 0 is the first row. The fields array is automatically updated. For
+databases that do not support scrolling internally, ADOdb will simulate forward
+scrolling. Some databases do not support backward scrolling. If the $to
+position is after the EOF, $to will move to the end of the RecordSet for
+most databases. Some obscure databases using odbc might not behave this way.
    
+
+
    Note: This function uses absolute positioning, unlike Microsoft's
+ADO.
    
+
+
    Returns true or false. If false, the internal cursor is not moved in most
+implementations, so AbsolutePosition( ) will return the last cursor position
+before the Move( ). 
    
+
+
    MoveFirst()
    
+
+
    Internally calls Move(0). Note that some databases do not support this function.
    
+
+
    MoveLast()
    
+
+
    Internally calls Move(RecordCount()-1). Note that some databases do not
+support this function.
    
+
+
    GetRowAssoc($toUpper=true)
    
+
+
    Returns an associative array containing the current row. The keys to the
+array are the column names. The column names are upper-cased for easy access.
+To get the next row, you will still need to call MoveNext(). 
    
+
+
    For example:
    
+Array ( [ID] => 1 [FIRSTNAME] => Caroline [LASTNAME] => Miranda
+[CREATED] => 2001-07-05 ) 
    
+
+
    Note: do not use GetRowAssoc() with $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC.
+Because they have the same functionality, they will interfere with each other.
    
+
+
    AbsolutePage($page=-1) 
    
+
+
    Returns the current page. Requires PageExecute()/CachePageExecute() to be
+called. See Example 8.
    
+
+
    AtFirstPage($status='')
    
+
+
    Returns true if at first page (1-based). Requires
+PageExecute()/CachePageExecute() to be called. See Example 8.
    
+
+
    AtLastPage($status='')
    
+
+
    Returns true if at last page (1-based). Requires
+PageExecute()/CachePageExecute() to be called. See Example 8.
    
+
+
    Fields($colname)
    
+
+
    Returns the value of the associated column $colname for the current
+row. The column name is case-insensitive.
    
+
+
    This is a convenience function. For higher performance, use $ADODB_FETCH_MODE. 
    
+
+
    FetchRow()
    
+
+
    Returns array containing current row, or false if EOF. FetchRow( )
+internally moves to the next record after returning the current row. 
    
+
+
    Warning: Do not mix using FetchRow() with MoveNext().
    
+
+
    Usage:
    
+
+
    $rs = $db->Execute($sql);
    
+if ($rs)
    
+ while ($arr = $rs->FetchRow()) {
    
+    # process $arr 
    
+ }
    
+
+
    FetchInto(&$array)
    
+
+
    Sets $array to the current row. Returns PEAR_Error object if EOF, 1 if ok
+(DB_OK constant). If PEAR is undefined, false is returned when EOF. FetchInto(
+) internally moves to the next record after returning the current row. 
    
+
+
    FetchRow() is easier to use. See above.
    
+
+
    FetchField($column_number)
    
+
+
    Returns an object containing the name, type and max_length
+of the associated field. If the max_length cannot be determined reliably, it
+will be set to -1. The column numbers are zero-based. See example
+2.
    
+
+
    FieldCount( )
    
+
+
    Returns the number of fields (columns) in the record set.
    
+
+
    RecordCount( )
    
+
+
    Returns the number of rows in the record set. If the number of records
+returned cannot be determined from the database driver API, we will buffer all
+rows and return a count of the rows after all the records have been retrieved.
+This buffering can be disabled (for performance reasons) by setting the global
+variable $ADODB_COUNTRECS = false. When disabled, RecordCount( ) will return -1
+for certain databases. See the supported databases list above for more details.
+
    
+
+
    RowCount is a synonym for RecordCount.
    
+
+
    PO_RecordCount($table, $where)
    
+
+
    Returns the number of rows in the record set. If the database does not
+support this, it will perform a SELECT COUNT(*) on the table $table, with the
+given $where condition to return an estimate of the recordset size.
    
+
+
    $numrows = $rs->PO_RecordCount("articles_table",
+"group=$group");
    
+
+
    NextRecordSet()
+
    
+
+
    For databases that allow multiple recordsets to be returned in one query,
+this function allows you to switch to the next recordset. Currently only
+supported by mssql driver.
    
+
+
    $rs = $db->Execute('execute return_multiple_rs');
    
+$arr1 = $rs->GetArray();
    
+$rs->NextRecordSet();
    
+$arr2 = $rs->GetArray();
    
+
+
    FetchObject($toupper=true)
    
+
+
    Returns the current row as an object. If you set $toupper to true, then the
+object fields are set to upper-case. Note: The newer FetchNextObject() is the
+recommended way of accessing rows as objects. See below.
    
+
+
    FetchNextObject($toupper=true)
    
+
+
    Gets the current row as an object and moves to the next row automatically.
+Returns false if at end-of-file. If you set $toupper to true, then the object
+fields are set to upper-case. Note that for some drivers such as mssql, you
+need to SetFetchMode(ADODB_FETCH_ASSOC) or SetFetchMode(ADODB_FETCH_BOTH).
    
+
+
    $rs = $db->Execute('select firstname,lastname from table');
    
+if ($rs) {
    
+ while ($o = $rs->FetchNextObject()) {
    
+ print "$o->FIRSTNAME, $o->LASTNAME<BR>";
    
+ }
    
+}
    
+
+
    There is some trade-off in speed in using FetchNextObject(). If performance
+is important, you should access rows with the fields[] array. FetchObj()
+
    
+
+
    Returns the current record as an object. Fields are not upper-cased, unlike
+FetchObject. 
    
+
+
    FetchNextObj() 
    
+
+
    Returns the current record as an object and moves to the next record. If
+EOF, false is returned. Fields are not upper-cased, unlike FetctNextObject. 
    
+
+
    CurrentRow( )
    
+
+
    Returns the current row of the record set. 0 is the first row.
    
+
+
    AbsolutePosition( )
    
+
+
    Synonym for CurrentRow for compatibility with ADO. Returns the
+current row of the record set. 0 is the first row.
    
+
+
    MetaType($nativeDBType[,$field_max_length],[$fieldobj])
    
+
+
    Determine what generic meta type a database field type is given its
+native type $nativeDBType as a string and the length of the field $field_max_length.
+Note that field_max_length can be -1 if it is not known. The field object
+returned by FetchField() can be passed in $fieldobj or as the 1st
+parameter $nativeDBType. This is useful for databases such as mysql
+which has additional properties in the field object such as primary_key.
+
    
+
+
    Uses the field blobSize and compares it with $field_max_length
+to determine whether the character field is actually a blob.
    
+
+
    For example, $db->MetaType('char') will return 'C'. 
    
+
+
    Returns:
    
+
+
      
+ 
    • C: Character fields
+     that should be shown in a <input type="text"> tag. 
      • 
+ 
    • X: Clob (character
+     large objects), or large text fields that should be shown in a
+     <textarea>
      • 
+ 
    • D: Date field
      • 
+ 
    • T: Timestamp field
      • 
+ 
    • L: Logical field
+     (boolean or bit-field)
      • 
+ 
    • N: Numeric field.
+     Includes decimal, numeric, floating point, and real. 
      • 
+ 
    • I:  Integer
+     field. 
      • 
+ 
    • R: Counter or
+     Autoincrement field. Must be numeric.
      • 
+ 
    • B: Blob, or binary
+     large objects. 
      • 
+
    
+
+
    Since ADOdb 3.0, MetaType accepts $fieldobj as the first parameter, instead
+of $nativeDBType. 
    
+
+
    Close( )
    
+
+
    Closes the recordset, cleaning all memory and resources associated with the
+recordset. 
    
+
+
    If memory management is not an issue, you do not need to call this function
+as recordsets are closed for you by PHP at the end of the script. SQL
+statements such as INSERT/UPDATE/DELETE do not really return a recordset, so you
+do not have to call Close() for such SQL statements.
    
+
+
    
+
+
    
+
+
    
+
+
    function rs2html($adorecordset,[$tableheader_attributes],
+[$col_titles])
    
+
+
    This is a standalone function (rs2html = recordset to html) that is similar
+to PHP's odbc_result_all function, it prints a ADORecordSet, $adorecordset
+as a HTML table. $tableheader_attributes allow you to control the table cellpadding,
+cellspacing and border attributes. Lastly you can replace the
+database column names with your own column titles with the array $col_titles.
+This is designed more as a quick debugging mechanism, not a production table
+recordset viewer.
    
+
+
    You will need to include the file tohtml.inc.php.
    
+
+
    Example of rs2html:
    
+
+
    <?
    
+include('tohtml.inc.php')    ; # load code common to ADOdb 
    
+include('adodb.inc.php'); # load code common to ADOdb 
    
+$conn = &ADONewConnection('mysql'); # create a connection 
    
+$conn->PConnect('localhost','userid','','agora');# connect to MySQL, agora db
    
+$sql = 'select CustomerName, CustomerID from customers'; 
    
+$rs = $conn->Execute($sql); 
    
+rs2html($rs,'border=2 cellpadding=3',array('Customer Name','Customer ID'));
    
+?>
    
+
+
    
+
+
    
+
+
    
+
+
    Differences between this ADOdb library and Microsoft ADO
    
+
+
      
+ 
    1. ADOdb only supports
+     recordsets created by a connection object. Recordsets cannot be created
+     independently.
      2. 
+ 
    2. ADO properties are implemented
+     as functions in ADOdb. This makes it easier to implement any enhanced ADO
+     functionality in the future.
      3. 
+ 
    3. ADOdb's ADORecordSet->Move() uses
+     absolute positioning, not relative. Bookmarks are not supported.
      4. 
+ 
    4. ADORecordSet->AbsolutePosition() cannot be used
+     to move the record cursor.
      5. 
+ 
    5. ADO Parameter objects are
+     not supported. Instead we have the ADOConnection::Parameter(
+     ) function, which provides a simpler interface for calling preparing
+     parameters and calling stored procedures.
      6. 
+ 
    6. Recordset properties for
+     paging records are available, but implemented as in Example
+     8.
      7. 
+
    
+
+
    
+
+
    
+
+
    
+
+
    Database Driver Guide
    
+
+
    This describes how to create a class to connect to a new database. To ensure
+there is no duplication of work, kindly email me at jlim#natsoft.com if you
+decide to create such a class.
    
+
+
    First decide on a name in lower case to call the database type. Let's say we
+call it xbase. 
    
+
+
    Then we need to create two classes ADODB_xbase and ADORecordSet_xbase in the
+file adodb-xbase.inc.php.
    
+
+
    The simplest form of database driver is an adaptation of an existing ODBC
+driver. Then we just need to create the class ADODB_xbase extends ADODB_odbc
+to support the new date and timestamp formats, the concatenation
+operator used, true and false. For the ADORecordSet_xbase
+extends ADORecordSet_odbc we need to change the MetaType function.
+See adodb-vfp.inc.php as an example.
    
+
+
    More complicated is a totally new database driver that connects to a new PHP
+extension. Then you will need to implement several functions. Fortunately, you
+do not have to modify most of the complex code. You only need to override a few
+stub functions. See adodb-mysql.inc.php for example.
    
+
+
    The default date format of ADOdb internally is YYYY-MM-DD (Ansi-92). All
+dates should be converted to that format when passing to an ADOdb date
+function. See Oracle for an example how we use ALTER SESSION to change the
+default date format in _pconnect _connect.
    
+
+
    ADOConnection Functions to Override
    
+
+
    Defining a constructor for your ADOConnection derived function is optional.
+There is no need to call the base class constructor.
    
+
+
    _connect: Low level implementation of Connect. Returns true or false.
+Should set the _connectionID.
    
+
+
    _pconnect: Low level implemention of PConnect. Returns true or false.
+Should set the _connectionID.
    
+
+
    _query: Execute a query. Returns the queryID, or false.
    
+
+
    _close: Close the connection -- PHP should clean up all recordsets. 
    
+
+
    ErrorMsg: Stores the error message in the private variable _errorMsg.
+
    
+
+
    ADOConnection Fields to Set
    
+
+
    _bindInputArray: Set to true if binding of parameters for SQL inserts
+and updates is allowed using ?, eg. as with ODBC.
    
+
+
    fmtDate
    
+
+
    fmtTimeStamp
    
+
+
    true
    
+
+
    false
    
+
+
    concat_operator
    
+
+
    replaceQuote
    
+
+
    hasLimit support SELECT * FROM TABLE LIMIT 10 of MySQL.
    
+
+
    hasTop support Microsoft style SELECT TOP 10 * FROM TABLE.
    
+
+
    ADORecordSet Functions to Override
    
+
+
    You will need to define a constructor for your ADORecordSet derived class
+that calls the parent class constructor.
    
+
+
    FetchField: as documented above in ADORecordSet
    
+
+
    _initrs: low level initialization of the recordset: setup the _numOfRows
+and _numOfFields fields -- called by the constructor.
    
+
+
    _seek: seek to a particular row. Do not load the data into the fields
+array. This is done by _fetch. Returns true or false. Note that some
+implementations such as Interbase do not support seek. Set canSeek to false.
    
+
+
    _fetch: fetch a row using the database extension function and then
+move to the next row. Sets the fields array. If the parameter
+$ignore_fields is true then there is no need to populate the fields
+array, just move to the next row. then Returns true or false.
    
+
+
    _close: close the recordset
    
+
+
    Fields: If the array row returned by the PHP extension is not an
+associative one, you will have to override this. See adodb-odbc.inc.php for an
+example. For databases such as MySQL and MSSQL where an associative array is
+returned, there is no need to override this function.
    
+
+
    ADOConnection Fields to Set
    
+
+
    canSeek: Set to true if the _seek function works.
    
+
+
    Optimizing PHP
    
+
+
    For info on tuning PHP, read this article on Optimizing
+PHP. 
    
+
+
    Change Log
    
+
    5.11 5 May 2010 
    
+
    mysql: Fixed GetOne() to return null if no records returned.
+
    oci8 perf: added stats on sga, rman, memory usage, and flash in performance tab.
+
    odbtp: Now you can define password in $password field of Connect()/PConnect(), and it will add it to DSN.
+
    Datadict: altering columns did not consider the scale of the column. Now it does.
+
    mssql: Fixed problem with ADODB_CASE_ASSOC causing multiple versions of column name appearing in recordset fields.
+
    oci8: Added missing & to refLob.
+
    oci8: Added obj->scale to FetchField().
+
    oci8: Now you can get column info of a table in a different schema, e.g. MetaColumns("schema.table") is supported.
+
    odbc_mssql: Fixed missing $metaDatabasesSQL.
+
    xmlschema: Changed declaration of create() to create($xmls) to fix compat problems. Also changed constructor adoSchema() to pass in variable instead of variable reference.
+
    ado5: Fixed ado5 exceptions to only display errors when $this->debug=true;
+
    Added DSN support to sessions2.inc.php.
+
    adodb-lib.inc.php. Fixed issue with _adodb_getcount() not using $secs2cache parameter.
+
    adodb active record. Fixed caching bug. See http://phplens.com/lens/lensforum/msgs.php?id=18288.
+
    db2: fixed ServerInfo().
+
    adodb_date: Added support for format 'e' for TZ as in adodb_date('e')
+
    Active Record: If you have a field which is a string field (with numbers in) and you add preceding 0's to it the adodb library does not pick up the fact that the field has changed because of the way php's == works (dodgily). The end result is that it never gets updated into the database - fix by  Matthew Forrester (MediaEquals). [matthew.forrester#mediaequals.com]
+
+
    Fixes RowLock() and MetaIndexes() inconsistencies. See http://phplens.com/lens/lensforum/msgs.php?id=18236
+
    Active record support for postgrseql boolean. See http://phplens.com/lens/lensforum/msgs.php?id=18246
+
    By default, Execute 2D array is disabled for security reasons. Set $conn->bulkBind = true to enable. See http://phplens.com/lens/lensforum/msgs.php?id=18270. Note this breaks backward compat.
+
    MSSQL: fixes for 5.2 compat. http://phplens.com/lens/lensforum/msgs.php?id=18325
+
    Changed Version() to return a string instead of a float so it correctly returns 5.10 instead of 5.1.
+
+
    5.10 10 Nov 2009 
    
+
    Fixed memcache to properly support $rs->timeCreated.
+
    adodb-ado.inc.php: Added BigInt support for PHP5. Will return float instead to support large numbers. Thx nasb#mail.goo.ne.jp.
+
    adodb-mysqli.inc.php: mysqli_multi_query is now turned off by default. To turn it on, use $conn->multiQuery = true; This is because of the risks of sql injection. See http://phplens.com/lens/lensforum/msgs.php?id=18144
+
    New db2oci driver for db2 9.7 when using PL/SQL mode. Allows oracle style :0, :1, :2 bind parameters which are remapped to ? ? ?.
+
    adodb-db2.inc.php: fixed bugs in MetaTables. SYS owner field not checked properly. Also in $conn->Connect($dsn, null, null, $schema) and PConnect($dsn, null, null, $schema), we do a SET SCHEMA=$schema if successful connection.
+
    adodb-mysqli.inc.php: Now $rs->Close() closes all pending next resultsets. Thx Clifton mesmackgod#gmail.com
+
    Moved _CreateCache() from PConnect()/Connect() to CacheExecute(). Suggested by Dumka.
+
    Many bug fixes to adodb-pdo_sqlite.inc.php and new datadict-sqlite.inc.php. Thx Andrei B. [andreutz#mymail.ro]
+
    Removed usage of split (deprecated in php 5.3). Thx david#horizon-nigh.org.
+
    Fixed RowLock() parameters to comply with PHP5 strict mode in multiple drivers.
+
+
    5.09 25 June 2009 
    
+
    Active Record: You can force column names to be quoted in INSERT and UPDATE statements, typically because you are using reserved words as column names by setting
+ADODB_Active_Record::$_quoteNames = true;
+
    Added memcache and cachesecs to DSN. e.g.
+
    +	# we have a memcache servers mem1,mem2 on port 8888, compression=off and cachesecs=120
+	$dsn = 'mysql://user:pwd@localhost/mydb?memcache=mem1,mem2:8888:0&cachesecs=120';
+
    
+
    Fixed up MetaColumns and MetaPrimaryIndexes() for php 5.3 compat. Thx http://adodb.pastebin.com/m52082b16
+
    The postgresql driver's OffsetDate() apparently does not work with postgres 8.3. Fixed.
+
    Added support for magic_quotes_sybase in qstr() and addq(). Thanks Eloy and Sam Moffat.
+
    The oci8 driver did not handle LOBs properly when binding. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=17991.
+
    Datadict: In order to support TIMESTAMP with subsecond accuracy, added to datadict the new TS type. Supported by mssql, postgresql and oci8 (oracle).
+Also changed oci8 $conn->sysTimeStamp to use 'SYSTIMESTAMP' instead of 'SYSDATE'. Should be backwards compat.
+
    Added support for PHP 5.1+ DateTime objects in DBDate and DBTimeStamp. This means that dates and timestamps will be managed by DateTime objects if you are running PHP 5.1+.
+
    Added new property to postgres64 driver to support returning I if type is unique int called $db->uniqueIisR, defaulting to true. See http://phplens.com/lens/lensforum/msgs.php?id=17963
+
    Added support for bindarray in adodb_GetActiveRecordsClass with SelectLimit in adodb-active-record.inc.php.
+
    Transactions now allowed in ado_access driver. Thx to  petar.petrov.georgiev#gmail.com.
+
    Sessions2 garbage collection is now much more robust. We perform ORDER BY to prevent deadlock in adodb-sessions2.inc.php.
+
    Fixed typo in pdo_sqlite driver.
+
+
    5.08a 17 Apr 2009 
    
+
    Fixes wrong version number string.
+
    Incorrect + in adodb-datadict.inc.php removed.
+
    Fixes missing OffsetDate() function in pdo. Thx paul#mantisforge.org. 
+
+
    5.08 17 Apr 2009 
    
+
    adodb-sybase.inc.php driver. Added $conn->charSet support. Thx Luis Henrique Mulinari (luis.mulinari#gmail.com)
+
    adodb-ado5.inc.php. Fixed some bind param issues. Thx Jirka Novak. 
+
    adodb-ado5.inc.php. Now has improved error handling.
+
    Fixed typo in adodb-xmlschema03.inc.php. See XMLS_EXISTING_DATA, line 1501. Thx james johnson.
+
    Made $inputarr optional for _query() in all drivers.
+
    Fixed spelling mistake in flushall() in adodb.inc.ophp.
+
    Fixed handling of quotes in adodb_active_record::doquote. Thx Jonathan Hohle (jhohle#godaddy.com).
+
    Added new index parameter to adodb_active_record::setdatabaseadaptor. Thx Jonathan Hohle
+
    Fixed & readcache() reference compat problem with php 5.3 in adodb.Thx Jonathan Hohle.
+
    Some minor $ADODB_CACHE_CLASS definition issues in adodb.inc.php.
+
    Added Reset() function to adodb_active_record. Thx marcus.
+
    Minor dsn fix for pdo_sqlite in adodb.inc.php. Thx Sergey Chvalyuk.
+
    Fixed adodb-datadict _CreateSuffix() inconsistencies. Thx Chris Miller.
+
    Option to delete old fields $dropOldFlds in datadict ChangeTableSQL($table, $flds, $tableOptions, $dropOldFlds=false) added. Thx  Philipp Niethammer.
+
    Memcache caching did not expire properly. Fixed.
+
    MetaForeignKeys for postgres7 driver changed from adodb_movenext to $rs->MoveNext (also in 4.99)
+
    Added support for ldap and ldaps url format in ldap driver. E.g. ldap://host:port/dn?attributes?scope?filter?extensions
+
    5.07 26 Dec 2008 
    
+
+
    BeginTrans/CommitTrans/RollbackTrans return true/false correctly on
+success/failure now for mssql, odbc, oci8, mysqlt, mysqli, postgres, pdo. 
    
+
+
    Replace() now quotes all non-null values including numeric ones. 
    
+
+
    Postgresql qstr() now returns booleans as true and false
+without quotes. 
    
+
+
    MetaForeignKeys in mysql and mysqli drivers had this problem: A table can
+have two foreign keys pointing to the same column in the same table. The
+original code will incorrectly report only the last column. Fixed.
+https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+
    
+
+
    Passing in full ado connection string in $argHostname with ado drivers was
+failing in adodb5 due to bug. Fixed. 
    
+
+
    Fixed memcachelib flushcache and flushall bugs. Also fixed possible
+timeCreated = 0 problem in readcache. (Also in adodb 4.992). Thanks AlexB_UK
+(alexbarnes#hotmail.com). 
    
+
+
    Fixed a notice in adodb-sessions2.inc.php, in _conn(). Thx bober
+m.derlukiewicz#rocktech.remove_me.pl; 
    
+
+
    ADOdb Active Record: Fixed some issues with incompatible fetch modes
+(ADODB_FETCH_ASSOC) causing problems in UpdateActiveTable(). 
    
+
+
    ADOdb Active Record: Added support for functions that support predefining
+one-to-many relationships:
    
+  ClassHasMany ClassBelongsTo TableHasMany TableBelongsTo
+TableKeyHasMany TableKeyBelongsTo. 
    
+You can also define your child/parent class in these functions, instead of the
+default ADODB_Active_Record. Thx Arialdo Martini & Chris R for idea. 
    
+
+
    ADOdb Active Record: HasMany hardcoded primary key to "id". Fixed.
+
    
+
+
    Many pdo and pdo-sqlite fixes from Sid Dunayer [sdunayer#interserv.com]. 
    
+
+
    CacheSelectLimit not working for mssql. Fixed. Thx AlexB. 
    
+
+
    The rs2html function did not display hours in timestamps correctly. Now 24hr
+clock used.
    
+
+
    Changed ereg* functions to use preg* functions as ereg* is deprecated in PHP 5.3. Modified sybase and postgresql drivers.
    
+
+
    5.06 16 Oct 2008 
    
+
+
    Added driver adodb-pdo_sqlite.inc.php. Thanks Diogo Toscano
+(diogo#scriptcase.net) for the code. 
    
+
+
    Added support for one-to-many relationships
+with BelongsTo() and HasMany() in adodb_active_record. 
    
+
+
    Added BINARY type to mysql.inc.php (also in 4.991). 
    
+
+
    Added support for SelectLimit($sql,-1,100) in oci8. (also in 4.991). 
    
+
+
    New $conn->GetMedian($table, $field, $where='') to get median account no.
+(also in 4.991) 
    
+
+
    The rs2html() function in tohtml.inc.php did not handle dates with ':' in it
+properly. Fixed. (also in 4.991) 
    
+
+
    Added support for connecting to oci8 using $DB->Connect($ip, $user, $pwd,
+"SID=$sid"); (also in 4.991) 
    
+
+
    Added mysql type 'VAR_STRING' to MetaType(). (also in 4.991) 
    
+
+
    The session and session2 code supports setfetchmode assoc properly now (also
+in 4.991). 
    
+
+
    Added concat support to pdo. Thx Andrea Baron. 
    
+
+
    Changed db2 driver to use format "Y-m-d H-i-s" for datetime
+instead of "Y-m-d-H-i-s" which was legacy from odbc_db2 conversion. 
    
+
+
    Removed vestigal break on adodb_tz_offset in adodb-time.inc.php. 
    
+
+
    MetaForeignKeys did not work for views in MySQL 5. Fixed. 
    
+
+
    Changed error handling in GetActiveRecordsClass. 
    
+
+
    Added better support for using existing driver when $ADODB_NEWCONNECTION
+function returns false. 
    
+
+
    In _CreateSuffix in adodb-datadict.inc.php, adding unsigned variable for
+mysql. 
    
+
+
    In adodb-xmlschema03.inc.php, changed addTableOpt to include db name. 
    
+
+
    If bytea blob in postgresql is null, empty string was formerly returned. Now
+null is returned. 
    
+
+
    Changed db2 driver CreateSequence to support $start parameter. 
    
+
+
    rs2html() now does not add nbsp to end if length of string > 0 
    
+
+
    The oci8po FetchField() now only lowercases field names if ADODB_ASSOC_CASE
+is set to 0. 
    
+
+
    New mssqlnative drivers for php. TQ Garrett Serack of M'soft. Download
+mssqlnative extension. Note that this is still in beta. 
    
+
+
    Fixed bugs in memcache support. 
    
+
+
    You can now change the return value of GetOne if no records are found using
+the global variable $ADODB_GETONE_EOF. The default is null. To change it back
+to the pre-4.99/5.00 behaviour of false, set $ADODB_GETONE_EOF = false; 
    
+
+
    In Postgresql 8.2/8.3 MetaForeignkeys did not work. Fixed William Kolodny
+William.Kolodny#gt-t.net 
    
+
+
    4.990/5.05 11 Jul 2008 
    
+
+
    Added support for multiple recordsets in mysqli "Geisel Sierote"
+geisel#4up.com.br. See http://phplens.com/lens/lensforum/msgs.php?id=15917 
    
+
+
    Malcolm Cook added new Reload() function to Active Record. See
+http://phplens.com/lens/lensforum/msgs.php?id=17474 
    
+
+
    Thanks Zoltan Monori [monzol#fotoprizma.hu] for bug fixes in iterator,
+SelectLimit, GetRandRow, etc. 
    
+
+
    Under heavy loads, the performance monitor for oci8 disables Ixora views. 
    
+
+
    Fixed sybase driver SQLDate to use str_replace(). Also for adodb5, changed
+sybase driver UnixDate and UnixTimeStamp calls to static. 
    
+
+
    Changed oci8 lob handler to use & reference
+$this->_refLOBs[$numlob]['VAR'] = &$var. 
    
+
+
    We now strtolower the get_class() function in PEAR::isError() for php5
+compat. 
    
+
+
    CacheExecute did not retrieve cache recordsets properly for 5.04 (worked in
+4.98). Fixed. 
    
+
+
    New ADODB_Cache_File class for file caching defined in adodb.inc.php. 
    
+
+
    Farsi language file contribution by Peyman Hooshmandi Raad
+(phooshmand#gmail.com) 
    
+
+
    New API for creating your custom caching class which is stored in
+$ADODB_CACHE: 
    
+
+
     
    include "/path/to/adodb.inc.php";
    $ADODB_CACHE_CLASS = 'MyCacheClass';
     
    class MyCacheClass extends ADODB_Cache_File
    {
     function writecache($filename, $contents,$debug=false){...}
     function &readcache($filename, &$err, $secs2cache, $rsClass){ ...}
      :
    }
     
    $DB = NewADOConnection($driver);
    $DB->Connect(...); ## MyCacheClass created here and stored in $ADODB_CACHE global variable.
     
    $data = $rs->CacheGetOne($sql); ## MyCacheClass is used here for caching...
    
+
+
    Memcache supports multiple pooled hosts now. Only if none of the pooled
+servers can be contacted will a connect error be generated. Usage example
+below: 
    
+
+
     
    $db = NewADOConnection($driver);
    $db->memCache = true; /// should we use memCache instead of caching in files
    $db->memCacheHost = array($ip1, $ip2, $ip3); /// $db->memCacheHost = $ip1; still works
    $db->memCachePort = 11211; /// this is default memCache port
    $db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
     
    $db->Connect(...);
    $db->CacheExecute($sql);
    
+
+
    4.98/5.04 13 Feb 2008 
    
+
+
    Fixed adodb_mktime problem which causes a performance bottleneck in $hrs. 
    
+
+
    Added mysqli support to adodb_getcount(). 
    
+
+
    Removed MYSQLI_TYPE_CHAR from MetaType(). 
    
+
+
    4.97/5.03 22 Jan 2008 
    
+
+
    Active Record: $ADODB_ASSOC_CASE=1 did not work properly. Fixed. 
    
+
+
    Modified Fields() in recordset class to support display null fields in
+FetchNextObject(). 
    
+
+
    In ADOdb5, active record implementation, we now support column names with
+spaces in them - we autoconvert the spaces to _ using __set(). Thx Daniel Cook.
+http://phplens.com/lens/lensforum/msgs.php?id=17200 
    
+
+
    Removed $arg3 from mysqli SelectLimit. See
+http://phplens.com/lens/lensforum/msgs.php?id=16243. Thx Zsolt Szeberenyi. 
    
+
+
    Changed oci8 FetchField, which returns the max_length of BLOB/CLOB/NCLOB as
+4000 (incorrectly) to -1. 
    
+
+
    CacheExecute would sometimes return an error on Windows if it was unable to
+lock the cache file. This is harmless and has been changed to a warning that
+can be ignored. Also adodb_write_file() code revised. 
    
+
+
    ADOdb perf code changed to only log sql if execution time >= 0.05
+seconds. New $ADODB_PERF_MIN variable holds min sql timing. Any SQL with timing
+value below this and is not causing an error is not logged. 
    
+
+
    Also adodb_backtrace() now traces 1 level deeper as sometimes actual culprit
+function is not displayed. 
    
+
+
    Fixed a group by problem with adodb_getcount() for db's which are not
+postgres/oci8 based. 
    
+
+
    Changed mssql driver Parameter() from SQLCHAR to SQLVARCHAR: case 'string':
+$type = SQLVARCHAR; break. 
    
+
+
    Problem with mssql driver in php5 (for adodb 5.03) because some functions
+are not static. Fixed. 
    
+
+
    4.96/5.02 24 Sept 2007 
    
+
+
    ADOdb perf for oci8 now has non-table-locking code when clearing the sql.
+Slower but better transparency. Added in 4.96a and 5.02a. 
    
+
+
    Fix adodb count optimisation. Preg_match did not work properly. Also rewrote
+the ORDER BY stripping code in _adodb_getcount(), adodb-lib.inc.php. 
    
+
+
    SelectLimit for oci8 not optimal for large recordsets when offset=0. Changed
+$nrows check. 
    
+
+
    Active record optimizations. Added support for assoc arrays in Set(). 
    
+
+
    Now GetOne returns null if EOF (no records found), and false if error
+occurs. Use ErrorMsg()/ErrorNo() to get the error. 
    
+
+
    Also CacheGetRow and CacheGetCol will return false if error occurs, or empty
+array() if EOF, just like GetRow and GetCol. 
    
+
+
    Datadict now allows changing of types which are not resizable, eg. VARCHAR
+to TEXT in ChangeTableSQL. -- Mateo Tibaquir 
    
+
+
    Added BIT data type support to adodb-ado.inc.php and adodb-ado5.inc.php. 
    
+
+
    Ldap driver did not return actual ldap error messages. Fixed. 
    
+
+
    Implemented GetRandRow($sql, $inputarr). Optimized for Oci8. 
    
+
+
    Changed adodb5 active record to use static SetDatabaseAdapter() and removed
+php4 constructor. Bas van Beek bas.vanbeek#gmail.com. 
    
+
+
    Also in adodb5, changed adodb-session2 to use static function declarations
+in class. Thx Daniel Berlin.
+
    
+
+
    Added "Clear SQL Log" to bottom of Performance screen. 
    
+
+
    Sessions2 code echo'ed directly to the screen in debug mode. Now uses
+ADOConnection::outp(). 
    
+
+
    In mysql/mysqli, qstr(null) will return the string "null" instead
+of empty quoted string "''". 
    
+
+
    postgresql optimizeTable in perf-postgres.inc.php added by Daniel Berlin
+(mail#daniel-berlin.de) 
    
+
+
    Added 5.2.1 compat code for oci8. 
    
+
+
    Changed @@identity to SCOPE_IDENTITY() for multiple mssql drivers. Thx
+Stefano Nari. 
    
+
+
    Code sanitization introduced in 4.95 caused problems in European locales (as
+float 3.2 was typecast to 3,2). Now we only sanitize if is_numeric fails. 
    
+
+
    Added support for customizing ADORecordset_empty using
+$this->rsPrefix.'empty'. By Josh Truwin. 
    
+
+
    Added proper support for ALterColumnSQL for Postgresql in datadict code.
+Thx. Josh Truwin. 
    
+
+
    Added better support for MetaType() in mysqli when using an array recordset.
+
    
+
+
    Changed parser for pgsql error messages in adodb-error.inc.php to
+case-insensitive regex. 
    
+
+
    4.95/5.01 17 May 2007 
    
+
+
    CacheFlush debug outp() passed in invalid parameters. Fixed. 
    
+
+
    Added Thai language file for adodb. Thx Trirat Petchsingh rosskouk#gmail.com
+and Marcos Pont
    
+
+
    Added zerofill checking support to MetaColumns for mysql and mysqli. 
    
+
+
    CacheFlush no longer deletes all files/directories. Only *.cache files
+deleted.
    
+
+
    DB2 timestamp format changed to var $fmtTimeStamp =
+"'Y-m-d-H:i:s'";
    
+
+
    Added some code sanitization to AutoExecute in adodb-lib.inc.php.
    
+
+
    Due to typo, all connections in adodb-oracle.inc.php would become
+persistent, even non-persistent ones. Fixed.
    
+
+
    Oci8 DBTimeStamp uses 24 hour time for input now, so you can perform string
+comparisons between 2 DBTimeStamp values.
    
+
+
    Some PHP4.4 compat issues fixed in adodb-session2.inc.php
    
+
+
    For ADOdb 5.01, fixed some adodb-datadict.inc.php MetaType compat issues
+with PHP5. 
    
+
+
    The $argHostname was wiped out in adodb-ado5.inc.php. Fixed. 
    
+
+
    Adodb5 version, added iterator support for adodb_recordset_empty. 
    
+
+
    Adodb5 version,more error checking code now will use exceptions if
+available. 
    
+
+
    4.94 23 Jan 2007 
    
+
+
    Active Record: $ADODB_ASSOC_CASE=2 did not work properly. Fixed. Thx
+gmane#auxbuss.com. 
    
+
+
    mysqli had bugs in BeginTrans() and EndTrans(). Fixed.
    
+
+
    Improved error handling when no database is connected for oci8. Thx Andy
+Hassall.
    
+
+
    Names longer than 30 chars in oci8 datadict will be changed to random name.
+Thx Eugenio. http://phplens.com/lens/lensforum/msgs.php?id=16182 
    
+
+
    Added var $upperCase = 'ucase' to access and ado_access drivers. Thx Renato
+De Giovanni renato#cria.org.br
    
+
+
    Postgres64 driver, if preparing plan failed in _query, did not handle error
+properly. Fixed. See http://phplens.com/lens/lensforum/msgs.php?id=16131. 
    
+
+
    Fixed GetActiveRecordsClass() reference bug. See
+http://phplens.com/lens/lensforum/msgs.php?id=16120 
    
+
+
    Added handling of nulls in adodb-ado_mssql.inc.php for qstr(). Thx to Felix
+Rabinovich. 
    
+
+
    Adodb-dict contributions by Gaetano: 
    
++ Support for INDEX in data-dict. Example: idx_ev1. The ability to define
+indexes using the INDEX keyword was added in ADOdb 4.94. The following example
+features mutiple indexes, including a compound index idx_ev1. 
    
+
+
     
     event_id I(11) NOTNULL AUTOINCREMENT PRIMARY,
     event_type I(4) NOTNULL INDEX idx_evt,
     event_start_date T DEFAULT NULL INDEX id_esd,
     event_end_date T DEFAULT '0000-00-00 00:00:00' INDEX id_eted,
     event_parent I(11) UNSIGNED NOTNULL DEFAULT 0 INDEX id_evp,
     event_owner I(11) DEFAULT 0 INDEX idx_ev1,
     event_project I(11) DEFAULT 0 INDEX idx_ev1,
     event_times_recuring I(11) UNSIGNED NOTNULL DEFAULT 0,
     event_icon C(20) DEFAULT 'obj/event',
     event_description X
    
+
+

    
++ Prevents the generated SQL from including double drop-sequence statements for
+REPLACE case of tables with autoincrement columns (on those dbs that emulate it
+via sequences) 
    
++ makes any date defined as DEFAULT value for D and T columns work
+cross-database, not just the "sysdate" value (as long as it is
+specified using adodb standard format). See above example. 
    
+
+
    Fixed pdo's GetInsertID() support. Thx Ricky Su. 
    
+
+
    oci8 Prepare() now sets error messages if an error occurs. 
    
+
+
    Added 'PT_BR' to SetDateLocale() -- brazilian portugese. 
    
+
+
    charset in oci8 was not set correctly on *Connect() 
    
+
+
    ADOConnection::Transpose() now appends as first column the field names. 
    
+
+
    Added $ADODB_QUOTE_FIELDNAMES. If set to true, will autoquote field names in
+AutoExecute(),GetInsertSQL(), GetUpdateSQL(). 
    
+
+
    Transpose now adds the field names as the first column after transposition. 
    
+
+
    Added === check in ADODB_SetDatabaseAdapter for $db,
+adodb-active-record.inc.php. Thx Christian Affolter. 
    
+
+
    Added ErrorNo() to adodb-active-record.inc.php. Thx ante#novisplet.com. 
    
+
+
    4.93 10 Oct 2006 
    
+
+
    Added support for multiple database connections in performance monitoring
+code (adodb-perf.inc.php). Now all sql in multiple database connections can be
+saved into one database ($ADODB_LOG_CONN). 
    
+
+
    Added MetaIndexes() to odbc_mssql. 
    
+
+
    Added connection property $db->null2null = 'null'. In
+autoexecute/getinsertsql/getupdatesql, this value will be converted to a null.
+Set this to a funny invalid value if you do not want null conversion. See
+http://phplens.com/lens/lensforum/msgs.php?id=15902. 
    
+
+
    Path disclosure problem in mysqli fixed. Thx Andy. 
    
+
+
    Fixed typo in session_schema2.xml. 
    
+
+
    Changed INT in oci8 to return correct precision in $fld->max_length,
+MetaColumns(). Thx
+ Eloy Lafuente
+ Plaza. 
    
+
+
    Patched postgres64 _connect to handle serverinfo(). see http://phplens.com/lens/lensforum/msgs.php?id=15887.
+
    
+
+
    Added pdo fix for null columns. See
+http://phplens.com/lens/lensforum/msgs.php?id=15889 
    
+
+
    For stored procedures, missing connection id now passed into mssql_query().
+Thx Ecsy (ecsy#freemail.hu). 
    
+
+
    4.92a 30 Aug 2006 
    
+
+
    Syntax error in postgres7 driver. Thx
+ Eloy Lafuente
+ Plaza. 
    
+
+
    Minor bug fixes - adodb informix 10 types added to adodb.inc.php. Thx
+Fernando Ortiz. 
    
+
+
    4.92 29 Aug 2006 
    
+
+
    Better odbtp date support. 
    
+
+
    Added IgnoreErrors() to bypass default error handling. 
    
+
+
    The _adodb_getcount() function in adodb-lib.inc.php, some ORDER BY bug
+fixes. 
    
+
+
    For ibase and firebird, set $sysTimeStamp = "CURRENT_TIMESTAMP". 
    
+
+
    Fixed postgres connection bug:
+http://phplens.com/lens/lensforum/msgs.php?id=11057. 
    
+
+
    Changed CacheSelectLimit() to flush cache when $secs2cache==-1 due to
+complaints from other users. 
    
+
+
    Added support for using memcached with CacheExecute/CacheSelectLimit.
+Requires memcache module PECL extension. Usage: 
    
+
+
     
    $db = NewADOConnection($driver);
    $db->memCache = true; /// should we use memCache instead of caching in files
    $db->memCacheHost = "126.0.1.1"; /// memCache host
    $db->memCachePort = 11211; /// this is default memCache port
    $db->memCacheCompress = false; /// Use 'true' to store the item compressed (uses zlib)
     
    $db->Connect(...);
    $db->CacheExecute($sql);
    
+
+
    Implemented Transpose() for recordsets. Recordset must be retrieved using
+ADODB_FETCH_NUM. First column becomes the column name. 
    
+
+
     
    $DB = NewADOConnection('mysql');
    $DB->Connect(...);
    $DB->SetFetchMode(ADODB_FETCH_NUM);
    $rs = $DB->Execute('select productname,productid,unitprice from products limit 10');
    $rs2 = $DB->Transpose($rs);
    rs2html($rs2);
    
+
+
    4.91 2 Aug 2006 
    
+
+
    Major session code rewrite .... See session docs. 
    
+
+
    PDO bindinputarray was not set properly for MySQL (changed from true to
+false). 
    
+
+
    Changed CacheSelectLimit() to re-cache when $secs2cache==0. This is one way
+to flush the cache when SelectLimit is called. 
    
+
+
    Added to quotes to mysql and mysqli: "SHOW COLUMNS FROM `%s`"; 
    
+
+
    Removed accidental optgroup handling in GetMenu(). Fixed ibase _BlobDecode
+for php5 compat, and also mem alloc issues for small blobs, thx
+salvatori#interia.pl 
    
+
+
    Mysql driver OffsetDate() speedup, useful for adodb-sessions. 
    
+
+
    Fix for GetAssoc() PHP5 compat. See
+http://phplens.com/lens/lensforum/msgs.php?id=15425 
    
+
+
    Active Record - If inserting a record and the value of a primary key field
+is null, then we do not insert that field in as we assume it is an
+auto-increment field. Needed by mssql. 
    
+
+
    Changed postgres7 MetaForeignKeys() see http://phplens.com/lens/lensforum/msgs.php?id=15531
+
    
+
+
    DB2 will now return db2_conn_errormsg() when it is a connection error. 
    
+
+
    4.90 8 June 2006 
    
+
+
    Changed adodb_countrec() in adodb-lib.inc.php to allow LIMIT to be used as a
+speedup to reduce no of records counted. 
    
+
+
    Added support for transaction modes for postgres and oci8 with
+SetTransactionMode(). These transaction modes affect all subsequent
+transactions of that connection. 
    
+
+
    Thanks to Halmai Csongor for suggestion. 
    
+
+
    Removed $off = $fieldOffset - 1 line in db2 driver, FetchField(). Tx Larry
+Menard. 
    
+
+
    Added support for PHP5 objects as Execute() bind parameters using __toString
+(eg. Simple-XML). Thx Carl-Christian Salvesen. 
    
+
+
    Rounding in tohtml.inc.php did not work properly. Fixed. 
    
+
+
    MetaIndexes in postgres fails when fields are deleted then added in again
+because the attnum has gaps in it. See
+http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976.
+Fixed. 
    
+
+
    MetaForeignkeys in mysql and mysqli did not work when
+fetchMode==ADODB_FETCH_ASSOC used. Fixed. 
    
+
+
    Reference error in AutoExecute() fixed. 
    
+
+
    Added macaddr postgres type to MetaType. Maps to 'C'. 
    
+
+
    Added to _connect() in adodb-ado5.inc.php support for $database and
+$dataProvider parameters. Thx Larry Menard. 
    
+
+
    Added support for sequences in adodb-ado_mssql.inc.php. Thx Larry Menard. 
    
+
+
    Added ADODB_SESSION_READONLY. 
    
+
+
    Added session expiryref support to crc32 mode, and in LOB code. 
    
+
+
    Clear _errorMsg in postgres7 driver, so that ErrorMsg() displays properly
+when no error occurs. 
    
+
+
    Added BindDate and BindTimeStamp 
    
+
+
    4.81 3 May 2006 
    
+
+
    Fixed variable ref errors in adodb-ado5.inc.php in _query(). 
    
+
+
    Mysqli setcharset fix using method_exists(). 
    
+
+
    The adodb-perf.inc.php CreateLogTable() code now works for user-defined
+table names. 
    
+
+
    Error in ibase_blob_open() fixed. See
+http://phplens.com/lens/lensforum/msgs.php?id=14997 
    
+
+
    4.80 8 Mar 2006 
    
+
+
    Added activerecord support. 
    
+
+
    Added mysql $conn->compat323 = true if you want MySQL 3.23 compat
+enabled. Fixes GetOne() Select-Limit problems. 
    
+
+
    Added adodb-xmlschema03.inc.php to support XML Schema version 3 and updated
+adodb-datadict.htm docs. 
    
+
+
    Better memory management in Execute. Thx Mike Fedyk. 
    
+
+
    4.72 21 Feb 2006 
    
+
+
    Added 'new' DSN parameter for NConnect(). 
    
+
+
    Pager now sanitizes $PHP_SELF to protect against XSS. Thx to James Bercegay
+and others. 
    
+
+
    ADOConnection::MetaType changed to setup $rs->connection correctly. 
    
+
+
    New native DB2 driver contributed by Larry Menard, Dan Scott, Andy
+Staudacher, Bharat Mediratta. 
    
+
+
    The mssql CreateSequence() did not BEGIN TRANSACTION correctly. Fixed. Thx
+Sean Lee. 
    
+
+
    The _adodb_countrecs() function in adodb-lib.inc.php has been revised to
+handle more ORDER BY variations. 
    
+
+
    4.71 24 Jan 2006 
    
+
+
    Fixes postgresql security issue related to binary strings. Thx to Andy
+Staudacher. 
    
+
+
    Several DSN bugs found: 
    
+
+
    1. Fix bugs in DSN connections introduced in 4.70 when underscores are found
+in the DSN. 
    
+
+
    2. DSN with _ did not work properly in PHP5 (fine in PHP4). Fixed. 
    
+
+
    3. Added support for PDO DSN connections in NewADOConnection(), and database
+parameter in PDO::Connect(). 
    
+
+
    The oci8 datetime flag not correctly implemented in ADORecordSet_array.
+Fixed. 
    
+
+
    Added BlobDelete() to postgres, as a counterpoint to UpdateBlobFile(). 
    
+
+
    Fixed GetInsertSQL() to support oci8po. 
    
+
+
    Fixed qstr() issue with postgresql with \0 in strings. 
    
+
+
    Fixed some datadict driver loading issues in _adodb_getdriver(). 
    
+
+
    Added register shutdown function session_write_close in
+adodb-session.inc.php for PHP 5 compat. See
+http://phplens.com/lens/lensforum/msgs.php?id=14200. 
    
+
+
    4.70 6 Jan 2006 
    
+
+
    Many fixes from Danila Ulyanov to ibase, oci8, postgres, mssql, odbc_oracle,
+odbtp, etc drivers. 
    
+
+
    Changed usage of binary hint in adodb-session.inc.php for mysql. See
+http://phplens.com/lens/lensforum/msgs.php?id=14160 
    
+
+
    Fixed invalid variable reference problem in undomq(), adodb-perf.inc.php. 
    
+
+
    Fixed http://phplens.com/lens/lensforum/msgs.php?id=14254 in
+adodb-perf.inc.php, _DBParameter() settings of fetchmode was wrong. 
    
+
+
    Fixed security issues in server.php and tmssql.php discussed by Andreas
+Sandblad in a Secunia security advisory. Added $ACCEPTIP = 127.0.0.1 and
+changed suggested root password to something more secure. 
    
+
+
    Changed pager to close recordset after RenderLayout(). 
    
+
+
    4.68 25 Nov 2005 
    
+
+
    PHP 5 compat for mysqli. MetaForeignKeys repeated twice and
+MYSQLI_BINARY_FLAG missing. 
    
+
+
    PHP 5.1 support for postgresql bind parameters using ? did not work if >=
+10 parameters. Fixed. Thx to Stanislav Shramko. 
    
+
+
    Lots of PDO improvements. 
    
+
+
    Spelling error fixed in mysql MetaForeignKeys, $associative parameter. 
    
+
+
    4.67 16 Nov 2005 
    
+
+
    Postgresql not_null flag not set to false correctly. Thx Cristian MARIN. 
    
+
+
    We now check in Replace() if key is in fieldArray. Thx Sbastien Vanvelthem.
+
    
+
+
    _file_get_contents() function was missing in xmlschema. fixed. 
    
+
+
    Added week in year support to SQLDate(), using 'W' flag. Thx Spider. 
    
+
+
    In sqlite metacolumns was repeated twice, causing PHP 5 problems. Fixed. 
    
+
+
    Made debug output XHTML compliant. 
    
+
+
    4.66 28 Sept 2005 
    
+
+
    ExecuteCursor() in oci8 did not clean up properly on failure. Fixed. 
    
+
+
    Updated xmlschema.dtd, by "Alec Smecher" asmecher#smecher.bc.ca 
    
+
+
    Hardened SelectLimit, typecasting nrows and offset to integer. 
    
+
+
    Fixed misc bugs in AutoExecute() and GetInsertSQL(). 
    
+
+
    Added $conn->database as the property holding the database name. The
+older $conn->databaseName is retained for backward compat. 
    
+
+
    Changed _adodb_backtrace() compat check to use function_exists(). 
    
+
+
    Bug in postgresql MetaIndexes fixed. Thx Kevin Jamieson. 
    
+
+
    Improved OffsetDate for MySQL, reducing rounding error. 
    
+
+
    Metacolumns added to sqlite. Thx Mark Newnham. 
    
+
+
    PHP 4.4 compat fixes for GetAssoc(). 
    
+
+
    Added postgresql bind support for php 5.1. Thx Cristiano da Cunha Duarte 
    
+
+
    OffsetDate() fixes for postgresql, typecasting strings to date or timestamp.
+
    
+
+
    DBTimeStamp formats for mssql, odbc_mssql and postgresql made to conform
+with other db's. 
    
+
+
    Changed PDO constants from PDO_ to PDO:: to support latest spec. 
    
+
+
    4.65 22 July 2005 
    
+
+
    Reverted 'X' in mssql datadict to 'TEXT' to be compat with mssql driver.
+However now you can set $datadict->typeX = 'varchar(4000)' or 'TEXT' or
+'CLOB' for mssql and oci8 drivers. 
    
+
+
    Added charset support when using DSN for Oracle. 
    
+
+
    _adodb_getmenu did not use fieldcount() to get number of fields. Fixed. 
    
+
+
    MetaForeignKeys() for mysql/mysqli contributed by Juan Carlos Gonzalez. 
    
+
+
    MetaDatabases() now correctly returns an array for mysqli driver. Thx
+Cristian MARIN. 
    
+
+
    CompleteTrans(false) did not return false. Fixed. Thx to JMF. 
    
+
+
    AutoExecute() did not work with Oracle. Fixed. Thx Jos Moreira. 
    
+
+
    MetaType() added to connection object. 
    
+
+
    More PHP 4.4 reference return fixes. Thx Ryan C Bonham and others. 
    
+
+
    4.64 20 June 2005 
    
+
+
    In datadict, if the default field value is set to '', then it is not applied
+when the field is created. Fixed by Eugenio. 
    
+
+
    MetaPrimaryKeys for postgres did not work because of true/false change in
+4.63. Fixed. 
    
+
+
    Tested ocifetchstatement in oci8. Rejected at the end. 
    
+
+
    Added port to dsn handling. Supported in postgres, mysql, mysqli,ldap. 
    
+
+
    Added 'w' and 'l' to mysqli SQLDate(). 
    
+
+
    Fixed error handling in ldap _connect() to be more consistent. Also added
+ErrorMsg() handling to ldap. 
    
+
+
    Added support for union in _adodb_getcount, adodb-lib.inc.php for postgres
+and oci8. 
    
+
+
    rs2html() did not work with null dates properly. 
    
+
+
    PHP 4.4 reference return fixes. 
    
+
+
    4.63 18 May 2005 
    
+
+
    Added $nrows<0 check to mysqli's SelectLimit().
+
    Added OptimizeTable() and OptimizeTables() in adodb-perf.inc.php. By Markus Staab.
+
    PostgreSQL inconsistencies fixed. true and false set to TRUE and FALSE, and boolean type in datadict-postgres.inc.php set
+to 'L' => 'BOOLEAN'. Thx Kevin Jamieson.
+
    New adodb_session_create_table() function in adodb-session.inc.php. By Markus Staab.
+
    Added null check to UserTimeStamp().
+
    Fixed typo in mysqlt driver in adorecordset. Thx to Andy Staudacher.
+
    GenID() had a bug in the raiseErrorFn handling. Fixed. Thx Marcos Pont.
+
    Datadict name quoting now handles ( ) in index fields correctly - they aren't part of the index field. >
    
+
+
    Performance monitoring: (1) oci8 Ixora checks moved down; (2) expensive sql
+changed so that only those sql with count(*)>1 are shown; (3) changed sql1
+field to a length+crc32 checksum - this breaks backward compat. 
    
+
+
    We remap firebird15 to firebird in data dictionary. 
    
+
+
    4.62 2 Apr 2005 
    
+
+
    Added 'w' (dow as 0-6 or 1-7) and 'l' (dow as string) for SQLDate for oci8,
+postgres and mysql. 
    
+
+
    Rolled back MetaType() changes for mysqli done in prev version. 
    
+
+
    Datadict change by chris, cblin#tennaxia.com data mappings from: 
    
+
+
     
    oci8: X->varchar(4000) XL->CLOB
    mssql: X->XL->TEXT
    mysql: X->XL->LONGTEXT
    fbird: X->XL->varchar(4000)
    
+
+
    to: 
    
+
+
     
    oci8: X->varchar(4000) XL->CLOB
    mssql: X->VARCHAR(4000) XL->TEXT
    mysql: X->TEXT XL->LONGTEXT
    fbird: X->VARCHAR(4000) XL->VARCHAR(32000)
    
+
+
    Added $connection->disableBlobs to postgresql to improve performance when
+no bytea is used (2-5% improvement). 
    
+
+
    Removed all HTTP_* vars. 
    
+
+
    Added $rs->tableName to be set before calling AutoExecute(). 
    
+
+
    Alex Rootoff rootoff#pisem.net contributed ukrainian language file. 
    
+
+
    Added new mysql_option() support using $conn->optionFlags array. 
    
+
+
    Added support for ldap_set_option() using the $LDAP_CONNECT_OPTIONS global
+variable. Contributed by Josh Eldridge. 
    
+
+
    Added LDAP_* constant definitions to ldap. 
    
+
+
    Added support for boolean bind variables. We use $conn->false and
+$conn->true to hold values to set false/true to. 
    
+
+
    We now do not close the session connection in adodb-session.inc.php as other
+objects could be using this connection. 
    
+
+
    We now strip off \0 at end of Ixora SQL strings in $perf->tohtml() for
+oci8. 
    
+
+
    4.61 23 Feb 2005 
    
+
+
    MySQLi added support for mysqli_connect_errno() and mysqli_connect_error(). 
    
+
+
    Massive improvements to alpha PDO driver. 
    
+
+
    Quote string bind parameters logged by performance monitor for easy type
+checking. Thx Jason Judge. 
    
+
+
    Added support for $role when connecting with Interbase/firebird. 
    
+
+
    Added support for enum recognition in MetaColumns() mysql and mysqli. Thx
+Amedeo Petrella. 
    
+
+
    The sybase_ase driver contributed by Interakt Online. Thx Cristian Marin
+cristic#interaktonline.com. 
    
+
+
    Removed not_null, has_default, and default_value from ADOFieldObject. 
    
+
+
    Sessions code, fixed quoting of keys when handling LOBs in session write()
+function. 
    
+
+
    Sessions code, added adodb_session_regenerate_id(), to reduce risk of
+session hijacking by changing session cookie dynamically. Thx Joe Li. 
    
+
+
    Perf monitor, polling for CPU did not work for PHP 4.3.10 and 5.0.0-5.0.3
+due to PHP bugs, so we special case these versions. 
    
+
+
    Postgresql, UpdateBlob() added code to handle type==CLOB. 
    
+
+
    4.60 24 Jan 2005 
    
+
+
    Implemented PEAR DB's autoExecute(). Simplified design because I don't like
+using constants when strings work fine. 
    
+
+
    _rs2serialize will now update $rs->sql and $rs->oldProvider. 
    
+
+
    Added autoExecute(). 
    
+
+
    Added support for postgres8 driver. Currently just remapped to postgres7
+driver. 
    
+
+
    Changed oci8 _query(), so that OCIBindByName() sets the length to -1 if
+element size is > 4000. This provides better support for LONGs. 
    
+
+
    Added SetDateLocale() support for netherlands (Nl). 
    
+
+
    Spelling error in pivot code ($iff should be $iif). 
    
+
+
    mysql insert_id() did not work with mysql 3.x. Fixed. 
    
+
+
    "\r\n" not converted to spaces correctly in exporting data. Fixed.
+
    
+
+
    _nconnect() in mysqli did not return value correctly. Fixed. 
    
+
+
    Arne Eckmann contributed danish language file. 
    
+
+
    Added clone() support to FetchObject() for PHP5.
    
+
+
    Removed SQL_CUR_USE_ODBC from odbc_mssql.
    
+
+
    4.55 5 Jan 2005 
    
+
+
    Found bug in Execute() with bind params for db's that do not support binding
+natively. 
    
+
+
    DropSequence() now correctly uses default parameter. 
    
+
+
    Now Execute() ignores locale for floats, so 1.23 is NEVER converted to 1,23.
+
    
+
+
    SetFetchMode() not properly saved in adodb-perf, suspicious sql and
+expensive sql. Fixed. 
    
+
+
    Added INET to postgresql metatypes. Thx motzel. 
    
+
+
    Allow oracle hints to work when counting with _adodb_getcount in
+adodb-lib.inc.php. Thx Chris Wrye. 
    
+
+
    Changed mysql insert_id() to use SELECT LAST_INSERT_ID(). 
    
+
+
    If alter col in datadict does not modify col type/size of actual col, then
+it is removed from alter col code. By Mark Newham. Not perfect as MetaType()
+!== ActualType(). 
    
+
+
    Added handling of view fields in metacolumns() for postgresql. Thx Renato De
+Giovanni. 
    
+
+
    Added to informix MetaPrimaryKeys and MetaColumns fixes for null bit. Thx to
+Cecilio Albero. 
    
+
+
    Removed obsolete connection_timeout() from perf code. 
    
+
+
    Added support for arrayClass in adodb-csv.inc.php. 
    
+
+
    RSFilter now accepts methods of the form $array($obj, 'methodname'). Thx to
+blake#near-time.com. 
    
+
+
    Changed CacheFlush to $cmd = 'rm -rf
+'.$ADODB_CACHE_DIR.'/[0-9a-f][0-9a-f]/'; 
    
+
+
    For better cursor concurrency, added code to free ref cursors in oci8 when
+$rs->Close() is called. Note that CLose() is called internally by the Get*
+functions too. 
    
+
+
    Added IIF support for access when pivoting. Thx Volodia Krupach. 
    
+
+
    Added mssql datadict support for timestamp. Thx Alexios. 
    
+
+
    Informix pager fix. By Mario Ramirez. 
    
+
+
    ADODB_TABLE_REGEX now includes ':'. By Mario Ramirez. 
    
+
+
    Mark Newnham contributed MetaIndexes for oci8 and db2. 
    
+
+
    4.54 5 Nov 2004 
    
+
+
    Now you can set $db->charSet = ?? before doing a Connect() in oci8. 
    
+
+
    Added adodbFetchMode to sqlite. 
    
+
+
    Perf code, added a string typecast to substr in adodb_log_sql(). 
    
+
+
    Postgres: Changed BlobDecode() to use po_loread, added new $maxblobsize
+parameter, and now it returns the blob instead of sending it to stdout - make
+sure to mention that as a compat warning. Also added $db->IsOID($oid)
+function; uses a heuristic, not guaranteed to work 100%. 
    
+
+
    Contributed arabic language file by "El-Shamaa, Khaled"
+k.el-shamaa#cgiar.org 
    
+
+
    PHP5 exceptions did not handle @ protocol properly. Fixed. 
    
+
+
    Added ifnull handling for postgresql (using coalesce). 
    
+
+
    Added metatables() support for Postgresql 8.0 (no longer uses pg_%
+dictionary tables). 
    
+
+
    Improved Sybase ErrorMsg() function. By Gaetano Giunta. 
    
+
+
    Improved oci8 SelectLimit() to use Prepare(). By Cristiano Duarte. 
    
+
+
    Type-cast $row parameter in ifx_fetch_row() to int. Thx stefan bodgan. 
    
+
+
    Ralf becker contributed improvements in postgresql, sapdb, mysql data
+dictionary handling:
    
+- MySql and Postgres MetaType was reporting every int column which was part of
+a primary key and unique as serial
    
+- Postgres was not reporting the scale of decimal types
    
+- MaxDB was padding the defaults of none-string types with spaces
    
+- MySql now correctly converts enum columns to varchar 
    
+
+
    Ralf also changed Postgresql datadict:
    
+- you cant add NOT NULL columns in postgres in one go, they need to be added as
+NULL and then altered to NOT NULL
    
+- AlterColumnSQL could not change a varchar column with numbers into an integer
+column, postgres need an explicit conversation
    
+- a re-created sequence was not set to the correct value, if the name was the
+old name (no implicit sequence), now always the new name of the implicit
+sequence is used
    
+
+
    Sergio Strampelli added extra $intoken check to Lens_ParseArgs() in datadict
+code. 
    
+
+
    4.53 28 Sept 2004 
    
+
+
    FetchMode cached in recordset is sometimes mapped to native db fetchMode.
+Normally this does not matter, but when using cached recordsets, we need to
+switch back to using adodb fetchmode. So we cache this in
+$rs->adodbFetchMode if it differs from the db's fetchMode. 
    
+
+
    For informix we now set canSeek = false driver because stefan bodgan tells
+me that seeking doesn't work. 
    
+
+
    SetDateLocale() never worked till now ;-) Thx david#tomato.it 
    
+
+
    Set $_bindInputArray = true in sapdb driver. Required for clob support. 
    
+
+
    Fixed some PEAR::DB emulation issues with isError() and isWarning. Thx to
+Gert-Rainer Bitterlich. 
    
+
+
    Empty() used in getupdatesql without strlen() check. Fixed.
    
+
+
    Added unsigned detection to mysql and mysqli drivers. Thx to dan cech. 
    
+
+
    Added hungarian language file. Thx to Halszvri Gbor. 
    
+
+
    Improved fieldname-type formatting of datadict SQL generated (adding
+$widespacing parameter to _GenField). 
    
+
+
    Datadict oci8 DROP CONSTRAINTS misspelt. Fixed. Thx Mark Newnham. 
    
+
+
    Changed odbtp to dynamically change databaseType based on connection, eg.
+from 'odbtp' to 'odbtp_mssql' when connecting to mssql database. 
    
+
+
    In datadict, MySQL I4 was wrongly mapped to MEDIUMINT, which is actually I3.
+Fixed. 
    
+
+
    Fixed mysqli MetaType() recognition. Mysqli returns numeric types unlike
+mysql extension. Thx Francesco Riosa. 
    
+
+
    VFP odbc driver curmode set wrongly, causing problems with memo fields.
+Fixed. 
    
+
+
    Odbc driver did not recognize odbc version 2 driver date types properly.
+Fixed. Thx Bostjan. 
    
+
+
    ChangeTableSQL() fixes to datadict-db2.inc.php by Mark Newnham. 
    
+
+
    Perf monitoring with odbc improved. Now we try in perf code to manually set
+the sysTimeStamp using date() if sysTimeStamp is empty. 
    
+
+
    All ADO
+errors are thrown as exceptions in PHP5. So we added exception handling to ado
+in PHP5 by creating new adodb-ado5.inc.php driver. 
    
+
+
    Added IsConnected(). Returns true if connection object connected. By
+Luca.Gioppo. 
    
+
+
    "Ralf Becker" RalfBecker#digitalROCK.de contributed new sapdb
+data-dictionary driver and a large patch that implements field and table
+renaming for oracle, mssql, postgresql, mysql and sapdb. See the new RenameTableSQL()
+and RenameColumnSQL() functions. 
    
+
+
    We now check ExecuteCursor to see if PrepareSP was initially called. 
    
+
+
    Changed oci8 datadict to use MODIFY for $dd->alterCol. Thx Mark Newnham. 
    
+
+
    4.52 10 Aug 2004 
    
+
+
    Bug found in Replace() when performance logging enabled, introduced in ADOdb
+4.50. Fixed. 
    
+
+
    Replace() checks update stmt. If update stmt fails, we now return
+immediately. Thx to alex. 
    
+
+
    Added support for $ADODB_FORCE_TYPE in GetUpdateSQL/GetInsertSQL. Thx to
+niko. 
    
+
+
    Added ADODB_ASSOC_CASE support to postgres/postgres7 driver. 
    
+
+
    Support for DECLARE stmt in oci8. Thx Lochbrunner. 
    
+
+
    4.51 29 July 2004 
    
+
+
    Added adodb-xmlschema 1.0.2. Thx dan and richard. 
    
+
+
    Added new adorecordset_ext_* classes. If ADOdb extension installed for
+mysql, mysqlt and oci8 (but not oci8po), we use the superfast ADOdb extension
+code for movenext. 
    
+
+
    Added schema support to mssql and odbc_mssql MetaPrimaryKeys(). 
    
+
+
    Patched MSSQL driver to support PHP NULL and Boolean values while binding
+the input array parameters in the _query() function. By Stephen Farmer. 
    
+
+
    Added support for clob's for mssql, UpdateBlob(). Thx to
+gfran#directa.com.br 
    
+
+
    Added normalize support for postgresql (true=lowercase table name, or
+false=case-sensitive table names) to MetaColumns($table, $normalize=true). 
    
+
+
    PHP5 variant dates in ADO
+not working. Fixed in adodb-ado.inc.php. 
    
+
+
    Constant ADODB_FORCE_NULLS was not working properly for many releases (for
+GetUpdateSQL). Fixed. Also GetUpdateSQL strips off ORDER BY now - thx Elieser
+Leo. 
    
+
+
    Perf Monitor for oci8 now dynamically highlights optimizer_* params if too
+high/low. 
    
+
+
    Added dsn support to NewADOConnection/ADONewConnection. 
    
+
+
    Fixed out of page bounds bug in _adodb_pageexecute_all_rows() Thx to
+"Sergio Strampelli" sergio#rir.it 
    
+
+
    Speedup of movenext for mysql and oci8 drivers. 
    
+
+
    Moved debugging code _adodb_debug_execute() to adodb-lib.inc.php. 
    
+
+
    Fixed postgresql bytea detection bug. See
+http://phplens.com/lens/lensforum/msgs.php?id=9849. 
    
+
+
    Fixed ibase datetimestamp typo in PHP5. Thx stefan. 
    
+
+
    Removed whitespace at end of odbtp drivers. 
    
+
+
    Added db2 metaprimarykeys fix. 
    
+
+
    Optimizations to MoveNext() for mysql and oci8. Misc speedups to Get*
+functions. 
    
+
+
    4.50 6 July 2004 
    
+
+
    Bumped it to 4.50 to avoid confusion with PHP 4.3.x series. 
    
+
+
    Added db2 metatables and metacolumns extensions. 
    
+
+
    Added alpha PDO driver. Very buggy, only works with odbc. 
    
+
+
    Tested mysqli. Set poorAffectedRows = true. Cleaned up movenext() and
+_fetch(). 
    
+
+
    PageExecute does not work properly with php5 (return val not a variable).
+Reported Dmytro Sychevsky sych#php.com.ua. Fixed. 
    
+
+
    MetaTables() for mysql, $showschema parameter was not backward compatible
+with older versions of adodb. Fixed. 
    
+
+
    Changed mysql GetOne() to work with mysql 3.23 when using with non-select
+stmts (e.g. SHOW TABLES). 
    
+
+
    Changed TRIG_ prefix to a variable in datadict-oci8.inc.php. Thx to
+Luca.Gioppo#csi.it. 
    
+
+
    New to adodb-time code. We allow you to define your own daylights savings
+function, adodb_daylight_sv for pre-1970 dates. If the function is defined
+(somewhere in an include), then you can correct for daylights savings. See
+http://phplens.com/phpeverywhere/node/view/16#daylightsavings for more info. 
    
+
+
    New sqlitepo driver. This is because assoc mode does not work like other
+drivers in sqlite. Namely, when selecting (joining) multiple tables, in assoc
+mode the table names are included in the assoc keys in the "sqlite"
+driver. In "sqlitepo" driver, the table names are stripped from the
+returned column names. When this results in a conflict, the first field get
+preference. Contributed by Herman Kuiper herman#ozuzo.net 
    
+
+
    Added $forcenull parameter to GetInsertSQL/GetUpdateSQL. Idea by Marco
+Aurelio Silva. 
    
+
+
    More XHTML changes for GetMenu. By Jeremy Evans. 
    
+
+
    Fixes some ibase date issues. Thx to stefan bogdan. 
    
+
+
    Improvements to mysqli driver to support $ADODB_COUNTRECS. 
    
+
+
    Fixed adodb-csvlib.inc.php problem when reading stream from socket. We need
+to poll stream continiously. 
    
+
+
    4.23 16 June 2004 
    
+
+
    New interbase/firebird fixes thx to Lester Caine. Driver fixes a problem
+with getting field names in the result array, and corrects a couple of data
+conversions. Also we default to dialect3 for firebird. Also ibase sysDate
+property was wrong. Changed to cast as timestamp. 
    
+
+
    The datadict driver is set up to give quoted tables and fields as this was
+the only way round reserved words being used as field names in TikiWiki.
+TikiPro is tidying that up, and I hope to be able to produce a build of THAT
+which uses what I consider proper UPPERCASE field and table names. The
+conversion of TikiWiki to ADOdb helped in that, but until the database is
+completely tidied up in TikiPro ... 
    
+
+
    Modified _gencachename() to include fetchmode in name hash. This means you
+should clear your cache directory after installing this release as the cache
+name algorithm has changed. 
    
+
+
    Now Cache* functions work in safe mode, because we do not create
+sub-directories in the $ADODB_CACHE_DIR in safe mode. In non-safe mode we still
+create sub-directories. Done by modifying _gencachename(). 
    
+
+
    Added $gmt parameter (true/false) to UserDate and UserTimeStamp in
+connection class, to force conversion of input (in local time) to be converted
+to UTC/GMT. 
    
+
+
    Mssql datadict did not support INT types properly (no size param allowed).
+Added _GetSize() to datadict-mssql.inc.php. 
    
+
+
    For borland_ibase, BeginTrans(), changed:
    
+
+
     $this->_transactionID = $this->_connectionID;
    
+
+
    to
    
+
+
     $this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID);
    
+
+
    Fixed typo in mysqi_field_seek(). Thx to Sh4dow (sh4dow#php.pl). 
    
+
+
    LogSQL did not work with Firebird/Interbase. Fixed. 
    
+
+
    Postgres: made errorno() handling more consistent. Thx to Michael Jahn,
+Michael.Jahn#mailbox.tu-dresden.de. 
    
+
+
    Added informix patch to better support metatables, metacolumns by
+"Cecilio Albero" c-albero#eos-i.com 
    
+
+
    Cyril Malevanov contributed patch to oci8 to support passing of LOB
+parameters: 
    
+
+
     $text = 'test test test';
    
+ $sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
    
+ $stmt = $conn -> PrepareSP($sql);
    
+ $conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB);
    
+ $rs = '';
    
+ $conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
    
+ $conn -> Execute($stmt);
    
+ echo "return = ".$rs."<br>";
    
+
+
    As he says, the LOBs limitations are: 
    
+
+
    - use OCINewDescriptor before binding
    
+- if Param is IN, uses save() before each execute. This is done automatically for you.
    
+- if Param is OUT, uses load() after each execute. This is done automatically for you.
    
+- when we bind $var as LOB, we create new descriptor and return it as a
    
+ Bind Result, so if we want to use OUT parameters, we have to store
    
+ somewhere &$var to load() data from LOB to it.
    
+- IN OUT params are not working now (should not be a big problem to fix it)
    
+- now mass binding not working too (I've wrote about it before)
    
+
+
    Simplified Connect() and PConnect() error handling. 
    
+
+
    When extension not loaded, Connect() and PConnect() will return null. On
+connect error, the fns will return false. 
    
+
+
    CacheGetArray() added to code. 
    
+
+
    Added Init() to adorecordset_empty(). 
    
+
+
    Changed postgres64 driver, MetaColumns() to not strip off quotes in default
+value if :: detected (type-casting of default). 
    
+
+
    Added test: if (!defined('ADODB_DIR')) die(). Useful to prevent hackers from
+detecting file paths. 
    
+
+
    Changed metaTablesSQL to ignore Postgres 7.4 information schemas (sql_*). 
    
+
+
    New polish language file by Grzegorz Pacan 
    
+
+
    Added support for UNION in
+_adodb_getcount(). 
    
+
+
    Added security check for ADODB_DIR to limit path disclosure issues.
+Requested by postnuke team. 
    
+
+
    Added better error message support to oracle driver. Thx to Gaetano Giunta. 
    
+
+
    Added showSchema support to mysql. 
    
+
+
    Bind in oci8 did not handle $name=false properly. Fixed. 
    
+
+
    If extension not loaded, Connect(), PConnect(), NConnect() will return null.
+
    
+
+
    4.22 15 Apr 2004 
    
+
+
    Moved docs to own adodb/docs folder. 
    
+
+
    Fixed session bug when quoting compressed/encrypted data in Replace(). 
    
+
+
    Netezza Driver and LDAP drivers contributed by Josh Eldridge. 
    
+
+
    GetMenu now uses rtrim() on values instead of trim(). 
    
+
+
    Changed MetaColumnNames to return an associative array, keys being the field
+names in uppercase. 
    
+
+
    Suggested fix to adodb-ado.inc.php affected_rows to support PHP5 variants.
+Thx to Alexios Fakos. 
    
+
+
    Contributed bulgarian language file by Valentin Sheiretsky
+valio#valio.eu.org. 
    
+
+
    Contributed romanian language file by stefan bogdan. 
    
+
+
    GetInsertSQL now checks for table name (string) in $rs, and will create a
+recordset for that table automatically. Contributed by Walt Boring. Also added
+OCI_B_BLOB in bind on Walt's request - hope it doesn't break anything :-) 
    
+
+
    Some minor postgres speedups in _initrs(). 
    
+
+
    ChangeTableSQL checks now if MetaColumns returns empty. Thx Jason Judge. 
    
+
+
    Added ADOConnection::Time(), returns current database time in unix timestamp
+format, or false. 
    
+
+
    4.21 20 Mar 2004 
    
+
+
    We no longer in SelectLimit for VFP driver add SELECT TOP X unless an ORDER
+BY exists. 
    
+
+
    Pim Koeman contributed dutch language file adodb-nl.inc.php. 
    
+
+
    Rick Hickerson added CLOB support to db2 datadict. 
    
+
+
    Added odbtp driver. Thx to "stefan bogdan" sbogdan#rsb.ro. 
    
+
+
    Changed PrepareSP() 2nd parameter, $cursor, to default to true (formerly
+false). Fixes oci8 backward compat problems with OUT params. 
    
+
+
    Fixed month calculation error in adodb-time.inc.php. 2102-June-01 appeared
+as 2102-May-32. 
    
+
+
    Updated PHP5 RC1 iterator support. API changed, hasMore() renamed to
+valid(). 
    
+
+
    Changed internal format of serialized cache recordsets. As we store a
+version number, this should be backward compatible. 
    
+
+
    Error handling when driver file not found was flawed in ADOLoadCode().
+Fixed. 
    
+
+
    4.20 27 Feb 2004 
    
+
+
    Updated to AXMLS 1.01. 
    
+
+
    MetaForeignKeys for postgres7 modified by Edward Jaramilla, works on pg 7.4.
+
    
+
+
    Now numbers accepts function calls or sequences for
+GetInsertSQL/GetUpdateSQL numeric fields. 
    
+
+
    Changed quotes of 'delete from $perf_table' to "". Thx Kehui
+(webmaster#kehui.net) 
    
+
+
    Added ServerInfo() for ifx, and putenv trim fix. Thx Fernando Ortiz. 
    
+
+
    Added addq(), which is analogous to addslashes(). 
    
+
+
    Tested with php5b4. Fix some php5 compat problems with exceptions and
+sybase. 
    
+
+
    Carl-Christian Salvesen added patch to mssql _query to support binds greater
+than 4000 chars. 
    
+
+
    Mike suggested patch to PHP5 exception handler. $errno must be numeric. 
    
+
+
    Added double quotes (") to ADODB_TABLE_REGEX. 
    
+
+
    For oci8, Prepare(...,$cursor), $cursor's meaning was accidentally inverted
+in 4.11. This causes problems with ExecuteCursor() too, which calls Prepare()
+internally. Thx to William Lovaton. 
    
+
+
    Now dateHasTime property in connection object renamed to datetime for
+consistency. This could break bc. 
    
+
+
    Csongor Halmai reports that db2 SelectLimit with input array is not working.
+Fixed.. 
    
+
+
    4.11 27 Jan 2004 
    
+
+
    Csongor Halmai reports db2 binding not working. Reverted back to emulated
+binding. 
    
+
+
    Dan Cech modifies datadict code. Adds support for DropIndex. Minor cleanups.
+
    
+
+
    Table misspelt in perf-oci8.inc.php. Changed v$conn_cache_advice to
+v$db_cache_advice. Reported by Steve W. 
    
+
+
    UserTimeStamp and DBTimeStamp did not handle YYYYMMDDHHMMSS format properly.
+Reported by Mike Muir. Fixed. 
    
+
+
    Changed oci8 Prepare(). Does not auto-allocate OCINewCursor automatically,
+unless 2nd param is set to true. This will break backward compat, if
+Prepare/Execute is used instead of ExecuteCursor. Reported by Chris Jones. 
    
+
+
    Added InParameter() and OutParameter(). Wrapper functions to Parameter(),
+but nicer because they are self-documenting. 
    
+
+
    Added 'R' handling in ActualType() to datadict-mysql.inc.php 
    
+
+
    Added ADOConnection::SerializableRS($rs). Returns a recordset that can be
+serialized in a session. 
    
+
+
    Added "Run SQL" to performance UI(). 
    
+
+
    Misc spelling corrections in adodb-mysqli.inc.php, adodb-oci8.inc.php and
+datadict-oci8.inc.php, from Heinz Hombergs. 
    
+
+
    MetaIndexes() for ibase contributed by Heinz Hombergs. 
    
+
+
    4.10 12 Jan 2004 
    
+
+
    Dan Cech contributed extensive changes to data dictionary to support name
+quoting (with `), and drop table/index. 
    
+
+
    Informix added cursorType property. Default remains IFX_SCROLL, but you can
+change to 0 (non-scrollable cursor) for performance. 
    
+
+
    Added ADODB_View_PrimaryKeys() for returning view primary keys to
+MetaPrimaryKeys(). 
    
+
+
    Simplified chinese file, adodb-cn.inc.php from cysoft. 
    
+
+
    Added check for ctype_alnum in adodb-datadict.inc.php. Thx to Jason Judge. 
    
+
+
    Added connection parameter to ibase Prepare(). Fix by Daniel Hassan. 
    
+
+
    Added nameQuote for quoting identifiers and names to connection obj.
+Requested by Jason Judge. Also the data dictionary parser now detects `field
+name` and generates column names with spaces correctly. 
    
+
+
    BOOL type not recognised correctly as L. Fixed. 
    
+
+
    Fixed paths in ADODB_DIR for session files, and back-ported it to 4.05 (15
+Dec 2003) 
    
+
+
    Added Schema to postgresql MetaTables. Thx to col#gear.hu 
    
+
+
    Empty postgresql recordsets that had blob fields did not set EOF properly.
+Fixed. 
    
+
+
    CacheSelectLimit internal parameters to SelectLimit were wrong. Thx to Nio. 
    
+
+
    Modified adodb_pr() and adodb_backtrace() to support command-line usage (eg.
+no html). 
    
+
+
    Fixed some fr and it lang errors. Thx to Gaetano G. 
    
+
+
    Added contrib directory, with adodb rs to xmlrpc convertor by Gaetano G. 
    
+
+
    Fixed array recordset bugs when _skiprow1 is true. Thx to Gaetano G. 
    
+
+
    Fixed pivot table code when count is false. 
    
+
+
    4.05 13 Dec 2003 
    
+
+
    Added MetaIndexes to data-dict code - thx to Dan Cech. 
    
+
+
    Rewritten session code by Ross Smith. Moved code to adodb/session directory.
+
    
+
+
    Added function exists check on connecting to most drivers, so we don't crash
+with the unknown function error. 
    
+
+
    Smart Transactions failed with GenID() when it no seq table has been created
+because the sql statement fails. Fix by Mark Newnham. 
    
+
+
    Added $db->length, which holds name of function that returns strlen. 
    
+
+
    Fixed error handling for bad driver in ADONewConnection - passed too few
+params to error-handler. 
    
+
+
    Datadict did not handle types like 16.0 properly in _GetSize. Fixed. 
    
+
+
    Oci8 driver SelectLimit() bug &= instead of =& used. Thx to Swen
+Thmmler. 
    
+
+
    Jesse Mullan suggested not flushing outp when output buffering enabled. Due
+to Apache 2.0 bug. Added. 
    
+
+
    MetaTables/MetaColumns return ref bug with PHP5 fixed in
+adodb-datadict.inc.php. 
    
+
+
    New mysqli driver contributed by Arjen de Rijke. Based on adodb 3.40 driver.
+Then jlim added BeginTrans, CommitTrans, RollbackTrans, IfNull, SQLDate. Also
+fixed return ref bug. 
    
+
+
    $ADODB_FLUSH added, if true then force flush in debugging outp. Default is
+false. In earlier versions, outp defaulted to flush, which is not compat with
+apache 2.0. 
    
+
+
    Mysql driver's GenID() function did not work when when sql logging is on.
+Fixed. 
    
+
+
    $ADODB_SESSION_TBL not declared as global var. Not available if
+adodb-session.inc.php included in function. Fixed. 
    
+
+
    The input array not passed to Execute() in _adodb_getcount(). Fixed. 
    
+
+
    4.04 13 Nov 2003 
    
+
+
    Switched back to foreach - faster than list-each. 
    
+
+
    Fixed bug in ado driver - wiping out $this->fields with date fields. 
    
+
+
    Performance Monitor, View SQL, Explain Plan did not work if
+strlen($SQL)>max($_GET length). Fixed. 
    
+
+
    Performance monitor, oci8 driver added memory sort ratio. 
    
+
+
    Added random property, returns SQL to generate a floating point number
+between 0 and 1; 
    
+
+
    4.03 6 Nov 2003 
    
+
+
    The path to adodb-php4.inc.php and adodb-iterators.inc.php was not setup
+properly. 
    
+
+
    Patched SQLDate in interbase to support hours/mins/secs. Thx to ari
+kuorikoski. 
    
+
+
    Force autorollback for pgsql persistent connections - apparently pgsql did
+not autorollback properly before 4.3.4. See http://bugs.php.net/bug.php?id=25404
+
    
+
+
    4.02 5 Nov 2003 
    
+
+
    Some errors in adodb_error_pg() fixed. Thx to Styve. 
    
+
+
    Spurious Insert_ID() error was generated by LogSQL(). Fixed. 
    
+
+
    Insert_ID was interfering with Affected_Rows() and Replace() when LogSQL()
+enabled. Fixed. 
    
+
+
    More foreach loops optimized with list/each. 
    
+
+
    Null dates not handled properly in ADO
+driver (it becomes 31 Dec 1969!). 
    
+
+
    Heinz Hombergs contributed patches for mysql MetaColumns - adding scale,
+made interbase MetaColumns work with firebird/interbase, and added
+lang/adodb-de.inc.php. 
    
+
+
    Added INFORMIXSERVER environment variable. 
    
+
+
    Added $ADODB_ANSI_PADDING_OFF for interbase/firebird. 
    
+
+
    PHP 5 beta 2 compat check. Foreach (Iterator) support. Exceptions support. 
    
+
+
    4.01 23 Oct 2003 
    
+
+
    Fixed bug in rs2html(), tohtml.inc.php, that generated blank table cells. 
    
+
+
    Fixed insert_id() incorrectly generated when logsql() enabled. 
    
+
+
    Modified PostgreSQL _fixblobs to use list/each instead of foreach. 
    
+
+
    Informix ErrorNo() implemented correctly. 
    
+
+
    Modified several places to use list/each, including GetRowAssoc(). 
    
+
+
    Added UserTimeStamp() to connection class. 
    
+
+
    Added $ADODB_ANSI_PADDING_OFF for oci8po. 
    
+
+
    4.00 20 Oct 2003 
    
+
+
    Upgraded adodb-xmlschema to 1 Oct 2003 snapshot. 
    
+
+
    Fix to rs2html warning message. Thx to Filo. 
    
+
+
    Fix for odbc_mssql/mssql SQLDate(), hours was wrong. 
    
+
+
    Added MetaColumns and MetaPrimaryKeys for sybase. Thx to Chris Phillipson. 
    
+
+
    Added autoquoting to datadict for MySQL and PostgreSQL. Suggestion by
+Karsten Dambekalns 
    
+
+
    3.94 11 Oct 2003 
    
+
+
    Create trigger in datadict-oci8.inc.php did not work, because all cr/lf's
+must be removed. 
    
+
+
    ErrorMsg()/ErrorNo() did not work for many databases when logging enabled.
+Fixed. 
    
+
+
    Removed global variable $ADODB_LOGSQL as it does not work properly with
+multiple connections. 
    
+
+
    Added SQLDate support for sybase. Thx to Chris Phillipson 
    
+
+
    Postgresql checking of pgsql resultset resource was incorrect. Fix by Bharat
+Mediratta bharat#menalto.com. Same patch applied to _insertid and _affectedrows
+for adodb-postgres64.inc.php. 
    
+
+
    Added support for NConnect for postgresql. 
    
+
+
    Added Sybase data dict support. Thx to Chris Phillipson 
    
+
+
    Extensive improvements in $perf->UI(), eg. Explain now opens in new
+window, we show scripts which call sql, etc. 
    
+
+
    Perf Monitor UI works with magic quotes enabled. 
    
+
+
    rsPrefix was declared twice. Removed. 
    
+
+
    Oci8 stored procedure support, eg. "begin func(); end;" was
+incorrect in _query. Fixed. 
    
+
+
    Tiraboschi Massimiliano contributed italian language file. 
    
+
+
    Fernando Ortiz, fortiz#lacorona.com.mx, contributed informix performance
+monitor. 
    
+
+
    Added _varchar (varchar arrays) support for postgresql. Reported by PREVOT
+Stphane.
    
+
+
    
+
+
    
+
+
    
+
+
    0.10 Sept 9 2000 First release 
    
+
+
    Old change log history moved to old-changelog.htm.
+
    
+
+
     
    
+
+
    
+
+
+
+
diff --git a/adodb/docs/docs-datadict.htm b/adodb/docs/docs-datadict.htm
new file mode 100644
index 0000000..28a7d43
--- /dev/null
+++ b/adodb/docs/docs-datadict.htm
@@ -0,0 +1,330 @@
+
+
+
+  ADOdb Data Dictionary Manual
+  
+  
+
+
+
    ADOdb Data Dictionary Library for PHP
    
+
    V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com).
    
+AXMLS (c) 2004 ars Cognita, Inc
    
+
    This software is dual licensed using BSD-Style and
+LGPL. This means you can use it in compiled proprietary and commercial
+products.
    
+
+
    Useful ADOdb links: Download
+  Other Docs
+
    
+
    This documentation describes a PHP class library to automate the
+creation of tables, indexes and foreign key constraints portably for
+multiple databases. Richard Tango-Lowy and Dan Cech have been kind
+enough to contribute AXMLS, an XML schema
+system for defining databases. You can contact them at
+dcech#phpwerx.net and richtl#arscognita.com.
    
+
    Currently the following databases are supported:
    
+
     Well-tested: PostgreSQL, MySQL, Oracle, MSSQL.
    
+Beta-quality: DB2, Informix, Sybase, Interbase, Firebird, SQLite.
    
+Alpha-quality: MS Access (does not support DEFAULT values) and
+generic ODBC.
+
    
+
    Example Usage
    
+
      include_once('adodb.inc.php');
      # First create a normal connection
      $db = NewADOConnection('mysql');
      $db->Connect(...);

      # Then create a data dictionary object, using this connection
      $dict = NewDataDictionary($db);

      # We have a portable declarative data dictionary format in ADOdb, similar to SQL.
      # Field types use 1 character codes, and fields are separated by commas.
      # The following example creates three fields: "col1", "col2" and "col3":
      $flds = " 
       col1 C(32) NOTNULL DEFAULT 'abc',
       col2 I  DEFAULT 0,
       col3 N(12.2)
      ";

      # We demonstrate creating tables and indexes
      $sqlarray = $dict->CreateTableSQL($tabname, $flds, $taboptarray);
      $dict->ExecuteSQLArray($sqlarray);

      $idxflds = 'co11, col2';
      $sqlarray = $dict->CreateIndexSQL($idxname, $tabname, $idxflds);
      $dict->ExecuteSQLArray($sqlarray);
    
+
    More Complex Table Sample
    
+
    
+The following string will create a table with a primary key event_id and multiple indexes, including one compound index idx_ev1. The ability to define indexes using the INDEX keyword was added in ADOdb 4.94 by Gaetano Giunta.
+
    +$flds = "
+  event_id I(11) NOTNULL AUTOINCREMENT PRIMARY,
+  event_type I(4) NOTNULL  INDEX idx_evt,
+  event_start_date T DEFAULT NULL INDEX id_esd,
+  event_end_date T DEFAULT '0000-00-00 00:00:00' INDEX id_eted,
+  event_parent I(11) UNSIGNED NOTNULL DEFAULT 0 INDEX id_evp,
+  event_owner I(11) DEFAULT 0 INDEX idx_ev1,
+  event_project I(11) DEFAULT 0 INDEX idx_ev1,
+  event_times_recuring I(11) UNSIGNED NOTNULL DEFAULT 0,
+  event_icon C(20) DEFAULT 'obj/event',
+  event_description X
+";
+$sqlarray = $db->CreateTableSQL($tablename, $flds);
+$dict->ExecuteSQLArray($sqlarray);
+
    
+
    Class Factory
    
+
    NewDataDictionary($connection, $drivername=false)
    
+
    Creates a new data dictionary object. You pass a database connection object in $connection. The $connection does not have to be actually connected to the database. Some database connection objects are generic (eg. odbtp and odbc). Since 4.53, you can tell ADOdb  the actual database with $drivername. E.g.
    
+
    +$db = NewADOConnection('odbtp');
+$datadict = NewDataDictionary($db, 'mssql'); # force mssql
+
    
+
    Class Functions
    
+
    function CreateDatabase($dbname, $optionsarray=false)
    
+
    Create a database with the name $dbname;
    
+
    function CreateTableSQL($tabname, $fldarray, $taboptarray=false)
    
+
      RETURNS:      an array of strings, the sql to be executed, or false
      $tabname:     name of table
      $fldarray:    string (or array) containing field info
      $taboptarray: array containing table options
    
+
    The new format of $fldarray uses a free text format, where each
+field is comma-delimited.
+The first token for each field is the field name, followed by the type
+and optional
+field size. Then optional keywords in $otheroptions:
    
+
      "$fieldname $type $colsize $otheroptions"
    
+
    The older (and still supported) format of $fldarray is a
+2-dimensional array, where each row in the 1st dimension represents one
+field. Each row has this format:
    
+
      array($fieldname, $type, [,$colsize] [,$otheroptions]*)
    
+
    The first 2 fields must be the field name and the field type. The
+field type can be a portable type codes or the actual type for that
+database.
    
+
    Legal portable type codes include:
    
+
      C:  Varchar, capped to 255 characters.
      X:  Larger varchar, capped to 4000 characters (to be compatible with Oracle). 
      XL: For Oracle, returns CLOB, otherwise the largest varchar size.

      C2: Multibyte varchar
      X2: Multibyte varchar (largest size)

      B:  BLOB (binary large object)

      D:  Date (some databases do not support this, and we return a datetime type)
      T:  Datetime or Timestamp accurate to the second.
      TS: Datetime or Timestamp supporting Sub-second accuracy.
           Supported by Oracle, PostgreSQL and SQL Server currently. 
           Otherwise equivalent to T.
    
+  L:  Integer field suitable for storing booleans (0 or 1)
      I:  Integer (mapped to I4)
      I1: 1-byte integer
      I2: 2-byte integer
      I4: 4-byte integer
      I8: 8-byte integer
      F:  Floating point number
      N:  Numeric or decimal number
    
+
    The $colsize field represents the size of the field. If a decimal
+number is used, then it is assumed that the number following the dot is
+the precision, so 6.2 means a number of size 6 digits and 2 decimal
+places. It is recommended that the default for number types be
+represented as a string to avoid any rounding errors.
    
+
    The $otheroptions include the following keywords (case-insensitive):
    
+
      AUTO            For autoincrement number. Emulated with triggers if not available.
                      Sets NOTNULL also.
      AUTOINCREMENT   Same as auto.
      KEY             Primary key field. Sets NOTNULL also. Compound keys are supported.
      PRIMARY         Same as KEY.
      DEF             Synonym for DEFAULT for lazy typists.
      DEFAULT         The default value. Character strings are auto-quoted unless
                      the string begins and ends with spaces, eg ' SYSDATE '.
      NOTNULL         If field is not null.
      DEFDATE         Set default value to call function to get today's date.
      DEFTIMESTAMP    Set default to call function to get today's datetime.
      NOQUOTE         Prevents autoquoting of default string values.
      CONSTRAINTS     Additional constraints defined at the end of the field
                      definition.
    
+
    The Data Dictonary accepts two formats, the older array
+specification:
    
+
      $flds = array(
        array('COLNAME',   'DECIMAL', '8.4', 'DEFAULT' =gt; 0, 'NOTNULL'),
        array('id',        'I'      , 'AUTO'),
        array('`MY DATE`', 'D'      , 'DEFDATE'),
        array('NAME',      'C'      , '32', 'CONSTRAINTS' =gt; 'FOREIGN KEY REFERENCES reftable')
      );
    
+
    Or the simpler declarative format:
    
+
      $flds = "
        COLNAME DECIMAL(8.4) DEFAULT 0 NOTNULL,
        id I AUTO,
        `MY DATE` D DEFDATE,
        NAME C(32) CONSTRAINTS 'FOREIGN KEY REFERENCES reftable'
      ";
    
+
    Note that if you have special characters in the field name (e.g. My
+Date), you should enclose it in back-quotes. Normally field names are
+not case-sensitive, but if you enclose it in back-quotes, some
+databases will treat the names as case-sensitive (eg. Oracle) , and
+others won't. So be careful.
    
+
    The $taboptarray is the 3rd parameter of the CreateTableSQL
+function. This contains table specific settings. Legal keywords include:
    
+
      
+  
    • REPLACE
      
+Indicates that the previous table definition should be removed
+(dropped)together with ALL data. See first example below. 
      • 
+  
    • DROP
      
+Drop table. Useful for removing unused tables. 
      • 
+  
    • CONSTRAINTS
      
+Define this as the key, with the constraint as the value. See the
+postgresql example below. Additional constraints defined for the whole
+table. You will probably need to prefix this with a comma. 
      • 
+
    
+
    Database specific table options can be defined also using the name
+of the database type as the array key. In the following example, create
+the table as ISAM with MySQL, and store the table in the "users"
+tablespace if using Oracle. And because we specified REPLACE, drop
+the table first.
    
+
      $taboptarray = array('mysql' =gt; 'TYPE=ISAM', 'oci8' =gt; 'tablespace users', 'REPLACE');
    
+
    You can also define foreign key constraints. The following is syntax
+for postgresql:
+
    
+
      $taboptarray = array('constraints' =gt; ', FOREIGN KEY (col1) REFERENCES reftable (refcol)');
    
+
    function DropTableSQL($tabname)
    
+
    Returns the SQL to drop the specified table.
    
+
    function ChangeTableSQL($tabname, $flds, $tableOptions=false, $dropOldFlds=false)
    
+
    Checks to see if table exists, if table does not exist, behaves like
+CreateTableSQL. If table exists, generates appropriate ALTER TABLE
+MODIFY COLUMN commands if field already exists, or ALTER TABLE ADD
+$column if field does not exist.
    
+
    The class must be connected to the database for ChangeTableSQL to
+detect the existence of the table. Idea and code contributed by Florian
+Buzin.
    
+
    Old fields not defined in $flds are not dropped by default. To drop old fields, set $dropOldFlds to true.
+
    function RenameTableSQL($tabname,$newname)
    
+
    Rename a table.  Returns the an array of strings, which is the SQL required to rename a table. Since ADOdb 4.53. Contributed by Ralf Becker.
    
+
     function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
    
+
    Rename a table field. Returns the an array of strings, which is the SQL required to rename a column. The optional $flds is a complete column-defintion-string like for AddColumnSQL, only used by mysql at the moment. Since ADOdb 4.53. Contributed by Ralf Becker.
    
+
    function CreateIndexSQL($idxname, $tabname, $flds,
+$idxoptarray=false)
    
+
      RETURNS:      an array of strings, the sql to be executed, or false
      $idxname:     name of index
      $tabname:     name of table
      $flds:        list of fields as a comma delimited string or an array of strings
      $idxoptarray: array of index creation options
    
+
    $idxoptarray is similar to $taboptarray in that index specific
+information can be embedded in the array. Other options include:
    
+
      CLUSTERED     Create clustered index (only mssql)
      BITMAP        Create bitmap index (only oci8)
      UNIQUE        Make unique index
      FULLTEXT      Make fulltext index (only mysql)
      HASH          Create hash index (only postgres)
      DROP          Drop legacy index
    
+
    function DropIndexSQL ($idxname, $tabname = NULL)
    
+
    Returns the SQL to drop the specified index.
    
+
    function AddColumnSQL($tabname, $flds)
    
+
    Add one or more columns. Not guaranteed to work under all situations.
    
+
    function AlterColumnSQL($tabname, $flds)
    
+
    Warning, not all databases support this feature.
    
+
    function DropColumnSQL($tabname, $flds)
    
+
    Drop 1 or more columns.
    
+
    function SetSchema($schema)
    
+
    Set the schema.
    
+
    function MetaTables()
    
+
    function MetaColumns($tab, $upper=true, $schema=false)
    
+
    function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
    
+
    function MetaIndexes($table, $primary = false, $owner = false)
    
+
    These functions are wrappers for the corresponding functions in the
+connection object. However, the table names will be autoquoted by the
+TableName function (see below) before being passed to the connection
+object.
    
+
    function NameQuote($name = NULL)
    
+
    If the provided name is quoted with backquotes (`) or contains
+special characters, returns the name quoted with the appropriate quote
+character, otherwise the name is returned unchanged.
    
+
    function TableName($name)
    
+
    The same as NameQuote, but will prepend the current schema if
+specified
    
+
    function MetaType($t,$len=-1,$fieldobj=false)
    
+
    function ActualType($meta)
    
+
    Convert between database-independent 'Meta' and database-specific
+'Actual' type codes.
    
+
    function ExecuteSQLArray($sqlarray, $contOnError = true)
    
+
      RETURNS:      0 if failed, 1 if executed all but with errors, 2 if executed successfully
      $sqlarray:    an array of strings with sql code (no semicolon at the end of string)
      $contOnError: if true, then continue executing even if error occurs
    
+
    Executes an array of SQL strings returned by CreateTableSQL or
+CreateIndexSQL.
    
+
    
+
+
    ADOdb XML Schema (AXMLS)
    
+
    This is a class contributed by Richard Tango-Lowy and Dan Cech that
+allows the user to quickly
+and easily build a database using the excellent ADODB database library
+and a simple XML formatted file.
+You can download
+the latest version of AXMLS here.
    
+
    Quick Start
    
+
    Adodb-xmlschema, or AXMLS, is a set of classes that allow the user
+to quickly and easily build or upgrade a database on almost any RDBMS
+using the excellent ADOdb database library and a simple XML formatted
+schema file. Our goal is to give developers a tool that's simple to
+use, but that will allow them to create a single file that can build,
+upgrade, and manipulate databases on most RDBMS platforms.
    
+ Installing axmls
+
    The easiest way to install AXMLS to download and install any recent
+version of the ADOdb database abstraction library. To install AXMLS
+manually, simply copy the adodb-xmlschema.inc.php file and the xsl
+directory into your adodb directory.
    
+ Using AXMLS in Your Application
+
    There are two steps involved in using AXMLS in your application:
+first, you must create a schema, or XML representation of your
+database, and second, you must create the PHP code that will parse and
+execute the schema.
    
+
    Let's begin with a schema that describes a typical, if simplistic
+user management table for an application.
    
+
    <?xml version="1.0"?>
    <schema version="0.2">

      <table name="users">
        <desc>A typical users table for our application.</desc>
        <field name="userId" type="I">
          <descr>A unique ID assigned to each user.</descr>

          <KEY/>
          <AUTOINCREMENT/>
        </field>
        
        <field name="userName" type="C" size="16"><NOTNULL/></field>

        
        <index name="userName">
          <descr>Put a unique index on the user name</descr>
          <col>userName</col>
          <UNIQUE/>

        </index>
      </table>
      
      <sql>
        <descr>Insert some data into the users table.</descr>
        <query>insert into users (userName) values ( 'admin' )</query>

        <query>insert into users (userName) values ( 'Joe' )</query>
      </sql>
    </schema>			
    
+
    Let's take a detailed look at this schema.
    
+
    The opening <?xml version="1.0"?> tag is required by XML. The
+<schema> tag tells the parser that the enclosed markup defines an
+XML schema. The version="0.2" attribute sets the version of the
+AXMLS DTD used by the XML schema. 
    
+
    All versions of AXMLS prior to version 1.0 have a schema version of
+"0.1". The current schema version is "0.2".
    
+
    <?xml version="1.0"?>
    <schema version="0.2">
      ...
    </schema>
    
+
    Next we define one or more tables. A table consists of a fields (and
+other objects) enclosed by <table> tags. The name="" attribute
+specifies the name of the table that will be created in the database.
    
+
    <table name="users">

        <desc>A typical users table for our application.</desc>
        <field name="userId" type="I">

          <descr>A unique ID assigned to each user.</descr>
          <KEY/>
          <AUTOINCREMENT/>
        </field>
        
        <field name="userName" type="C" size="16"><NOTNULL/></field>

        
    </table>
    
+
    This table is called "users" and has a description and two fields.
+The description is optional, and is currently only for your own
+information; it is not applied to the database.
    
+
    The first <field> tag will create a field named "userId" of
+type "I", or integer. (See the ADOdb Data Dictionary documentation for
+a list of valid types.) This <field> tag encloses two special
+field options: <KEY/>, which specifies this field as a primary
+key, and <AUTOINCREMENT/>, which specifies that the database
+engine should automatically fill this field with the next available
+value when a new row is inserted.
    
+
    The second <field> tag will create a field named "userName" of
+type "C", or character, and of length 16 characters. The
+<NOTNULL/> option specifies that this field does not allow NULLs.
    
+
    There are two ways to add indexes to a table. The simplest is to
+mark a field with the <KEY/> option as described above; a primary
+key is a unique index. The second and more powerful method uses the
+<index> tags.
    
+
    <table name="users">
      ...
        
      <index name="userName">
        <descr>Put a unique index on the user name</descr>
        <col>userName</col>

        <UNIQUE/>
      </index>
        
    </table>
    
+
    The <index> tag specifies that an index should be created on
+the enclosing table. The name="" attribute provides the name of the
+index that will be created in the database. The description, as above,
+is for your information only. The <col> tags list each column
+that will be included in the index. Finally, the <UNIQUE/> tag
+specifies that this will be created as a unique index.
    
+
    Finally, AXMLS allows you to include arbitrary SQL that will be
+applied to the database when the schema is executed.
    
+
    <sql>
      <descr>Insert some data into the users table.</descr>
      <query>insert into users (userName) values ( 'admin' )</query>

      <query>insert into users (userName) values ( 'Joe' )</query>
    </sql>
    
+
    The <sql> tag encloses any number of SQL queries that you
+define for your own use.
    
+
    Now that we've defined an XML schema, you need to know how to apply
+it to your database. Here's a simple PHP script that shows how to load
+the schema.
    
+
    <?PHP
    /* You must tell the script where to find the ADOdb and
     * the AXMLS libraries.
     */
+require( "path_to_adodb/adodb.inc.php");
+require( "path_to_adodb/adodb-xmlschema.inc.php" ); # or adodb-xmlschema03.inc.php
+
+/* Configuration information. Define the schema filename,
     * RDBMS platform (see the ADODB documentation for valid
     * platform names), and database connection information here.
     */
    $schemaFile = 'example.xml';
    $platform = 'mysql';
    $dbHost = 'localhost';
    $dbName = 'database';
    $dbUser = 'username';
    $dbPassword = 'password';

    /* Start by creating a normal ADODB connection.
     */
    $db = ADONewConnection( $platform );
    $db->Connect( $dbHost, $dbUser, $dbPassword, $dbName );

    /* Use the database connection to create a new adoSchema object.
     */
    $schema = new adoSchema( $db );

    /* Call ParseSchema() to build SQL from the XML schema file.
     * Then call ExecuteSchema() to apply the resulting SQL to 
     * the database.
     */
    $sql = $schema->ParseSchema( $schemaFile );
    $result = $schema->ExecuteSchema();
    ?>
    
+
    Let's look at each part of the example in turn. After you manually
+create the database, there are three steps required to load (or
+upgrade) your schema.
    
+
    First, create a normal ADOdb connection. The variables and values
+here should be those required to connect to your database.
    
+
    $db = ADONewConnection( 'mysql' );
    $db->Connect( 'host', 'user', 'password', 'database' );
    
+
    Second, create the adoSchema object that load and manipulate your
+schema. You must pass an ADOdb database connection object in order to
+create the adoSchema object.
    
+
    $schema = new adoSchema( $db );
    
+
    Third, call ParseSchema() to parse the schema and then
+ExecuteSchema() to apply it to the database. You must pass
+ParseSchema() the path and filename of your schema file.
    
+
    $schema->ParseSchema( $schemaFile ); 
    $schema->ExecuteSchema();
    
+
    Execute the above code and then log into your database. If you've
+done all this right, you should see your tables, indexes, and SQL.
    
+
    You can find the source files for this tutorial in the examples
+directory as tutorial_shema.xml and tutorial.php. See the class
+documentation for a more detailed description of the adoSchema methods,
+including methods and schema elements that are not described in this
+tutorial.
    
+
    XML Schema Version 3
    
+
    In March 2006, we added adodb-xmlschema03.inc.php to the release, which supports version 3 of XML Schema. 
+The adodb-xmlschema.inc.php remains the same as previous releases, and supports version 2 of XML Schema. 
+Version 3 provides some enhancements:
+
+
      
+     
    •  Support for updating table data during an upgrade.
+     
    •  Support for platform-specific table options and platform negation.
+     
    •  Support for unsigned fields.
+     
    •  Fixed opt and constraint support
+     
    •  Many other fixes such as OPT tag, which allows you to set optional platform settings:
+
    
+
+
    Example usage:
+
    <?xml version="1.0"?>
+<schema version="0.3">
+ <table name="ats_kb">
+  <descr>ATS KnowledgeBase</descr>
+  <opt platform="mysql">TYPE=INNODB</opt>
+  <field name="recid" type="I"/>
+  <field name="organization_code" type="I4"/> 
+  <field name="sub_code" type="C" size="20"/>
+  etc...
+
    
+
    To use it, change your code to include adodb-xmlschema03.inc.php.
+
+
    Upgrading
    
+
    
+If your schema version is older, than XSLT is used to transform the
+schema to the newest version. This means that if you are using an older
+XML schema format, you need to have the XSLT extension installed.
+If you do not want to require your users to have the XSLT extension
+installed, make sure you modify your XML schema to conform to the
+latest version.
+
    
+
    If you have any questions or comments, please email them to
+Richard at richtl#arscognita.com.
+
    
+
+
diff --git a/adodb/docs/docs-oracle.htm b/adodb/docs/docs-oracle.htm
new file mode 100644
index 0000000..3ee27aa
--- /dev/null
+++ b/adodb/docs/docs-oracle.htm
@@ -0,0 +1,542 @@
+
+
+
+
+ADOdb with PHP and Oracle
+
+
+
+
+
+
    
+
    Using ADOdb with PHP and Oracle: an advanced tutorial
    
+
    
+
    (c)2004-2005 John Lim. All rights reserved.
    
+
    1. Introduction
    
+
    Oracle is the most popular commercial database used with PHP. There are many ways of accessing Oracle databases in PHP. These include:
    
+
      
+  
    • The oracle extension
      • 
+  
    • The oci8 extension
      • 
+  
    • PEAR DB library
      • 
+  
    • ADOdb library
      • 
+
    
+
    The wide range of choices is confusing to someone just starting with Oracle and PHP. I will briefly summarize the differences, and  show you the advantages of using ADOdb. 
    
+
    First we have the C extensions which provide low-level access to Oracle functionality. These C extensions are precompiled into PHP, or linked in dynamically when the web server starts up. Just in case you need it, here's a guide to installing Oracle and PHP on Linux.
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+
    Oracle extensionDesigned for Oracle 7 or earlier. This is obsolete.
    Oci8 extension Despite it's name, which implies it is only for Oracle 8i, this is the standard method for accessing databases running Oracle 8i, 9i or 10g (and later).
    
+
    Here is an example of using the oci8 extension to query the emp table of the scott schema with bind parameters:
+
    +$conn = OCILogon("scott","tiger", $tnsName); 
+
+$stmt = OCIParse($conn,"select * from emp where empno > :emp order by empno"); 
+$emp = 7900;
+OCIBindByName($stmt, ':emp', $emp);
+$ok = OCIExecute($stmt);
+while (OCIFetchInto($stmt,$arr)) {
+	print_r($arr);
+	echo "<hr>";	
+} 
+
    
+
    This generates the following output:
+
    
+Array ( [0] => 7902 [1] => FORD [2] => ANALYST [3] => 7566 [4] => 03/DEC/81 [5] => 3000 [7] => 20 ) 
+
    
+  Array ( [0] => 7934 [1] => MILLER [2] => CLERK [3] => 7782 [4] => 23/JAN/82 [5] => 1300 [7] => 10 )
+
    
+
    We also have  many higher level PHP libraries that allow you to simplify the above code. The most popular are PEAR DB and ADOdb.  Here are some of the differences between these libraries:
    
+
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+
    FeaturePEAR DB 1.6ADOdb 4.52
    General StyleSimple, easy to use. Lacks Oracle specific functionality.Has multi-tier design. Simple high-level design for beginners, and also lower-level advanced Oracle functionality.
    Support for PrepareYes, but only on one statement, as the last prepare overwrites previous prepares.Yes (multiple simultaneous prepare's allowed)
    Support for LOBsNoYes, using update semantics
    Support for REF CursorsNoYes
    Support for IN ParametersYesYes
    Support for OUT ParametersNoYes
    Schema creation using XMLNoYes, including ability to define tablespaces and constraints
    Provides database portability featuresNoYes, has some ability to abstract features that differ between databases such as dates, bind parameters, and data types.
    Performance monitoring and tracingNoYes. SQL can be traced and linked to web page it was executed on. Explain plan support included.
    Recordset caching for frequently used queriesNoYes. Provides great speedups for SQL involving complex where, group-by and order-by clauses.
    PopularityYes, part of PEAR releaseYes, many open source projects are using this software, including PostNuke, Xaraya, Mambo, Tiki Wiki.
    SpeedMedium speed.Very high speed. Fastest database abstraction library available for PHP. Benchmarks are available.
    High Speed Extension availableNoYes. You can install the optional ADOdb extension, which reimplements the most frequently used parts of ADOdb as fast C code. Note that the source code version of ADOdb runs just fine without this extension, and only makes use of the extension if detected.
    
+
     PEAR DB is good enough for simple web apps. But if you need more power, you can see ADOdb offers more sophisticated functionality. The rest of this article will concentrate on using ADOdb with Oracle. You can find out more about connecting to Oracle later in this guide.
    
+
    ADOdb Example
    
+
    In ADOdb, the above oci8 example querying the emp table could be written as:
    
+
    +include "/path/to/adodb.inc.php";
+$db = NewADOConnection("oci8");
+$db->Connect($tnsName, "scott", "tiger");
+
+$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
+                    array('emp' => 7900));
+while ($arr = $rs->FetchRow()) {
+    print_r($arr);
+	echo "<hr>";
+}
+
    
+
    The Execute( ) function returns a recordset object, and you can retrieve the rows returned using $recordset->FetchRow( ). 
    
+
    If we ignore the initial connection preamble, we can see the ADOdb version is much easier and simpler:
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+
    Oci8ADOdb
    $stmt = OCIParse($conn,
+       "select * from emp where empno > :emp"); 
+$emp = 7900;
+OCIBindByName($stmt, ':emp', $emp);
+$ok = OCIExecute($stmt);
+
+while (OCIFetchInto($stmt,$arr)) {
+	print_r($arr);
+	echo "<hr>";	
+} 
    $recordset = $db->Execute("select * from emp where empno>:emp", 
+                           array('emp' => 7900));
+
+while ($arr = $recordset->FetchRow()) {
+	print_r($arr);
+	echo "<hr>";
+}
    
+
     
    
+
    2. ADOdb Query Semantics
    
+
    You can also query the database using the standard Microsoft ADO MoveNext( ) metaphor. The data array for the current row is stored in the fields property of the recordset object, $rs.
+MoveNext( ) offers the highest performance among all the techniques for iterating through a recordset:
+
    +$rs = $db->Execute("select * from emp where empno>:emp", array('emp' => 7900));
+while (!$rs->EOF) {
+	print_r($rs->fields);
+	$rs->MoveNext();
+}
+
    
+
    And if you are interested in having the data returned in a 2-dimensional array, you can use:
+
    +$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
+
    
+
    Now to obtain only the first row as an array:
+
    +$arr = $db->GetRow("select * from emp where empno=:emp", array('emp' => 7900));
+
    
+
    Or to retrieve only the first field of the first row:
+
    +$arr = $db->GetOne("select ename from emp where empno=:emp", array('emp' => 7900));
+
    
+
    For easy pagination support, we provide the SelectLimit function. The following will perform a select query, limiting it to 100 rows, starting from row 201 (row 1 being the 1st row):
+
    +$offset = 200; $limitrows = 100;
+$rs = $db->SelectLimit('select * from table', $limitrows, $offset);
+
    
+
    The $offset parameter is optional.
+
    Array Fetch Mode
    
+
    When data is being returned in an array, you can choose the type of array the data is returned in. 
+
      
+  
    1.  Numeric indexes - use $connection->SetFetchMode(ADODB_FETCH_NUM).
      2. 
+  
    2. Associative indexes - the keys of the array are the names of the fields (in upper-case). Use $connection->SetFetchMode(ADODB_FETCH_ASSOC).
      3. 
+  
    3. Both numeric and associative indexes - use $connection->SetFetchMode(ADODB_FETCH_BOTH).
      4. 
+
    
+
    The default is ADODB_FETCH_BOTH for Oracle.
    
+
    Caching
    
+
    You can define a database cache directory using $ADODB_CACHE_DIR, and cache the results of frequently used queries that rarely change. This is particularly useful for SQL with complex where clauses and group-by's and order-by's. It is also good for relieving heavily-loaded database servers.
    
+
    This example will cache the following select statement for 3600 seconds (1 hour):
    
+
    +$ADODB_CACHE_DIR = '/var/adodb/tmp';
+$rs = $db->CacheExecute(3600, "select names from allcountries order by 1");
+
    
+There are analogous CacheGetArray(
+), CacheGetRow( ),  CacheGetOne( ) and CacheSelectLimit( )  functions. The first parameter is the number of seconds to cache. You can also pass a bind array as a 3rd parameter (not shown above).
+
    There is an alternative syntax for the caching functions. The first parameter is omitted, and you set the cacheSecs
+ property of the connection object:
+
    +$ADODB_CACHE_DIR = '/var/adodb/tmp';
+$connection->cacheSecs = 3600;
+$rs = $connection->CacheExecute($sql, array('id' => 1));
+
    
+
     
    
+
    3. Using Prepare( ) For Frequently Used Statements
    
+
    Prepare( ) is  for compiling frequently used  SQL statement for reuse. For example, suppose we have a large array which needs to be inserted into an Oracle database. The following will result in a massive speedup in query execution (at least 20-40%), as the SQL statement only needs to be compiled once:
    
+
    +$stmt = $db->Prepare('insert into table (field1, field2) values (:f1, :f2)');
+foreach ($arrayToInsert as $key => $value) {
+	$db->Execute($stmt, array('f1' => $key, 'f2' => $val);
+}
+
    
+
     
    
+
    4. Working With LOBs
    
+
    Oracle treats data which is more than 4000 bytes in length specially. These are called Large Objects, or LOBs for short. Binary LOBs are BLOBs, and character LOBs are CLOBs. In most Oracle libraries, you need to do a lot of work to process LOBs, probably because Oracle designed it to work in systems with little memory. ADOdb tries to make things easy by assuming the LOB can fit into main memory. 
    
+
    ADOdb will transparently handle LOBs  in select statements. The LOBs are automatically converted to PHP variables without any special coding.
    
+
    For updating records with LOBs, the functions UpdateBlob( ) and UpdateClob( ) are provided. Here's a BLOB example. The parameters should be self-explanatory:
+
    +$ok = $db->Execute("insert into aTable (id, name, ablob) 
+                                values (aSequence.nextVal, 'Name', null)");
+if (!$ok) return LogError($db->ErrorMsg());
+# params: $tableName, $blobFieldName, $blobValue, $whereClause
+$db->UpdateBlob('aTable', 'ablob', $blobValue, 'id=aSequence.currVal');
+
    
+
    and the analogous CLOB example:
+
    +$ok = $db->Execute("insert into aTable (id, name, aclob) 
+                                values (aSequence.nextVal, 'Name', null)");
+if (!$ok) return LogError($db->ErrorMsg());
+$db->UpdateClob('aTable', 'aclob', $clobValue, 'id=aSequence.currVal');
+
    
+
    Note that LogError( ) is a user-defined function, and not part of ADOdb.
+
    Inserting LOBs is more complicated. Since ADOdb 4.55, we allow you to do this
+  (assuming that the photo field is a BLOB, and we want to store $blob_data into
+  this field, and the primary key is the id field):
+
    +	$sql = "INSERT INTO photos ( ID, photo) ".
+			"VALUES ( :id, empty_blob() )".
+			" RETURNING photo INTO :xx";
+
+ 		$stmt = $db->PrepareSP($sql);
+		$db->InParameter($stmt, $id, 'id');
+		$blob = $db->InParameter($stmt, $blob_data, 'xx',-1, OCI_B_BLOB);
+		$db->StartTrans();
+		$ok = $db->Execute($stmt);
+		$db->CompleteTrans();
+
     
+
    
+
    5. REF CURSORs
    
+
    Oracle recordsets can be passed around as variables called REF Cursors. For example, in PL/SQL, we could define a function open_tab that returns a REF CURSOR in the first parameter:
    
+
    +TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
+
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
+	BEGIN
+		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
+	END open_tab;
+
    
+
    In ADOdb, we could access this REF Cursor using the ExecuteCursor() function. The following will find
+ all table names that begin with 'A' in the current schema:
+
    +$rs = $db->ExecuteCursor("BEGIN open_tab(:refc,'A%'); END;",'refc');
+while ($arr = $rs->FetchRow()) print_r($arr);
+
    
+
    The first parameter is the PL/SQL statement, and the second parameter is the name of the REF Cursor.
+
    
+
     
    
+
    6. In and Out Parameters
    
+
    The following PL/SQL
+stored procedure  requires an input  variable, and returns a result into an output variable:
+
    +PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
+	BEGIN
+		output := 'I love '||input;
+	END;
+
    
+
    The following ADOdb code allows you to call the stored procedure:
    
+
    +$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
+$input = 'Sophia Loren';
+$db->InParameter($stmt,$input,'a1');
+$db->OutParameter($stmt,$output,'a2');
+$ok = $db->Execute($stmt);
+if ($ok) echo ($output == 'I love Sophia Loren') ? 'OK' : 'Failed';
+
    
+
    PrepareSP( ) is a special function that knows about bind parameters.
+The main limitation currently is that IN OUT parameters do not work.
+
    Bind Parameters and REF CURSORs
    
+
    We could also rewrite the REF CURSOR example to use InParameter (requires ADOdb 4.53 or later):
+
    +$stmt = $db->PrepareSP("BEGIN adodb.open_tab(:refc,:tabname); END;");
+$input = 'A%';
+$db->InParameter($stmt,$input,'tabname');
+$rs = $db->ExecuteCursor($stmt,'refc');
+while ($arr = $rs->FetchRow()) print_r($arr);
+
    
+
    Bind Parameters and LOBs
    
+
    You can also operate on LOBs. In this example, we have IN and OUT parameters using CLOBs. 
+
    +	$text = 'test test test';
+	$sql = "declare rs clob; begin :rs := lobinout(:sa0); end;";
+	$stmt = $conn -> PrepareSP($sql);
+	$conn -> InParameter($stmt,$text,'sa0', -1, OCI_B_CLOB); # -1 means variable length
+	$rs = '';
+	$conn -> OutParameter($stmt,$rs,'rs', -1, OCI_B_CLOB);
+	$conn -> Execute($stmt);
+	echo "return = ".$rs."<br>";
+
    
+
    Similarly, you can use the constant OCI_B_BLOB to indicate that you are using BLOBs.
+
    Reusing Bind Parameters with CURSOR_SHARING=FORCE
    
+
    Many web programmers do not care to use bind parameters, and prefer to enter the SQL directly. So instead of:
    
+
    +$arr = $db->GetArray("select * from emp where empno>:emp", array('emp' => 7900));
+
    
+
    They prefer  entering the values inside the SQL:
+
    +$arr = $db->GetArray("select * from emp where empno>7900");
+
    
+
    This reduces Oracle performance because Oracle will reuse compiled SQL which is identical to previously compiled SQL. The above example with the values inside the SQL
+is unlikely to be reused. As an optimization, from Oracle 8.1 onwards, you can set the following session parameter after you login:
+
    +ALTER SESSION SET CURSOR_SHARING=FORCE
+
    
+
    This will force Oracle to convert all such variables (eg. the 7900 value) into constant bind parameters, improving SQL reuse.
    
+
    More speedup tips.
    
+
     
    
+
    7. Dates and Datetime in ADOdb
    
+
    There are two things you need to know about dates in ADOdb. 
    
+
    First, to ensure cross-database compability, ADOdb assumes that dates are returned in ISO format (YYYY-MM-DD H24:MI:SS).
    
+
    Secondly, since Oracle treats dates and datetime as the same data type, we decided not to display the time in the default date format. So on login, ADOdb will set the NLS_DATE_FORMAT to 'YYYY-MM-DD'. If you prefer to show the date and time by default, do this:
    
+
    +$db = NewADOConnection('oci8');
+$db->NLS_DATE_FORMAT =  'RRRR-MM-DD HH24:MI:SS';
+$db->Connect($tns, $user, $pwd);
+
    
+
    Or execute:
    
+
    $sql = quot;ALTER SESSION SET NLS_DATE_FORMAT = 'RRRR-MM-DD HH24:MI:SS'";
+$db->Execute($sql);
+
    
+
    If you are not concerned about date portability and do not use ADOdb's portability layer, you can use your preferred date format instead.
+
    
+
    8. Database Portability Layer
    
+
    ADOdb provides the following functions for portably generating SQL functions 
+  as strings to be merged into your SQL statements:
    
+
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+  
+    
+    
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
    FunctionDescription
    DBDate($date)Pass in a UNIX timestamp or ISO date and it will convert it to a date 
+      string formatted for INSERT/UPDATE
    DBTimeStamp($date)Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp 
+      string formatted for INSERT/UPDATE
    SQLDate($date, $fmt)Portably generate a date formatted using $fmt mask, for use in SELECT 
+      statements.
    OffsetDate($date, $ndays)Portably generate a $date offset by $ndays.
    Concat($s1, $s2, ...)Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, 
+      which allows || operator.
    IfNull($fld, $replaceNull)Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.
    Param($name)Generates bind placeholders, using ? or named conventions as appropriate.
    $db->sysDateProperty that holds the SQL function that returns today's date
    $db->sysTimeStampProperty that holds the SQL function that returns the current
+timestamp (date+time).
+
    $db->concat_operatorProperty that holds the concatenation operator
+
    $db->lengthProperty that holds the name of the SQL strlen function.
+
    $db->upperCaseProperty that holds the name of the SQL strtoupper function.
+
    $db->randomProperty that holds the SQL to generate a random number between 0.00 and 1.00.
+
    $db->substrProperty that holds the name of the SQL substring function.
+
    
+
    ADOdb also provides multiple oracle oci8 drivers for different scenarios:
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
    Driver NameDescription
    oci805 Specifically for Oracle 8.0.5. This driver has a slower SelectLimit( ).
    oci8The default high performance driver. The keys of associative arrays returned in a recordset are upper-case.
    oci8po The portable Oracle driver. Slightly slower than oci8. This driver uses ? instead of :bindvar for binding variables, which is the standard for  other databases. Also the keys of associative arrays are in lower-case like other databases.
    
+
    Here's an example of calling the oci8po driver. Note that the bind variables use question-mark:
    
+
    $db = NewADOConnection('oci8po');
+$db->Connect($tns, $user, $pwd);
+$db->Execute("insert into atable (f1, f2) values (?,?)", array(12, 'abc'));
    
+
     
+
    9. Connecting to Oracle
    
+
    Before you can use ADOdb, you need to have the Oracle client installed and setup the oci8 extension. This extension comes pre-compiled for Windows (but you still need to enable it in the php.ini file). For information on compiling the oci8 extension for PHP and Apache on Unix, there is an excellent guide at oracle.com. 
    
+
    Should You Use Persistent Connections
    
+
    One question that is frequently asked is should you use persistent connections to Oracle. Persistent connections allow PHP to recycle existing connections, reusing them after the previous web pages have completed. Non-persistent connections close automatically after the web page has completed. Persistent connections are faster because the cost of reconnecting is expensive, but there is additional resource overhead. As an alternative, Oracle allows you to pool and reuse server processes; this is called  Shared Server (also known as MTS).
    
+
    The author's benchmarks suggest that using non-persistent connections and the  Shared Server configuration offer the best performance. If Shared Server is not an option, only then consider using persistent connections.
    
+
    Connection Examples
    
+
    Just in case you are having problems connecting to Oracle, here are some examples:
    
+
    a. PHP and Oracle reside on the same machine, use default SID, with non-persistent connections:
    
+
    	$conn = NewADOConnection('oci8');
+	$conn->Connect(false, 'scott', 'tiger');
    
+
    b. TNS Name defined in tnsnames.ora (or ONAMES or HOSTNAMES), eg. 'myTNS', using persistent connections:
    
+
    	$conn = NewADOConnection('oci8');
+	$conn->PConnect(false, 'scott', 'tiger', 'myTNS');
    
+
    or
    
+
     	$conn->PConnect('myTNS', 'scott', 'tiger');
    
+
    c. Host Address and SID
    
+
    +	$conn->connectSID = true;	
+	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'SID');
    
+
    d. Host Address and Service Name
    
+
    	$conn->Connect('192.168.0.1', 'scott', 'tiger', 'servicename');
    
+
    e. Oracle connection string:
+
    	$cstr = "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$host)(PORT=$port))
+			(CONNECT_DATA=(SID=$sid)))";
+	$conn->Connect($cstr, 'scott', 'tiger');
+
    
+
    f. ADOdb data source names (dsn):
+
    +	$dsn = 'oci8://user:pwd@tnsname/?persist';  # persist is optional
+	$conn = ADONewConnection($dsn);  # no need for Connect/PConnect
+	
+	$dsn = 'oci8://user:pwd@host/sid';
+	$conn = ADONewConnection($dsn);
+	
+	$dsn = 'oci8://user:pwd@/';   # oracle on local machine
+	$conn = ADONewConnection($dsn);
    
+
    With ADOdb data source names,
+you don't have to call Connect( ) or PConnect( ).
+
    
+
     
    
+
    10. Error Checking
    
+
    The examples in this article are easy to read but a bit simplistic because we ignore error-handling. Execute( ) and Connect( ) will return false on error. So a more realistic way to call Connect( ) and Execute( ) is:
+
    function InvokeErrorHandler()
+{
    global $db; ## assume global
+    MyLogFunction($db->ErrorNo(), $db->ErrorMsg());
+}
+if (!$db->Connect($tns, $usr, $pwd)) InvokeErrorHandler();
+
+$rs = $db->Execute("select * from emp where empno>:emp order by empno", 
+                    array('emp' => 7900));
+if (!$rs) return InvokeErrorHandler();
+while ($arr = $rs->FetchRow()) {
+    print_r($arr);
+	echo "<hr>";
+}
+
    
+
    You can retrieve the  error message and error number of the last SQL statement executed from ErrorMsg( ) and ErrorNo( ). You can also define a custom error handler function.
+ADOdb also supports throwing exceptions in PHP5.
+
     
    
+
    Handling Large Recordsets (added 27 May 2005)
    
+The oci8 driver does not support counting the number of records returned in a SELECT statement, so the function RecordCount() 
+is emulated when the global variable $ADODB_COUNTRECS is set to true, which is the default. 
+We emulate this by buffering all the records. This can take up large amounts of memory for big recordsets.
+ Set $ADODB_COUNTRECS to false for the best performance. 
+ 
    
+This variable is checked every time a query is executed, so you can selectively choose which recordsets to count.
+
     
    
+
    11. Other ADOdb Features
    
+
    Schema generation. This allows you to define a schema using XML and import it into different RDBMS systems portably.
    
+
    Performance monitoring and tracing. Highlights of performance monitoring include identification of poor and suspicious SQL, with explain plan support, and identifying which web pages the SQL ran on.
    
+
     
    
+
    12. Download
    
+
    You can download ADOdb from sourceforge. ADOdb uses a BSD style license. That means that it is free for commercial use, and redistribution without source code is allowed.
    
+
     
    
+
    13. Resources
    
+
+
+
diff --git a/adodb/docs/docs-perf.htm b/adodb/docs/docs-perf.htm
new file mode 100644
index 0000000..924fe16
--- /dev/null
+++ b/adodb/docs/docs-perf.htm
@@ -0,0 +1,965 @@
+
+
+
+  ADOdb Performance Monitoring Library
+  
+
+
+
    The ADOdb Performance Monitoring Library
    
+
    V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com)
    
+
    This software is dual licensed using BSD-Style and
+LGPL. This means you can use it in compiled proprietary and commercial
+products.
    
+
    Useful ADOdb links: Download
+  Other Docs
+
    
+
    Introduction
    
+
    This module, part of the ADOdb package, provides both CLI and HTML
+interfaces for viewing key performance indicators of your database.
+This is very useful because web apps such as the popular phpMyAdmin
+currently do not provide effective database health monitoring tools.
+The module provides the following: 
    
+
      
+  
    • A quick health check of your database server using $perf->HealthCheck()
+or $perf->HealthCheckCLI(). 
      • 
+  
    • User interface for performance monitoring, $perf->UI().
+This UI displays:
+    
        
+      
      • the health check, 
        • 
+      
      • all SQL logged and their query plans, 
        • 
+      
      • a list of all tables in the current database
        • 
+      
      • an interface to continiously poll the server for key
+performance indicators such as CPU, Hit Ratio, Disk I/O
        • 
+      
      • a form where you can enter and run SQL interactively.
        • 
+    
      
+  
      • 
+  
    • Gives you an API to build database monitoring tools for a server
+farm, for example calling $perf->DBParameter('data cache hit
+ratio') returns this very important statistic in a database
+independant manner. 
      • 
+
    
+
    ADOdb also has the ability to log all SQL executed, using LogSQL. All SQL logged can be
+analyzed through the performance monitor UI. In the View
+SQL mode, we categorize the SQL into 3 types:
+
    
+
      
+  
    • Suspicious SQL: queries with high average execution times,
+and are potential candidates for rewriting
      • 
+  
    • Expensive SQL: queries with high total execution times
+(#executions * avg execution time). Optimizing these queries will
+reduce your database server load.
      • 
+  
    • Invalid SQL: queries that generate errors.
      • 
+
    
+
    Each query is hyperlinked to a description of the query plan, and
+every PHP script that executed that query is also shown.
    
+
    Please note that the information presented is a very basic database
+health check, and does not provide a complete overview of database
+performance. Although some attempt has been made to make it work across
+multiple databases in the same way, it is impossible to do so. For the
+health check, we do try to display the following key database
+parameters for all drivers:
    
+
      
+  
    • data cache size - The amount of memory allocated to the
+cache.
      • 
+  
    • data cache hit ratio - A measure of how effective the
+cache is, as a percentage. The higher, the better.
      • 
+  
    • current connections - The number of sessions currently
+connected to the database. 
      • 
+
    
+
    You will need to connect to the database as an administrator to view
+most of the parameters. 
    
+
    Code improvements as very welcome, particularly adding new database
+parameters and automated tuning hints.
    
+
+
    Usage
    
+
    Currently, the following drivers: mysql, postgres,
+oci8, mssql, informix and db2 are
+supported. To create a new performance monitor, call NewPerfMonitor( )
+as demonstrated below: 
    
+
    <?php
    include_once('adodb.inc.php');
    session_start(); # session variables required for monitoring
    $conn = ADONewConnection($driver);
    $conn->Connect($server,$user,$pwd,$db);
    $perf =& NewPerfMonitor($conn);
    $perf->UI($pollsecs=5);
    ?>
    
+
    It is also possible to retrieve a single database parameter:
    
+
    $size = $perf->DBParameter('data cache size');
    
+
    
+Thx to Fernando Ortiz for the informix module. 
    
+
    Methods
    
+
+
    function UI($pollsecs=5)
    
+
    Creates a web-based user interface for performance monitoring. When
+you click on Poll, server statistics will be displayed every $pollsecs
+seconds. See Usage above. 
    
+
    Since 4.11, we allow users to enter and run SQL interactively via
+the "Run SQL" link. To disable this for security reasons, set this
+constant before calling $perf->UI(). 
    
+
     
    
+
    define('ADODB_PERF_NO_RUN_SQL',1);
    
+
    Sample output follows below:
    
+
+  
+    
+      
+    
+    
+      
+    
+  
+
     ADOdb
+Performance Monitor for localhost, db=test
    
+      PostgreSQL 7.3.2 on i686-pc-cygwin, compiled by
+GCC gcc (GCC) 3.2 20020927 (prerelease)
     Performance Stats   View
+SQL   View Tables   Poll
+Stats
    
+
+  
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+
    
+      
    postgres7
    
+      
    ParameterValueDescription
    Ratios  
    statistics collectorTRUEValue must be TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level
+and stats_block_level must be set to true in postgresql.conf)
    data cache hit ratio99.7967555299239 
    IO  
    data reads125  
    data writes21.78125000000000000Count of inserts/updates/deletes * coef
    Data Cache  
    data cache buffers640Number of cache buffers. Tuning
    cache blocksize8192(estimate)
    data cache size5M 
    operating system cache size80M(effective cache size)
    Memory Usage  
    sort buffer size1MSize of sort buffer (per query)
    Connections  
    current connections0 
    max connections32 
    Parameters  
    rollback buffers8WAL buffers
    random page cost4Cost of doing a seek (default=4). See random_page_cost
    
+
    function HealthCheck()
    
+
    Returns database health check parameters as a HTML table. You will
+need to echo or print the output of this function,
    
+
    function HealthCheckCLI()
    
+
    Returns database health check parameters formatted for a command
+line interface. You will need to echo or print the output of this
+function. Sample output for mysql:
    
+
    -- Ratios -- 
              MyISAM cache hit ratio =gt; 56.5635738832 
              InnoDB cache hit ratio =gt; 0 
                 sql cache hit ratio =gt; 0 
     -- IO -- 
                          data reads =gt; 2622 
                         data writes =gt; 2415.5 
     -- Data Cache -- 
              MyISAM data cache size =gt; 512K 
                 BDB data cache size =gt; 8388600
              InnoDB data cache size =gt; 8M
     -- Memory Pools -- 
                    read buffer size =gt; 131072 
                    sort buffer size =gt; 65528 
                         table cache =gt; 4 
     -- Connections -- 
                 current connections =gt; 3
                     max connections =gt; 100
    
+
    function Poll($pollSecs=5)
+ 
    
+
     Run in infinite loop, displaying the following information every
+$pollSecs. This will not work properly if output buffering is enabled.
+In the example below, $pollSecs=3:
+
    
+
    Accumulating statistics...
     Time   WS-CPU%   Hit%   Sess        Reads/s          Writes/s
    11:08:30    0.7  56.56      1         0.0000            0.0000
    11:08:33    1.8  56.56      2         0.0000            0.0000
    11:08:36   11.1  56.55      3         2.5000            0.0000
    11:08:39    9.8  56.55      2         3.1121            0.0000
    11:08:42    2.8  56.55      1         0.0000            0.0000
    11:08:45    7.4  56.55      2         0.0000            1.5000
    
+
    WS-CPU% is the Web Server CPU load of the server that PHP is
+running from (eg. the database client), and not the database. The Hit%
+is the data cache hit ratio. Sess is the current number of
+sessions connected to the database. If you are using persistent
+connections, this should not change much. The Reads/s and Writes/s
+are synthetic values to give the viewer a rough guide to I/O, and are
+not to be taken literally. 
    
+
    function SuspiciousSQL($numsql=10)
    
+
    Returns SQL which have high average execution times as a HTML table.
+Each sql statement
+is hyperlinked to a new window which details the execution plan and the
+scripts that execute this SQL.
+
    
+
     The number of statements returned is determined by $numsql. Data is
+taken from the adodb_logsql table, where the sql statements are logged
+when
+$connection->LogSQL(true) is enabled. The adodb_logsql table is
+populated using $conn->LogSQL.
+
    
+
    For Oracle, Ixora Suspicious SQL returns a list of SQL statements
+that are most cache intensive as a HTML table. These are data intensive
+SQL statements that could benefit most from tuning. 
    
+
    function ExpensiveSQL($numsql=10)
    
+
    Returns SQL whose total execution time (avg time * #executions) is
+high as a HTML table. Each sql statement
+is hyperlinked to a new window which details the execution plan and the
+scripts that execute this SQL.
+
    
+
     The number of statements returned is determined by $numsql. Data is
+taken from the adodb_logsql table, where the sql statements are logged
+when
+$connection->LogSQL(true) is enabled. The adodb_logsql table is
+populated using $conn->LogSQL.
+
    
+
    For Oracle, Ixora Expensive SQL returns a list of SQL statements
+that are taking the most CPU load when run.
+
    
+
    function InvalidSQL($numsql=10)
    
+
    Returns a list of invalid SQL as an HTML table.
+
    
+
    Data is taken from the adodb_logsql table, where the sql statements
+are logged when
+$connection->LogSQL(true) is enabled.
+
    
+
    function Tables($orderby=1)
    
+
    Returns information on all tables in a database, with the first two
+fields containing the table name and table size, the remaining fields
+depend on the database driver. If $orderby is set to 1, it will sort by
+name. If $orderby is set to 2, then it will sort by table size. Some
+database drivers (mssql and mysql) will ignore the $orderby clause. For
+postgresql, the information is up-to-date since the last vacuum.
+Not supported currently for db2.
    
+
    Raw Functions
    
+
    Raw functions return values without any formatting.
    
+
    function DBParameter($paramname)
    
+
    Returns the value of a database parameter, such as
+$this->DBParameter("data cache size").
    
+
    function CPULoad()
    
+
    Returns the CPU load of the database client (NOT THE SERVER) as a
+percentage. Only works for Linux and Windows. For Windows, WMI must be
+available.
    
+
    $ADODB_PERF_MIN
    
+
    New in adodb 4.97/5.03 is this global variable, which controls whether sql timings which are too small are not saved. Currently it defaults 
+to 0.05 (seconds). This means that all sql's which are faster than 0.05 seconds to execute are not saved.
+
    Format of $settings Property
    
+
     To create new database parameters, you need to understand
+$settings. The $settings data structure is an associative array. Each
+element of the array defines a database parameter. The key is the name
+of the database parameter. If no key is defined, then it is assumed to
+be a section break, and the value is the name of the section break. If
+this is too confusing, looking at the source code will help a lot!
    
+
     Each database parameter is itself an array consisting of the
+following elements:
    
+
      
+  
    1.  Category code, used to group related db parameters. If the
+category code is 'HIDE', then
+the database parameter is not shown when HTML() is called. 
      
+  
      2. 
+  
    2.  either
+    
        
+      
      1. sql string to retrieve value, eg. "select value from
+v\$parameter where name='db_block_size'", 
        2. 
+      
      2. array holding sql string and field to look for, e.g.
+array('show variables','table_cache'); optional 3rd parameter is the
+$rs->fields[$index] to use (otherwise $index=1), and optional 4th
+parameter is a constant to multiply the result with (typically 100 for
+percentage calculations),
        3. 
+      
      3. a string prefixed by =, then a PHP method of the class is
+invoked, e.g. to invoke $this->GetIndexValue(), set this array
+element to '=GetIndexValue', 
        
+      
        4. 
+    
      
+  
      3. 
+  
    3.  Description of database parameter. If description begins with an
+=, then it is interpreted as a method call, just as in (1c) above,
+taking one parameter, the current value. E.g. '=GetIndexDescription'
+will invoke $this->GetIndexDescription($val). This is useful for
+generating tuning suggestions. For an example, see WarnCacheRatio().
      4. 
+
    
+
    Example from MySQL, table_cache database parameter:
    
+
    'table cache' =gt; array('CACHE',            # category code
       array("show variables", 'table_cache'), # array (type 1b)
       'Number of tables to keep open'),       # description
    
+
    Example Health Check Output
    
+
    db2 informix mysql mssql oci8
+postgres
    
+
    
+
+  
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+  
+
    
+      
    db2
    
+      
    ParameterValueDescription
    Ratios  
    data cache hit ratio0    
    Data Cache
    data cache buffers250   See tuning
+reference.
    cache blocksize4096    
    data cache size1000K    
    Connections
    current connections2    
    
+
     
    
+
    
+
+  
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+  
+
    
+      
    informix
    
+      
    ParameterVal
+ueDescription
    Ratios  
    data cache hit
+ratio95.89 
    IO  
    data
+reads1883884Page reads
    data writes1716724Page writes
    Connections
+ 
    current connections263.0Number of
+sessions
    
+
    
+
     
    
+
    
+
+  
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+
    
+      
    mysql
    
+      
    ParameterValueDescription
    Ratios  
    MyISAM cache hit ratio56.5658301822Cache ratio should be at least 90%
    InnoDB cache hit ratio0Cache ratio should be at least 90%
    sql cache hit ratio0 
    IO  
    data reads2622Number of selects (Key_reads is not accurate)
    data writes2415.5Number of inserts/updates/deletes * coef (Key_writes is not
+accurate)
    Data Cache  
    MyISAM data cache size512K 
    BDB data cache size8388600 
    InnoDB data cache size8M 
    Memory Pools  
    read buffer size131072(per session)
    sort buffer size65528Size of sort buffer (per session)
    table cache4Number of tables to keep open
    Connections  
    current connections3 
    max connections100 
    
+
     
    
+
    
+
+  
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+
    
+      
    mssql
    
+      
    ParameterValueDescription
    Ratios  
    data cache hit ratio99.9999694824 
    prepared sql hit ratio99.7738579828 
    adhoc sql hit ratio98.4540169133 
    IO  
    data reads2858  
    data writes1438  
    Data Cache  
    data cache size4362in K
    Connections  
    current connections14 
    max connections32767 
    
+
     
    
+
    
+
+  
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+
    
+      
    oci8
    
+      
    ParameterValueDescription
    Ratios  
    data cache hit ratio96.98 
    sql cache hit ratio99.96 
    IO  
    data reads842938  
    data writes16852  
    Data Cache  
    data cache buffers3072Number of cache buffers
    data cache blocksize8192 
    data cache size48Mshared_pool_size
    Memory Pools  
    java pool size0java_pool_size
    sort buffer size512Ksort_area_size (per query)
    user session buffer size8Mlarge_pool_size
    Connections  
    current connections1 
    max connections170 
    data cache utilization ratio88.46Percentage of data cache actually in use
    user cache utilization ratio91.76Percentage of user cache (large_pool) actually in use
    rollback segments11 
    Transactions  
    peak transactions24Taken from high-water-mark
    max transactions187max transactions / rollback segments < 3.5 (or
+transactions_per_rollback_segment)
    Parameters  
    cursor sharingEXACTCursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR
+(9i+). See cursor_sharing.
    index cache cost0% of indexed data blocks expected in the cache. Recommended
+is 20-80. Default is 0. See optimizer_index_caching.
    random page cost100Recommended is 10-50 for TP, and 50 for data warehouses.
+Default is 100. See optimizer_index_cost_adj.
+      
    
+
    Suspicious SQL
    
+
+  
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+
    LOADEXECUTESSQL_TEXT
     .73%89select u.name, o.name, t.spare1, t.pctfree$ from sys.obj$ o,
+sys.user$ u, sys.tab$ t where (bitand(t.trigflag, 1048576) = 1048576)
+and o.obj#=t.obj# and o.owner# = u.user# select i.obj#, i.flags,
+u.name, o.name from sys.obj$ o, sys.user$ u, sys.ind$ i where
+(bitand(i.flags, 256) = 256 or bitand(i.flags, 512) = 512) and
+(not((i.type# = 9) and bitand(i.flags,8) = 8)) and o.obj#=i.obj# and
+o.owner# = u.user# 
     .84%3select /*+ RULE */ distinct tabs.table_name, tabs.owner ,
+partitioned, iot_type , TEMPORARY, table_type, table_type_owner from
+DBA_ALL_TABLES tabs where tabs.owner = :own 
     3.95%6SELECT round(count(1)*avg(buf.block_size)/1048576) FROM
+DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE
+obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
+seg.owner and obj.object_name = seg.segment_name and obj.object_type =
+seg.segment_type and seg.buffer_pool = buf.name and buf.name =
+'DEFAULT' 
     4.50%6SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM
+DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE
+obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
+seg.owner and obj.object_name = seg.segment_name and obj.object_type =
+seg.segment_type and seg.tablespace_name = tsp.tablespace_name 
    57.34%9267select t.schema, t.name, t.flags, q.name from
+system.aq$_queue_tables t, sys.aq$_queue_table_affinities aft,
+system.aq$_queues q where aft.table_objno = t.objno and
+aft.owner_instance = :1 and q.table_objno = t.objno and q.usage = 0 and
+bitand(t.flags, 4+16+32+64+128+256) = 0 for update of t.name,
+aft.table_objno skip locked 
    
+
    Expensive SQL
    
+
+  
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+
    LOADEXECUTESSQL_TEXT
     5.24%1select round(sum(bytes)/1048576) from dba_segments 
     6.89%6SELECT round(count(1)*avg(buf.block_size)/1048576) FROM
+DBA_OBJECTS obj, V$BH bh, dba_segments seg, v$buffer_pool buf WHERE
+obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
+seg.owner and obj.object_name = seg.segment_name and obj.object_type =
+seg.segment_type and seg.buffer_pool = buf.name and buf.name =
+'DEFAULT' 
     7.85%6SELECT round(count(1)*avg(tsp.block_size)/1048576) FROM
+DBA_OBJECTS obj, V$BH bh, dba_segments seg, dba_tablespaces tsp WHERE
+obj.object_id = bh.objd AND obj.owner != 'SYS' and obj.owner =
+seg.owner and obj.object_name = seg.segment_name and obj.object_type =
+seg.segment_type and seg.tablespace_name = tsp.tablespace_name 
    33.69%89select u.name, o.name, t.spare1, t.pctfree$ from sys.obj$ o,
+sys.user$ u, sys.tab$ t where (bitand(t.trigflag, 1048576) = 1048576)
+and o.obj#=t.obj# and o.owner# = u.user# 
    36.44%89select i.obj#, i.flags, u.name, o.name from sys.obj$ o,
+sys.user$ u, sys.ind$ i where (bitand(i.flags, 256) = 256 or
+bitand(i.flags, 512) = 512) and (not((i.type# = 9) and
+bitand(i.flags,8) = 8)) and o.obj#=i.obj# and o.owner# = u.user# 
    
+
    
+
+  
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+    
+      
+    
+    
+      
+      
+      
+    
+    
+      
+      
+      
+    
+  
+
    
+      
    postgres7
    
+      
    ParameterValueDescription
    Ratios  
    statistics collectorFALSEMust be set to TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level
+and stats_block_level must be set to true in postgresql.conf)
    data cache hit ratio99.9666031916603 
    IO  
    data reads15  
    data writes0.000000000000000000Count of inserts/updates/deletes * coef
    Data Cache  
    data cache buffers1280Number of cache buffers. Tuning
    cache blocksize8192(estimate)
    data cache size10M 
    operating system cache size80000K(effective cache size)
    Memory Pools  
    sort buffer size1MSize of sort buffer (per query)
    Connections  
    current connections13 
    max connections32 
    Parameters  
    rollback buffers8WAL buffers
    random page cost4Cost of doing a seek (default=4). See random_page_cost
    
+
+
diff --git a/adodb/docs/docs-session.htm b/adodb/docs/docs-session.htm
new file mode 100644
index 0000000..f367739
--- /dev/null
+++ b/adodb/docs/docs-session.htm
@@ -0,0 +1,342 @@
+
+
+
+  ADODB Session Management Manual
+  
+  
+
+
+
    ADODB Session 2 Management Manual
    
+
    
+V5.11 5 May 2010  (c) 2000-2010 John Lim (jlim#natsoft.com)
+
    
+
     This software is dual licensed using BSD-Style and
+LGPL. This means you can use it in compiled proprietary and commercial
+products. 
+
    Useful ADOdb links: Download
+  Other Docs
+
    
+
    Introduction
    
+
     This document discusses the newer session handler adodb-session2.php. If
+  you have used the older adodb-session.php, then be forewarned that you will
+  need to alter your session table format. Otherwise everything is backward
+  compatible.
+  Here are the older
+    docs for
+  adodb-session.php.
    
+
    Why Session Variables in a Database? 
    
+
    We store state information specific to a user or web
+    client in session variables. These session variables persist throughout a
+session, as the user moves from page to page. 
    
+
    To use session variables, call session_start() at the beginning of
+your web page, before your HTTP headers are sent. Then for every
+variable you want to keep alive for the duration of the session, call
+session_register($variable_name). By default, the session handler will
+keep track of the session by using a cookie. You can save objects or
+arrays in session variables also.
+
    
+
    The default method of storing sessions is to store it in a file.
+However if you have special needs such as you:
+
    
+
      
+  
    • Have multiple web servers that need to share session info
      • 
+  
    • Need to do special processing of each session
      • 
+  
    • Require notification when a session expires
      • 
+
    
+
    The ADOdb session handler provides you with the above
+additional capabilities by storing the session information as records
+in a database table that can be shared across multiple servers. 
    
+
    These records will be garbage collected based on the php.ini [session] timeout settings. 
+You can register a notification function to notify you when the record has expired and 
+is about to be freed by the garbage collector.
    
+
    An alternative to using a database backed session handler is to use memcached.
+  This is a distributed memory based caching system suitable for storing session
+  information.
+  
    
+
     The Improved Session Handler
    
+
    In ADOdb 4.91, we added a new session handler, in adodb-session2.php.
+It features the following improvements:
+
      
+
    • Fully supports server farms using a new database table format. The
+  previous version used the web server time for timestamps, which can cause problems
+  on a system with multiple web servers with possibly inconsistent
+  times. The new version uses the database server time instead for all timestamps.
+
    • The older database table format is obsolete. The database table must be modified
+  to support storage of the database server time mentioned above. Also the field
+  named DATA has been changed to SESSDATA. In some databases, DATA is a reserved
+  word.
+
    • The functions dataFieldName() and syncSeconds() is obsolete.
+
    
+
+
    Usage is 
+
+
    +include_once("adodb/session/adodb-session2.php");
+ADOdb_Session::config($driver, $host, $user, $password, $database,$options=false);
+session_start();
+
+#
    # Test session vars, the following should increment on refresh
    #
    $_SESSION['AVAR'] += 1;
    print "<p>\$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";    
+
    
+
+
    When the session is created in session_start( ), the global variable $ADODB_SESS_CONN holds
+the connection object.
+
    The default name of the table is sessions2. If you want to override it:
+  
+
    +include_once("adodb/session/adodb-session2.php");
+$options['table'] = 'mytablename';
+ADOdb_Session::config($driver, $host, $user, $password, $database,$options);
+session_start();
+
    
+
+
+
    ADOdb Session Handler Features
    
+
      
+  
    • Ability to define a notification function that is called when a
+session expires. Typically
+used to detect session logout and release global resources. 
      • 
+  
    • Optimization of database writes. We crc32 the session data and
+only perform an update
+to the session data if there is a data change. 
      • 
+  
    • Support for large amounts of session data with CLOBs (see
+adodb-session-clob2.php). Useful
+for Oracle. 
      • 
+  
    • Support for encrypted session data, see
+adodb-cryptsession2.php. Enabling encryption is simply a matter of
+including adodb-cryptsession2.php instead of adodb-session2.php. 
      • 
+
    
+
    Session Handler Files 
    
+
    There are 3 session management files that you can use:
+
    
+
    adodb-session2.php        : The default
    adodb-cryptsession2.php   : Use this if you want to store encrypted session data in the database
    adodb-session-clob2.php   : Use this if you are storing DATA in clobs and you are NOT using oci8 driver
    
+
    Usage Examples
    
+
    To force non-persistent connections, call Persist() first before session_start():
+
+ 
+
    + 
+include_once("adodb/session/adodb-session2.php");
+$driver = 'mysql'; $host = 'localhost'; $user = 'auser'; $pwd = 'secret'; $database = 'sessiondb';
+ADOdb_Session::config($driver, $host, $user, $password, $database, $options=false);
    ADOdb_session::Persist($connectMode=false);    
+session_start();
     
+
+# or, using DSN support so you can set other options such as port (since 5.11)
+include_once("adodb/session/adodb-session2.php");
+$dsn = 'mysql://root:pwd@localhost/mydb?persist=1&port=5654';
+ADOdb_Session::config($dsn, '', '', '');
+session_start();
+
    
+
     The parameter to the Persist( ) method sets the connection mode. You can
+  pass the following:
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
    $connectModeConnection Method
    true
    PConnect( )
    falseConnect( )
    'N'NConnect( )
    'P'PConnect( )
    'C'Connect( )
    
+
    To use a encrypted sessions, simply replace the file adodb-session2.php:
    
+ 
     
    include('adodb/session/adodb-cryptsession2.php');
    $driver = 'mysql'; $host = 'localhost'; $user = 'auser'; $pwd = 'secret'; $database = 'sessiondb';
+ADOdb_Session::config($driver, $host, $user, $password, $database,$options=false);
    adodb_sess_open(false,false,$connectMode=false);    
+session_start();
    
+ 
    And the same technique for adodb-session-clob2.php:
    
+ 
      
    include('adodb/session/adodb-session2-clob2.php');
    $driver = 'oci8'; $host = 'localhost'; $user = 'auser'; $pwd = 'secret'; $database = 'sessiondb';
+ADOdb_Session::config($driver, $host, $user, $password, $database,$options=false);
    adodb_sess_open(false,false,$connectMode=false);    
+session_start();
    
+ 
    Installation
    
+
    1. Create this table in your database. Here is the MySQL version:
+
      
+CREATE TABLE sessions2(
+	  sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
+  	  expiry DATETIME NOT NULL ,
+	  expireref VARCHAR( 250 ) DEFAULT '',
+	  created DATETIME NOT NULL ,
+	  modified DATETIME NOT NULL ,
+	  sessdata LONGTEXT,
+	  PRIMARY KEY ( sesskey ) ,
+	  INDEX sess2_expiry( expiry ),
+	  INDEX sess2_expireref( expireref )
+)
    
+
+ 
     For PostgreSQL, use:
+ 
    CREATE TABLE sessions2(
+ sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
+ expiry TIMESTAMP NOT NULL ,
+ expireref VARCHAR( 250 ) DEFAULT '',
+ created TIMESTAMP NOT NULL ,
+ modified TIMESTAMP NOT NULL ,
+ sessdata TEXT DEFAULT '',
+ PRIMARY KEY ( sesskey )
+ );
+
    
+ 
    create INDEX sess2_expiry on sessions2( expiry );
+create INDEX sess2_expireref on sessions2 ( expireref );
    
+ 
    Here is the Oracle definition, which uses a CLOB for the SESSDATA field:
+ 
    +  CREATE TABLE SESSIONS2
    (
       SESSKEY    VARCHAR2(48 BYTE)                  NOT NULL,
       EXPIRY     DATE                               NOT NULL,
       EXPIREREF  VARCHAR2(200 BYTE),
       CREATED    DATE                               NOT NULL,
       MODIFIED   DATE                               NOT NULL,
       SESSDATA   CLOB,
      PRIMARY KEY(SESSKEY)
    );
+
    CREATE INDEX SESS2_EXPIRY ON SESSIONS2(EXPIRY);
+CREATE INDEX SESS2_EXPIREREF ON SESSIONS2(EXPIREREF);
    
+
     We need to use a CLOB here because for text greater than 4000 bytes long,
+  Oracle requires you to use the CLOB data type. If you are using the oci8 driver,
+  ADOdb will automatically enable CLOB handling. So you can use either adodb-session2.php
+  or adodb-session-clob2.php - in this case it doesn't matter. 
        
+
    Notifications
    
+
    You can receive notification when your session is cleaned up by the session garbage collector or
+when you call session_destroy().
+
    PHP's session extension will automatically run a special garbage collection function based on
+your php.ini session.cookie_lifetime and session.gc_probability settings. This will in turn call
+adodb's garbage collection function, which can be setup to do notification.
+
    
+
    +	PHP Session --> ADOdb Session  --> Find all recs  --> Send          --> Delete queued
+	GC Function     GC Function        to be deleted      notification      records
+	executed at     called by                             for all recs
+	random time     Session Extension                     queued for deletion
+
    
+
    When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically 
+the userid of the session. Later when the session has expired,  just before the record is deleted,
+we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which 
+is the userid of the person being logged off.
+
    ADOdb uses a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must predefine before session
+start to store the notification configuration. 
+$ADODB_SESSION_EXPIRE_NOTIFY is an array with 2 elements, the
+first being the name of the session variable you would like to store in
+the EXPIREREF field, and the 2nd is the notification function's name. 
    
+
    For example, suppose we want to be notified when a user's session has expired,
+based on the userid. When the user logs in, we store the id in the global session variable
+$USERID. The function name is 'NotifyFn'. 
+
    
+So we define (before session_start() is called): 
    
+
     
+	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+
    
+And when the NotifyFn is called (when the session expires), the
+$EXPIREREF holding the user id is passed in as the first parameter, eg. NotifyFn($userid, $sesskey). The
+session key (which is the primary key of the record in the sessions
+table) is the 2nd parameter.
+
     Here is an example of a Notification function that deletes some
+records in the database and temporary files: 
    
+
    
+	function NotifyFn($expireref, $sesskey)
+	{
+		global $ADODB_SESS_CONN; # the session connection object
+		$user = $ADODB_SESS_CONN->qstr($expireref);
+		
+		$ADODB_SESS_CONN->Execute("delete from shopping_cart where user=$user");          
+		system("rm /work/tmpfiles/$expireref/*");
+	}  
+			  
    
+
     NOTE 1: If you have register_globals disabled in php.ini, then you
+will have to manually set the EXPIREREF. E.g. 
    
+
     
+$GLOBALS['USERID'] = GetUserID();
+$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+
    
+
     NOTE 2: If you want to change the EXPIREREF after the session
+record has been created, you will need to modify any session variable
+to force a database record update.
+
    
+
    Neat Notification Tricks
    
+
    ExpireRef normally holds the user id of the current session.
+
    
+
    1. You can then write a session monitor, scanning expireref to see
+who is currently logged on.
+
    
+
    2. If you delete the sessions record for a specific user, eg.
+
    
+
    delete from sessions where expireref = '$USER'
    
+then the user is logged out. Useful for ejecting someone from a
+site.
+
    3. You can scan the sessions table to ensure no user
+can be logged in twice. Useful for security reasons.
+
    
+
    Compression/Encryption Schemes
    
+Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and
+compression schemes are supported. Currently, supported are:
+
    
+
      MD5Crypt (crypt.inc.php)
      MCrypt
      Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
      GZip
      BZip2
    
+
    These are stackable. E.g.
+
    ADODB_Session::filter(new ADODB_Compress_Bzip2());
    ADODB_Session::filter(new ADODB_Encrypt_MD5());
    
+will compress and then encrypt the record in the database.
+
    Session Cookie Regeneration: adodb_session_regenerate_id()
    
+
    Dynamically change the current session id with a newly generated one and update
+  database. Currently only works with cookies. Useful to improve security by
+  reducing the risk of session-hijacking. See this article on Session
+  Fixation for more info 
+on the theory behind this feature. Usage:
    +	include('path/to/adodb/session/adodb-session2.php');
+	
+	session_start();
+	# Approximately every 10 page loads, reset cookie for safety.
+	# This is extremely simplistic example, better 
+	# to regenerate only when the user logs in or changes
+	# user privilege levels.
+	if ((rand()%10) == 0) adodb_session_regenerate_id(); 
+
    
+
    This function calls session_regenerate_id() internally or simulates it if the function does not exist.
+
    Vacuum/Optimize Database
    
+
    During session garbage collection, if postgresql is detected,
+  ADOdb can be set to run VACUUM. If mysql is detected, then optimize database
+  could be called.You can turn this on or off using:
    
+
    $turnOn = true; # or false
+ADODB_Session::optimize($turnOn);
+
    
+
    The default  is optimization is disabled.
    
+
    Backwards Compatability 
    
+
    The older method of connecting to ADOdb using global variables is still supported:
    
+
     $ADODB_SESSION_DRIVER='mysql';
+ $ADODB_SESSION_CONNECT='localhost';
+ $ADODB_SESSION_USER ='root';
+ $ADODB_SESSION_PWD ='abc';
+ $ADODB_SESSION_DB ='phplens';
+ 
+ include('path/to/adodb/session/adodb-session2.php'); 
    
+
    In the above example, the only things you need to change in your code to upgrade
+  is 
    
+
      
+  
    • your session table format to the new one.
      • 
+  
    • the include file from adodb-session.php to adodb-session2.php. 
      • 
+
    
+
    More Info
    
+
    Also see the core ADOdb documentation. And if
+  you are interested in the obsolete adodb-session.php, see old
+    session documentation. 
    
+
+
diff --git a/adodb/docs/docs-session.old.htm b/adodb/docs/docs-session.old.htm
new file mode 100644
index 0000000..3c772d6
--- /dev/null
+++ b/adodb/docs/docs-session.old.htm
@@ -0,0 +1,313 @@
+
+
+
+  ADODB Old Session Management Manual
+  
+  
+
+
+
    ADODB Session Management Manual
    
+
    
+V5.06 16 Oct 2008  (c) 2000-2010 John Lim (jlim#natsoft.com)
+
    
+
     This software is dual licensed using BSD-Style and
+LGPL. This means you can use it in compiled proprietary and commercial
+products. 
+
    Useful ADOdb links: Download
+  Other Docs
+
    
+
    Introduction
    
+
    This documentation discusses the old adodb-session.php. 
+Here is the new documentation on the newer adodb-session2.php.
+
     We store state information specific to a user or web client in
+session variables. These session variables persist throughout a
+session, as the user moves from page to page. 
    
+
    To use session variables, call session_start() at the beginning of
+your web page, before your HTTP headers are sent. Then for every
+variable you want to keep alive for the duration of the session, call
+session_register($variable_name). By default, the session handler will
+keep track of the session by using a cookie. You can save objects or
+arrays in session variables also.
+
    
+
    The default method of storing sessions is to store it in a file.
+However if you have special needs such as you:
+
    
+
      
+  
    • Have multiple web servers that need to share session info
      • 
+  
    • Need to do special processing of each session
      • 
+  
    • Require notification when a session expires
      • 
+
    
+
    The ADOdb session handler provides you with the above
+additional capabilities by storing the session information as records
+in a database table that can be shared across multiple servers. 
    
+
    These records will be garbage collected based on the php.ini [session] timeout settings. 
+You can register a notification function to notify you when the record has expired and 
+is about to be freed by the garbage collector.
    
+
    Important Upgrade Notice: Since ADOdb 4.05, the session files
+have been moved to its own folder, adodb/session. This is a rewrite
+of the session code by Ross Smith. The old session code is in
+adodb/session/old. 
    
+
    ADOdb Session Handler Features
    
+
      
+  
    • Ability to define a notification function that is called when a
+session expires. Typically
+used to detect session logout and release global resources. 
      • 
+  
    • Optimization of database writes. We crc32 the session data and
+only perform an update
+to the session data if there is a data change. 
      • 
+  
    • Support for large amounts of session data with CLOBs (see
+adodb-session-clob.php). Useful
+for Oracle. 
      • 
+  
    • Support for encrypted session data, see
+adodb-cryptsession.php. Enabling encryption is simply a matter of
+including adodb-cryptsession.php instead of adodb-session.php. 
      • 
+
    
+
    Setup
    
+
    There are 3 session management files that you can use:
+
    
+
    adodb-session.php        : The default
    adodb-session-clob.php   : Use this if you are storing DATA in clobs
    adodb-cryptsession.php   : Use this if you want to store encrypted session data in the database

    
+
    
+
    Examples
+
    +     include('adodb/adodb.inc.php');
        
        $ADODB_SESSION_DRIVER='mysql';
        $ADODB_SESSION_CONNECT='localhost';
        $ADODB_SESSION_USER ='scott';
        $ADODB_SESSION_PWD ='tiger';
        $ADODB_SESSION_DB ='sessiondb';
        
        include('adodb/session/adodb-session.php');
        session_start();
        
        #
        # Test session vars, the following should increment on refresh
        #
        $_SESSION['AVAR'] += 1;
        print "<p>\$_SESSION['AVAR']={$_SESSION['AVAR']}</p>";
    
+ 
+
    To force non-persistent connections, call adodb_session_open() first before session_start():
+
    
+ 
    + 
        include('adodb/adodb.inc.php');
        
        $ADODB_SESSION_DRIVER='mysql';
        $ADODB_SESSION_CONNECT='localhost';
        $ADODB_SESSION_USER ='scott';
        $ADODB_SESSION_PWD ='tiger';
        $ADODB_SESSION_DB ='sessiondb';
        
        include('adodb/session/adodb-session.php');
        adodb_sess_open(false,false,false);
        session_start();
         
+ 
    
+
     The 3rd parameter to adodb_sess_open($path, $sessname, $connectMode)  sets the connection method. You can pass in the following:
    
+
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
    $connectModeConnection Method
    true
    PConnect( )
    falseConnect( )
    'N'NConnect( )
    'P'PConnect( )
    'C'Connect( )
    
+
    To use a encrypted sessions, simply replace the file adodb-session.php:
    
+ 
     
        include('adodb/adodb.inc.php');
        
        $ADODB_SESSION_DRIVER='mysql';
        $ADODB_SESSION_CONNECT='localhost';
        $ADODB_SESSION_USER ='scott';
        $ADODB_SESSION_PWD ='tiger';
        $ADODB_SESSION_DB ='sessiondb';
        
        include('adodb/session/adodb-cryptsession.php');
        session_start();
    
+ 
    
+ 
    And the same technique for adodb-session-clob.php:
    
+ 
      
        include('adodb/adodb.inc.php');
        
        $ADODB_SESSION_DRIVER='mysql';
        $ADODB_SESSION_CONNECT='localhost';
        $ADODB_SESSION_USER ='scott';
        $ADODB_SESSION_PWD ='tiger';
        $ADODB_SESSION_DB ='sessiondb';
        
        include('adodb/session/adodb-session-clob.php');
        session_start();    
+ 
    
+ 
    An alternative way to set persistant or non-persistent connections is to call the following function before session_start() is called.
+ 
    + 	ADODB_Session::persist('P'); # 'C' for non-persistent connections
+ 
    
+ 
    Installation
    
+
    1. Create this table in your database (MySQL syntax):
+
      
+   create table sessions (
+       SESSKEY char(32) not null,
+       EXPIRY int(11) unsigned not null,
+       EXPIREREF varchar(64),
+	   DATA text not null,
+	   primary key (sesskey)
+	   );
+ 
    
+
+ 
    You may want to rename the 'data' field to 'session_data' as
+	'data' appears to be a reserved word for one or more of the following:
+	
      
+	
    • 	ANSI SQL
+	
    • 	IBM DB2
+	
    • 	MS SQL Server
+	
    • 	Postgres
+	
    • 	SAP
+		
    
+
    
+	If you do, then execute:
+
    +		ADODB_Session::dataFieldName('session_data');
+
    
+ 
     For the adodb-session-clob.php version, create this:
+
      
    +    
        create table sessions (
           SESSKEY char(32) not null,
           EXPIRY int(11) unsigned not null,
           EXPIREREF varchar(64),
           DATA CLOB,
          primary key (sesskey)
      );    
+ 
    
+ 
    2. Then define the following parameters. You can either modify this file, or define them before this file is included:
+ 
          
        $ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
        $ADODB_SESSION_CONNECT='server to connect to';
        $ADODB_SESSION_USER ='user';
        $ADODB_SESSION_PWD ='password';
        $ADODB_SESSION_DB ='database';
        $ADODB_SESSION_TBL = 'sessions'; # setting this is optional
    	    
+ 
    
+     When the session is created, $ADODB_SESS_CONN holds the connection object.
        
      3. Recommended is PHP 4.0.6 or later. There are documented session bugs in earlier versions of PHP.
+
    Notifications
    
+
    You can receive notification when your session is cleaned up by the session garbage collector or
+when you call session_destroy().
+
    PHP's session extension will automatically run a special garbage collection function based on
+your php.ini session.cookie_lifetime and session.gc_probability settings. This will in turn call
+adodb's garbage collection function, which can be setup to do notification.
+
    
+
    +	PHP Session --> ADOdb Session  --> Find all recs  --> Send          --> Delete queued
+	GC Function     GC Function        to be deleted      notification      records
+	executed at     called by                             for all recs
+	random time     Session Extension                     queued for deletion
+
    
+
    When a session is created, we need to store a value in the session record (in the EXPIREREF field), typically 
+the userid of the session. Later when the session has expired,  just before the record is deleted,
+we reload the EXPIREREF field and call the notification function with the value of EXPIREREF, which 
+is the userid of the person being logged off.
+
    ADOdb uses a global variable $ADODB_SESSION_EXPIRE_NOTIFY that you must predefine before session
+start to store the notification configuration. 
+$ADODB_SESSION_EXPIRE_NOTIFY is an array with 2 elements, the
+first being the name of the session variable you would like to store in
+the EXPIREREF field, and the 2nd is the notification function's name. 
    
+
    For example, suppose we want to be notified when a user's session has expired,
+based on the userid. When the user logs in, we store the id in the global session variable
+$USERID. The function name is 'NotifyFn'. 
+
    
+So we define (before session_start() is called): 
    
+
     
+	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+
    
+And when the NotifyFn is called (when the session expires), the
+$USERID is passed in as the first parameter, eg. NotifyFn($userid, $sesskey). The
+session key (which is the primary key of the record in the sessions
+table) is the 2nd parameter.
+
     Here is an example of a Notification function that deletes some
+records in the database and temporary files: 
    
+
    
+	function NotifyFn($expireref, $sesskey)
+	{
+		global $ADODB_SESS_CONN; # the session connection object
+		$user = $ADODB_SESS_CONN->qstr($expireref);
+		
+		$ADODB_SESS_CONN->Execute("delete from shopping_cart where user=$user");          
+		system("rm /work/tmpfiles/$expireref/*");
+	}  
+			  
    
+
     NOTE 1: If you have register_globals disabled in php.ini, then you
+will have to manually set the EXPIREREF. E.g. 
    
+
     
+$GLOBALS['USERID'] = GetUserID();
+$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+
    
+
     NOTE 2: If you want to change the EXPIREREF after the session
+record has been created, you will need to modify any session variable
+to force a database record update.
+
    
+
    Neat Notification Tricks
    
+
    ExpireRef normally holds the user id of the current session.
+
    
+
    1. You can then write a session monitor, scanning expireref to see
+who is currently logged on.
+
    
+
    2. If you delete the sessions record for a specific user, eg.
+
    
+
    delete from sessions where expireref = '$USER'
    
+then the user is logged out. Useful for ejecting someone from a
+site.
+
    3. You can scan the sessions table to ensure no user
+can be logged in twice. Useful for security reasons.
+
    
+
    Using Oracle CLOBs
    
+
    Suppose you are storing the DATA field in a CLOB:
+ 
    
+   CREATE TABLE sessions (
+       SESSKEY VARCHAR(32) NOT NULL,
+       EXPIRY NUMBER(16)  NOT NULL,
+       EXPIREREF VARCHAR(64),
+       DATA CLOB,
+      PRIMARY KEY (sesskey)
+  );
+ 
     
+ 
    Then your PHP code could look like this:
+	 
    +	ADODB_SESSION_DRIVER='oci8';
+	$ADODB_SESSION_CONNECT=$tnsname;
+	$ADODB_SESSION_USER ='scott';
+	$ADODB_SESSION_PWD = 'tiger';
+	$ADODB_SESSION_DB ='';
+	
+	$ADODB_SESSION_USE_LOBS = 'clob';
+	$ADODB_SESSION_TBL = 'sessions';
+	
+	$ADODB_SESS_DEBUG=0;
+	
+	include(ADODB_DIR.'/session/adodb-session.php');
+	
+	ADODB_Session::persist('P'); # use 'C' for non-persistent connects
+	
+	session_start();
+ 
    
+ 
    Note that you can set persistance using ADODB_Session::persist('P').
+ 
+
    Compression/Encryption Schemes
    
+Since ADOdb 4.05, thanks to Ross Smith, multiple encryption and
+compression schemes are supported. Currently, supported are:
+
    
+
      MD5Crypt (crypt.inc.php)
      MCrypt
      Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
      GZip
      BZip2
    
+
    These are stackable. E.g.
+
    ADODB_Session::filter(new ADODB_Compress_Bzip2());
    ADODB_Session::filter(new ADODB_Encrypt_MD5());
    
+will compress and then encrypt the record in the database.
+
    adodb_session_regenerate_id()
    
+
    Dynamically change the current session id with a newly generated one and update database. Currently only
+works with cookies. Useful to improve security by reducing the risk of session-hijacking.
+See this article on Session Fixation for more info 
+on the theory behind this feature. Usage:
+
    +	$ADODB_SESSION_DRIVER='mysql';
+	$ADODB_SESSION_CONNECT='localhost';
+	$ADODB_SESSION_USER ='root';
+	$ADODB_SESSION_PWD ='abc';
+	$ADODB_SESSION_DB ='phplens';
+	
+	include('path/to/adodb/session/adodb-session.php');
+	
+	session_start();
+	# Every 10 page loads, reset cookie for safety.
+	# This is extremely simplistic example, better 
+	# to regenerate only when the user logs in or changes
+	# user privilege levels.
+	if ((rand()%10) == 0) adodb_session_regenerate_id(); 
+
    
+
    This function calls session_regenerate_id() internally or simulates it if the function does not exist.
+
    Vacuum/Optimize Database
    
+
    During session garbage collection, if postgresql is detected,
+  ADOdb can be set to run VACUUM. If mysql is detected, then optimize database
+  could be called.You can turn this on or off using:
    
+
    $turnOn = true; # or false
+ADODB_Session::optimize($turnOn);
+
    
+
    The default for optimization is it is disabled.
    
+
    More Info
    
+
    Also see the core ADOdb documentation.
+
    
+
+
diff --git a/adodb/docs/old-changelog.htm b/adodb/docs/old-changelog.htm
new file mode 100644
index 0000000..bf8a1af
--- /dev/null
+++ b/adodb/docs/old-changelog.htm
@@ -0,0 +1,822 @@
+Old Changelog: ADOdb
+
    Old Changelog
    
+
+
    3.92 22 Sept 2003 
+
    Added GetAssoc and CacheGetAssoc to connection object.
+
    Removed TextMax and CharMax functions from adodb.inc.php. 
+
    HasFailedTrans() returned false when trans failed. Fixed. 
+
    Moved perf driver classes into adodb/perf/*.php. 
+
    Misc improvements to performance monitoring, including UI(). 
+
    RETVAL in mssql Parameter(), we do not append @ now. 
+
    Added Param($name) to connection class, returns '?' or ":$name", for defining 
+  bind parameters portably. 
+
    LogSQL traps affected_rows() and saves its value properly now. Also fixed oci8 
+  _stmt and _affectedrows() bugs. 
+
    Session code timestamp check for oci8 works now. Formerly default NLS_DATE_FORMAT 
+  stripped off time portion. Thx to Tony Blair (tonanbarbarian#hotmail.com). Also 
+  added new $conn->datetime field to oci8, controls whether MetaType() returns 
+  'D' ($this->datetime==false) or 'T' ($this->datetime == true) for DATE type. 
+
    Fixed bugs in adodb-cryptsession.inc.php and adodb-session-clob.inc.php. 
+
    Fixed misc bugs in adodb_key_exists, GetInsertSQL() and GetUpdateSQL(). 
+
    Tuned include_once handling to reduce file-system checking overhead. 
+
    3.91 9 Sept 2003 
+
    Only released to InterAkt 
+
    Added LogSQL() for sql logging and $ADODB_NEWCONNECTION to override factory 
+  for driver instantiation. 
+
    Added IfNull($field,$ifNull) function, thx to johnwilk#juno.com 
+
    Added portable substr support. 
+
    Now rs2html() has new parameter, $echo. Set to false to return $html instead 
+  of echoing it. 
+
    3.90 5 Sept 2003 
+
    First beta of performance monitoring released. 
+
    MySQL supports MetaTable() masking. 
+
    Fixed key_exists() bug in adodb-lib.inc.php 
+
    Added sp_executesql Prepare() support to mssql. 
+
    Added bind support to db2. 
+
    Added swedish language file - Christian Tiberg" christian#commsoft.nu 
+
    Bug in drop index for mssql data dict fixed. Thx to Gert-Rainer Bitterlich. 
+
    Left join setting for oci8 was wrong. Thx to johnwilk#juno.com 
+
    3.80 27 Aug 2003 
+
    Patch for PHP 4.3.3 cached recordset csv2rs() fread loop incompatibility. 
+
    Added matching mask for MetaTables. Only for oci8, mssql and postgres currently. 
+
    Rewrite of "oracle" driver connection code, merging with "oci8", by Gaetano. 
+
    Added better debugging for Smart Transactions. 
+
    Postgres DBTimeStamp() was wrongly using TO_DATE. Changed to TO_TIMESTAMP. 
+
    ADODB_FETCH_CASE check pushed to ADONewConnection to allow people to define 
+  it after including adodb.inc.php. 
+
    Added portugese (brazilian) to languages. Thx to "Levi Fukumori". 
+
    Removed arg3 parameter from Execute/SelectLimit/Cache* functions. 
+
    Execute() now accepts 2-d array as $inputarray. Also changed docs of fnExecute() 
+  to note change in sql query counting with 2-d arrays. 
+
    Added MONEY to MetaType in PostgreSQL. 
+
    Added more debugging output to CacheFlush(). 
+
    3.72 9 Aug 2003 
+
    Added qmagic($str), which is a qstr($str) that auto-checks for magic quotes 
+  and does the right thing... 
+
    Fixed CacheFlush() bug - Thx to martin#gmx.de 
+
    Walt Boring contributed MetaForeignKeys for postgres7. 
+
    _fetch() called _BlobDecode() wrongly in interbase. Fixed. 
+
    adodb_time bug fixed with dates after 2038 fixed by Jason Pell. http://phplens.com/lens/lensforum/msgs.php?id=6980 
+
    3.71 4 Aug 2003 
+
    The oci8 driver, MetaPrimaryKeys() did not check the owner correctly when $owner 
+  == false. 
+
    Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru. 
+
    Spanish language file contributed by "Horacio Degiorgi" horaciod#codigophp.com. 
+
    Error handling in oci8 bugfix - if there was an error in Execute(), then when 
+  calling ErrorNo() and/or ErrorMsg(), the 1st call would return the error, but 
+  the 2nd call would return no error. 
+
    Error handling in odbc bugfix. ODBC would always return the last error, even 
+  if it happened 5 queries ago. Now we reset the errormsg to '' and errorno to 
+  0 everytime before CacheExecute() and Execute(). 
+
    3.70 29 July 2003 
+
    Added new SQLite driver. Tested on PHP 4.3 and PHP 5. 
+
    Added limited "sapdb" driver support - mainly date support. 
+
    The oci8 driver did not identify NUMBER with no defined precision correctly. 
+
    Added ADODB_FORCE_NULLS, if set, then PHP nulls are converted to SQL nulls 
+  in GetInsertSQL/GetUpdateSQL. 
+
    DBDate() and DBTimeStamp() format for postgresql had problems. Fixed. 
+
    Added tableoptions to ChangeTableSQL(). Thx to Mike Benoit. 
+
    Added charset support to postgresql. Thx to Julian Tarkhanov. 
+
    Changed OS check for MS-Windows to prevent confusion with darWIN (MacOS) 
+
    Timestamp format for db2 was wrong. Changed to yyyy-mm-dd-hh.mm.ss.nnnnnn. 
+
    adodb-cryptsession.php includes wrong. Fixed. 
+
    Added MetaForeignKeys(). Supported by mssql, odbc_mssql and oci8. 
+
    Fixed some oci8 MetaColumns/MetaPrimaryKeys bugs. Thx to Walt Boring. 
+
    adodb_getcount() did not init qryRecs to 0. Missing "WHERE" clause checking 
+  in GetUpdateSQL fixed. Thx to Sebastiaan van Stijn. 
+
    Added support for only 'VIEWS' and "TABLES" in MetaTables. From Walt Boring. 
+
    Upgraded to adodb-xmlschema.inc.php 0.0.2. 
+
    NConnect for mysql now returns value. Thx to Dennis Verspuij. 
+
    ADODB_FETCH_BOTH support added to interbase/firebird. 
+
    Czech language file contributed by Kamil Jakubovic jake#host.sk. 
+
    PostgreSQL BlobDecode did not use _connectionID properly. Thx to Juraj Chlebec. 
+
    Added some new initialization stuff for Informix. Thx to "Andrea Pinnisi" pinnisi#sysnet.it 
+
    ADODB_ASSOC_CASE constant wrong in sybase _fetch(). Fixed. 
+
    3.60 16 June 2003 
+
    We now SET CONCAT_NULL_YIELDS_NULL OFF for odbc_mssql driver to be compat with 
+  mssql driver. 
+
    The property $emptyDate missing from connection class. Also changed 1903 to 
+  constant (TIMESTAMP_FIRST_YEAR=100). Thx to Sebastiaan van Stijn. 
+
    ADOdb speedup optimization - we now return all arrays by reference. 
+
    Now DBDate() and DBTimeStamp() now accepts the string 'null' as a parameter. 
+  Suggested by vincent. 
+
    Added GetArray() to connection class. 
+
    Added not_null check in informix metacolumns(). 
+
    Connection parameters for postgresql did not work correctly when port was defined. 
+
    DB2 is now a tested driver, making adodb 100% compatible. Extensive changes 
+  to odbc driver for DB2, including implementing serverinfo() and SQLDate(), switching 
+  to SQL_CUR_USE_ODBC as the cursor mode, and lastAffectedRows and SelectLimit() 
+  fixes. 
+
    The odbc driver's FetchField() field names did not obey ADODB_ASSOC_CASE. Fixed. 
+
    Some bugs in adodb_backtrace() fixed. 
+
    Added "INT IDENTITY" type to adorecordset::MetaType() to support odbc_mssql 
+  properly. 
+
    MetaColumns() for oci8, mssql, odbc revised to support scale. Also minor revisions 
+  to odbc MetaColumns() for vfp and db2 compat. 
+
    Added unsigned support to mysql datadict class. Thx to iamsure. 
+
    Infinite loop in mssql MoveNext() fixed when ADODB_FETCH_ASSOC used. Thx to 
+  Josh R, Night_Wulfe#hotmail.com. 
+
    ChangeTableSQL contributed by Florian Buzin. 
+
    The odbc_mssql driver now sets CONCAT_NULL_YIELDS_NULL OFF for compat with 
+  mssql driver. 
+
    
+
+
    3.50 19 May 2003
    
+
    Fixed mssql compat with FreeTDS. FreeTDS does not implement mssql_fetch_assoc(). 
+
    Merged back connection and recordset code into adodb.inc.php. 
+
    ADOdb sessions using oracle clobs contributed by achim.gosse#ddd.de. See adodb-session-clob.php. 
+
    Added /s modifier to preg_match everywhere, which ensures that regex does not 
+  stop at /n. Thx Pao-Hsi Huang. 
+
    Fixed error in metacolumns() for mssql. 
+
    Added time format support for SQLDate. 
+
    Image => B added to metatype. 
+
    MetaType now checks empty($this->blobSize) instead of empty($this). 
+
    Datadict has beta support for informix, sybase (mapped to mssql), db2 and generic 
+  (which is a fudge). 
+
    BlobEncode for postgresql uses pg_escape_bytea, if available. Needed for compat 
+  with 7.3. 
+
    Added $ADODB_LANG, to support multiple languages in MetaErrorMsg(). 
+
    Datadict can now parse table definition as declarative text. 
+
    For DataDict, oci8 autoincrement trigger missing semi-colon. Fixed. 
+
    For DataDict, when REPLACE flag enabled, drop sequence in datadict for autoincrement 
+  field in postgres and oci8.s 
+
    Postgresql defaults to template1 database if no database defined in connect/pconnect. 
+
    We now clear _resultid in postgresql if query fails. 
+
    3.40 19 May 2003
    
+
    Added insert_id for odbc_mssql. 
+
    Modified postgresql UpdateBlobFile() because it did not work in safe mode. 
+
    Now connection object is passed to raiseErrorFn as last parameter. Needed by 
+  StartTrans(). 
+
    Added StartTrans() and CompleteTrans(). It is recommended that you do not modify 
+  transOff, but use the above functions. 
+
    oci8po now obeys ADODB_ASSOC_CASE settings. 
+
    Added virtualized error codes, using PEAR DB equivalents. Requires you to manually 
+  include adodb-error.inc.php yourself, with MetaError() and MetaErrorMsg($errno). 
+
    GetRowAssoc for mysql and pgsql were flawed. Fix by Ross Smith. 
+
    Added to datadict types I1, I2, I4 and I8. Changed datadict type 'T' to map 
+  to timestamp instead of datetime for postgresql. 
+
    Error handling in ExecuteSQLArray(), adodb-datadict.inc.php did not work. 
+
    We now auto-quote postgresql connection parameters when building connection 
+  string. 
+
    Added session expiry notification. 
+
    We now test with odbc mysql - made some changes to odbc recordset constructor. 
+
    MetaColumns now special cases access and other databases for odbc. 
+
    3.31 17 March 2003
    
+
    Added row checking for _fetch in postgres. 
+
    Added Interval type to MetaType for postgres. 
+
    Remapped postgres driver to call postgres7 driver internally. 
+
    Adorecordset_array::getarray() did not return array when nRows >= 0. 
+
    Postgresql: at times, no error message returned by pg_result_error() but error 
+  message returned in pg_last_error(). Recoded again. 
+
    Interbase blob's now use chunking for updateblob. 
+
    Move() did not set EOF correctly. Reported by Jorma T. 
+
    We properly support mysql timestamp fields when we are creating mysql tables 
+  using the data-dict interface. 
+
    Table regex includes backticks character now. 
+
    3.30 3 March 2003
    
+
    Added $ADODB_EXTENSION and $ADODB_COMPAT_FETCH constant. 
+
    Made blank1stItem configurable using syntax "value:text" in GetMenu/GetMenu2. 
+  Thx to Gabriel Birke. 
+
    Previously ADOdb differed from the Microsoft standard because it did not define 
+  what to set $this->fields when EOF was reached. Now at EOF, ADOdb sets $this->fields 
+  to false for all databases, which is consist with Microsoft's implementation. 
+  Postgresql and mysql have always worked this way (in 3.11 and earlier). If you 
+  are experiencing compatibility problems (and you are not using postgresql nor 
+  mysql) on upgrading to 3.30, try setting the global variables $ADODB_COUNTRECS 
+  = true (which is the default) and $ADODB_FETCH_COMPAT = true (this is a new 
+  global variable). 
+
    We now check both pg_result_error and pg_last_error as sometimes pg_result_error 
+  does not display anything. Iman Mayes 
+
     We no longer check for magic quotes gpc in Quote(). 
+
     Misc fixes for table creation in adodb-datadict.inc.php. Thx to iamsure. 
+
     Time calculations use adodb_time library for all negative timestamps due to 
+  problems in Red Hat 7.3 or later. Formerly, only did this for Windows. 
+
     In mssqlpo, we now check if $sql in _query is a string before we change || 
+  to +. This is to support prepared stmts. 
+
     Move() and MoveLast() internals changed to support to support EOF and $this->fields 
+  change. 
+
     Added ADODB_FETCH_BOTH support to mssql. Thx to Angel Fradejas afradejas#mediafusion.es 
+
     We now check if link resource exists before we run mysql_escape_string in 
+  qstr(). 
+
     Before we flock in csv code, we check that it is not a http url. 
+
    3.20 17 Feb 2003
    
+
    Added new Data Dictionary classes for creating tables and indexes. Warning 
+  - this is very much alpha quality code. The API can still change. See adodb/tests/test-datadict.php 
+  for more info. 
+
    We now ignore $ADODB_COUNTRECS for mysql, because PHP truncates incomplete 
+  recordsets when mysql_unbuffered_query() is called a second time. 
+
    Now postgresql works correctly when $ADODB_COUNTRECS = false. 
+
    Changed _adodb_getcount to properly support SELECT DISTINCT. 
+
    Discovered that $ADODB_COUNTRECS=true has some problems with prepared queries 
+  - suspect PHP bug. 
+
    Now GetOne and GetRow run in $ADODB_COUNTRECS=false mode for better performance. 
+
    Added support for mysql_real_escape_string() and pg_escape_string() in qstr(). 
+
    Added an intermediate variable for mysql _fetch() and MoveNext() to store fields, 
+  to prevent overwriting field array with boolean when mysql_fetch_array() returns 
+  false. 
+
    Made arrays for getinsertsql and getupdatesql case-insensitive. Suggested by 
+  Tim Uckun" tim#diligence.com 
+
    3.11 11 Feb 2003
    
+
    Added check for ADODB_NEVER_PERSIST constant in PConnect(). If defined, then 
+  PConnect() will actually call non-persistent Connect(). 
+
    Modified interbase to properly work with Prepare(). 
+
    Added $this->ibase_timefmt to allow you to change the date and time format. 
+
    Added support for $input_array parameter in CacheFlush(). 
+
    Added experimental support for dbx, which was then removed when i found that 
+  it was slower than using native calls. 
+
    Added MetaPrimaryKeys for mssql and ibase/firebird. 
+
    Added new $trim parameter to GetCol and CacheGetCol 
+
    Uses updated adodb-time.inc.php 0.06. 
+
    3.10 27 Jan 2003 
+
    Added adodb_date(), adodb_getdate(), adodb_mktime() and adodb-time.inc.php. 
+
    For interbase, added code to handle unlimited number of bind parameters. From 
+  Daniel Hasan daniel#hasan.cl. 
+
    Added BlobDecode and UpdateBlob for informix. Thx to Fernando Ortiz. 
+
    Added constant ADODB_WINDOWS. If defined, means that running on Windows. 
+
    Added constant ADODB_PHPVER which stores php version as a hex num. Removed 
+  $ADODB_PHPVER variable. 
+
    Felho Bacsi reported a minor white-space regular expression problem in GetInsertSQL. 
+
    Modified ADO to use variant to store _affectedRows 
+
    Changed ibase to use base class Replace(). Modified base class Replace() to 
+  support ibase. 
+
    Changed odbc to auto-detect when 0 records returned is wrong due to bad odbc 
+  drivers. 
+
    Changed mssql to use datetimeconvert ini setting only when 4.30 or later (does 
+  not work in 4.23). 
+
    ExecuteCursor($stmt, $cursorname, $params) now accepts a new $params array 
+  of additional bind parameters -- William Lovaton walovaton#yahoo.com.mx. 
+
    Added support for sybase_unbuffered_query if ADODB_COUNTRECS == false. Thx 
+  to chuck may. 
+
    Fixed FetchNextObj() bug. Thx to Jorma Tuomainen. 
+
    We now use SCOPE_IDENTITY() instead of @@IDENTITY for mssql - thx to marchesini#eside.it 
+
    Changed postgresql movenext logic to prevent illegal row number from being 
+  passed to pg_fetch_array(). 
+
    Postgresql initrs bug found by "Bogdan RIPA" bripa#interakt.ro $f1 accidentally 
+  named $f 
+
    3.00 6 Jan 2003 
+
    Fixed adodb-pear.inc.php syntax error. 
+
    Improved _adodb_getcount() to use SELECT COUNT(*) FROM ($sql) for languages 
+  that accept it. 
+
    Fixed _adodb_getcount() caching error. 
+
    Added sql to retrive table and column info for odbc_mssql. 
+
    2.91 3 Jan 2003 
+
    Revised PHP version checking to use $ADODB_PHPVER with legal values 0x4000, 
+  0x4050, 0x4200, 0x4300. 
+
    Added support for bytea fields and oid blobs in postgres by allowing BlobDecode() 
+  to detect and convert non-oid fields. Also added BlobEncode to postgres when 
+  you want to encode oid blobs. 
+
    Added blobEncodeType property for connections to inform phpLens what encoding 
+  method to use for blobs. 
+
    Added BlobDecode() and BlobEncode() to base ADOConnection class. 
+
    Added umask() to _gencachename() when creating directories. 
+
    Added charPage for ado drivers, so you can set the code page. 
+
    +$conn->charPage = CP_UTF8;
+$conn->Connect($dsn);
+
    
+
    Modified _seek in mysql to check for num rows=0. 
+
    Added to metatypes new informix types for IDS 9.30. Thx Fernando Ortiz. 
+
    _maxrecordcount returned in CachePageExecute $rsreturn 
+
    Fixed sybase cacheselectlimit( ) problems 
+
    MetaColumns() max_length should use precision for types X and C for ms access. 
+  Fixed. 
+
    Speedup of odbc non-SELECT sql statements. 
+
    Added support in MetaColumns for Wide Char types for ODBC. We halve max_length 
+  if unicode/wide char. 
+
    Added 'B' to types handled by GetUpdateSQL/GetInsertSQL. 
+
    Fixed warning message in oci8 driver with $persist variable when using PConnect. 
+
    2.90 11 Dec 2002 
+
    Mssql and mssqlpo and oci8po now support ADODB_ASSOC_CASE. 
+
    Now MetaType() can accept a field object as the first parameter. 
+
    New $arr = $db->ServerInfo( ) function. Returns $arr['description'] which 
+  is the string description, and $arr['version']. 
+
    PostgreSQL and MSSQL speedups for insert/updates. 
+
     Implemented new SetFetchMode() that removes the need to use $ADODB_FETCH_MODE. 
+  Each connection has independant fetchMode. 
+
    ADODB_ASSOC_CASE now defaults to 2, use native defaults. This is because we 
+  would break backward compat for too many applications otherwise. 
+
    Patched encrypted sessions to use replace() 
+
    The qstr function supports quoting of nulls when escape character is \ 
+
    Rewrote bits and pieces of session code to check for time synch and improve 
+  reliability. 
+
    Added property ADOConnection::hasTransactions = true/false; 
+
    Added CreateSequence and DropSequence functions 
+
    Found misplaced MoveNext() in adodb-postgres.inc.php. Fixed. 
+
    Sybase SelectLimit not reliable because 'set rowcount' not cached - fixed. 
+
    Moved ADOConnection to adodb-connection.inc.php and ADORecordSet to adodb-recordset.inc.php. 
+  This allows us to use doxygen to generate documentation. Doxygen doesn't like 
+  the classes in the main adodb.inc.php file for some mysterious reason. 
+
    2.50, 14 Nov 2002 
+
    Added transOff and transCnt properties for disabling (transOff = true) and 
+  tracking transaction status (transCnt>0). 
+
    Added inputarray handling into _adodb_pageexecute_all_rows - "Ross Smith" RossSmith#bnw.com. 
+
    Fixed postgresql inconsistencies in date handling. 
+
    Added support for mssql_fetch_assoc. 
+
    Fixed $ADODB_FETCH_MODE bug in odbc MetaTables() and MetaPrimaryKeys(). 
+
    Accidentally declared UnixDate() twice, making adodb incompatible with php 
+  4.3.0. Fixed. 
+
    Fixed pager problems with some databases that returned -1 for _currentRow on 
+  MoveLast() by switching to MoveNext() in adodb-lib.inc.php. 
+
    Also fixed uninited $discard in adodb-lib.inc.php. 
+
    2.43, 25 Oct 2002
    
+Added ADODB_ASSOC_CASE constant to better support ibase and odbc field names. 
+
    Added support for NConnect() for oracle OCINLogin. 
+
    Fixed NumCols() bug. 
+
    Changed session handler to use Replace() on write. 
+
    Fixed oci8 SelectLimit aggregate function bug again. 
+
    Rewrote pivoting code. 
+
    2.42, 4 Oct 2002
    
+
    Fixed ibase_fetch() problem with nulls. Also interbase now does automatic blob 
+  decoding, and is backward compatible. Suggested by Heinz Hombergs heinz#hhombergs.de. 
+
    Fixed postgresql MoveNext() problems when called repeatedly after EOF. Also 
+  suggested by Heinz Hombergs. 
+
    PageExecute() does not rewrite queries if SELECT DISTINCT is used. Requested 
+  by hans#velum.net 
+
    Added additional fixes to oci8 SelectLimit handling with aggregate functions 
+  - thx to Christian Bugge for reporting the problem. 
+
    2.41, 2 Oct 2002
    
+
    Fixed ADODB_COUNTRECS bug in odbc. Thx to Joshua Zoshi jzoshi#hotmail.com. 
+
    Increased buffers for adodb-csvlib.inc.php for extremely long sql from 8192 
+  to 32000. 
+
    Revised pivottable.inc.php code. Added better support for aggregate fields. 
+
    Fixed mysql text/blob types problem in MetaTypes base class - thx to horacio 
+  degiorgi. 
+
    Added SQLDate($fmt,$date) function, which allows an sql date format string 
+  to be generated - useful for group by's. 
+
    Fixed bug in oci8 SelectLimit when offset>100. 
+
    2.40 4 Sept 2002
    
+
    Added new NLS_DATE_FORMAT property to oci8. Suggested by Laurent NAVARRO ln#altidev.com 
+
    Now use bind parameters in oci8 selectlimit for better performance. 
+
    Fixed interbase replaceQuote for dialect != 1. Thx to "BEGUIN Pierre-Henri 
+  - INFOCOB" phb#infocob.com. 
+
    Added white-space check to QA. 
+
    Changed unixtimestamp to support fractional seconds (we always round down/floor 
+  the seconds). Thanks to beezly#beezly.org.uk. 
+
    Now you can set the trigger_error type your own user-defined type in adodb-errorhandler.inc.php. 
+  Suggested by Claudio Bustos clbustos#entelchile.net. 
+
    Added recordset filters with rsfilter.inc.php. 
+
    $conn->_rs2rs does not create a new recordset when it detects it is of type 
+  array. Some trickery there as there seems to be a bug in Zend Engine 
+
    Added render_pagelinks to adodb-pager.inc.php. Code by "Pablo Costa" pablo#cbsp.com.br. 
+
    MetaType() speedup in adodb.inc.php by using hashing instead of switch. Best 
+  performance if constant arrays are supported, as they are in PHP5. 
+
    adodb-session.php now updates only the expiry date if the crc32 check indicates 
+  that the data has not been modified. 
+
    2.31 20 Aug 2002
    
+
    Made changes to pivottable.inc.php due to daniel lucuzaeu's suggestions (we sum the pivottable column if desired).
+
    Fixed ErrorNo() in postgres so it does not depend on _errorMsg property.
+
    Robert Tuttle added support for oracle cursors. See ExecuteCursor().
+
    Fixed Replace() so it works with mysql when updating record where data has not changed. Reported by
+Cal Evans (cal#calevans.com).
+
    2.30 1 Aug 2002
    
+
    Added pivottable.inc.php. Thanks to daniel.lucazeau#ajornet.com for the original 
+  concept.
+
    Added ADOConnection::outp($msg,$newline) to output error and debugging messages. Now 
+you can override this using the ADODB_OUTP constant and use your own output handler.
+
    Changed == to === for 'null' comparison. Reported by ericquil#yahoo.com 
+
    Fixed mssql SelectLimit( ) bug when distinct used.
+
    2.30 1 Aug 2002
    
+
    New GetCol() and CacheGetCol() from ross#bnw.com that returns the first field as a 1 dim array.
+
    We have an empty recordset, but RecordCount() could return -1. Fixed. Reported by  "Jonathan Polansky" jonathan#polansky.com.
+
    We now check for session variable changes using strlen($sessval).crc32($sessval). 
+Formerly we only used crc32().
+
    Informix SelectLimit() problem with $ADODB_COUNTRECS fixed.
+
    Fixed informix SELECT FIRST x DISTINCT, and not SELECT DISTINCT FIRST x - reported by F Riosa
+
    Now default adodb error handlers ignores error if @ used.
+
    If you set $conn->autoRollback=true, we auto-rollback persistent connections for odbc, mysql, oci8, mssql. 
+Default for autoRollback is false. No need to do so for postgres. 
+As interbase requires a transaction id (what a flawed api), we don't do it for interbase.
+
    Changed PageExecute() to use non-greedy preg_match when searching for "FROM" keyword.
+
    2.20 9 July 2002
    
+
    Added CacheGetOne($secs2cache,$sql), CacheGetRow($secs2cache,$sql), CacheGetAll($secs2cache,$sql).
+
    Added $conn->OffsetDate($dayFraction,$date=false) to generate sql that calcs 
+  date offsets. Useful for scheduling appointments.
+
    Added connection properties: leftOuter, rightOuter that hold left and right 
+  outer join operators.
+
    Added connection property: ansiOuter to indicate whether ansi outer joins supported.
+
    New driver mssqlpo, the portable mssql driver, which converts string 
+  concat operator from || to +.
+
    Fixed ms access bug - SelectLimit() did not support ties - fixed.
+
    Karsten Kraus (Karsten.Kraus#web.de), contributed error-handling code to ADONewConnection. 
+  Unfortunately due to backward compat problems, had to rollback most of the changes.
+
    Added new parameter to GetAssoc() to allow returning an array of key-value pairs, 
+ignoring any additional columns in the recordset. Off by default.
+
    Corrected mssql $conn->sysDate to return only date using convert().
+
    CacheExecute() improved debugging output.
+
    Changed rs2html() so newlines are converted to BR tags. Also optimized rs2html() based
+on feedback by "Jerry Workman" jerry#mtncad.com.
+
    Added support for Replace() with Interbase, using DELETE and INSERT.
+
    Some minor optimizations (mostly removing & references when passing arrays).
+
    Changed  GenID() to allows id's larger than the size of an integer.
+
    Added force_session property to oci8 for better updateblob() support.
+
    Fixed PageExecute() which did not work properly with sql containing GROUP BY.
+
    2.12 12 June 2002
    
+
    Added toexport.inc.php to export recordsets in CSV and tab-delimited format.
+
    CachePageExecute() does not work - fixed - thx John Huong.
+
    Interbase aliases not set properly in FetchField() - fixed. Thx Stefan Goethals.
+
    Added cache property to adodb pager class. The number of secs to cache recordsets.
+
    SQL rewriting bug in pageexecute() due to skipping of newlines due to missing /s modifier. Fixed.
+
    Max size of cached recordset due to a bug was 256000 bytes. Fixed.
+
    Speedup of 1st invocation of CacheExecute() by tuning code.
+
    We compare $rewritesql with $sql in pageexecute code in case of rewrite failure.
+
    2.11 7 June 2002
    
+
    Fixed PageExecute() rewrite sql problem - COUNT(*) and ORDER BY don't go together with
+	mssql, access and postgres. Thx to Alexander Zhukov alex#unipack.ru
+
    DB2 support for CHARACTER type added - thx John Huong huongch#bigfoot.com
+
    For ado, $argProvider not properly checked. Fixed - kalimero#ngi.it
+
    Added $conn->Replace() function for update with automatic insert if the record does not exist. 
+	Supported by all databases except interbase.
+
    2.10 4 June 2002
    
+
    Added uniqueSort property to indicate mssql ORDER BY cols must be unique.
+
    Optimized session handler by crc32 the data. We only write if session data has changed.
+
    adodb_sess_read in adodb-session.php now returns ''correctly - thanks to Jorma Tuomainen, webmaster#wizactive.com
+
    Mssql driver did not throw EXECUTE errors correctly because ErrorMsg() and ErrorNo() called in wrong order. 
+Pointed out by Alexios Fakos. Fixed.
+
    Changed ado to use client cursors. This fixes BeginTran() problems with ado.
+
    Added handling of timestamp type in ado.
+
    Added to ado_mssql support for insert_id() and affected_rows().
+
    Added support for mssql.datetimeconvert=0, available since php 4.2.0.
+
    Made UnixDate() less strict, so that the time is ignored if present.
+
    Changed quote() so that it checks for magic_quotes_gpc.
+
    Changed maxblobsize for odbc to default to 64000.
+
    2.00 13 May 2002
    
+
    Added drivers informix72 for pre-7.3 versions, and oci805 for 
+  oracle 8.0.5, and postgres64 for postgresql 6.4 and earlier. The postgres and postgres7 drivers
+  are now identical.
+
    Interbase now partially supports ADODB_FETCH_BOTH, by defaulting to ASSOC mode.
+
    Proper support for blobs in mssql. Also revised blob support code 
+is base class. Now UpdateBlobFile() calls UpdateBlob() for consistency.
+
    Added support for changed odbc_fetch_into api in php 4.2.0 
+with $conn->_has_stupid_odbc_fetch_api_change.
+
    Fixed spelling of tablock locking hint in GenID( ) for mssql. 
+
    Added RowLock( ) to several databases, including oci8, informix, sybase, etc. 
+  Fixed where error in mssql RowLock().
+
    Added sysDate and sysTimeStamp properties to most database drivers. These are the sql
+functions/constants for that database that return the current date and current timestamp, and 
+are useful for portable inserts and updates.
+
    Support for RecordCount() caused date handling in sybase and mssql to break. 
+Fixed, thanks to Toni Tunkkari, by creating derived classes for ADORecordSet_array for
+both databases. Generalized using arrayClass property. Also to support RecordCount(), 
+changed metatype handling for ado drivers. Now the type returned in FetchField 
+  is no longer a number, but the 1-char data type returned by MetaType.
+  At the same time, fixed a lot of date handling. Now mssql support dmy and mdy date formats. 
+Also speedups in sybase and mssql with preg_match and ^ in date/timestamp handling.
+Added support in sybase and mssql for 24 hour clock in timestamps (no AM/PM).
+
    Extensive revisions to informix driver - thanks to Samuel CARRIERE samuel_carriere#hotmail.com 
+
    Added $ok parameter to CommitTrans($ok) for easy rollbacks.
+
    Fixed odbc MetaColumns and MetaTables to save and restore $ADODB_FETCH_MODE.
+
    Some odbc drivers did not call the base connection class constructor. Fixed.
+
    Fixed regex for GetUpdateSQL() and GetInsertSQL() to support more legal character combinations.
+
+
    1.99 21 April 2002
    
+
    Added emulated RecordCount() to all database drivers if $ADODB_COUNTRECS = true 
+  (which it is by default). Inspired by Cristiano Duarte (cunha17#uol.com.br). 
+
    Unified stored procedure support for mssql and oci8. Parameter() and PrepareSP() 
+  functions implemented. 
+
    Added support for SELECT FIRST in informix, modified hasTop property to support 
+  this. 
+
    Changed csv driver to handle updates/deletes/inserts properly (when Execute() returns true).
+Bind params also work now, and raiseErrorFn with csv driver. Added csv driver to QA process. 
+
    Better error checking in oci8 UpdateBlob() and UpdateBlobFile().
+
    Added TIME type to MySQL - patch by Manfred h9125297#zechine.wu-wien.ac.at
+
    Prepare/Execute implemented for Interbase/Firebird 
+
    Changed some regular expressions to be anchored by /^ $/ for speed.
+
    Added UnixTimeStamp() and UnixDate() to ADOConnection(). Now these functions 
+  are in both ADOConnection and ADORecordSet classes.
+
    Empty recordsets were not cached - fixed.
+
    Thanks to Gaetano Giunta (g.giunta#libero.it) for the oci8 code review. We 
+  didn't agree on everything, but i hoped we agreed to disagree! 
+
    1.90 6 April 2002
    
+
    Now all database drivers support fetch modes ADODB_FETCH_NUM and ADODB_FETCH_ASSOC, though
+	still not fully tested. Eg. Frontbase, Sybase, Informix.
+
    NextRecordSet() support for mssql. Contributed by "Sven Axelsson" sven.axelsson#bokochwebb.se
+
    Added blob support for SQL Anywhere. Contributed by Wade Johnson wade#wadejohnson.de
+
    Fixed some security loopholes in server.php. Server.php also supports fetch mode.
+
    Generalized GenID() to support odbc and mssql drivers. Mssql no longer generates GUID's.
+
    Experimental RowLock($table,$where) for mssql.
+
    Properly implemented Prepare() in oci8 and ODBC.
+
    Added Bind() support to oci8 to support Prepare().
+
    Improved error handler. Catches CacheExecute() and GenID() errors now.
+
    Now if you are running php from the command line, debugging messages do not output html formating.
+Not 100% complete, but getting there.
+
    1.81 22 March 2002
    
+
    Restored default $ADODB_FETCH_MODE = ADODB_FETCH_DEFAULT for backward compatibility.
+
    SelectLimit for oci8 improved - Our FIRST_ROWS optimization now does not overwrite existing hint.
+
    New Sybase SQL Anywhere driver. Contributed by Wade Johnson wade#wadejohnson.de
+
    1.80 15 March 2002
    
+
    Redesigned directory structure of ADOdb files. Added new driver directory where
+all database drivers reside.
+
    Changed caching algorithm to create subdirectories. Now we scale better.
+
    Informix driver now supports insert_id(). Contribution by "Andrea Pinnisi" pinnisi#sysnet.it
+
    Added experimental ISO date and FetchField support for informix.
+
    Fixed a quoting bug in Execute() with bind parameters, causing problems with blobs.
+
    Mssql driver speedup by 10-15%.
+
    Now in CacheExecute($secs2cache,$sql,...), $secs2cache is optional. If missing, it will
+take the value defined in $connection->cacheSecs (default is 3600 seconds). Note that
+CacheSelectLimit(), the secs2cache is still compulsory - sigh.
+
    Sybase SQL Anywhere driver (using ODBC) contributed by Wade Johnson wade#wadejohnson.de
+
    1.72 8 March 2002
    
+
    Added @ when returning Fields() to prevent spurious error - "Michael William Miller" mille562#pilot.msu.edu
+
    MetaDatabases() for postgres contributed by Phil pamelant#nerim.net
+ 
    Mitchell T. Young (mitch#youngfamily.org) contributed informix driver.
+ 
    Fixed rs2html() problem. I cannot reproduce, so probably a problem with pre PHP 4.1.0 versions,
+  when supporting new ADODB_FETCH_MODEs.
+ 
    Mattia Rossi (mattia#technologist.com) contributed BlobDecode() and UpdateBlobFile() for postgresql
+ using the postgres specific pg_lo_import()/pg_lo_open() - i don't use them but hopefully others will
+ find this useful. See this posting
+ for an example of usage.
+ 
    Added UpdateBlobFile() for uploading files to a database.
+ 
    Made UpdateBlob() compatible with oci8po driver.
+ 
    Added noNullStrings support to oci8 driver. Oracle changes all ' ' strings to nulls,
+  so you need to set strings to ' ' to prevent the nullifying of strings. $conn->noNullStrings = true;
+  will do this for you automatically. This is useful when you define a char column as NOT NULL.
+  
    Fixed UnixTimeStamp() bug - wasn't setting minutes and seconds properly. Patch from Agusti Fita i Borrell agusti#anglatecnic.com.
+  
    Toni Tunkkari added patch for sybase dates. Problem with spaces in day part of date fixed.
+ 
    1.71 18 Jan 2002
    
+ 
    Sequence start id support. Now $conn->Gen_ID('seqname', 50) to start sequence from 50.
+ 
    CSV driver fix for selectlimit, from Andreas - akaiser#vocote.de.
+
    Gam3r spotted that a global variable was undefined in the session handler. 
+
    Mssql date regex had error. Fixed - reported by Minh Hoang vb_user#yahoo.com.
+
    DBTimeStamp() and DBDate() now accept iso dates and unix timestamps. This means
+that the PostgreSQL handling of dates in GetInsertSQL() and GetUpdateSQL() can
+be removed. Also if these functions are passed '' or null or false, we return a SQL null.
+
    GetInsertSQL() and GetUpdateSQL() now accept a new parameter, $magicq to 
+indicate whether quotes should be inserted based on magic quote settings - suggested by
+dj#4ict.com.
+
    Reformated docs slightly based on suggestions by Chris Small.
+ 
    1.65 28 Dec 2001
    
+ 
    Fixed borland_ibase class naming bug.
+ 
    Now instead of using $rs->fields[0] internally, we use reset($rs->fields) so 
+ that we are compatible with ADODB_FETCH_ASSOC mode. Reported by Nico S.
+ 
    Changed recordset constructor and _initrs() for oci8 so that it returns the field definitions even
+ if no rows in the recordset. Reported by Rick Hickerson (rhickers#mv.mv.com).
+ 
    Improved support for postgresql in GetInsertSQL and GetUpdateSQL by
+  "mike" mike#partner2partner.com  and "Ryan Bailey" rebel#windriders.com
+ 
    1.64 20 Dec 2001
    
+
    Danny Milosavljevic <danny.milo#gmx.net> added some patches for MySQL error handling
+and displaying default values.
+
    Fixed some ADODB_FETCH_BOTH inconsistencies in odbc and interbase.
+
    Added more tests to test suite to cover ADODB_FETCH_* and ADODB_ERROR_HANDLER.
+
    Added firebird (ibase) driver
+
    Added borland_ibase driver for interbase 6.5
+
    1.63 13 Dec 2001
    
+Absolute to the adodb-lib.inc.php file not set properly. Fixed.
    
+
+
    1.62 11 Dec 2001
    
+
    Major speedup of ADOdb for low-end web sites by reducing the php code loading and compiling
+cycle. We conditionally compile not so common functions. 
+Moved csv code to adodb-csvlib.inc.php to reduce adodb.inc.php parsing. This file
+is loaded only when the csv/proxy driver is used, or CacheExecute() is run.
+Also moved PageExecute(), GetSelectSQL() and GetUpdateSQL() core code to adodb-lib.inc.php.
+This reduced the 70K main adodb.inc.php file to 55K, and since at least 20K of the file
+is comments, we have reduced 50K of code in adodb.inc.php to 35K. There
+ should be 35% reduction in memory and thus 35% speedup in compiling the php code for the
+main adodb.inc.php file.
+
    Highly tuned SelectLimit() for oci8 for massive speed improvements on large files. 
+Selecting 20 rows starting from the 20,000th row of a table is now 7 times faster. 
+Thx to Tomas V V Cox.
+
    Allow . and # in table definitions in GetInsertSQL and GetUpdateSQL.
+ See ADODB_TABLE_REGEX constant. Thx to Ari Kuorikoski.
+
    Added ADODB_PREFETCH_ROWS constant, defaulting to 10. This determines the number
+of records to prefetch in a SELECT statement. Only used by oci8.
    
+
    Added high portability Oracle class called oci8po. This uses ? for bind variables, and 
+lower cases column names.
    
+
    Now all database drivers support $ADODB_FETCH_MODE, including interbase, ado, and odbc:
+ADODB_FETCH_NUM and ADODB_FETCH_ASSOC. ADODB_FETCH_BOTH is not fully implemented for all 
+database drivers.
+
    1.61 Nov 2001
    
+
    Added PO_RecordCount() and PO_Insert_ID(). PO stands for portable. Pablo Roca 
+  [pabloroca#mvps.org]
    
+
    GenID now returns 0 if not available. Safer is that you should check $conn->hasGenID 
+  for availability.
    
+
    M'soft ADO we now correctly close recordset in _close() peterd#telephonetics.co.uk
    
+
    MSSQL now supports GenID(). It generates a 16-byte GUID from mssql newid() 
+  function.
    
+
    Changed ereg_replace to preg_replace in SelectLimit. This is a fix for mssql. 
+  Ereg doesn't support t or n! Reported by marino Carlos xaplo#postnuke-espanol.org
    
+
    Added $recordset->connection. This is the ADOConnection object for the recordset. 
+Works with cached and normal recordsets. Surprisingly, this had no affect on performance!
    
+
    1.54 15 Nov 2001
    
+Fixed some more bugs in PageExecute().  I am getting sick of bug in this and will have to 
+reconsider my QA here. The main issue is that I don't use PageExecute() and 
+to check whether it is working requires a visual inspection of the html generated currently.
+It is possible to write a test script but it would be quite complicated :(
+
     More speedups of SelectLimit() for DB2, Oci8, access, vfp, mssql.
+
    
+
+
    1.53 7 Nov 2001
    
+Added support for ADODB_FETCH_ASSOC for ado and odbc drivers.
    
+Tuned GetRowAssoc(false) in postgresql and mysql.
    
+Stephen Van Dyke contributed ADOdb icon, accepted with some minor mods.
    
+Enabled Affected_Rows() for postgresql
    
+Speedup for Concat() using implode() - Benjamin Curtis ben_curtis#yahoo.com
    
+Fixed some more bugs in PageExecute() to prevent infinite loops
    
+
    1.52 5 Nov 2001
    
+Spelling error in CacheExecute() caused it to fail. $ql should be $sql in line 625!
    
+Added fixes for parsing [ and ] in GetUpdateSQL().
+
    1.51 5 Nov 2001
    
+
    Oci8 SelectLimit() speedup by using OCIFetch().
+
    Oci8 was mistakenly reporting errors when $db->debug = true.
+
    If a connection failed with ODBC, it was not correctly reported - fixed.
+
    _connectionID was inited to -1, changed to false.
+
    Added $rs->FetchRow(), to simplify API, ala PEAR DB
+
    Added PEAR DB compat mode, which is still faster than PEAR! See adodb-pear.inc.php.
+
    Removed postgres pconnect debugging statement.
+
    1.50 31 Oct 2001
    
+
    ADOdbConnection renamed to ADOConnection, and ADOdbFieldObject to ADOFieldObject.
+
    PageExecute() now checks for empty $rs correctly, and the errors in the docs on this subject have been fixed.
+
    odbc_error() does not return 6 digit error correctly at times. Implemented workaround.
+
    Added ADORecordSet_empty class. This will speedup INSERTS/DELETES/UPDATES because the return
+object created is much smaller.
+
    Added Prepare() to odbc, and oci8 (but doesn't work properly for oci8 still).
+
    Made pgsql a synonym for postgre7, and changed SELECT LIMIT to use OFFSET for compat with 
+postgres 7.2.
+
    Revised adodb-cryptsession.php thanks to Ari.
+
    Set resources to false on _close, to force freeing of resources.
+
    Added adodb-errorhandler.inc.php, adodb-errorpear.inc.php and raiseErrorFn on Freek's urging.
+
    GetRowAssoc($toUpper=true): $toUpper added as default.
+
    Errors when connecting to a database were not captured formerly. Now we do it correctly.
+
    1.40 19 September 2001
    
+
    PageExecute() to implement page scrolling added. Code and idea by Iván Oliva.
    
+
    Some minor postgresql fixes.
    
+
    Added sequence support using GenID() for postgresql, oci8, mysql, interbase.
    
+
    Added UpdateBlob support for interbase (untested).
    
+
    Added encrypted sessions (see adodb-cryptsession.php). By Ari Kuorikoski <kuoriari#finebyte.com>
    
+
    1.31 21 August 2001
    
+
    Many bug fixes thanks to "GaM3R (Cameron)" <gamr#outworld.cx>. Some session changes due to Gam3r.
+
    Fixed qstr() to quote  also.
+
    rs2html() now pretty printed.
+
    Jonathan Younger jyounger#unilab.com contributed the great idea GetUpdateSQL() and GetInsertSQL() which
+generates SQL to update and insert into a table from a recordset. Modify the recordset fields
+array, then can this function to generate the SQL (the SQL is not executed).
+
    "Nicola Fankhauser" <nicola.fankhauser#couniq.com> found some bugs in date handling for mssql.
    
+
    Added minimal Oracle support for LOBs. Still under development.
    
+Added $ADODB_FETCH_MODE so you can control whether recordsets return arrays which are
+numeric, associative or both. This is a global variable you set. Currently only MySQL, Oci8, Postgres
+drivers support this.
+
    PostgreSQL properly closes recordsets now. Reported by several people.
+
    
+Added UpdateBlob() for Oracle. A hack to make it easier to save blobs.
+
    
+Oracle timestamps did not display properly. Fixed.
+
    1.20 6 June 2001
    
+
    Now Oracle can connect using tnsnames.ora or server and service name
    
+
    Extensive Oci8 speed optimizations. 
+Oci8 code revised to support variable binding, and /*+ FIRST_ROWS */ hint.
    
+
    Worked around some 4.0.6 bugs in odbc_fetch_into().
    
+
    Paolo S. Asioli paolo.asioli#libero.it suggested GetRowAssoc().
    
+
    Escape quotes for oracle wrongly set to '. Now '' is used.
    
+
    Variable binding now works in ODBC also.
    
+
    Jumped to version 1.20 because I don't like 13 :-)
    
+
    1.12 6 June 2001
    
+
    Changed $ADODB_DIR to ADODB_DIR constant to plug a security loophole.
    
+
    Changed _close() to close persistent connections also. Prevents connection leaks.
    
+
    Major revision of oracle and oci8 drivers. 
+Added OCI_RETURN_NULLS and OCI_RETURN_LOBS to OCIFetchInto(). BLOB, CLOB and VARCHAR2 recognition
+in MetaType() improved. MetaColumns() returns columns in correct sort order.
    
+
    Interbase timestamp input format was wrong. Fixed.
    
+
    1.11 20 May 2001
    
+
    Improved file locking for Windows.
    
+
    Probabilistic flushing of cache to avoid avalanche updates when cache timeouts.
    
+
    Cached recordset timestamp not saved in some scenarios. Fixed.
    
+
    1.10 19 May 2001
    
+
    Added caching. CacheExecute() and CacheSelectLimit().
+
    Added csv driver. See http://php.weblogs.com/ADODB_csv. 
+
    Fixed SelectLimit(), SELECT TOP not working under certain circumstances.
+
    Added better Frontbase support of MetaTypes() by Frank M. Kromann.
+
    1.01 24 April 2001
    
+
    Fixed SelectLimit bug.  not quoted properly.
+
    SelectLimit: SELECT TOP -1 * FROM TABLE not support by Microsoft. Fixed.
    
+
    GetMenu improved by glen.davies#cce.ac.nz to support multiple hilited items
    
+
    FetchNextObject() did not work with only 1 record returned. Fixed bug reported by $tim#orotech.net
    
+
    Fixed mysql field max_length problem. Fix suggested by Jim Nicholson (jnich#att.com)
    
+
    1.00 16 April 2001
    
+
    Given some brilliant suggestions on how to simplify ADOdb by akul. You no longer need to
+setup $ADODB_DIR yourself, and ADOLoadCode() is automatically called by ADONewConnection(), 
+simplifying the startup code.
    
+
    FetchNextObject() added. Suggested by Jakub Marecek. This makes FetchObject() obsolete, as
+this is more flexible and powerful.
    
+
    Misc fixes to SelectLimit() to support Access (top must follow distinct) and Fields() 
+in the array recordset. From Reinhard Balling.
    
+
    0.96 27 Mar 2001
    
+
    ADOConnection Close() did not return a value correctly. Thanks to akul#otamedia.com.
    
+
    When the horrible magic_quotes is enabled, back-slash () is changed to double-backslash (\).
+This doesn't make sense for Microsoft/Sybase databases. We fix this in qstr().
    
+
    Fixed Sybase date problem in UnixDate() thanks to Toni Tunkkari. Also fixed MSSQL problem
+in UnixDate() - thanks to milhouse31#hotmail.com.
    
+
    MoveNext() moved to leaf classes for speed in MySQL/PostgreSQL. 10-15% speedup.
    
+
    Added null handling in bindInputArray in Execute() -- Ron Baldwin suggestion.
    
+
    Fixed some option tags. Thanks to john#jrmstudios.com.
    
+
    0.95 13 Mar 2001
    
+
    Added postgres7 database driver which supports LIMIT and other version 7 stuff in the future.
    
+
    Added SelectLimit to ADOConnection to simulate PostgreSQL's "select * from table limit 10 offset 3".
+Added helper function GetArrayLimit() to ADORecordSet.
    
+
    Fixed mysql metacolumns bug. Thanks to Freek Dijkstra (phpeverywhere#macfreek.com).
    
+
    Also many PostgreSQL changes by Freek. He almost rewrote the whole PostgreSQL driver!
    
+
    Added fix to input parameters in Execute for non-strings by Ron Baldwin.
    
+
    Added new metatype, X for TeXt. Formerly, metatype B for Blob also included
+text fields. Now 'B' is for binary/image data. 'X' for textual data.
    
+
    Fixed $this->GetArray() in GetRows().
    
+
    Oracle and OCI8: 1st parameter is always blank -- now warns if it is filled.
    
+
    Now hasLimit and hasTop added to indicate whether 
+SELECT * FROM TABLE LIMIT 10 or SELECT TOP 10 * FROM TABLE are supported.
    
+
    0.94 04 Feb 2001
    
+
    Added ADORecordSet::GetRows() for compatibility with Microsoft ADO. Synonym for GetArray().
    
+
    Added new metatype 'R' to represent autoincrement numbers.
    
+
    Added ADORecordSet.FetchObject() to return a row as an object.
    
+
    Finally got a Linux box to test PostgreSql. Many fixes.
    
+
    Fixed copyright misspellings in 0.93.
    
+
    Fixed mssql MetaColumns type bug.
    
+
    Worked around odbc bug in PHP4 for sessions.
    
+
    Fixed many documentation bugs (affected_rows, metadatabases, qstr).
    
+
    Fixed MySQL timestamp format (removed comma).
    
+
    Interbase driver did not call ibase_pconnect(). Fixed.
    
+
    0.93 18 Jan 2002
    
+
    Fixed GetMenu bug.
    
+
    Simplified Interbase commit and rollback.
    
+
    Default behaviour on closing a connection is now to rollback all active transactions.
    
+
    Added field object handling for array recordset for future XML compatibility.
    
+
    Added arr2html() to convert array to html table.
    
+
    0.92 2 Jan 2002
    
+
    Interbase Commit and Rollback should be working again.
    
+
    Changed initialisation of ADORecordSet. This is internal and should not affect users. We
+are doing this to support cached recordsets in the future.
    
+
+
    Implemented ADORecordSet_array class. This allows you to simulate a database recordset
+with an array.
    
+
    Added UnixDate() and UnixTimeStamp() to ADORecordSet.
    
+
    0.91 21 Dec 2000
    
+
    Fixed ODBC so ErrorMsg() is working.
    
+
    Worked around ADO unrecognised null (0x1) value problem in COM.
    
+
    Added Sybase support for FetchField() type
    
+
    Removed debugging code and unneeded html from various files
    
+
    Changed to javadoc style comments to adodb.inc.php.
    
+
    Added maxsql as synonym for mysqlt
    
+
    Now ODBC downloads first 8K of blob by default
+
    0.90 15 Nov 2000
    
+
    Lots of testing of Microsoft ADO. Should be more stable now.
    
+
    Added $ADODB_COUNTREC. Set to false for high speed selects.
    
+
    Added Sybase support. Contributed by Toni Tunkkari (toni.tunkkari#finebyte.com). Bug in Sybase 
+  API: GetFields is unable to determine date types.
    
+
    Changed behaviour of RecordSet.GetMenu() to support size parameter (listbox) properly.
    
+
    Added emptyDate and emptyTimeStamp to RecordSet class that defines how to represent 
+  empty dates.
    
+
    Added MetaColumns($table) that returns an array of ADOFieldObject's listing 
+  the columns of a table.
    
+
    Added transaction support for PostgresSQL -- thanks to "Eric G. Werk" egw#netguide.dk.
    
+
    Added adodb-session.php for session support.
    
+
    0.80 30 Nov 2000
    
+
    Added support for charSet for interbase. Implemented MetaTables for most databases. 
+  PostgreSQL more extensively tested.
    
+
    0.71 22 Nov 2000
    
+
    Switched from using require_once to include/include_once for backward compatability with PHP 4.02 and earlier.
    
+
    0.70 15 Nov 2000
    
+
    Calls by reference have been removed (call_time_pass_reference=Off) to ensure compatibility with future versions of PHP, 
+except in Oracle 7 driver due to a bug in php_oracle.dll.
    
+
    PostgreSQL database driver contributed by Alberto Cerezal (acerezalp#dbnet.es). 
+
    
+
    Oci8 driver for Oracle 8 contributed by George Fourlanos (fou#infomap.gr).
    
+
    Added mysqlt database driver to support MySQL 3.23 which has transaction 
+ support. 
    
+
    Oracle default date format (DD-MON-YY) did not match ADOdb default date format (which is YYYY-MM-DD). Use ALTER SESSION to force the default date.
    
+
    Error message checking is now included in test suite.
    
+
    MoveNext() did not check EOF properly -- fixed.
    
+
    0.60 Nov 8 2000
    
+
    Fixed some constructor bugs in ODBC and ADO. Added ErrorNo function to ADOConnection 
+ class. 
    
+
    0.51 Oct 18 2000
    
+
    Fixed some interbase bugs.
    
+
    0.50 Oct 16 2000
    
+
    Interbase commit/rollback changed to be compatible with PHP 4.03. 
    
+
    CommitTrans( ) will now return true if transactions not supported. 
    
+
    Conversely RollbackTrans( ) will return false if transactions not supported. 
+
    
+
    0.46 Oct 12
    
+Many Oracle compatibility issues fixed. 
+
    0.40 Sept 26
    
+
    Many bug fixes
    
+
    Now Code for BeginTrans, CommitTrans and RollbackTrans is working. So is the Affected_Rows
+and Insert_ID. Added above functions to test.php.
    
+
    ADO type handling was busted in 0.30. Fixed.
    
+
    Generalised Move( ) so it works will all databases, including ODBC.
    
+
    0.30 Sept 18
    
+
    Renamed ADOLoadDB to ADOLoadCode. This is clearer.
    
+
    Added BeginTrans, CommitTrans and RollbackTrans functions.
    
+
    Added Affected_Rows() and Insert_ID(), _affectedrows() and _insertID(), ListTables(), 
+ ListDatabases(), ListColumns().
    
+
    Need to add New_ID() and hasInsertID and hasAffectedRows, autoCommit 
    
+
    0.20 Sept 12
    
+
    Added support for Microsoft's ADO.
    
+
    Added new field to ADORecordSet -- canSeek
    
+
    Added new parameter to _fetch($ignore_fields = false). Setting to true will 
+ not update fields array for faster performance.
    
+
    Added new field to ADORecordSet/ADOConnection -- dataProvider to indicate whether 
+ a class is derived from odbc or ado.
    
+
    Changed class ODBCFieldObject to ADOFieldObject -- not documented currently.
    
+
    Added benchmark.php and testdatabases.inc.php to the test suite.
    
+
    Added to ADORecordSet FastForward( ) for future high speed scrolling. Not documented.
    
+
    Realised that ADO's Move( ) uses relative positioning. ADOdb uses absolute. 
+
    
+
    0.10 Sept 9 2000
    
+
    First release
    
+
\ No newline at end of file
diff --git a/adodb/docs/readme.htm b/adodb/docs/readme.htm
new file mode 100644
index 0000000..4780cb7
--- /dev/null
+++ b/adodb/docs/readme.htm
@@ -0,0 +1,68 @@
+
+
+ADODB Manual
+
+
+	
+
+
+
    ADOdb Library for PHP
    
+
    ADOdb is a suite of database libraries that allow you to connect to multiple 
+	databases in a portable manner. Download from http://adodb.sourceforge.net/.
+
    • The ADOdb documentation has moved to docs-adodb.htm 
+	This allows you to query, update and insert records using a portable API.
+
    • The ADOdb data dictionary docs are at docs-datadict.htm. 
+	This allows you to create database tables and indexes in a portable manner.
+
    • The ADOdb database performance monitoring docs are at docs-perf.htm. 
+	This allows you to perform health checks, tune and monitor your database.
+
    • The ADOdb database-backed session docs are at docs-session.htm. 
+
    
+
    
+
    Installation
    
+Make sure you are running PHP4.0.4 or later. Unpack all the files into a directory accessible by your webserver.
+
    
+To test, try modifying some of the tutorial examples. Make sure you customize the connection settings correctly. You can debug using:
+
    +<?php
+include('adodb/adodb.inc.php');
+
+$db = ADONewConnection($driver); # eg. 'mysql' or 'oci8' 
+$db->debug = true;
+$db->Connect($server, $user, $password, $database);
+$rs = $db->Execute('select * from some_small_table');
+print "<pre>";
+print_r($rs->GetRows());
+print "</pre>";
+?>
+
    
+
    How are people using ADOdb
    
+Here are some examples of how people are using ADOdb: 
+
      
+	
    •  PhpLens is a commercial data grid component that allows 
+		both cool Web designers and serious unshaved programmers to develop and 
+		maintain databases on the Web easily. Developed by the author of ADOdb. 
+	
      • 
+	
    •  PHAkt: PHP Extension for DreamWeaver Ultradev allows 
+		you to script PHP in the popular Web page editor. Database handling provided 
+		by ADOdb. 
      • 
+	
    •  Analysis Console for Intrusion Databases (ACID): PHP-based 
+		analysis engine to search and process a database of security incidents 
+		generated by security-related software such as IDSes and firewalls (e.g. 
+		Snort, ipchains). By Roman Danyliw. 
      • 
+	
    •  PostNuke is a very popular free content management system 
+		and weblog system. It offers full CSS support, HTML 4.01 transitional 
+		compliance throughout, an advanced blocks system, and is fully multi-lingual 
+		enabled. 
      • 
+	
    •  EasyPublish CMS is another free content management system 
+		for managing information and integrated modules on your internet, intranet- 
+		and extranet-sites. From Norway. 
      • 
+	
    •  NOLA is a full featured accounting, inventory, and job 
+		tracking application. It is licensed under the GPL, and developed by Noguska. 
+	
      • 
+
    
+
+
diff --git a/adodb/docs/tips_portable_sql.htm b/adodb/docs/tips_portable_sql.htm
new file mode 100644
index 0000000..aa75069
--- /dev/null
+++ b/adodb/docs/tips_portable_sql.htm
@@ -0,0 +1,367 @@
+
+
+
+
+	Tips on Writing Portable SQL for Multiple Databases for PHP
+
+
+
+
    Tips on Writing Portable SQL  
    		
+ 
    
+  
    Updated 6 Oct 2006. Added OffsetDate example.
+  
    Updated 18 Sep 2003. Added Portable Native SQL section.
+
    
+
+ If you are writing an application that is used in multiple environments and 
+  operating systems, you need to plan to support multiple databases. This article 
+  is based on my experiences with multiple database systems, stretching from 4th 
+  Dimension in my Mac days, to the databases I currently use, which are: Oracle, 
+  FoxPro, Access, MS SQL Server and MySQL. Although most of the advice here applies 
+  to using SQL with Perl, Python and other programming languages, I will focus on PHP and how 
+  the ADOdb database abstraction library 
+  offers some solutions.
    
+
    Most database vendors practice product lock-in. The best or fastest way to 
+  do things is often implemented using proprietary extensions to SQL. This makes 
+  it extremely hard to write portable SQL code that performs well under all conditions. 
+  When the first ANSI committee got together in 1984 to standardize SQL, the database 
+  vendors had such different implementations that they could only agree on the 
+  core functionality of SQL. Many important application specific requirements 
+  were not standardized, and after so many years since the ANSI effort began, 
+  it looks as if much useful database functionality will never be standardized. 
+  Even though ANSI-92 SQL has codified much more, we still have to implement portability 
+  at the application level.
    
+
    Selects
    
+
    The SELECT statement has been standardized to a great degree. Nearly every 
+  database supports the following:
    
+
    SELECT [cols] FROM [tables]
    
+    [WHERE conditions]
    
+    [GROUP BY cols]
    
+    [HAVING conditions] 
    
+    [ORDER BY cols]
    
+
    But so many useful techniques can only be implemented by using proprietary 
+  extensions. For example, when writing SQL to retrieve the first 10 rows for 
+  paging, you could write...
    
+
+   
+	
+	
+  
+   
+	
+	
+  
+   
+	
+	
+  
+   
+	
+	
+  
+   
+	
+	
+  
+   
+	
+	
+  
+
    DatabaseSQL Syntax
    DB2select * from table fetch first 10 rows only
    Informixselect first 10 * from table
    Microsoft SQL Server and Accessselect top 10 * from table
    MySQL and PostgreSQLselect * from table limit 10
    Oracle 8iselect * from (select * from table) where rownum <= 10
    
+
    This feature of getting a subset of data is so useful that in the PHP class 
+  library ADOdb, we have a SelectLimit( ) function that allows you to hide the 
+  implementation details within a function that will rewrite your SQL for you:
    
+
    $connection->SelectLimit('select * from table', 10);
+
    
+
    Selects: Fetch Modes
    
+
    PHP allows you to retrieve database records as arrays. You can choose to have 
+  the arrays indexed by field name or number. However different low-level PHP 
+  database drivers are inconsistent in their indexing efforts. ADOdb allows you 
+  to determine your prefered mode. You set this by setting the variable $ADODB_FETCH_MODE 
+  to either of the constants ADODB_FETCH_NUM (for numeric indexes) or ADODB_FETCH_ASSOC 
+  (using field names as an associative index).
    
+
    The default behaviour of ADOdb varies depending on the database you are using. 
+  For consistency, set the fetch mode to either ADODB_FETCH_NUM (for speed) or 
+  ADODB_FETCH_ASSOC (for convenience) at the beginning of your code. 
    
+
    Selects: Counting Records
    
+
    Another problem with SELECTs is that some databases do not return the number 
+  of rows retrieved from a select statement. This is because the highest performance 
+  databases will return records to you even before the last record has been found. 
+
    
+
    In ADOdb, RecordCount( ) returns the number of rows returned, or will emulate 
+  it by buffering the rows and returning the count after all rows have been returned. 
+  This can be disabled for performance reasons when retrieving large recordsets 
+  by setting the global variable $ADODB_COUNTRECS = false. This variable is checked 
+  every time a query is executed, so you can selectively choose which recordsets 
+  to count.
    
+
    If you prefer to set $ADODB_COUNTRECS = false, ADOdb still has the PO_RecordCount( 
+  ) function. This will return the number of rows, or if it is not found, it will 
+  return an estimate using SELECT COUNT(*):
    
+
    $rs = $db->Execute("select * from table where state=$state");
+$numrows = $rs->PO_RecordCount('table', "state=$state");
    
+
    Selects: Locking 
    
+
    SELECT statements are commonly used to implement row-level locking of tables. 
+  Other databases such as Oracle, Interbase, PostgreSQL and MySQL with InnoDB 
+  do not require row-level locking because they use versioning to display data 
+  consistent with a specific point in time.
    
+
    Currently, I recommend encapsulating the row-level locking in a separate function, 
+  such as RowLock($table, $where):
    
+
    $connection->BeginTrans( );
+$connection->RowLock($table, $where); 
    
+
    # some operation
    
+
    if ($ok) $connection->CommitTrans( );
+else $connection->RollbackTrans( );
+
    
+
    Selects: Outer Joins
    
+
    Not all databases support outer joins. Furthermore the syntax for outer joins 
+  differs dramatically between database vendors. One portable (and possibly slower) 
+  method of implementing outer joins is using UNION.
    
+
    For example, an ANSI-92 left outer join between two tables t1 and t2 could 
+  look like:
    
+
    SELECT t1.col1, t1.col2, t2.cola 
      FROM t1 LEFT JOIN t2 ON t1.col = t2.col
    
+
    This can be emulated using:
    
+
    SELECT t1.col1, t1.col2, t2.cola FROM t1, t2 
    	   WHERE t1.col = t2.col 
+   UNION ALL
+SELECT col1, col2, null FROM t1 
    	   WHERE t1.col not in (select distinct col from t2)
+
    
+
    Since ADOdb 2.13, we provide some hints in the connection object as to legal 
+  join variations. This is still incomplete and sometimes depends on the database 
+  version you are using, but is useful as a general guideline:
    
+
    $conn->leftOuter: holds the 
+  operator used for left outer joins (eg. '*='), or false if not known or not 
+  available.
    
+  $conn->rightOuter: holds the 
+  operator used for right outer joins (eg '=*'), or false if not known or not 
+  available.
    
+  $conn->ansiOuter: boolean 
+  that if true means that ANSI-92 style outer joins are supported, or false if 
+  not known.
    
+
    Inserts 
    
+
    When you create records, you need to generate unique id's for each record. 
+  There are two common techniques: (1) auto-incrementing columns and (2) sequences. 
+
    
+
    Auto-incrementing columns are supported by MySQL, Sybase and Microsoft Access 
+  and SQL Server. However most other databases do not support this feature. So 
+  for portability, you have little choice but to use sequences. Sequences are 
+  special functions that return a unique incrementing number every time you call 
+  it, suitable to be used as database keys. In ADOdb, we use the GenID( ) function. 
+  It has takes a parameter, the sequence name. Different tables can have different 
+  sequences. 
    
+
    $id = $connection->GenID('sequence_name');
    $connection->Execute("insert into table (id, firstname, lastname) 
    			   values ($id, $firstname, $lastname)");
    
+
    For databases that do not support sequences natively, ADOdb emulates sequences 
+  by creating a table for every sequence.
    
+
    Binding
    
+
    Binding variables in an SQL statement is another tricky feature. Binding is 
+  useful because it allows pre-compilation of SQL. When inserting multiple records 
+  into a database in a loop, binding can offer a 50% (or greater) speedup. However 
+  many databases such as Access and MySQL do not support binding natively and 
+  there is some overhead in emulating binding. Furthermore, different databases 
+  (specificly Oracle!) implement binding differently. My recommendation is to 
+  use binding if your database queries are too slow, but make sure you are using 
+  a database that supports it like Oracle. 
    
+
    ADOdb supports portable Prepare/Execute with:
    
+
    $stmt = $db->Prepare('select * from customers where custid=? and state=?');
+$rs = $db->Execute($stmt, array($id,'New York'));
    
+
    Oracle uses named bind placeholders, not "?", so to support portable binding, we have Param() that generates 
+the correct placeholder (available since ADOdb 3.92):
+
    $sql = 'insert into table (col1,col2) values ('.$DB->Param('a').','.$DB->Param('b').')';
+# generates 'insert into table (col1,col2) values (?,?)'
+# or        'insert into table (col1,col2) values (:a,:b)'
+$stmt = $DB->Prepare($sql);
+$stmt = $DB->Execute($stmt,array('one','two'));
+
    
+
+
    Portable Native SQL
    
+
    ADOdb provides the following functions for portably generating SQL functions 
+  as strings to be merged into your SQL statements (some are only available since 
+  ADOdb 3.92): 
    
+
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+   
+    
+    
+  
+  
+    
+    
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
    FunctionDescription
    DBDate($date)Pass in a UNIX timestamp or ISO date and it will convert it to a date 
+      string formatted for INSERT/UPDATE
    DBTimeStamp($date)Pass in a UNIX timestamp or ISO date and it will convert it to a timestamp 
+      string formatted for INSERT/UPDATE
    SQLDate($date, $fmt)Portably generate a date formatted using $fmt mask, for use in SELECT 
+      statements.
    OffsetDate($date, $ndays)Portably generate a $date offset by $ndays.
    Concat($s1, $s2, ...)Portably concatenate strings. Alternatively, for mssql use mssqlpo driver, 
+      which allows || operator.
    IfNull($fld, $replaceNull)Returns a string that is the equivalent of MySQL IFNULL or Oracle NVL.
    Param($name)Generates bind placeholders, using ? or named conventions as appropriate.
    $db->sysDateProperty that holds the SQL function that returns today's date
    $db->sysTimeStampProperty that holds the SQL function that returns the current
+timestamp (date+time).
+
    $db->concat_operatorProperty that holds the concatenation operator
+
    $db->lengthProperty that holds the name of the SQL strlen function.
+
    $db->upperCaseProperty that holds the name of the SQL strtoupper function.
+
    $db->randomProperty that holds the SQL to generate a random number between 0.00 and 1.00.
+
    $db->substrProperty that holds the name of the SQL substring function.
+
    
+
      
    
+
    DDL and Tuning
    
+There are database design tools such as ERWin or Dezign that allow you to generate data definition language commands such as ALTER TABLE or CREATE INDEX from Entity-Relationship diagrams. 
+
    
+However if you prefer to use a PHP-based table creation scheme, adodb provides you with this feature. Here is the code to generate the SQL to create a table with: 
+
      
+	
    1.  Auto-increment primary key 'ID', 
      2. 
+	
    2. The person's 'NAME' VARCHAR(32) NOT NULL and defaults to '', 
      3. 
+	
    3. The date and time of record creation 'CREATED', 
      4. 
+	
    4.  The person's 'AGE', defaulting to 0, type NUMERIC(16). 
      5. 
+
    
+
    
+Also create a compound index consisting of 'NAME' and 'AGE': 
+
    +$datadict = NewDataDictionary($connection);
+$flds = " 
+  ID I AUTOINCREMENT PRIMARY,
+  NAME C(32) DEFAULT '' NOTNULL,
+  CREATED T DEFTIMESTAMP,
+  AGE N(16) DEFAULT 0
+";
+$sql1 = $datadict->CreateTableSQL('tabname', $flds);
+$sql2 = $datadict->CreateIndexSQL('idx_name_age', 'tabname', 'NAME,AGE');
+
    
+
+
    Data Types
    
+
    Stick to a few data types that are available in most databases. Char, varchar 
+  and numeric/number are supported by most databases. Most other data types (including 
+  integer, boolean and float) cannot be relied on being available. I recommend 
+  using char(1) or number(1) to hold booleans. 
    
+
    Different databases have different ways of representing dates and timestamps/datetime. 
+  ADOdb attempts to display all dates in ISO (YYYY-MM-DD) format. ADOdb also provides 
+  DBDate( ) and DBTimeStamp( ) to convert dates to formats that are acceptable 
+  to that database. Both functions accept Unix integer timestamps and date strings 
+  in ISO format.
    
+
    $date1 = $connection->DBDate(time( ));
    $date2 = $connection->DBTimeStamp('2002-02-23 13:03:33');
    
+
    We also provide functions to convert database dates to Unix timestamps:
    
+
    $unixts = $recordset->UnixDate('#2002-02-30#'); # MS Access date =gt; unix timestamp
    
+
    For date calculations, we have OffsetDate which allows you to calculate dates such as yesterday and next week in a RDBMS independant fashion. For example, if we want to set a field to 6 hour from now, use:
+
    +$sql = 'update table set dtimefld='.$db->OffsetDate($db->sysTimeStamp, 6/24).' where ...';
+
    
+
    The maximum length of a char/varchar field is also database specific. You can 
+  only assume that field lengths of up to 250 characters are supported. This is 
+  normally impractical for web based forum or content management systems. You 
+  will need to be familiar with how databases handle large objects (LOBs). ADOdb 
+  implements two functions, UpdateBlob( ) and UpdateClob( ) that allow you to 
+  update fields holding Binary Large Objects (eg. pictures) and Character Large 
+  Objects (eg. HTML articles):
    
+
    # for oracle 
+$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1,empty_blob())'); 
+$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1'); 
+   
+# non-oracle databases
+$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); 
+$conn->UpdateBlob('blobtable','blobcol',$blobvalue,'id=1');
+
    
+
    Null handling is another area where differences can occur. This is a mine-field, 
+  because 3-value logic is tricky.
+
    In general, I avoid using nulls except for dates and default all my numeric 
+  and character fields to 0 or the empty string. This maintains consistency with 
+  PHP, where empty strings and zero are treated as equivalent, and avoids SQL 
+  ambiguities when you use the ANY and EXISTS operators. However if your database 
+  has significant amounts of missing or unknown data, using nulls might be a good 
+  idea. 
+  
    
+  ADOdb also supports a portable IfNull function, so you can define what to display
+  if the field contains a null.
+
    Stored Procedures
    
+
    Stored procedures are another problem area. Some databases allow recordsets 
+  to be returned in a stored procedure (Microsoft SQL Server and Sybase), and 
+  others only allow output parameters to be returned. Stored procedures sometimes 
+  need to be wrapped in special syntax. For example, Oracle requires such code 
+  to be wrapped in an anonymous block with BEGIN and END. Also internal sql operators 
+  and functions such as +, ||, TRIM( ), SUBSTR( ) or INSTR( ) vary between vendors. 
+
    
+
    An example of how to call a stored procedure with 2 parameters and 1 return 
+  value follows:
    
+
    	switch ($db->databaseType) {
+	case 'mssql':
+	  $sql = 'SP_RUNSOMETHING'; break;
+	case 'oci8':
+	  $sql = 
+	  "declare RETVAL integer;begin :RETVAL := SP_RUNSOMETHING(:myid,:group);end;";
+	  break;
+	default:
+	  die('Unsupported feature');
+	}
+	# @RETVAL = SP_RUNSOMETHING @myid,@group
+	$stmt = $db->PrepareSP($sql);	
    	$db->Parameter($stmt,$id,'myid'); 
+	$db->Parameter($stmt,$group,'group');
+	# true indicates output parameter
    	    $db->Parameter($stmt,$ret,'RETVAL',true); 
+	$db->Execute($stmt); 
    
+
    As you can see, the ADOdb API is the same for both databases. But the stored 
+  procedure SQL syntax is quite different between databases and is not portable, 
+  so be forewarned! However sometimes you have little choice as some systems only 
+  allow data to be accessed via stored procedures. This is when the ultimate portability 
+  solution might be the only solution: treating portable SQL as a localization 
+  exercise...
    
+
    SQL as a Localization Exercise
    
+
     In general to provide real portability, you will have to treat SQL coding 
+  as a localization exercise. In PHP, it has become common to define separate 
+  language files for English, Russian, Korean, etc. Similarly, I would suggest 
+  you have separate Sybase, Intebase, MySQL, etc files, and conditionally include 
+  the SQL based on the database. For example, each MySQL SQL statement would be 
+  stored in a separate variable, in a file called 'mysql-lang.inc.php'.
    
+
    $sqlGetPassword = 'select password from users where userid=%s';
+$sqlSearchKeyword = quot;SELECT * FROM articles WHERE match (title,body) against (%s)";
    
+
    In our main PHP file:
    
+
    # define which database to load...
+$database = 'mysql';
+include_once("$database-lang.inc.php");
+
+$db = NewADOConnection($database);
+$db->PConnect(...) or die('Failed to connect to database');
+
+# search for a keyword $word
+$rs = $db->Execute(sprintf($sqlSearchKeyWord,$db->qstr($word)));
    
+
    Note that we quote the $word variable using the qstr( ) function. This is because 
+  each database quotes strings using different conventions.
    
+
    
+
    Final Thoughts
    
+
    The best way to ensure that you have portable SQL is to have your data tables designed using 
+sound principles. Learn the theory of normalization and entity-relationship diagrams and model 
+your data carefully. Understand how joins and indexes work and how they are used to tune performance.
+
     Visit the following page for more references on database theory and vendors: 
+  http://php.weblogs.com/sql_tutorial. 
+  Also read this article on Optimizing PHP.
+
    
+(c) 2002-2003 John Lim.
+
+
+
diff --git a/adodb/docs/tute.htm b/adodb/docs/tute.htm
new file mode 100644
index 0000000..408ba75
--- /dev/null
+++ b/adodb/docs/tute.htm
@@ -0,0 +1,290 @@
+
+
+
+
+	Tutorial: Moving from MySQL to ADODB
+
+
+
+
    Tutorial: Moving from MySQL to ADODB
    
+
+
    		You say eether and I say eyether, 
+		You say neether and I say nyther; 
+		Eether, eyether, neether, nyther - 
+		Let's call the whole thing off ! 
+
    
+		You like potato and I like po-tah-to, 
+		You like tomato and I like to-mah-to; 
+		Potato, po-tah-to, tomato, to-mah-to - 
+		Let's call the whole thing off ! 
+
    
+
    I love this song, especially the version with Louis Armstrong and Ella singing 
+  duet. It is all about how hard it is for two people in love to be compatible 
+  with each other. It's about compromise and finding a common ground, and that's 
+  what this article is all about. 
+
    PHP is all about creating dynamic web-sites with the least fuss and the most 
+  fun. To create these websites we need to use databases to retrieve login information, 
+  to splash dynamic news onto the web page and store forum postings. So let's 
+  say we were using the popular MySQL database for this. Your company has done 
+  such a fantastic job that the Web site is more popular than your wildest dreams. 
+  You find that MySQL cannot scale to handle the workload; time to switch databases. 
+
     Unfortunately in PHP every database is accessed slightly differently. To connect 
+  to MySQL, you would use mysql_connect(); when you decide to upgrade to 
+  Oracle or Microsoft SQL Server, you would use ocilogon() or mssql_connect() 
+  respectively. What is worse is that the parameters you use for the different 
+  connect functions are different also.. One database says po-tato, the other 
+  database says pota-to. Oh-oh. 
+
    Let's NOT call the whole thing off
    
+
    A database wrapper library such as ADODB comes in handy when you need to ensure portability. It provides 
+  you with a common API to communicate with any supported database so you don't have to call things off. 
    
+
+
    ADODB stands for Active Data Objects DataBase (sorry computer guys are sometimes 
+  not very original). ADODB currently supports MySQL, PostgreSQL, Oracle, Interbase, 
+  Microsoft SQL Server, Access, FoxPro, Sybase, ODBC and ADO. You can download 
+  ADODB from http://php.weblogs.com/adodb.
+
    MySQL Example
    
+
    The most common database used with PHP is MySQL, so I guess you should be familiar 
+  with the following code. It connects to a MySQL server at localhost, 
+  database mydb, and executes an SQL select statement. The results are 
+  printed, one line per row. 
+
    $db = mysql_connect("localhost", "root", "password");
+mysql_select_db("mydb",$db);
+$result = mysql_query("SELECT * FROM employees",$db);
+if ($result === false) die("failed"); 
+while ($fields = mysql_fetch_row($result)) {
+ for ($i=0, $max=sizeof($fields); $i < $max; $i++) {
+		print $fields[$i].' ';
+ }
+ print "<br>\n";
+} 
+
    
+
    The above code has been color-coded by section. The first section is the connection 
+  phase. The second is the execution of the SQL, and the last section is displaying 
+  the fields. The while loop scans the rows of the result, while the for 
+  loop scans the fields in one row.
    
+
    Here is the equivalent code in ADODB
    
+
     include("adodb.inc.php");
+ $db = NewADOConnection('mysql');
+ $db->Connect("localhost", "root", "password", "mydb");
+ $result = $db->Execute("SELECT * FROM employees");
+ if ($result === false) die("failed");  
+ while (!$result->EOF) {
+	for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
+		   print $result->fields[$i].' ';
+	$result->MoveNext();
+	print "<br>\n";
+ } 
    
+
    
+
    Now porting to Oracle is as simple as changing the second line to NewADOConnection('oracle'). 
+  Let's walk through the code...
    
+
    Connecting to the Database
    
+
    
+
    include("adodb.inc.php");
+$db = NewADOConnection('mysql');
+$db->Connect("localhost", "root", "password", "mydb");
    
+
    The connection code is a bit more sophisticated than MySQL's because our needs 
+  are more sophisticated. In ADODB, we use an object-oriented approach to managing 
+  the complexity of handling multiple databases. We have different classes to 
+  handle different databases. If you aren't familiar with object-oriented programing, 
+  don't worry -- the complexity is all hidden away in the NewADOConnection() 
+  function.
    
+
    To conserve memory, we only load the PHP code specific to the database you 
+  are connecting to. We do this by calling NewADOConnection(databasedriver). 
+  Legal database drivers include mysql, mssql, oracle, oci8, postgres, sybase, 
+  vfp, access, ibase and many others.
    
+
    Then we create a new instance of the connection class by calling NewADOConnection(). 
+  Finally we connect to the database using $db->Connect(). 
    
+
    Executing the SQL
    
+
    $result = $db->Execute("SELECT * 
+  FROM employees");
    
+  if ($result === false) die("failed")    ; 
+  
    
+
    
+
    Sending the SQL statement to the server is straight forward. Execute() will 
+  return a recordset object on successful execution. You should check $result 
+  as we do above.
+
    An issue that confuses beginners is the fact that we have two types of objects 
+  in ADODB, the connection object and the recordset object. When do we use each?
+
    The connection object ($db) is responsible for connecting to the database, 
+  formatting your SQL and querying the database server. The recordset object ($result) 
+  is responsible for retrieving the results and formatting the reply as text or 
+  as an array.
+
    The only thing I need to add is that ADODB provides several helper functions 
+  for making INSERT and UPDATE statements easier, which we will cover in the Advanced 
+  section. 
+
    Retrieving the Data
    
+
    
+
    while (!$result->EOF) {
+   for ($i=0, $max=$result->FieldCount(); $i < $max; $i++)
+	   print $result->fields[$i].' ';
+   $result->MoveNext();
+   print "<br>\n";
+}
    
+
    The paradigm for getting the data is that it's like reading a file. For every 
+  line, we check first whether we have reached the end-of-file (EOF). While not 
+  end-of-file, loop through each field in the row. Then move to the next line 
+  (MoveNext) and repeat. 
+
    The $result->fields[] array is generated by the PHP database 
+  extension. Some database extensions do not index the array by field name. 
+  To force indexing by name - that is associative arrays - 
+  use the $ADODB_FETCH_MODE global variable. 
+
    +	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$rs1 = $db->Execute('select * from table');
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs2 = $db->Execute('select * from table');
+	print_r($rs1->fields); // shows array([0]=>'v0',[1] =>'v1')
+	print_r($rs2->fields); // shows array(['col1']=>'v0',['col2'] =>'v1')
+
    
+
    
+As you can see in the above example, both recordsets store and use different fetch modes
+based on the $ADODB_FETCH_MODE setting when the recordset was created by Execute().
    
+
    ADOConnection
    
+
    Object that performs the connection to the database, executes SQL statements 
+  and has a set of utility functions for standardising the format of SQL statements 
+  for issues such as concatenation and date formats.
    
+  
+
    Other Useful Functions
    
+
    $recordset->Move($pos) scrolls to that particular row. ADODB supports forward 
+  scrolling for all databases. Some databases will not support backwards scrolling. 
+  This is normally not a problem as you can always cache records to simulate backwards 
+  scrolling. 
+
    $recordset->RecordCount() returns the number of records accessed by the 
+  SQL statement. Some databases will return -1 because it is not supported. 
+
    $recordset->GetArray() returns the result as an array. 
+
    rs2html($recordset) is a function that is generates a HTML table based on the 
+  $recordset passed to it. An example with the relevant lines in bold:
+
       include('adodb.inc.php'); 
+   include('tohtml.inc.php'); /* includes the rs2html function */
+   $conn = ADONewConnection('mysql'); 
+   $conn->PConnect('localhost','userid','password','database');
+   $rs = $conn->Execute('select * from table');
+   rs2html($rs); /* recordset to html table */ 
    
+
    There are many other helper functions that are listed in the documentation available at http://php.weblogs.com/adodb_manual. 
+
    Advanced Material
    
+
    Inserts and Updates 
    
+
    Let's say you want to insert the following data into a database. 
+
    ID = 3
    
+  TheDate=mktime(0,0,0,8,31,2001) /* 31st August 2001 */
    
+  Note= sugar why don't we call it off 
+
    When you move to another database, your insert might no longer work.
    
+
    The first problem is that each database has a different default date format. 
+  MySQL expects YYYY-MM-DD format, while other databases have different defaults. 
+  ADODB has a function called DBDate() that addresses this issue by converting 
+  converting the date to the correct format.
    
+
    The next problem is that the don't in the Note needs to be quoted. In 
+  MySQL, we use don\'t but in some other databases (Sybase, Access, Microsoft 
+  SQL Server) we use don''t. The qstr() function addresses this issue.
    
+
    So how do we use the functions? Like this:
    
+
    $sql = "INSERT INTO table (id, thedate,note) values (" 
+   . $ID . ','
+   . $db->DBDate($TheDate) .','
+   . $db->qstr($Note).")";
+$db->Execute($sql);
    
+
    ADODB also supports $connection->Affected_Rows() (returns the 
+  number of rows affected by last update or delete) and $recordset->Insert_ID() 
+  (returns last autoincrement number generated by an insert statement). Be forewarned 
+  that not all databases support the two functions.
    
+
    
+
    MetaTypes
    
+
    You can find out more information about each of the fields (I use the words 
+  fields and columns interchangebly) you are selecting by calling the recordset 
+  method FetchField($fieldoffset). This will return an object with 
+  3 properties: name, type and max_length. 
+
    For example:
    
+
    $recordset = $conn->Execute("select adate from table");
    $f0 = $recordset->FetchField(0);
+
    
+
    Then $f0->name will hold 'adata', $f0->type 
+  will be set to 'date'. If the max_length is unknown, it will be set to 
+  -1. 
+
    One problem with handling different databases is that each database often calls 
+  the same type by a different name. For example a timestamp type is called 
+  datetime in one database and time in another. So ADODB has a special 
+  MetaType($type, $max_length) function that standardises the types 
+  to the following: 
+
    C: character and varchar types
    
+  X: text or long character (eg. more than 255 bytes wide).
    
+  B: blob or binary image
    
+  D: date
    
+  T: timestamp
    
+  L: logical (boolean)
    
+  I: integer
    
+  N: numeric (float, double, money) 
+
    In the above date example, 
+
    $recordset = $conn->Execute("select adate from table");
    
+  $f0 = $recordset->FetchField(0);
    
+  $type = $recordset->MetaType($f0->type, $f0->max_length);
    
+  print $type; /* should print 'D'     */
+
     
+
    Select Limit and Top Support 
+
    ADODB has a function called $connection->SelectLimit($sql,$nrows,$offset) that allows
+you to retrieve a subset of the recordset. This will take advantage of native
+SELECT TOP on Microsoft products and SELECT ... LIMIT with PostgreSQL and MySQL, and
+emulated if the database does not support it.
+
    Caching Support 
+
    ADODB allows you to cache recordsets in your file system, and only requery the database
+server after a certain timeout period with $connection->CacheExecute($secs2cache,$sql) and 
+$connection->CacheSelectLimit($secs2cache,$sql,$nrows,$offset).
+
    PHP4 Session Handler Support 
+
    ADODB also supports PHP4 session handlers. You can store your session variables 
+  in a database for true scalability using ADODB. For further information, visit 
+  http://php.weblogs.com/adodb-sessions
+
    Commercial Use Encouraged
    
+
    If you plan to write commercial PHP applications that you want to resell, you should consider ADODB. It has been released using the lesser GPL, which means you can legally include it in commercial applications, while keeping your code proprietary. Commercial use of ADODB is strongly encouraged! We are using it internally for this reason.
    
+
+
    Conclusion
    
+
    As a thank you for finishing this article, here are the complete lyrics for 
+  let's call the whole thing off.
    
+  
    
+
    +   Refrain 
+
    
+		You say eether and I say eyether, 
+		You say neether and I say nyther; 
+		Eether, eyether, neether, nyther - 
+		Let's call the whole thing off ! 
+
    
+		You like potato and I like po-tah-to, 
+		You like tomato and I like to-mah-to; 
+		Potato, po-tah-to, tomato, to-mah-to - 
+		Let's call the whole thing off ! 
+
    
+But oh, if we call the whole thing off, then we must part. 
+And oh, if we ever part, then that might break my heart. 
+
    
+		So, if you like pajamas and I like pa-jah-mas, 
+		I'll wear pajamas and give up pa-jah-mas. 
+		For we know we 
+		Need each other, so we 
+		Better call the calling off off. 
+		Let's call the whole thing off ! 
+
    
+   Second Refrain 
+
    
+		You say laughter and I say lawfter, 
+		You say after and I say awfter; 
+		Laughter, lawfter, after, awfter - 
+		Let's call the whole thing off ! 
+
    
+		You like vanilla and I like vanella, 
+		You, sa's'parilla and I sa's'parella; 
+		Vanilla, vanella, choc'late, strawb'ry - 
+		Let's call the whole thing off ! 
+
    
+But oh, if we call the whole thing off, then we must part. 
+And oh, if we ever part, then that might break my heart. 
+
    
+		So, if you go for oysters and I go for ersters, 
+		I'll order oysters and cancel the ersters. 
+		For we know we 
+		Need each other, so we 
+		Better call the calling off off. 
+		Let's call the whole thing off ! 
+  
    
+
    Song and lyrics by George and Ira Gershwin, introduced by Fred Astaire and Ginger Rogers
+in the film "Shall We Dance?"  
    
+
    
+(c)2001-2002 John Lim.
+
+
+
diff --git a/adodb/drivers/adodb-access.inc.php b/adodb/drivers/adodb-access.inc.php
new file mode 100644
index 0000000..ef94e9b
--- /dev/null
+++ b/adodb/drivers/adodb-access.inc.php
@@ -0,0 +1,87 @@
+ADODB_odbc();
+	}
+	
+	function Time()
+	{
+		return time();
+	}
+	
+	function BeginTrans() { return false;}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " IIF(IsNull($field), $ifNull, $field) "; // if Access
+	}
+/*
+	function MetaTables()
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = odbc_tables($this->_connectionID);
+		$rs = new ADORecordSet_odbc($qid);
+		$ADODB_FETCH_MODE = $savem;
+		if (!$rs) return false;
+		
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		
+		$arr = $rs->GetArray();
+		//print_pre($arr);
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][2] && $arr[$i][3] != 'SYSTEM TABLE')
+				$arr2[] = $arr[$i][2];
+		}
+		return $arr2;
+	}*/
+}
+
+ 
+class  ADORecordSet_access extends ADORecordSet_odbc {	
+	
+	var $databaseType = "access";		
+	
+	function ADORecordSet_access($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbc($id,$mode);
+	}
+}// class
+} 
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-ado.inc.php b/adodb/drivers/adodb-ado.inc.php
new file mode 100644
index 0000000..671e858
--- /dev/null
+++ b/adodb/drivers/adodb-ado.inc.php
@@ -0,0 +1,660 @@
+_affectedRows = new VARIANT;
+	}
+
+	function ServerInfo()
+	{
+		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
+		return array('description' => $desc, 'version' => '');
+	}
+	
+	function _affectedrows()
+	{
+		if (PHP_VERSION >= 5) return $this->_affectedRows;
+		
+		return $this->_affectedRows->value;
+	}
+	
+	// you can also pass a connection string like this:
+	//
+	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
+	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
+	{
+		$u = 'UID';
+		$p = 'PWD';
+	
+		if (!empty($this->charPage))
+			$dbc = new COM('ADODB.Connection',null,$this->charPage);
+		else
+			$dbc = new COM('ADODB.Connection');
+			
+		if (! $dbc) return false;
+
+		/* special support if provider is mssql or access */
+		if ($argProvider=='mssql') {
+			$u = 'User Id';  //User parameter name for OLEDB
+			$p = 'Password'; 
+			$argProvider = "SQLOLEDB"; // SQL Server Provider
+			
+			// not yet
+			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
+			
+			//use trusted conection for SQL if username not specified
+			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
+		} else if ($argProvider=='access')
+			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
+		
+		if ($argProvider) $dbc->Provider = $argProvider;	
+		
+		if ($argUsername) $argHostname .= ";$u=$argUsername";
+		if ($argPassword)$argHostname .= ";$p=$argPassword";
+		
+		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
    \n version=$dbc->version");
+		// @ added below for php 4.0.1 and earlier
+		@$dbc->Open((string) $argHostname);
+		
+		$this->_connectionID = $dbc;
+		
+		$dbc->CursorLocation = $this->_cursor_location;
+		return  $dbc->State > 0;
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
+	{
+		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
+	}	
+	
+/*
+	adSchemaCatalogs	= 1,
+	adSchemaCharacterSets	= 2,
+	adSchemaCollations	= 3,
+	adSchemaColumns	= 4,
+	adSchemaCheckConstraints	= 5,
+	adSchemaConstraintColumnUsage	= 6,
+	adSchemaConstraintTableUsage	= 7,
+	adSchemaKeyColumnUsage	= 8,
+	adSchemaReferentialContraints	= 9,
+	adSchemaTableConstraints	= 10,
+	adSchemaColumnsDomainUsage	= 11,
+	adSchemaIndexes	= 12,
+	adSchemaColumnPrivileges	= 13,
+	adSchemaTablePrivileges	= 14,
+	adSchemaUsagePrivileges	= 15,
+	adSchemaProcedures	= 16,
+	adSchemaSchemata	= 17,
+	adSchemaSQLLanguages	= 18,
+	adSchemaStatistics	= 19,
+	adSchemaTables	= 20,
+	adSchemaTranslations	= 21,
+	adSchemaProviderTypes	= 22,
+	adSchemaViews	= 23,
+	adSchemaViewColumnUsage	= 24,
+	adSchemaViewTableUsage	= 25,
+	adSchemaProcedureParameters	= 26,
+	adSchemaForeignKeys	= 27,
+	adSchemaPrimaryKeys	= 28,
+	adSchemaProcedureColumns	= 29,
+	adSchemaDBInfoKeywords	= 30,
+	adSchemaDBInfoLiterals	= 31,
+	adSchemaCubes	= 32,
+	adSchemaDimensions	= 33,
+	adSchemaHierarchies	= 34,
+	adSchemaLevels	= 35,
+	adSchemaMeasures	= 36,
+	adSchemaProperties	= 37,
+	adSchemaMembers	= 38
+
+*/
+	
+	function MetaTables()
+	{
+		$arr= array();
+		$dbc = $this->_connectionID;
+		
+		$adors=@$dbc->OpenSchema(20);//tables
+		if ($adors){
+			$f = $adors->Fields(2);//table/view name
+			$t = $adors->Fields(3);//table type
+			while (!$adors->EOF){
+				$tt=substr($t->value,0,6);
+				if ($tt!='SYSTEM' && $tt !='ACCESS')
+					$arr[]=$f->value;
+				//print $f->value . ' ' . $t->value.'
    ';
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		
+		return $arr;
+	}
+	
+	function MetaColumns($table, $normalize=true)
+	{
+		$table = strtoupper($table);
+		$arr = array();
+		$dbc = $this->_connectionID;
+		
+		$adors=@$dbc->OpenSchema(4);//tables
+	
+		if ($adors){
+			$t = $adors->Fields(2);//table/view name
+			while (!$adors->EOF){
+				
+				
+				if (strtoupper($t->Value) == $table) {
+				
+					$fld = new ADOFieldObject();
+					$c = $adors->Fields(3);
+					$fld->name = $c->Value;
+					$fld->type = 'CHAR'; // cannot discover type in ADO!
+					$fld->max_length = -1;
+					$arr[strtoupper($fld->name)]=$fld;
+				}
+		
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		$false = false;
+		return empty($arr) ? $false : $arr;
+	}
+	
+
+
+	
+	/* returns queryID or false */
+	function _query($sql,$inputarr=false) 
+	{
+		
+		$dbc = $this->_connectionID;
+		$false = false;
+		
+	//	return rs	
+		if ($inputarr) {
+			
+			if (!empty($this->charPage))
+				$oCmd = new COM('ADODB.Command',null,$this->charPage);
+			else
+				$oCmd = new COM('ADODB.Command');
+			$oCmd->ActiveConnection = $dbc;
+			$oCmd->CommandText = $sql;
+			$oCmd->CommandType = 1;
+
+      // Map by http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ado270/htm/mdmthcreateparam.asp
+      // Check issue http://bugs.php.net/bug.php?id=40664 !!!
+			while(list(, $val) = each($inputarr)) {
+				$type = gettype($val);
+				$len=strlen($val);
+				if ($type == 'boolean')
+					$this->adoParameterType = 11;
+				else if ($type == 'integer')
+					$this->adoParameterType = 3;
+				else if ($type == 'double')
+					$this->adoParameterType = 5;
+				elseif ($type == 'string')
+					$this->adoParameterType = 202;
+				else if (($val === null) || (!defined($val)))
+					$len=1;
+				else
+					$this->adoParameterType = 130;
+				
+				// name, type, direction 1 = input, len,
+        		$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
+
+				$oCmd->Parameters->Append($p);
+			}
+			$p = false;
+			$rs = $oCmd->Execute();
+			$e = $dbc->Errors;
+			if ($dbc->Errors->Count > 0) return $false;
+			return $rs;
+		}
+		
+		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
+
+		if ($dbc->Errors->Count > 0) return $false;
+		if (! $rs) return $false;
+		
+		if ($rs->State == 0) {
+			$true = true;
+			return $true; // 0 = adStateClosed means no records returned
+		}
+		return $rs;
+	}
+
+	
+	function BeginTrans() 
+	{ 
+		if ($this->transOff) return true;
+		
+		if (isset($this->_thisTransactions))
+			if (!$this->_thisTransactions) return false;
+		else {
+			$o = $this->_connectionID->Properties("Transaction DDL");
+			$this->_thisTransactions = $o ? true : false;
+			if (!$o) return false;
+		}
+		@$this->_connectionID->BeginTrans();
+		$this->transCnt += 1;
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transOff) return true;
+		
+		@$this->_connectionID->CommitTrans();
+		if ($this->transCnt) @$this->transCnt -= 1;
+		return true;
+	}
+	function RollbackTrans() {
+		if ($this->transOff) return true;
+		@$this->_connectionID->RollbackTrans();
+		if ($this->transCnt) @$this->transCnt -= 1;
+		return true;
+	}
+	
+	/*	Returns: the last error message from previous database operation	*/	
+
+	function ErrorMsg() 
+	{
+		if (!$this->_connectionID) return "No connection established";
+		$errc = $this->_connectionID->Errors;
+		if (!$errc) return "No Errors object found";
+		if ($errc->Count == 0) return '';
+		$err = $errc->Item($errc->Count-1);
+		return $err->Description;
+	}
+	
+	function ErrorNo() 
+	{
+		$errc = $this->_connectionID->Errors;
+		if ($errc->Count == 0) return 0;
+		$err = $errc->Item($errc->Count-1);
+		return $err->NativeError;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		if ($this->_connectionID) $this->_connectionID->Close();
+		$this->_connectionID = false;
+		return true;
+	}
+	
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_ado extends ADORecordSet {	
+	
+	var $bind = false;
+	var $databaseType = "ado";	
+	var $dataProvider = "ado";	
+	var $_tarr = false; // caches the types
+	var $_flds; // and field objects
+	var $canSeek = true;
+  	var $hideErrors = true;
+		  
+	function ADORecordSet_ado($id,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		return $this->ADORecordSet($id,$mode);
+	}
+
+
+	// returns the field object
+	function FetchField($fieldOffset = -1) {
+		$off=$fieldOffset+1; // offsets begin at 1
+		
+		$o= new ADOFieldObject();
+		$rs = $this->_queryID;
+		$f = $rs->Fields($fieldOffset);
+		$o->name = $f->Name;
+		$t = $f->Type;
+		$o->type = $this->MetaType($t);
+		$o->max_length = $f->DefinedSize;
+		$o->ado_type = $t;	
+
+		//print "off=$off name=$o->name type=$o->type len=$o->max_length
    ";
+		return $o;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+		
+	function _initrs()
+	{
+		$rs = $this->_queryID;
+		$this->_numOfRows = $rs->RecordCount;
+		
+		$f = $rs->Fields;
+		$this->_numOfFields = $f->Count;
+	}
+	
+	
+	 // should only be used to move forward as we normally use forward-only cursors
+	function _seek($row)
+	{
+	   $rs = $this->_queryID; 
+		// absoluteposition doesn't work -- my maths is wrong ?
+		//	$rs->AbsolutePosition->$row-2;
+		//	return true;
+		if ($this->_currentRow > $row) return false;
+		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
+		return true;
+	}
+	
+/*
+	OLEDB types
+	
+	 enum DBTYPEENUM
+	{	DBTYPE_EMPTY	= 0,
+	DBTYPE_NULL	= 1,
+	DBTYPE_I2	= 2,
+	DBTYPE_I4	= 3,
+	DBTYPE_R4	= 4,
+	DBTYPE_R8	= 5,
+	DBTYPE_CY	= 6,
+	DBTYPE_DATE	= 7,
+	DBTYPE_BSTR	= 8,
+	DBTYPE_IDISPATCH	= 9,
+	DBTYPE_ERROR	= 10,
+	DBTYPE_BOOL	= 11,
+	DBTYPE_VARIANT	= 12,
+	DBTYPE_IUNKNOWN	= 13,
+	DBTYPE_DECIMAL	= 14,
+	DBTYPE_UI1	= 17,
+	DBTYPE_ARRAY	= 0x2000,
+	DBTYPE_BYREF	= 0x4000,
+	DBTYPE_I1	= 16,
+	DBTYPE_UI2	= 18,
+	DBTYPE_UI4	= 19,
+	DBTYPE_I8	= 20,
+	DBTYPE_UI8	= 21,
+	DBTYPE_GUID	= 72,
+	DBTYPE_VECTOR	= 0x1000,
+	DBTYPE_RESERVED	= 0x8000,
+	DBTYPE_BYTES	= 128,
+	DBTYPE_STR	= 129,
+	DBTYPE_WSTR	= 130,
+	DBTYPE_NUMERIC	= 131,
+	DBTYPE_UDT	= 132,
+	DBTYPE_DBDATE	= 133,
+	DBTYPE_DBTIME	= 134,
+	DBTYPE_DBTIMESTAMP	= 135
+	
+	ADO Types
+	
+   	adEmpty	= 0,
+	adTinyInt	= 16,
+	adSmallInt	= 2,
+	adInteger	= 3,
+	adBigInt	= 20,
+	adUnsignedTinyInt	= 17,
+	adUnsignedSmallInt	= 18,
+	adUnsignedInt	= 19,
+	adUnsignedBigInt	= 21,
+	adSingle	= 4,
+	adDouble	= 5,
+	adCurrency	= 6,
+	adDecimal	= 14,
+	adNumeric	= 131,
+	adBoolean	= 11,
+	adError	= 10,
+	adUserDefined	= 132,
+	adVariant	= 12,
+	adIDispatch	= 9,
+	adIUnknown	= 13,	
+	adGUID	= 72,
+	adDate	= 7,
+	adDBDate	= 133,
+	adDBTime	= 134,
+	adDBTimeStamp	= 135,
+	adBSTR	= 8,
+	adChar	= 129,
+	adVarChar	= 200,
+	adLongVarChar	= 201,
+	adWChar	= 130,
+	adVarWChar	= 202,
+	adLongVarWChar	= 203,
+	adBinary	= 128,
+	adVarBinary	= 204,
+	adLongVarBinary	= 205,
+	adChapter	= 136,
+	adFileTime	= 64,
+	adDBFileTime	= 137,
+	adPropVariant	= 138,
+	adVarNumeric	= 139
+*/
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		if (!is_numeric($t)) return $t;
+		
+		switch ($t) {
+		case 0:
+		case 12: // variant
+		case 8: // bstr
+		case 129: //char
+		case 130: //wc
+		case 200: // varc
+		case 202:// varWC
+		case 128: // bin
+		case 204: // varBin
+		case 72: // guid
+			if ($len <= $this->blobSize) return 'C';
+		
+		case 201:
+		case 203:
+			return 'X';
+		case 128:
+		case 204:
+		case 205:
+			 return 'B';
+		case 7:
+		case 133: return 'D';
+		
+		case 134:
+		case 135: return 'T';
+		
+		case 11: return 'L';
+		
+		case 16://	adTinyInt	= 16,
+		case 2://adSmallInt	= 2,
+		case 3://adInteger	= 3,
+		case 4://adBigInt	= 20,
+		case 17://adUnsignedTinyInt	= 17,
+		case 18://adUnsignedSmallInt	= 18,
+		case 19://adUnsignedInt	= 19,
+		case 20://adUnsignedBigInt	= 21,
+			return 'I';
+		default: return 'N';
+		}
+	}
+	
+	// time stamp not supported yet
+	function _fetch()
+	{	
+		$rs = $this->_queryID;
+		if (!$rs or $rs->EOF) {
+			$this->fields = false;
+			return false;
+		}
+		$this->fields = array();
+	
+		if (!$this->_tarr) {
+			$tarr = array();
+			$flds = array();
+			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
+				$f = $rs->Fields($i);
+				$flds[] = $f;
+				$tarr[] = $f->Type;
+			}
+			// bind types and flds only once
+			$this->_tarr = $tarr; 
+			$this->_flds = $flds;
+		}
+		$t = reset($this->_tarr);
+		$f = reset($this->_flds);
+		
+		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
+		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
+			//echo "
    ",$t,' ';var_dump($f->value); echo '
    ';
+			switch($t) {
+			case 135: // timestamp
+				if (!strlen((string)$f->value)) $this->fields[] = false;
+				else {
+					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
+						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
+						$val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
+					else 
+						$val = $f->value;
+					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+				}
+				break;			
+			case 133:// A date value (yyyymmdd) 
+				if ($val = $f->value) {
+					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+				} else
+					$this->fields[] = false;
+				break;
+			case 7: // adDate
+				if (!strlen((string)$f->value)) $this->fields[] = false;
+				else {
+					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+					else $val = $f->value;
+					
+					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
+					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+				}
+				break;
+			case 1: // null
+				$this->fields[] = false;
+				break;
+			case 6: // currency is not supported properly;
+				ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP');
+				$this->fields[] = (float) $f->value;
+				break;
+			case 11: //BIT;
+				$val = "";
+				if(is_bool($f->value))	{
+					if($f->value==true) $val = 1;
+					else $val = 0;
+				}
+				if(is_null($f->value)) $val = null;
+				
+				$this->fields[] = $val;
+				break;
+			default:
+				$this->fields[] = $f->value; 
+				break;
+			}
+			//print " $f->value $t, ";
+			$f = next($this->_flds);
+			$t = next($this->_tarr);
+		} // for
+		if ($this->hideErrors) error_reporting($olde);
+		@$rs->MoveNext(); // @ needed for some versions of PHP!
+		
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+		}
+		return true;
+	}
+	
+		function NextRecordSet()
+		{
+			$rs = $this->_queryID;
+			$this->_queryID = $rs->NextRecordSet();
+			//$this->_queryID = $this->_QueryId->NextRecordSet();
+			if ($this->_queryID == null) return false;
+			
+			$this->_currentRow = -1;
+			$this->_currentPage = -1;
+			$this->bind = false;
+			$this->fields = false;
+			$this->_flds = false;
+			$this->_tarr = false;
+			
+			$this->_inited = false;
+			$this->Init();
+			return true;
+		}
+
+	function _close() {
+		$this->_flds = false;
+		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
+		$this->_queryID = false;	
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-ado5.inc.php b/adodb/drivers/adodb-ado5.inc.php
new file mode 100644
index 0000000..30d192d
--- /dev/null
+++ b/adodb/drivers/adodb-ado5.inc.php
@@ -0,0 +1,708 @@
+_affectedRows = new VARIANT;
+	}
+
+	function ServerInfo()
+	{
+		if (!empty($this->_connectionID)) $desc = $this->_connectionID->provider;
+		return array('description' => $desc, 'version' => '');
+	}
+	
+	function _affectedrows()
+	{
+		if (PHP_VERSION >= 5) return $this->_affectedRows;
+		
+		return $this->_affectedRows->value;
+	}
+	
+	// you can also pass a connection string like this:
+	//
+	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
+	function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $argProvider= '')
+	{
+	// two modes
+	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
+	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
+	
+		
+		 if ($argProvider) {
+		 	$argDatabasename = $argDBorProvider;
+		 } else {
+		 	$argDatabasename = '';
+		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
+			else if (stripos($argHostname,'PROVIDER') === false) /* full conn string is not in $argHostname */ 
+				$argProvider = 'MSDASQL';
+		}
+		
+		
+		try {
+		$u = 'UID';
+		$p = 'PWD';
+	
+		if (!empty($this->charPage))
+			$dbc = new COM('ADODB.Connection',null,$this->charPage);
+		else
+			$dbc = new COM('ADODB.Connection');
+			
+		if (! $dbc) return false;
+
+		/* special support if provider is mssql or access */
+		if ($argProvider=='mssql') {
+			$u = 'User Id';  //User parameter name for OLEDB
+			$p = 'Password'; 
+			$argProvider = "SQLOLEDB"; // SQL Server Provider
+			
+			// not yet
+			//if ($argDatabasename) $argHostname .= ";Initial Catalog=$argDatabasename";
+			
+			//use trusted conection for SQL if username not specified
+			if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
+		} else if ($argProvider=='access')
+			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
+		
+		if ($argProvider) $dbc->Provider = $argProvider;	
+
+		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
+		
+
+		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
+		if ($argUsername) $argHostname .= ";$u=$argUsername";
+		if ($argPassword)$argHostname .= ";$p=$argPassword";
+		
+		if ($this->debug) ADOConnection::outp( "Host=".$argHostname."
    \n version=$dbc->version");
+		// @ added below for php 4.0.1 and earlier
+		@$dbc->Open((string) $argHostname);
+		
+		$this->_connectionID = $dbc;
+		
+		$dbc->CursorLocation = $this->_cursor_location;
+		return  $dbc->State > 0;
+		} catch (exception $e) {
+			if ($this->debug) echo "
    ",$argHostname,"\n",$e,"
    \n";
+		}
+		
+		return false;
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argProvider='MSDASQL')
+	{
+		return $this->_connect($argHostname,$argUsername,$argPassword,$argProvider);
+	}	
+	
+/*
+	adSchemaCatalogs	= 1,
+	adSchemaCharacterSets	= 2,
+	adSchemaCollations	= 3,
+	adSchemaColumns	= 4,
+	adSchemaCheckConstraints	= 5,
+	adSchemaConstraintColumnUsage	= 6,
+	adSchemaConstraintTableUsage	= 7,
+	adSchemaKeyColumnUsage	= 8,
+	adSchemaReferentialContraints	= 9,
+	adSchemaTableConstraints	= 10,
+	adSchemaColumnsDomainUsage	= 11,
+	adSchemaIndexes	= 12,
+	adSchemaColumnPrivileges	= 13,
+	adSchemaTablePrivileges	= 14,
+	adSchemaUsagePrivileges	= 15,
+	adSchemaProcedures	= 16,
+	adSchemaSchemata	= 17,
+	adSchemaSQLLanguages	= 18,
+	adSchemaStatistics	= 19,
+	adSchemaTables	= 20,
+	adSchemaTranslations	= 21,
+	adSchemaProviderTypes	= 22,
+	adSchemaViews	= 23,
+	adSchemaViewColumnUsage	= 24,
+	adSchemaViewTableUsage	= 25,
+	adSchemaProcedureParameters	= 26,
+	adSchemaForeignKeys	= 27,
+	adSchemaPrimaryKeys	= 28,
+	adSchemaProcedureColumns	= 29,
+	adSchemaDBInfoKeywords	= 30,
+	adSchemaDBInfoLiterals	= 31,
+	adSchemaCubes	= 32,
+	adSchemaDimensions	= 33,
+	adSchemaHierarchies	= 34,
+	adSchemaLevels	= 35,
+	adSchemaMeasures	= 36,
+	adSchemaProperties	= 37,
+	adSchemaMembers	= 38
+
+*/
+	
+	function MetaTables()
+	{
+		$arr= array();
+		$dbc = $this->_connectionID;
+		
+		$adors=@$dbc->OpenSchema(20);//tables
+		if ($adors){
+			$f = $adors->Fields(2);//table/view name
+			$t = $adors->Fields(3);//table type
+			while (!$adors->EOF){
+				$tt=substr($t->value,0,6);
+				if ($tt!='SYSTEM' && $tt !='ACCESS')
+					$arr[]=$f->value;
+				//print $f->value . ' ' . $t->value.'
    ';
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		
+		return $arr;
+	}
+	
+	function MetaColumns($table, $normalize=true)
+	{
+		$table = strtoupper($table);
+		$arr= array();
+		$dbc = $this->_connectionID;
+		
+		$adors=@$dbc->OpenSchema(4);//tables
+	
+		if ($adors){
+			$t = $adors->Fields(2);//table/view name
+			while (!$adors->EOF){
+				
+				
+				if (strtoupper($t->Value) == $table) {
+				
+					$fld = new ADOFieldObject();
+					$c = $adors->Fields(3);
+					$fld->name = $c->Value;
+					$fld->type = 'CHAR'; // cannot discover type in ADO!
+					$fld->max_length = -1;
+					$arr[strtoupper($fld->name)]=$fld;
+				}
+		
+				$adors->MoveNext();
+			}
+			$adors->Close();
+		}
+		
+		return $arr;
+	}
+	
+	/* returns queryID or false */
+	function _query($sql,$inputarr=false) 
+	{
+		try { // In PHP5, all COM errors are exceptions, so to maintain old behaviour...
+		
+		$dbc = $this->_connectionID;
+		
+	//	return rs	
+	
+		$false = false;
+		
+		if ($inputarr) {
+			
+			if (!empty($this->charPage))
+				$oCmd = new COM('ADODB.Command',null,$this->charPage);
+			else
+				$oCmd = new COM('ADODB.Command');
+			$oCmd->ActiveConnection = $dbc;
+			$oCmd->CommandText = $sql;
+			$oCmd->CommandType = 1;
+
+			while(list(, $val) = each($inputarr)) {
+				$type = gettype($val);
+				$len=strlen($val);
+				if ($type == 'boolean')
+					$this->adoParameterType = 11;
+				else if ($type == 'integer')
+					$this->adoParameterType = 3;
+				else if ($type == 'double')
+					$this->adoParameterType = 5;
+				elseif ($type == 'string')
+					$this->adoParameterType = 202;
+				else if (($val === null) || (!defined($val)))
+					$len=1;
+				else
+					$this->adoParameterType = 130;
+				
+				// name, type, direction 1 = input, len,
+        		$p = $oCmd->CreateParameter('name',$this->adoParameterType,1,$len,$val);
+
+				$oCmd->Parameters->Append($p);
+			}
+			
+			$p = false;
+			$rs = $oCmd->Execute();
+			$e = $dbc->Errors;
+			if ($dbc->Errors->Count > 0) return $false;
+			return $rs;
+		}
+		
+		$rs = @$dbc->Execute($sql,$this->_affectedRows, $this->_execute_option);
+			
+		if ($dbc->Errors->Count > 0) return $false;
+		if (! $rs) return $false;
+		
+		if ($rs->State == 0) {
+			$true = true;
+			return $true; // 0 = adStateClosed means no records returned
+		}
+		return $rs;
+		
+		} catch (exception $e) {
+			
+		}
+		return $false;
+	}
+
+	
+	function BeginTrans() 
+	{ 
+		if ($this->transOff) return true;
+		
+		if (isset($this->_thisTransactions))
+			if (!$this->_thisTransactions) return false;
+		else {
+			$o = $this->_connectionID->Properties("Transaction DDL");
+			$this->_thisTransactions = $o ? true : false;
+			if (!$o) return false;
+		}
+		@$this->_connectionID->BeginTrans();
+		$this->transCnt += 1;
+		return true;
+	}
+	function CommitTrans($ok=true) 
+	{ 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transOff) return true;
+		
+		@$this->_connectionID->CommitTrans();
+		if ($this->transCnt) @$this->transCnt -= 1;
+		return true;
+	}
+	function RollbackTrans() {
+		if ($this->transOff) return true;
+		@$this->_connectionID->RollbackTrans();
+		if ($this->transCnt) @$this->transCnt -= 1;
+		return true;
+	}
+	
+	/*	Returns: the last error message from previous database operation	*/	
+
+	function ErrorMsg() 
+	{
+		if (!$this->_connectionID) return "No connection established";
+		$errmsg = '';
+		
+		try {
+			$errc = $this->_connectionID->Errors;
+			if (!$errc) return "No Errors object found";
+			if ($errc->Count == 0) return '';
+			$err = $errc->Item($errc->Count-1);
+			$errmsg = $err->Description;
+		}catch(exception $e) {
+		}
+		return $errmsg;
+	}
+	
+	function ErrorNo() 
+	{
+		$errc = $this->_connectionID->Errors;
+		if ($errc->Count == 0) return 0;
+		$err = $errc->Item($errc->Count-1);
+		return $err->NativeError;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		if ($this->_connectionID) $this->_connectionID->Close();
+		$this->_connectionID = false;
+		return true;
+	}
+	
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_ado extends ADORecordSet {	
+	
+	var $bind = false;
+	var $databaseType = "ado";	
+	var $dataProvider = "ado";	
+	var $_tarr = false; // caches the types
+	var $_flds; // and field objects
+	var $canSeek = true;
+  	var $hideErrors = true;
+		  
+	function ADORecordSet_ado($id,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		return $this->ADORecordSet($id,$mode);
+	}
+
+
+	// returns the field object
+	function FetchField($fieldOffset = -1) {
+		$off=$fieldOffset+1; // offsets begin at 1
+		
+		$o= new ADOFieldObject();
+		$rs = $this->_queryID;
+		if (!$rs) return false;
+		
+		$f = $rs->Fields($fieldOffset);
+		$o->name = $f->Name;
+		$t = $f->Type;
+		$o->type = $this->MetaType($t);
+		$o->max_length = $f->DefinedSize;
+		$o->ado_type = $t;
+		
+
+		//print "off=$off name=$o->name type=$o->type len=$o->max_length
    ";
+		return $o;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+		
+	function _initrs()
+	{
+		$rs = $this->_queryID;
+		
+		try {
+			$this->_numOfRows = $rs->RecordCount;
+		} catch (Exception $e) {
+			$this->_numOfRows = -1;
+		}
+		$f = $rs->Fields;
+		$this->_numOfFields = $f->Count;
+	}
+	
+	
+	 // should only be used to move forward as we normally use forward-only cursors
+	function _seek($row)
+	{
+	   $rs = $this->_queryID; 
+		// absoluteposition doesn't work -- my maths is wrong ?
+		//	$rs->AbsolutePosition->$row-2;
+		//	return true;
+		if ($this->_currentRow > $row) return false;
+		@$rs->Move((integer)$row - $this->_currentRow-1); //adBookmarkFirst
+		return true;
+	}
+	
+/*
+	OLEDB types
+	
+	 enum DBTYPEENUM
+	{	DBTYPE_EMPTY	= 0,
+	DBTYPE_NULL	= 1,
+	DBTYPE_I2	= 2,
+	DBTYPE_I4	= 3,
+	DBTYPE_R4	= 4,
+	DBTYPE_R8	= 5,
+	DBTYPE_CY	= 6,
+	DBTYPE_DATE	= 7,
+	DBTYPE_BSTR	= 8,
+	DBTYPE_IDISPATCH	= 9,
+	DBTYPE_ERROR	= 10,
+	DBTYPE_BOOL	= 11,
+	DBTYPE_VARIANT	= 12,
+	DBTYPE_IUNKNOWN	= 13,
+	DBTYPE_DECIMAL	= 14,
+	DBTYPE_UI1	= 17,
+	DBTYPE_ARRAY	= 0x2000,
+	DBTYPE_BYREF	= 0x4000,
+	DBTYPE_I1	= 16,
+	DBTYPE_UI2	= 18,
+	DBTYPE_UI4	= 19,
+	DBTYPE_I8	= 20,
+	DBTYPE_UI8	= 21,
+	DBTYPE_GUID	= 72,
+	DBTYPE_VECTOR	= 0x1000,
+	DBTYPE_RESERVED	= 0x8000,
+	DBTYPE_BYTES	= 128,
+	DBTYPE_STR	= 129,
+	DBTYPE_WSTR	= 130,
+	DBTYPE_NUMERIC	= 131,
+	DBTYPE_UDT	= 132,
+	DBTYPE_DBDATE	= 133,
+	DBTYPE_DBTIME	= 134,
+	DBTYPE_DBTIMESTAMP	= 135
+	
+	ADO Types
+	
+   	adEmpty	= 0,
+	adTinyInt	= 16,
+	adSmallInt	= 2,
+	adInteger	= 3,
+	adBigInt	= 20,
+	adUnsignedTinyInt	= 17,
+	adUnsignedSmallInt	= 18,
+	adUnsignedInt	= 19,
+	adUnsignedBigInt	= 21,
+	adSingle	= 4,
+	adDouble	= 5,
+	adCurrency	= 6,
+	adDecimal	= 14,
+	adNumeric	= 131,
+	adBoolean	= 11,
+	adError	= 10,
+	adUserDefined	= 132,
+	adVariant	= 12,
+	adIDispatch	= 9,
+	adIUnknown	= 13,	
+	adGUID	= 72,
+	adDate	= 7,
+	adDBDate	= 133,
+	adDBTime	= 134,
+	adDBTimeStamp	= 135,
+	adBSTR	= 8,
+	adChar	= 129,
+	adVarChar	= 200,
+	adLongVarChar	= 201,
+	adWChar	= 130,
+	adVarWChar	= 202,
+	adLongVarWChar	= 203,
+	adBinary	= 128,
+	adVarBinary	= 204,
+	adLongVarBinary	= 205,
+	adChapter	= 136,
+	adFileTime	= 64,
+	adDBFileTime	= 137,
+	adPropVariant	= 138,
+	adVarNumeric	= 139
+*/
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		if (!is_numeric($t)) return $t;
+		
+		switch ($t) {
+		case 0:
+		case 12: // variant
+		case 8: // bstr
+		case 129: //char
+		case 130: //wc
+		case 200: // varc
+		case 202:// varWC
+		case 128: // bin
+		case 204: // varBin
+		case 72: // guid
+			if ($len <= $this->blobSize) return 'C';
+		
+		case 201:
+		case 203:
+			return 'X';
+		case 128:
+		case 204:
+		case 205:
+			 return 'B';
+		case 7:
+		case 133: return 'D';
+		
+		case 134:
+		case 135: return 'T';
+		
+		case 11: return 'L';
+		
+		case 16://	adTinyInt	= 16,
+		case 2://adSmallInt	= 2,
+		case 3://adInteger	= 3,
+		case 4://adBigInt	= 20,
+		case 17://adUnsignedTinyInt	= 17,
+		case 18://adUnsignedSmallInt	= 18,
+		case 19://adUnsignedInt	= 19,
+		case 20://adUnsignedBigInt	= 21,
+			return 'I';
+		default: return 'N';
+		}
+	}
+	
+	// time stamp not supported yet
+	function _fetch()
+	{	
+		$rs = $this->_queryID;
+		if (!$rs or $rs->EOF) {
+			$this->fields = false;
+			return false;
+		}
+		$this->fields = array();
+	
+		if (!$this->_tarr) {
+			$tarr = array();
+			$flds = array();
+			for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
+				$f = $rs->Fields($i);
+				$flds[] = $f;
+				$tarr[] = $f->Type;
+			}
+			// bind types and flds only once
+			$this->_tarr = $tarr; 
+			$this->_flds = $flds;
+		}
+		$t = reset($this->_tarr);
+		$f = reset($this->_flds);
+		
+		if ($this->hideErrors)  $olde = error_reporting(E_ERROR|E_CORE_ERROR);// sometimes $f->value be null
+		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
+			//echo "
    ",$t,' ';var_dump($f->value); echo '
    ';
+			switch($t) {
+			case 135: // timestamp
+				if (!strlen((string)$f->value)) $this->fields[] = false;
+				else {
+					if (!is_numeric($f->value)) # $val = variant_date_to_timestamp($f->value);
+						// VT_DATE stores dates as (float) fractional days since 1899/12/30 00:00:00
+						$val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
+					else 
+						$val = $f->value;
+					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+				}
+				break;			
+			case 133:// A date value (yyyymmdd) 
+				if ($val = $f->value) {
+					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+				} else
+					$this->fields[] = false;
+				break;
+			case 7: // adDate
+				if (!strlen((string)$f->value)) $this->fields[] = false;
+				else {
+					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+					else $val = $f->value;
+					
+					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
+					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+				}
+				break;
+			case 1: // null
+				$this->fields[] = false;
+				break;
+			case 20:
+			case 21: // bigint (64 bit)
+    			$this->fields[] = (float) $f->value; // if 64 bit PHP, could use (int)
+    			break;
+			case 6: // currency is not supported properly;
+				ADOConnection::outp( ''.$f->Name.': currency type not supported by PHP');
+				$this->fields[] = (float) $f->value;
+				break;
+			case 11: //BIT;
+				$val = "";
+				if(is_bool($f->value))	{
+					if($f->value==true) $val = 1;
+					else $val = 0;
+				}
+				if(is_null($f->value)) $val = null;
+				
+				$this->fields[] = $val;
+				break;
+			default:
+				$this->fields[] = $f->value; 
+				break;
+			}
+			//print " $f->value $t, ";
+			$f = next($this->_flds);
+			$t = next($this->_tarr);
+		} // for
+		if ($this->hideErrors) error_reporting($olde);
+		@$rs->MoveNext(); // @ needed for some versions of PHP!
+		
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+		}
+		return true;
+	}
+	
+		function NextRecordSet()
+		{
+			$rs = $this->_queryID;
+			$this->_queryID = $rs->NextRecordSet();
+			//$this->_queryID = $this->_QueryId->NextRecordSet();
+			if ($this->_queryID == null) return false;
+			
+			$this->_currentRow = -1;
+			$this->_currentPage = -1;
+			$this->bind = false;
+			$this->fields = false;
+			$this->_flds = false;
+			$this->_tarr = false;
+			
+			$this->_inited = false;
+			$this->Init();
+			return true;
+		}
+
+	function _close() {
+		$this->_flds = false;
+		try {
+		@$this->_queryID->Close();// by Pete Dishman (peterd@telephonetics.co.uk)
+		} catch (Exception $e) {
+		}
+		$this->_queryID = false;	
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-ado_access.inc.php b/adodb/drivers/adodb-ado_access.inc.php
new file mode 100644
index 0000000..5b30f44
--- /dev/null
+++ b/adodb/drivers/adodb-ado_access.inc.php
@@ -0,0 +1,54 @@
+= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
+	else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
+}
+
+class  ADODB_ado_access extends ADODB_ado {	
+	var $databaseType = 'ado_access';
+	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
+	var $fmtDate = "#Y-m-d#";
+	var $fmtTimeStamp = "#Y-m-d h:i:sA#";// note no comma
+	var $sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
+	var $sysTimeStamp = 'NOW';
+	var $upperCase = 'ucase';
+	
+	function ADODB_ado_access()
+	{
+		$this->ADODB_ado();
+	}
+	
+	/*function BeginTrans() { return false;}
+	
+	function CommitTrans() { return false;}
+	
+	function RollbackTrans() { return false;}*/
+
+}
+
+ 
+class  ADORecordSet_ado_access extends ADORecordSet_ado {	
+	
+	var $databaseType = "ado_access";		
+	
+	function ADORecordSet_ado_access($id,$mode=false)
+	{
+		return $this->ADORecordSet_ado($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-ado_mssql.inc.php b/adodb/drivers/adodb-ado_mssql.inc.php
new file mode 100644
index 0000000..dd2f58a
--- /dev/null
+++ b/adodb/drivers/adodb-ado_mssql.inc.php
@@ -0,0 +1,154 @@
+= 5) include(ADODB_DIR."/drivers/adodb-ado5.inc.php");
+	else include(ADODB_DIR."/drivers/adodb-ado.inc.php");
+}
+
+
+class  ADODB_ado_mssql extends ADODB_ado {        
+	var $databaseType = 'ado_mssql';
+	var $hasTop = 'top';
+	var $hasInsertID = true;
+	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+	var $sysTimeStamp = 'GetDate()';
+	var $leftOuter = '*=';
+	var $rightOuter = '=*';
+	var $ansiOuter = true; // for mssql7 or later
+	var $substr = "substring";
+	var $length = 'len';
+	var $_dropSeqSQL = "drop table %s";
+	
+	//var $_inTransaction = 1; // always open recordsets, so no transaction problems.
+	
+	function ADODB_ado_mssql()
+	{
+	        $this->ADODB_ado();
+	}
+	
+	function _insertid()
+	{
+	        return $this->GetOne('select SCOPE_IDENTITY()');
+	}
+	
+	function _affectedrows()
+	{
+	        return $this->GetOne('select @@rowcount');
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
+	function qstr($s,$magic_quotes=false)
+	{
+		$s = ADOConnection::qstr($s, $magic_quotes);
+		return str_replace("\0", "\\\\000", $s);
+	}
+	
+	function MetaColumns($table, $normalize=true)
+	{
+        $table = strtoupper($table);
+        $arr= array();
+        $dbc = $this->_connectionID;
+        
+        $osoptions = array();
+        $osoptions[0] = null;
+        $osoptions[1] = null;
+        $osoptions[2] = $table;
+        $osoptions[3] = null;
+        
+        $adors=@$dbc->OpenSchema(4, $osoptions);//tables
+
+        if ($adors){
+                while (!$adors->EOF){
+                        $fld = new ADOFieldObject();
+                        $c = $adors->Fields(3);
+                        $fld->name = $c->Value;
+                        $fld->type = 'CHAR'; // cannot discover type in ADO!
+                        $fld->max_length = -1;
+                        $arr[strtoupper($fld->name)]=$fld;
+        
+                        $adors->MoveNext();
+                }
+                $adors->Close();
+        }
+        $false = false;
+		return empty($arr) ? $false : $arr;
+	}
+	
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$start -= 1;
+		$this->Execute("create table $seq (id float(53))");
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+		}
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return true;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		//$this->debug=1;
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$this->Execute("create table $seq (id float(53))");
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+			}
+			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			return $start;
+		}
+		$num = $this->GetOne("select id from $seq");
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return $num;
+		
+		// in old implementation, pre 1.90, we returned GUID...
+		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
+	}
+	
+	} // end class 
+	
+	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        
+	
+	var $databaseType = 'ado_mssql';
+	
+	function ADORecordSet_ado_mssql($id,$mode=false)
+	{
+	        return $this->ADORecordSet_ado($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-ads.inc.php b/adodb/drivers/adodb-ads.inc.php
new file mode 100644
index 0000000..0de57ca
--- /dev/null
+++ b/adodb/drivers/adodb-ads.inc.php
@@ -0,0 +1,796 @@
+_haserrorfunctions = ADODB_PHPVER >= 0x4050;
+    $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
+  }
+
+  // returns true or false
+  function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+  {
+          global $php_errormsg;
+
+    if (!function_exists('ads_connect')) return null;
+
+    if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') {
+      ADOConnection::outp("For Advantage Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
+    }
+    if (isset($php_errormsg)) $php_errormsg = '';
+    if ($this->curmode === false) $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword);
+    else $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword,$this->curmode);
+    $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+    if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+
+    return $this->_connectionID != false;
+  }
+
+  // returns true or false
+  function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+  {
+  global $php_errormsg;
+
+    if (!function_exists('ads_connect')) return null;
+
+    if (isset($php_errormsg)) $php_errormsg = '';
+    $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+    if ($this->debug && $argDatabasename) {
+            ADOConnection::outp("For PConnect(), $argDatabasename is not used. Place dsn in 1st parameter.");
+    }
+  //  print "dsn=$argDSN u=$argUsername p=$argPassword
    "; flush();
+    if ($this->curmode === false) $this->_connectionID = ads_connect($argDSN,$argUsername,$argPassword);
+    else $this->_connectionID = ads_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
+
+    $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+    if ($this->_connectionID && $this->autoRollback) @ads_rollback($this->_connectionID);
+    if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+
+    return $this->_connectionID != false;
+  }
+
+  // returns the Server version and Description
+  function ServerInfo()
+  {
+
+    if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
+      $stmt = $this->Prepare('EXECUTE PROCEDURE sp_mgGetInstallInfo()');
+                        $res =  $this->Execute($stmt);
+                        if(!$res)
+                                print $this->ErrorMsg();
+                        else{
+                                $ret["version"]= $res->fields[3];
+                                $ret["description"]="Advantage Database Server";
+                                return $ret;
+                        }
+                }
+                else {
+            return ADOConnection::ServerInfo();
+    }
+  }
+
+
+        // returns true or false
+        function CreateSequence( $seqname,$start=1)
+  {
+                $res =  $this->Execute("CREATE TABLE $seqname ( ID autoinc( 1 ) ) IN DATABASE");
+                if(!$res){
+                        print $this->ErrorMsg();
+                        return false;
+                }
+                else
+                        return true;
+
+        }
+
+        // returns true or false
+        function DropSequence($seqname)
+  {
+                $res = $this->Execute("DROP TABLE $seqname");
+                if(!$res){
+                        print $this->ErrorMsg();
+                        return false;
+                }
+                else
+                        return true;
+        }
+
+
+  // returns the generated ID or false
+        // checks if the table already exists, else creates the table and inserts a record into the table
+        // and gets the ID number of the last inserted record.
+        function GenID($seqname,$start=1)
+        {
+                $go = $this->Execute("select * from $seqname");
+                if (!$go){
+                        $res = $this->Execute("CREATE TABLE $seqname ( ID autoinc( 1 ) ) IN DATABASE");
+                        if(!res){
+                                print $this->ErrorMsg();
+                                return false;
+                        }
+                }
+                $res = $this->Execute("INSERT INTO $seqname VALUES( DEFAULT )");
+                if(!$res){
+                        print $this->ErrorMsg();
+                        return false;
+                }
+                else{
+                        $gen = $this->Execute("SELECT LastAutoInc( STATEMENT ) FROM system.iota");
+                        $ret = $gen->fields[0];
+                        return $ret;
+                }
+
+        }
+
+
+
+
+  function ErrorMsg()
+  {
+    if ($this->_haserrorfunctions) {
+      if ($this->_errorMsg !== false) return $this->_errorMsg;
+      if (empty($this->_connectionID)) return @ads_errormsg();
+      return @ads_errormsg($this->_connectionID);
+    } else return ADOConnection::ErrorMsg();
+  }
+
+
+  function ErrorNo()
+  {
+
+                if ($this->_haserrorfunctions) {
+      if ($this->_errorCode !== false) {
+        // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+        return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
+      }
+
+      if (empty($this->_connectionID)) $e = @ads_error();
+      else $e = @ads_error($this->_connectionID);
+
+       // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+       // so we check and patch
+      if (strlen($e)<=2) return 0;
+      return $e;
+    } else return ADOConnection::ErrorNo();
+  }
+
+
+
+  function BeginTrans()
+  {
+    if (!$this->hasTransactions) return false;
+    if ($this->transOff) return true;
+    $this->transCnt += 1;
+    $this->_autocommit = false;
+    return ads_autocommit($this->_connectionID,false);
+  }
+
+  function CommitTrans($ok=true)
+  {
+    if ($this->transOff) return true;
+    if (!$ok) return $this->RollbackTrans();
+    if ($this->transCnt) $this->transCnt -= 1;
+    $this->_autocommit = true;
+    $ret = ads_commit($this->_connectionID);
+    ads_autocommit($this->_connectionID,true);
+    return $ret;
+  }
+
+  function RollbackTrans()
+  {
+    if ($this->transOff) return true;
+    if ($this->transCnt) $this->transCnt -= 1;
+    $this->_autocommit = true;
+    $ret = ads_rollback($this->_connectionID);
+    ads_autocommit($this->_connectionID,true);
+    return $ret;
+  }
+
+
+  // Returns tables,Views or both on succesfull execution. Returns
+        // tables by default on succesfull execustion.
+  function &MetaTables($ttype)
+  {
+          $recordSet1 = $this->Execute("select * from system.tables");
+                if(!$recordSet1){
+                        print $this->ErrorMsg();
+                        return false;
+                }
+                $recordSet2 = $this->Execute("select * from system.views");
+                if(!$recordSet2){
+                        print $this->ErrorMsg();
+                        return false;
+                }
+                $i=0;
+                while (!$recordSet1->EOF){
+                                 $arr["$i"] = $recordSet1->fields[0];
+                                 $recordSet1->MoveNext();
+                                 $i=$i+1;
+                }
+                if($ttype=='FALSE'){
+                        while (!$recordSet2->EOF){
+                                $arr["$i"] = $recordSet2->fields[0];
+                                $recordSet2->MoveNext();
+                                $i=$i+1;
+                        }
+                        return $arr;
+                }
+                elseif($ttype=='VIEWS'){
+                        while (!$recordSet2->EOF){
+                                $arrV["$i"] = $recordSet2->fields[0];
+                                $recordSet2->MoveNext();
+                                $i=$i+1;
+                        }
+                        return $arrV;
+                }
+                else{
+                        return $arr;
+                }
+
+  }
+
+        function &MetaPrimaryKeys($table)
+  {
+          $recordSet = $this->Execute("select table_primary_key from system.tables where name='$table'");
+                if(!$recordSet){
+                        print $this->ErrorMsg();
+                        return false;
+                }
+                $i=0;
+                while (!$recordSet->EOF){
+                                 $arr["$i"] = $recordSet->fields[0];
+                                 $recordSet->MoveNext();
+                                 $i=$i+1;
+                }
+                return $arr;
+        }
+
+/*
+See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
+/ SQL data type codes /
+#define SQL_UNKNOWN_TYPE  0
+#define SQL_CHAR      1
+#define SQL_NUMERIC    2
+#define SQL_DECIMAL    3
+#define SQL_INTEGER    4
+#define SQL_SMALLINT    5
+#define SQL_FLOAT      6
+#define SQL_REAL      7
+#define SQL_DOUBLE      8
+#if (ODBCVER >= 0x0300)
+#define SQL_DATETIME    9
+#endif
+#define SQL_VARCHAR   12
+
+
+/ One-parameter shortcuts for date/time data types /
+#if (ODBCVER >= 0x0300)
+#define SQL_TYPE_DATE   91
+#define SQL_TYPE_TIME   92
+#define SQL_TYPE_TIMESTAMP 93
+
+#define SQL_UNICODE                             (-95)
+#define SQL_UNICODE_VARCHAR                     (-96)
+#define SQL_UNICODE_LONGVARCHAR                 (-97)
+*/
+  function ODBCTypes($t)
+  {
+    switch ((integer)$t) {
+    case 1:
+    case 12:
+    case 0:
+    case -95:
+    case -96:
+      return 'C';
+    case -97:
+    case -1: //text
+      return 'X';
+    case -4: //image
+      return 'B';
+
+    case 9:
+    case 91:
+      return 'D';
+
+    case 10:
+    case 11:
+    case 92:
+    case 93:
+      return 'T';
+
+    case 4:
+    case 5:
+    case -6:
+      return 'I';
+
+    case -11: // uniqidentifier
+      return 'R';
+    case -7: //bit
+      return 'L';
+
+    default:
+      return 'N';
+    }
+  }
+
+  function &MetaColumns($table)
+  {
+  global $ADODB_FETCH_MODE;
+
+    $false = false;
+    if ($this->uCaseTables) $table = strtoupper($table);
+    $schema = '';
+    $this->_findschema($table,$schema);
+
+    $savem = $ADODB_FETCH_MODE;
+    $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+    /*if (false) { // after testing, confirmed that the following does not work becoz of a bug
+      $qid2 = ads_tables($this->_connectionID);
+      $rs = new ADORecordSet_ads($qid2);
+      $ADODB_FETCH_MODE = $savem;
+      if (!$rs) return false;
+      $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+      $rs->_fetch();
+
+      while (!$rs->EOF) {
+        if ($table == strtoupper($rs->fields[2])) {
+          $q = $rs->fields[0];
+          $o = $rs->fields[1];
+          break;
+        }
+        $rs->MoveNext();
+      }
+      $rs->Close();
+
+      $qid = ads_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
+    } */
+
+    switch ($this->databaseType) {
+    case 'access':
+    case 'vfp':
+      $qid = ads_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
+      break;
+
+
+    case 'db2':
+            $colname = "%";
+            $qid = ads_columns($this->_connectionID, "", $schema, $table, $colname);
+            break;
+
+    default:
+      $qid = @ads_columns($this->_connectionID,'%','%',strtoupper($table),'%');
+      if (empty($qid)) $qid = ads_columns($this->_connectionID);
+      break;
+    }
+    if (empty($qid)) return $false;
+
+    $rs = new ADORecordSet_ads($qid);
+    $ADODB_FETCH_MODE = $savem;
+
+    if (!$rs) return $false;
+    $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+    $rs->_fetch();
+
+    $retarr = array();
+
+    /*
+    $rs->fields indices
+    0 TABLE_QUALIFIER
+    1 TABLE_SCHEM
+    2 TABLE_NAME
+    3 COLUMN_NAME
+    4 DATA_TYPE
+    5 TYPE_NAME
+    6 PRECISION
+    7 LENGTH
+    8 SCALE
+    9 RADIX
+    10 NULLABLE
+    11 REMARKS
+    */
+    while (!$rs->EOF) {
+    //  adodb_pr($rs->fields);
+      if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
+        $fld = new ADOFieldObject();
+        $fld->name = $rs->fields[3];
+        $fld->type = $this->ODBCTypes($rs->fields[4]);
+
+        // ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
+        // access uses precision to store length for char/varchar
+        if ($fld->type == 'C' or $fld->type == 'X') {
+          if ($this->databaseType == 'access')
+            $fld->max_length = $rs->fields[6];
+          else if ($rs->fields[4] <= -95) // UNICODE
+            $fld->max_length = $rs->fields[7]/2;
+          else
+            $fld->max_length = $rs->fields[7];
+        } else
+          $fld->max_length = $rs->fields[7];
+        $fld->not_null = !empty($rs->fields[10]);
+        $fld->scale = $rs->fields[8];
+        $retarr[strtoupper($fld->name)] = $fld;
+      } else if (sizeof($retarr)>0)
+        break;
+      $rs->MoveNext();
+    }
+    $rs->Close(); //-- crashes 4.03pl1 -- why?
+
+    if (empty($retarr)) $retarr = false;
+    return $retarr;
+  }
+
+        // Returns an array of columns names for a given table
+        function &MetaColumnNames($table)
+        {
+                $recordSet = $this->Execute("select name from system.columns where parent='$table'");
+                if(!$recordSet){
+                        print $this->ErrorMsg();
+                        return false;
+                }
+                else{
+                        $i=0;
+                        while (!$recordSet->EOF){
+                                $arr["FIELD$i"] = $recordSet->fields[0];
+                                $recordSet->MoveNext();
+                                $i=$i+1;
+                        }
+                        return $arr;
+                }
+        }
+
+
+  function Prepare($sql)
+  {
+    if (! $this->_bindInputArray) return $sql; // no binding
+    $stmt = ads_prepare($this->_connectionID,$sql);
+    if (!$stmt) {
+      // we don't know whether odbc driver is parsing prepared stmts, so just return sql
+      return $sql;
+    }
+    return array($sql,$stmt,false);
+  }
+
+  /* returns queryID or false */
+  function _query($sql,$inputarr=false)
+  {
+  GLOBAL $php_errormsg;
+    if (isset($php_errormsg)) $php_errormsg = '';
+    $this->_error = '';
+
+                if ($inputarr) {
+      if (is_array($sql)) {
+        $stmtid = $sql[1];
+      } else {
+        $stmtid = ads_prepare($this->_connectionID,$sql);
+
+        if ($stmtid == false) {
+          $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+          return false;
+        }
+      }
+
+      if (! ads_execute($stmtid,$inputarr)) {
+        //@ads_free_result($stmtid);
+        if ($this->_haserrorfunctions) {
+          $this->_errorMsg = ads_errormsg();
+          $this->_errorCode = ads_error();
+        }
+        return false;
+      }
+
+    } else if (is_array($sql)) {
+      $stmtid = $sql[1];
+      if (!ads_execute($stmtid)) {
+        //@ads_free_result($stmtid);
+        if ($this->_haserrorfunctions) {
+          $this->_errorMsg = ads_errormsg();
+          $this->_errorCode = ads_error();
+        }
+        return false;
+      }
+    } else
+                        {
+
+      $stmtid = ads_exec($this->_connectionID,$sql);
+
+                        }
+
+                $this->_lastAffectedRows = 0;
+
+    if ($stmtid)
+                {
+
+      if (@ads_num_fields($stmtid) == 0) {
+        $this->_lastAffectedRows = ads_num_rows($stmtid);
+        $stmtid = true;
+
+      } else {
+
+        $this->_lastAffectedRows = 0;
+        ads_binmode($stmtid,$this->binmode);
+        ads_longreadlen($stmtid,$this->maxblobsize);
+
+      }
+
+      if ($this->_haserrorfunctions)
+                        {
+
+        $this->_errorMsg = '';
+        $this->_errorCode = 0;
+      }
+                        else
+        $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+    }
+                else
+                {
+      if ($this->_haserrorfunctions) {
+        $this->_errorMsg = ads_errormsg();
+        $this->_errorCode = ads_error();
+      } else
+        $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+    }
+
+    return $stmtid;
+
+  }
+
+  /*
+    Insert a null into the blob field of the table first.
+    Then use UpdateBlob to store the blob.
+
+    Usage:
+
+    $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+    $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+   */
+  function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+  {
+                $sql = "UPDATE $table SET $column=? WHERE $where";
+                $stmtid = ads_prepare($this->_connectionID,$sql);
+                if ($stmtid == false){
+                  $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+                  return false;
+          }
+                if (! ads_execute($stmtid,array($val),array(SQL_BINARY) )){
+                        if ($this->_haserrorfunctions){
+                                $this->_errorMsg = ads_errormsg();
+                    $this->_errorCode = ads_error();
+            }
+                        return false;
+           }
+                 return TRUE;
+        }
+
+  // returns true or false
+  function _close()
+  {
+    $ret = @ads_close($this->_connectionID);
+    $this->_connectionID = false;
+    return $ret;
+  }
+
+  function _affectedrows()
+  {
+    return $this->_lastAffectedRows;
+  }
+
+}
+
+/*--------------------------------------------------------------------------------------
+   Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_ads extends ADORecordSet {
+
+  var $bind = false;
+  var $databaseType = "ads";
+  var $dataProvider = "ads";
+  var $useFetchArray;
+  var $_has_stupid_odbc_fetch_api_change;
+
+  function ADORecordSet_ads($id,$mode=false)
+  {
+    if ($mode === false) {
+      global $ADODB_FETCH_MODE;
+      $mode = $ADODB_FETCH_MODE;
+    }
+    $this->fetchMode = $mode;
+
+    $this->_queryID = $id;
+
+    // the following is required for mysql odbc driver in 4.3.1 -- why?
+    $this->EOF = false;
+    $this->_currentRow = -1;
+    //$this->ADORecordSet($id);
+  }
+
+
+  // returns the field object
+  function &FetchField($fieldOffset = -1)
+  {
+
+    $off=$fieldOffset+1; // offsets begin at 1
+
+    $o= new ADOFieldObject();
+    $o->name = @ads_field_name($this->_queryID,$off);
+    $o->type = @ads_field_type($this->_queryID,$off);
+    $o->max_length = @ads_field_len($this->_queryID,$off);
+    if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+    else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+    return $o;
+  }
+
+  /* Use associative array to get fields array */
+  function Fields($colname)
+  {
+    if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+    if (!$this->bind) {
+      $this->bind = array();
+      for ($i=0; $i < $this->_numOfFields; $i++) {
+        $o = $this->FetchField($i);
+        $this->bind[strtoupper($o->name)] = $i;
+      }
+    }
+
+     return $this->fields[$this->bind[strtoupper($colname)]];
+  }
+
+
+  function _initrs()
+  {
+  global $ADODB_COUNTRECS;
+    $this->_numOfRows = ($ADODB_COUNTRECS) ? @ads_num_rows($this->_queryID) : -1;
+    $this->_numOfFields = @ads_num_fields($this->_queryID);
+    // some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
+    if ($this->_numOfRows == 0) $this->_numOfRows = -1;
+    //$this->useFetchArray = $this->connection->useFetchArray;
+    $this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
+  }
+
+  function _seek($row)
+  {
+    return false;
+  }
+
+  // speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
+  function &GetArrayLimit($nrows,$offset=-1)
+  {
+    if ($offset <= 0) {
+      $rs =& $this->GetArray($nrows);
+      return $rs;
+    }
+    $savem = $this->fetchMode;
+    $this->fetchMode = ADODB_FETCH_NUM;
+    $this->Move($offset);
+    $this->fetchMode = $savem;
+
+    if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+      $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+    }
+
+    $results = array();
+    $cnt = 0;
+    while (!$this->EOF && $nrows != $cnt) {
+      $results[$cnt++] = $this->fields;
+      $this->MoveNext();
+    }
+
+    return $results;
+  }
+
+
+  function MoveNext()
+  {
+    if ($this->_numOfRows != 0 && !$this->EOF) {
+      $this->_currentRow++;
+
+      if ($this->_has_stupid_odbc_fetch_api_change)
+        $rez = @ads_fetch_into($this->_queryID,$this->fields);
+      else {
+        $row = 0;
+        $rez = @ads_fetch_into($this->_queryID,$row,$this->fields);
+      }
+      if ($rez) {
+        if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+          $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+        }
+        return true;
+      }
+    }
+    $this->fields = false;
+    $this->EOF = true;
+    return false;
+  }
+
+  function _fetch()
+  {
+
+    if ($this->_has_stupid_odbc_fetch_api_change)
+      $rez = @ads_fetch_into($this->_queryID,$this->fields);
+    else {
+      $row = 0;
+      $rez = @ads_fetch_into($this->_queryID,$row,$this->fields);
+    }
+    if ($rez) {
+      if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+        $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE);
+      }
+      return true;
+    }
+    $this->fields = false;
+    return false;
+  }
+
+  function _close()
+  {
+    return @ads_free_result($this->_queryID);
+  }
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-borland_ibase.inc.php b/adodb/drivers/adodb-borland_ibase.inc.php
new file mode 100644
index 0000000..b19210f
--- /dev/null
+++ b/adodb/drivers/adodb-borland_ibase.inc.php
@@ -0,0 +1,92 @@
+ADODB_ibase();
+	}
+	
+	function BeginTrans()
+	{	 
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->autoCommit = false;
+	 	$this->_transactionID = ibase_trans($this->ibasetrans, $this->_connectionID);
+		return $this->_transactionID;
+	}
+	
+	function ServerInfo()
+	{
+		$arr['dialect'] = $this->dialect;
+		switch($arr['dialect']) {
+		case '': 
+		case '1': $s = 'Interbase 6.5, Dialect 1'; break;
+		case '2': $s = 'Interbase 6.5, Dialect 2'; break;
+		default:
+		case '3': $s = 'Interbase 6.5, Dialect 3'; break;
+		}
+		$arr['version'] = '6.5';
+		$arr['description'] = $s;
+		return $arr;
+	}
+	
+	// Note that Interbase 6.5 uses ROWS instead - don't you love forking wars!
+	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
+	// Firebird uses
+	//		SELECT FIRST 5 SKIP 2 col1, col2 FROM TABLE
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
+		if ($nrows > 0) {
+			if ($offset <= 0) $str = " ROWS $nrows "; 
+			else {
+				$a = $offset+1;
+				$b = $offset+$nrows;
+				$str = " ROWS $a TO $b";
+			}
+		} else {
+			// ok, skip 
+			$a = $offset + 1;
+			$str = " ROWS $a TO 999999999"; // 999 million
+		}
+		$sql .= $str;
+		
+		return ($secs2cache) ? 
+				$this->CacheExecute($secs2cache,$sql,$inputarr)
+			:
+				$this->Execute($sql,$inputarr);
+	}
+	
+};
+ 
+
+class  ADORecordSet_borland_ibase extends ADORecordSet_ibase {	
+	
+	var $databaseType = "borland_ibase";		
+	
+	function ADORecordSet_borland_ibase($id,$mode=false)
+	{
+		$this->ADORecordSet_ibase($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-csv.inc.php b/adodb/drivers/adodb-csv.inc.php
new file mode 100644
index 0000000..5606ca6
--- /dev/null
+++ b/adodb/drivers/adodb-csv.inc.php
@@ -0,0 +1,207 @@
+_insertid;
+	}
+	
+	function _affectedrows()
+	{
+			return $this->_affectedrows;
+	}
+  
+  	function MetaDatabases()
+	{
+		return false;
+	}
+
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
+		$this->_url = $argHostname;
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (strtolower(substr($argHostname,0,7)) !== 'http://') return false;
+		$this->_url = $argHostname;
+		return true;
+	}
+	
+ 	function MetaColumns($table, $normalize=true) 
+	{
+		return false;
+	}
+		
+		
+	// parameters use PostgreSQL convention, not MySQL
+	function SelectLimit($sql,$nrows=-1,$offset=-1)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$url = $this->_url.'?sql='.urlencode($sql)."&nrows=$nrows&fetch=".
+			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE).
+			"&offset=$offset";
+		$err = false;
+		$rs = csv2rs($url,$err,false);
+		
+		if ($this->debug) print "$url
    $err
    ";
+
+		$at = strpos($err,'::::');
+		if ($at === false) {
+			$this->_errorMsg = $err;
+			$this->_errorNo = (integer)$err;
+		} else {
+			$this->_errorMsg = substr($err,$at+4,1024);
+			$this->_errorNo = -9999;
+		}
+		if ($this->_errorNo) 
+			if ($fn = $this->raiseErrorFn) {
+				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,'');
+			}
+			
+		if (is_object($rs)) {	
+		
+			$rs->databaseType='csv';		
+			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
+			$rs->connection = $this;
+		}
+		return $rs;
+	}
+	
+	// returns queryID or false
+	function _Execute($sql,$inputarr=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		if (!$this->_bindInputArray && $inputarr) {
+			$sqlarr = explode('?',$sql);
+			$sql = '';
+			$i = 0;
+			foreach($inputarr as $v) {
+
+				$sql .= $sqlarr[$i];
+				if (gettype($v) == 'string')
+					$sql .= $this->qstr($v);
+				else if ($v === null)
+					$sql .= 'NULL';
+				else
+					$sql .= $v;
+				$i += 1;
+	
+			}
+			$sql .= $sqlarr[$i];
+			if ($i+1 != sizeof($sqlarr))	
+				print "Input Array does not match ?: ".htmlspecialchars($sql);
+			$inputarr = false;
+		}
+		
+		$url =  $this->_url.'?sql='.urlencode($sql)."&fetch=".
+			(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
+		$err = false;
+		
+		
+		$rs = csv2rs($url,$err,false);
+		if ($this->debug) print urldecode($url)."
    $err
    ";
+		$at = strpos($err,'::::');
+		if ($at === false) {		
+			$this->_errorMsg = $err;
+			$this->_errorNo = (integer)$err;
+		} else {
+			$this->_errorMsg = substr($err,$at+4,1024);
+			$this->_errorNo = -9999;
+		}
+		
+		if ($this->_errorNo) 
+			if ($fn = $this->raiseErrorFn) {
+				$fn($this->databaseType,'EXECUTE',$this->ErrorNo(),$this->ErrorMsg(),$sql,$inputarr);
+			}
+		if (is_object($rs)) {
+			$rs->fetchMode = ($this->fetchMode !== false) ?  $this->fetchMode : $ADODB_FETCH_MODE;
+			
+			$this->_affectedrows = $rs->affectedrows;
+			$this->_insertid = $rs->insertid;
+			$rs->databaseType='csv';
+			$rs->connection = $this;
+		}
+		return $rs;
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+			return $this->_errorMsg;
+	}
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	{
+		return $this->_errorNo;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return true;
+	}
+} // class
+
+class ADORecordset_csv extends ADORecordset {
+	function ADORecordset_csv($id,$mode=false)
+	{
+		$this->ADORecordset($id,$mode);
+	}
+	
+	function _close()
+	{
+		return true;
+	}
+}
+
+} // define
+	
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-db2.inc.php b/adodb/drivers/adodb-db2.inc.php
new file mode 100644
index 0000000..faf6c0a
--- /dev/null
+++ b/adodb/drivers/adodb-db2.inc.php
@@ -0,0 +1,848 @@
+_haserrorfunctions = ADODB_PHPVER >= 0x4050;
+	}
+	
+		// returns true or false
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+		global $php_errormsg;
+		
+		if (!function_exists('db2_connect')) {
+			ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension which is not installed.");
+			return null;
+		}
+		// This needs to be set before the connect().
+		// Replaces the odbc_binmode() call that was in Execute()
+		ini_set('ibm_db2.binmode', $this->binmode);
+
+		if ($argDatabasename && empty($argDSN)) {
+		
+			if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_connect($argDatabasename,null,null);
+			else $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword);
+		} else {
+			if ($argDatabasename) $schema = $argDatabasename;
+			if (stripos($argDSN,'UID=') && stripos($argDSN,'PWD=')) $this->_connectionID = db2_connect($argDSN,null,null);
+			else $this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword);
+		}
+		if (isset($php_errormsg)) $php_errormsg = '';
+
+		// For db2_connect(), there is an optional 4th arg.  If present, it must be
+		// an array of valid options.  So far, we don't use them.
+
+		$this->_errorMsg = @db2_conn_errormsg();
+		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+		
+		if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
+		return $this->_connectionID != false;
+	}
+	
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+		global $php_errormsg;
+	
+		if (!function_exists('db2_connect')) return null;
+		
+		// This needs to be set before the connect().
+		// Replaces the odbc_binmode() call that was in Execute()
+		ini_set('ibm_db2.binmode', $this->binmode);
+
+		if (isset($php_errormsg)) $php_errormsg = '';
+		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+		
+		if ($argDatabasename && empty($argDSN)) {
+		
+			if (stripos($argDatabasename,'UID=') && stripos($argDatabasename,'PWD=')) $this->_connectionID = db2_pconnect($argDatabasename,null,null);
+			else $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword);
+		} else {
+			if ($argDatabasename) $schema = $argDatabasename;
+			if (stripos($argDSN,'UID=') && stripos($argDSN,'PWD=')) $this->_connectionID = db2_pconnect($argDSN,null,null);
+			else $this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword);
+		}
+		if (isset($php_errormsg)) $php_errormsg = '';
+
+		$this->_errorMsg = @db2_conn_errormsg();
+		if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID);
+		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+		
+		if ($this->_connectionID && isset($schema)) $this->Execute("SET SCHEMA=$schema");
+		return $this->_connectionID != false;
+	}
+
+	// format and return date string in database timestamp format
+	function DBTimeStamp($ts)
+	{
+		if (empty($ts) && $ts !== 0) return 'null';
+		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+	// use right() and replace() ?
+		if (!$col) $col = $this->sysDate;
+
+		/* use TO_CHAR() if $fmt is TO_CHAR() allowed fmt */
+		if ($fmt== 'Y-m-d H:i:s')
+			return 'TO_CHAR('.$col.", 'YYYY-MM-DD HH24:MI:SS')";
+
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= $this->concat_operator;
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				if ($len==1) return "year($col)";
+				$s .= "char(year($col))";
+				break;
+			case 'M':
+				if ($len==1) return "monthname($col)";
+				$s .= "substr(monthname($col),1,3)";
+				break;
+			case 'm':
+				if ($len==1) return "month($col)";
+				$s .= "right(digits(month($col)),2)";
+				break;
+			case 'D':
+			case 'd':
+				if ($len==1) return "day($col)";
+				$s .= "right(digits(day($col)),2)";
+				break;
+			case 'H':
+			case 'h':
+				if ($len==1) return "hour($col)";
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				else $s .= "''";
+				break;
+			case 'i':
+			case 'I':
+				if ($len==1) return "minute($col)";
+				if ($col != $this->sysDate)
+					$s .= "right(digits(minute($col)),2)";
+					else $s .= "''";
+				break;
+			case 'S':
+			case 's':
+				if ($len==1) return "second($col)";
+				if ($col != $this->sysDate)
+					$s .= "right(digits(second($col)),2)";
+				else $s .= "''";
+				break;
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+			}
+		}
+		return $s;
+	} 
+ 
+	
+	function ServerInfo()
+	{
+		$row = $this->GetRow("SELECT service_level, fixpack_num FROM TABLE(sysproc.env_get_inst_info()) 
+			as INSTANCEINFO");
+
+		
+		if ($row) {		
+			$info['version'] = $row[0].':'.$row[1];
+			$info['fixpack'] = $row[1];
+			$info['description'] = '';
+		} else {
+			return ADOConnection::ServerInfo();
+		}
+		
+		return $info;
+	}
+	
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname,$start));
+		if (!$ok) return false;
+		return true;
+	}
+	
+	function DropSequence($seqname)
+	{
+		if (empty($this->_dropSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
+	{
+		$nrows = (integer) $nrows;
+		if ($offset <= 0) {
+		// could also use " OPTIMIZE FOR $nrows ROWS "
+			if ($nrows >= 0) $sql .=  " FETCH FIRST $nrows ROWS ONLY ";
+			$rs = $this->Execute($sql,$inputArr);
+		} else {
+			if ($offset > 0 && $nrows < 0);
+			else {
+				$nrows += $offset;
+				$sql .=  " FETCH FIRST $nrows ROWS ONLY ";
+			}
+			$rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
+		}
+		
+		return $rs;
+	}
+	
+	/*
+		This algorithm is not very efficient, but works even if table locking
+		is not available.
+		
+		Will return false if unable to generate an ID after $MAXLOOPS attempts.
+	*/
+	function GenID($seq='adodbseq',$start=1)
+	{	
+		// if you have to modify the parameter below, your database is overloaded,
+		// or you need to implement generation of id's yourself!
+				$num = $this->GetOne("VALUES NEXTVAL FOR $seq");
+				return $num;
+	}
+
+
+	function ErrorMsg()
+	{
+		if ($this->_haserrorfunctions) {
+			if ($this->_errorMsg !== false) return $this->_errorMsg;
+			if (empty($this->_connectionID)) return @db2_conn_errormsg();
+			return @db2_conn_errormsg($this->_connectionID);
+		} else return ADOConnection::ErrorMsg();
+	}
+	
+	function ErrorNo()
+	{
+		
+		if ($this->_haserrorfunctions) {
+			if ($this->_errorCode !== false) {
+				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
+			}
+
+			if (empty($this->_connectionID)) $e = @db2_conn_error(); 
+			else $e = @db2_conn_error($this->_connectionID);
+			
+			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+			 // so we check and patch
+			if (strlen($e)<=2) return 0;
+			return $e;
+		} else return ADOConnection::ErrorNo();
+	}
+	
+	
+
+	function BeginTrans()
+	{	
+		if (!$this->hasTransactions) return false;
+		if ($this->transOff) return true; 
+		$this->transCnt += 1;
+		$this->_autocommit = false;
+		return db2_autocommit($this->_connectionID,false);
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->_autocommit = true;
+		$ret = db2_commit($this->_connectionID);
+		db2_autocommit($this->_connectionID,true);
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true; 
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->_autocommit = true;
+		$ret = db2_rollback($this->_connectionID);
+		db2_autocommit($this->_connectionID,true);
+		return $ret;
+	}
+	
+	function MetaPrimaryKeys($table)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		if ($this->uCaseTables) $table = strtoupper($table);
+		$schema = '';
+		$this->_findschema($table,$schema);
+
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = @db2_primarykeys($this->_connectionID,'',$schema,$table);
+		
+		if (!$qid) {
+			$ADODB_FETCH_MODE = $savem;
+			return false;
+		}
+		$rs = new ADORecordSet_db2($qid);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if (!$rs) return false;
+		
+		$arr = $rs->GetArray();
+		$rs->Close();
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
+		}
+		return $arr2;
+	}
+	
+	function MetaForeignKeys($table, $owner = FALSE, $upper = FALSE, $asociative = FALSE )
+	{
+	global $ADODB_FETCH_MODE;
+	
+		if ($this->uCaseTables) $table = strtoupper($table);
+		$schema = '';
+		$this->_findschema($table,$schema);
+
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = @db2_foreign_keys($this->_connectionID,'',$schema,$table);
+		if (!$qid) {
+			$ADODB_FETCH_MODE = $savem;
+			return false;
+		}
+		$rs = new ADORecordSet_db2($qid);
+
+		$ADODB_FETCH_MODE = $savem;
+		/*
+		$rs->fields indices
+		0 PKTABLE_CAT
+		1 PKTABLE_SCHEM
+		2 PKTABLE_NAME
+		3 PKCOLUMN_NAME
+		4 FKTABLE_CAT
+		5 FKTABLE_SCHEM
+		6 FKTABLE_NAME
+		7 FKCOLUMN_NAME
+		*/	
+		if (!$rs) return false;
+
+		$foreign_keys = array();	 	 
+		while (!$rs->EOF) {
+			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
+				if (!is_array($foreign_keys[$rs->fields[5].'.'.$rs->fields[6]])) 
+					$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]] = array();
+				$foreign_keys[$rs->fields[5].'.'.$rs->fields[6]][$rs->fields[7]] = $rs->fields[3];	 		
+			}
+			$rs->MoveNext();
+		}
+
+		$rs->Close();
+		return $foreign_key;
+	}
+	
+	
+	function MetaTables($ttype=false,$schema=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = db2_tables($this->_connectionID);
+		
+		$rs = new ADORecordSet_db2($qid);
+		
+		$ADODB_FETCH_MODE = $savem;
+		if (!$rs) {
+			$false = false;
+			return $false;
+		}
+		
+		$arr = $rs->GetArray();
+		$rs->Close();
+		$arr2 = array();
+		
+		if ($ttype) {
+			$isview = strncmp($ttype,'V',1) === 0;
+		}
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if (!$arr[$i][2]) continue;
+			$type = $arr[$i][3];
+			$owner = $arr[$i][1];
+			$schemaval = ($schema) ? $arr[$i][1].'.' : '';
+			if ($ttype) { 
+				if ($isview) {
+					if (strncmp($type,'V',1) === 0) $arr2[] = $schemaval.$arr[$i][2];
+				} else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
+			} else if (strncmp($owner,'SYS',3) !== 0) $arr2[] = $schemaval.$arr[$i][2];
+		}
+		return $arr2;
+	}
+	
+/*
+See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp
+/ SQL data type codes /
+#define	SQL_UNKNOWN_TYPE	0
+#define SQL_CHAR			1
+#define SQL_NUMERIC		 2
+#define SQL_DECIMAL		 3
+#define SQL_INTEGER		 4
+#define SQL_SMALLINT		5
+#define SQL_FLOAT		   6
+#define SQL_REAL			7
+#define SQL_DOUBLE		  8
+#if (DB2VER >= 0x0300)
+#define SQL_DATETIME		9
+#endif
+#define SQL_VARCHAR		12
+
+
+/ One-parameter shortcuts for date/time data types /
+#if (DB2VER >= 0x0300)
+#define SQL_TYPE_DATE	  91
+#define SQL_TYPE_TIME	  92
+#define SQL_TYPE_TIMESTAMP 93
+
+#define SQL_UNICODE                             (-95)
+#define SQL_UNICODE_VARCHAR                     (-96)
+#define SQL_UNICODE_LONGVARCHAR                 (-97)
+*/
+	function DB2Types($t)
+	{
+		switch ((integer)$t) {
+		case 1:	
+		case 12:
+		case 0:
+		case -95:
+		case -96:
+			return 'C';
+		case -97:
+		case -1: //text
+			return 'X';
+		case -4: //image
+			return 'B';
+				
+		case 9:	
+		case 91:
+			return 'D';
+		
+		case 10:
+		case 11:
+		case 92:
+		case 93:
+			return 'T';
+			
+		case 4:
+		case 5:
+		case -6:
+			return 'I';
+			
+		case -11: // uniqidentifier
+			return 'R';
+		case -7: //bit
+			return 'L';
+		
+		default:
+			return 'N';
+		}
+	}
+	
+	function MetaColumns($table, $normalize=true)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$false = false;
+		if ($this->uCaseTables) $table = strtoupper($table);
+		$schema = '';
+		$this->_findschema($table,$schema);
+		
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	
+        	$colname = "%";
+	        $qid = db2_columns($this->_connectionID, "", $schema, $table, $colname);
+		if (empty($qid)) return $false;
+		
+		$rs = new ADORecordSet_db2($qid);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if (!$rs) return $false;
+		$rs->_fetch();
+		
+		$retarr = array();
+		
+		/*
+		$rs->fields indices
+		0 TABLE_QUALIFIER
+		1 TABLE_SCHEM
+		2 TABLE_NAME
+		3 COLUMN_NAME
+		4 DATA_TYPE
+		5 TYPE_NAME
+		6 PRECISION
+		7 LENGTH
+		8 SCALE
+		9 RADIX
+		10 NULLABLE
+		11 REMARKS
+		*/
+		while (!$rs->EOF) {
+			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[3];
+				$fld->type = $this->DB2Types($rs->fields[4]);
+				
+				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
+				// access uses precision to store length for char/varchar
+				if ($fld->type == 'C' or $fld->type == 'X') {
+					if ($rs->fields[4] <= -95) // UNICODE
+						$fld->max_length = $rs->fields[7]/2;
+					else
+						$fld->max_length = $rs->fields[7];
+				} else 
+					$fld->max_length = $rs->fields[7];
+				$fld->not_null = !empty($rs->fields[10]);
+				$fld->scale = $rs->fields[8];
+				$fld->primary_key = false;
+				$retarr[strtoupper($fld->name)] = $fld;	
+			} else if (sizeof($retarr)>0)
+				break;
+			$rs->MoveNext();
+		}
+		$rs->Close(); 
+		if (empty($retarr)) $retarr = false;
+
+	      $qid = db2_primary_keys($this->_connectionID, "", $schema, $table);
+		if (empty($qid)) return $false;
+		
+		$rs = new ADORecordSet_db2($qid);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if (!$rs) return $retarr;
+		$rs->_fetch();
+		
+		/*
+		$rs->fields indices
+		0 TABLE_CAT
+		1 TABLE_SCHEM
+		2 TABLE_NAME
+		3 COLUMN_NAME
+		4 KEY_SEQ
+		5 PK_NAME
+		*/
+		while (!$rs->EOF) {
+			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
+				$retarr[strtoupper($rs->fields[3])]->primary_key = true;
+			} else if (sizeof($retarr)>0)
+				break;
+			$rs->MoveNext();
+		}
+		$rs->Close(); 
+		
+		if (empty($retarr)) $retarr = false;
+		return $retarr;
+	}
+	
+		
+	function Prepare($sql)
+	{
+		if (! $this->_bindInputArray) return $sql; // no binding
+		$stmt = db2_prepare($this->_connectionID,$sql);
+		if (!$stmt) {
+			// we don't know whether db2 driver is parsing prepared stmts, so just return sql
+			return $sql;
+		}
+		return array($sql,$stmt,false);
+	}
+
+	/* returns queryID or false */
+	function _query($sql,$inputarr=false) 
+	{
+	GLOBAL $php_errormsg;
+		if (isset($php_errormsg)) $php_errormsg = '';
+		$this->_error = '';
+		
+		if ($inputarr) {
+			if (is_array($sql)) {
+				$stmtid = $sql[1];
+			} else {
+				$stmtid = db2_prepare($this->_connectionID,$sql);
+	
+				if ($stmtid == false) {
+					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+					return false;
+				}
+			}
+			
+			if (! db2_execute($stmtid,$inputarr)) {
+				if ($this->_haserrorfunctions) {
+					$this->_errorMsg = db2_stmt_errormsg();
+					$this->_errorCode = db2_stmt_error();
+				}
+				return false;
+			}
+		
+		} else if (is_array($sql)) {
+			$stmtid = $sql[1];
+			if (!db2_execute($stmtid)) {
+				if ($this->_haserrorfunctions) {
+					$this->_errorMsg = db2_stmt_errormsg();
+					$this->_errorCode = db2_stmt_error();
+				}
+				return false;
+			}
+		} else
+			$stmtid = @db2_exec($this->_connectionID,$sql);
+		
+		$this->_lastAffectedRows = 0;
+		if ($stmtid) {
+			if (@db2_num_fields($stmtid) == 0) {
+				$this->_lastAffectedRows = db2_num_rows($stmtid);
+				$stmtid = true;
+			} else {
+				$this->_lastAffectedRows = 0;
+			}
+			
+			if ($this->_haserrorfunctions) {
+				$this->_errorMsg = '';
+				$this->_errorCode = 0;
+			} else
+				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+		} else {
+			if ($this->_haserrorfunctions) {
+				$this->_errorMsg = db2_stmt_errormsg();
+				$this->_errorCode = db2_stmt_error();
+			} else
+				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+
+		}
+		return $stmtid;
+	}
+
+	/*
+		Insert a null into the blob field of the table first.
+		Then use UpdateBlob to store the blob.
+		
+		Usage:
+		 
+		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		$ret = @db2_close($this->_connectionID);
+		$this->_connectionID = false;
+		return $ret;
+	}
+
+	function _affectedrows()
+	{
+		return $this->_lastAffectedRows;
+	}
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_db2 extends ADORecordSet {	
+	
+	var $bind = false;
+	var $databaseType = "db2";		
+	var $dataProvider = "db2";
+	var $useFetchArray;
+	
+	function ADORecordSet_db2($id,$mode=false)
+	{
+		if ($mode === false) {  
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		
+		$this->_queryID = $id;
+	}
+
+
+	// returns the field object
+	function FetchField($offset = -1) 
+	{
+		$o= new ADOFieldObject();
+		$o->name = @db2_field_name($this->_queryID,$offset);
+		$o->type = @db2_field_type($this->_queryID,$offset);
+		$o->max_length = db2_field_width($this->_queryID,$offset);
+		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+		return $o;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+		
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @db2_num_rows($this->_queryID) : -1;
+		$this->_numOfFields = @db2_num_fields($this->_queryID);
+		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
+		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
+	}	
+	
+	function _seek($row)
+	{
+		return false;
+	}
+	
+	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
+	function GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) {
+			$rs = $this->GetArray($nrows);
+			return $rs;
+		}
+		$savem = $this->fetchMode;
+		$this->fetchMode = ADODB_FETCH_NUM;
+		$this->Move($offset);
+		$this->fetchMode = $savem;
+		
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+		}
+		
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+	
+	
+	function MoveNext() 
+	{
+		if ($this->_numOfRows != 0 && !$this->EOF) {		
+			$this->_currentRow++;
+			
+			$this->fields = @db2_fetch_array($this->_queryID);
+			if ($this->fields) {
+				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+					$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+				}
+				return true;
+			}
+		}
+		$this->fields = false;
+		$this->EOF = true;
+		return false;
+	}	
+	
+	function _fetch()
+	{
+
+		$this->fields = db2_fetch_array($this->_queryID);
+		if ($this->fields) {
+			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+			}
+			return true;
+		}
+		$this->fields = false;
+		return false;
+	}
+	
+	function _close() 
+	{
+		return @db2_free_result($this->_queryID);		
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-db2oci.inc.php b/adodb/drivers/adodb-db2oci.inc.php
new file mode 100644
index 0000000..6afa944
--- /dev/null
+++ b/adodb/drivers/adodb-db2oci.inc.php
@@ -0,0 +1,230 @@
+ $_COLONSZ) return $p;
+	$_COLONARR[] = $v;
+	return '?';
+}
+
+// smart remapping of :0, :1 bind vars to ? ?
+function _colonscope($sql,$arr)
+{
+global $_COLONARR,$_COLONSZ;
+
+	$_COLONARR = array();
+	$_COLONSZ = sizeof($arr);
+	
+	$sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql);
+	
+	if (empty($_COLONARR)) return array($sql,$arr);
+	
+	foreach($_COLONARR as $k => $v) {
+		$arr2[] = $arr[$v]; 
+	}
+	
+	return array($sql2,$arr2);
+}
+*/
+
+/*
+	Smart remapping of :0, :1 bind vars to ? ?
+	
+	Handles colons in comments -- and / * * / and in quoted strings.
+*/
+
+function _colonparser($sql,$arr)
+{
+	$lensql = strlen($sql);
+	$arrsize = sizeof($arr);
+	$state = 'NORM';
+	$at = 1;
+	$ch = $sql[0]; 
+	$ch2 = @$sql[1];
+	$sql2 = '';
+	$arr2 = array();
+	$nprev = 0;
+	
+	
+	while (strlen($ch)) {
+	
+		switch($ch) {
+		case '/':
+			if ($state == 'NORM' && $ch2 == '*') {
+				$state = 'COMMENT';
+				
+				$at += 1;
+				$ch = $ch2;
+				$ch2 = $at < $lensql ? $sql[$at] : '';
+			}
+			break;
+			
+		case '*':
+			if ($state == 'COMMENT' && $ch2 == '/') {
+				$state = 'NORM';
+				
+				$at += 1;
+				$ch = $ch2;
+				$ch2 = $at < $lensql ? $sql[$at] : '';
+			}
+			break;
+		
+		case "\n":
+		case "\r":
+			if ($state == 'COMMENT2') $state = 'NORM';
+			break;
+		
+		case "'":
+			do {
+				$at += 1;
+				$ch = $ch2;
+				$ch2 = $at < $lensql ? $sql[$at] : '';
+			} while ($ch !== "'");
+			break;
+			
+		case ':':
+			if ($state == 'COMMENT' || $state == 'COMMENT2') break;
+			
+			//echo "$at=$ch $ch2, ";
+			if ('0' <= $ch2 && $ch2 <= '9') {
+				$n = '';
+				$nat = $at;
+				do {
+					$at += 1;
+					$ch = $ch2;
+					$n .= $ch;
+					$ch2 = $at < $lensql ? $sql[$at] : '';
+				} while ('0' <= $ch && $ch <= '9');
+				#echo "$n $arrsize ] ";
+				$n = (integer) $n;
+				if ($n < $arrsize) {
+					$sql2 .= substr($sql,$nprev,$nat-$nprev-1).'?';
+					$nprev = $at-1;
+					$arr2[] = $arr[$n];
+				}
+			}
+			break;
+			
+		case '-':
+			if ($state == 'NORM') {
+				if ($ch2 == '-') $state = 'COMMENT2';
+				$at += 1;
+				$ch = $ch2;
+				$ch2 = $at < $lensql ? $sql[$at] : '';
+			}
+			break;
+		}
+		
+		$at += 1;
+		$ch = $ch2;
+		$ch2 = $at < $lensql ? $sql[$at] : '';
+	}
+	
+	if ($nprev == 0) {
+		$sql2 = $sql;
+	} else {
+		$sql2 .= substr($sql,$nprev);
+	}
+	
+	return array($sql2,$arr2);
+}
+
+class ADODB_db2oci extends ADODB_db2 {
+	var $databaseType = "db2oci";	
+	var $sysTimeStamp = 'sysdate';
+	var $sysDate = 'trunc(sysdate)';
+	var $_bindInputArray = true;
+	
+	function ADODB_db2oci()
+	{
+		parent::ADODB_db2();
+	}
+	
+	function Param($name,$type=false)
+	{
+		return ':'.$name;
+	}
+	
+	
+	function MetaTables($ttype=false,$schema=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = db2_tables($this->_connectionID);
+		
+		$rs = new ADORecordSet_db2($qid);
+		
+		$ADODB_FETCH_MODE = $savem;
+		if (!$rs) {
+			$false = false;
+			return $false;
+		}
+		
+		$arr = $rs->GetArray();
+		$rs->Close();
+		$arr2 = array();
+	//	adodb_pr($arr);
+		if ($ttype) {
+			$isview = strncmp($ttype,'V',1) === 0;
+		}
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if (!$arr[$i][2]) continue;
+			$type = $arr[$i][3];
+			$schemaval = ($schema) ? $arr[$i][1].'.' : '';
+			$name = $schemaval.$arr[$i][2];
+			$owner = $arr[$i][1];
+			if (substr($name,0,8) == 'EXPLAIN_') continue;
+			if ($ttype) { 
+				if ($isview) {
+					if (strncmp($type,'V',1) === 0) $arr2[] = $name;
+				} else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name;
+			} else if (strncmp($type,'T',1) === 0 && strncmp($owner,'SYS',3) !== 0) $arr2[] = $name;
+		}
+		return $arr2;
+	}
+	
+	function _Execute($sql, $inputarr=false	)
+	{
+		if ($inputarr) list($sql,$inputarr) = _colonparser($sql, $inputarr);
+		return parent::_Execute($sql, $inputarr);
+	}
+};
+ 
+
+class  ADORecordSet_db2oci extends ADORecordSet_db2 {	
+	
+	var $databaseType = "db2oci";		
+	
+	function ADORecordSet_db2oci($id,$mode=false)
+	{
+		return $this->ADORecordSet_db2($id,$mode);
+	}
+}
+
+} //define
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-db2ora.inc.php b/adodb/drivers/adodb-db2ora.inc.php
new file mode 100644
index 0000000..e02e269
--- /dev/null
+++ b/adodb/drivers/adodb-db2ora.inc.php
@@ -0,0 +1,80 @@
+ $_COLONSZ) return $p;
+	$_COLONARR[] = $v;
+	return '?';
+}
+
+function _colonscope($sql,$arr)
+{
+global $_COLONARR,$_COLONSZ;
+
+	$_COLONARR = array();
+	$_COLONSZ = sizeof($arr);
+	
+	$sql2 = preg_replace("/(:[0-9]+)/e","_colontrack('\\1')",$sql);
+	
+	if (empty($_COLONARR)) return array($sql,$arr);
+	
+	foreach($_COLONARR as $k => $v) {
+		$arr2[] = $arr[$v]; 
+	}
+	
+	return array($sql2,$arr2);
+}
+
+class ADODB_db2oci extends ADODB_db2 {
+	var $databaseType = "db2oci";	
+	var $sysTimeStamp = 'sysdate';
+	var $sysDate = 'trunc(sysdate)';
+	
+	function ADODB_db2oci()
+	{
+		$this->ADODB_db2();
+	}
+	
+	
+	function _Execute($sql, $inputarr)
+	{
+		if ($inputarr) list($sql,$inputarr) = _colonscope($sql, $inputarr);
+		return parent::_Execute($sql, $inputarr);
+	}
+};
+ 
+
+class  ADORecordSet_db2oci extends ADORecordSet_odbc {	
+	
+	var $databaseType = "db2oci";		
+	
+	function ADORecordSet_db2oci($id,$mode=false)
+	{
+		return $this->ADORecordSet_db2($id,$mode);
+	}
+}
+
+} //define
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-fbsql.inc.php b/adodb/drivers/adodb-fbsql.inc.php
new file mode 100644
index 0000000..1cb5597
--- /dev/null
+++ b/adodb/drivers/adodb-fbsql.inc.php
@@ -0,0 +1,266 @@
+. 
+  Set tabs to 8.
+*/ 
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (! defined("_ADODB_FBSQL_LAYER")) {
+ define("_ADODB_FBSQL_LAYER", 1 );
+
+class ADODB_fbsql extends ADOConnection {
+	var $databaseType = 'fbsql';
+	var $hasInsertID = true;
+	var $hasAffectedRows = true;	
+	var $metaTablesSQL = "SHOW TABLES";	
+	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $hasLimit = false;
+	
+	function ADODB_fbsql() 
+	{			
+	}
+	
+	function _insertid()
+	{
+			return fbsql_insert_id($this->_connectionID);
+	}
+	
+	function _affectedrows()
+	{
+			return fbsql_affected_rows($this->_connectionID);
+	}
+  
+  	function MetaDatabases()
+	{
+		$qid = fbsql_list_dbs($this->_connectionID);
+		$arr = array();
+		$i = 0;
+		$max = fbsql_num_rows($qid);
+		while ($i < $max) {
+			$arr[] = fbsql_tablename($qid,$i);
+			$i += 1;
+		}
+		return $arr;
+	}
+
+	// returns concatenated string
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+		$first = true;
+
+		$s = implode(',',$arr);
+		if (sizeof($arr) > 0) return "CONCAT($s)";
+		else return '';
+	}
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = fbsql_connect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->_connectionID = fbsql_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+ 	function MetaColumns($table, $normalize=true) 
+	{
+		if ($this->metaColumnsSQL) {
+			
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+			
+			if ($rs === false) return false;
+			
+			$retarr = array();
+			while (!$rs->EOF){
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+				$fld->type = $rs->fields[1];
+					
+				// split type into type(length):
+				if (preg_match("/^(.+)\((\d+)\)$/", $fld->type, $query_array)) {
+					$fld->type = $query_array[1];
+					$fld->max_length = $query_array[2];
+				} else {
+					$fld->max_length = -1;
+				}
+				$fld->not_null = ($rs->fields[2] != 'YES');
+				$fld->primary_key = ($rs->fields[3] == 'PRI');
+				$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
+				$fld->binary = (strpos($fld->type,'blob') !== false);
+				
+				$retarr[strtoupper($fld->name)] = $fld;	
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return false;
+	}
+		
+	// returns true or false
+	function SelectDB($dbName) 
+	{
+		$this->database = $dbName;
+		if ($this->_connectionID) {
+			return @fbsql_select_db($dbName,$this->_connectionID);		
+		}
+		else return false;	
+	}
+	
+	
+	// returns queryID or false
+	function _query($sql,$inputarr=false)
+	{
+		return fbsql_query("$sql;",$this->_connectionID);
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+		$this->_errorMsg = @fbsql_error($this->_connectionID);
+			return $this->_errorMsg;
+	}
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	{
+		return @fbsql_errno($this->_connectionID);
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return @fbsql_close($this->_connectionID);
+	}
+		
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_fbsql extends ADORecordSet{	
+	
+	var $databaseType = "fbsql";
+	var $canSeek = true;
+	
+	function ADORecordSet_fbsql($queryID,$mode=false) 
+	{
+		if (!$mode) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode) {
+		case ADODB_FETCH_NUM: $this->fetchMode = FBSQL_NUM; break;
+		case ADODB_FETCH_ASSOC: $this->fetchMode = FBSQL_ASSOC; break;
+		case ADODB_FETCH_BOTH: 
+		default:
+		$this->fetchMode = FBSQL_BOTH; break;
+		}
+		return $this->ADORecordSet($queryID);
+	}
+	
+	function _initrs()
+	{
+	GLOBAL $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @fbsql_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @fbsql_num_fields($this->_queryID);
+	}
+	
+
+
+	function FetchField($fieldOffset = -1) {
+		if ($fieldOffset != -1) {
+			$o =  @fbsql_fetch_field($this->_queryID, $fieldOffset);
+			//$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable
+			$f = @fbsql_field_flags($this->_queryID,$fieldOffset);
+			$o->binary = (strpos($f,'binary')!== false);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$o = @fbsql_fetch_field($this->_queryID);// fbsql returns the max length less spaces -- so it is unrealiable
+			//$o->max_length = -1;
+		}
+		
+		return $o;
+	}
+		
+	function _seek($row)
+	{
+		return @fbsql_data_seek($this->_queryID,$row);
+	}
+	
+	function _fetch($ignore_fields=false)
+	{
+		$this->fields = @fbsql_fetch_array($this->_queryID,$this->fetchMode);
+		return ($this->fields == true);
+	}
+	
+	function _close() {
+		return @fbsql_free_result($this->_queryID);		
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		$len = -1; // fbsql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'CHARACTER':
+		case 'CHARACTER VARYING': 
+		case 'BLOB': 
+		case 'CLOB': 
+		case 'BIT': 
+		case 'BIT VARYING': 
+			if ($len <= $this->blobSize) return 'C';
+			
+		// so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+			return !empty($fieldobj->binary) ? 'B' : 'X';
+			
+		case 'DATE': return 'D';
+		
+		case 'TIME':
+		case 'TIME WITH TIME ZONE':
+		case 'TIMESTAMP': 
+		case 'TIMESTAMP WITH TIME ZONE': return 'T';
+		
+		case 'PRIMARY_KEY':
+			return 'R';
+		case 'INTEGER':
+		case 'SMALLINT': 
+		case 'BOOLEAN':
+			
+			if (!empty($fieldobj->primary_key)) return 'R';
+			else return 'I';
+		
+		default: return 'N';
+		}
+	}
+
+} //class
+} // defined
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-firebird.inc.php b/adodb/drivers/adodb-firebird.inc.php
new file mode 100644
index 0000000..3bb07e7
--- /dev/null
+++ b/adodb/drivers/adodb-firebird.inc.php
@@ -0,0 +1,77 @@
+ADODB_ibase();
+	}
+	
+	function ServerInfo()
+	{
+		$arr['dialect'] = $this->dialect;
+		switch($arr['dialect']) {
+		case '': 
+		case '1': $s = 'Firebird Dialect 1'; break;
+		case '2': $s = 'Firebird Dialect 2'; break;
+		default:
+		case '3': $s = 'Firebird Dialect 3'; break;
+		}
+		$arr['version'] = ADOConnection::_findvers($s);
+		$arr['description'] = $s;
+		return $arr;
+	}
+	
+	// Note that Interbase 6.5 uses this ROWS instead - don't you love forking wars!
+	// 		SELECT col1, col2 FROM table ROWS 5 -- get 5 rows 
+	//		SELECT col1, col2 FROM TABLE ORDER BY col1 ROWS 3 TO 7 -- first 5 skip 2
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false, $secs=0)
+	{
+		$nrows = (integer) $nrows;
+		$offset = (integer) $offset;
+		$str = 'SELECT ';
+		if ($nrows >= 0) $str .= "FIRST $nrows "; 
+		$str .=($offset>=0) ? "SKIP $offset " : '';
+		
+		$sql = preg_replace('/^[ \t]*select/i',$str,$sql); 
+		if ($secs)
+			$rs = $this->CacheExecute($secs,$sql,$inputarr);
+		else
+			$rs = $this->Execute($sql,$inputarr);
+			
+		return $rs;
+	}
+	
+	
+};
+ 
+
+class  ADORecordSet_firebird extends ADORecordSet_ibase {	
+	
+	var $databaseType = "firebird";		
+	
+	function ADORecordSet_firebird($id,$mode=false)
+	{
+		$this->ADORecordSet_ibase($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-ibase.inc.php b/adodb/drivers/adodb-ibase.inc.php
new file mode 100644
index 0000000..71c3a5e
--- /dev/null
+++ b/adodb/drivers/adodb-ibase.inc.php
@@ -0,0 +1,887 @@
+
+  	changed transaction handling and added experimental blob stuff
+  
+  Docs to interbase at the website
+   http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html
+   
+  To use gen_id(), see
+   http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen
+   
+   $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database');
+   $id = $rs->fields[0];
+   $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+class ADODB_ibase extends ADOConnection {
+	var $databaseType = "ibase";
+	var $dataProvider = "ibase";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $ibase_datefmt = '%Y-%m-%d'; // For hours,mins,secs change to '%Y-%m-%d %H:%M:%S';
+	var $fmtDate = "'Y-m-d'";
+	var $ibase_timestampfmt = "%Y-%m-%d %H:%M:%S";
+	var $ibase_timefmt = "%H:%M:%S";
+	var $fmtTimeStamp = "'Y-m-d, H:i:s'";
+	var $concat_operator='||';
+	var $_transactionID;
+	var $metaTablesSQL = "select rdb\$relation_name from rdb\$relations where rdb\$relation_name not like 'RDB\$%'";
+	//OPN STUFF start
+	var $metaColumnsSQL = "select a.rdb\$field_name, a.rdb\$null_flag, a.rdb\$default_source, b.rdb\$field_length, b.rdb\$field_scale, b.rdb\$field_sub_type, b.rdb\$field_precision, b.rdb\$field_type from rdb\$relation_fields a, rdb\$fields b where a.rdb\$field_source = b.rdb\$field_name and a.rdb\$relation_name = '%s' order by a.rdb\$field_position asc";
+	//OPN STUFF end
+	var $ibasetrans;
+	var $hasGenID = true;
+	var $_bindInputArray = true;
+	var $buffers = 0;
+	var $dialect = 1;
+	var $sysDate = "cast('TODAY' as timestamp)";
+	var $sysTimeStamp = "CURRENT_TIMESTAMP"; //"cast('NOW' as timestamp)";
+	var $ansiOuter = true;
+	var $hasAffectedRows = false;
+	var $poorAffectedRows = true;
+	var $blobEncodeType = 'C';
+	var $role = false;
+	
+	function ADODB_ibase() 
+	{
+		 if (defined('IBASE_DEFAULT')) $this->ibasetrans = IBASE_DEFAULT;
+  	}
+	
+	
+	   // returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$persist=false)
+	{  
+		if (!function_exists('ibase_pconnect')) return null;
+		if ($argDatabasename) $argHostname .= ':'.$argDatabasename;
+		$fn = ($persist) ? 'ibase_pconnect':'ibase_connect';
+		if ($this->role)
+			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
+					$this->charSet,$this->buffers,$this->dialect,$this->role);
+		else	
+			$this->_connectionID = $fn($argHostname,$argUsername,$argPassword,
+					$this->charSet,$this->buffers,$this->dialect);
+		
+		if ($this->dialect != 1) { // http://www.ibphoenix.com/ibp_60_del_id_ds.html
+			$this->replaceQuote = "''";
+		}
+		if ($this->_connectionID === false) {
+			$this->_handleerror();
+			return false;
+		}
+		
+		// PHP5 change.
+		if (function_exists('ibase_timefmt')) {
+			ibase_timefmt($this->ibase_datefmt,IBASE_DATE );
+			if ($this->dialect == 1) ibase_timefmt($this->ibase_datefmt,IBASE_TIMESTAMP );
+			else ibase_timefmt($this->ibase_timestampfmt,IBASE_TIMESTAMP );
+			ibase_timefmt($this->ibase_timefmt,IBASE_TIME );
+			
+		} else {
+			ini_set("ibase.timestampformat", $this->ibase_timestampfmt);
+			ini_set("ibase.dateformat", $this->ibase_datefmt);
+			ini_set("ibase.timeformat", $this->ibase_timefmt);
+		}
+		return true;
+	}
+	   // returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,true);
+	}	
+	
+	
+	function MetaPrimaryKeys($table,$owner_notused=false,$internalKey=false)
+	{	
+		if ($internalKey) return array('RDB$DB_KEY');
+		
+		$table = strtoupper($table);
+		
+		$sql = 'SELECT S.RDB$FIELD_NAME AFIELDNAME
+	FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON I.RDB$INDEX_NAME=S.RDB$INDEX_NAME  
+	WHERE I.RDB$RELATION_NAME=\''.$table.'\' and I.RDB$INDEX_NAME like \'RDB$PRIMARY%\'
+	ORDER BY I.RDB$INDEX_NAME,S.RDB$FIELD_POSITION';
+
+		$a = $this->GetCol($sql,false,true);
+		if ($a && sizeof($a)>0) return $a;
+		return false;	  
+	}
+	
+	function ServerInfo()
+	{
+		$arr['dialect'] = $this->dialect;
+		switch($arr['dialect']) {
+		case '': 
+		case '1': $s = 'Interbase 5.5 or earlier'; break;
+		case '2': $s = 'Interbase 5.6'; break;
+		default:
+		case '3': $s = 'Interbase 6.0'; break;
+		}
+		$arr['version'] = ADOConnection::_findvers($s);
+		$arr['description'] = $s;
+		return $arr;
+	}
+
+	function BeginTrans()
+	{	 
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->autoCommit = false;
+	 	$this->_transactionID = $this->_connectionID;//ibase_trans($this->ibasetrans, $this->_connectionID);
+		return $this->_transactionID;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ret = false;
+		$this->autoCommit = true;
+		if ($this->_transactionID) {
+			   		//print ' commit ';
+			$ret = ibase_commit($this->_transactionID);
+		}
+		$this->_transactionID = false;
+		return $ret;
+	}
+	
+	// there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently.
+	// it appears that ibase extension cannot support multiple concurrent queryid's
+	function _Execute($sql,$inputarr=false) 
+	{
+	global $ADODB_COUNTRECS;
+	
+		if ($this->_logsql) {
+			$savecrecs = $ADODB_COUNTRECS;
+			$ADODB_COUNTRECS = true; // force countrecs
+			$ret = ADOConnection::_Execute($sql,$inputarr);
+			$ADODB_COUNTRECS = $savecrecs;
+		} else {
+			$ret = ADOConnection::_Execute($sql,$inputarr);
+		}
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ret = false;
+		$this->autoCommit = true;
+		if ($this->_transactionID) 
+				  $ret = ibase_rollback($this->_transactionID);
+		$this->_transactionID = false;   
+		
+		return $ret;
+	}
+	
+	function MetaIndexes ($table, $primary = FALSE, $owner=false)
+	{
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+        $false = false;
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+        $table = strtoupper($table);
+        $sql = "SELECT * FROM RDB\$INDICES WHERE RDB\$RELATION_NAME = '".$table."'";
+        if (!$primary) {
+        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$%'";
+        } else {
+        	$sql .= " AND RDB\$INDEX_NAME NOT LIKE 'RDB\$FOREIGN%'";
+        }
+        // get index details
+        $rs = $this->Execute($sql);
+        if (!is_object($rs)) {
+	        // restore fetchmode
+	        if (isset($savem)) {
+	            $this->SetFetchMode($savem);
+	        }
+	        $ADODB_FETCH_MODE = $save;
+            return $false;
+        }
+        
+        $indexes = array();
+		while ($row = $rs->FetchRow()) {
+			$index = $row[0];
+             if (!isset($indexes[$index])) {
+             		if (is_null($row[3])) {$row[3] = 0;}
+                     $indexes[$index] = array(
+                             'unique' => ($row[3] == 1),
+                             'columns' => array()
+                     );
+             }
+			$sql = "SELECT * FROM RDB\$INDEX_SEGMENTS WHERE RDB\$INDEX_NAME = '".$index."' ORDER BY RDB\$FIELD_POSITION ASC";
+			$rs1 = $this->Execute($sql);
+            while ($row1 = $rs1->FetchRow()) {
+             	$indexes[$index]['columns'][$row1[2]] = $row1[1];
+        	}
+		}
+        // restore fetchmode
+        if (isset($savem)) {
+            $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+        
+        return $indexes;
+	}
+
+	
+	// See http://community.borland.com/article/0,1410,25844,00.html
+	function RowLock($tables,$where,$col=false)
+	{
+		if ($this->autoCommit) $this->BeginTrans();
+		$this->Execute("UPDATE $table SET $col=$col WHERE $where "); // is this correct - jlim?
+		return 1;
+	}
+	
+	
+	function CreateSequence($seqname,$startID=1)
+	{
+		$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
+		if (!$ok) return false;
+		return $this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
+	}
+	
+	function DropSequence($seqname)
+	{
+		$seqname = strtoupper($seqname);
+		$this->Execute("delete from RDB\$GENERATORS where RDB\$GENERATOR_NAME='$seqname'");
+	}
+	
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		$getnext = ("SELECT Gen_ID($seqname,1) FROM RDB\$DATABASE");
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			$this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
+			$this->Execute("SET GENERATOR $seqname TO ".($startID-1).';');
+			$rs = $this->Execute($getnext);
+		}
+		if ($rs && !$rs->EOF) $this->genID = (integer) reset($rs->fields);
+		else $this->genID = 0; // false
+		
+		if ($rs) $rs->Close();
+		
+		return $this->genID;
+	}
+
+	function SelectDB($dbName) 
+	{
+		   return false;
+	}
+
+	function _handleerror()
+	{
+		$this->_errorMsg = ibase_errmsg();
+	}
+
+	function ErrorNo() 
+	{
+		if (preg_match('/error code = ([\-0-9]*)/i', $this->_errorMsg,$arr)) return (integer) $arr[1];
+		else return 0;
+	}
+
+	function ErrorMsg() 
+	{
+			return $this->_errorMsg;
+	}
+
+	function Prepare($sql)
+	{
+		$stmt = ibase_prepare($this->_connectionID,$sql);
+		if (!$stmt) return false;
+		return array($sql,$stmt);
+	}
+
+	   // returns query ID if successful, otherwise false
+	   // there have been reports of problems with nested queries - the code is probably not re-entrant?
+	function _query($sql,$iarr=false)
+	{ 
+
+		if (!$this->autoCommit && $this->_transactionID) {
+			$conn = $this->_transactionID;
+			$docommit = false;
+		} else {
+			$conn = $this->_connectionID;
+			$docommit = true;
+		}
+		if (is_array($sql)) {
+			$fn = 'ibase_execute';
+			$sql = $sql[1];
+			if (is_array($iarr)) {
+				if  (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
+					if ( !isset($iarr[0]) ) $iarr[0] = ''; // PHP5 compat hack
+					$fnarr = array_merge( array($sql) , $iarr);
+					$ret = call_user_func_array($fn,$fnarr);
+				} else {
+					switch(sizeof($iarr)) {
+					case 1: $ret = $fn($sql,$iarr[0]); break;
+					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
+					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
+					case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+					case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+					case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+					case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
+					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+					}
+				}
+			} else $ret = $fn($sql); 
+		} else {
+			$fn = 'ibase_query';
+		
+			if (is_array($iarr)) {	
+				if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
+					if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
+					$fnarr = array_merge( array($conn,$sql) , $iarr);
+					$ret = call_user_func_array($fn,$fnarr);
+				} else {
+					switch(sizeof($iarr)) {
+					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
+					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
+					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
+					case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+					case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+					case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+					case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
+					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+					}
+				}
+			} else $ret = $fn($conn,$sql); 
+		}
+		if ($docommit && $ret === true) ibase_commit($this->_connectionID);
+
+		$this->_handleerror();
+		return $ret;
+	}
+
+	 // returns true or false
+	 function _close()
+	 {	   
+		if (!$this->autoCommit) @ibase_rollback($this->_connectionID);
+		return @ibase_close($this->_connectionID);
+	 }
+	
+	//OPN STUFF start
+	function _ConvertFieldType(&$fld, $ftype, $flen, $fscale, $fsubtype, $fprecision, $dialect3)
+	{
+		$fscale = abs($fscale);
+		$fld->max_length = $flen;
+		$fld->scale = null;
+		switch($ftype){
+			case 7: 
+			case 8:
+				if ($dialect3) {
+				    switch($fsubtype){
+				    	case 0: 
+				    		$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
+				    		break;
+				    	case 1: 
+				    		$fld->type = 'numeric';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+				    		break;
+				    	case 2:
+				    		$fld->type = 'decimal';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+				    		break;
+				    } // switch
+				} else {
+					if ($fscale !=0) {
+					    $fld->type = 'decimal';
+						$fld->scale = $fscale;
+						$fld->max_length = ($ftype == 7 ? 4 : 9);
+					} else {
+						$fld->type = ($ftype == 7 ? 'smallint' : 'integer');
+					}
+				}
+				break;
+			case 16: 
+				if ($dialect3) {
+				    switch($fsubtype){
+				    	case 0: 
+				    		$fld->type = 'decimal';
+							$fld->max_length = 18;
+							$fld->scale = 0;
+				    		break;
+				    	case 1: 
+				    		$fld->type = 'numeric';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+				    		break;
+				    	case 2:
+				    		$fld->type = 'decimal';
+							$fld->max_length = $fprecision;
+							$fld->scale = $fscale;
+				    		break;
+				    } // switch
+				}
+				break;
+			case 10:
+				$fld->type = 'float';
+				break;
+			case 14:
+				$fld->type = 'char';
+				break;
+			case 27:
+				if ($fscale !=0) {
+				    $fld->type = 'decimal';
+					$fld->max_length = 15;
+					$fld->scale = 5;
+				} else {
+					$fld->type = 'double';
+				}
+				break;
+			case 35:
+				if ($dialect3) {
+				    $fld->type = 'timestamp';
+				} else {
+					$fld->type = 'date';
+				}
+				break;
+			case 12:
+				$fld->type = 'date';
+				break;
+			case 13:
+				$fld->type = 'time';
+				break;
+			case 37:
+				$fld->type = 'varchar';
+				break;
+			case 40:
+				$fld->type = 'cstring';
+				break;
+			case 261:
+				$fld->type = 'blob';
+				$fld->max_length = -1;
+				break;
+		} // switch
+	}
+	//OPN STUFF end
+		// returns array of ADOFieldObjects for current table
+	function MetaColumns($table, $normalize=true) 
+	{
+	global $ADODB_FETCH_MODE;
+		
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+	
+		$ADODB_FETCH_MODE = $save;
+		$false = false;
+		if ($rs === false) {
+			return $false;
+		}
+		
+		$retarr = array();
+		//OPN STUFF start
+		$dialect3 = ($this->dialect==3 ? true : false);
+		//OPN STUFF end
+		while (!$rs->EOF) { //print_r($rs->fields);
+			$fld = new ADOFieldObject();
+			$fld->name = trim($rs->fields[0]);
+			//OPN STUFF start
+			$this->_ConvertFieldType($fld, $rs->fields[7], $rs->fields[3], $rs->fields[4], $rs->fields[5], $rs->fields[6], $dialect3);
+			if (isset($rs->fields[1]) && $rs->fields[1]) {
+				$fld->not_null = true;
+			}				
+			if (isset($rs->fields[2])) {
+				
+				$fld->has_default = true;
+				$d = substr($rs->fields[2],strlen('default '));
+				switch ($fld->type)
+				{
+				case 'smallint':
+				case 'integer': $fld->default_value = (int) $d; break;
+				case 'char': 
+				case 'blob':
+				case 'text':
+				case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
+				case 'double':
+				case 'float': $fld->default_value = (float) $d; break;
+				default: $fld->default_value = $d; break;
+				}
+		//	case 35:$tt = 'TIMESTAMP'; break;
+			}
+			if ((isset($rs->fields[5])) && ($fld->type == 'blob')) {
+				$fld->sub_type = $rs->fields[5];
+			} else {
+				$fld->sub_type = null;
+			}
+			//OPN STUFF end
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[strtoupper($fld->name)] = $fld;
+			
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		if ( empty($retarr)) return $false;
+		else return $retarr;	
+	}
+	
+	function BlobEncode( $blob ) 
+	{
+		$blobid = ibase_blob_create( $this->_connectionID);
+		ibase_blob_add( $blobid, $blob );
+		return ibase_blob_close( $blobid );
+	}
+	
+	// since we auto-decode all blob's since 2.42, 
+	// BlobDecode should not do any transforms
+	function BlobDecode($blob)
+	{
+		return $blob; 
+	}
+	
+	
+	
+	
+	// old blobdecode function
+	// still used to auto-decode all blob's
+	function _BlobDecode_old( $blob ) 
+	{
+		$blobid = ibase_blob_open($this->_connectionID, $blob );
+		$realblob = ibase_blob_get( $blobid,$this->maxblobsize); // 2nd param is max size of blob -- Kevin Boillet 
+		while($string = ibase_blob_get($blobid, 8192)){ 
+			$realblob .= $string; 
+		}
+		ibase_blob_close( $blobid );
+
+		return( $realblob );
+	} 
+	
+	function _BlobDecode( $blob ) 
+    {
+        if  (ADODB_PHPVER >= 0x5000) {
+            $blob_data = ibase_blob_info($this->_connectionID, $blob );
+            $blobid = ibase_blob_open($this->_connectionID, $blob );
+        } else {
+
+            $blob_data = ibase_blob_info( $blob );
+            $blobid = ibase_blob_open( $blob );
+        }
+
+        if( $blob_data[0] > $this->maxblobsize ) {
+
+            $realblob = ibase_blob_get($blobid, $this->maxblobsize);
+
+            while($string = ibase_blob_get($blobid, 8192)){
+                $realblob .= $string; 
+            }
+        } else {
+            $realblob = ibase_blob_get($blobid, $blob_data[0]);
+        }
+
+        ibase_blob_close( $blobid );
+        return( $realblob );
+	}
+	
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
+	{ 
+		$fd = fopen($path,'rb'); 
+		if ($fd === false) return false; 
+		$blob_id = ibase_blob_create($this->_connectionID); 
+		
+		/* fill with data */ 
+		
+		while ($val = fread($fd,32768)){ 
+			ibase_blob_add($blob_id, $val); 
+		} 
+		
+		/* close and get $blob_id_str for inserting into table */ 
+		$blob_id_str = ibase_blob_close($blob_id); 
+		
+		fclose($fd); 
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
+	} 
+	
+	/*
+		Insert a null into the blob field of the table first.
+		Then use UpdateBlob to store the blob.
+		
+		Usage:
+		 
+		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') 
+	{ 
+	$blob_id = ibase_blob_create($this->_connectionID); 
+	
+	// ibase_blob_add($blob_id, $val); 
+	
+	// replacement that solves the problem by which only the first modulus 64K / 
+	// of $val are stored at the blob field //////////////////////////////////// 
+	// Thx Abel Berenstein  aberenstein#afip.gov.ar
+	$len = strlen($val); 
+	$chunk_size = 32768; 
+	$tail_size = $len % $chunk_size; 
+	$n_chunks = ($len - $tail_size) / $chunk_size; 
+	
+	for ($n = 0; $n < $n_chunks; $n++) { 
+		$start = $n * $chunk_size; 
+		$data = substr($val, $start, $chunk_size); 
+		ibase_blob_add($blob_id, $data); 
+	} 
+	
+	if ($tail_size) {
+		$start = $n_chunks * $chunk_size; 
+		$data = substr($val, $start, $tail_size); 
+		ibase_blob_add($blob_id, $data); 
+	}
+	// end replacement ///////////////////////////////////////////////////////// 
+	
+	$blob_id_str = ibase_blob_close($blob_id); 
+	
+	return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false; 
+	
+	} 
+	
+	
+	function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		$blob_id = ibase_blob_create($this->_connectionID);
+		ibase_blob_add($blob_id, $val);
+		$blob_id_str = ibase_blob_close($blob_id);
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blob_id_str)) != false;
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	// Only since Interbase 6.0 - uses EXTRACT
+	// problem - does not zero-fill the day and month yet
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysDate;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '||';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "extract(year from $col)";
+				break;
+			case 'M':
+			case 'm':
+				$s .= "extract(month from $col)";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "(extract(day from $col))";
+				break;
+			case 'H':
+			case 'h':
+			  $s .= "(extract(hour from $col))";
+			  break;                        
+			case 'I':
+			case 'i':
+			  $s .= "(extract(minute from $col))";
+			  break;                
+			case 'S':
+			case 's':
+			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
+			  break;        
+
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_ibase extends ADORecordSet
+{
+
+	var $databaseType = "ibase";
+	var $bind=false;
+	var $_cacheType;
+	
+	function ADORecordset_ibase($id,$mode=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+			$this->fetchMode = ($mode === false) ? $ADODB_FETCH_MODE : $mode;
+			$this->ADORecordSet($id);
+	}
+
+	/*		Returns: an object containing field information.
+			Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+			fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+			fetchField() is retrieved.		*/
+
+	function FetchField($fieldOffset = -1)
+	{
+			 $fld = new ADOFieldObject;
+			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
+			 switch (ADODB_ASSOC_CASE) {
+			 case 2: // the default
+			 	$fld->name = ($ibf['alias']);
+				 if (empty($fld->name)) $fld->name = ($ibf['name']);
+				 break;
+			 case 0: 
+				 $fld->name = strtoupper($ibf['alias']);
+				 if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
+				 break;
+			 case 1: 
+			 	$fld->name = strtolower($ibf['alias']);
+				 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
+				 break;
+			 }
+			 
+			 $fld->type = $ibf['type'];
+			 $fld->max_length = $ibf['length'];
+			 
+			 /*       This needs to be populated from the metadata */ 
+			 $fld->not_null = false;
+			 $fld->has_default = false;
+			 $fld->default_value = 'null';
+			 return $fld;
+	}
+
+	function _initrs()
+	{
+		$this->_numOfRows = -1;
+		$this->_numOfFields = @ibase_num_fields($this->_queryID);
+
+		// cache types for blob decode check
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+			$f1 = $this->FetchField($i); 
+			$this->_cacheType[] = $f1->type;
+		}				
+	}
+
+	function _seek($row)
+	{
+		return false;
+	}
+	
+	function _fetch() 
+	{
+		$f = @ibase_fetch_row($this->_queryID); 
+		if ($f === false) {
+			$this->fields = false;
+			return false;
+		}
+		// OPN stuff start - optimized
+		// fix missing nulls and decode blobs automatically
+	
+		global $ADODB_ANSI_PADDING_OFF;
+		//$ADODB_ANSI_PADDING_OFF=1;
+		$rtrim = !empty($ADODB_ANSI_PADDING_OFF);
+		
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) { 
+			if ($this->_cacheType[$i]=="BLOB") {
+				if (isset($f[$i])) { 
+					$f[$i] = $this->connection->_BlobDecode($f[$i]); 
+				} else { 
+					$f[$i] = null; 
+				} 
+			} else { 
+				if (!isset($f[$i])) { 
+					$f[$i] = null; 
+				} else if ($rtrim && is_string($f[$i])) {
+					$f[$i] = rtrim($f[$i]);
+				}
+			} 
+		} 
+		// OPN stuff end 
+		
+		$this->fields = $f;
+		if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+		} else if ($this->fetchMode == ADODB_FETCH_BOTH) {
+			$this->fields = array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
+		}
+		return true;
+	}
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		return $this->fields[$this->bind[strtoupper($colname)]];
+		
+	}
+	
+
+	function _close() 
+	{
+			return @ibase_free_result($this->_queryID);
+	}
+
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+		case 'CHAR':
+			return 'C';
+			
+		case 'TEXT':
+		case 'VARCHAR':
+		case 'VARYING':
+		if ($len <= $this->blobSize) return 'C';
+			return 'X';
+		case 'BLOB':
+			return 'B';
+			   
+		case 'TIMESTAMP':
+		case 'DATE': return 'D';
+		case 'TIME': return 'T';
+				//case 'T': return 'T';
+
+				//case 'L': return 'L';
+		case 'INT': 
+		case 'SHORT':
+		case 'INTEGER': return 'I';
+		default: return 'N';
+		}
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-informix.inc.php b/adodb/drivers/adodb-informix.inc.php
new file mode 100644
index 0000000..18ad037
--- /dev/null
+++ b/adodb/drivers/adodb-informix.inc.php
@@ -0,0 +1,40 @@
+ADORecordset_informix72($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-informix72.inc.php b/adodb/drivers/adodb-informix72.inc.php
new file mode 100644
index 0000000..1c9aec6
--- /dev/null
+++ b/adodb/drivers/adodb-informix72.inc.php
@@ -0,0 +1,475 @@
+
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('IFX_SCROLL')) define('IFX_SCROLL',1);
+
+class ADODB_informix72 extends ADOConnection {
+	var $databaseType = "informix72";
+	var $dataProvider = "informix";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $hasInsertID = true;
+	var $hasAffectedRows = true;
+    var $substr = 'substr';
+	var $metaTablesSQL="select tabname,tabtype from systables where tabtype in ('T','V') and owner!='informix'"; //Don't get informix tables and pseudo-tables
+
+
+	var $metaColumnsSQL = 
+		"select c.colname, c.coltype, c.collength, d.default,c.colno
+		from syscolumns c, systables t,outer sysdefaults d
+		where c.tabid=t.tabid and d.tabid=t.tabid and d.colno=c.colno
+		and tabname='%s' order by c.colno";
+
+	var $metaPrimaryKeySQL =
+		"select part1,part2,part3,part4,part5,part6,part7,part8 from
+		systables t,sysconstraints s,sysindexes i where t.tabname='%s'
+		and s.tabid=t.tabid and s.constrtype='P'
+		and i.idxname=s.idxname";
+
+	var $concat_operator = '||';
+
+	var $lastQuery = false;
+	var $has_insertid = true;
+
+	var $_autocommit = true;
+	var $_bindInputArray = true;  // set to true if ADOConnection.Execute() permits binding of array parameters.
+	var $sysDate = 'TODAY';
+	var $sysTimeStamp = 'CURRENT';
+	var $cursorType = IFX_SCROLL; // IFX_SCROLL or IFX_HOLD or 0
+   
+	function ADODB_informix72()
+	{
+		// alternatively, use older method:
+		//putenv("DBDATE=Y4MD-");
+		
+		// force ISO date format
+		putenv('GL_DATE=%Y-%m-%d');
+		
+		if (function_exists('ifx_byteasvarchar')) {
+			ifx_byteasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
+        	ifx_textasvarchar(1); // Mode "0" will return a blob id, and mode "1" will return a varchar with text content. 
+        	ifx_blobinfile_mode(0); // Mode "0" means save Byte-Blobs in memory, and mode "1" means save Byte-Blobs in a file.
+		}
+	}
+	
+	function ServerInfo()
+	{
+	    if (isset($this->version)) return $this->version;
+	
+	    $arr['description'] = $this->GetOne("select DBINFO('version','full') from systables where tabid = 1");
+	    $arr['version'] = $this->GetOne("select DBINFO('version','major') || DBINFO('version','minor') from systables where tabid = 1");
+	    $this->version = $arr;
+	    return $arr;
+	}
+
+
+
+	function _insertid()
+	{
+		$sqlca =ifx_getsqlca($this->lastQuery);
+		return @$sqlca["sqlerrd1"];
+	}
+
+	function _affectedrows()
+	{
+		if ($this->lastQuery) {
+		   return @ifx_affected_rows ($this->lastQuery);
+		}
+		return 0;
+	}
+
+	function BeginTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->Execute('BEGIN');
+		$this->_autocommit = false;
+		return true;
+	}
+
+	function CommitTrans($ok=true) 
+	{ 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('COMMIT');
+		$this->_autocommit = true;
+		return true;
+	}
+
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('ROLLBACK');
+		$this->_autocommit = true;
+		return true;
+	}
+
+	function RowLock($tables,$where,$col='1 as adodbignore')
+	{
+		if ($this->_autocommit) $this->BeginTrans();
+		return $this->GetOne("select $col from $tables where $where for update");
+	}
+
+	/*	Returns: the last error message from previous database operation
+		Note: This function is NOT available for Microsoft SQL Server.	*/
+
+	function ErrorMsg() 
+	{
+		if (!empty($this->_logsql)) return $this->_errorMsg;
+		$this->_errorMsg = ifx_errormsg();
+		return $this->_errorMsg;
+	}
+
+	function ErrorNo()
+	{
+		preg_match("/.*SQLCODE=([^\]]*)/",ifx_error(),$parse);
+		if (is_array($parse) && isset($parse[1])) return (int)$parse[1]; 
+		return 0;
+	}
+
+   
+    function MetaColumns($table, $normalize=true)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$false = false;
+		if (!empty($this->metaColumnsSQL)) {
+			$save = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+			if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+          		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			if ($rs === false) return $false;
+			$rspkey = $this->Execute(sprintf($this->metaPrimaryKeySQL,$table)); //Added to get primary key colno items
+
+			$retarr = array();
+			while (!$rs->EOF) { //print_r($rs->fields);
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[0];
+/*  //!eos.
+						$rs->fields[1] is not the correct adodb type
+						$rs->fields[2] is not correct max_length, because can include not-null bit
+
+				$fld->type = $rs->fields[1];
+				$fld->primary_key=$rspkey->fields && array_search($rs->fields[4],$rspkey->fields); //Added to set primary key flag
+				$fld->max_length = $rs->fields[2];*/
+				$pr=ifx_props($rs->fields[1],$rs->fields[2]); //!eos
+				$fld->type = $pr[0] ;//!eos
+				$fld->primary_key=$rspkey->fields && array_search($rs->fields[4],$rspkey->fields);
+				$fld->max_length = $pr[1]; //!eos
+				$fld->precision = $pr[2] ;//!eos
+				$fld->not_null = $pr[3]=="N"; //!eos
+
+				if (trim($rs->fields[3]) != "AAAAAA 0") {
+	                    		$fld->has_default = 1;
+	                    		$fld->default_value = $rs->fields[3];
+				} else {
+					$fld->has_default = 0;
+				}
+
+                $retarr[strtolower($fld->name)] = $fld;	
+				$rs->MoveNext();
+			}
+
+			$rs->Close();
+			$rspkey->Close(); //!eos
+			return $retarr;	
+		}
+
+		return $false;
+	}
+	
+   function xMetaColumns($table)
+   {
+		return ADOConnection::MetaColumns($table,false);
+   }
+
+	 function MetaForeignKeys($table, $owner=false, $upper=false) //!Eos
+	{
+		$sql = "
+			select tr.tabname,updrule,delrule,
+			i.part1 o1,i2.part1 d1,i.part2 o2,i2.part2 d2,i.part3 o3,i2.part3 d3,i.part4 o4,i2.part4 d4,
+			i.part5 o5,i2.part5 d5,i.part6 o6,i2.part6 d6,i.part7 o7,i2.part7 d7,i.part8 o8,i2.part8 d8
+			from systables t,sysconstraints s,sysindexes i,
+			sysreferences r,systables tr,sysconstraints s2,sysindexes i2
+			where t.tabname='$table'
+			and s.tabid=t.tabid and s.constrtype='R' and r.constrid=s.constrid
+			and i.idxname=s.idxname and tr.tabid=r.ptabid
+			and s2.constrid=r.primary and i2.idxname=s2.idxname";
+
+		$rs = $this->Execute($sql);
+		if (!$rs || $rs->EOF)  return false;
+		$arr = $rs->GetArray();
+		$a = array();
+		foreach($arr as $v) {
+			$coldest=$this->metaColumnNames($v["tabname"]);
+			$colorig=$this->metaColumnNames($table);
+			$colnames=array();
+			for($i=1;$i<=8 && $v["o$i"] ;$i++) {
+				$colnames[]=$coldest[$v["d$i"]-1]."=".$colorig[$v["o$i"]-1];
+			}
+			if($upper)
+				$a[strtoupper($v["tabname"])] =  $colnames;
+			else
+				$a[$v["tabname"]] =  $colnames;
+		}
+		return $a;
+	 }
+
+   function UpdateBlob($table, $column, $val, $where, $blobtype = 'BLOB')
+   {
+   		$type = ($blobtype == 'TEXT') ? 1 : 0;
+		$blobid = ifx_create_blob($type,0,$val);
+		return $this->Execute("UPDATE $table SET $column=(?) WHERE $where",array($blobid));
+   }
+
+   function BlobDecode($blobid)
+   {
+   		return function_exists('ifx_byteasvarchar') ? $blobid : @ifx_get_blob($blobid);
+   }
+   
+	// returns true or false
+   function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('ifx_connect')) return null;
+		
+		$dbs = $argDatabasename . "@" . $argHostname;
+		if ($argHostname) putenv("INFORMIXSERVER=$argHostname"); 
+		putenv("INFORMIXSERVER=".trim($argHostname)); 
+		$this->_connectionID = ifx_connect($dbs,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;
+	}
+
+	// returns true or false
+   function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('ifx_connect')) return null;
+		
+		$dbs = $argDatabasename . "@" . $argHostname;
+		putenv("INFORMIXSERVER=".trim($argHostname)); 
+		$this->_connectionID = ifx_pconnect($dbs,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		#if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;
+	}
+/*
+	// ifx_do does not accept bind parameters - weird ???
+	function Prepare($sql)
+	{
+		$stmt = ifx_prepare($sql);
+		if (!$stmt) return $sql;
+		else return array($sql,$stmt);
+	}
+*/
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+	
+	  // String parameters have to be converted using ifx_create_char
+	  if ($inputarr) {
+		 foreach($inputarr as $v) {
+			if (gettype($v) == 'string') {
+			   $tab[] = ifx_create_char($v);
+			}
+			else {
+			   $tab[] = $v;
+			}
+		 }
+	  }
+
+	  // In case of select statement, we use a scroll cursor in order
+	  // to be able to call "move", or "movefirst" statements
+	  if (!$ADODB_COUNTRECS && preg_match("/^\s*select/is", $sql)) {
+		 if ($inputarr) {
+			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType, $tab);
+		 }
+		 else {
+			$this->lastQuery = ifx_query($sql,$this->_connectionID, $this->cursorType);
+		 }
+	  }
+	  else {
+		 if ($inputarr) {
+			$this->lastQuery = ifx_query($sql,$this->_connectionID, $tab);
+		 }
+		 else {
+			$this->lastQuery = ifx_query($sql,$this->_connectionID);
+		 }
+	  }
+
+	  // Following line have been commented because autocommit mode is
+	  // not supported by informix SE 7.2
+
+	  //if ($this->_autocommit) ifx_query('COMMIT',$this->_connectionID);
+
+		return $this->lastQuery;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		$this->lastQuery = false;
+		return ifx_close($this->_connectionID);
+	}
+}
+
+
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_informix72 extends ADORecordSet {
+
+	var $databaseType = "informix72";
+	var $canSeek = true;
+	var $_fieldprops = false;
+
+	function ADORecordset_informix72($id,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		return $this->ADORecordSet($id);
+	}
+
+
+
+	/*	Returns: an object containing field information.
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+	function FetchField($fieldOffset = -1)
+	{
+		if (empty($this->_fieldprops)) {
+			$fp = ifx_fieldproperties($this->_queryID);
+			foreach($fp as $k => $v) {
+				$o = new ADOFieldObject;
+				$o->name = $k;
+				$arr = explode(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
+				$o->type = $arr[0];
+				$o->max_length = $arr[1];
+				$this->_fieldprops[] = $o;
+				$o->not_null = $arr[4]=="N";
+			}
+		}
+		$ret = $this->_fieldprops[$fieldOffset];
+		return $ret;
+	}
+
+	function _initrs()
+	{
+		$this->_numOfRows = -1; // ifx_affected_rows not reliable, only returns estimate -- ($ADODB_COUNTRECS)? ifx_affected_rows($this->_queryID):-1;
+		$this->_numOfFields = ifx_num_fields($this->_queryID);
+	}
+
+	function _seek($row)
+	{
+		return @ifx_fetch_row($this->_queryID, (int) $row);
+	}
+
+   function MoveLast()
+   {
+	  $this->fields = @ifx_fetch_row($this->_queryID, "LAST");
+	  if ($this->fields) $this->EOF = false;
+	  $this->_currentRow = -1;
+
+	  if ($this->fetchMode == ADODB_FETCH_NUM) {
+		 foreach($this->fields as $v) {
+			$arr[] = $v;
+		 }
+		 $this->fields = $arr;
+	  }
+
+	  return true;
+   }
+
+   function MoveFirst()
+	{
+	  $this->fields = @ifx_fetch_row($this->_queryID, "FIRST");
+	  if ($this->fields) $this->EOF = false;
+	  $this->_currentRow = 0;
+
+	  if ($this->fetchMode == ADODB_FETCH_NUM) {
+		 foreach($this->fields as $v) {
+			$arr[] = $v;
+		 }
+		 $this->fields = $arr;
+	  }
+
+	  return true;
+   }
+
+   function _fetch($ignore_fields=false)
+   {
+
+		$this->fields = @ifx_fetch_row($this->_queryID);
+
+		if (!is_array($this->fields)) return false;
+
+		if ($this->fetchMode == ADODB_FETCH_NUM) {
+			foreach($this->fields as $v) {
+				$arr[] = $v;
+			}
+			$this->fields = $arr;
+		}
+		return true;
+	}
+
+	/*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+	function _close()
+	{
+		return ifx_free_result($this->_queryID);
+	}
+
+}
+/** !Eos
+* Auxiliar function to Parse coltype,collength. Used by Metacolumns
+* return: array ($mtype,$length,$precision,$nullable) (similar to ifx_fieldpropierties)
+*/
+function ifx_props($coltype,$collength){
+	$itype=fmod($coltype+1,256);
+	$nullable=floor(($coltype+1) /256) ?"N":"Y";
+	$mtype=substr(" CIIFFNNDN TBXCC     ",$itype,1);
+	switch ($itype){
+		case 2:
+			$length=4;
+		case 6:
+		case 9:
+		case 14:
+			$length=floor($collength/256);
+			$precision=fmod($collength,256);
+			break;
+		default:
+			$precision=0;
+			$length=$collength;
+	}
+	return array($mtype,$length,$precision,$nullable);
+}
+
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-ldap.inc.php b/adodb/drivers/adodb-ldap.inc.php
new file mode 100644
index 0000000..4c5eb1a
--- /dev/null
+++ b/adodb/drivers/adodb-ldap.inc.php
@@ -0,0 +1,423 @@
+_connectionID = @ldap_connect($host);
+		} else {
+			$conn_info = array( $host,$this->port);
+		
+			if ( strstr( $host, ':' ) ) {
+			    $conn_info = explode( ':', $host );
+			} 
+		
+			$this->_connectionID = @ldap_connect( $conn_info[0], $conn_info[1] );
+		}
+		if (!$this->_connectionID) {
+			$e = 'Could not connect to ' . $conn_info[0];
+			$this->_errorMsg = $e;
+			if ($this->debug) ADOConnection::outp($e);
+			return false;
+		}
+		if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) {
+			$this->_inject_bind_options( $LDAP_CONNECT_OPTIONS );
+		}
+		
+		if ($username) {
+		    $bind = @ldap_bind( $this->_connectionID, $username, $password );
+		} else {
+			$username = 'anonymous';
+		    $bind = @ldap_bind( $this->_connectionID );		
+		}
+		
+		if (!$bind) {
+			$e = sprintf($this->_bind_errmsg,ldap_error($this->_connectionID));
+			$this->_errorMsg = $e;
+			if ($this->debug) ADOConnection::outp($e);
+			return false;
+		}
+		$this->_errorMsg = '';
+		$this->database = $ldapbase;
+		return $this->_connectionID;
+	}
+    
+/*
+	Valid Domain Values for LDAP Options:
+
+	LDAP_OPT_DEREF (integer)
+	LDAP_OPT_SIZELIMIT (integer)
+	LDAP_OPT_TIMELIMIT (integer)
+	LDAP_OPT_PROTOCOL_VERSION (integer)
+	LDAP_OPT_ERROR_NUMBER (integer)
+	LDAP_OPT_REFERRALS (boolean)
+	LDAP_OPT_RESTART (boolean)
+	LDAP_OPT_HOST_NAME (string)
+	LDAP_OPT_ERROR_STRING (string)
+	LDAP_OPT_MATCHED_DN (string)
+	LDAP_OPT_SERVER_CONTROLS (array)
+	LDAP_OPT_CLIENT_CONTROLS (array)
+
+	Make sure to set this BEFORE calling Connect()
+
+	Example:
+
+	$LDAP_CONNECT_OPTIONS = Array(
+		Array (
+			"OPTION_NAME"=>LDAP_OPT_DEREF,
+			"OPTION_VALUE"=>2
+		),
+		Array (
+			"OPTION_NAME"=>LDAP_OPT_SIZELIMIT,
+			"OPTION_VALUE"=>100
+		),
+		Array (
+			"OPTION_NAME"=>LDAP_OPT_TIMELIMIT,
+			"OPTION_VALUE"=>30
+		),
+		Array (
+			"OPTION_NAME"=>LDAP_OPT_PROTOCOL_VERSION,
+			"OPTION_VALUE"=>3
+		),
+		Array (
+			"OPTION_NAME"=>LDAP_OPT_ERROR_NUMBER,
+			"OPTION_VALUE"=>13
+		),
+		Array (
+			"OPTION_NAME"=>LDAP_OPT_REFERRALS,
+			"OPTION_VALUE"=>FALSE
+		),
+		Array (
+			"OPTION_NAME"=>LDAP_OPT_RESTART,
+			"OPTION_VALUE"=>FALSE
+		)
+	);
+*/
+
+	function _inject_bind_options( $options ) {
+		foreach( $options as $option ) {
+			ldap_set_option( $this->_connectionID, $option["OPTION_NAME"], $option["OPTION_VALUE"] )
+				or die( "Unable to set server option: " . $option["OPTION_NAME"] );
+		}
+	}
+	
+	/* returns _queryID or false */
+	function _query($sql,$inputarr=false)
+	{
+		$rs = @ldap_search( $this->_connectionID, $this->database, $sql );
+		$this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql.': '.ldap_error($this->_connectionID);
+		return $rs; 
+	}
+
+	function ErrorMsg()
+	{
+		return $this->_errorMsg;
+	}
+	
+	function ErrorNo()
+	{
+		return @ldap_errno($this->_connectionID);
+	}
+	
+    /* closes the LDAP connection */
+	function _close()
+	{
+		@ldap_close( $this->_connectionID );
+		$this->_connectionID = false;
+	}
+    
+	function SelectDB($db) {
+		$this->database = $db;
+		return true;
+	} // SelectDB
+
+    function ServerInfo()
+    {
+        if( !empty( $this->version ) ) return $this->version;
+        $version = array();
+        /*
+        Determines how aliases are handled during search. 
+        LDAP_DEREF_NEVER (0x00)
+        LDAP_DEREF_SEARCHING (0x01)
+        LDAP_DEREF_FINDING (0x02)
+        LDAP_DEREF_ALWAYS (0x03)
+        The LDAP_DEREF_SEARCHING value means aliases are dereferenced during the search but 
+        not when locating the base object of the search. The LDAP_DEREF_FINDING value means 
+        aliases are dereferenced when locating the base object but not during the search.  
+        Default: LDAP_DEREF_NEVER
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_DEREF, $version['LDAP_OPT_DEREF'] ) ;
+        switch ( $version['LDAP_OPT_DEREF'] ) {
+          case 0:
+            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_NEVER';
+          case 1:
+            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_SEARCHING';
+          case 2:
+            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_FINDING';
+          case 3:
+            $version['LDAP_OPT_DEREF'] = 'LDAP_DEREF_ALWAYS';
+        }
+        
+        /* 
+        A limit on the number of entries to return from a search. 
+        LDAP_NO_LIMIT (0) means no limit.
+        Default: LDAP_NO_LIMIT
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_SIZELIMIT, $version['LDAP_OPT_SIZELIMIT'] );
+        if ( $version['LDAP_OPT_SIZELIMIT'] == 0 ) {
+           $version['LDAP_OPT_SIZELIMIT'] = 'LDAP_NO_LIMIT';
+        }
+        
+        /*
+        A limit on the number of seconds to spend on a search. 
+        LDAP_NO_LIMIT (0) means no limit.
+        Default: LDAP_NO_LIMIT
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_TIMELIMIT, $version['LDAP_OPT_TIMELIMIT'] );
+        if ( $version['LDAP_OPT_TIMELIMIT'] == 0 ) {
+           $version['LDAP_OPT_TIMELIMIT'] = 'LDAP_NO_LIMIT';
+        }
+        
+        /*
+        Determines whether the LDAP library automatically follows referrals returned by LDAP servers or not. 
+        LDAP_OPT_ON
+        LDAP_OPT_OFF
+        Default: ON
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_REFERRALS, $version['LDAP_OPT_REFERRALS'] );
+        if ( $version['LDAP_OPT_REFERRALS'] == 0 ) {
+           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_OFF';
+        } else {
+           $version['LDAP_OPT_REFERRALS'] = 'LDAP_OPT_ON';
+        
+        }
+        /*
+        Determines whether LDAP I/O operations are automatically restarted if they abort prematurely. 
+        LDAP_OPT_ON
+        LDAP_OPT_OFF
+        Default: OFF
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_RESTART, $version['LDAP_OPT_RESTART'] );
+        if ( $version['LDAP_OPT_RESTART'] == 0 ) {
+           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_OFF';
+        } else {
+           $version['LDAP_OPT_RESTART'] = 'LDAP_OPT_ON';
+        
+        }
+        /*
+        This option indicates the version of the LDAP protocol used when communicating with the primary LDAP server.
+        LDAP_VERSION2 (2)
+        LDAP_VERSION3 (3)
+        Default: LDAP_VERSION2 (2)
+        */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_PROTOCOL_VERSION, $version['LDAP_OPT_PROTOCOL_VERSION'] );
+        if ( $version['LDAP_OPT_PROTOCOL_VERSION'] == 2 ) {
+           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION2';
+        } else {
+           $version['LDAP_OPT_PROTOCOL_VERSION'] = 'LDAP_VERSION3';
+        
+        }
+        /* The host name (or list of hosts) for the primary LDAP server. */
+        ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); 
+        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); 
+        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); 
+        ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); 
+        
+        return $this->version = $version;
+    
+    }
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_ldap extends ADORecordSet{	
+	
+	var $databaseType = "ldap";
+	var $canSeek = false;
+	var $_entryID; /* keeps track of the entry resource identifier */
+	
+	function ADORecordSet_ldap($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: 
+		  $this->fetchMode = LDAP_NUM; 
+		break;
+		case ADODB_FETCH_ASSOC: 
+		  $this->fetchMode = LDAP_ASSOC; 
+		break;
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH: 
+		default:
+		  $this->fetchMode = LDAP_BOTH; 
+		break;
+		}
+	
+		$this->ADORecordSet($queryID);	
+	}
+	
+	function _initrs()
+	{
+	   /* 
+	   This could be teaked to respect the $COUNTRECS directive from ADODB
+	   It's currently being used in the _fetch() function and the
+	   GetAssoc() function
+       */
+	    $this->_numOfRows = ldap_count_entries( $this->connection->_connectionID, $this->_queryID );
+
+	}
+
+    /*
+    Return whole recordset as a multi-dimensional associative array
+	*/
+	function GetAssoc($force_array = false, $first2cols = false) 
+	{
+		$records = $this->_numOfRows;
+        $results = array();
+            for ( $i=0; $i < $records; $i++ ) {
+                foreach ( $this->fields as $k=>$v ) {
+                    if ( is_array( $v ) ) {
+                        if ( $v['count'] == 1 ) {
+                            $results[$i][$k] = $v[0];
+                        } else {
+                            array_shift( $v );
+                            $results[$i][$k] = $v;
+                        } 
+                    }
+                }
+            }
+        
+		return $results; 
+	}
+    
+    function GetRowAssoc()
+	{
+        $results = array();
+        foreach ( $this->fields as $k=>$v ) {
+            if ( is_array( $v ) ) {
+                if ( $v['count'] == 1 ) {
+                    $results[$k] = $v[0];
+                } else {
+                    array_shift( $v );
+                    $results[$k] = $v;
+                } 
+            }
+        }
+ 
+		return $results; 
+	}
+		
+    function GetRowNums()
+    {
+        $results = array();
+        foreach ( $this->fields as $k=>$v ) {
+        static $i = 0;
+            if (is_array( $v )) {
+                if ( $v['count'] == 1 ) {
+                    $results[$i] = $v[0];
+                } else {
+                    array_shift( $v );
+                    $results[$i] = $v;
+                } 
+            $i++;
+            }
+        }
+        return $results;
+    }
+	
+	function _fetch()
+	{		
+		if ( $this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0 )
+        	return false;
+        	
+        if ( $this->_currentRow == 0 ) {
+		  $this->_entryID = ldap_first_entry( $this->connection->_connectionID, $this->_queryID );
+        } else {
+          $this->_entryID = ldap_next_entry( $this->connection->_connectionID, $this->_entryID );
+        }
+	    
+	    $this->fields = ldap_get_attributes( $this->connection->_connectionID, $this->_entryID );
+	    $this->_numOfFields = $this->fields['count'];	
+	    switch ( $this->fetchMode ) {
+            
+            case LDAP_ASSOC:
+            $this->fields = $this->GetRowAssoc();
+            break;
+            
+            case LDAP_NUM:
+			$this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc());
+            break;
+            
+            case LDAP_BOTH:
+            default:
+			$this->fields = $this->GetRowNums();
+            break;
+        }
+        return ( is_array( $this->fields ) );        
+	}
+	
+	function _close() {
+		@ldap_free_result( $this->_queryID );	
+		$this->_queryID = false;
+	}
+	
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mssql.inc.php b/adodb/drivers/adodb-mssql.inc.php
new file mode 100644
index 0000000..9de8f78
--- /dev/null
+++ b/adodb/drivers/adodb-mssql.inc.php
@@ -0,0 +1,1116 @@
+= 0x4300) {
+// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
+	ini_set('mssql.datetimeconvert',0); 
+} else {
+global $ADODB_mssql_mths;		// array, months must be upper-case
+
+
+	$ADODB_mssql_date_order = 'mdy'; 
+	$ADODB_mssql_mths = array(
+		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
+		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+}
+
+//---------------------------------------------------------------------------
+// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
+// just after you connect to the database. Supports mdy and dmy only.
+// Not required for PHP 4.2.0 and above.
+function AutoDetect_MSSQL_Date_Order($conn)
+{
+global $ADODB_mssql_date_order;
+	$adate = $conn->GetOne('select getdate()');
+	if ($adate) {
+		$anum = (int) $adate;
+		if ($anum > 0) {
+			if ($anum > 31) {
+				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
+			} else
+				$ADODB_mssql_date_order = 'dmy';
+		} else
+			$ADODB_mssql_date_order = 'mdy';
+	}
+}
+
+class ADODB_mssql extends ADOConnection {
+	var $databaseType = "mssql";	
+	var $dataProvider = "mssql";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $hasInsertID = true;
+	var $substr = "substring";
+	var $length = 'len';
+	var $hasAffectedRows = true;
+	var $metaDatabasesSQL = "select name from sysdatabases where name <> 'master'";
+	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
+	var $metaColumnsSQL = # xtype==61 is datetime
+"select c.name,t.name,c.length,
+	(case when c.xusertype=61 then 0 else c.xprec end),
+	(case when c.xusertype=61 then 0 else c.xscale end) 
+	from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
+	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
+	var $hasGenID = true;
+	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+	var $sysTimeStamp = 'GetDate()';
+	var $_has_mssql_init;
+	var $maxParameterLen = 4000;
+	var $arrayClass = 'ADORecordSet_array_mssql';
+	var $uniqueSort = true;
+	var $leftOuter = '*=';
+	var $rightOuter = '=*';
+	var $ansiOuter = true; // for mssql7 or later
+	var $poorAffectedRows = true;
+	var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
+	var $uniqueOrderBy = true;
+	var $_bindInputArray = true;
+	var $forceNewConnect = false;
+	
+	function ADODB_mssql() 
+	{		
+		$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
+	}
+
+	function ServerInfo()
+	{
+	global $ADODB_FETCH_MODE;
+	
+	
+		if ($this->fetchMode === false) {
+			$savem = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		} else 
+			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+				
+		if (0) {
+			$stmt = $this->PrepareSP('sp_server_info');
+			$val = 2;
+			$this->Parameter($stmt,$val,'attribute_id');
+			$row = $this->GetRow($stmt);
+		}
+		
+		$row = $this->GetRow("execute sp_server_info 2");
+		
+		
+		if ($this->fetchMode === false) {
+			$ADODB_FETCH_MODE = $savem;
+		} else
+			$this->SetFetchMode($savem);
+		
+		$arr['description'] = $row[2];
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " ISNULL($field, $ifNull) "; // if MS SQL Server
+	}
+	
+	function _insertid()
+	{
+	// SCOPE_IDENTITY()
+	// Returns the last IDENTITY value inserted into an IDENTITY column in 
+	// the same scope. A scope is a module -- a stored procedure, trigger, 
+	// function, or batch. Thus, two statements are in the same scope if 
+	// they are in the same stored procedure, function, or batch.
+        if ($this->lastInsID !== false) {
+            return $this->lastInsID; // InsID from sp_executesql call
+        } else {
+			return $this->GetOne($this->identitySQL);
+		}
+	}
+
+
+
+	/**
+	* Correctly quotes a string so that all strings are escaped. We prefix and append
+	* to the string single-quotes.
+	* An example is  $db->qstr("Don't bother",magic_quotes_runtime());
+	* 
+	* @param s         the string to quote
+	* @param [magic_quotes]    if $s is GET/POST var, set to get_magic_quotes_gpc().
+	*              This undoes the stupidity of magic quotes for GPC.
+	*
+	* @return  quoted string to be sent back to database
+	*/
+	function qstr($s,$magic_quotes=false)
+	{
+ 		if (!$magic_quotes) {
+ 			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
+		}
+
+ 		// undo magic quotes for " unless sybase is on
+ 		$sybase = ini_get('magic_quotes_sybase');
+ 		if (!$sybase) {
+ 			$s = str_replace('\\"','"',$s);
+ 			if ($this->replaceQuote == "\\'")  // ' already quoted, no need to change anything
+ 				return "'$s'";
+ 			else {// change \' to '' for sybase/mssql
+ 				$s = str_replace('\\\\','\\',$s);
+ 				return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+ 			}
+ 		} else {
+ 			return "'".$s."'";
+		}
+	}
+// moodle change end - see readme_moodle.txt
+
+	function _affectedrows()
+	{
+		return $this->GetOne('select @@rowcount');
+	}
+
+	var $_dropSeqSQL = "drop table %s";
+	
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$start -= 1;
+		$this->Execute("create table $seq (id float(53))");
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+		}
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return true;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		//$this->debug=1;
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$this->Execute("create table $seq (id float(53))");
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+			}
+			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			return $start;
+		}
+		$num = $this->GetOne("select id from $seq");
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return $num;
+		
+		// in old implementation, pre 1.90, we returned GUID...
+		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
+	}
+	
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		if ($nrows > 0 && $offset <= 0) {
+			$sql = preg_replace(
+				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
+				
+			if ($secs2cache)
+				$rs = $this->CacheExecute($secs2cache, $sql, $inputarr);
+			else
+				$rs = $this->Execute($sql,$inputarr);
+		} else
+			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+	
+		return $rs;
+	}
+	
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '+';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "datename(yyyy,$col)";
+				break;
+			case 'M':
+				$s .= "convert(char(3),$col,0)";
+				break;
+			case 'm':
+				$s .= "replace(str(month($col),2),' ','0')";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "datename(quarter,$col)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "replace(str(day($col),2),' ','0')";
+				break;
+			case 'h':
+				$s .= "substring(convert(char(14),$col,0),13,2)";
+				break;
+			
+			case 'H':
+				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
+				break;
+				
+			case 'i':
+				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
+				break;
+			case 's':
+				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
+				break;
+			case 'a':
+			case 'A':
+				$s .= "substring(convert(char(19),$col,0),18,2)";
+				break;
+				
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+
+	
+	function BeginTrans()
+	{
+		if ($this->transOff) return true; 
+		$this->transCnt += 1;
+	   	$ok = $this->Execute('BEGIN TRAN');
+	   	return $ok;
+	}
+		
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ok = $this->Execute('COMMIT TRAN');
+		return $ok;
+	}
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true; 
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ok = $this->Execute('ROLLBACK TRAN');
+		return $ok;
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
+	/*
+		Usage:
+		
+		$this->BeginTrans();
+		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
+		
+		# some operation on both tables table1 and table2
+		
+		$this->CommitTrans();
+		
+		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
+	*/
+	function RowLock($tables,$where,$col='1 as adodbignore') 
+	{
+		if ($col == '1 as adodbignore') $col = 'top 1 null as ignore';
+		if (!$this->transCnt) $this->BeginTrans();
+		return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
+	}
+	
+	
+	function MetaIndexes($table,$primary=false, $owner=false)
+	{
+		$table = $this->qstr($table);
+
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
+			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
+			ORDER BY O.name, I.Name, K.keyno";
+
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+        	$savem = $this->SetFetchMode(FALSE);
+        }
+        
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+        	$this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        if (!is_object($rs)) {
+        	return FALSE;
+        }
+
+		$indexes = array();
+		while ($row = $rs->FetchRow()) {
+			if ($primary && !$row[5]) continue;
+			
+            $indexes[$row[0]]['unique'] = $row[6];
+            $indexes[$row[0]]['columns'][] = $row[1];
+    	}
+        return $indexes;
+	}
+	
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$table = $this->qstr(strtoupper($table));
+		
+		$sql = 
+"select object_name(constid) as constraint_name,
+	col_name(fkeyid, fkey) as column_name,
+	object_name(rkeyid) as referenced_table_name,
+   	col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where upper(object_name(fkeyid)) = $table
+order by constraint_name, referenced_table_name, keyno";
+		
+		$constraints = $this->GetArray($sql);
+		
+		$ADODB_FETCH_MODE = $save;
+		
+		$arr = false;
+		foreach($constraints as $constr) {
+			//print_r($constr);
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+		}
+		if (!$arr) return false;
+		
+		$arr2 = false;
+		
+		foreach($arr as $k => $v) {
+			foreach($v as $a => $b) {
+				if ($upper) $a = strtoupper($a);
+				$arr2[$a] = $b;
+			}
+		}
+		return $arr2;
+	}
+
+	//From: Fernando Moreira 
+	function MetaDatabases() 
+	{ 
+		if(@mssql_select_db("master")) { 
+				 $qry=$this->metaDatabasesSQL; 
+				 if($rs=@mssql_query($qry,$this->_connectionID)){ 
+						 $tmpAr=$ar=array(); 
+						 while($tmpAr=@mssql_fetch_row($rs)) 
+								 $ar[]=$tmpAr[0]; 
+						@mssql_select_db($this->database); 
+						 if(sizeof($ar)) 
+								 return($ar); 
+						 else 
+								 return(false); 
+				 } else { 
+						 @mssql_select_db($this->database); 
+						 return(false); 
+				 } 
+		 } 
+		 return(false); 
+	} 
+
+	// "Stein-Aksel Basma" 
+	// tested with MSSQL 2000
+	function MetaPrimaryKeys($table, $owner=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$schema = '';
+		$this->_findschema($table,$schema);
+		if (!$schema) $schema = $this->database;
+		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+
+		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
+		information_schema.table_constraints tc 
+		where tc.constraint_name = k.constraint_name and tc.constraint_type =
+		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
+		
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$a = $this->GetCol($sql);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if ($a && sizeof($a)>0) return $a;
+		$false = false;
+		return $false;	  
+	}
+
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(($mask));
+			$this->metaTablesSQL .= " AND name like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+ 
+	function SelectDB($dbName) 
+	{
+		$this->database = $dbName;
+		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+		if ($this->_connectionID) {
+			return @mssql_select_db($dbName);		
+		}
+		else return false;	
+	}
+	
+	function ErrorMsg() 
+	{
+		if (empty($this->_errorMsg)){
+			$this->_errorMsg = mssql_get_last_message();
+		}
+		return $this->_errorMsg;
+	}
+	
+	function ErrorNo() 
+	{
+		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
+		if (empty($this->_errorMsg)) {
+			$this->_errorMsg = mssql_get_last_message();
+		}
+		$id = @mssql_query("select @@ERROR",$this->_connectionID);
+		if (!$id) return false;
+		$arr = mssql_fetch_array($id);
+		@mssql_free_result($id);
+		if (is_array($arr)) return $arr[0];
+	   else return -1;
+	}
+	
+	// returns true or false, newconnect supported since php 5.1.0.
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$newconnect=false)
+	{
+		if (!function_exists('mssql_pconnect')) return null;
+		$this->_connectionID = mssql_connect($argHostname,$argUsername,$argPassword,$newconnect);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('mssql_pconnect')) return null;
+		$this->_connectionID = mssql_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		
+		// persistent connections can forget to rollback on crash, so we do it here.
+		if ($this->autoRollback) {
+			$cnt = $this->GetOne('select @@TRANCOUNT');
+			while (--$cnt >= 0) $this->Execute('ROLLBACK TRAN'); 
+		}
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+    {
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
+    }
+
+	function Prepare($sql)
+	{
+		$sqlarr = explode('?',$sql);
+		if (sizeof($sqlarr) <= 1) return $sql;
+		$sql2 = $sqlarr[0];
+		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
+			$sql2 .=  '@P'.($i-1) . $sqlarr[$i];
+		} 
+		return array($sql,$this->qstr($sql2),$max,$sql2);
+	}
+	
+	function PrepareSP($sql,$param=true)
+	{
+		if (!$this->_has_mssql_init) {
+			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
+			return $sql;
+		}
+		$stmt = mssql_init($sql,$this->_connectionID);
+		if (!$stmt)  return $sql;
+		return array($sql,$stmt);
+	}
+	
+	// returns concatenated string
+    // MSSQL requires integers to be cast as strings
+    // automatically cast every datatype to VARCHAR(255)
+    // @author David Rogers (introspectshun)
+    function Concat()
+    {
+            $s = "";
+            $arr = func_get_args();
+
+            // Split single record on commas, if possible
+            if (sizeof($arr) == 1) {
+                foreach ($arr as $arg) {
+                    $args = explode(',', $arg);
+                }
+                $arr = $args;
+            }
+
+            array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
+            $s = implode('+',$arr);
+            if (sizeof($arr) > 0) return "$s";
+            
+			return '';
+    }
+	
+	/* 
+	Usage:
+		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
+		
+		# note that the parameter does not have @ in front!
+		$db->Parameter($stmt,$id,'myid');
+		$db->Parameter($stmt,$group,'group',false,64);
+		$db->Execute($stmt);
+		
+		@param $stmt Statement returned by Prepare() or PrepareSP().
+		@param $var PHP variable to bind to. Can set to null (for isNull support).
+		@param $name Name of stored procedure variable name to bind to.
+		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
+		@param [$maxLen] Holds an maximum length of the variable.
+		@param [$type] The data type of $var. Legal values depend on driver.
+		
+		See mssql_bind documentation at php.net.
+	*/
+	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=4000, $type=false)
+	{
+		if (!$this->_has_mssql_init) {
+			ADOConnection::outp( "Parameter: mssql_bind only available since PHP 4.1.0");
+			return false;
+		}
+
+		$isNull = is_null($var); // php 4.0.4 and above...
+			
+		if ($type === false) 
+			switch(gettype($var)) {
+			default:
+			case 'string': $type = SQLVARCHAR; break;
+			case 'double': $type = SQLFLT8; break;
+			case 'integer': $type = SQLINT4; break;
+			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
+			}
+		
+		if  ($this->debug) {
+			$prefix = ($isOutput) ? 'Out' : 'In';
+			$ztype = (empty($type)) ? 'false' : $type;
+			ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
+		}
+		/*
+			See http://phplens.com/lens/lensforum/msgs.php?id=7231
+			
+			RETVAL is HARD CODED into php_mssql extension:
+			The return value (a long integer value) is treated like a special OUTPUT parameter, 
+			called "RETVAL" (without the @). See the example at mssql_execute to 
+			see how it works. - type: one of this new supported PHP constants. 
+				SQLTEXT, SQLVARCHAR,SQLCHAR, SQLINT1,SQLINT2, SQLINT4, SQLBIT,SQLFLT8 
+		*/
+		if ($name !== 'RETVAL') $name = '@'.$name;
+		return mssql_bind($stmt[1], $name, $var, $type, $isOutput, $isNull, $maxLen);
+	}
+	
+	/* 
+		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
+		So all your blobs must be of type "image".
+		
+		Remember to set in php.ini the following...
+		
+		; Valid range 0 - 2147483647. Default = 4096. 
+		mssql.textlimit = 0 ; zero to pass through 
+
+		; Valid range 0 - 2147483647. Default = 4096. 
+		mssql.textsize = 0 ; zero to pass through 
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+	
+		if (strtoupper($blobtype) == 'CLOB') {
+			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
+			return $this->Execute($sql) != false;
+		}
+		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
+		return $this->Execute($sql) != false;
+	}
+	
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr=false)
+	{
+		$this->_errorMsg = false;
+		if (is_array($inputarr)) {
+			
+			# bind input params with sp_executesql: 
+			# see http://www.quest-pipelines.com/newsletter-v3/0402_F.htm
+			# works only with sql server 7 and newer
+            $getIdentity = false;
+            if (!is_array($sql) && preg_match('/^\\s*insert/i', $sql)) {
+                $getIdentity = true;
+                $sql .= (preg_match('/;\\s*$/i', $sql) ? ' ' : '; ') . $this->identitySQL;
+            }
+			if (!is_array($sql)) $sql = $this->Prepare($sql);
+			$params = '';
+			$decl = '';
+			$i = 0;
+			foreach($inputarr as $v) {
+				if ($decl) {
+					$decl .= ', ';
+					$params .= ', ';
+				}	
+				if (is_string($v)) {
+					$len = strlen($v);
+					if ($len == 0) $len = 1;
+					
+					if ($len > 4000 ) {
+						// NVARCHAR is max 4000 chars. Let's use NTEXT
+						$decl .= "@P$i NTEXT";
+					} else {
+						$decl .= "@P$i NVARCHAR($len)";
+					}
+
+					$params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
+				} else if (is_integer($v)) {
+					$decl .= "@P$i INT";
+					$params .= "@P$i=".$v;
+				} else if (is_float($v)) {
+					$decl .= "@P$i FLOAT";
+					$params .= "@P$i=".$v;
+				} else if (is_bool($v)) {
+					$decl .= "@P$i INT"; # Used INT just in case BIT in not supported on the user's MSSQL version. It will cast appropriately.
+					$params .= "@P$i=".(($v)?'1':'0'); # True == 1 in MSSQL BIT fields and acceptable for storing logical true in an int field
+				} else {
+					$decl .= "@P$i CHAR"; # Used char because a type is required even when the value is to be NULL.
+					$params .= "@P$i=NULL";
+					}
+				$i += 1;
+			}
+			$decl = $this->qstr($decl);
+			if ($this->debug) ADOConnection::outp("sp_executesql N{$sql[1]},N$decl,$params");
+			$rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params", $this->_connectionID);
+            if ($getIdentity) {
+                $arr = @mssql_fetch_row($rez);
+                $this->lastInsID = isset($arr[0]) ? $arr[0] : false;
+                @mssql_data_seek($rez, 0);
+            }
+			
+		} else if (is_array($sql)) {
+			# PrepareSP()
+			$rez = mssql_execute($sql[1]);
+            $this->lastInsID = false;
+			
+		} else {
+			$rez = mssql_query($sql,$this->_connectionID);
+            $this->lastInsID = false;
+		}
+		return $rez;
+	}
+	
+	// returns true or false
+	function _close()
+	{ 
+		if ($this->transCnt) $this->RollbackTrans();
+		$rez = @mssql_close($this->_connectionID);
+		$this->_connectionID = false;
+		return $rez;
+	}
+	
+	// mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
+	{
+		return ADORecordSet_array_mssql::UnixDate($v);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_mssql::UnixTimeStamp($v);
+	}	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_mssql extends ADORecordSet {	
+
+	var $databaseType = "mssql";
+	var $canSeek = true;
+	var $hasFetchAssoc; // see http://phplens.com/lens/lensforum/msgs.php?id=6083
+	// _mths works only in non-localised system
+	
+	function ADORecordset_mssql($id,$mode=false)
+	{
+		// freedts check...
+		$this->hasFetchAssoc = function_exists('mssql_fetch_assoc');
+
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+
+		}
+		$this->fetchMode = $mode;
+		return $this->ADORecordSet($id,$mode);
+	}
+	
+	
+	function _initrs()
+	{
+	GLOBAL $ADODB_COUNTRECS;	
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @mssql_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @mssql_num_fields($this->_queryID);
+	}
+	
+
+	//Contributed by "Sven Axelsson" 
+	// get next resultset - requires PHP 4.0.5 or later
+	function NextRecordSet()
+	{
+		if (!mssql_next_result($this->_queryID)) return false;
+		$this->_inited = false;
+		$this->bind = false;
+		$this->_currentRow = -1;
+		$this->Init();
+		return true;
+	}
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	/*	Returns: an object containing field information. 
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+
+	function FetchField($fieldOffset = -1) 
+	{
+		if ($fieldOffset != -1) {
+			$f = @mssql_fetch_field($this->_queryID, $fieldOffset);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$f = @mssql_fetch_field($this->_queryID);
+		}
+		$false = false;
+		if (empty($f)) return $false;
+		return $f;
+	}
+	
+	function _seek($row) 
+	{
+		return @mssql_data_seek($this->_queryID, $row);
+	}
+
+	// speedup
+	function MoveNext() 
+	{
+		if ($this->EOF) return false;
+		
+		$this->_currentRow++;
+		
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			if ($this->fetchMode & ADODB_FETCH_NUM) {
+				//ADODB_FETCH_BOTH mode
+				$this->fields = @mssql_fetch_array($this->_queryID);
+			}
+			else {
+				if ($this->hasFetchAssoc) {// only for PHP 4.2.0 or later
+					 $this->fields = @mssql_fetch_assoc($this->_queryID);
+				} else {
+					$flds = @mssql_fetch_array($this->_queryID);
+					if (is_array($flds)) {
+						$fassoc = array();
+						foreach($flds as $k => $v) {
+							if (is_numeric($k)) continue;
+							$fassoc[$k] = $v;
+						}
+						$this->fields = $fassoc;
+					} else
+						$this->fields = false;
+				}
+			}
+			
+			if (is_array($this->fields)) {
+				if (ADODB_ASSOC_CASE == 0) {
+					foreach($this->fields as $k=>$v) {
+						$kn = strtolower($k);
+						if ($kn <> $k) {
+							unset($this->fields[$k]);
+							$this->fields[$kn] = $v;
+						}
+					}
+				} else if (ADODB_ASSOC_CASE == 1) {
+					foreach($this->fields as $k=>$v) {
+						$kn = strtoupper($k);
+						if ($kn <> $k) {
+							unset($this->fields[$k]);
+							$this->fields[$kn] = $v;
+						}
+					}
+				}
+			}
+		} else {
+			$this->fields = @mssql_fetch_row($this->_queryID);
+		}
+		if ($this->fields) return true;
+		$this->EOF = true;
+		
+		return false;
+	}
+
+	
+	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
+	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
+	function _fetch($ignore_fields=false) 
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			if ($this->fetchMode & ADODB_FETCH_NUM) {
+				//ADODB_FETCH_BOTH mode
+				$this->fields = @mssql_fetch_array($this->_queryID);
+			} else {
+				if ($this->hasFetchAssoc) // only for PHP 4.2.0 or later
+					$this->fields = @mssql_fetch_assoc($this->_queryID);
+				else {
+					$this->fields = @mssql_fetch_array($this->_queryID);
+					if (@is_array($$this->fields)) {
+						$fassoc = array();
+						foreach($$this->fields as $k => $v) {
+							if (is_integer($k)) continue;
+							$fassoc[$k] = $v;
+						}
+						$this->fields = $fassoc;
+					}
+				}
+			}
+			
+			if (!$this->fields) {
+			} else if (ADODB_ASSOC_CASE == 0) {
+				foreach($this->fields as $k=>$v) {
+					$kn = strtolower($k);
+					if ($kn <> $k) {
+						unset($this->fields[$k]);
+						$this->fields[$kn] = $v;
+					}
+				}
+			} else if (ADODB_ASSOC_CASE == 1) {
+				foreach($this->fields as $k=>$v) {
+					$kn = strtoupper($k);
+					if ($kn <> $k) {
+						unset($this->fields[$k]);
+						$this->fields[$kn] = $v;
+					}
+				}
+			}
+		} else {
+			$this->fields = @mssql_fetch_row($this->_queryID);
+		}
+		return $this->fields;
+	}
+	
+	/*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+
+	function _close() 
+	{
+		$rez = mssql_free_result($this->_queryID);	
+		$this->_queryID = false;
+		return $rez;
+	}
+	// mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
+	{
+		return ADORecordSet_array_mssql::UnixDate($v);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_mssql::UnixTimeStamp($v);
+	}
+	
+}
+
+
+class ADORecordSet_array_mssql extends ADORecordSet_array {
+	function ADORecordSet_array_mssql($id=-1,$mode=false) 
+	{
+		$this->ADORecordSet_array($id,$mode);
+	}
+	
+		// mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
+	{
+	
+		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
+		
+	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+	
+		//Dec 30 2000 12:00AM 
+		if ($ADODB_mssql_date_order == 'dmy') {
+			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+				return parent::UnixDate($v);
+			}
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			
+			$theday = $rr[1];
+			$themth =  substr(strtoupper($rr[2]),0,3);
+		} else {
+			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+				return parent::UnixDate($v);
+			}
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			
+			$theday = $rr[2];
+			$themth = substr(strtoupper($rr[1]),0,3);
+		}
+		$themth = $ADODB_mssql_mths[$themth];
+		if ($themth <= 0) return false;
+		// h-m-s-MM-DD-YY
+		return  mktime(0,0,0,$themth,$theday,$rr[3]);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+	
+		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
+		
+	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+	
+		//Dec 30 2000 12:00AM
+		 if ($ADODB_mssql_date_order == 'dmy') {
+			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+			$theday = $rr[1];
+			$themth =  substr(strtoupper($rr[2]),0,3);
+		} else {
+			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+			$theday = $rr[2];
+			$themth = substr(strtoupper($rr[1]),0,3);
+		}
+		
+		$themth = $ADODB_mssql_mths[$themth];
+		if ($themth <= 0) return false;
+		
+		switch (strtoupper($rr[6])) {
+		case 'P':
+			if ($rr[4]<12) $rr[4] += 12;
+			break;
+		case 'A':
+			if ($rr[4]==12) $rr[4] = 0;
+			break;
+		default:
+			break;
+		}
+		// h-m-s-MM-DD-YY
+		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
+	}
+}
+
+/*
+Code Example 1:
+
+select 	object_name(constid) as constraint_name,
+       	object_name(fkeyid) as table_name, 
+        col_name(fkeyid, fkey) as column_name,
+	object_name(rkeyid) as referenced_table_name,
+   	col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where object_name(fkeyid) = x
+order by constraint_name, table_name, referenced_table_name,  keyno
+
+Code Example 2:
+select 	constraint_name,
+	column_name,
+	ordinal_position
+from information_schema.key_column_usage
+where constraint_catalog = db_name()
+and table_name = x
+order by constraint_name, ordinal_position
+
+http://www.databasejournal.com/scripts/article.php/1440551
+*/
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mssql_n.inc.php b/adodb/drivers/adodb-mssql_n.inc.php
new file mode 100644
index 0000000..78d2c6c
--- /dev/null
+++ b/adodb/drivers/adodb-mssql_n.inc.php
@@ -0,0 +1,171 @@
+_appendN($sql);
+		return ADODB_mssql::_query($sql,$inputarr);
+	}
+
+    /**
+     * This function will intercept all the literals used in the SQL, prepending the "N" char to them
+     * in order to allow mssql to store properly data sent in the correct UCS-2 encoding (by freeTDS
+     * and ODBTP) keeping SQL compatibility at ADOdb level (instead of hacking every project to add
+     * the "N" notation when working against MSSQL.
+     *
+     * Note that this hack only must be used if ALL the char-based columns in your DB are of type nchar,
+     * nvarchar and ntext
+     */
+    function _appendN($sql) {
+
+        $result = $sql;
+
+    /// Check we have some single quote in the query. Exit ok.
+        if (strpos($sql, SINGLEQUOTE) === false) {
+            return $sql;
+        }
+
+    /// Check we haven't an odd number of single quotes (this can cause problems below
+    /// and should be considered one wrong SQL). Exit with debug info.
+        if ((substr_count($sql, SINGLEQUOTE) & 1)) {
+            if ($this->debug) {
+                ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Wrong number of quotes (odd)");
+            }
+            return $sql;
+        }
+
+    /// Check we haven't any backslash + single quote combination. It should mean wrong
+    /// backslashes use (bad magic_quotes_sybase?). Exit with debug info.
+        $regexp = '/(\\\\' . SINGLEQUOTE . '[^' . SINGLEQUOTE . '])/';
+        if (preg_match($regexp, $sql)) {
+            if ($this->debug) {
+                ADOConnection::outp("{$this->databaseType} internal transformation: not converted. Found bad use of backslash + single quote");
+            }
+            return $sql;
+        }
+
+    /// Remove pairs of single-quotes
+        $pairs = array();
+        $regexp = '/(' . SINGLEQUOTE . SINGLEQUOTE . ')/';
+        preg_match_all($regexp, $result, $list_of_pairs);
+        if ($list_of_pairs) {
+            foreach (array_unique($list_of_pairs[0]) as $key=>$value) {
+                $pairs['<@#@#@PAIR-'.$key.'@#@#@>'] = $value;
+            }
+            if (!empty($pairs)) {
+                $result = str_replace($pairs, array_keys($pairs), $result);
+            }
+        }
+
+    /// Remove the rest of literals present in the query
+        $literals = array();
+        $regexp = '/(N?' . SINGLEQUOTE . '.*?' . SINGLEQUOTE . ')/is';
+        preg_match_all($regexp, $result, $list_of_literals);
+        if ($list_of_literals) {
+            foreach (array_unique($list_of_literals[0]) as $key=>$value) {
+                $literals['<#@#@#LITERAL-'.$key.'#@#@#>'] = $value;
+            }
+            if (!empty($literals)) {
+                $result = str_replace($literals, array_keys($literals), $result);
+            }
+        }
+
+
+    /// Analyse literals to prepend the N char to them if their contents aren't numeric
+        if (!empty($literals)) {
+            foreach ($literals as $key=>$value) {
+                if (!is_numeric(trim($value, SINGLEQUOTE))) {
+                /// Non numeric string, prepend our dear N
+                    $literals[$key] = 'N' . trim($value, 'N'); //Trimming potentially existing previous "N"
+                }
+            }
+        }
+
+    /// Re-apply literals to the text
+        if (!empty($literals)) {
+            $result = str_replace(array_keys($literals), $literals, $result);
+        }
+
+    /// Any pairs followed by N' must be switched to N' followed by those pairs
+    /// (or strings beginning with single quotes will fail)
+        $result = preg_replace("/((<@#@#@PAIR-(\d+)@#@#@>)+)N'/", "N'$1", $result);
+
+    /// Re-apply pairs of single-quotes to the text
+        if (!empty($pairs)) {
+            $result = str_replace(array_keys($pairs), $pairs, $result);
+        }
+
+    /// Print transformation if debug = on
+        if ($result != $sql && $this->debug) {
+            ADOConnection::outp("{$this->databaseType} internal transformation:
    {$sql}
    to
    {$result}");
+        }
+
+        return $result;
+    }
+}
+
+class ADORecordset_mssql_n extends ADORecordset_mssql {
+	var $databaseType = "mssql_n";
+	function ADORecordset_mssql_n($id,$mode=false)
+	{
+		$this->ADORecordset_mssql($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mssqlnative.inc.php b/adodb/drivers/adodb-mssqlnative.inc.php
new file mode 100644
index 0000000..8b326ab
--- /dev/null
+++ b/adodb/drivers/adodb-mssqlnative.inc.php
@@ -0,0 +1,923 @@
+= 0x4300) {
+// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
+	ini_set('mssql.datetimeconvert',0); 
+} else {
+    global $ADODB_mssql_mths;		// array, months must be upper-case
+	$ADODB_mssql_date_order = 'mdy'; 
+	$ADODB_mssql_mths = array(
+		'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
+		'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+}
+
+//---------------------------------------------------------------------------
+// Call this to autoset $ADODB_mssql_date_order at the beginning of your code,
+// just after you connect to the database. Supports mdy and dmy only.
+// Not required for PHP 4.2.0 and above.
+function AutoDetect_MSSQL_Date_Order($conn)
+{
+    global $ADODB_mssql_date_order;
+	$adate = $conn->GetOne('select getdate()');
+	if ($adate) {
+		$anum = (int) $adate;
+		if ($anum > 0) {
+			if ($anum > 31) {
+				//ADOConnection::outp( "MSSQL: YYYY-MM-DD date format not supported currently");
+			} else
+				$ADODB_mssql_date_order = 'dmy';
+		} else
+			$ADODB_mssql_date_order = 'mdy';
+	}
+}
+
+class ADODB_mssqlnative extends ADOConnection {
+	var $databaseType = "mssqlnative";	
+	var $dataProvider = "mssqlnative";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d H:i:s'";
+	var $hasInsertID = true;
+	var $substr = "substring";
+	var $length = 'len';
+	var $hasAffectedRows = true;
+	var $poorAffectedRows = false;
+	var $metaDatabasesSQL = "select name from sys.sysdatabases where name <> 'master'";
+	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE','dtproperties'))";
+	var $metaColumnsSQL = # xtype==61 is datetime
+        "select c.name,t.name,c.length,
+	    (case when c.xusertype=61 then 0 else c.xprec end),
+	    (case when c.xusertype=61 then 0 else c.xscale end) 
+	    from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
+	var $hasTop = 'top';		// support mssql SELECT TOP 10 * FROM TABLE
+	var $hasGenID = true;
+	var $sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+	var $sysTimeStamp = 'GetDate()';
+	var $maxParameterLen = 4000;
+	var $arrayClass = 'ADORecordSet_array_mssqlnative';
+	var $uniqueSort = true;
+	var $leftOuter = '*=';
+	var $rightOuter = '=*';
+	var $ansiOuter = true; // for mssql7 or later
+	var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
+	var $uniqueOrderBy = true;
+	var $_bindInputArray = true;
+	var $_dropSeqSQL = "drop table %s";
+	
+	function ADODB_mssqlnative() 
+	{		
+        if ($this->debug) {
+            error_log("
    ");
+            sqlsrv_set_error_handling( SQLSRV_ERRORS_LOG_ALL );
+            sqlsrv_log_set_severity( SQLSRV_LOG_SEVERITY_ALL );
+            sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+            sqlsrv_configure('warnings_return_as_errors', 0);
+        } else {
+            sqlsrv_set_error_handling(0);
+            sqlsrv_log_set_severity(0);
+            sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+            sqlsrv_configure('warnings_return_as_errors', 0);
+        }
+	}
+
+	function ServerInfo()
+	{
+    	global $ADODB_FETCH_MODE;
+		if ($this->fetchMode === false) {
+			$savem = $ADODB_FETCH_MODE;
+			$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		} else 
+			$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
+		$arrServerInfo = sqlsrv_server_info($this->_connectionID);
+		$arr['description'] = $arrServerInfo['SQLServerName'].' connected to '.$arrServerInfo['CurrentDatabase'];
+		$arr['version'] = $arrServerInfo['SQLServerVersion'];//ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " ISNULL($field, $ifNull) "; // if MS SQL Server
+	}
+	
+	function _insertid()
+	{
+	// SCOPE_IDENTITY()
+	// Returns the last IDENTITY value inserted into an IDENTITY column in 
+	// the same scope. A scope is a module -- a stored procedure, trigger, 
+	// function, or batch. Thus, two statements are in the same scope if 
+	// they are in the same stored procedure, function, or batch.
+		return $this->GetOne($this->identitySQL);
+	}
+
+	function _affectedrows()
+	{
+        return sqlsrv_rows_affected($this->_queryID);
+	}
+	
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		if($this->debug) error_log("
    CreateSequence($seq,$start)");
+        sqlsrv_begin_transaction($this->_connectionID);
+		$start -= 1;
+		$this->Execute("create table $seq (id int)");//was float(53)
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+            if($this->debug) error_log("
    Error: ROLLBACK");
+            sqlsrv_rollback($this->_connectionID);
+			return false;
+		}
+        sqlsrv_commit($this->_connectionID);
+		return true;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+        if($this->debug) error_log("
    GenID($seq,$start)");
+        sqlsrv_begin_transaction($this->_connectionID);
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$this->Execute("create table $seq (id int)");
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+                if($this->debug) error_log("
    Error: ROLLBACK");
+                sqlsrv_rollback($this->_connectionID);
+				return false;
+			}
+			sqlsrv_commit($this->_connectionID);
+			return $start;
+		}
+		$num = $this->GetOne("select id from $seq");
+        sqlsrv_commit($this->_connectionID);
+        if($this->debug) error_log(" Returning: $num");
+		return $num;
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '+';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "datename(yyyy,$col)";
+				break;
+			case 'M':
+				$s .= "convert(char(3),$col,0)";
+				break;
+			case 'm':
+				$s .= "replace(str(month($col),2),' ','0')";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "datename(quarter,$col)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "replace(str(day($col),2),' ','0')";
+				break;
+			case 'h':
+				$s .= "substring(convert(char(14),$col,0),13,2)";
+				break;
+			
+			case 'H':
+				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
+				break;
+				
+			case 'i':
+				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
+				break;
+			case 's':
+				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
+				break;
+			case 'a':
+			case 'A':
+				$s .= "substring(convert(char(19),$col,0),18,2)";
+				break;
+				
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+
+	
+	function BeginTrans()
+	{
+		if ($this->transOff) return true; 
+		$this->transCnt += 1;
+        if ($this->debug) error_log('
    begin transaction');
+		sqlsrv_begin_transaction($this->_connectionID);
+	   	return true;
+	}
+		
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true; 
+        if ($this->debug) error_log('
    commit transaction');
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		sqlsrv_commit($this->_connectionID);
+		return true;
+	}
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true; 
+        if ($this->debug) error_log('
    rollback transaction');
+		if ($this->transCnt) $this->transCnt -= 1;
+		sqlsrv_rollback($this->_connectionID);
+		return true;
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
+	/*
+		Usage:
+		
+		$this->BeginTrans();
+		$this->RowLock('table1,table2','table1.id=33 and table2.id=table1.id'); # lock row 33 for both tables
+		
+		# some operation on both tables table1 and table2
+		
+		$this->CommitTrans();
+		
+		See http://www.swynk.com/friends/achigrik/SQL70Locks.asp
+	*/
+	function RowLock($tables,$where,$col='1 as adodbignore') 
+	{
+		if ($col == '1 as adodbignore') $col = 'top 1 null as ignore';
+		if (!$this->transCnt) $this->BeginTrans();
+		return $this->GetOne("select $col from $tables with (ROWLOCK,HOLDLOCK) where $where");
+	}
+	 
+	function SelectDB($dbName) 
+	{
+		$this->database = $dbName;
+		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+		if ($this->_connectionID) {
+            $rs = $this->Execute('USE '.$dbName); 
+            if($rs) {
+                return true;
+            } else return false;		
+		}
+		else return false;	
+	}
+	
+	function ErrorMsg() 
+	{
+		$retErrors = sqlsrv_errors(SQLSRV_ERR_ALL);
+		if($retErrors != null) {
+			foreach($retErrors as $arrError) {
+				$this->_errorMsg .= "SQLState: ".$arrError[ 'SQLSTATE']."\n";
+				$this->_errorMsg .= "Error Code: ".$arrError[ 'code']."\n";
+				$this->_errorMsg .= "Message: ".$arrError[ 'message']."\n";
+			}
+		} else {
+			$this->_errorMsg = "No errors found";
+		}
+		return $this->_errorMsg;
+	}
+	
+	function ErrorNo() 
+	{
+		if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode;
+		$err = sqlsrv_errors(SQLSRV_ERR_ALL);
+        if($err[0]) return $err[0]['code'];
+        else return -1;
+	}
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sqlsrv_connect')) return null;
+        $connectionInfo = array("Database"=>$argDatabasename,'UID'=>$argUsername,'PWD'=>$argPassword);
+        if ($this->debug) error_log("
    connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
+        //if ($this->debug) error_log("
    _connectionID before: ".serialize($this->_connectionID));
+        if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) { 
+            if ($this->debug) error_log( "
    errors: ".print_r( sqlsrv_errors(), true));
+            return false;
+        }
+        //if ($this->debug) error_log(" _connectionID after: ".serialize($this->_connectionID));
+        //if ($this->debug) error_log("
    defined functions: 
    ".var_export(get_defined_functions(),true)."
    ");
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		//return null;//not implemented. NOTE: Persistent connections have no effect if PHP is used as a CGI program. (FastCGI!)
+        return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+	}
+	
+	function Prepare($sql)
+	{
+		$stmt = sqlsrv_prepare( $this->_connectionID, $sql);
+		if (!$stmt)  return $sql;
+		return array($sql,$stmt);
+	}
+	
+	// returns concatenated string
+    // MSSQL requires integers to be cast as strings
+    // automatically cast every datatype to VARCHAR(255)
+    // @author David Rogers (introspectshun)
+    function Concat()
+    {
+        $s = "";
+        $arr = func_get_args();
+
+        // Split single record on commas, if possible
+        if (sizeof($arr) == 1) {
+            foreach ($arr as $arg) {
+                $args = explode(',', $arg);
+            }
+            $arr = $args;
+        }
+
+        array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
+        $s = implode('+',$arr);
+        if (sizeof($arr) > 0) return "$s";
+        
+		return '';
+    }
+	
+	/* 
+		Unfortunately, it appears that mssql cannot handle varbinary > 255 chars
+		So all your blobs must be of type "image".
+		
+		Remember to set in php.ini the following...
+		
+		; Valid range 0 - 2147483647. Default = 4096. 
+		mssql.textlimit = 0 ; zero to pass through 
+
+		; Valid range 0 - 2147483647. Default = 4096. 
+		mssql.textsize = 0 ; zero to pass through 
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+	
+		if (strtoupper($blobtype) == 'CLOB') {
+			$sql = "UPDATE $table SET $column='" . $val . "' WHERE $where";
+			return $this->Execute($sql) != false;
+		}
+		$sql = "UPDATE $table SET $column=0x".bin2hex($val)." WHERE $where";
+		return $this->Execute($sql) != false;
+	}
+	
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr=false)
+	{
+		$this->_errorMsg = false;
+		if (is_array($inputarr)) {
+            $rez = sqlsrv_query($this->_connectionID,$sql,$inputarr);
+		} else if (is_array($sql)) {
+            $rez = sqlsrv_query($this->_connectionID,$sql[1],$inputarr);
+		} else {
+			$rez = sqlsrv_query($this->_connectionID,$sql);
+		}
+        if ($this->debug) error_log("
    running query: ".var_export($sql,true)."
    input array: ".var_export($inputarr,true)."
    result: ".var_export($rez,true));//"
    connection: ".serialize($this->_connectionID)
+        //fix for returning true on anything besides select statements
+        if (is_array($sql)) $sql = $sql[1];
+        $sql = ltrim($sql);
+        if(stripos($sql, 'SELECT') !== 0 && $rez !== false) {
+            if ($this->debug) error_log(" isn't a select query, returning boolean true");
+            return true;
+        }
+        //end fix
+        if(!$rez) $rez = false;
+		return $rez;
+	}
+	
+	// returns true or false
+	function _close()
+	{ 
+		if ($this->transCnt) $this->RollbackTrans();
+		$rez = @sqlsrv_close($this->_connectionID);
+		$this->_connectionID = false;
+		return $rez;
+	}
+	
+	// mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
+	{
+		return ADORecordSet_array_mssql::UnixDate($v);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_mssql::UnixTimeStamp($v);
+	}	
+
+	function &MetaIndexes($table,$primary=false, $owner = false)
+	{
+		$table = $this->qstr($table);
+
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
+			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
+			ORDER BY O.name, I.Name, K.keyno";
+
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+        	$savem = $this->SetFetchMode(FALSE);
+        }
+        
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+        	$this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        if (!is_object($rs)) {
+        	return FALSE;
+        }
+
+		$indexes = array();
+		while ($row = $rs->FetchRow()) {
+			if (!$primary && $row[5]) continue;
+			
+            $indexes[$row[0]]['unique'] = $row[6];
+            $indexes[$row[0]]['columns'][] = $row[1];
+    	}
+        return $indexes;
+	}
+	
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+    	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$table = $this->qstr(strtoupper($table));
+		
+		$sql = 
+            "select object_name(constid) as constraint_name,
+	            col_name(fkeyid, fkey) as column_name,
+	            object_name(rkeyid) as referenced_table_name,
+   	            col_name(rkeyid, rkey) as referenced_column_name
+            from sysforeignkeys
+            where upper(object_name(fkeyid)) = $table
+            order by constraint_name, referenced_table_name, keyno";
+		
+		$constraints =& $this->GetArray($sql);
+		
+		$ADODB_FETCH_MODE = $save;
+		
+		$arr = false;
+		foreach($constraints as $constr) {
+			//print_r($constr);
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+		}
+		if (!$arr) return false;
+		
+		$arr2 = false;
+		
+		foreach($arr as $k => $v) {
+			foreach($v as $a => $b) {
+				if ($upper) $a = strtoupper($a);
+				$arr2[$a] = $b;
+			}
+		}
+		return $arr2;
+	}
+
+	//From: Fernando Moreira 
+	function MetaDatabases() 
+	{ 
+	    $this->SelectDB("master");
+        $rs =& $this->Execute($this->metaDatabasesSQL);
+        $rows = $rs->GetRows();
+        $ret = array();
+        for($i=0;$iSelectDB($this->database);
+        if($ret)
+            return $ret;
+        else 
+            return false;
+	} 
+
+	// "Stein-Aksel Basma" 
+	// tested with MSSQL 2000
+	function &MetaPrimaryKeys($table)
+	{
+    	global $ADODB_FETCH_MODE;
+	
+		$schema = '';
+		$this->_findschema($table,$schema);
+		if (!$schema) $schema = $this->database;
+		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+
+		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
+		information_schema.table_constraints tc 
+		where tc.constraint_name = k.constraint_name and tc.constraint_type =
+		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
+		
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$a = $this->GetCol($sql);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if ($a && sizeof($a)>0) return $a;
+		$false = false;
+		return $false;	  
+	}
+
+	
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+	    if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(($mask));
+			$this->metaTablesSQL .= " AND name like $mask";
+		}
+		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
+
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_mssqlnative extends ADORecordSet {	
+
+	var $databaseType = "mssqlnative";
+	var $canSeek = false;
+	var $fieldOffset = 0;
+	// _mths works only in non-localised system
+	
+	function ADORecordset_mssqlnative($id,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+
+		}
+		$this->fetchMode = $mode;
+		return $this->ADORecordSet($id,$mode);
+	}
+	
+	
+	function _initrs()
+	{
+	    global $ADODB_COUNTRECS;	
+        if ($this->connection->debug) error_log("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+        /*$retRowsAff = sqlsrv_rows_affected($this->_queryID);//"If you need to determine the number of rows a query will return before retrieving the actual results, appending a SELECT COUNT ... query would let you get that information, and then a call to next_result would move you to the "real" results."
+        error_log("rowsaff: ".serialize($retRowsAff));
+		$this->_numOfRows = ($ADODB_COUNTRECS)? $retRowsAff:-1;*/
+        $this->_numOfRows = -1;//not supported
+        $fieldmeta = sqlsrv_field_metadata($this->_queryID);
+        $this->_numOfFields = ($fieldmeta)? count($fieldmeta):-1;
+        if ($this->connection->debug) error_log("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+	}
+	
+
+	//Contributed by "Sven Axelsson" 
+	// get next resultset - requires PHP 4.0.5 or later
+	function NextRecordSet()
+	{
+		if (!sqlsrv_next_result($this->_queryID)) return false;
+		$this->_inited = false;
+		$this->bind = false;
+		$this->_currentRow = -1;
+		$this->Init();
+		return true;
+	}
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode != ADODB_FETCH_NUM) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	/*	Returns: an object containing field information. 
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+
+	function &FetchField($fieldOffset = -1) 
+	{
+        if ($this->connection->debug) error_log("
    fetchfield: $fieldOffset, fetch array: 
    ".print_r($this->fields,true)."
     backtrace: ".adodb_backtrace(false));
+		if ($fieldOffset != -1) $this->fieldOffset = $fieldOffset;
+		$arrKeys = array_keys($this->fields);
+		if(array_key_exists($this->fieldOffset,$arrKeys) && !array_key_exists($arrKeys[$this->fieldOffset],$this->fields)) {
+			$f = false;
+		} else {
+			$f = $this->fields[ $arrKeys[$this->fieldOffset] ];
+			if($fieldOffset == -1) $this->fieldOffset++;
+		}
+
+        if (empty($f)) {
+            $f = false;//PHP Notice: Only variable references should be returned by reference
+        }
+		return $f;
+	}
+	
+	function _seek($row) 
+	{
+		return false;//There is no support for cursors in the driver at this time.  All data is returned via forward-only streams.
+	}
+
+	// speedup
+	function MoveNext() 
+	{
+        if ($this->connection->debug) error_log("movenext()");
+        //if ($this->connection->debug) error_log("eof (beginning): ".$this->EOF);
+		if ($this->EOF) return false;
+		
+		$this->_currentRow++;
+        if ($this->connection->debug) error_log("_currentRow: ".$this->_currentRow);
+		
+		if ($this->_fetch()) return true;
+		$this->EOF = true;
+        //if ($this->connection->debug) error_log("eof (end): ".$this->EOF);
+		
+		return false;
+	}
+
+	
+	// INSERT UPDATE DELETE returns false even if no error occurs in 4.0.4
+	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
+	function _fetch($ignore_fields=false) 
+	{
+        if ($this->connection->debug) error_log("_fetch()");
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			if ($this->fetchMode & ADODB_FETCH_NUM) {
+                if ($this->connection->debug) error_log("fetch mode: both");
+				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_BOTH);
+			} else {
+                if ($this->connection->debug) error_log("fetch mode: assoc");
+				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
+			}
+			
+			if (ADODB_ASSOC_CASE == 0) {
+				foreach($this->fields as $k=>$v) {
+					$this->fields[strtolower($k)] = $v;
+				}
+			} else if (ADODB_ASSOC_CASE == 1) {
+				foreach($this->fields as $k=>$v) {
+					$this->fields[strtoupper($k)] = $v;
+				}
+			}
+		} else {
+            if ($this->connection->debug) error_log("fetch mode: num");
+			$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_NUMERIC);
+		}
+        if(is_array($this->fields) && array_key_exists(1,$this->fields) && !array_key_exists(0,$this->fields)) {//fix fetch numeric keys since they're not 0 based 
+            $arrFixed = array();
+            foreach($this->fields as $key=>$value) {
+                if(is_numeric($key)) {
+                    $arrFixed[$key-1] = $value;
+                } else {
+                    $arrFixed[$key] = $value;
+                }
+            }
+            //if($this->connection->debug) error_log("
    fixing non 0 based return array, old: ".print_r($this->fields,true)." new: ".print_r($arrFixed,true));
+            $this->fields = $arrFixed;
+        }
+		if(is_array($this->fields)) {
+			foreach($this->fields as $key=>$value) {
+				if (is_object($value) && method_exists($value, 'format')) {//is DateTime object
+					$this->fields[$key] = $value->format("Y-m-d\TH:i:s\Z");
+				}
+			}
+		}
+        if($this->fields === null) $this->fields = false;
+        if ($this->connection->debug) error_log("
    after _fetch, fields: 
    ".print_r($this->fields,true)." backtrace: ".adodb_backtrace(false));
+		return $this->fields;
+	}
+	
+    /*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+	function _close() 
+	{
+		$rez = sqlsrv_free_stmt($this->_queryID);	
+		$this->_queryID = false;
+		return $rez;
+	}
+
+	// mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
+	{
+		return ADORecordSet_array_mssqlnative::UnixDate($v);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_mssqlnative::UnixTimeStamp($v);
+	}
+}
+
+
+class ADORecordSet_array_mssqlnative extends ADORecordSet_array {
+	function ADORecordSet_array_mssqlnative($id=-1,$mode=false) 
+	{
+		$this->ADORecordSet_array($id,$mode);
+	}
+	
+		// mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
+	{
+	
+		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixDate($v);
+		
+    	global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+	
+		//Dec 30 2000 12:00AM 
+		if ($ADODB_mssql_date_order == 'dmy') {
+			if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+				return parent::UnixDate($v);
+			}
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			
+			$theday = $rr[1];
+			$themth =  substr(strtoupper($rr[2]),0,3);
+		} else {
+			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})|" ,$v, $rr)) {
+				return parent::UnixDate($v);
+			}
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+			
+			$theday = $rr[2];
+			$themth = substr(strtoupper($rr[1]),0,3);
+		}
+		$themth = $ADODB_mssql_mths[$themth];
+		if ($themth <= 0) return false;
+		// h-m-s-MM-DD-YY
+		return  mktime(0,0,0,$themth,$theday,$rr[3]);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+	
+		if (is_numeric(substr($v,0,1)) && ADODB_PHPVER >= 0x4200) return parent::UnixTimeStamp($v);
+		
+	    global $ADODB_mssql_mths,$ADODB_mssql_date_order;
+	
+		//Dec 30 2000 12:00AM
+		 if ($ADODB_mssql_date_order == 'dmy') {
+			 if (!preg_match( "|^([0-9]{1,2})[-/\. ]+([A-Za-z]{3})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+			$theday = $rr[1];
+			$themth =  substr(strtoupper($rr[2]),0,3);
+		} else {
+			if (!preg_match( "|^([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})|"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+			if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+			$theday = $rr[2];
+			$themth = substr(strtoupper($rr[1]),0,3);
+		}
+		
+		$themth = $ADODB_mssql_mths[$themth];
+		if ($themth <= 0) return false;
+		
+		switch (strtoupper($rr[6])) {
+		case 'P':
+			if ($rr[4]<12) $rr[4] += 12;
+			break;
+		case 'A':
+			if ($rr[4]==12) $rr[4] = 0;
+			break;
+		default:
+			break;
+		}
+		// h-m-s-MM-DD-YY
+		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);
+	}
+}
+
+/*
+Code Example 1:
+
+select 	object_name(constid) as constraint_name,
+       	object_name(fkeyid) as table_name, 
+        col_name(fkeyid, fkey) as column_name,
+	object_name(rkeyid) as referenced_table_name,
+   	col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where object_name(fkeyid) = x
+order by constraint_name, table_name, referenced_table_name,  keyno
+
+Code Example 2:
+select 	constraint_name,
+	column_name,
+	ordinal_position
+from information_schema.key_column_usage
+where constraint_catalog = db_name()
+and table_name = x
+order by constraint_name, ordinal_position
+
+http://www.databasejournal.com/scripts/article.php/1440551
+*/
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mssqlpo.inc.php b/adodb/drivers/adodb-mssqlpo.inc.php
new file mode 100644
index 0000000..dd3b377
--- /dev/null
+++ b/adodb/drivers/adodb-mssqlpo.inc.php
@@ -0,0 +1,62 @@
+_has_mssql_init) {
+			ADOConnection::outp( "PrepareSP: mssql_init only available since PHP 4.1.0");
+			return $sql;
+		}
+		if (is_string($sql)) $sql = str_replace('||','+',$sql);
+		$stmt = mssql_init($sql,$this->_connectionID);
+		if (!$stmt)  return $sql;
+		return array($sql,$stmt);
+	}
+	
+	function _query($sql,$inputarr=false)
+	{
+		if (is_string($sql)) $sql = str_replace('||','+',$sql);
+		return ADODB_mssql::_query($sql,$inputarr);
+	}
+}
+
+class ADORecordset_mssqlpo extends ADORecordset_mssql {
+	var $databaseType = "mssqlpo";
+	function ADORecordset_mssqlpo($id,$mode=false)
+	{
+		$this->ADORecordset_mssql($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mysql.inc.php b/adodb/drivers/adodb-mysql.inc.php
new file mode 100644
index 0000000..4b215e5
--- /dev/null
+++ b/adodb/drivers/adodb-mysql.inc.php
@@ -0,0 +1,795 @@
+rsPrefix .= 'ext_';
+	}
+	
+	function ServerInfo()
+	{
+		$arr['description'] = ADOConnection::GetOne("select version()");
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " IFNULL($field, $ifNull) "; // if MySQL
+	}
+	
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{	
+		$save = $this->metaTablesSQL;
+		if ($showSchema && is_string($showSchema)) {
+			$this->metaTablesSQL .= " from $showSchema";
+		}
+		
+		if ($mask) {
+			$mask = $this->qstr($mask);
+			$this->metaTablesSQL .= " like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		$this->metaTablesSQL = $save;
+		return $ret;
+	}
+	
+	
+	function MetaIndexes ($table, $primary = FALSE, $owner=false)
+	{
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+        
+		$false = false;
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+        
+        // get index details
+        $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
+        
+        // restore fetchmode
+        if (isset($savem)) {
+                $this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+        
+        if (!is_object($rs)) {
+                return $false;
+        }
+        
+        $indexes = array ();
+        
+        // parse index data into array
+        while ($row = $rs->FetchRow()) {
+                if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+                        continue;
+                }
+                
+                if (!isset($indexes[$row[2]])) {
+                        $indexes[$row[2]] = array(
+                                'unique' => ($row[1] == 0),
+                                'columns' => array()
+                        );
+                }
+                
+                $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
+        }
+        
+        // sort columns by order in the index
+        foreach ( array_keys ($indexes) as $index )
+        {
+                ksort ($indexes[$index]['columns']);
+        }
+        
+        return $indexes;
+	}
+
+	
+	// if magic quotes disabled, use mysql_real_escape_string()
+	function qstr($s,$magic_quotes=false)
+	{
+		if (is_null($s)) return 'NULL';
+		if (!$magic_quotes) {
+		
+			if (ADODB_PHPVER >= 0x4300) {
+				if (is_resource($this->_connectionID))
+					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
+			}
+			if ($this->replaceQuote[0] == '\\'){
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		return "'$s'";
+	}
+	
+	function _insertid()
+	{
+		return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
+		//return mysql_insert_id($this->_connectionID);
+	}
+	
+	function GetOne($sql,$inputarr=false)
+	{
+	global $ADODB_GETONE_EOF;
+		if ($this->compat323 == false && strncasecmp($sql,'sele',4) == 0) {
+			$rs = $this->SelectLimit($sql,1,-1,$inputarr);
+			if ($rs) {
+				$rs->Close();
+				if ($rs->EOF) return $ADODB_GETONE_EOF;
+				return reset($rs->fields);
+			}
+		} else {
+			return ADOConnection::GetOne($sql,$inputarr);
+		}
+		return false;
+	}
+	
+	function BeginTrans()
+	{
+		if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
+	}
+	
+	function _affectedrows()
+	{
+			return mysql_affected_rows($this->_connectionID);
+	}
+  
+ 	 // See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
+	// Reference on Last_Insert_ID on the recommended way to simulate sequences
+ 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
+	var $_genSeqSQL = "create table %s (id int not null)";
+	var $_genSeqCountSQL = "select count(*) from %s";
+	var $_genSeq2SQL = "insert into %s values (%s)";
+	var $_dropSeqSQL = "drop table %s";
+	
+	function CreateSequence($seqname='adodbseq',$startID=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$u = strtoupper($seqname);
+		
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+	}
+	
+
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		// post-nuke sets hasGenID to false
+		if (!$this->hasGenID) return false;
+		
+		$savelog = $this->_logsql;
+		$this->_logsql = false;
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		$holdtransOK = $this->_transOK; // save the current status
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
+			$u = strtoupper($seqname);
+			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
+			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
+			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+			$rs = $this->Execute($getnext);
+		}
+		
+		if ($rs) {
+			$this->genID = mysql_insert_id($this->_connectionID);
+			$rs->Close();
+		} else
+			$this->genID = 0;
+		
+		$this->_logsql = $savelog;
+		return $this->genID;
+	}
+	
+  	function MetaDatabases()
+	{
+		$qid = mysql_list_dbs($this->_connectionID);
+		$arr = array();
+		$i = 0;
+		$max = mysql_num_rows($qid);
+		while ($i < $max) {
+			$db = mysql_tablename($qid,$i);
+			if ($db != 'mysql') $arr[] = $db;
+			$i += 1;
+		}
+		return $arr;
+	}
+	
+		
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = 'DATE_FORMAT('.$col.",'";
+		$concat = false;
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+				
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				/** FALL THROUGH */
+			case '-':
+			case '/':
+				$s .= $ch;
+				break;
+				
+			case 'Y':
+			case 'y':
+				$s .= '%Y';
+				break;
+			case 'M':
+				$s .= '%b';
+				break;
+				
+			case 'm':
+				$s .= '%m';
+				break;
+			case 'D':
+			case 'd':
+				$s .= '%d';
+				break;
+			
+			case 'Q':
+			case 'q':
+				$s .= "'),Quarter($col)";
+				
+				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+				else $s .= ",('";
+				$concat = true;
+				break;
+			
+			case 'H': 
+				$s .= '%H';
+				break;
+				
+			case 'h':
+				$s .= '%I';
+				break;
+				
+			case 'i':
+				$s .= '%i';
+				break;
+				
+			case 's':
+				$s .= '%s';
+				break;
+				
+			case 'a':
+			case 'A':
+				$s .= '%p';
+				break;
+				
+			case 'w':
+				$s .= '%w';
+				break;
+				
+			 case 'W':
+				$s .= '%U';
+				break;
+				
+			case 'l':
+				$s .= '%W';
+				break;
+			}
+		}
+		$s.="')";
+		if ($concat) $s = "CONCAT($s)";
+		return $s;
+	}
+	
+
+	// returns concatenated string
+	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+		
+		// suggestion by andrew005@mnogo.ru
+		$s = implode(',',$arr); 
+		if (strlen($s) > 0) return "CONCAT($s)";
+		else return '';
+	}
+	
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) $date = $this->sysDate;
+		
+		$fraction = $dayFraction * 24 * 3600;
+		return '('. $date . ' + INTERVAL ' .	 $fraction.' SECOND)';
+		
+//		return "from_unixtime(unix_timestamp($date)+$fraction)";
+	}
+	
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!empty($this->port)) $argHostname .= ":".$this->port;
+		
+		if (ADODB_PHPVER >= 0x4300)
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect,$this->clientFlags);
+		else if (ADODB_PHPVER >= 0x4200)
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect);
+		else
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
+	
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!empty($this->port)) $argHostname .= ":".$this->port;
+		
+		if (ADODB_PHPVER >= 0x4300)
+			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
+		else
+			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($this->autoRollback) $this->RollbackTrans();
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		$this->forceNewConnect = true;
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+	}
+	
+ 	function MetaColumns($table, $normalize=true) 
+	{
+		$this->_findschema($table,$schema);
+		if ($schema) {
+			$dbName = $this->database;
+			$this->SelectDB($schema);
+		}
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+		
+		if ($schema) {
+			$this->SelectDB($dbName);
+		}
+		
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		if (!is_object($rs)) {
+			$false = false;
+			return $false;
+		}
+			
+		$retarr = array();
+		while (!$rs->EOF){
+			$fld = new ADOFieldObject();
+			$fld->name = $rs->fields[0];
+			$type = $rs->fields[1];
+			
+			// split type into type(length):
+			$fld->scale = null;
+			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
+			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$arr = explode(",",$query_array[2]);
+				$fld->enums = $arr;
+				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
+				$fld->max_length = ($zlen > 0) ? $zlen : 1;
+			} else {
+				$fld->type = $type;
+				$fld->max_length = -1;
+			}
+			$fld->not_null = ($rs->fields[2] != 'YES');
+			$fld->primary_key = ($rs->fields[3] == 'PRI');
+			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
+			$fld->binary = (strpos($type,'blob') !== false || strpos($type,'binary') !== false);
+			$fld->unsigned = (strpos($type,'unsigned') !== false);
+			$fld->zerofill = (strpos($type,'zerofill') !== false);
+
+			if (!$fld->binary) {
+				$d = $rs->fields[4];
+				if ($d != '' && $d != 'NULL') {
+					$fld->has_default = true;
+					$fld->default_value = $d;
+				} else {
+					$fld->has_default = false;
+				}
+			}
+			
+			if ($save == ADODB_FETCH_NUM) {
+				$retarr[] = $fld;
+			} else {
+				$retarr[strtoupper($fld->name)] = $fld;
+			}
+				$rs->MoveNext();
+			}
+		
+			$rs->Close();
+			return $retarr;	
+	}
+		
+	// returns true or false
+	function SelectDB($dbName) 
+	{
+		$this->database = $dbName;
+		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+		if ($this->_connectionID) {
+			return @mysql_select_db($dbName,$this->_connectionID);		
+		}
+		else return false;	
+	}
+	
+	// parameters use PostgreSQL convention, not MySQL
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
+	{
+		$offsetStr =($offset>=0) ? ((integer)$offset)."," : '';
+		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
+		if ($nrows < 0) $nrows = '18446744073709551615'; 
+		
+		if ($secs)
+			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
+		else
+			$rs = $this->Execute($sql." LIMIT $offsetStr".((integer)$nrows),$inputarr);
+		return $rs;
+	}
+	
+	// returns queryID or false
+	function _query($sql,$inputarr=false)
+	{
+	//global $ADODB_COUNTRECS;
+		//if($ADODB_COUNTRECS) 
+		return mysql_query($sql,$this->_connectionID);
+		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+	
+		if ($this->_logsql) return $this->_errorMsg;
+		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
+		else $this->_errorMsg = @mysql_error($this->_connectionID);
+		return $this->_errorMsg;
+	}
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	{
+		if ($this->_logsql) return $this->_errorCode;
+		if (empty($this->_connectionID))  return @mysql_errno();
+		else return @mysql_errno($this->_connectionID);
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		@mysql_close($this->_connectionID);
+		$this->_connectionID = false;
+	}
+
+	
+	/*
+	* Maximum size of C field
+	*/
+	function CharMax()
+	{
+		return 255; 
+	}
+	
+	/*
+	* Maximum size of X field
+	*/
+	function TextMax()
+	{
+		return 4294967295; 
+	}
+	
+	// "Innox - Juan Carlos Gonzalez" 
+	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
+     {
+	 global $ADODB_FETCH_MODE;
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+
+         if ( !empty($owner) ) {
+            $table = "$owner.$table";
+         }
+         $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
+		 if ($associative) {
+		 	$create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
+         } else $create_sql  = $a_create_table[1];
+
+         $matches = array();
+
+         if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
+	     $foreign_keys = array();	 	 
+         $num_keys = count($matches[0]);
+         for ( $i = 0;  $i < $num_keys;  $i ++ ) {
+             $my_field  = explode('`, `', $matches[1][$i]);
+             $ref_table = $matches[2][$i];
+             $ref_field = explode('`, `', $matches[3][$i]);
+
+             if ( $upper ) {
+                 $ref_table = strtoupper($ref_table);
+             }
+
+			// see https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+			if (!isset($foreign_keys[$ref_table])) {
+				$foreign_keys[$ref_table] = array();
+			}
+            $num_fields = count($my_field);
+            for ( $j = 0;  $j < $num_fields;  $j ++ ) {
+                 if ( $associative ) {
+                     $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
+                 } else {
+                     $foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
+                 }
+             }
+         }
+         
+         return  $foreign_keys;
+     }
+	 
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+
+class ADORecordSet_mysql extends ADORecordSet{	
+	
+	var $databaseType = "mysql";
+	var $canSeek = true;
+	
+	function ADORecordSet_mysql($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default:
+			$this->fetchMode = MYSQL_BOTH; break;
+		}
+		$this->adodbFetchMode = $mode;
+		$this->ADORecordSet($queryID);	
+	}
+	
+	function _initrs()
+	{
+	//GLOBAL $ADODB_COUNTRECS;
+	//	$this->_numOfRows = ($ADODB_COUNTRECS) ? @mysql_num_rows($this->_queryID):-1;
+		$this->_numOfRows = @mysql_num_rows($this->_queryID);
+		$this->_numOfFields = @mysql_num_fields($this->_queryID);
+	}
+	
+	function FetchField($fieldOffset = -1) 
+	{	
+		if ($fieldOffset != -1) {
+			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
+			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
+			if ($o) $o->max_length = @mysql_field_len($this->_queryID,$fieldOffset); // suggested by: Jim Nicholson (jnich#att.com)
+			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
+			if ($o) $o->binary = (strpos($f,'binary')!== false);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$o = @mysql_fetch_field($this->_queryID);
+			if ($o) $o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich#att.com)
+		//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
+		}
+			
+		return $o;
+	}
+
+	function GetRowAssoc($upper=true)
+	{
+		if ($this->fetchMode == MYSQL_ASSOC && !$upper) $row = $this->fields;
+		else $row = ADORecordSet::GetRowAssoc($upper);
+		return $row;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{	
+		// added @ by "Michael William Miller" 
+		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
+		
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	function _seek($row)
+	{
+		if ($this->_numOfRows == 0) return false;
+		return @mysql_data_seek($this->_queryID,$row);
+	}
+	
+	function MoveNext()
+	{
+		//return adodb_movenext($this);
+		//if (defined('ADODB_EXTENSION')) return adodb_movenext($this);
+		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
+		return false;
+	}
+	
+	function _fetch()
+	{
+		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
+		return is_array($this->fields);
+	}
+	
+	function _close() {
+		@mysql_free_result($this->_queryID);	
+		$this->_queryID = false;	
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		$len = -1; // mysql max_length is not accurate
+		switch (strtoupper($t)) {
+		case 'STRING': 
+		case 'CHAR':
+		case 'VARCHAR': 
+		case 'TINYBLOB': 
+		case 'TINYTEXT': 
+		case 'ENUM': 
+		case 'SET': 
+			if ($len <= $this->blobSize) return 'C';
+			
+		case 'TEXT':
+		case 'LONGTEXT': 
+		case 'MEDIUMTEXT':
+			return 'X';
+			
+		// php_mysql extension always returns 'blob' even if 'text'
+		// so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+		case 'BINARY':
+			return !empty($fieldobj->binary) ? 'B' : 'X';
+			
+		case 'YEAR':
+		case 'DATE': return 'D';
+		
+		case 'TIME':
+		case 'DATETIME':
+		case 'TIMESTAMP': return 'T';
+		
+		case 'INT': 
+		case 'INTEGER':
+		case 'BIGINT':
+		case 'TINYINT':
+		case 'MEDIUMINT':
+		case 'SMALLINT': 
+			
+			if (!empty($fieldobj->primary_key)) return 'R';
+			else return 'I';
+		
+		default: return 'N';
+		}
+	}
+
+}
+
+class ADORecordSet_ext_mysql extends ADORecordSet_mysql {	
+	function ADORecordSet_ext_mysql($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default:
+		$this->fetchMode = MYSQL_BOTH; break;
+		}
+		$this->adodbFetchMode = $mode;
+		$this->ADORecordSet($queryID);
+	}
+	
+	function MoveNext()
+	{
+		return @adodb_movenext($this);
+	}
+}
+
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mysqli.inc.php b/adodb/drivers/adodb-mysqli.inc.php
new file mode 100644
index 0000000..094c150
--- /dev/null
+++ b/adodb/drivers/adodb-mysqli.inc.php
@@ -0,0 +1,1209 @@
+_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+	}
+
+	// returns true or false
+	// To add: parameter int $port,
+	//         parameter string $socket
+	function _connect($argHostname = NULL, 
+			  $argUsername = NULL, 
+			  $argPassword = NULL, 
+			  $argDatabasename = NULL, $persist=false)
+	  {
+	  	 if(!extension_loaded("mysqli")) {
+			return null;
+		 }
+	    $this->_connectionID = @mysqli_init();
+	    
+	    if (is_null($this->_connectionID)) {
+	      // mysqli_init only fails if insufficient memory
+	      if ($this->debug) 
+				ADOConnection::outp("mysqli_init() failed : "  . $this->ErrorMsg());
+	      return false;
+	    }
+		/*
+		I suggest a simple fix which would enable adodb and mysqli driver to
+		read connection options from the standard mysql configuration file
+		/etc/my.cnf - "Bastien Duclaux" 
+		*/
+		foreach($this->optionFlags as $arr) {	
+			mysqli_options($this->_connectionID,$arr[0],$arr[1]);
+		}
+
+		#if (!empty($this->port)) $argHostname .= ":".$this->port;
+		$ok = mysqli_real_connect($this->_connectionID,
+ 				    $argHostname,
+ 				    $argUsername,
+ 				    $argPassword,
+ 				    $argDatabasename,
+					$this->port,
+					$this->socket,
+					$this->clientFlags);
+ 	     
+		if ($ok) {
+	 		if ($argDatabasename)  return $this->SelectDB($argDatabasename);
+ 			return true;
+ 	   } else {
+			if ($this->debug) 
+		  		ADOConnection::outp("Could't connect : "  . $this->ErrorMsg());
+			$this->_connectionID = null;
+			return false;
+	   }
+	}
+	
+	// returns true or false
+	// How to force a persistent connection
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, true);
+
+	}
+	
+	// When is this used? Close old connection first?
+	// In _connect(), check $this->forceNewConnect? 
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	  {
+	    $this->forceNewConnect = true;
+	    return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
+	  }
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " IFNULL($field, $ifNull) "; // if MySQL
+	}
+	
+	// do not use $ADODB_COUNTRECS
+	function GetOne($sql,$inputarr=false)
+	{
+		$ret = false;
+		$rs = $this->Execute($sql,$inputarr);
+		if ($rs) {	
+			if (!$rs->EOF) $ret = reset($rs->fields);
+			$rs->Close();
+		}
+		return $ret;
+	}
+	
+	function ServerInfo()
+	{
+		$arr['description'] = $this->GetOne("select version()");
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+	
+	
+	function BeginTrans()
+	{	  
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		
+		//$this->Execute('SET AUTOCOMMIT=0');
+		mysqli_autocommit($this->_connectionID, false);
+		$this->Execute('BEGIN');
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('COMMIT');
+		
+		//$this->Execute('SET AUTOCOMMIT=1');
+		mysqli_autocommit($this->_connectionID, true);
+		return true;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('ROLLBACK');
+		//$this->Execute('SET AUTOCOMMIT=1');
+		mysqli_autocommit($this->_connectionID, true);
+		return true;
+	}
+	
+	function RowLock($tables,$where='',$col='1 as adodbignore') 
+	{
+		if ($this->transCnt==0) $this->BeginTrans();
+		if ($where) $where = ' where '.$where;
+		$rs = $this->Execute("select $col from $tables $where for update");
+		return !empty($rs); 
+	}
+	
+	// if magic quotes disabled, use mysql_real_escape_string()
+	// From readme.htm:
+	// Quotes a string to be sent to the database. The $magic_quotes_enabled
+	// parameter may look funny, but the idea is if you are quoting a 
+	// string extracted from a POST/GET variable, then 
+	// pass get_magic_quotes_gpc() as the second parameter. This will 
+	// ensure that the variable is not quoted twice, once by qstr and once 
+	// by the magic_quotes_gpc.
+	//
+	//Eg. $s = $db->qstr(_GET['name'],get_magic_quotes_gpc());
+	function qstr($s, $magic_quotes = false)
+	{
+		if (is_null($s)) return 'NULL';
+		if (!$magic_quotes) {
+	    	if (PHP_VERSION >= 5)
+	      		return "'" . mysqli_real_escape_string($this->_connectionID, $s) . "'";   
+	    
+		if ($this->replaceQuote[0] == '\\')
+			$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+	    return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+	  }
+	  // undo magic quotes for "
+	  $s = str_replace('\\"','"',$s);
+	  return "'$s'";
+	}
+	
+	function _insertid()
+	{
+	  $result = @mysqli_insert_id($this->_connectionID);
+	  if ($result == -1){
+	      if ($this->debug) ADOConnection::outp("mysqli_insert_id() failed : "  . $this->ErrorMsg());
+	  }
+	  return $result;
+	}
+	
+	// Only works for INSERT, UPDATE and DELETE query's
+	function _affectedrows()
+	{
+	  $result =  @mysqli_affected_rows($this->_connectionID);
+	  if ($result == -1) {
+	      if ($this->debug) ADOConnection::outp("mysqli_affected_rows() failed : "  . $this->ErrorMsg());
+	  }
+	  return $result;
+	}
+  
+ 	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
+	// Reference on Last_Insert_ID on the recommended way to simulate sequences
+ 	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
+	var $_genSeqSQL = "create table %s (id int not null)";
+	var $_genSeqCountSQL = "select count(*) from %s";
+	var $_genSeq2SQL = "insert into %s values (%s)";
+	var $_dropSeqSQL = "drop table %s";
+	
+	function CreateSequence($seqname='adodbseq',$startID=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$u = strtoupper($seqname);
+		
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+	}
+	
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		// post-nuke sets hasGenID to false
+		if (!$this->hasGenID) return false;
+		
+		$getnext = sprintf($this->_genIDSQL,$seqname);
+		$holdtransOK = $this->_transOK; // save the current status
+		$rs = @$this->Execute($getnext);
+		if (!$rs) {
+			if ($holdtransOK) $this->_transOK = true; //if the status was ok before reset
+			$u = strtoupper($seqname);
+			$this->Execute(sprintf($this->_genSeqSQL,$seqname));
+			$cnt = $this->GetOne(sprintf($this->_genSeqCountSQL,$seqname));
+			if (!$cnt) $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
+			$rs = $this->Execute($getnext);
+		}
+		
+		if ($rs) {
+			$this->genID = mysqli_insert_id($this->_connectionID);
+			$rs->Close();
+		} else
+			$this->genID = 0;
+			
+		return $this->genID;
+	}
+	
+  	function MetaDatabases()
+	{
+		$query = "SHOW DATABASES";
+		$ret = $this->Execute($query);
+		if ($ret && is_object($ret)){
+		   $arr = array();
+			while (!$ret->EOF){
+				$db = $ret->Fields('Database');
+				if ($db != 'mysql') $arr[] = $db;
+				$ret->MoveNext();
+			}
+   		   return $arr;
+		}
+        return $ret;
+	}
+
+	  
+	function MetaIndexes ($table, $primary = FALSE, $owner = false)
+	{
+		// save old fetch mode
+		global $ADODB_FETCH_MODE;
+		
+		$false = false;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== FALSE) {
+		       $savem = $this->SetFetchMode(FALSE);
+		}
+		
+		// get index details
+		$rs = $this->Execute(sprintf('SHOW INDEXES FROM %s',$table));
+		
+		// restore fetchmode
+		if (isset($savem)) {
+		        $this->SetFetchMode($savem);
+		}
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!is_object($rs)) {
+		        return $false;
+		}
+		
+		$indexes = array ();
+		
+		// parse index data into array
+		while ($row = $rs->FetchRow()) {
+		        if ($primary == FALSE AND $row[2] == 'PRIMARY') {
+		                continue;
+		        }
+		        
+		        if (!isset($indexes[$row[2]])) {
+		                $indexes[$row[2]] = array(
+		                        'unique' => ($row[1] == 0),
+		                        'columns' => array()
+		                );
+		        }
+		        
+		        $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
+		}
+		
+		// sort columns by order in the index
+		foreach ( array_keys ($indexes) as $index )
+		{
+		        ksort ($indexes[$index]['columns']);
+		}
+		
+		return $indexes;
+	}
+
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = 'DATE_FORMAT('.$col.",'";
+		$concat = false;
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= '%Y';
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "'),Quarter($col)";
+				
+				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+				else $s .= ",('";
+				$concat = true;
+				break;
+			case 'M':
+				$s .= '%b';
+				break;
+				
+			case 'm':
+				$s .= '%m';
+				break;
+			case 'D':
+			case 'd':
+				$s .= '%d';
+				break;
+			
+			case 'H': 
+				$s .= '%H';
+				break;
+				
+			case 'h':
+				$s .= '%I';
+				break;
+				
+			case 'i':
+				$s .= '%i';
+				break;
+				
+			case 's':
+				$s .= '%s';
+				break;
+				
+			case 'a':
+			case 'A':
+				$s .= '%p';
+				break;
+			
+			case 'w':
+				$s .= '%w';
+				break;
+				
+			case 'l':
+				$s .= '%W';
+				break;
+				
+			default:
+				
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $ch;
+				break;
+			}
+		}
+		$s.="')";
+		if ($concat) $s = "CONCAT($s)";
+		return $s;
+	}
+	
+	// returns concatenated string
+	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
+	function Concat()
+	{
+		$s = "";
+		$arr = func_get_args();
+		
+		// suggestion by andrew005@mnogo.ru
+		$s = implode(',',$arr); 
+		if (strlen($s) > 0) return "CONCAT($s)";
+		else return '';
+	}
+	
+	// dayFraction is a day in floating point
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) $date = $this->sysDate;
+		
+		$fraction = $dayFraction * 24 * 3600;
+		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
+		
+//		return "from_unixtime(unix_timestamp($date)+$fraction)";
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{	
+		$save = $this->metaTablesSQL;
+		if ($showSchema && is_string($showSchema)) {
+			$this->metaTablesSQL .= " from $showSchema";
+		}
+		
+		if ($mask) {
+			$mask = $this->qstr($mask);
+			$this->metaTablesSQL .= " like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		$this->metaTablesSQL = $save;
+		return $ret;
+	}
+	
+	// "Innox - Juan Carlos Gonzalez" 
+	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
+	{
+	 global $ADODB_FETCH_MODE;
+		
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+		
+	    if ( !empty($owner) ) {
+	       $table = "$owner.$table";
+	    }
+	    $a_create_table = $this->getRow(sprintf('SHOW CREATE TABLE %s', $table));
+		if ($associative) {
+			$create_sql = isset($a_create_table["Create Table"]) ? $a_create_table["Create Table"] : $a_create_table["Create View"];
+	    } else $create_sql  = $a_create_table[1];
+	
+	    $matches = array();
+	
+	    if (!preg_match_all("/FOREIGN KEY \(`(.*?)`\) REFERENCES `(.*?)` \(`(.*?)`\)/", $create_sql, $matches)) return false;
+	 	$foreign_keys = array();	 	 
+	    $num_keys = count($matches[0]);
+	    for ( $i = 0;  $i < $num_keys;  $i ++ ) {
+	        $my_field  = explode('`, `', $matches[1][$i]);
+	        $ref_table = $matches[2][$i];
+	        $ref_field = explode('`, `', $matches[3][$i]);
+	
+	        if ( $upper ) {
+	            $ref_table = strtoupper($ref_table);
+	        }
+	
+	        // see https://sourceforge.net/tracker/index.php?func=detail&aid=2287278&group_id=42718&atid=433976
+			if (!isset($foreign_keys[$ref_table])) {
+				$foreign_keys[$ref_table] = array();
+			}
+	        $num_fields = count($my_field);
+	        for ( $j = 0;  $j < $num_fields;  $j ++ ) {
+	            if ( $associative ) {
+	                $foreign_keys[$ref_table][$ref_field[$j]] = $my_field[$j];
+	            } else {
+	                $foreign_keys[$ref_table][] = "{$my_field[$j]}={$ref_field[$j]}";
+	            }
+	        }
+	    }
+	    
+	    return  $foreign_keys;
+	}
+	
+ 	function MetaColumns($table, $normalize=true) 
+	{
+		$false = false;
+		if (!$this->metaColumnsSQL)
+			return $false;
+		
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false)
+			$savem = $this->SetFetchMode(false);
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		if (!is_object($rs))
+			return $false;
+		
+		$retarr = array();
+		while (!$rs->EOF) {
+			$fld = new ADOFieldObject();
+			$fld->name = $rs->fields[0];
+			$type = $rs->fields[1];
+			
+			// split type into type(length):
+			$fld->scale = null;
+			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
+			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$arr = explode(",",$query_array[2]);
+				$fld->enums = $arr;
+				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
+				$fld->max_length = ($zlen > 0) ? $zlen : 1;
+			} else {
+				$fld->type = $type;
+				$fld->max_length = -1;
+			}
+			$fld->not_null = ($rs->fields[2] != 'YES');
+			$fld->primary_key = ($rs->fields[3] == 'PRI');
+			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
+			$fld->binary = (strpos($type,'blob') !== false);
+			$fld->unsigned = (strpos($type,'unsigned') !== false);
+			$fld->zerofill = (strpos($type,'zerofill') !== false);
+
+			if (!$fld->binary) {
+				$d = $rs->fields[4];
+				if ($d != '' && $d != 'NULL') {
+					$fld->has_default = true;
+					$fld->default_value = $d;
+				} else {
+					$fld->has_default = false;
+				}
+			}
+			
+			if ($save == ADODB_FETCH_NUM) {
+				$retarr[] = $fld;
+			} else {
+				$retarr[strtoupper($fld->name)] = $fld;
+			}
+			$rs->MoveNext();
+		}
+		
+		$rs->Close();
+		return $retarr;
+	}
+		
+	// returns true or false
+	function SelectDB($dbName) 
+	{
+//	    $this->_connectionID = $this->mysqli_resolve_link($this->_connectionID);
+	    $this->database = $dbName;
+		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+		
+	    if ($this->_connectionID) {
+        	$result = @mysqli_select_db($this->_connectionID, $dbName);
+			if (!$result) {
+		    	ADOConnection::outp("Select of database " . $dbName . " failed. " . $this->ErrorMsg());
+			}
+			return $result;		
+		}
+	    return false;	
+	}
+	
+	// parameters use PostgreSQL convention, not MySQL
+	function SelectLimit($sql,
+			      $nrows = -1,
+			      $offset = -1,
+			      $inputarr = false, 
+			      $secs = 0)
+	{
+		$offsetStr = ($offset >= 0) ? "$offset," : '';
+		if ($nrows < 0) $nrows = '18446744073709551615';
+		
+		if ($secs)
+			$rs = $this->CacheExecute($secs, $sql . " LIMIT $offsetStr$nrows" , $inputarr );
+		else
+			$rs = $this->Execute($sql . " LIMIT $offsetStr$nrows" , $inputarr );
+			
+		return $rs;
+	}
+	
+	
+	function Prepare($sql)
+	{
+		return $sql;
+		$stmt = $this->_connectionID->prepare($sql);
+		if (!$stmt) {
+			echo $this->ErrorMsg();
+			return $sql;
+		}
+		return array($sql,$stmt);
+	}
+	
+	
+	// returns queryID or false
+	function _query($sql, $inputarr)
+	{
+	global $ADODB_COUNTRECS;
+		// Move to the next recordset, or return false if there is none. In a stored proc
+		// call, mysqli_next_result returns true for the last "recordset", but mysqli_store_result
+		// returns false. I think this is because the last "recordset" is actually just the
+		// return value of the stored proc (ie the number of rows affected).
+		// Commented out for reasons of performance. You should retrieve every recordset yourself.
+		//	if (!mysqli_next_result($this->connection->_connectionID))	return false;
+	
+		if (is_array($sql)) {
+		
+			// Prepare() not supported because mysqli_stmt_execute does not return a recordset, but
+			// returns as bound variables.
+		
+			$stmt = $sql[1];
+			$a = '';
+			foreach($inputarr as $k => $v) {
+				if (is_string($v)) $a .= 's';
+				else if (is_integer($v)) $a .= 'i'; 
+				else $a .= 'd';
+			}
+			
+			$fnarr = array_merge( array($stmt,$a) , $inputarr);
+			$ret = call_user_func_array('mysqli_stmt_bind_param',$fnarr);
+			$ret = mysqli_stmt_execute($stmt);
+			return $ret;
+		}
+		
+		/*
+		if (!$mysql_res =  mysqli_query($this->_connectionID, $sql, ($ADODB_COUNTRECS) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT)) {
+		    if ($this->debug) ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
+		    return false;
+		}
+		
+		return $mysql_res;
+		*/
+		
+		if ($this->multiQuery) {
+			$rs = mysqli_multi_query($this->_connectionID, $sql.';');
+			if ($rs) {
+				$rs = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->_connectionID ) : @mysqli_use_result( $this->_connectionID );
+				return $rs ? $rs : true; // mysqli_more_results( $this->_connectionID )
+			}
+		} else {
+			$rs = mysqli_query($this->_connectionID, $sql, $ADODB_COUNTRECS ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
+		
+			if ($rs) return $rs;
+		}
+
+		if($this->debug)
+			ADOConnection::outp("Query: " . $sql . " failed. " . $this->ErrorMsg());
+		
+		return false;
+		
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	  {
+	    if (empty($this->_connectionID)) 
+	      $this->_errorMsg = @mysqli_connect_error();
+	    else 
+	      $this->_errorMsg = @mysqli_error($this->_connectionID);
+	    return $this->_errorMsg;
+	  }
+	
+	/*	Returns: the last error number from previous database operation	*/	
+	function ErrorNo() 
+	  {
+	    if (empty($this->_connectionID))  
+	      return @mysqli_connect_errno();
+	    else 
+	      return @mysqli_errno($this->_connectionID);
+	  }
+	
+	// returns true or false
+	function _close()
+	  {
+	    @mysqli_close($this->_connectionID);
+	    $this->_connectionID = false;
+	  }
+
+	/*
+	* Maximum size of C field
+	*/
+	function CharMax()
+	{
+		return 255; 
+	}
+	
+	/*
+	* Maximum size of X field
+	*/
+	function TextMax()
+	{
+	  return 4294967295; 
+	}
+
+
+
+	// this is a set of functions for managing client encoding - very important if the encodings
+	// of your database and your output target (i.e. HTML) don't match
+	// for instance, you may have UTF8 database and server it on-site as latin1 etc.
+	// GetCharSet - get the name of the character set the client is using now
+	// Under Windows, the functions should work with MySQL 4.1.11 and above, the set of charsets supported
+	// depends on compile flags of mysql distribution 
+
+  function GetCharSet()
+  {
+    //we will use ADO's builtin property charSet
+    if (!method_exists($this->_connectionID,'character_set_name'))
+    	return false;
+    	
+    $this->charSet = @$this->_connectionID->character_set_name();
+    if (!$this->charSet) {
+      return false;
+    } else {
+      return $this->charSet;
+    }
+  }
+
+  // SetCharSet - switch the client encoding
+  function SetCharSet($charset_name)
+  {
+    if (!method_exists($this->_connectionID,'set_charset'))
+    	return false;
+
+    if ($this->charSet !== $charset_name) {
+      $if = @$this->_connectionID->set_charset($charset_name);
+      if ($if == "0" & $this->GetCharSet() == $charset_name) {
+        return true;
+      } else return false;
+    } else return true;
+  }
+
+
+
+
+}
+ 
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_mysqli extends ADORecordSet{	
+	
+	var $databaseType = "mysqli";
+	var $canSeek = true;
+	
+	function ADORecordSet_mysqli($queryID, $mode = false) 
+	{
+	  if ($mode === false) 
+	   { 
+	      global $ADODB_FETCH_MODE;
+	      $mode = $ADODB_FETCH_MODE;
+	   }
+	   
+	  switch ($mode)
+	    {
+	    case ADODB_FETCH_NUM: 
+	      $this->fetchMode = MYSQLI_NUM; 
+	      break;
+	    case ADODB_FETCH_ASSOC:
+	      $this->fetchMode = MYSQLI_ASSOC; 
+	      break;
+	    case ADODB_FETCH_DEFAULT:
+	    case ADODB_FETCH_BOTH:
+	    default:
+	      $this->fetchMode = MYSQLI_BOTH; 
+	      break;
+	    }
+	  $this->adodbFetchMode = $mode;
+	  $this->ADORecordSet($queryID);	
+	}
+	
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+	
+		$this->_numOfRows = $ADODB_COUNTRECS ? @mysqli_num_rows($this->_queryID) : -1;
+		$this->_numOfFields = @mysqli_num_fields($this->_queryID);
+	}
+	
+/*
+1      = MYSQLI_NOT_NULL_FLAG
+2      = MYSQLI_PRI_KEY_FLAG
+4      = MYSQLI_UNIQUE_KEY_FLAG
+8      = MYSQLI_MULTIPLE_KEY_FLAG
+16     = MYSQLI_BLOB_FLAG
+32     = MYSQLI_UNSIGNED_FLAG
+64     = MYSQLI_ZEROFILL_FLAG
+128    = MYSQLI_BINARY_FLAG
+256    = MYSQLI_ENUM_FLAG
+512    = MYSQLI_AUTO_INCREMENT_FLAG
+1024   = MYSQLI_TIMESTAMP_FLAG
+2048   = MYSQLI_SET_FLAG
+32768  = MYSQLI_NUM_FLAG
+16384  = MYSQLI_PART_KEY_FLAG
+32768  = MYSQLI_GROUP_FLAG
+65536  = MYSQLI_UNIQUE_FLAG
+131072 = MYSQLI_BINCMP_FLAG
+*/
+
+	function FetchField($fieldOffset = -1) 
+	{	
+		$fieldnr = $fieldOffset;
+		if ($fieldOffset != -1) {
+		  $fieldOffset = @mysqli_field_seek($this->_queryID, $fieldnr);
+		}
+		$o = @mysqli_fetch_field($this->_queryID);
+		if (!$o) return false;
+		/* Properties of an ADOFieldObject as set by MetaColumns */
+		$o->primary_key = $o->flags & MYSQLI_PRI_KEY_FLAG;
+		$o->not_null = $o->flags & MYSQLI_NOT_NULL_FLAG;
+		$o->auto_increment = $o->flags & MYSQLI_AUTO_INCREMENT_FLAG;
+		$o->binary = $o->flags & MYSQLI_BINARY_FLAG;
+		// $o->blob = $o->flags & MYSQLI_BLOB_FLAG; /* not returned by MetaColumns */
+		$o->unsigned = $o->flags & MYSQLI_UNSIGNED_FLAG;
+
+		return $o;
+	}
+
+	function GetRowAssoc($upper = true)
+	{
+		if ($this->fetchMode == MYSQLI_ASSOC && !$upper) 
+		  return $this->fields;
+		$row = ADORecordSet::GetRowAssoc($upper);
+		return $row;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{	
+	  if ($this->fetchMode != MYSQLI_NUM) 
+	    return @$this->fields[$colname];
+		
+	  if (!$this->bind) {
+	    $this->bind = array();
+	    for ($i = 0; $i < $this->_numOfFields; $i++) {
+	      $o = $this->FetchField($i);
+	      $this->bind[strtoupper($o->name)] = $i;
+	    }
+	  }
+	  return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	function _seek($row)
+	{
+	  if ($this->_numOfRows == 0) 
+	    return false;
+
+	  if ($row < 0)
+	    return false;
+
+	  mysqli_data_seek($this->_queryID, $row);
+	  $this->EOF = false;
+	  return true;
+	}
+		
+		
+	function NextRecordSet()
+	{
+	global $ADODB_COUNTRECS;
+	
+		mysqli_free_result($this->_queryID);
+		$this->_queryID = -1;
+		// Move to the next recordset, or return false if there is none. In a stored proc
+		// call, mysqli_next_result returns true for the last "recordset", but mysqli_store_result
+		// returns false. I think this is because the last "recordset" is actually just the
+		// return value of the stored proc (ie the number of rows affected).
+		if(!mysqli_next_result($this->connection->_connectionID)) {
+		return false;
+		}
+		// CD: There is no $this->_connectionID variable, at least in the ADO version I'm using
+		$this->_queryID = ($ADODB_COUNTRECS) ? @mysqli_store_result( $this->connection->_connectionID )
+						: @mysqli_use_result( $this->connection->_connectionID );
+		if(!$this->_queryID) {
+			return false;
+		}
+		$this->_inited = false;
+		$this->bind = false;
+		$this->_currentRow = -1;
+		$this->Init();
+		return true;
+	}
+
+	// 10% speedup to move MoveNext to child class
+	// This is the only implementation that works now (23-10-2003).
+	// Other functions return no or the wrong results.
+	function MoveNext() 
+	{
+		if ($this->EOF) return false;
+		$this->_currentRow++;
+		$this->fields = @mysqli_fetch_array($this->_queryID,$this->fetchMode);
+		
+		if (is_array($this->fields)) return true;
+		$this->EOF = true;
+		return false;
+	}	
+	
+	function _fetch()
+	{
+		$this->fields = mysqli_fetch_array($this->_queryID,$this->fetchMode);  
+	  	return is_array($this->fields);
+	}
+	
+	function _close() 
+	{
+	    //if results are attached to this pointer from Stored Proceedure calls, the next standard query will die 2014
+        //only a problem with persistant connections
+
+        //mysqli_next_result($this->connection->_connectionID); trashes the DB side attached results.
+
+        while(mysqli_more_results($this->connection->_connectionID)){
+           @mysqli_next_result($this->connection->_connectionID);
+        }
+
+        //Because you can have one attached result, without tripping mysqli_more_results
+        @mysqli_next_result($this->connection->_connectionID);
+
+
+		mysqli_free_result($this->_queryID); 
+	  	$this->_queryID = false;	
+	}
+	
+/*
+
+0 = MYSQLI_TYPE_DECIMAL
+1 = MYSQLI_TYPE_CHAR
+1 = MYSQLI_TYPE_TINY
+2 = MYSQLI_TYPE_SHORT
+3 = MYSQLI_TYPE_LONG
+4 = MYSQLI_TYPE_FLOAT
+5 = MYSQLI_TYPE_DOUBLE
+6 = MYSQLI_TYPE_NULL
+7 = MYSQLI_TYPE_TIMESTAMP
+8 = MYSQLI_TYPE_LONGLONG
+9 = MYSQLI_TYPE_INT24
+10 = MYSQLI_TYPE_DATE
+11 = MYSQLI_TYPE_TIME
+12 = MYSQLI_TYPE_DATETIME
+13 = MYSQLI_TYPE_YEAR
+14 = MYSQLI_TYPE_NEWDATE
+247 = MYSQLI_TYPE_ENUM
+248 = MYSQLI_TYPE_SET
+249 = MYSQLI_TYPE_TINY_BLOB
+250 = MYSQLI_TYPE_MEDIUM_BLOB
+251 = MYSQLI_TYPE_LONG_BLOB
+252 = MYSQLI_TYPE_BLOB
+253 = MYSQLI_TYPE_VAR_STRING
+254 = MYSQLI_TYPE_STRING
+255 = MYSQLI_TYPE_GEOMETRY
+*/
+
+	function MetaType($t, $len = -1, $fieldobj = false)
+	{
+		if (is_object($t)) {
+		    $fieldobj = $t;
+		    $t = $fieldobj->type;
+		    $len = $fieldobj->max_length;
+		}
+		
+		
+		 $len = -1; // mysql max_length is not accurate
+		 switch (strtoupper($t)) {
+		 case 'STRING': 
+		 case 'CHAR':
+		 case 'VARCHAR': 
+		 case 'TINYBLOB': 
+		 case 'TINYTEXT': 
+		 case 'ENUM': 
+		 case 'SET': 
+		
+		case MYSQLI_TYPE_TINY_BLOB :
+		#case MYSQLI_TYPE_CHAR :
+		case MYSQLI_TYPE_STRING :
+		case MYSQLI_TYPE_ENUM :
+		case MYSQLI_TYPE_SET :
+		case 253 :
+		   if ($len <= $this->blobSize) return 'C';
+		   
+		case 'TEXT':
+		case 'LONGTEXT': 
+		case 'MEDIUMTEXT':
+		   return 'X';
+		
+		
+		   // php_mysql extension always returns 'blob' even if 'text'
+		   // so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+		
+		case MYSQLI_TYPE_BLOB :
+		case MYSQLI_TYPE_LONG_BLOB :
+		case MYSQLI_TYPE_MEDIUM_BLOB :
+		
+		   return !empty($fieldobj->binary) ? 'B' : 'X';
+		case 'YEAR':
+		case 'DATE': 
+		case MYSQLI_TYPE_DATE :
+		case MYSQLI_TYPE_YEAR :
+		
+		   return 'D';
+		
+		case 'TIME':
+		case 'DATETIME':
+		case 'TIMESTAMP':
+		
+		case MYSQLI_TYPE_DATETIME :
+		case MYSQLI_TYPE_NEWDATE :
+		case MYSQLI_TYPE_TIME :
+		case MYSQLI_TYPE_TIMESTAMP :
+		
+			return 'T';
+		
+		case 'INT': 
+		case 'INTEGER':
+		case 'BIGINT':
+		case 'TINYINT':
+		case 'MEDIUMINT':
+		case 'SMALLINT': 
+		
+		case MYSQLI_TYPE_INT24 :
+		case MYSQLI_TYPE_LONG :
+		case MYSQLI_TYPE_LONGLONG :
+		case MYSQLI_TYPE_SHORT :
+		case MYSQLI_TYPE_TINY :
+		
+		   if (!empty($fieldobj->primary_key)) return 'R';
+		   
+		   return 'I';
+		
+		
+		   // Added floating-point types
+		   // Maybe not necessery.
+		 case 'FLOAT':
+		 case 'DOUBLE':
+		   //		case 'DOUBLE PRECISION':
+		 case 'DECIMAL':
+		 case 'DEC':
+		 case 'FIXED':
+		 default:
+		 	//if (!is_numeric($t)) echo "
    --- Error in type matching $t -----
    "; 
+		 	return 'N';
+		}
+	} // function
+	
+
+} // rs class
+ 
+}
+
+class ADORecordSet_array_mysqli extends ADORecordSet_array {
+  
+  function ADORecordSet_array_mysqli($id=-1,$mode=false) 
+  {
+    $this->ADORecordSet_array($id,$mode);
+  }
+  
+	function MetaType($t, $len = -1, $fieldobj = false)
+	{
+		if (is_object($t)) {
+		    $fieldobj = $t;
+		    $t = $fieldobj->type;
+		    $len = $fieldobj->max_length;
+		}
+		
+		
+		 $len = -1; // mysql max_length is not accurate
+		 switch (strtoupper($t)) {
+		 case 'STRING': 
+		 case 'CHAR':
+		 case 'VARCHAR': 
+		 case 'TINYBLOB': 
+		 case 'TINYTEXT': 
+		 case 'ENUM': 
+		 case 'SET': 
+		
+		case MYSQLI_TYPE_TINY_BLOB :
+		#case MYSQLI_TYPE_CHAR :
+		case MYSQLI_TYPE_STRING :
+		case MYSQLI_TYPE_ENUM :
+		case MYSQLI_TYPE_SET :
+		case 253 :
+		   if ($len <= $this->blobSize) return 'C';
+		   
+		case 'TEXT':
+		case 'LONGTEXT': 
+		case 'MEDIUMTEXT':
+		   return 'X';
+		
+		
+		   // php_mysql extension always returns 'blob' even if 'text'
+		   // so we have to check whether binary...
+		case 'IMAGE':
+		case 'LONGBLOB': 
+		case 'BLOB':
+		case 'MEDIUMBLOB':
+		
+		case MYSQLI_TYPE_BLOB :
+		case MYSQLI_TYPE_LONG_BLOB :
+		case MYSQLI_TYPE_MEDIUM_BLOB :
+		
+		   return !empty($fieldobj->binary) ? 'B' : 'X';
+		case 'YEAR':
+		case 'DATE': 
+		case MYSQLI_TYPE_DATE :
+		case MYSQLI_TYPE_YEAR :
+		
+		   return 'D';
+		
+		case 'TIME':
+		case 'DATETIME':
+		case 'TIMESTAMP':
+		
+		case MYSQLI_TYPE_DATETIME :
+		case MYSQLI_TYPE_NEWDATE :
+		case MYSQLI_TYPE_TIME :
+		case MYSQLI_TYPE_TIMESTAMP :
+		
+			return 'T';
+		
+		case 'INT': 
+		case 'INTEGER':
+		case 'BIGINT':
+		case 'TINYINT':
+		case 'MEDIUMINT':
+		case 'SMALLINT': 
+		
+		case MYSQLI_TYPE_INT24 :
+		case MYSQLI_TYPE_LONG :
+		case MYSQLI_TYPE_LONGLONG :
+		case MYSQLI_TYPE_SHORT :
+		case MYSQLI_TYPE_TINY :
+		
+		   if (!empty($fieldobj->primary_key)) return 'R';
+		   
+		   return 'I';
+		
+		
+		   // Added floating-point types
+		   // Maybe not necessery.
+		 case 'FLOAT':
+		 case 'DOUBLE':
+		   //		case 'DOUBLE PRECISION':
+		 case 'DECIMAL':
+		 case 'DEC':
+		 case 'FIXED':
+		 default:
+		 	//if (!is_numeric($t)) echo "
    --- Error in type matching $t -----
    "; 
+		 	return 'N';
+		}
+	} // function
+  
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mysqlpo.inc.php b/adodb/drivers/adodb-mysqlpo.inc.php
new file mode 100644
index 0000000..668bdcf
--- /dev/null
+++ b/adodb/drivers/adodb-mysqlpo.inc.php
@@ -0,0 +1,138 @@
+
+  
+  Requires mysql client. Works on Windows and Unix.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
+
+
+class ADODB_mysqlt extends ADODB_mysql {
+	var $databaseType = 'mysqlt';
+	var $ansiOuter = true; // for Version 3.23.17 or later
+	var $hasTransactions = true;
+	var $autoRollback = true; // apparently mysql does not autorollback properly 
+	
+	function ADODB_mysqlt() 
+	{			
+	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
+	}
+	
+	function BeginTrans()
+	{	  
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->Execute('SET AUTOCOMMIT=0');
+		$this->Execute('BEGIN');
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('COMMIT');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->Execute('ROLLBACK');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return true;
+	}
+	
+	function RowLock($tables,$where='',$col='1 as adodbignore') 
+	{
+		if ($this->transCnt==0) $this->BeginTrans();
+		if ($where) $where = ' where '.$where;
+		$rs = $this->Execute("select $col from $tables $where for update");
+		return !empty($rs); 
+	}
+	
+}
+
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+	var $databaseType = "mysqlt";
+	
+	function ADORecordSet_mysqlt($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+		
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default: $this->fetchMode = MYSQL_BOTH; break;
+		}
+	
+		$this->adodbFetchMode = $mode;
+		$this->ADORecordSet($queryID);	
+	}
+	
+	function MoveNext()
+	{
+		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
+		return false;
+	}
+}
+
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
+
+	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+		
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default: 
+			$this->fetchMode = MYSQL_BOTH; break;
+		}
+		$this->adodbFetchMode = $mode;
+		$this->ADORecordSet($queryID);	
+	}
+	
+	function MoveNext()
+	{
+		return adodb_movenext($this);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-mysqlt.inc.php b/adodb/drivers/adodb-mysqlt.inc.php
new file mode 100644
index 0000000..5007b75
--- /dev/null
+++ b/adodb/drivers/adodb-mysqlt.inc.php
@@ -0,0 +1,155 @@
+
+  
+  Requires mysql client. Works on Windows and Unix.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
+
+
+class ADODB_mysqlt extends ADODB_mysql {
+	var $databaseType = 'mysqlt';
+	var $ansiOuter = true; // for Version 3.23.17 or later
+	var $hasTransactions = true;
+	var $autoRollback = true; // apparently mysql does not autorollback properly 
+	
+	function ADODB_mysqlt() 
+	{			
+	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
+	}
+	
+	/* set transaction mode
+	
+	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
+{ READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
+
+	*/
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+	}
+	
+	function BeginTrans()
+	{	  
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->Execute('SET AUTOCOMMIT=0');
+		$this->Execute('BEGIN');
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ok = $this->Execute('COMMIT');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return $ok ? true : false;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ok = $this->Execute('ROLLBACK');
+		$this->Execute('SET AUTOCOMMIT=1');
+		return $ok ? true : false;
+	}
+	
+	function RowLock($tables,$where='',$col='1 as adodbignore') 
+	{
+		if ($this->transCnt==0) $this->BeginTrans();
+		if ($where) $where = ' where '.$where;
+		$rs = $this->Execute("select $col from $tables $where for update");
+		return !empty($rs); 
+	}
+	
+}
+
+class ADORecordSet_mysqlt extends ADORecordSet_mysql{	
+	var $databaseType = "mysqlt";
+	
+	function ADORecordSet_mysqlt($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+		
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default: $this->fetchMode = MYSQL_BOTH; break;
+		}
+	
+		$this->adodbFetchMode = $mode;
+		$this->ADORecordSet($queryID);	
+	}
+	
+	function MoveNext()
+	{
+		if (@$this->fields = mysql_fetch_array($this->_queryID,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
+		return false;
+	}
+}
+
+class ADORecordSet_ext_mysqlt extends ADORecordSet_mysqlt {	
+
+	function ADORecordSet_ext_mysqlt($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+		
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default: 
+			$this->fetchMode = MYSQL_BOTH; break;
+		}
+		$this->adodbFetchMode = $mode;
+		$this->ADORecordSet($queryID);	
+	}
+	
+	function MoveNext()
+	{
+		return adodb_movenext($this);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-netezza.inc.php b/adodb/drivers/adodb-netezza.inc.php
new file mode 100644
index 0000000..0f5a1ee
--- /dev/null
+++ b/adodb/drivers/adodb-netezza.inc.php
@@ -0,0 +1,170 @@
+ 0 ORDER BY attnum";
+	var $metaColumnsSQL1 = "SELECT attname, atttype FROM _v_relation_column_def WHERE name = '%s' AND attnum > 0 ORDER BY attnum";
+	// netezza doesn't have keys. it does have distributions, so maybe this is 
+	// something that can be pulled from the system tables
+	var $metaKeySQL = "";
+	var $hasAffectedRows = true;
+	var $hasLimit = true;	
+	var $true = 't';		// string that represents TRUE for a database
+	var $false = 'f';		// string that represents FALSE for a database
+	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
+	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
+	var $ansiOuter = true;
+	var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
+							// http://bugs.php.net/bug.php?id=25404
+
+							
+	function ADODB_netezza() 
+	{
+	
+	}
+	
+	function MetaColumns($table,$upper=true) 
+	{
+	
+	// Changed this function to support Netezza which has no concept of keys
+	// could posisbly work on other things from the system table later.
+	
+	global $ADODB_FETCH_MODE;
+	
+		$table = strtolower($table);
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if ($rs === false) return false;
+
+		$retarr = array();
+		while (!$rs->EOF) { 	
+			$fld = new ADOFieldObject();
+			$fld->name = $rs->fields[0];
+			
+			// since we're returning type and length as one string, 
+			// split them out here.
+			
+			if ($first = strstr($rs->fields[1], "(")) {
+			 $fld->max_length = trim($first, "()");
+			} else {
+			 $fld->max_length = -1;
+			}
+		
+			if ($first = strpos($rs->fields[1], "(")) {
+			 $fld->type = substr($rs->fields[1], 0, $first);
+			} else {
+			 $fld->type = $rs->fields[1];
+			}
+			
+			switch ($fld->type) {
+			 case "byteint":
+			 case "boolean":
+			 $fld->max_length = 1;
+			 break;
+			 case "smallint":
+			 $fld->max_length = 2;
+			 break;
+			 case "integer":
+			 case "numeric":
+			 case "date":
+			 $fld->max_length = 4;
+			 break;
+			 case "bigint":
+			 case "time":
+			 case "timestamp":
+			 $fld->max_length = 8;
+			 break;
+			 case "timetz":
+			 case "time with time zone":
+			 $fld->max_length = 12;
+			 break;
+			}
+			
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[($upper) ? strtoupper($fld->name) : $fld->name] = $fld;
+			
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		return $retarr;	
+		
+	}
+
+		
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_netezza extends ADORecordSet_postgres64
+{
+	var $databaseType = "netezza";
+	var $canSeek = true;
+	
+	function ADORecordSet_netezza($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+		
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default: $this->fetchMode = PGSQL_BOTH; break;
+		}
+		$this->adodbFetchMode = $mode;
+		$this->ADORecordSet($queryID);
+	}
+	
+	// _initrs modified to disable blob handling
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($this->_queryID):-1;
+		$this->_numOfFields = @pg_numfields($this->_queryID);
+	}
+
+}
+?>
diff --git a/adodb/drivers/adodb-oci8.inc.php b/adodb/drivers/adodb-oci8.inc.php
new file mode 100644
index 0000000..360b6b4
--- /dev/null
+++ b/adodb/drivers/adodb-oci8.inc.php
@@ -0,0 +1,1628 @@
+
+  
+  13 Nov 2000 jlim - removed all ora_* references.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+/*
+NLS_Date_Format
+Allows you to use a date format other than the Oracle Lite default. When a literal
+character string appears where a date value is expected, the Oracle Lite database
+tests the string to see if it matches the formats of Oracle, SQL-92, or the value
+specified for this parameter in the POLITE.INI file. Setting this parameter also
+defines the default format used in the TO_CHAR or TO_DATE functions when no
+other format string is supplied.
+
+For Oracle the default is dd-mon-yy or dd-mon-yyyy, and for SQL-92 the default is
+yy-mm-dd or yyyy-mm-dd.
+
+Using 'RR' in the format forces two-digit years less than or equal to 49 to be
+interpreted as years in the 21st century (20002049), and years over 50 as years in
+the 20th century (19501999). Setting the RR format as the default for all two-digit
+year entries allows you to become year-2000 compliant. For example:
+NLS_DATE_FORMAT='RR-MM-DD'
+
+You can also modify the date format using the ALTER SESSION command. 
+*/
+
+# define the LOB descriptor type for the given type
+# returns false if no LOB descriptor
+function oci_lob_desc($type) {
+	switch ($type) {
+		case OCI_B_BFILE: $result = OCI_D_FILE; break;
+		case OCI_B_CFILEE: $result = OCI_D_FILE; break;
+		case OCI_B_CLOB: $result = OCI_D_LOB; break;
+		case OCI_B_BLOB: $result = OCI_D_LOB; break;
+		case OCI_B_ROWID: $result = OCI_D_ROWID; break;
+		default: $result = false; break;
+	}
+	return $result;
+}
+
+class ADODB_oci8 extends ADOConnection {
+	var $databaseType = 'oci8';
+	var $dataProvider = 'oci8';
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $concat_operator='||';
+	var $sysDate = "TRUNC(SYSDATE)";
+	var $sysTimeStamp = 'SYSDATE'; // requires oracle 9 or later, otherwise use SYSDATE
+	var $metaDatabasesSQL = "SELECT USERNAME FROM ALL_USERS WHERE USERNAME NOT IN ('SYS','SYSTEM','DBSNMP','OUTLN') ORDER BY 1";
+	var $_stmt;
+	var $_commit = OCI_COMMIT_ON_SUCCESS;
+	var $_initdate = true; // init date to YYYY-MM-DD
+	var $metaTablesSQL = "select table_name,table_type from cat where table_type in ('TABLE','VIEW') and table_name not like 'BIN\$%'"; // bin$ tables are recycle bin tables
+	var $metaColumnsSQL = "select cname,coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
+	var $metaColumnsSQL2 = "select column_name,data_type,data_length, data_scale, data_precision, 
+    case when nullable = 'Y' then 'NULL'
+    else 'NOT NULL' end as nulls,
+    data_default from all_tab_cols 
+  where owner='%s' and table_name='%s' order by column_id"; // when there is a schema
+	var $_bindInputArray = true;
+	var $hasGenID = true;
+	var $_genIDSQL = "SELECT (%s.nextval) FROM DUAL";
+	var $_genSeqSQL = "CREATE SEQUENCE %s START WITH %s";
+	var $_dropSeqSQL = "DROP SEQUENCE %s";
+	var $hasAffectedRows = true;
+	var $random = "abs(mod(DBMS_RANDOM.RANDOM,10000001)/10000000)";
+	var $noNullStrings = false;
+	var $connectSID = false;
+	var $_bind = false;
+	var $_nestedSQL = true;
+	var $_hasOCIFetchStatement = false;
+	var $_getarray = false; // currently not working
+	var $leftOuter = '';  // oracle wierdness, $col = $value (+) for LEFT OUTER, $col (+)= $value for RIGHT OUTER
+	var $session_sharing_force_blob = false; // alter session on updateblob if set to true 
+	var $firstrows = true; // enable first rows optimization on SelectLimit()
+	var $selectOffsetAlg1 = 1000; // when to use 1st algorithm of selectlimit.
+	var $NLS_DATE_FORMAT = 'YYYY-MM-DD';  // To include time, use 'RRRR-MM-DD HH24:MI:SS'
+	var $dateformat = 'YYYY-MM-DD'; // DBDate format
+ 	var $useDBDateFormatForTextInput=false;
+	var $datetime = false; // MetaType('DATE') returns 'D' (datetime==false) or 'T' (datetime == true)
+	var $_refLOBs = array();
+		
+	// var $ansiOuter = true; // if oracle9
+    
+	function ADODB_oci8() 
+	{
+		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
+		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
+	}
+	
+	/*  function MetaColumns($table, $normalize=true) added by smondino@users.sourceforge.net*/
+	function MetaColumns($table, $normalize=true) 
+	{
+	global $ADODB_FETCH_MODE;
+		
+		$schema = '';
+		$this->_findschema($table, $schema);
+		
+		$false = false;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+
+		if ($schema)
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL2, strtoupper($schema), strtoupper($table)));
+		else
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+		
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		if (!$rs) {
+			return $false;
+		}
+		$retarr = array();
+		while (!$rs->EOF) {
+			$fld = new ADOFieldObject();
+	   		$fld->name = $rs->fields[0];
+	   		$fld->type = $rs->fields[1];
+	   		$fld->max_length = $rs->fields[2];
+			$fld->scale = $rs->fields[3];
+			if ($rs->fields[1] == 'NUMBER') {
+				if ($rs->fields[3] == 0) $fld->type = 'INT';
+	     		$fld->max_length = $rs->fields[4];
+	    	}	
+		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
+			$fld->binary = (strpos($fld->type,'BLOB') !== false);
+			$fld->default_value = $rs->fields[6];
+			
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[strtoupper($fld->name)] = $fld;
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		if (empty($retarr))
+			return  $false;
+		else 
+			return $retarr;
+	}
+	
+	function Time()
+	{
+		$rs = $this->Execute("select TO_CHAR($this->sysTimeStamp,'YYYY-MM-DD HH24:MI:SS') from dual");
+		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
+		
+		return false;
+	}
+ 
+/*
+
+  Multiple modes of connection are supported:
+  
+  a. Local Database
+    $conn->Connect(false,'scott','tiger');
+  
+  b. From tnsnames.ora
+    $conn->Connect(false,'scott','tiger',$tnsname); 
+    $conn->Connect($tnsname,'scott','tiger'); 
+  
+  c. Server + service name
+    $conn->Connect($serveraddress,'scott,'tiger',$service_name);
+  
+  d. Server + SID
+  	$conn->connectSID = true;
+	$conn->Connect($serveraddress,'scott,'tiger',$SID);
+
+
+Example TNSName:
+---------------
+NATSOFT.DOMAIN =
+  (DESCRIPTION =
+	(ADDRESS_LIST =
+	  (ADDRESS = (PROTOCOL = TCP)(HOST = kermit)(PORT = 1523))
+	)
+	(CONNECT_DATA =
+	  (SERVICE_NAME = natsoft.domain)
+	)
+  )
+  
+  There are 3 connection modes, 0 = non-persistent, 1 = persistent, 2 = force new connection
+	
+*/
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename,$mode=0)
+	{
+		if (!function_exists('OCIPLogon')) return null;
+		#adodb_backtrace(); 
+		
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+		
+		if($argHostname) { // added by Jorma Tuomainen 
+			if (empty($argDatabasename)) $argDatabasename = $argHostname;
+			else {
+				if(strpos($argHostname,":")) {
+					$argHostinfo=explode(":",$argHostname);
+				   	$argHostname=$argHostinfo[0];
+					$argHostport=$argHostinfo[1];
+			 	} else {
+					$argHostport = empty($this->port)?  "1521" : $this->port;
+	   			}
+				
+				if (strncasecmp($argDatabasename,'SID=',4) == 0) {
+					$argDatabasename = substr($argDatabasename,4);
+					$this->connectSID = true;
+				}
+				
+				if ($this->connectSID) {
+					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+					.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
+				} else
+					$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+					.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
+			}
+		}
+				
+ 		//if ($argHostname) print "
    Connect: 1st argument should be left blank for $this->databaseType
    ";
+		if ($mode==1) {
+			$this->_connectionID = ($this->charSet) ? 
+				OCIPLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				:
+				OCIPLogon($argUsername,$argPassword, $argDatabasename)
+				;
+			if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
+		} else if ($mode==2) {
+			$this->_connectionID = ($this->charSet) ? 
+				OCINLogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				:
+				OCINLogon($argUsername,$argPassword, $argDatabasename);
+				
+		} else {
+			$this->_connectionID = ($this->charSet) ? 
+				OCILogon($argUsername,$argPassword, $argDatabasename,$this->charSet)
+				:
+				OCILogon($argUsername,$argPassword, $argDatabasename);
+		}
+		if (!$this->_connectionID) return false;
+		if ($this->_initdate) {
+			$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
+		}
+		
+		// looks like: 
+		// Oracle8i Enterprise Edition Release 8.1.7.0.0 - Production With the Partitioning option JServer Release 8.1.7.0.0 - Production
+		// $vers = OCIServerVersion($this->_connectionID);
+		// if (strpos($vers,'8i') !== false) $this->ansiOuter = true;
+		return true;
+   	}
+	
+	function ServerInfo()
+	{
+		$arr['compat'] = $this->GetOne('select value from sys.database_compatible_level');
+		$arr['description'] = @OCIServerVersion($this->_connectionID);
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+		// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
+	}
+	
+	// returns true or false
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,2);
+	}
+	
+	function _affectedrows()
+	{
+		if (is_resource($this->_stmt)) return @OCIRowCount($this->_stmt);
+		return 0;
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " NVL($field, $ifNull) "; // if Oracle
+	}
+	
+	// format and return date string in database date format
+	function DBDate($d,$isfld=false)
+	{
+		if (empty($d) && $d !== 0) return 'null';
+		if ($isfld) return 'TO_DATE('.$d.",'".$this->dateformat."')";
+		
+		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+		
+		if (is_object($d)) $ds = $d->format($this->fmtDate);
+		else $ds = adodb_date($this->fmtDate,$d);
+		
+		return "TO_DATE(".$ds.",'".$this->dateformat."')";
+	}
+
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($ts)
+	{
+		if (empty($ts) && $ts !== 0) return 'null';
+		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+		
+		if (is_object($ts)) $tss = $ts->format("'Y-m-d H:i:s'");
+		else $tss = adodb_date("'Y-m-d H:i:s'",$ts);
+		
+		return $tss;
+	}
+	
+	// format and return date string in database timestamp format
+	function DBTimeStamp($ts,$isfld=false)
+	{
+		if (empty($ts) && $ts !== 0) return 'null';
+		if ($isfld) return 'TO_DATE(substr('.$ts.",1,19),'RRRR-MM-DD, HH24:MI:SS')";
+		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+		
+		if (is_object($ts)) $tss = $ts->format("'Y-m-d H:i:s'");
+		else $tss = adodb_date("'Y-m-d H:i:s'",$ts);
+		
+		return 'TO_DATE('.$tss.",'RRRR-MM-DD, HH24:MI:SS')";
+	}
+	
+	function RowLock($tables,$where,$col='1 as adodbignore') 
+	{
+		if ($this->autoCommit) $this->BeginTrans();
+		return $this->GetOne("select $col from $tables where $where for update");
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(strtoupper($mask));
+			$this->metaTablesSQL .= " AND upper(table_name) like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	// Mark Newnham 
+	function MetaIndexes ($table, $primary = FALSE, $owner=false)
+	{
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+
+		// get index details
+		$table = strtoupper($table);
+
+		// get Primary index
+		$primary_key = '';
+
+		$false = false;
+		$rs = $this->Execute(sprintf("SELECT * FROM ALL_CONSTRAINTS WHERE UPPER(TABLE_NAME)='%s' AND CONSTRAINT_TYPE='P'",$table));
+		if ($row = $rs->FetchRow())
+		   $primary_key = $row[1]; //constraint_name
+
+		if ($primary==TRUE && $primary_key=='') {
+			 if (isset($savem)) 
+                $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			return $false; //There is no primary key
+		}
+
+        $rs = $this->Execute(sprintf("SELECT ALL_INDEXES.INDEX_NAME, ALL_INDEXES.UNIQUENESS, ALL_IND_COLUMNS.COLUMN_POSITION, ALL_IND_COLUMNS.COLUMN_NAME FROM ALL_INDEXES,ALL_IND_COLUMNS WHERE UPPER(ALL_INDEXES.TABLE_NAME)='%s' AND ALL_IND_COLUMNS.INDEX_NAME=ALL_INDEXES.INDEX_NAME",$table));
+
+		
+        if (!is_object($rs)) {
+			if (isset($savem)) 
+				$this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+            return $false;
+        }
+
+		$indexes = array ();
+        // parse index data into array
+
+        while ($row = $rs->FetchRow()) {
+			if ($primary && $row[0] != $primary_key) continue;
+            if (!isset($indexes[$row[0]])) {
+				$indexes[$row[0]] = array(
+				   'unique' => ($row[1] == 'UNIQUE'),
+				   'columns' => array()
+				);
+            }
+            $indexes[$row[0]]['columns'][$row[2] - 1] = $row[3];
+        }
+
+        // sort columns by order in the index
+        foreach ( array_keys ($indexes) as $index ) {
+            ksort ($indexes[$index]['columns']);
+        }
+
+		if (isset($savem)) { 
+            $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+		}
+        return $indexes;
+	}
+	
+	function BeginTrans()
+	{	
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->autoCommit = false;
+		$this->_commit = OCI_DEFAULT;
+		
+		if ($this->_transmode) $ok = $this->Execute("SET TRANSACTION ".$this->_transmode);
+		else $ok = true;
+		
+		return $ok ? true : false;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true;
+		if (!$ok) return $this->RollbackTrans();
+		
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ret = OCIcommit($this->_connectionID);
+		$this->_commit = OCI_COMMIT_ON_SUCCESS;
+		$this->autoCommit = true;
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$ret = OCIrollback($this->_connectionID);
+		$this->_commit = OCI_COMMIT_ON_SUCCESS;
+		$this->autoCommit = true;
+		return $ret;
+	}
+	
+	
+	function SelectDB($dbName) 
+	{
+		return false;
+	}
+
+	function ErrorMsg() 
+	{
+		if ($this->_errorMsg !== false) return $this->_errorMsg;
+
+		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
+		if (empty($arr)) {
+			if (is_resource($this->_connectionID)) $arr = @OCIError($this->_connectionID);
+			else $arr = @OCIError();
+			if ($arr === false) return '';
+		}
+		$this->_errorMsg = $arr['message'];
+		$this->_errorCode = $arr['code'];
+		return $this->_errorMsg;
+	}
+
+	function ErrorNo() 
+	{
+		if ($this->_errorCode !== false) return $this->_errorCode;
+		
+		if (is_resource($this->_stmt)) $arr = @OCIError($this->_stmt);
+		if (empty($arr)) {
+			$arr = @OCIError($this->_connectionID);
+			if ($arr == false) $arr = @OCIError();
+			if ($arr == false) return '';
+		}
+		
+		$this->_errorMsg = $arr['message'];
+		$this->_errorCode = $arr['code'];
+		
+		return $arr['code'];
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = 'TO_CHAR('.$col.",'";
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= 'YYYY';
+				break;
+			case 'Q':
+			case 'q':
+				$s .= 'Q';
+				break;
+				
+			case 'M':
+				$s .= 'Mon';
+				break;
+				
+			case 'm':
+				$s .= 'MM';
+				break;
+			case 'D':
+			case 'd':
+				$s .= 'DD';
+				break;
+			
+			case 'H':
+				$s.= 'HH24';
+				break;
+				
+			case 'h':
+				$s .= 'HH';
+				break;
+				
+			case 'i':
+				$s .= 'MI';
+				break;
+			
+			case 's':
+				$s .= 'SS';
+				break;
+			
+			case 'a':
+			case 'A':
+				$s .= 'AM';
+				break;
+				
+			case 'w':
+				$s .= 'D';
+				break;
+				
+			case 'l':
+				$s .= 'DAY';
+				break;
+				
+			 case 'W':
+				$s .= 'WW';
+				break;
+				
+			default:
+			// handle escape characters...
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+				else $s .= '"'.$ch.'"';
+				
+			}
+		}
+		return $s. "')";
+	}
+	
+	function GetRandRow($sql, $arr = false)
+	{
+		$sql = "SELECT * FROM ($sql ORDER BY dbms_random.value) WHERE rownum = 1";
+		
+		return $this->GetRow($sql,$arr);
+	}
+	
+	/*
+	This algorithm makes use of
+	
+	a. FIRST_ROWS hint
+	The FIRST_ROWS hint explicitly chooses the approach to optimize response time, 
+	that is, minimum resource usage to return the first row. Results will be returned 
+	as soon as they are identified. 
+
+	b. Uses rownum tricks to obtain only the required rows from a given offset.
+	 As this uses complicated sql statements, we only use this if the $offset >= 100. 
+	 This idea by Tomas V V Cox.
+	 
+	 This implementation does not appear to work with oracle 8.0.5 or earlier. Comment
+	 out this function then, and the slower SelectLimit() in the base class will be used.
+	*/
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		// seems that oracle only supports 1 hint comment in 8i
+		if ($this->firstrows) {
+			if (strpos($sql,'/*+') !== false)
+				$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
+			else
+				$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
+		}
+		
+		if ($offset == -1 || ($offset < $this->selectOffsetAlg1 && 0 < $nrows && $nrows < 1000)) {
+			if ($nrows > 0) {	
+				if ($offset > 0) $nrows += $offset;
+				//$inputarr['adodb_rownum'] = $nrows;
+				if ($this->databaseType == 'oci8po') {
+					$sql = "select * from (".$sql.") where rownum <= ?";
+				} else {
+					$sql = "select * from (".$sql.") where rownum <= :adodb_offset";
+				} 
+				$inputarr['adodb_offset'] = $nrows;
+				$nrows = -1;
+			}
+			// note that $nrows = 0 still has to work ==> no rows returned
+
+			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			return $rs;
+			
+		} else {
+			 // Algorithm by Tomas V V Cox, from PEAR DB oci8.php
+			
+			 // Let Oracle return the name of the columns
+			$q_fields = "SELECT * FROM (".$sql.") WHERE NULL = NULL";
+		
+			$false = false;
+			if (! $stmt_arr = $this->Prepare($q_fields)) {
+				return $false;
+			}
+			$stmt = $stmt_arr[1];
+			 
+			if (is_array($inputarr)) {
+			 	foreach($inputarr as $k => $v) {
+					if (is_array($v)) {
+						if (sizeof($v) == 2) // suggested by g.giunta@libero.
+							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
+						else
+							OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+					} else {
+						$len = -1;
+						if ($v === ' ') $len = 1;
+						if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
+							$bindarr[$k] = $v;
+						} else { 				// dynamic sql, so rebind every time
+							OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+							
+						}
+					}
+				}
+			}
+			
+			 if (!OCIExecute($stmt, OCI_DEFAULT)) {
+				 OCIFreeStatement($stmt); 
+				 return $false;
+			 }
+			 
+			 $ncols = OCINumCols($stmt);
+			 for ( $i = 1; $i <= $ncols; $i++ ) {
+				 $cols[] = '"'.OCIColumnName($stmt, $i).'"';
+			 }
+			 $result = false;
+			
+			 OCIFreeStatement($stmt); 
+			 $fields = implode(',', $cols);
+			 if ($nrows <= 0) $nrows = 999999999999;
+			 else $nrows += $offset;
+			 $offset += 1; // in Oracle rownum starts at 1
+			
+			if ($this->databaseType == 'oci8po') {
+					 $sql = "SELECT /*+ FIRST_ROWS */ $fields FROM".
+					  "(SELECT rownum as adodb_rownum, $fields FROM".
+					  " ($sql) WHERE rownum <= ?".
+					  ") WHERE adodb_rownum >= ?";
+				} else {
+					 $sql = "SELECT /*+ FIRST_ROWS */ $fields FROM".
+					  "(SELECT rownum as adodb_rownum, $fields FROM".
+					  " ($sql) WHERE rownum <= :adodb_nrows".
+					  ") WHERE adodb_rownum >= :adodb_offset";
+				} 
+				$inputarr['adodb_nrows'] = $nrows;
+				$inputarr['adodb_offset'] = $offset;
+				
+			if ($secs2cache>0) $rs = $this->CacheExecute($secs2cache, $sql,$inputarr);
+			else $rs = $this->Execute($sql,$inputarr);
+			return $rs;
+		}
+	
+	}
+	
+	/**
+	* Usage:
+	* Store BLOBs and CLOBs
+	*
+	* Example: to store $var in a blob
+	*
+	*	$conn->Execute('insert into TABLE (id,ablob) values(12,empty_blob())');
+	*	$conn->UpdateBlob('TABLE', 'ablob', $varHoldingBlob, 'ID=12', 'BLOB');
+	*	
+	*	$blobtype supports 'BLOB' and 'CLOB', but you need to change to 'empty_clob()'.
+	*
+	*  to get length of LOB:
+	*  	select DBMS_LOB.GETLENGTH(ablob) from TABLE
+	*
+	* If you are using CURSOR_SHARING = force, it appears this will case a segfault
+	* under oracle 8.1.7.0. Run:
+	*	 $db->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+	* before UpdateBlob() then...
+	*/
+
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		
+		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
+		
+		switch(strtoupper($blobtype)) {
+		default: ADOConnection::outp("UpdateBlob: Unknown blobtype=$blobtype"); return false;
+		case 'BLOB': $type = OCI_B_BLOB; break;
+		case 'CLOB': $type = OCI_B_CLOB; break;
+		}
+		
+		if ($this->databaseType == 'oci8po') 
+			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
+		else 
+			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		
+		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
+		$arr['blob'] = array($desc,-1,$type);
+		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=EXACT');
+		$commit = $this->autoCommit;
+		if ($commit) $this->BeginTrans();
+		$rs = $this->_Execute($sql,$arr);
+		if ($rez = !empty($rs)) $desc->save($val);
+		$desc->free();
+		if ($commit) $this->CommitTrans();
+		if ($this->session_sharing_force_blob) $this->Execute('ALTER SESSION SET CURSOR_SHARING=FORCE');
+		
+		if ($rez) $rs->Close();
+		return $rez;
+	}
+	
+	/**
+	* Usage:  store file pointed to by $val in a blob
+	*/
+	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		switch(strtoupper($blobtype)) {
+		default: ADOConnection::outp( "UpdateBlob: Unknown blobtype=$blobtype"); return false;
+		case 'BLOB': $type = OCI_B_BLOB; break;
+		case 'CLOB': $type = OCI_B_CLOB; break;
+		}
+		
+		if ($this->databaseType == 'oci8po') 
+			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO ?";
+		else 
+			$sql = "UPDATE $table set $column=EMPTY_{$blobtype}() WHERE $where RETURNING $column INTO :blob";
+		
+		$desc = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
+		$arr['blob'] = array($desc,-1,$type);
+		
+		$this->BeginTrans();
+		$rs = ADODB_oci8::Execute($sql,$arr);
+		if ($rez = !empty($rs)) $desc->savefile($val);
+		$desc->free();
+		$this->CommitTrans();
+		
+		if ($rez) $rs->Close();
+		return $rez;
+	}
+
+		/**
+	 * Execute SQL 
+	 *
+	 * @param sql		SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
+	 * @param [inputarr]	holds the input data to bind to. Null elements will be set to null.
+	 * @return 		RecordSet or false
+	 */
+	function Execute($sql,$inputarr=false) 
+	{
+		if ($this->fnExecute) {
+			$fn = $this->fnExecute;
+			$ret = $fn($this,$sql,$inputarr);
+			if (isset($ret)) return $ret;
+		}
+		if ($inputarr) {
+			#if (!is_array($inputarr)) $inputarr = array($inputarr);
+			
+			$element0 = reset($inputarr);
+			
+			if (!$this->_bindInputArray) {
+			# is_object check because oci8 descriptors can be passed in
+			if (is_array($element0) && !is_object(reset($element0))) {
+				if (is_string($sql))
+					$stmt = $this->Prepare($sql);
+				else
+					$stmt = $sql;
+					
+				foreach($inputarr as $arr) {
+					$ret = $this->_Execute($stmt,$arr);
+					if (!$ret) return $ret;
+				}
+			} else {
+				$sqlarr = explode(':',$sql);
+				$sql = '';
+				$lastnomatch = -2;
+				#var_dump($sqlarr);echo "
    ";var_dump($inputarr);echo"
    ";
+				foreach($sqlarr as $k => $str) {
+						if ($k == 0) { $sql = $str; continue; }
+						// we need $lastnomatch because of the following datetime, 
+						// eg. '10:10:01', which causes code to think that there is bind param :10 and :1
+						$ok = preg_match('/^([0-9]*)/', $str, $arr); 
+			
+						if (!$ok) $sql .= $str;
+						else {
+							$at = $arr[1];
+							if (isset($inputarr[$at]) || is_null($inputarr[$at])) {
+								if ((strlen($at) == strlen($str) && $k < sizeof($arr)-1)) {
+									$sql .= ':'.$str;
+									$lastnomatch = $k;
+								} else if ($lastnomatch == $k-1) {
+									$sql .= ':'.$str;
+								} else {
+									if (is_null($inputarr[$at])) $sql .= 'null';
+									else $sql .= $this->qstr($inputarr[$at]);
+									$sql .= substr($str, strlen($at));
+								}
+							} else {
+								$sql .= ':'.$str;
+							}
+							
+						}
+					}
+					$inputarr = false;
+				}
+			}
+			$ret = $this->_Execute($sql,$inputarr);
+			
+			
+		} else {
+			$ret = $this->_Execute($sql,false);
+		}
+
+		return $ret;
+	}
+	
+	/*
+		Example of usage:
+		
+		$stmt = $this->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
+	*/
+	function Prepare($sql,$cursor=false)
+	{
+	static $BINDNUM = 0;
+	
+		$stmt = OCIParse($this->_connectionID,$sql);
+
+		if (!$stmt) {
+			$this->_errorMsg = false;
+			$this->_errorCode = false;
+			$arr = @OCIError($this->_connectionID);
+			if ($arr === false) return false;
+		
+			$this->_errorMsg = $arr['message'];
+			$this->_errorCode = $arr['code'];
+			return false;
+		}
+		
+		$BINDNUM += 1;
+		
+		$sttype = @OCIStatementType($stmt);
+		if ($sttype == 'BEGIN' || $sttype == 'DECLARE') {
+			return array($sql,$stmt,0,$BINDNUM, ($cursor) ? OCINewCursor($this->_connectionID) : false);
+		}
+		return array($sql,$stmt,0,$BINDNUM);
+	}
+	
+	/*
+		Call an oracle stored procedure and returns a cursor variable as a recordset. 
+		Concept by Robert Tuttle robert@ud.com
+		
+		Example:
+			Note: we return a cursor variable in :RS2
+			$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS2); END;",'RS2');
+			
+			$rs = $db->ExecuteCursor(
+				"BEGIN :RS2 = adodb.getdata(:VAR1); END;", 
+				'RS2',
+				array('VAR1' => 'Mr Bean'));
+			
+	*/
+	function ExecuteCursor($sql,$cursorName='rs',$params=false)
+	{
+		if (is_array($sql)) $stmt = $sql;
+		else $stmt = ADODB_oci8::Prepare($sql,true); # true to allocate OCINewCursor
+	
+		if (is_array($stmt) && sizeof($stmt) >= 5) {
+			$hasref = true;
+			$ignoreCur = false;
+			$this->Parameter($stmt, $ignoreCur, $cursorName, false, -1, OCI_B_CURSOR);
+			if ($params) {
+				foreach($params as $k => $v) {
+					$this->Parameter($stmt,$params[$k], $k);
+				}
+			}
+		} else
+			$hasref = false;
+			
+		$rs = $this->Execute($stmt);
+		if ($rs) {
+			if ($rs->databaseType == 'array') OCIFreeCursor($stmt[4]);
+			else if ($hasref) $rs->_refcursor = $stmt[4];
+		}
+		return $rs;
+	}
+	
+	/*
+		Bind a variable -- very, very fast for executing repeated statements in oracle. 
+		Better than using
+			for ($i = 0; $i < $max; $i++) {	
+				$p1 = ?; $p2 = ?; $p3 = ?;
+				$this->Execute("insert into table (col0, col1, col2) values (:0, :1, :2)", 
+					array($p1,$p2,$p3));
+			}
+		
+		Usage:
+			$stmt = $DB->Prepare("insert into table (col0, col1, col2) values (:0, :1, :2)");
+			$DB->Bind($stmt, $p1);
+			$DB->Bind($stmt, $p2);
+			$DB->Bind($stmt, $p3);
+			for ($i = 0; $i < $max; $i++) {	
+				$p1 = ?; $p2 = ?; $p3 = ?;
+				$DB->Execute($stmt);
+			}
+			
+		Some timings:		
+			** Test table has 3 cols, and 1 index. Test to insert 1000 records
+			Time 0.6081s (1644.60 inserts/sec) with direct OCIParse/OCIExecute
+			Time 0.6341s (1577.16 inserts/sec) with ADOdb Prepare/Bind/Execute
+			Time 1.5533s ( 643.77 inserts/sec) with pure SQL using Execute
+			
+		Now if PHP only had batch/bulk updating like Java or PL/SQL...
+	
+		Note that the order of parameters differs from OCIBindByName,
+		because we default the names to :0, :1, :2
+	*/
+	function Bind(&$stmt,&$var,$size=4000,$type=false,$name=false,$isOutput=false)
+	{
+		
+		if (!is_array($stmt)) return false;
+        
+        if (($type == OCI_B_CURSOR) && sizeof($stmt) >= 5) { 
+            return OCIBindByName($stmt[1],":".$name,$stmt[4],$size,$type);
+        }
+        
+		if ($name == false) {
+			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size,$type);
+			else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
+			$stmt[2] += 1;
+		} else if (oci_lob_desc($type)) {
+			if ($this->debug) {
+				ADOConnection::outp("Bind: name = $name");
+			}
+            //we have to create a new Descriptor here
+			$numlob = count($this->_refLOBs);
+        	$this->_refLOBs[$numlob]['LOB'] = OCINewDescriptor($this->_connectionID, oci_lob_desc($type));
+			$this->_refLOBs[$numlob]['TYPE'] = $isOutput;
+			
+			$tmp = $this->_refLOBs[$numlob]['LOB'];
+	        $rez = OCIBindByName($stmt[1], ":".$name, $tmp, -1, $type);
+			if ($this->debug) {
+				ADOConnection::outp("Bind: descriptor has been allocated, var (".$name.") binded");
+			}
+			
+			// if type is input then write data to lob now
+			if ($isOutput == false) {
+				$var = $this->BlobEncode($var);
+				$tmp->WriteTemporary($var);
+				$this->_refLOBs[$numlob]['VAR'] = &$var;
+				if ($this->debug) {
+					ADOConnection::outp("Bind: LOB has been written to temp");
+				}
+			} else {
+				$this->_refLOBs[$numlob]['VAR'] = &$var;
+			}
+			$rez = $tmp;
+		} else {
+			if ($this->debug) 
+				ADOConnection::outp("Bind: name = $name");
+			
+			if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
+			else $rez = OCIBindByName($stmt[1],":".$name,$var,$size); // +1 byte for null terminator
+		}
+		
+		return $rez;
+	}
+	
+	function Param($name,$type=false)
+	{
+		return ':'.$name;
+	}
+	
+	/* 
+	Usage:
+		$stmt = $db->Prepare('select * from table where id =:myid and group=:group');
+		$db->Parameter($stmt,$id,'myid');
+		$db->Parameter($stmt,$group,'group');
+		$db->Execute($stmt);
+		
+		@param $stmt Statement returned by Prepare() or PrepareSP().
+		@param $var PHP variable to bind to
+		@param $name Name of stored procedure variable name to bind to.
+		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in oci8.
+		@param [$maxLen] Holds an maximum length of the variable.
+		@param [$type] The data type of $var. Legal values depend on driver.
+		
+		See OCIBindByName documentation at php.net.
+	*/
+	function Parameter(&$stmt,&$var,$name,$isOutput=false,$maxLen=4000,$type=false)
+	{
+			if  ($this->debug) {
+				$prefix = ($isOutput) ? 'Out' : 'In';
+				$ztype = (empty($type)) ? 'false' : $type;
+				ADOConnection::outp( "{$prefix}Parameter(\$stmt, \$php_var='$var', \$name='$name', \$maxLen=$maxLen, \$type=$ztype);");
+			}
+			return $this->Bind($stmt,$var,$maxLen,$type,$name,$isOutput);
+	}
+	
+	/*
+	returns query ID if successful, otherwise false
+	this version supports:
+	
+	   1. $db->execute('select * from table');
+	   
+	   2. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+		  $db->execute($prepared_statement, array(1,2,3));
+		  
+	   3. $db->execute('insert into table (a,b,c) values (:a,:b,:c)',array('a'=>1,'b'=>2,'c'=>3));
+	   
+	   4. $db->prepare('insert into table (a,b,c) values (:0,:1,:2)');
+		  $db->bind($stmt,1); $db->bind($stmt,2); $db->bind($stmt,3); 
+		  $db->execute($stmt);
+	*/ 
+	function _query($sql,$inputarr=false)
+	{
+		if (is_array($sql)) { // is prepared sql
+			$stmt = $sql[1];
+			
+			// we try to bind to permanent array, so that OCIBindByName is persistent
+			// and carried out once only - note that max array element size is 4000 chars
+			if (is_array($inputarr)) {
+				$bindpos = $sql[3];
+				if (isset($this->_bind[$bindpos])) {
+				// all tied up already
+					$bindarr = $this->_bind[$bindpos];
+				} else {
+				// one statement to bind them all
+					$bindarr = array();
+					foreach($inputarr as $k => $v) {
+						$bindarr[$k] = $v;
+						OCIBindByName($stmt,":$k",$bindarr[$k],is_string($v) && strlen($v)>4000 ? -1 : 4000);
+					}
+					$this->_bind[$bindpos] = $bindarr;
+				}
+			}
+		} else {
+			$stmt=OCIParse($this->_connectionID,$sql);
+		}
+			
+		$this->_stmt = $stmt;
+		if (!$stmt) return false;
+	
+		if (defined('ADODB_PREFETCH_ROWS')) @OCISetPrefetch($stmt,ADODB_PREFETCH_ROWS);
+			
+		if (is_array($inputarr)) {
+			foreach($inputarr as $k => $v) {
+				if (is_array($v)) {
+					if (sizeof($v) == 2) // suggested by g.giunta@libero.
+						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1]);
+					else
+						OCIBindByName($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]);
+					
+					if ($this->debug==99) {
+						if (is_object($v[0])) 
+							echo "name=:$k",' len='.$v[1],' type='.$v[2],'
    ';
+						else
+							echo "name=:$k",' var='.$inputarr[$k][0],' len='.$v[1],' type='.$v[2],'
    ';
+						
+					}
+				} else {
+					$len = -1;
+					if ($v === ' ') $len = 1;
+					if (isset($bindarr)) {	// is prepared sql, so no need to ocibindbyname again
+						$bindarr[$k] = $v;
+					} else { 				// dynamic sql, so rebind every time
+						OCIBindByName($stmt,":$k",$inputarr[$k],$len);
+					}
+				}
+			}
+		}
+		
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+		if (OCIExecute($stmt,$this->_commit)) {
+//OCIInternalDebug(1);			
+			if (count($this -> _refLOBs) > 0) {
+		
+				foreach ($this -> _refLOBs as $key => $value) {
+					if ($this -> _refLOBs[$key]['TYPE'] == true) {
+						$tmp = $this -> _refLOBs[$key]['LOB'] -> load();
+						if ($this -> debug) {
+							ADOConnection::outp("OUT LOB: LOB has been loaded. 
    ");
+						}
+						//$_GLOBALS[$this -> _refLOBs[$key]['VAR']] = $tmp;
+						$this -> _refLOBs[$key]['VAR'] = $tmp;
+					} else {
+                        $this->_refLOBs[$key]['LOB']->save($this->_refLOBs[$key]['VAR']);
+						$this -> _refLOBs[$key]['LOB']->free();
+						unset($this -> _refLOBs[$key]);
+                        if ($this->debug) {
+							ADOConnection::outp("IN LOB: LOB has been saved. 
    ");
+						}
+                    }					
+				}
+			}
+		
+            switch (@OCIStatementType($stmt)) {
+                case "SELECT":
+					return $stmt;
+				
+				case 'DECLARE':
+                case "BEGIN":
+                    if (is_array($sql) && !empty($sql[4])) {
+						$cursor = $sql[4];
+						if (is_resource($cursor)) {
+							$ok = OCIExecute($cursor);	
+	                        return $cursor;
+						}
+						return $stmt;
+                    } else {
+						if (is_resource($stmt)) {
+							OCIFreeStatement($stmt);
+							return true;
+						}
+                        return $stmt;
+                    }
+                    break;
+                default :
+					// ociclose -- no because it could be used in a LOB?
+                    return true;
+            }
+		}
+		return false;
+	}
+	
+	// From Oracle Whitepaper: PHP Scalability and High Availability
+	function IsConnectionError($err)
+	{
+		switch($err) {
+			case 378: /* buffer pool param incorrect */
+			case 602: /* core dump */
+			case 603: /* fatal error */
+			case 609: /* attach failed */
+			case 1012: /* not logged in */
+			case 1033: /* init or shutdown in progress */
+			case 1043: /* Oracle not available */
+			case 1089: /* immediate shutdown in progress */
+			case 1090: /* shutdown in progress */
+			case 1092: /* instance terminated */
+			case 3113: /* disconnect */
+			case 3114: /* not connected */
+			case 3122: /* closing window */
+			case 3135: /* lost contact */
+			case 12153: /* TNS: not connected */
+			case 27146: /* fatal or instance terminated */
+			case 28511: /* Lost RPC */
+			return true;
+		}
+		return false;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		if (!$this->_connectionID) return;
+		
+		if (!$this->autoCommit) OCIRollback($this->_connectionID);
+		if (count($this->_refLOBs) > 0) {
+			foreach ($this ->_refLOBs as $key => $value) {
+				$this->_refLOBs[$key]['LOB']->free();
+				unset($this->_refLOBs[$key]);
+			}
+		}
+		OCILogoff($this->_connectionID);
+		
+		$this->_stmt = false;
+		$this->_connectionID = false;
+	}
+	
+	function MetaPrimaryKeys($table, $owner=false,$internalKey=false)
+	{
+		if ($internalKey) return array('ROWID');
+		
+	// tested with oracle 8.1.7
+		$table = strtoupper($table);
+		if ($owner) {
+			$owner_clause = "AND ((a.OWNER = b.OWNER) AND (a.OWNER = UPPER('$owner')))";
+			$ptab = 'ALL_';
+		} else {
+			$owner_clause = '';
+			$ptab = 'USER_';
+		}
+		$sql = "
+SELECT /*+ RULE */ distinct b.column_name
+   FROM {$ptab}CONSTRAINTS a
+	  , {$ptab}CONS_COLUMNS b
+  WHERE ( UPPER(b.table_name) = ('$table'))
+	AND (UPPER(a.table_name) = ('$table') and a.constraint_type = 'P')
+	$owner_clause
+	AND (a.constraint_name = b.constraint_name)";
+
+ 		$rs = $this->Execute($sql);
+		if ($rs && !$rs->EOF) {
+			$arr = $rs->GetArray();
+			$a = array();
+			foreach($arr as $v) {
+				$a[] = reset($v);
+			}
+			return $a;
+		}
+		else return false;
+	}
+	
+	// http://gis.mit.edu/classes/11.521/sqlnotes/referential_integrity.html
+	function MetaForeignKeys($table, $owner=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$table = $this->qstr(strtoupper($table));
+		if (!$owner) {
+			$owner = $this->user;
+			$tabp = 'user_';
+		} else
+			$tabp = 'all_';
+			
+		$owner = ' and owner='.$this->qstr(strtoupper($owner));
+		
+		$sql = 
+"select constraint_name,r_owner,r_constraint_name 
+	from {$tabp}constraints
+	where constraint_type = 'R' and table_name = $table $owner";
+		
+		$constraints = $this->GetArray($sql);
+		$arr = false;
+		foreach($constraints as $constr) {
+			$cons = $this->qstr($constr[0]);
+			$rowner = $this->qstr($constr[1]);
+			$rcons = $this->qstr($constr[2]);
+			$cols = $this->GetArray("select column_name from {$tabp}cons_columns where constraint_name=$cons $owner order by position");
+			$tabcol = $this->GetArray("select table_name,column_name from {$tabp}cons_columns where owner=$rowner and constraint_name=$rcons order by position");
+			
+			if ($cols && $tabcol) 
+				for ($i=0, $max=sizeof($cols); $i < $max; $i++) {
+					$arr[$tabcol[$i][0]] = $cols[$i][0].'='.$tabcol[$i][1];
+				}
+		}
+		$ADODB_FETCH_MODE = $save;
+		
+		return $arr;
+	}
+
+	
+	function CharMax()
+	{
+		return 4000;
+	}
+	
+	function TextMax()
+	{
+		return 4000;
+	}
+	
+	/**
+	 * Quotes a string.
+	 * An example is  $db->qstr("Don't bother",magic_quotes_runtime());
+	 * 
+	 * @param s			the string to quote
+	 * @param [magic_quotes]	if $s is GET/POST var, set to get_magic_quotes_gpc().
+	 *				This undoes the stupidity of magic quotes for GPC.
+	 *
+	 * @return  quoted string to be sent back to database
+	 */
+	function qstr($s,$magic_quotes=false)
+	{	
+		//$nofixquotes=false;
+	
+		if ($this->noNullStrings && strlen($s)==0)$s = ' ';
+		if (!$magic_quotes) {	
+			if ($this->replaceQuote[0] == '\\'){
+				$s = str_replace('\\','\\\\',$s);
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
+		}
+		
+		// undo magic quotes for " unless sybase is on
+		if (!ini_get('magic_quotes_sybase')) {
+			$s = str_replace('\\"','"',$s);
+			$s = str_replace('\\\\','\\',$s);
+			return "'".str_replace("\\'",$this->replaceQuote,$s)."'";
+		} else {
+			return "'".$s."'";
+		}
+	}
+	
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8 extends ADORecordSet {
+
+	var $databaseType = 'oci8';
+	var $bind=false;
+	var $_fieldobjs;
+	
+	//var $_arr = false;
+		
+	function ADORecordset_oci8($queryID,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_NUM: 
+		default:
+		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		}
+		
+		$this->adodbFetchMode = $mode;
+		$this->_queryID = $queryID;
+	}
+
+
+	function Init()
+	{
+		if ($this->_inited) return;
+		
+		$this->_inited = true;
+		if ($this->_queryID) {
+			
+			$this->_currentRow = 0;
+			@$this->_initrs();
+			$this->EOF = !$this->_fetch();
+			
+			/*
+			// based on idea by Gaetano Giunta to detect unusual oracle errors
+			// see http://phplens.com/lens/lensforum/msgs.php?id=6771
+			$err = OCIError($this->_queryID);
+			if ($err && $this->connection->debug) ADOConnection::outp($err);
+			*/
+			
+			if (!is_array($this->fields)) {
+				$this->_numOfRows = 0;
+				$this->fields = array();
+			}
+		} else {
+			$this->fields = array();
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+	}
+	
+	function _initrs()
+	{
+		$this->_numOfRows = -1;
+		$this->_numOfFields = OCInumcols($this->_queryID);
+		if ($this->_numOfFields>0) {
+			$this->_fieldobjs = array();
+			$max = $this->_numOfFields;
+			for ($i=0;$i<$max; $i++) $this->_fieldobjs[] = $this->_FetchField($i);
+		}
+	}
+
+	  /*		Returns: an object containing field information.
+			  Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+			  fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+			  fetchField() is retrieved.		*/
+
+	function _FetchField($fieldOffset = -1)
+	{
+		$fld = new ADOFieldObject;
+		$fieldOffset += 1;
+		$fld->name =OCIcolumnname($this->_queryID, $fieldOffset);
+		$fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
+		$fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
+	 	switch($fld->type) {
+		case 'NUMBER':
+	 		$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
+			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
+			if ($p != 0 && $sc == 0) $fld->type = 'INT';
+			$fld->scale = $p;
+			break;
+		
+	 	case 'CLOB':
+		case 'NCLOB':
+		case 'BLOB': 
+			$fld->max_length = -1;
+			break;
+		}
+		return $fld;
+	}
+	
+	/* For some reason, OCIcolumnname fails when called after _initrs() so we cache it */
+	function FetchField($fieldOffset = -1)
+	{
+		return $this->_fieldobjs[$fieldOffset];
+	}
+	
+	
+	/*
+	// 10% speedup to move MoveNext to child class
+	function _MoveNext() 
+	{
+	//global $ADODB_EXTENSION;if ($ADODB_EXTENSION) return @adodb_movenext($this);
+		
+		if ($this->EOF) return false;
+		
+		$this->_currentRow++;
+		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode))
+			return true;
+		$this->EOF = true;
+		
+		return false;
+	}	*/
+	
+	
+	function MoveNext()
+	{
+		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
+		return false;
+	}
+	
+	/*
+	# does not work as first record is retrieved in _initrs(), so is not included in GetArray()
+	function GetArray($nRows = -1) 
+	{
+	global $ADODB_OCI8_GETARRAY;
+	
+		if (true ||  !empty($ADODB_OCI8_GETARRAY)) {
+			# does not support $ADODB_ANSI_PADDING_OFF
+	
+			//OCI_RETURN_NULLS and OCI_RETURN_LOBS is set by OCIfetchstatement
+			switch($this->adodbFetchMode) {
+			case ADODB_FETCH_NUM:
+			
+				$ncols = @OCIfetchstatement($this->_queryID, $results, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
+				$results = array_merge(array($this->fields),$results);
+				return $results;
+				
+			case ADODB_FETCH_ASSOC: 
+				if (ADODB_ASSOC_CASE != 2 || $this->databaseType != 'oci8') break;
+				
+				$ncols = @OCIfetchstatement($this->_queryID, $assoc, 0, $nRows, OCI_FETCHSTATEMENT_BY_ROW);
+				$results = array_merge(array($this->fields),$assoc);
+				return $results;
+			
+			default:
+				break;
+			}
+		}
+			
+		$results = ADORecordSet::GetArray($nRows);
+		return $results;
+		
+	} */
+	
+	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
+	function GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) {
+			$arr = $this->GetArray($nrows);
+			return $arr;
+		}
+		$arr = array();
+		for ($i=1; $i < $offset; $i++) 
+			if (!@OCIFetch($this->_queryID)) return $arr;
+			
+		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) return $arr;;
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+
+
+	function _seek($row)
+	{
+		return false;
+	}
+
+	function _fetch() 
+	{
+		return @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
+	}
+
+	/*		close() only needs to be called if you are worried about using too much memory while your script
+			is running. All associated result memory for the specified result identifier will automatically be freed.		*/
+
+	function _close() 
+	{
+		if ($this->connection->_stmt === $this->_queryID) $this->connection->_stmt = false;
+		if (!empty($this->_refcursor)) {
+			OCIFreeCursor($this->_refcursor);
+			$this->_refcursor = false;
+		}
+		@OCIFreeStatement($this->_queryID);
+ 		$this->_queryID = false;
+		
+	}
+
+	function MetaType($t,$len=-1)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+	 	case 'VARCHAR':
+	 	case 'VARCHAR2':
+		case 'CHAR':
+		case 'VARBINARY':
+		case 'BINARY':
+		case 'NCHAR':
+		case 'NVARCHAR':
+		case 'NVARCHAR2':
+				 if ($len <= $this->blobSize) return 'C';
+		
+		case 'NCLOB':
+		case 'LONG':
+		case 'LONG VARCHAR':
+		case 'CLOB':
+		return 'X';
+		
+		case 'LONG RAW':
+		case 'LONG VARBINARY':
+		case 'BLOB':
+			return 'B';
+		
+		case 'DATE': 
+			return  ($this->connection->datetime) ? 'T' : 'D';
+		
+		
+		case 'TIMESTAMP': return 'T';
+		
+		case 'INT': 
+		case 'SMALLINT':
+		case 'INTEGER': 
+			return 'I';
+			
+		default: return 'N';
+		}
+	}
+}
+
+class ADORecordSet_ext_oci8 extends ADORecordSet_oci8 {	
+	function ADORecordSet_ext_oci8($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		case ADODB_FETCH_NUM: 
+		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+		}
+		$this->adodbFetchMode = $mode;
+		$this->_queryID = $queryID;
+	}
+	
+	function MoveNext()
+	{
+		return adodb_movenext($this);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-oci805.inc.php b/adodb/drivers/adodb-oci805.inc.php
new file mode 100644
index 0000000..6d8a202
--- /dev/null
+++ b/adodb/drivers/adodb-oci805.inc.php
@@ -0,0 +1,59 @@
+ADODB_oci8();
+	}
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		// seems that oracle only supports 1 hint comment in 8i
+		if (strpos($sql,'/*+') !== false)
+			$sql = str_replace('/*+ ','/*+FIRST_ROWS ',$sql);
+		else
+			$sql = preg_replace('/^[ \t\n]*select/i','SELECT /*+FIRST_ROWS*/',$sql);
+		
+		/* 
+			The following is only available from 8.1.5 because order by in inline views not 
+			available before then...
+			http://www.jlcomp.demon.co.uk/faq/top_sql.html
+		if ($nrows > 0) {	
+			if ($offset > 0) $nrows += $offset;
+			$sql = "select * from ($sql) where rownum <= $nrows";
+			$nrows = -1;
+		}
+		*/
+
+		return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+	}
+}
+
+class ADORecordset_oci805 extends ADORecordset_oci8 {	
+	var $databaseType = "oci805";
+	function ADORecordset_oci805($id,$mode=false)
+	{
+		$this->ADORecordset_oci8($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-oci8po.inc.php b/adodb/drivers/adodb-oci8po.inc.php
new file mode 100644
index 0000000..3f80db1
--- /dev/null
+++ b/adodb/drivers/adodb-oci8po.inc.php
@@ -0,0 +1,218 @@
+
+
+   Should some emulation of RecordCount() be implemented?
+  
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+include_once(ADODB_DIR.'/drivers/adodb-oci8.inc.php');
+
+class ADODB_oci8po extends ADODB_oci8 {
+	var $databaseType = 'oci8po';
+	var $dataProvider = 'oci8';
+	var $metaColumnsSQL = "select lower(cname),coltype,width, SCALE, PRECISION, NULLS, DEFAULTVAL from col where tname='%s' order by colno"; //changed by smondino@users.sourceforge. net
+	var $metaTablesSQL = "select lower(table_name),table_type from cat where table_type in ('TABLE','VIEW')";
+	
+	function ADODB_oci8po()
+	{
+		$this->_hasOCIFetchStatement = ADODB_PHPVER >= 0x4200;
+		# oci8po does not support adodb extension: adodb_movenext()
+	}
+	
+	function Param($name)
+	{
+		return '?';
+	}
+	
+	function Prepare($sql,$cursor=false)
+	{
+		$sqlarr = explode('?',$sql);
+		$sql = $sqlarr[0];
+		for ($i = 1, $max = sizeof($sqlarr); $i < $max; $i++) {
+			$sql .=  ':'.($i-1) . $sqlarr[$i];
+		} 
+		return ADODB_oci8::Prepare($sql,$cursor);
+	}
+	
+	// emulate handling of parameters ? ?, replacing with :bind0 :bind1
+	function _query($sql,$inputarr=false)
+	{
+		if (is_array($inputarr)) {
+			$i = 0;
+			if (is_array($sql)) {
+				foreach($inputarr as $v) {
+					$arr['bind'.$i++] = $v;
+				} 
+			} else {
+				$sqlarr = explode('?',$sql);
+				$sql = $sqlarr[0];
+				foreach($inputarr as $k => $v) {
+					$sql .=  ":$k" . $sqlarr[++$i];
+				}
+			}
+		}
+		return ADODB_oci8::_query($sql,$inputarr);
+	}
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oci8po extends ADORecordset_oci8 {
+
+	var $databaseType = 'oci8po';
+	
+	function ADORecordset_oci8po($queryID,$mode=false)
+	{
+		$this->ADORecordset_oci8($queryID,$mode);
+	}
+
+	function Fields($colname)
+	{
+		if ($this->fetchMode & OCI_ASSOC) return $this->fields[$colname];
+		
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+	// lowercase field names...
+	function _FetchField($fieldOffset = -1)
+	{
+		 $fld = new ADOFieldObject;
+ 		 $fieldOffset += 1;
+		 $fld->name = OCIcolumnname($this->_queryID, $fieldOffset);
+		 if (ADODB_ASSOC_CASE == 0) $fld->name = strtolower($fld->name);
+		 $fld->type = OCIcolumntype($this->_queryID, $fieldOffset);
+		 $fld->max_length = OCIcolumnsize($this->_queryID, $fieldOffset);
+		 if ($fld->type == 'NUMBER') {
+		 	//$p = OCIColumnPrecision($this->_queryID, $fieldOffset);
+			$sc = OCIColumnScale($this->_queryID, $fieldOffset);
+			if ($sc == 0) $fld->type = 'INT';
+		 }
+		 return $fld;
+	}
+	/*
+	function MoveNext()
+	{
+		if (@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+			$this->_currentRow += 1;
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->_currentRow += 1;
+			$this->EOF = true;
+		}
+		return false;
+	}*/
+
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if(@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+		global $ADODB_ANSI_PADDING_OFF;
+			$this->_currentRow++;
+			
+			if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+			if (!empty($ADODB_ANSI_PADDING_OFF)) {
+				foreach($this->fields as $k => $v) {
+					if (is_string($v)) $this->fields[$k] = rtrim($v);
+				}
+			}
+			return true;
+		}
+		if (!$this->EOF) {
+			$this->EOF = true;
+			$this->_currentRow++;
+		}
+		return false;
+	}	
+	
+	/* Optimize SelectLimit() by using OCIFetch() instead of OCIFetchInto() */
+	function GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) {
+			$arr = $this->GetArray($nrows);
+			return $arr;
+		}
+		for ($i=1; $i < $offset; $i++) 
+			if (!@OCIFetch($this->_queryID)) {
+				$arr = array();
+				return $arr;
+			}
+		if (!@OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode)) {
+			$arr = array();
+			return $arr;
+		}
+		if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+
+	// Create associative array
+	function _updatefields()
+	{
+		if (ADODB_ASSOC_CASE == 2) return; // native
+	
+		$arr = array();
+		$lowercase = (ADODB_ASSOC_CASE == 0);
+		
+		foreach($this->fields as $k => $v) {
+			if (is_integer($k)) $arr[$k] = $v;
+			else {
+				if ($lowercase)
+					$arr[strtolower($k)] = $v;
+				else
+					$arr[strtoupper($k)] = $v;
+			}
+		}
+		$this->fields = $arr;
+	}
+	
+	function _fetch() 
+	{
+		$ret = @OCIfetchinto($this->_queryID,$this->fields,$this->fetchMode);
+		if ($ret) {
+		global $ADODB_ANSI_PADDING_OFF;
+	
+				if ($this->fetchMode & OCI_ASSOC) $this->_updatefields();
+				if (!empty($ADODB_ANSI_PADDING_OFF)) {
+					foreach($this->fields as $k => $v) {
+						if (is_string($v)) $this->fields[$k] = rtrim($v);
+					}
+				}
+		}
+		return $ret;
+	}
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbc.inc.php b/adodb/drivers/adodb-odbc.inc.php
new file mode 100644
index 0000000..0beb4bf
--- /dev/null
+++ b/adodb/drivers/adodb-odbc.inc.php
@@ -0,0 +1,744 @@
+_haserrorfunctions = ADODB_PHPVER >= 0x4050;
+		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
+	}
+	
+		// returns true or false
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+		
+		if (!function_exists('odbc_connect')) return null;
+		
+		if ($this->debug && $argDatabasename && $this->databaseType != 'vfp') {
+			ADOConnection::outp("For odbc Connect(), $argDatabasename is not used. Place dsn in 1st parameter.");
+		}
+		if (isset($php_errormsg)) $php_errormsg = '';
+		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
+		else $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,$this->curmode);
+		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+		
+		return $this->_connectionID != false;
+	}
+	
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+	
+		if (!function_exists('odbc_connect')) return null;
+		
+		if (isset($php_errormsg)) $php_errormsg = '';
+		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+		if ($this->debug && $argDatabasename) {
+			ADOConnection::outp("For odbc PConnect(), $argDatabasename is not used. Place dsn in 1st parameter.");
+		}
+	//	print "dsn=$argDSN u=$argUsername p=$argPassword
    "; flush();
+		if ($this->curmode === false) $this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword);
+		else $this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,$this->curmode);
+		
+		$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+		if ($this->_connectionID && $this->autoRollback) @odbc_rollback($this->_connectionID);
+		if (isset($this->connectStmt)) $this->Execute($this->connectStmt);
+		
+		return $this->_connectionID != false;
+	}
+
+	
+	function ServerInfo()
+	{
+	
+		if (!empty($this->host) && ADODB_PHPVER >= 0x4300) {
+			$dsn = strtoupper($this->host);
+			$first = true;
+			$found = false;
+			
+			if (!function_exists('odbc_data_source')) return false;
+			
+			while(true) {
+				
+				$rez = @odbc_data_source($this->_connectionID,
+					$first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT);
+				$first = false;
+				if (!is_array($rez)) break;
+				if (strtoupper($rez['server']) == $dsn) {
+					$found = true;
+					break;
+				}
+			} 
+			if (!$found) return ADOConnection::ServerInfo();
+			if (!isset($rez['version'])) $rez['version'] = '';
+			return $rez;
+		} else {
+			return ADOConnection::ServerInfo();
+		}
+	}
+
+	
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		$start -= 1;
+		return $this->Execute("insert into $seqname values($start)");
+	}
+	
+	var $_dropSeqSQL = 'drop table %s';
+	function DropSequence($seqname)
+	{
+		if (empty($this->_dropSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+	
+	/*
+		This algorithm is not very efficient, but works even if table locking
+		is not available.
+		
+		Will return false if unable to generate an ID after $MAXLOOPS attempts.
+	*/
+	function GenID($seq='adodbseq',$start=1)
+	{	
+		// if you have to modify the parameter below, your database is overloaded,
+		// or you need to implement generation of id's yourself!
+		$MAXLOOPS = 100;
+		//$this->debug=1;
+		while (--$MAXLOOPS>=0) {
+			$num = $this->GetOne("select id from $seq");
+			if ($num === false) {
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$start -= 1;
+				$num = '0';
+				$ok = $this->Execute("insert into $seq values($start)");
+				if (!$ok) return false;
+			} 
+			$this->Execute("update $seq set id=id+1 where id=$num");
+			
+			if ($this->affected_rows() > 0) {
+				$num += 1;
+				$this->genID = $num;
+				return $num;
+			} elseif ($this->affected_rows() == 0) {
+				// some drivers do not return a valid value => try with another method
+				$value = $this->GetOne("select id from $seq");
+				if ($value == $num + 1) {
+					return $value;
+				}
+			}
+		}
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
+		}
+		return false;
+	}
+
+
+	function ErrorMsg()
+	{
+		if ($this->_haserrorfunctions) {
+			if ($this->_errorMsg !== false) return $this->_errorMsg;
+			if (empty($this->_connectionID)) return @odbc_errormsg();
+			return @odbc_errormsg($this->_connectionID);
+		} else return ADOConnection::ErrorMsg();
+	}
+	
+	function ErrorNo()
+	{
+		
+		if ($this->_haserrorfunctions) {
+			if ($this->_errorCode !== false) {
+				// bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+				return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode;
+			}
+
+			if (empty($this->_connectionID)) $e = @odbc_error(); 
+			else $e = @odbc_error($this->_connectionID);
+			
+			 // bug in 4.0.6, error number can be corrupted string (should be 6 digits)
+			 // so we check and patch
+			if (strlen($e)<=2) return 0;
+			return $e;
+		} else return ADOConnection::ErrorNo();
+	}
+	
+	
+
+	function BeginTrans()
+	{	
+		if (!$this->hasTransactions) return false;
+		if ($this->transOff) return true; 
+		$this->transCnt += 1;
+		$this->_autocommit = false;
+		return odbc_autocommit($this->_connectionID,false);
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->_autocommit = true;
+		$ret = odbc_commit($this->_connectionID);
+		odbc_autocommit($this->_connectionID,true);
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true; 
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->_autocommit = true;
+		$ret = odbc_rollback($this->_connectionID);
+		odbc_autocommit($this->_connectionID,true);
+		return $ret;
+	}
+	
+	function MetaPrimaryKeys($table)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		if ($this->uCaseTables) $table = strtoupper($table);
+		$schema = '';
+		$this->_findschema($table,$schema);
+
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = @odbc_primarykeys($this->_connectionID,'',$schema,$table);
+		
+		if (!$qid) {
+			$ADODB_FETCH_MODE = $savem;
+			return false;
+		}
+		$rs = new ADORecordSet_odbc($qid);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if (!$rs) return false;
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		
+		$arr = $rs->GetArray();
+		$rs->Close();
+		//print_r($arr);
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
+		}
+		return $arr2;
+	}
+	
+	
+	
+	function MetaTables($ttype=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = odbc_tables($this->_connectionID);
+		
+		$rs = new ADORecordSet_odbc($qid);
+		
+		$ADODB_FETCH_MODE = $savem;
+		if (!$rs) {
+			$false = false;
+			return $false;
+		}
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		
+		$arr = $rs->GetArray();
+		//print_r($arr);
+		
+		$rs->Close();
+		$arr2 = array();
+		
+		if ($ttype) {
+			$isview = strncmp($ttype,'V',1) === 0;
+		}
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if (!$arr[$i][2]) continue;
+			$type = $arr[$i][3];
+			if ($ttype) { 
+				if ($isview) {
+					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
+				} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+			} else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+		}
+		return $arr2;
+	}
+	
+/*
+See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/odbcdatetime_data_type_changes.asp
+/ SQL data type codes /
+#define	SQL_UNKNOWN_TYPE	0
+#define SQL_CHAR			1
+#define SQL_NUMERIC		 2
+#define SQL_DECIMAL		 3
+#define SQL_INTEGER		 4
+#define SQL_SMALLINT		5
+#define SQL_FLOAT		   6
+#define SQL_REAL			7
+#define SQL_DOUBLE		  8
+#if (ODBCVER >= 0x0300)
+#define SQL_DATETIME		9
+#endif
+#define SQL_VARCHAR		12
+
+
+/ One-parameter shortcuts for date/time data types /
+#if (ODBCVER >= 0x0300)
+#define SQL_TYPE_DATE	  91
+#define SQL_TYPE_TIME	  92
+#define SQL_TYPE_TIMESTAMP 93
+
+#define SQL_UNICODE                             (-95)
+#define SQL_UNICODE_VARCHAR                     (-96)
+#define SQL_UNICODE_LONGVARCHAR                 (-97)
+*/
+	function ODBCTypes($t)
+	{
+		switch ((integer)$t) {
+		case 1:	
+		case 12:
+		case 0:
+		case -95:
+		case -96:
+			return 'C';
+		case -97:
+		case -1: //text
+			return 'X';
+		case -4: //image
+			return 'B';
+				
+		case 9:	
+		case 91:
+			return 'D';
+		
+		case 10:
+		case 11:
+		case 92:
+		case 93:
+			return 'T';
+			
+		case 4:
+		case 5:
+		case -6:
+			return 'I';
+			
+		case -11: // uniqidentifier
+			return 'R';
+		case -7: //bit
+			return 'L';
+		
+		default:
+			return 'N';
+		}
+	}
+	
+	function MetaColumns($table, $normalize=true)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$false = false;
+		if ($this->uCaseTables) $table = strtoupper($table);
+		$schema = '';
+		$this->_findschema($table,$schema);
+		
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	
+		/*if (false) { // after testing, confirmed that the following does not work becoz of a bug
+			$qid2 = odbc_tables($this->_connectionID);
+			$rs = new ADORecordSet_odbc($qid2);		
+			$ADODB_FETCH_MODE = $savem;
+			if (!$rs) return false;
+			$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+			$rs->_fetch();
+			
+			while (!$rs->EOF) {
+				if ($table == strtoupper($rs->fields[2])) {
+					$q = $rs->fields[0];
+					$o = $rs->fields[1];
+					break;
+				}
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			
+			$qid = odbc_columns($this->_connectionID,$q,$o,strtoupper($table),'%');
+		} */
+		
+		switch ($this->databaseType) {
+		case 'access':
+		case 'vfp':
+			$qid = odbc_columns($this->_connectionID);#,'%','',strtoupper($table),'%');
+			break;
+		
+		
+		case 'db2':
+            $colname = "%";
+            $qid = odbc_columns($this->_connectionID, "", $schema, $table, $colname);
+            break;
+			
+		default:
+			$qid = @odbc_columns($this->_connectionID,'%','%',strtoupper($table),'%');
+			if (empty($qid)) $qid = odbc_columns($this->_connectionID);
+			break;
+		}
+		if (empty($qid)) return $false;
+		
+		$rs = new ADORecordSet_odbc($qid);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if (!$rs) return $false;
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		$rs->_fetch();
+		
+		$retarr = array();
+		
+		/*
+		$rs->fields indices
+		0 TABLE_QUALIFIER
+		1 TABLE_SCHEM
+		2 TABLE_NAME
+		3 COLUMN_NAME
+		4 DATA_TYPE
+		5 TYPE_NAME
+		6 PRECISION
+		7 LENGTH
+		8 SCALE
+		9 RADIX
+		10 NULLABLE
+		11 REMARKS
+		*/
+		while (!$rs->EOF) {
+		//	adodb_pr($rs->fields);
+			if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) {
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[3];
+				$fld->type = $this->ODBCTypes($rs->fields[4]);
+				
+				// ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp
+				// access uses precision to store length for char/varchar
+				if ($fld->type == 'C' or $fld->type == 'X') {
+					if ($this->databaseType == 'access') 
+						$fld->max_length = $rs->fields[6];
+					else if ($rs->fields[4] <= -95) // UNICODE
+						$fld->max_length = $rs->fields[7]/2;
+					else
+						$fld->max_length = $rs->fields[7];
+				} else 
+					$fld->max_length = $rs->fields[7];
+				$fld->not_null = !empty($rs->fields[10]);
+				$fld->scale = $rs->fields[8];
+				$retarr[strtoupper($fld->name)] = $fld;	
+			} else if (sizeof($retarr)>0)
+				break;
+			$rs->MoveNext();
+		}
+		$rs->Close(); //-- crashes 4.03pl1 -- why?
+		
+		if (empty($retarr)) $retarr = false;
+		return $retarr;
+	}
+	
+	function Prepare($sql)
+	{
+		if (! $this->_bindInputArray) return $sql; // no binding
+		$stmt = odbc_prepare($this->_connectionID,$sql);
+		if (!$stmt) {
+			// we don't know whether odbc driver is parsing prepared stmts, so just return sql
+			return $sql;
+		}
+		return array($sql,$stmt,false);
+	}
+
+	/* returns queryID or false */
+	function _query($sql,$inputarr=false) 
+	{
+	GLOBAL $php_errormsg;
+		if (isset($php_errormsg)) $php_errormsg = '';
+		$this->_error = '';
+		
+		if ($inputarr) {
+			if (is_array($sql)) {
+				$stmtid = $sql[1];
+			} else {
+				$stmtid = odbc_prepare($this->_connectionID,$sql);
+	
+				if ($stmtid == false) {
+					$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+					return false;
+				}
+			}
+			
+			if (! odbc_execute($stmtid,$inputarr)) {
+				//@odbc_free_result($stmtid);
+				if ($this->_haserrorfunctions) {
+					$this->_errorMsg = odbc_errormsg();
+					$this->_errorCode = odbc_error();
+				}
+				return false;
+			}
+		
+		} else if (is_array($sql)) {
+			$stmtid = $sql[1];
+			if (!odbc_execute($stmtid)) {
+				//@odbc_free_result($stmtid);
+				if ($this->_haserrorfunctions) {
+					$this->_errorMsg = odbc_errormsg();
+					$this->_errorCode = odbc_error();
+				}
+				return false;
+			}
+		} else
+			$stmtid = odbc_exec($this->_connectionID,$sql);
+		
+		$this->_lastAffectedRows = 0;
+		if ($stmtid) {
+			if (@odbc_num_fields($stmtid) == 0) {
+				$this->_lastAffectedRows = odbc_num_rows($stmtid);
+				$stmtid = true;
+			} else {
+				$this->_lastAffectedRows = 0;
+				odbc_binmode($stmtid,$this->binmode);
+				odbc_longreadlen($stmtid,$this->maxblobsize);
+			}
+			
+			if ($this->_haserrorfunctions) {
+				$this->_errorMsg = '';
+				$this->_errorCode = 0;
+			} else
+				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+		} else {
+			if ($this->_haserrorfunctions) {
+				$this->_errorMsg = odbc_errormsg();
+				$this->_errorCode = odbc_error();
+			} else
+				$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : '';
+		}
+		return $stmtid;
+	}
+
+	/*
+		Insert a null into the blob field of the table first.
+		Then use UpdateBlob to store the blob.
+		
+		Usage:
+		 
+		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+	*/
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+		return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false;
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		$ret = @odbc_close($this->_connectionID);
+		$this->_connectionID = false;
+		return $ret;
+	}
+
+	function _affectedrows()
+	{
+		return $this->_lastAffectedRows;
+	}
+	
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_odbc extends ADORecordSet {	
+	
+	var $bind = false;
+	var $databaseType = "odbc";		
+	var $dataProvider = "odbc";
+	var $useFetchArray;
+	var $_has_stupid_odbc_fetch_api_change;
+	
+	function ADORecordSet_odbc($id,$mode=false)
+	{
+		if ($mode === false) {  
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		
+		$this->_queryID = $id;
+		
+		// the following is required for mysql odbc driver in 4.3.1 -- why?
+		$this->EOF = false;
+		$this->_currentRow = -1;
+		//$this->ADORecordSet($id);
+	}
+
+
+	// returns the field object
+	function FetchField($fieldOffset = -1) 
+	{
+		
+		$off=$fieldOffset+1; // offsets begin at 1
+		
+		$o= new ADOFieldObject();
+		$o->name = @odbc_field_name($this->_queryID,$off);
+		$o->type = @odbc_field_type($this->_queryID,$off);
+		$o->max_length = @odbc_field_len($this->_queryID,$off);
+		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+		return $o;
+	}
+	
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+		
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @odbc_num_rows($this->_queryID) : -1;
+		$this->_numOfFields = @odbc_num_fields($this->_queryID);
+		// some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0
+		if ($this->_numOfRows == 0) $this->_numOfRows = -1;
+		//$this->useFetchArray = $this->connection->useFetchArray;
+		$this->_has_stupid_odbc_fetch_api_change = ADODB_PHPVER >= 0x4200;
+	}	
+	
+	function _seek($row)
+	{
+		return false;
+	}
+	
+	// speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated
+	function GetArrayLimit($nrows,$offset=-1) 
+	{
+		if ($offset <= 0) {
+			$rs = $this->GetArray($nrows);
+			return $rs;
+		}
+		$savem = $this->fetchMode;
+		$this->fetchMode = ADODB_FETCH_NUM;
+		$this->Move($offset);
+		$this->fetchMode = $savem;
+		
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+			$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+		}
+		
+		$results = array();
+		$cnt = 0;
+		while (!$this->EOF && $nrows != $cnt) {
+			$results[$cnt++] = $this->fields;
+			$this->MoveNext();
+		}
+		
+		return $results;
+	}
+	
+	
+	function MoveNext() 
+	{
+		if ($this->_numOfRows != 0 && !$this->EOF) {		
+			$this->_currentRow++;
+			
+			if ($this->_has_stupid_odbc_fetch_api_change)
+				$rez = @odbc_fetch_into($this->_queryID,$this->fields);
+			else {
+				$row = 0;
+				$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
+			}
+			if ($rez) {
+				if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+					$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+				}
+				return true;
+			}
+		}
+		$this->fields = false;
+		$this->EOF = true;
+		return false;
+	}	
+	
+	function _fetch()
+	{
+
+		if ($this->_has_stupid_odbc_fetch_api_change)
+			$rez = @odbc_fetch_into($this->_queryID,$this->fields);
+		else {
+			$row = 0;
+			$rez = @odbc_fetch_into($this->_queryID,$row,$this->fields);
+		}
+		if ($rez) {
+			if ($this->fetchMode & ADODB_FETCH_ASSOC) {
+				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+			}
+			return true;
+		}
+		$this->fields = false;
+		return false;
+	}
+	
+	function _close() 
+	{
+		return @odbc_free_result($this->_queryID);		
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbc_db2.inc.php b/adodb/drivers/adodb-odbc_db2.inc.php
new file mode 100644
index 0000000..8bec473
--- /dev/null
+++ b/adodb/drivers/adodb-odbc_db2.inc.php
@@ -0,0 +1,368 @@
+curMode = SQL_CUR_USE_ODBC;
+$db->Connect($dsn, $userid, $pwd);
+
+
+
+USING CLI INTERFACE
+===================
+
+I have had reports that the $host and $database params have to be reversed in 
+Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
+
+> The symptom is that if I change the database engine from postgres or any other to DB2 then the following
+> connection command becomes wrong despite being described this version to be correct in the docs. 
+>
+> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
+>
+> In case of DB2 I had to swap the first and last arguments in order to connect properly. 
+
+
+System Error 5
+==============
+IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
+to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+}
+if (!defined('ADODB_ODBC_DB2')){
+define('ADODB_ODBC_DB2',1);
+
+class ADODB_ODBC_DB2 extends ADODB_odbc {
+	var $databaseType = "db2";	
+	var $concat_operator = '||';
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
+	var $sysTimeStamp = 'CURRENT TIMESTAMP';
+	// The complete string representation of a timestamp has the form 
+	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
+	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
+	var $ansiOuter = true;
+	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
+	var $_bindInputArray = true;
+	 var $hasInsertID = true;
+	var $rsPrefix = 'ADORecordset_odbc_';
+	
+	function ADODB_DB2()
+	{
+		if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
+		$this->ADODB_odbc();
+	}
+	
+	function IfNull( $field, $ifNull ) 
+	{
+		return " COALESCE($field, $ifNull) "; // if DB2 UDB
+	}
+	
+	function ServerInfo()
+	{
+		//odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/);
+		$vers = $this->GetOne('select versionnumber from sysibm.sysversions');
+		//odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/);
+		return array('description'=>'DB2 ODBC driver', 'version'=>$vers);
+	}
+	
+	function _insertid()
+	{
+		return $this->GetOne($this->identitySQL);
+	}
+	
+	function RowLock($tables,$where,$col='1 as adodbignore')
+	{
+		if ($this->_autocommit) $this->BeginTrans();
+		return $this->GetOne("select $col from $tables where $where for update");
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%")
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$qid = odbc_tables($this->_connectionID, "", $qschema, $qtable, "");
+		
+		$rs = new ADORecordSet_odbc($qid);
+		
+		$ADODB_FETCH_MODE = $savem;
+		if (!$rs) {
+			$false = false;
+			return $false;
+		}
+		$rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change;
+		
+		$arr = $rs->GetArray();
+		//print_r($arr);
+		
+		$rs->Close();
+		$arr2 = array();
+		
+		if ($ttype) {
+			$isview = strncmp($ttype,'V',1) === 0;
+		}
+		for ($i=0; $i < sizeof($arr); $i++) {
+		
+			if (!$arr[$i][2]) continue;
+			if (strncmp($arr[$i][1],'SYS',3) === 0) continue;
+			
+			$type = $arr[$i][3];
+			
+			if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2];
+			
+			if ($ttype) { 
+				if ($isview) {
+					if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
+				} else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
+			} else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
+		}
+		return $arr2;
+	}
+
+	function MetaIndexes ($table, $primary = FALSE, $owner=false)
+	{
+        // save old fetch mode
+        global $ADODB_FETCH_MODE;
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+		$false = false;
+		// get index details
+		$table = strtoupper($table);
+		$SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'";
+        if ($primary) 
+			$SQL.= " AND UNIQUERULE='P'";
+		$rs = $this->Execute($SQL);
+        if (!is_object($rs)) {
+			if (isset($savem)) 
+				$this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+            return $false;
+        }
+		$indexes = array ();
+        // parse index data into array
+        while ($row = $rs->FetchRow()) {
+			$indexes[$row[0]] = array(
+			   'unique' => ($row[1] == 'U' || $row[1] == 'P'),
+			   'columns' => array()
+			);
+			$cols = ltrim($row[2],'+');
+			$indexes[$row[0]]['columns'] = explode('+', $cols);
+        }
+		if (isset($savem)) { 
+            $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+		}
+        return $indexes;
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+	// use right() and replace() ?
+		if (!$col) $col = $this->sysDate;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '||';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "char(year($col))";
+				break;
+			case 'M':
+				$s .= "substr(monthname($col),1,3)";
+				break;
+			case 'm':
+				$s .= "right(digits(month($col)),2)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "right(digits(day($col)),2)";
+				break;
+			case 'H':
+			case 'h':
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				else $s .= "''";
+				break;
+			case 'i':
+			case 'I':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(minute($col)),2)";
+					else $s .= "''";
+				break;
+			case 'S':
+			case 's':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(second($col)),2)";
+				else $s .= "''";
+				break;
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+			}
+		}
+		return $s;
+	} 
+ 
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
+	{
+		$nrows = (integer) $nrows;
+		if ($offset <= 0) {
+		// could also use " OPTIMIZE FOR $nrows ROWS "
+			if ($nrows >= 0) $sql .=  " FETCH FIRST $nrows ROWS ONLY ";
+			$rs = $this->Execute($sql,$inputArr);
+		} else {
+			if ($offset > 0 && $nrows < 0);
+			else {
+				$nrows += $offset;
+				$sql .=  " FETCH FIRST $nrows ROWS ONLY ";
+			}
+			$rs = ADOConnection::SelectLimit($sql,-1,$offset,$inputArr);
+		}
+		
+		return $rs;
+	}
+	
+};
+ 
+
+class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
+	
+	var $databaseType = "db2";		
+	
+	function ADORecordSet_db2($id,$mode=false)
+	{
+		$this->ADORecordSet_odbc($id,$mode);
+	}
+
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		switch (strtoupper($t)) {
+		case 'VARCHAR':
+		case 'CHAR':
+		case 'CHARACTER':
+		case 'C':
+			if ($len <= $this->blobSize) return 'C';
+		
+		case 'LONGCHAR':
+		case 'TEXT':
+		case 'CLOB':
+		case 'DBCLOB': // double-byte
+		case 'X':
+			return 'X';
+		
+		case 'BLOB':
+		case 'GRAPHIC':
+		case 'VARGRAPHIC':
+			return 'B';
+			
+		case 'DATE':
+		case 'D':
+			return 'D';
+		
+		case 'TIME':
+		case 'TIMESTAMP':
+		case 'T':
+			return 'T';
+		
+		//case 'BOOLEAN': 
+		//case 'BIT':
+		//	return 'L';
+			
+		//case 'COUNTER':
+		//	return 'R';
+			
+		case 'INT':
+		case 'INTEGER':
+		case 'BIGINT':
+		case 'SMALLINT':
+		case 'I':
+			return 'I';
+			
+		default: return 'N';
+		}
+	}
+}
+
+} //define
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbc_mssql.inc.php b/adodb/drivers/adodb-odbc_mssql.inc.php
new file mode 100644
index 0000000..fe47341
--- /dev/null
+++ b/adodb/drivers/adodb-odbc_mssql.inc.php
@@ -0,0 +1,307 @@
+ 'master'";
+	var $metaTablesSQL="select name,case when type='U' then 'T' else 'V' end from sysobjects where (type='U' or type='V') and (name not in ('sysallocations','syscolumns','syscomments','sysdepends','sysfilegroups','sysfiles','sysfiles1','sysforeignkeys','sysfulltextcatalogs','sysindexes','sysindexkeys','sysmembers','sysobjects','syspermissions','sysprotects','sysreferences','systypes','sysusers','sysalternates','sysconstraints','syssegments','REFERENTIAL_CONSTRAINTS','CHECK_CONSTRAINTS','CONSTRAINT_TABLE_USAGE','CONSTRAINT_COLUMN_USAGE','VIEWS','VIEW_TABLE_USAGE','VIEW_COLUMN_USAGE','SCHEMATA','TABLES','TABLE_CONSTRAINTS','TABLE_PRIVILEGES','COLUMNS','COLUMN_DOMAIN_USAGE','COLUMN_PRIVILEGES','DOMAINS','DOMAIN_CONSTRAINTS','KEY_COLUMN_USAGE'))";
+	var $metaColumnsSQL = "select c.name,t.name,c.length from syscolumns c join systypes t on t.xusertype=c.xusertype join sysobjects o on o.id=c.id where o.name='%s'";
+	var $hasTop = 'top';		// support mssql/interbase SELECT TOP 10 * FROM TABLE
+	var $sysDate = 'GetDate()';
+	var $sysTimeStamp = 'GetDate()';
+	var $leftOuter = '*=';
+	var $rightOuter = '=*';
+	var $substr = 'substring';
+	var $length = 'len';
+	var $ansiOuter = true; // for mssql7 or later
+	var $identitySQL = 'select SCOPE_IDENTITY()'; // 'select SCOPE_IDENTITY'; # for mssql 2000
+	var $hasInsertID = true;
+	var $connectStmt = 'SET CONCAT_NULL_YIELDS_NULL OFF'; # When SET CONCAT_NULL_YIELDS_NULL is ON, 
+														  # concatenating a null value with a string yields a NULL result
+	
+	function ADODB_odbc_mssql()
+	{
+		$this->ADODB_odbc();
+		//$this->curmode = SQL_CUR_USE_ODBC;	
+	}
+
+	// crashes php...
+	function ServerInfo()
+	{
+	global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$row = $this->GetRow("execute sp_server_info 2");
+		$ADODB_FETCH_MODE = $save;
+		if (!is_array($row)) return false;
+		$arr['description'] = $row[2];
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+
+	function IfNull( $field, $ifNull ) 
+	{
+		return " ISNULL($field, $ifNull) "; // if MS SQL Server
+	}
+	
+	function _insertid()
+	{
+	// SCOPE_IDENTITY()
+	// Returns the last IDENTITY value inserted into an IDENTITY column in 
+	// the same scope. A scope is a module -- a stored procedure, trigger, 
+	// function, or batch. Thus, two statements are in the same scope if 
+	// they are in the same stored procedure, function, or batch.
+			return $this->GetOne($this->identitySQL);
+	}
+	
+	
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$table = $this->qstr(strtoupper($table));
+		
+		$sql = 
+"select object_name(constid) as constraint_name,
+	col_name(fkeyid, fkey) as column_name,
+	object_name(rkeyid) as referenced_table_name,
+   	col_name(rkeyid, rkey) as referenced_column_name
+from sysforeignkeys
+where upper(object_name(fkeyid)) = $table
+order by constraint_name, referenced_table_name, keyno";
+		
+		$constraints = $this->GetArray($sql);
+		
+		$ADODB_FETCH_MODE = $save;
+		
+		$arr = false;
+		foreach($constraints as $constr) {
+			//print_r($constr);
+			$arr[$constr[0]][$constr[2]][] = $constr[1].'='.$constr[3]; 
+		}
+		if (!$arr) return false;
+		
+		$arr2 = false;
+		
+		foreach($arr as $k => $v) {
+			foreach($v as $a => $b) {
+				if ($upper) $a = strtoupper($a);
+				$arr2[$a] = $b;
+			}
+		}
+		return $arr2;
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		if ($mask) {$this->debug=1;
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr($mask);
+			$this->metaTablesSQL .= " AND name like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	function MetaColumns($table, $normalize=true)
+	{
+		$arr = ADOConnection::MetaColumns($table);
+		return $arr;
+	}
+	
+	
+	function MetaIndexes($table,$primary=false, $owner=false)
+	{
+		$table = $this->qstr($table);
+
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
+			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND O.Name LIKE $table
+			ORDER BY O.name, I.Name, K.keyno";
+
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+        	$savem = $this->SetFetchMode(FALSE);
+        }
+        
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+        	$this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        if (!is_object($rs)) {
+        	return FALSE;
+        }
+
+		$indexes = array();
+		while ($row = $rs->FetchRow()) {
+			if (!$primary && $row[5]) continue;
+			
+            $indexes[$row[0]]['unique'] = $row[6];
+            $indexes[$row[0]]['columns'][] = $row[1];
+    	}
+        return $indexes;
+	}
+	
+	function _query($sql,$inputarr=false)
+	{
+		if (is_string($sql)) $sql = str_replace('||','+',$sql);
+		return ADODB_odbc::_query($sql,$inputarr);
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
+	// "Stein-Aksel Basma" 
+	// tested with MSSQL 2000
+	function MetaPrimaryKeys($table)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$schema = '';
+		$this->_findschema($table,$schema);
+		//if (!$schema) $schema = $this->database;
+		if ($schema) $schema = "and k.table_catalog like '$schema%'"; 
+	
+		$sql = "select distinct k.column_name,ordinal_position from information_schema.key_column_usage k,
+		information_schema.table_constraints tc 
+		where tc.constraint_name = k.constraint_name and tc.constraint_type =
+		'PRIMARY KEY' and k.table_name = '$table' $schema order by ordinal_position ";
+		
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		$a = $this->GetCol($sql);
+		$ADODB_FETCH_MODE = $savem;
+		
+		if ($a && sizeof($a)>0) return $a;
+		$false = false;
+		return $false;	  
+	}
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		if ($nrows > 0 && $offset <= 0) {
+			$sql = preg_replace(
+				'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop." $nrows ",$sql);
+			$rs = $this->Execute($sql,$inputarr);
+		} else
+			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			
+		return $rs;
+	}
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= '+';
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "datename(yyyy,$col)";
+				break;
+			case 'M':
+				$s .= "convert(char(3),$col,0)";
+				break;
+			case 'm':
+				$s .= "replace(str(month($col),2),' ','0')";
+				break;
+			case 'Q':
+			case 'q':
+				$s .= "datename(quarter,$col)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "replace(str(day($col),2),' ','0')";
+				break;
+			case 'h':
+				$s .= "substring(convert(char(14),$col,0),13,2)";
+				break;
+			
+			case 'H':
+				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
+				break;
+				
+			case 'i':
+				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
+				break;
+			case 's':
+				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
+				break;
+			case 'a':
+			case 'A':
+				$s .= "substring(convert(char(19),$col,0),18,2)";
+				break;
+				
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+				break;
+			}
+		}
+		return $s;
+	}
+
+} 
+ 
+class  ADORecordSet_odbc_mssql extends ADORecordSet_odbc {	
+	
+	var $databaseType = 'odbc_mssql';
+	
+	function ADORecordSet_odbc_mssql($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbc($id,$mode);
+	}	
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbc_oracle.inc.php b/adodb/drivers/adodb-odbc_oracle.inc.php
new file mode 100644
index 0000000..7c2c77f
--- /dev/null
+++ b/adodb/drivers/adodb-odbc_oracle.inc.php
@@ -0,0 +1,115 @@
+ADODB_odbc();
+	}
+		
+	function MetaTables() 
+	{
+		$false = false;
+		$rs = $this->Execute($this->metaTablesSQL);
+		if ($rs === false) return $false;
+		$arr = $rs->GetArray();
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			$arr2[] = $arr[$i][0];
+		}
+		$rs->Close();
+		return $arr2;
+	}
+	
+	function MetaColumns($table, $normalize=true) 
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+		if ($rs === false) {	
+			$false = false;
+			return $false;
+		}
+		$retarr = array();
+		while (!$rs->EOF) { //print_r($rs->fields);
+			$fld = new ADOFieldObject();
+			$fld->name = $rs->fields[0];
+			$fld->type = $rs->fields[1];
+			$fld->max_length = $rs->fields[2];
+			
+			
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[strtoupper($fld->name)] = $fld;
+			
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		return $retarr;	
+	}
+
+	// returns true or false
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+	
+		$php_errormsg = '';
+		$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
+		$this->_errorMsg = $php_errormsg;
+		
+		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+	global $php_errormsg;
+		$php_errormsg = '';
+		$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
+		$this->_errorMsg = $php_errormsg;
+		
+		$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+		//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
+		return $this->_connectionID != false;
+	}
+} 
+ 
+class  ADORecordSet_odbc_oracle extends ADORecordSet_odbc {	
+	
+	var $databaseType = 'odbc_oracle';
+	
+	function ADORecordSet_odbc_oracle($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbc($id,$mode);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-odbtp.inc.php b/adodb/drivers/adodb-odbtp.inc.php
new file mode 100644
index 0000000..2c7b124
--- /dev/null
+++ b/adodb/drivers/adodb-odbtp.inc.php
@@ -0,0 +1,839 @@
+
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+define("_ADODB_ODBTP_LAYER", 2 );
+
+class ADODB_odbtp extends ADOConnection{
+	var $databaseType = "odbtp";
+	var $dataProvider = "odbtp";
+	var $fmtDate = "'Y-m-d'";
+	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+	var $replaceQuote = "''"; // string to use to replace quotes
+	var $odbc_driver = 0;
+	var $hasAffectedRows = true;
+	var $hasInsertID = false;
+	var $hasGenID = true;
+	var $hasMoveFirst = true;
+
+	var $_genSeqSQL = "create table %s (seq_name char(30) not null unique , seq_value integer not null)";
+	var $_dropSeqSQL = "delete from adodb_seq where seq_name = '%s'";
+	var $_bindInputArray = false;
+	var $_useUnicodeSQL = false;
+	var $_canPrepareSP = false;
+	var $_dontPoolDBC = true;
+
+	function ADODB_odbtp()
+	{
+	}
+
+	function ServerInfo()
+	{
+		return array('description' => @odbtp_get_attr( ODB_ATTR_DBMSNAME, $this->_connectionID),
+		             'version' => @odbtp_get_attr( ODB_ATTR_DBMSVER, $this->_connectionID));
+	}
+
+	function ErrorMsg()
+	{
+		if ($this->_errorMsg !== false) return $this->_errorMsg;
+		if (empty($this->_connectionID)) return @odbtp_last_error();
+		return @odbtp_last_error($this->_connectionID);
+	}
+
+	function ErrorNo()
+	{
+		if ($this->_errorCode !== false) return $this->_errorCode;
+		if (empty($this->_connectionID)) return @odbtp_last_error_state();
+			return @odbtp_last_error_state($this->_connectionID);
+	}
+/*
+	function DBDate($d,$isfld=false)
+	{
+		if (empty($d) && $d !== 0) return 'null';
+		if ($isfld) return "convert(date, $d, 120)";
+		
+		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+		$d = adodb_date($this->fmtDate,$d);
+		return "convert(date, $d, 120)"; 
+	}
+	
+	function DBTimeStamp($d,$isfld=false)
+	{
+		if (empty($d) && $d !== 0) return 'null';
+		if ($isfld) return "convert(datetime, $d, 120)";
+		
+		if (is_string($d)) $d = ADORecordSet::UnixDate($d);
+		$d = adodb_date($this->fmtDate,$d);
+		return "convert(datetime, $d, 120)"; 
+	}
+*/
+	
+	function _insertid()
+	{
+	// SCOPE_IDENTITY()
+	// Returns the last IDENTITY value inserted into an IDENTITY column in
+	// the same scope. A scope is a module -- a stored procedure, trigger,
+	// function, or batch. Thus, two statements are in the same scope if
+	// they are in the same stored procedure, function, or batch.
+			return $this->GetOne($this->identitySQL);
+	}
+
+	function _affectedrows()
+	{
+		if ($this->_queryID) {
+			return @odbtp_affected_rows ($this->_queryID);
+	   } else
+		return 0;
+	}
+
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		//verify existence
+		$num = $this->GetOne("select seq_value from adodb_seq");
+		$seqtab='adodb_seq';
+		if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
+			$path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, $this->_connectionID );
+			//if using vfp dbc file
+			if( !strcasecmp(strrchr($path, '.'), '.dbc') )
+                $path = substr($path,0,strrpos($path,'\/'));
+           	$seqtab = $path . '/' . $seqtab;
+        }
+		if($num == false) {
+			if (empty($this->_genSeqSQL)) return false;
+			$ok = $this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
+		}
+		$num = $this->GetOne("select seq_value from adodb_seq where seq_name='$seqname'");
+		if ($num) {
+			return false;
+		}
+		$start -= 1;
+		return $this->Execute("insert into adodb_seq values('$seqname',$start)");
+	}
+
+	function DropSequence($seqname)
+	{
+		if (empty($this->_dropSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		$seqtab='adodb_seq';
+		if( $this->odbc_driver == ODB_DRIVER_FOXPRO) {
+			$path = @odbtp_get_attr( ODB_ATTR_DATABASENAME, $this->_connectionID );
+			//if using vfp dbc file
+			if( !strcasecmp(strrchr($path, '.'), '.dbc') )
+                $path = substr($path,0,strrpos($path,'\/'));
+           	$seqtab = $path . '/' . $seqtab;
+        }
+		$MAXLOOPS = 100;
+		while (--$MAXLOOPS>=0) {
+			$num = $this->GetOne("select seq_value from adodb_seq where seq_name='$seq'");
+			if ($num === false) {
+				//verify if abodb_seq table exist
+				$ok = $this->GetOne("select seq_value from adodb_seq ");
+				if(!$ok) {
+					//creating the sequence table adodb_seq
+					$this->Execute(sprintf($this->_genSeqSQL ,$seqtab));
+				}
+				$start -= 1;
+				$num = '0';
+				$ok = $this->Execute("insert into adodb_seq values('$seq',$start)");
+				if (!$ok) return false;
+			}
+			$ok = $this->Execute("update adodb_seq set seq_value=seq_value+1 where seq_name='$seq'");
+			if($ok) {
+				$num += 1;
+				$this->genID = $num;
+				return $num;
+			}
+		}
+	if ($fn = $this->raiseErrorFn) {
+		$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
+	}
+		return false;
+	}
+
+	//example for $UserOrDSN
+	//for visual fox : DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBF;SOURCEDB=c:\YourDbfFileDir;EXCLUSIVE=NO;
+	//for visual fox dbc: DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBC;SOURCEDB=c:\YourDbcFileDir\mydb.dbc;EXCLUSIVE=NO;
+	//for access : DRIVER={Microsoft Access Driver (*.mdb)};DBQ=c:\path_to_access_db\base_test.mdb;UID=root;PWD=;
+	//for mssql : DRIVER={SQL Server};SERVER=myserver;UID=myuid;PWD=mypwd;DATABASE=OdbtpTest;
+	//if uid & pwd can be separate
+    function _connect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
+	{
+		if ($argPassword && stripos($UserOrDSN,'DRIVER=') !== false) {
+			$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN.';PWD='.$argPassword);
+		} else
+			$this->_connectionID = odbtp_connect($HostOrInterface,$UserOrDSN,$argPassword,$argDatabase);
+		if ($this->_connectionID === false) {
+			$this->_errorMsg = $this->ErrorMsg() ;
+			return false;
+		}
+		
+		odbtp_convert_datetime($this->_connectionID,true);
+		
+		if ($this->_dontPoolDBC) {
+			if (function_exists('odbtp_dont_pool_dbc'))
+				@odbtp_dont_pool_dbc($this->_connectionID);
+		}
+		else {
+			$this->_dontPoolDBC = true;
+		}
+		$this->odbc_driver = @odbtp_get_attr(ODB_ATTR_DRIVER, $this->_connectionID);
+		$dbms = strtolower(@odbtp_get_attr(ODB_ATTR_DBMSNAME, $this->_connectionID));
+		$this->odbc_name = $dbms;
+		
+		// Account for inconsistent DBMS names
+		if( $this->odbc_driver == ODB_DRIVER_ORACLE )
+			$dbms = 'oracle';
+		else if( $this->odbc_driver == ODB_DRIVER_SYBASE )
+			$dbms = 'sybase';
+
+		// Set DBMS specific attributes
+		switch( $dbms ) {
+			case 'microsoft sql server':
+				$this->databaseType = 'odbtp_mssql';
+				$this->fmtDate = "'Y-m-d'";
+				$this->fmtTimeStamp = "'Y-m-d h:i:sA'";
+				$this->sysDate = 'convert(datetime,convert(char,GetDate(),102),102)';
+				$this->sysTimeStamp = 'GetDate()';
+				$this->ansiOuter = true;
+				$this->leftOuter = '*=';
+				$this->rightOuter = '=*';
+                $this->hasTop = 'top';
+				$this->hasInsertID = true;
+				$this->hasTransactions = true;
+				$this->_bindInputArray = true;
+				$this->_canSelectDb = true;
+				$this->substr = "substring";
+				$this->length = 'len';
+				$this->identitySQL = 'select SCOPE_IDENTITY()';
+				$this->metaDatabasesSQL = "select name from master..sysdatabases where name <> 'master'";
+				$this->_canPrepareSP = true;
+				break;
+			case 'access':
+				$this->databaseType = 'odbtp_access';
+				$this->fmtDate = "#Y-m-d#";
+				$this->fmtTimeStamp = "#Y-m-d h:i:sA#";
+				$this->sysDate = "FORMAT(NOW,'yyyy-mm-dd')";
+				$this->sysTimeStamp = 'NOW';
+                $this->hasTop = 'top';
+				$this->hasTransactions = false;
+				$this->_canPrepareSP = true;  // For MS Access only.
+				break;
+			case 'visual foxpro':
+				$this->databaseType = 'odbtp_vfp';
+				$this->fmtDate = "{^Y-m-d}";
+				$this->fmtTimeStamp = "{^Y-m-d, h:i:sA}";
+				$this->sysDate = 'date()';
+				$this->sysTimeStamp = 'datetime()';
+				$this->ansiOuter = true;
+                $this->hasTop = 'top';
+				$this->hasTransactions = false;
+				$this->replaceQuote = "'+chr(39)+'";
+				$this->true = '.T.';
+				$this->false = '.F.';
+
+				break;
+			case 'oracle':
+				$this->databaseType = 'odbtp_oci8';
+				$this->fmtDate = "'Y-m-d 00:00:00'";
+				$this->fmtTimeStamp = "'Y-m-d h:i:sA'";
+				$this->sysDate = 'TRUNC(SYSDATE)';
+				$this->sysTimeStamp = 'SYSDATE';
+				$this->hasTransactions = true;
+				$this->_bindInputArray = true;
+				$this->concat_operator = '||';
+				break;
+			case 'sybase':
+				$this->databaseType = 'odbtp_sybase';
+				$this->fmtDate = "'Y-m-d'";
+				$this->fmtTimeStamp = "'Y-m-d H:i:s'";
+				$this->sysDate = 'GetDate()';
+				$this->sysTimeStamp = 'GetDate()';
+				$this->leftOuter = '*=';
+				$this->rightOuter = '=*';
+				$this->hasInsertID = true;
+				$this->hasTransactions = true;
+				$this->identitySQL = 'select SCOPE_IDENTITY()';
+				break;
+			default:
+				$this->databaseType = 'odbtp';
+				if( @odbtp_get_attr(ODB_ATTR_TXNCAPABLE, $this->_connectionID) )
+					$this->hasTransactions = true;
+				else
+					$this->hasTransactions = false;
+		}
+        @odbtp_set_attr(ODB_ATTR_FULLCOLINFO, TRUE, $this->_connectionID );
+
+		if ($this->_useUnicodeSQL )
+			@odbtp_set_attr(ODB_ATTR_UNICODESQL, TRUE, $this->_connectionID);
+
+        return true;
+	}
+
+	function _pconnect($HostOrInterface, $UserOrDSN='', $argPassword='', $argDatabase='')
+	{
+		$this->_dontPoolDBC = false;
+  		return $this->_connect($HostOrInterface, $UserOrDSN, $argPassword, $argDatabase);
+	}
+
+	function SelectDB($dbName)
+	{
+		if (!@odbtp_select_db($dbName, $this->_connectionID)) {
+			return false;
+		}
+		$this->database = $dbName;
+		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+		return true;
+	}
+	
+	function MetaTables($ttype='',$showSchema=false,$mask=false)
+	{
+	global $ADODB_FETCH_MODE;
+
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
+		
+		$arr = $this->GetArray("||SQLTables||||$ttype");
+		
+		if (isset($savefm)) $this->SetFetchMode($savefm);
+		$ADODB_FETCH_MODE = $savem;
+
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][3] == 'SYSTEM TABLE' )	continue;
+			if ($arr[$i][2])
+				$arr2[] = $showSchema && $arr[$i][1]? $arr[$i][1].'.'.$arr[$i][2] : $arr[$i][2];
+		}
+		return $arr2;
+	}
+	
+	function MetaColumns($table,$upper=true)
+	{
+	global $ADODB_FETCH_MODE;
+
+		$schema = false;
+		$this->_findschema($table,$schema);
+		if ($upper) $table = strtoupper($table);
+
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savefm = $this->SetFetchMode(false);
+		
+		$rs = $this->Execute( "||SQLColumns||$schema|$table" );
+		
+		if (isset($savefm)) $this->SetFetchMode($savefm);
+		$ADODB_FETCH_MODE = $savem;
+
+		if (!$rs || $rs->EOF) {
+			$false = false;
+			return $false;
+		}
+		$retarr = array();
+		while (!$rs->EOF) {
+			//print_r($rs->fields);
+			if (strtoupper($rs->fields[2]) == $table) {
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->fields[3];
+				$fld->type = $rs->fields[5];
+				$fld->max_length = $rs->fields[6];
+    			$fld->not_null = !empty($rs->fields[9]);
+ 				$fld->scale = $rs->fields[7];
+				if (isset($rs->fields[12])) // vfp does not have field 12
+	 				if (!is_null($rs->fields[12])) {
+	 					$fld->has_default = true;
+	 					$fld->default_value = $rs->fields[12];
+					}
+				$retarr[strtoupper($fld->name)] = $fld;
+			} else if (!empty($retarr))
+				break;
+			$rs->MoveNext();
+		}
+		$rs->Close();
+
+		return $retarr;
+	}
+
+	function MetaPrimaryKeys($table, $owner='')
+	{
+	global $ADODB_FETCH_MODE;
+
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$arr = $this->GetArray("||SQLPrimaryKeys||$owner|$table");
+		$ADODB_FETCH_MODE = $savem;
+
+		//print_r($arr);
+		$arr2 = array();
+		for ($i=0; $i < sizeof($arr); $i++) {
+			if ($arr[$i][3]) $arr2[] = $arr[$i][3];
+		}
+		return $arr2;
+	}
+
+	function MetaForeignKeys($table, $owner='', $upper=false)
+	{
+	global $ADODB_FETCH_MODE;
+
+		$savem = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$constraints = $this->GetArray("||SQLForeignKeys|||||$owner|$table");
+		$ADODB_FETCH_MODE = $savem;
+
+		$arr = false;
+		foreach($constraints as $constr) {
+			//print_r($constr);
+			$arr[$constr[11]][$constr[2]][] = $constr[7].'='.$constr[3];
+		}
+		if (!$arr) {
+			$false = false;
+			return $false;
+		}
+		
+		$arr2 = array();
+
+		foreach($arr as $k => $v) {
+			foreach($v as $a => $b) {
+				if ($upper) $a = strtoupper($a);
+				$arr2[$a] = $b;
+			}
+		}
+		return $arr2;
+	}
+
+	function BeginTrans()
+	{
+		if (!$this->hasTransactions) return false;
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		$this->autoCommit = false;
+		if (defined('ODB_TXN_DEFAULT'))
+			$txn = ODB_TXN_DEFAULT;
+		else
+			$txn = ODB_TXN_READUNCOMMITTED;
+		$rs = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS,$txn,$this->_connectionID);
+		if(!$rs) return false;
+		return true;
+	}
+
+	function CommitTrans($ok=true)
+	{
+		if ($this->transOff) return true;
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->autoCommit = true;
+		if( ($ret = @odbtp_commit($this->_connectionID)) )
+			$ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, ODB_TXN_NONE, $this->_connectionID);//set transaction off
+		return $ret;
+	}
+
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->autoCommit = true;
+		if( ($ret = @odbtp_rollback($this->_connectionID)) )
+			$ret = @odbtp_set_attr(ODB_ATTR_TRANSACTIONS, ODB_TXN_NONE, $this->_connectionID);//set transaction off
+		return $ret;
+	}
+
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		// TOP requires ORDER BY for Visual FoxPro
+		if( $this->odbc_driver == ODB_DRIVER_FOXPRO ) {
+			if (!preg_match('/ORDER[ \t\r\n]+BY/is',$sql)) $sql .= ' ORDER BY 1';
+		}
+		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		return $ret;
+	}
+
+	function Prepare($sql)
+	{
+		if (! $this->_bindInputArray) return $sql; // no binding
+		
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+		
+		$stmt = @odbtp_prepare($sql,$this->_connectionID);
+		if (!$stmt) {
+		//	print "Prepare Error for ($sql) ".$this->ErrorMsg()."
    ";
+			return $sql;
+		}
+		return array($sql,$stmt,false);
+	}
+
+	function PrepareSP($sql)
+	{
+		if (!$this->_canPrepareSP) return $sql; // Can't prepare procedures
+
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+		
+		$stmt = @odbtp_prepare_proc($sql,$this->_connectionID);
+		if (!$stmt) return false;
+		return array($sql,$stmt);
+	}
+
+	/*
+	Usage:
+		$stmt = $db->PrepareSP('SP_RUNSOMETHING'); -- takes 2 params, @myid and @group
+
+		# note that the parameter does not have @ in front!
+		$db->Parameter($stmt,$id,'myid');
+		$db->Parameter($stmt,$group,'group',false,64);
+		$db->Parameter($stmt,$group,'photo',false,100000,ODB_BINARY);
+		$db->Execute($stmt);
+
+		@param $stmt Statement returned by Prepare() or PrepareSP().
+		@param $var PHP variable to bind to. Can set to null (for isNull support).
+		@param $name Name of stored procedure variable name to bind to.
+		@param [$isOutput] Indicates direction of parameter 0/false=IN  1=OUT  2= IN/OUT. This is ignored in odbtp.
+		@param [$maxLen] Holds an maximum length of the variable.
+		@param [$type] The data type of $var. Legal values depend on driver.
+
+		See odbtp_attach_param documentation at http://odbtp.sourceforge.net.
+	*/
+	function Parameter(&$stmt, &$var, $name, $isOutput=false, $maxLen=0, $type=0)
+	{
+		if ( $this->odbc_driver == ODB_DRIVER_JET ) {
+			$name = '['.$name.']';
+			if( !$type && $this->_useUnicodeSQL
+				&& @odbtp_param_bindtype($stmt[1], $name) == ODB_CHAR )
+			{
+				$type = ODB_WCHAR;
+			}
+		}
+		else {
+			$name = '@'.$name;
+		}
+		return @odbtp_attach_param($stmt[1], $name, $var, $type, $maxLen);
+	}
+
+	/*
+		Insert a null into the blob field of the table first.
+		Then use UpdateBlob to store the blob.
+
+		Usage:
+
+		$conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+		$conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+	*/
+
+	function UpdateBlob($table,$column,$val,$where,$blobtype='image')
+	{
+		$sql = "UPDATE $table SET $column = ? WHERE $where";
+		if( !($stmt = @odbtp_prepare($sql, $this->_connectionID)) )
+			return false;
+		if( !@odbtp_input( $stmt, 1, ODB_BINARY, 1000000, $blobtype ) )
+			return false;
+		if( !@odbtp_set( $stmt, 1, $val ) )
+			return false;
+		return @odbtp_execute( $stmt ) != false;
+	}
+
+	function MetaIndexes($table,$primary=false, $owner=false)
+	{
+		switch ( $this->odbc_driver) {
+			case ODB_DRIVER_MSSQL:
+				return $this->MetaIndexes_mssql($table, $primary);
+			default:
+				return array();
+		}
+	}
+	
+	function MetaIndexes_mssql($table,$primary=false, $owner = false)
+	{
+		$table = strtolower($this->qstr($table));
+
+		$sql = "SELECT i.name AS ind_name, C.name AS col_name, USER_NAME(O.uid) AS Owner, c.colid, k.Keyno, 
+			CASE WHEN I.indid BETWEEN 1 AND 254 AND (I.status & 2048 = 2048 OR I.Status = 16402 AND O.XType = 'V') THEN 1 ELSE 0 END AS IsPK,
+			CASE WHEN I.status & 2 = 2 THEN 1 ELSE 0 END AS IsUnique
+			FROM dbo.sysobjects o INNER JOIN dbo.sysindexes I ON o.id = i.id 
+			INNER JOIN dbo.sysindexkeys K ON I.id = K.id AND I.Indid = K.Indid 
+			INNER JOIN dbo.syscolumns c ON K.id = C.id AND K.colid = C.Colid
+			WHERE LEFT(i.name, 8) <> '_WA_Sys_' AND o.status >= 0 AND lower(O.Name) = $table
+			ORDER BY O.name, I.Name, K.keyno";
+
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+        	$savem = $this->SetFetchMode(FALSE);
+        }
+        
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+        	$this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        if (!is_object($rs)) {
+        	return FALSE;
+        }
+
+		$indexes = array();
+		while ($row = $rs->FetchRow()) {
+			if ($primary && !$row[5]) continue;
+			
+            $indexes[$row[0]]['unique'] = $row[6];
+            $indexes[$row[0]]['columns'][] = $row[1];
+    	}
+        return $indexes;
+	}
+	
+	function IfNull( $field, $ifNull )
+	{
+		switch( $this->odbc_driver ) {
+			case ODB_DRIVER_MSSQL:
+				return " ISNULL($field, $ifNull) ";
+			case ODB_DRIVER_JET:
+				return " IIF(IsNull($field), $ifNull, $field) ";
+		}
+		return " CASE WHEN $field is null THEN $ifNull ELSE $field END ";
+	}
+
+	function _query($sql,$inputarr=false)
+	{
+	global $php_errormsg;
+	
+        $this->_errorMsg = false;
+		$this->_errorCode = false;
+		
+ 		if ($inputarr) {
+			if (is_array($sql)) {
+				$stmtid = $sql[1];
+			} else {
+				$stmtid = @odbtp_prepare($sql,$this->_connectionID);
+				if ($stmtid == false) {
+					$this->_errorMsg = $php_errormsg;
+					return false;
+				}
+			}
+			$num_params = @odbtp_num_params( $stmtid );
+			/*
+			for( $param = 1; $param <= $num_params; $param++ ) {
+				@odbtp_input( $stmtid, $param );
+				@odbtp_set( $stmtid, $param, $inputarr[$param-1] );
+			}*/
+			
+			$param = 1;
+			foreach($inputarr as $v) {
+				@odbtp_input( $stmtid, $param );
+				@odbtp_set( $stmtid, $param, $v );
+				$param += 1;
+				if ($param > $num_params) break;
+			}
+			
+			if (!@odbtp_execute($stmtid) ) {
+				return false;
+			}
+		} else if (is_array($sql)) {
+			$stmtid = $sql[1];
+			if (!@odbtp_execute($stmtid)) {
+				return false;
+			}
+		} else {
+			$stmtid = odbtp_query($sql,$this->_connectionID);
+   		}
+		$this->_lastAffectedRows = 0;
+		if ($stmtid) {
+				$this->_lastAffectedRows = @odbtp_affected_rows($stmtid);
+		}
+        return $stmtid;
+	}
+
+	function _close()
+	{
+		$ret = @odbtp_close($this->_connectionID);
+		$this->_connectionID = false;
+		return $ret;
+	}
+}
+
+class ADORecordSet_odbtp extends ADORecordSet {
+
+	var $databaseType = 'odbtp';
+	var $canSeek = true;
+
+	function ADORecordSet_odbtp($queryID,$mode=false)
+	{
+		if ($mode === false) {
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		$this->ADORecordSet($queryID);
+	}
+
+	function _initrs()
+	{
+		$this->_numOfFields = @odbtp_num_fields($this->_queryID);
+		if (!($this->_numOfRows = @odbtp_num_rows($this->_queryID)))
+			$this->_numOfRows = -1;
+
+		if (!$this->connection->_useUnicodeSQL) return;
+
+		if ($this->connection->odbc_driver == ODB_DRIVER_JET) {
+			if (!@odbtp_get_attr(ODB_ATTR_MAPCHARTOWCHAR,
+			                     $this->connection->_connectionID))
+			{
+				for ($f = 0; $f < $this->_numOfFields; $f++) {
+					if (@odbtp_field_bindtype($this->_queryID, $f) == ODB_CHAR)
+						@odbtp_bind_field($this->_queryID, $f, ODB_WCHAR);
+				}
+			}
+		}
+	}
+
+	function FetchField($fieldOffset = 0)
+	{
+		$off=$fieldOffset; // offsets begin at 0
+		$o= new ADOFieldObject();
+		$o->name = @odbtp_field_name($this->_queryID,$off);
+		$o->type = @odbtp_field_type($this->_queryID,$off);
+        $o->max_length = @odbtp_field_length($this->_queryID,$off);
+		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+		return $o;
+	}
+
+	function _seek($row)
+	{
+		return @odbtp_data_seek($this->_queryID, $row);
+	}
+
+	function fields($colname)
+	{
+		if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname];
+
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$name = @odbtp_field_name( $this->_queryID, $i );
+				$this->bind[strtoupper($name)] = $i;
+			}
+		}
+		return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+	function _fetch_odbtp($type=0)
+	{
+		switch ($this->fetchMode) {
+			case ADODB_FETCH_NUM:
+				$this->fields = @odbtp_fetch_row($this->_queryID, $type);
+				break;
+			case ADODB_FETCH_ASSOC:
+				$this->fields = @odbtp_fetch_assoc($this->_queryID, $type);
+				break;
+            default:
+				$this->fields = @odbtp_fetch_array($this->_queryID, $type);
+		}
+		if ($this->databaseType = 'odbtp_vfp') {
+			if ($this->fields)
+			foreach($this->fields as $k => $v) {
+				if (strncmp($v,'1899-12-30',10) == 0) $this->fields[$k] = '';
+			}
+		}
+		return is_array($this->fields);
+	}
+
+	function _fetch()
+	{
+		return $this->_fetch_odbtp();
+	}
+
+	function MoveFirst()
+	{
+		if (!$this->_fetch_odbtp(ODB_FETCH_FIRST)) return false;
+		$this->EOF = false;
+		$this->_currentRow = 0;
+		return true;
+    }
+
+	function MoveLast()
+	{
+		if (!$this->_fetch_odbtp(ODB_FETCH_LAST)) return false;
+		$this->EOF = false;
+		$this->_currentRow = $this->_numOfRows - 1;
+		return true;
+	}
+
+	function NextRecordSet()
+	{
+		if (!@odbtp_next_result($this->_queryID)) return false;
+		$this->_inited = false;
+		$this->bind = false;
+		$this->_currentRow = -1;
+		$this->Init();
+		return true;
+	}
+
+	function _close()
+	{
+		return @odbtp_free_query($this->_queryID);
+	}
+}
+
+class ADORecordSet_odbtp_mssql extends ADORecordSet_odbtp {
+
+	var $databaseType = 'odbtp_mssql';
+
+	function ADORecordSet_odbtp_mssql($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbtp($id,$mode);
+	}
+}
+
+class ADORecordSet_odbtp_access extends ADORecordSet_odbtp {
+
+	var $databaseType = 'odbtp_access';
+
+	function ADORecordSet_odbtp_access($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbtp($id,$mode);
+	}
+}
+
+class ADORecordSet_odbtp_vfp extends ADORecordSet_odbtp {
+
+	var $databaseType = 'odbtp_vfp';
+
+	function ADORecordSet_odbtp_vfp($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbtp($id,$mode);
+	}
+}
+
+class ADORecordSet_odbtp_oci8 extends ADORecordSet_odbtp {
+
+	var $databaseType = 'odbtp_oci8';
+
+	function ADORecordSet_odbtp_oci8($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbtp($id,$mode);
+	}
+}
+
+class ADORecordSet_odbtp_sybase extends ADORecordSet_odbtp {
+
+	var $databaseType = 'odbtp_sybase';
+
+	function ADORecordSet_odbtp_sybase($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbtp($id,$mode);
+	}
+}
+?>
diff --git a/adodb/drivers/adodb-odbtp_unicode.inc.php b/adodb/drivers/adodb-odbtp_unicode.inc.php
new file mode 100644
index 0000000..e61cee7
--- /dev/null
+++ b/adodb/drivers/adodb-odbtp_unicode.inc.php
@@ -0,0 +1,39 @@
+
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+/*
+    Because the ODBTP server sends and reads UNICODE text data using UTF-8
+    encoding, the following HTML meta tag must be included within the HTML
+    head section of every HTML form and script page:
+
+    
+
+    Also, all SQL query strings must be submitted as UTF-8 encoded text.
+*/
+
+if (!defined('_ADODB_ODBTP_LAYER')) {
+	include(ADODB_DIR."/drivers/adodb-odbtp.inc.php");
+}
+
+class ADODB_odbtp_unicode extends ADODB_odbtp {
+	var $databaseType = 'odbtp';
+	var $_useUnicodeSQL = true;
+
+	function ADODB_odbtp_unicode()
+	{
+		$this->ADODB_odbtp();
+	}
+}
+?>
diff --git a/adodb/drivers/adodb-oracle.inc.php b/adodb/drivers/adodb-oracle.inc.php
new file mode 100644
index 0000000..fa18eee
--- /dev/null
+++ b/adodb/drivers/adodb-oracle.inc.php
@@ -0,0 +1,342 @@
+format($this->fmtDate);
+		else $ds = adodb_date($this->fmtDate,$d);
+		return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
+	}
+	
+	// format and return date string in database timestamp format
+	function DBTimeStamp($ts)
+	{
+
+		if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+		if (is_object($ts)) $ds = $ts->format($this->fmtDate);
+		else $ds = adodb_date($this->fmtTimeStamp,$ts);
+		return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
+	}
+	
+	
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+
+	
+	function BeginTrans()
+	{	  
+		 $this->autoCommit = false;
+		 ora_commitoff($this->_connectionID);
+		 return true;
+	}
+
+	
+	function CommitTrans($ok=true) 
+	{ 
+		   if (!$ok) return $this->RollbackTrans();
+		   $ret = ora_commit($this->_connectionID);
+		   ora_commiton($this->_connectionID);
+		   return $ret;
+	}
+
+	
+	function RollbackTrans()
+	{
+		$ret = ora_rollback($this->_connectionID);
+		ora_commiton($this->_connectionID);
+		return $ret;
+	}
+
+
+	/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
+	function ErrorMsg() 
+ 	{   
+        if ($this->_errorMsg !== false) return $this->_errorMsg;
+
+        if (is_resource($this->_curs)) $this->_errorMsg = @ora_error($this->_curs);
+ 		if (empty($this->_errorMsg)) $this->_errorMsg = @ora_error($this->_connectionID);
+		return $this->_errorMsg;
+	}
+
+ 
+	function ErrorNo() 
+	{
+		if ($this->_errorCode !== false) return $this->_errorCode;
+
+		if (is_resource($this->_curs)) $this->_errorCode = @ora_errorcode($this->_curs);
+		if (empty($this->_errorCode)) $this->_errorCode = @ora_errorcode($this->_connectionID);
+        return $this->_errorCode;
+	}
+
+	
+
+		// returns true or false
+		function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
+		{
+			if (!function_exists('ora_plogon')) return null;
+				
+            //  Reset error messages before connecting
+            $this->_errorMsg = false;
+		    $this->_errorCode = false;
+        
+            // G. Giunta 2003/08/13 - This looks danegrously suspicious: why should we want to set
+            // the oracle home to the host name of remote DB?
+//			if ($argHostname) putenv("ORACLE_HOME=$argHostname");
+
+			if($argHostname) { // code copied from version submitted for oci8 by Jorma Tuomainen 
+				if (empty($argDatabasename)) $argDatabasename = $argHostname;
+				else {
+					if(strpos($argHostname,":")) {
+						$argHostinfo=explode(":",$argHostname);
+						$argHostname=$argHostinfo[0];
+						$argHostport=$argHostinfo[1];
+					} else {
+						$argHostport="1521";
+					}
+
+
+					if ($this->connectSID) {
+						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+						.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
+					} else
+						$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
+						.")(PORT=$argHostport))(CONNECT_DATA=(SERVICE_NAME=$argDatabasename)))";
+				}
+
+			}
+
+			if ($argDatabasename) $argUsername .= "@$argDatabasename";
+
+		//if ($argHostname) print "
    Connect: 1st argument should be left blank for $this->databaseType
    ";
+			if ($mode == 1)
+				$this->_connectionID = ora_plogon($argUsername,$argPassword);
+			else
+				$this->_connectionID = ora_logon($argUsername,$argPassword);
+			if ($this->_connectionID === false) return false;
+			if ($this->autoCommit) ora_commiton($this->_connectionID);
+			if ($this->_initdate) {
+				$rs = $this->_query("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD'");
+				if ($rs) ora_close($rs);
+			}
+
+			return true;
+		}
+
+
+		// returns true or false
+		function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+		{
+			return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
+		}
+
+
+		// returns query ID if successful, otherwise false
+		function _query($sql,$inputarr=false)
+		{
+            //  Reset error messages before executing
+            $this->_errorMsg = false;
+		    $this->_errorCode = false;
+
+			$curs = ora_open($this->_connectionID);
+		 
+		 	if ($curs === false) return false;
+			$this->_curs = $curs;
+			if (!ora_parse($curs,$sql)) return false;
+			if (ora_exec($curs)) return $curs;
+            //  before we close the cursor, we have to store the error message
+            // that we can obtain ONLY from the cursor (and not from the connection)
+            $this->_errorCode = @ora_errorcode($curs);
+            $this->_errorMsg = @ora_error($curs);
+            //             
+		 	@ora_close($curs);
+			return false;
+		}
+
+
+		// returns true or false
+		function _close()
+		{
+			return @ora_logoff($this->_connectionID);
+		}
+
+
+
+}
+
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_oracle extends ADORecordSet {
+
+	var $databaseType = "oracle";
+	var $bind = false;
+
+	function ADORecordset_oracle($queryID,$mode=false)
+	{
+		
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->fetchMode = $mode;
+		
+		$this->_queryID = $queryID;
+	
+		$this->_inited = true;
+		$this->fields = array();
+		if ($queryID) {
+			$this->_currentRow = 0;
+			$this->EOF = !$this->_fetch();
+			@$this->_initrs();
+		} else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+		
+		return $this->_queryID;
+	}
+
+
+
+	   /*		Returns: an object containing field information.
+			   Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+			   fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+			   fetchField() is retrieved.		*/
+
+	   function FetchField($fieldOffset = -1)
+	   {
+			$fld = new ADOFieldObject;
+			$fld->name = ora_columnname($this->_queryID, $fieldOffset);
+			$fld->type = ora_columntype($this->_queryID, $fieldOffset);
+			$fld->max_length = ora_columnsize($this->_queryID, $fieldOffset);
+			return $fld;
+	   }
+
+	/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+   function _initrs()
+   {
+		   $this->_numOfRows = -1;
+		   $this->_numOfFields = @ora_numcols($this->_queryID);
+   }
+
+
+   function _seek($row)
+   {
+		   return false;
+   }
+
+   function _fetch($ignore_fields=false) {
+// should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
+		if ($this->fetchMode & ADODB_FETCH_ASSOC)
+			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
+   		else 
+			return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
+   }
+
+   /*		close() only needs to be called if you are worried about using too much memory while your script
+		   is running. All associated result memory for the specified result identifier will automatically be freed.		*/
+
+   function _close() 
+{
+		   return @ora_close($this->_queryID);
+   }
+
+	function MetaType($t,$len=-1)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		
+		switch (strtoupper($t)) {
+		case 'VARCHAR':
+		case 'VARCHAR2':
+		case 'CHAR':
+		case 'VARBINARY':
+		case 'BINARY':
+				if ($len <= $this->blobSize) return 'C';
+		case 'LONG':
+		case 'LONG VARCHAR':
+		case 'CLOB':
+		return 'X';
+		case 'LONG RAW':
+		case 'LONG VARBINARY':
+		case 'BLOB':
+				return 'B';
+		
+		case 'DATE': return 'D';
+		
+		//case 'T': return 'T';
+		
+		case 'BIT': return 'L';
+		case 'INT': 
+		case 'SMALLINT':
+		case 'INTEGER': return 'I';
+		default: return 'N';
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-pdo.inc.php b/adodb/drivers/adodb-pdo.inc.php
new file mode 100644
index 0000000..bc88507
--- /dev/null
+++ b/adodb/drivers/adodb-pdo.inc.php
@@ -0,0 +1,626 @@
+_driver;
+		$this->fmtDate = $d->fmtDate;
+		$this->fmtTimeStamp = $d->fmtTimeStamp;
+		$this->replaceQuote = $d->replaceQuote;
+		$this->sysDate = $d->sysDate;
+		$this->sysTimeStamp = $d->sysTimeStamp;
+		$this->random = $d->random;
+		$this->concat_operator = $d->concat_operator;
+		$this->nameQuote = $d->nameQuote;
+				
+		$this->hasGenID = $d->hasGenID;
+		$this->_genIDSQL = $d->_genIDSQL;
+		$this->_genSeqSQL = $d->_genSeqSQL;
+		$this->_dropSeqSQL = $d->_dropSeqSQL;
+
+		$d->_init($this);
+	}
+	
+	function Time()
+	{
+		if (!empty($this->_driver->_hasdual)) $sql = "select $this->sysTimeStamp from dual";
+		else $sql = "select $this->sysTimeStamp";
+		
+		$rs = $this->_Execute($sql);
+		if ($rs && !$rs->EOF) return $this->UnixTimeStamp(reset($rs->fields));
+		
+		return false;
+	}
+	
+	// returns true or false
+	function _connect($argDSN, $argUsername, $argPassword, $argDatabasename, $persist=false)
+	{
+		$at = strpos($argDSN,':');
+		$this->dsnType = substr($argDSN,0,$at);
+
+		if ($argDatabasename) {
+			$argDSN .= ';dbname='.$argDatabasename;
+		}
+		try {
+			$this->_connectionID = new PDO($argDSN, $argUsername, $argPassword);
+		} catch (Exception $e) {
+			$this->_connectionID = false;
+			$this->_errorno = -1;
+			//var_dump($e);
+			$this->_errormsg = 'Connection attempt failed: '.$e->getMessage();
+			return false;
+		}
+		
+		if ($this->_connectionID) {
+			switch(ADODB_ASSOC_CASE){
+			case 0: $m = PDO::CASE_LOWER; break;
+			case 1: $m = PDO::CASE_UPPER; break;
+			default:
+			case 2: $m = PDO::CASE_NATURAL; break;
+			}
+			
+			//$this->_connectionID->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_SILENT );
+			$this->_connectionID->setAttribute(PDO::ATTR_CASE,$m);
+			
+			$class = 'ADODB_pdo_'.$this->dsnType;
+			//$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
+			switch($this->dsnType) {
+			case 'oci':
+			case 'mysql':
+			case 'pgsql':
+			case 'mssql':
+			case 'sqlite':
+				include_once(ADODB_DIR.'/drivers/adodb-pdo_'.$this->dsnType.'.inc.php');
+				break;
+			}
+			if (class_exists($class))
+				$this->_driver = new $class();
+			else
+				$this->_driver = new ADODB_pdo_base();
+			
+			$this->_driver->_connectionID = $this->_connectionID;
+			$this->_UpdatePDO();
+			return true;
+		}
+		$this->_driver = new ADODB_pdo_base();
+		return false;
+	}
+	
+	function Concat() 
+	{
+		$args = func_get_args();
+		if(method_exists($this->_driver, 'Concat')) 
+			return call_user_func_array(array($this->_driver, 'Concat'), $args); 
+		
+		return call_user_func_array(array($this,'parent::Concat'), $args); 
+	}
+	
+	// returns true or false
+	function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
+	{
+		return $this->_connect($argDSN, $argUsername, $argPassword, $argDatabasename, true);
+	}
+	
+	/*------------------------------------------------------------------------------*/
+	
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	{	
+		$save = $this->_driver->fetchMode;
+		$this->_driver->fetchMode = $this->fetchMode;
+	 	$this->_driver->debug = $this->debug;
+		$ret = $this->_driver->SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		$this->_driver->fetchMode = $save;
+		return $ret;
+	}
+	
+	
+	function ServerInfo()
+	{
+		return $this->_driver->ServerInfo();
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
+		return $this->_driver->MetaTables($ttype,$showSchema,$mask);
+	}
+	
+	function MetaColumns($table,$normalize=true)
+	{
+		return $this->_driver->MetaColumns($table,$normalize);
+	}
+	
+	function InParameter(&$stmt,&$var,$name,$maxLen=4000,$type=false)
+	{
+		$obj = $stmt[1];
+		if ($type) $obj->bindParam($name,$var,$type,$maxLen);
+		else $obj->bindParam($name, $var);
+	}
+	
+	function OffsetDate($dayFraction,$date=false)
+    {   
+        return $this->_driver->OffsetDate($dayFraction,$date);
+    }
+	
+	function ErrorMsg()
+	{
+		if ($this->_errormsg !== false) return $this->_errormsg;
+		if (!empty($this->_stmt)) $arr = $this->_stmt->errorInfo();
+		else if (!empty($this->_connectionID)) $arr = $this->_connectionID->errorInfo();
+		else return 'No Connection Established';
+		
+		
+		if ($arr) {
+		 	if (sizeof($arr)<2) return '';
+			if ((integer)$arr[1]) return $arr[2];
+			else return '';
+		} else return '-1';
+	}
+	
+
+	function ErrorNo()
+	{
+		if ($this->_errorno !== false) return $this->_errorno;
+		if (!empty($this->_stmt)) $err = $this->_stmt->errorCode();
+		else if (!empty($this->_connectionID)) {
+			$arr = $this->_connectionID->errorInfo();
+			if (isset($arr[0])) $err = $arr[0];
+			else $err = -1;
+		} else
+			return 0;
+			
+		if ($err == '00000') return 0; // allows empty check
+		return $err;
+	}
+
+	function SetTransactionMode($transaction_mode) 
+	{
+		if(method_exists($this->_driver, 'SetTransactionMode')) 
+			return $this->_driver->SetTransactionMode($transaction_mode); 
+		
+		return parent::SetTransactionMode($seqname); 
+	}
+
+	function BeginTrans()
+	{	
+		if(method_exists($this->_driver, 'BeginTrans')) 
+			return $this->_driver->BeginTrans(); 
+		
+		if (!$this->hasTransactions) return false;
+		if ($this->transOff) return true; 
+		$this->transCnt += 1;
+		$this->_autocommit = false;
+		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,false);
+		return $this->_connectionID->beginTransaction();
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if(method_exists($this->_driver, 'CommitTrans')) 
+			return $this->_driver->CommitTrans($ok); 
+		
+		if (!$this->hasTransactions) return false;
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->_autocommit = true;
+		
+		$ret = $this->_connectionID->commit();
+		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		if(method_exists($this->_driver, 'RollbackTrans')) 
+			return $this->_driver->RollbackTrans(); 
+		
+		if (!$this->hasTransactions) return false;
+		if ($this->transOff) return true; 
+		if ($this->transCnt) $this->transCnt -= 1;
+		$this->_autocommit = true;
+		
+		$ret = $this->_connectionID->rollback();
+		$this->_connectionID->setAttribute(PDO::ATTR_AUTOCOMMIT,true);
+		return $ret;
+	}
+	
+	function Prepare($sql)
+	{
+		$this->_stmt = $this->_connectionID->prepare($sql);
+		if ($this->_stmt) return array($sql,$this->_stmt);
+		
+		return false;
+	}
+	
+	function PrepareStmt($sql)
+	{
+		$stmt = $this->_connectionID->prepare($sql);
+		if (!$stmt) return false;
+		$obj = new ADOPDOStatement($stmt,$this);
+		return $obj;
+	}
+	
+	function CreateSequence($seqname='adodbseq',$startID=1)
+	{
+		if(method_exists($this->_driver, 'CreateSequence')) 
+			return $this->_driver->CreateSequence($seqname, $startID); 
+		
+		return parent::CreateSequence($seqname, $startID); 
+	}
+	
+	function DropSequence($seqname='adodbseq')
+	{
+		if(method_exists($this->_driver, 'DropSequence')) 
+			return $this->_driver->DropSequence($seqname); 
+		
+		return parent::DropSequence($seqname); 
+	}
+
+	function GenID($seqname='adodbseq',$startID=1)
+	{
+		if(method_exists($this->_driver, 'GenID')) 
+			return $this->_driver->GenID($seqname, $startID); 
+		
+		return parent::GenID($seqname, $startID); 
+	}
+
+	
+	/* returns queryID or false */
+	function _query($sql,$inputarr=false) 
+	{
+		if (is_array($sql)) {
+			$stmt = $sql[1];
+		} else {
+			$stmt = $this->_connectionID->prepare($sql);
+		}
+		#adodb_backtrace();
+		#var_dump($this->_bindInputArray);
+		if ($stmt) {
+			$this->_driver->debug = $this->debug;
+			if ($inputarr) $ok = $stmt->execute($inputarr);
+			else $ok = $stmt->execute();
+		} 
+		
+		
+		$this->_errormsg = false;
+		$this->_errorno = false;
+			
+		if ($ok) {
+			$this->_stmt = $stmt;
+			return $stmt;
+		}
+		
+		if ($stmt) {
+			
+			$arr = $stmt->errorinfo();
+			if ((integer)$arr[1]) {
+				$this->_errormsg = $arr[2];
+				$this->_errorno = $arr[1];
+			}
+
+		} else {
+			$this->_errormsg = false;
+			$this->_errorno = false;
+		}
+		return false;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		$this->_stmt = false;
+		return true;
+	}
+
+	function _affectedrows()
+	{
+		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
+	}
+	
+	function _insertid()
+	{
+		return ($this->_connectionID) ? $this->_connectionID->lastInsertId() : 0;
+	}
+}
+
+class ADODB_pdo_base extends ADODB_pdo {
+
+	var $sysDate = "'?'";
+	var $sysTimeStamp = "'?'";
+	
+
+	function _init($parentDriver)
+	{
+		$parentDriver->_bindInputArray = true;
+		#$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
+	}
+	
+	function ServerInfo()
+	{
+		return ADOConnection::ServerInfo();
+	}
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
+		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		return $ret;
+	}
+	
+	function MetaTables()
+	{
+		return false;
+	}
+	
+	function MetaColumns()
+	{
+		return false;
+	}
+}
+
+class ADOPDOStatement {
+
+	var $databaseType = "pdo";		
+	var $dataProvider = "pdo";
+	var $_stmt;
+	var $_connectionID;
+	
+	function ADOPDOStatement($stmt,$connection)
+	{
+		$this->_stmt = $stmt;
+		$this->_connectionID = $connection;
+	}
+	
+	function Execute($inputArr=false)
+	{
+		$savestmt = $this->_connectionID->_stmt;
+		$rs = $this->_connectionID->Execute(array(false,$this->_stmt),$inputArr);
+		$this->_connectionID->_stmt = $savestmt;
+		return $rs;
+	}
+	
+	function InParameter(&$var,$name,$maxLen=4000,$type=false)
+	{
+
+		if ($type) $this->_stmt->bindParam($name,$var,$type,$maxLen);
+		else $this->_stmt->bindParam($name, $var);
+	}
+	
+	function Affected_Rows()
+	{
+		return ($this->_stmt) ? $this->_stmt->rowCount() : 0;
+	}
+	
+	function ErrorMsg()
+	{
+		if ($this->_stmt) $arr = $this->_stmt->errorInfo();
+		else $arr = $this->_connectionID->errorInfo();
+
+		if (is_array($arr)) {
+			if ((integer) $arr[0] && isset($arr[2])) return $arr[2];
+			else return '';
+		} else return '-1';
+	}
+	
+	function NumCols()
+	{
+		return ($this->_stmt) ? $this->_stmt->columnCount() : 0;
+	}
+	
+	function ErrorNo()
+	{
+		if ($this->_stmt) return $this->_stmt->errorCode();
+		else return $this->_connectionID->errorInfo();
+	}
+}
+
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_pdo extends ADORecordSet {	
+	
+	var $bind = false;
+	var $databaseType = "pdo";		
+	var $dataProvider = "pdo";
+	
+	function ADORecordSet_pdo($id,$mode=false)
+	{
+		if ($mode === false) {  
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		$this->adodbFetchMode = $mode;
+		switch($mode) {
+		case ADODB_FETCH_NUM: $mode = PDO::FETCH_NUM; break;
+		case ADODB_FETCH_ASSOC:  $mode = PDO::FETCH_ASSOC; break;
+		
+		case ADODB_FETCH_BOTH: 
+		default: $mode = PDO::FETCH_BOTH; break;
+		}
+		$this->fetchMode = $mode;
+		
+		$this->_queryID = $id;
+		$this->ADORecordSet($id);
+	}
+
+	
+	function Init()
+	{
+		if ($this->_inited) return;
+		$this->_inited = true;
+		if ($this->_queryID) @$this->_initrs();
+		else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+		}
+		if ($this->_numOfRows != 0 && $this->_currentRow == -1) {
+			$this->_currentRow = 0;
+			if ($this->EOF = ($this->_fetch() === false)) {
+				$this->_numOfRows = 0; // _numOfRows could be -1
+			}
+		} else {
+			$this->EOF = true;
+		}
+	}
+	
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+	
+		$this->_numOfRows = ($ADODB_COUNTRECS) ? @$this->_queryID->rowCount() : -1;
+		if (!$this->_numOfRows) $this->_numOfRows = -1;
+		$this->_numOfFields = $this->_queryID->columnCount();
+	}
+
+	// returns the field object
+	function FetchField($fieldOffset = -1) 
+	{
+		$off=$fieldOffset+1; // offsets begin at 1
+		
+		$o= new ADOFieldObject();
+		$arr = @$this->_queryID->getColumnMeta($fieldOffset);
+		if (!$arr) {
+			$o->name = 'bad getColumnMeta()';
+			$o->max_length = -1;
+			$o->type = 'VARCHAR';
+			$o->precision = 0;
+	#		$false = false;
+			return $o;
+		}
+		//adodb_pr($arr);
+		$o->name = $arr['name'];
+		if (isset($arr['native_type']) && $arr['native_type'] <> "null") $o->type = $arr['native_type'];
+		else $o->type = adodb_pdo_type($arr['pdo_type']);
+		$o->max_length = $arr['len'];
+		$o->precision = $arr['precision'];
+		
+		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
+		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
+		return $o;
+	}
+	
+	function _seek($row)
+	{
+		return false;
+	}
+	
+	function _fetch()
+	{
+		if (!$this->_queryID) return false;
+		
+		$this->fields = $this->_queryID->fetch($this->fetchMode);
+		return !empty($this->fields);
+	}
+	
+	function _close() 
+	{
+		$this->_queryID = false;
+	}
+	
+	function Fields($colname)
+	{
+		if ($this->adodbFetchMode != ADODB_FETCH_NUM) return @$this->fields[$colname];
+		
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-pdo_mssql.inc.php b/adodb/drivers/adodb-pdo_mssql.inc.php
new file mode 100644
index 0000000..5a7dd51
--- /dev/null
+++ b/adodb/drivers/adodb-pdo_mssql.inc.php
@@ -0,0 +1,61 @@
+hasTransactions = false; ## <<< BUG IN PDO mssql driver
+		$parentDriver->_bindInputArray = false;
+		$parentDriver->hasInsertID = true;
+	}
+	
+	function ServerInfo()
+	{
+		return ADOConnection::ServerInfo();
+	}
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
+	{
+		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		return $ret;
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		return false;
+	}
+	
+	function MetaColumns($table,$normalize=true)
+	{
+		return false;
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-pdo_mysql.inc.php b/adodb/drivers/adodb-pdo_mysql.inc.php
new file mode 100644
index 0000000..94b59fb
--- /dev/null
+++ b/adodb/drivers/adodb-pdo_mysql.inc.php
@@ -0,0 +1,182 @@
+hasTransactions = false;
+		#$parentDriver->_bindInputArray = false;
+		$parentDriver->hasInsertID = true;
+		$parentDriver->_connectionID->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY,true);
+	}
+	
+		// dayFraction is a day in floating point
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) $date = $this->sysDate;
+		
+		$fraction = $dayFraction * 24 * 3600;
+		return $date . ' + INTERVAL ' .	 $fraction.' SECOND';
+		
+//		return "from_unixtime(unix_timestamp($date)+$fraction)";
+	}
+	
+	function Concat() 
+	{	
+		$s = "";
+		$arr = func_get_args();
+
+		// suggestion by andrew005#mnogo.ru
+		$s = implode(',',$arr);
+		if (strlen($s) > 0) return "CONCAT($s)"; return ''; 
+	}
+	
+	function ServerInfo()
+	{
+		$arr['description'] = ADOConnection::GetOne("select version()");
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{	
+		$save = $this->metaTablesSQL;
+		if ($showSchema && is_string($showSchema)) {
+			$this->metaTablesSQL .= " from $showSchema";
+		}
+		
+		if ($mask) {
+			$mask = $this->qstr($mask);
+			$this->metaTablesSQL .= " like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		$this->metaTablesSQL = $save;
+		return $ret;
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+	}
+	
+ 	function MetaColumns($table,$normalize=true)
+	{
+		$this->_findschema($table,$schema);
+		if ($schema) {
+			$dbName = $this->database;
+			$this->SelectDB($schema);
+		}
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+		
+		if ($schema) {
+			$this->SelectDB($dbName);
+		}
+		
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		if (!is_object($rs)) {
+			$false = false;
+			return $false;
+		}
+			
+		$retarr = array();
+		while (!$rs->EOF){
+			$fld = new ADOFieldObject();
+			$fld->name = $rs->fields[0];
+			$type = $rs->fields[1];
+			
+			// split type into type(length):
+			$fld->scale = null;
+			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+				$fld->scale = is_numeric($query_array[3]) ? $query_array[3] : -1;
+			} elseif (preg_match("/^(.+)\((\d+)/", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$fld->max_length = is_numeric($query_array[2]) ? $query_array[2] : -1;
+			} elseif (preg_match("/^(enum)\((.*)\)$/i", $type, $query_array)) {
+				$fld->type = $query_array[1];
+				$arr = explode(",",$query_array[2]);
+				$fld->enums = $arr;
+				$zlen = max(array_map("strlen",$arr)) - 2; // PHP >= 4.0.6
+				$fld->max_length = ($zlen > 0) ? $zlen : 1;
+			} else {
+				$fld->type = $type;
+				$fld->max_length = -1;
+			}
+			$fld->not_null = ($rs->fields[2] != 'YES');
+			$fld->primary_key = ($rs->fields[3] == 'PRI');
+			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
+			$fld->binary = (strpos($type,'blob') !== false);
+			$fld->unsigned = (strpos($type,'unsigned') !== false);
+				
+			if (!$fld->binary) {
+				$d = $rs->fields[4];
+				if ($d != '' && $d != 'NULL') {
+					$fld->has_default = true;
+					$fld->default_value = $d;
+				} else {
+					$fld->has_default = false;
+				}
+			}
+			
+			if ($save == ADODB_FETCH_NUM) {
+				$retarr[] = $fld;
+			} else {
+				$retarr[strtoupper($fld->name)] = $fld;
+			}
+				$rs->MoveNext();
+			}
+		
+			$rs->Close();
+			return $retarr;	
+	}
+		
+	
+	// parameters use PostgreSQL convention, not MySQL
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
+	{
+		$offsetStr =($offset>=0) ? "$offset," : '';
+		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
+		if ($nrows < 0) $nrows = '18446744073709551615'; 
+		
+		if ($secs)
+			$rs = $this->CacheExecute($secs,$sql." LIMIT $offsetStr$nrows",$inputarr);
+		else
+			$rs = $this->Execute($sql." LIMIT $offsetStr$nrows",$inputarr);
+		return $rs;
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-pdo_oci.inc.php b/adodb/drivers/adodb-pdo_oci.inc.php
new file mode 100644
index 0000000..6e9dcc0
--- /dev/null
+++ b/adodb/drivers/adodb-pdo_oci.inc.php
@@ -0,0 +1,93 @@
+_bindInputArray = true;
+		$parentDriver->_nestedSQL = true;
+		if ($this->_initdate) {
+			$parentDriver->Execute("ALTER SESSION SET NLS_DATE_FORMAT='".$this->NLS_DATE_FORMAT."'");
+		}
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(strtoupper($mask));
+			$this->metaTablesSQL .= " AND table_name like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	function MetaColumns($table,$normalize=true)
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$false = false;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		
+		$rs = $this->Execute(sprintf($this->metaColumnsSQL,strtoupper($table)));
+		
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		if (!$rs) {
+			return $false;
+		}
+		$retarr = array();
+		while (!$rs->EOF) { //print_r($rs->fields);
+			$fld = new ADOFieldObject();
+	   		$fld->name = $rs->fields[0];
+	   		$fld->type = $rs->fields[1];
+	   		$fld->max_length = $rs->fields[2];
+			$fld->scale = $rs->fields[3];
+			if ($rs->fields[1] == 'NUMBER' && $rs->fields[3] == 0) {
+				$fld->type ='INT';
+	     		$fld->max_length = $rs->fields[4];
+	    	}	
+		   	$fld->not_null = (strncmp($rs->fields[5], 'NOT',3) === 0);
+			$fld->binary = (strpos($fld->type,'BLOB') !== false);
+			$fld->default_value = $rs->fields[6];
+			
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[strtoupper($fld->name)] = $fld;
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		if (empty($retarr))
+			return  $false;
+		else 
+			return $retarr;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-pdo_pgsql.inc.php b/adodb/drivers/adodb-pdo_pgsql.inc.php
new file mode 100644
index 0000000..5405dc3
--- /dev/null
+++ b/adodb/drivers/adodb-pdo_pgsql.inc.php
@@ -0,0 +1,230 @@
+ 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+
+	// used when schema defined
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
+ and c.relnamespace=n.oid and n.nspname='%s' 
+	and a.attname not like '....%%' AND a.attnum > 0 
+	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+	
+	// get primary key etc -- from Freek Dijkstra
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
+	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
+	
+	var $hasAffectedRows = true;
+	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	// below suggested by Freek Dijkstra 
+	var $true = 't';		// string that represents TRUE for a database
+	var $false = 'f';		// string that represents FALSE for a database
+	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
+	var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
+	var $hasMoveFirst = true;
+	var $hasGenID = true;
+	var $_genIDSQL = "SELECT NEXTVAL('%s')";
+	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
+	var $_dropSeqSQL = "DROP SEQUENCE %s";
+	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
+	var $random = 'random()';		/// random function
+	var $concat_operator='||';
+	
+	function _init($parentDriver)
+	{
+	
+		$parentDriver->hasTransactions = false; ## <<< BUG IN PDO pgsql driver
+		$parentDriver->hasInsertID = true;
+		$parentDriver->_nestedSQL = true;
+	}
+	
+	function ServerInfo()
+	{
+		$arr['description'] = ADOConnection::GetOne("select version()");
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		return $arr;
+	}
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	{
+		 $offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+		 $limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : '';
+		 if ($secs2cache)
+		  	$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		 else
+		  	$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+		
+		return $rs;
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		$info = $this->ServerInfo();
+		if ($info['version'] >= 7.3) {
+	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
+			  and schemaname  not in ( 'pg_catalog','information_schema')
+	union 
+        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
+		}
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(strtolower($mask));
+			if ($info['version']>=7.3)
+				$this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
+ union 
+select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
+			else
+				$this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask 
+ union 
+select viewname,'V' from pg_views where viewname like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	function MetaColumns($table,$normalize=true) 
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$schema = false;
+		$this->_findschema($table,$schema);
+		
+		if ($normalize) $table = strtolower($table);
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		
+		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
+		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if ($rs === false) {
+			$false = false;
+			return $false;
+		}
+		if (!empty($this->metaKeySQL)) {
+			// If we want the primary keys, we have to issue a separate query
+			// Of course, a modified version of the metaColumnsSQL query using a 
+			// LEFT JOIN would have been much more elegant, but postgres does 
+			// not support OUTER JOINS. So here is the clumsy way.
+			
+			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+			
+			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
+			// fetch all result in once for performance.
+			$keys = $rskey->GetArray();
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			
+			$rskey->Close();
+			unset($rskey);
+		}
+
+		$rsdefa = array();
+		if (!empty($this->metaDefaultsSQL)) {
+			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+			$sql = sprintf($this->metaDefaultsSQL, ($table));
+			$rsdef = $this->Execute($sql);
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			
+			if ($rsdef) {
+				while (!$rsdef->EOF) {
+					$num = $rsdef->fields['num'];
+					$s = $rsdef->fields['def'];
+					if (strpos($s,'::')===false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
+						$s = substr($s, 1);
+						$s = substr($s, 0, strlen($s) - 1);
+					}
+
+					$rsdefa[$num] = $s;
+					$rsdef->MoveNext();
+				}
+			} else {
+				ADOConnection::outp( "==> SQL => " . $sql);
+			}
+			unset($rsdef);
+		}
+	
+		$retarr = array();
+		while (!$rs->EOF) { 	
+			$fld = new ADOFieldObject();
+			$fld->name = $rs->fields[0];
+			$fld->type = $rs->fields[1];
+			$fld->max_length = $rs->fields[2];
+			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
+			if ($fld->max_length <= 0) $fld->max_length = -1;
+			if ($fld->type == 'numeric') {
+				$fld->scale = $fld->max_length & 0xFFFF;
+				$fld->max_length >>= 16;
+			}
+			// dannym
+			// 5 hasdefault; 6 num-of-column
+			$fld->has_default = ($rs->fields[5] == 't');
+			if ($fld->has_default) {
+				$fld->default_value = $rsdefa[$rs->fields[6]];
+			}
+
+			//Freek
+			if ($rs->fields[4] == $this->true) {
+				$fld->not_null = true;
+			}
+			
+			// Freek
+			if (is_array($keys)) {
+				foreach($keys as $key) {
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
+						$fld->primary_key = true;
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
+						$fld->unique = true; // What name is more compatible?
+				}
+			}
+			
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
+			
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		if (empty($retarr)) {
+			$false = false;
+			return $false;
+		} else return $retarr;	
+		
+	}
+
+}
+
+?>
diff --git a/adodb/drivers/adodb-pdo_sqlite.inc.php b/adodb/drivers/adodb-pdo_sqlite.inc.php
new file mode 100644
index 0000000..0306a05
--- /dev/null
+++ b/adodb/drivers/adodb-pdo_sqlite.inc.php
@@ -0,0 +1,203 @@
+pdoDriver = $parentDriver;
+		$parentDriver->_bindInputArray = true;
+		$parentDriver->hasTransactions = false; // // should be set to false because of PDO SQLite driver not supporting changing autocommit mode
+		$parentDriver->hasInsertID = true;
+	}
+
+	function ServerInfo()
+	{
+		$parent = $this->pdoDriver;
+		@($ver = array_pop($parent->GetCol("SELECT sqlite_version()")));
+		@($enc = array_pop($parent->GetCol("PRAGMA encoding")));
+
+		$arr['version']     = $ver;
+		$arr['description'] = 'SQLite ';
+		$arr['encoding']    = $enc;
+
+		return $arr;
+	}
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	{
+		$parent = $this->pdoDriver;
+		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
+	  	if ($secs2cache)
+	   		$rs = $parent->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+	  	else
+	   		$rs = $parent->Execute($sql."$limitStr$offsetStr",$inputarr);
+
+		return $rs;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		$parent = $this->pdoDriver;
+		// if you have to modify the parameter below, your database is overloaded,
+		// or you need to implement generation of id's yourself!
+		$MAXLOOPS = 100;
+		while (--$MAXLOOPS>=0) {
+			@($num = array_pop($parent->GetCol("SELECT id FROM {$seq}")));
+			if ($num === false || !is_numeric($num)) {
+				@$parent->Execute(sprintf($this->_genSeqSQL ,$seq));
+				$start -= 1;
+				$num = '0';
+				$cnt = $parent->GetOne(sprintf($this->_genSeqCountSQL,$seq));
+				if (!$cnt) {
+					$ok = $parent->Execute(sprintf($this->_genSeq2SQL,$seq,$start));
+				}
+				if (!$ok) return false;
+			}
+			$parent->Execute(sprintf($this->_genIDSQL,$seq,$num));
+
+			if ($parent->affected_rows() > 0) {
+                	        $num += 1;
+                		$parent->genID = intval($num);
+                		return intval($num);
+			}
+		}
+		if ($fn = $parent->raiseErrorFn) {
+			$fn($parent->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
+		}
+		return false;
+	}
+
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		$parent = $this->pdoDriver;
+		$ok = $parent->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		$start -= 1;
+		return $parent->Execute("insert into $seqname values($start)");
+	}
+
+	function SetTransactionMode($transaction_mode)
+	{
+		$parent = $this->pdoDriver;
+		$parent->_transmode = strtoupper($transaction_mode);
+	}
+
+	function BeginTrans()
+	{	
+		$parent = $this->pdoDriver;
+		if ($parent->transOff) return true; 
+		$parent->transCnt += 1;
+		$parent->_autocommit = false;
+		return $parent->Execute("BEGIN {$parent->_transmode}");
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		$parent = $this->pdoDriver;
+		if ($parent->transOff) return true; 
+		if (!$ok) return $parent->RollbackTrans();
+		if ($parent->transCnt) $parent->transCnt -= 1;
+		$parent->_autocommit = true;
+		
+		$ret = $parent->Execute('COMMIT');
+		return $ret;
+	}
+	
+	function RollbackTrans()
+	{
+		$parent = $this->pdoDriver;
+		if ($parent->transOff) return true; 
+		if ($parent->transCnt) $parent->transCnt -= 1;
+		$parent->_autocommit = true;
+		
+		$ret = $parent->Execute('ROLLBACK');
+		return $ret;
+	}
+
+
+    // mark newnham
+	function MetaColumns($tab,$normalize=true)
+	{
+	  global $ADODB_FETCH_MODE;
+
+	  $parent = $this->pdoDriver;
+	  $false = false;
+	  $save = $ADODB_FETCH_MODE;
+	  $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	  if ($parent->fetchMode !== false) $savem = $parent->SetFetchMode(false);
+	  $rs = $parent->Execute("PRAGMA table_info('$tab')");
+	  if (isset($savem)) $parent->SetFetchMode($savem);
+	  if (!$rs) {
+	    $ADODB_FETCH_MODE = $save; 
+	    return $false;
+	  }
+	  $arr = array();
+	  while ($r = $rs->FetchRow()) {
+	    $type = explode('(',$r['type']);
+	    $size = '';
+	    if (sizeof($type)==2)
+	    $size = trim($type[1],')');
+	    $fn = strtoupper($r['name']);
+	    $fld = new ADOFieldObject;
+	    $fld->name = $r['name'];
+	    $fld->type = $type[0];
+	    $fld->max_length = $size;
+	    $fld->not_null = $r['notnull'];
+	    $fld->primary_key = $r['pk'];
+	    $fld->default_value = $r['dflt_value'];
+	    $fld->scale = 0;
+	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
+	    else $arr[strtoupper($fld->name)] = $fld;
+	  }
+	  $rs->Close();
+	  $ADODB_FETCH_MODE = $save;
+	  return $arr;
+	}
+
+	function MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
+		$parent = $this->pdoDriver;
+		
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(strtoupper($mask));
+			$this->metaTablesSQL .= " AND name LIKE $mask";
+		}
+		
+		$ret = $parent->GetCol($this->metaTablesSQL);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+   }
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-postgres.inc.php b/adodb/drivers/adodb-postgres.inc.php
new file mode 100644
index 0000000..6f580ff
--- /dev/null
+++ b/adodb/drivers/adodb-postgres.inc.php
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/adodb/drivers/adodb-postgres64.inc.php b/adodb/drivers/adodb-postgres64.inc.php
new file mode 100644
index 0000000..8258149
--- /dev/null
+++ b/adodb/drivers/adodb-postgres64.inc.php
@@ -0,0 +1,1071 @@
+
+					jlim - changed concat operator to || and data types to MetaType to match documented pgsql types 
+		 	see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm  
+  22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" 
+  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" 
+  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk. 
+  31 Jan 2002 jlim - finally installed postgresql. testing
+  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
+  
+  See http://www.varlena.com/varlena/GeneralBits/47.php
+  
+	-- What indexes are on my table?
+	select * from pg_indexes where tablename = 'tablename';
+	
+	-- What triggers are on my table?
+	select c.relname as "Table", t.tgname as "Trigger Name", 
+	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
+	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
+	   p.proname as "Function Name"
+	from pg_trigger t, pg_class c, pg_class cc, pg_proc p
+	where t.tgfoid = p.oid and t.tgrelid = c.oid
+	   and t.tgconstrrelid = cc.oid
+	   and c.relname = 'tablename';
+	
+	-- What constraints are on my table?
+	select r.relname as "Table", c.conname as "Constraint Name",
+	   contype as "Constraint Type", conkey as "Key Columns",
+	   confkey as "Foreign Columns", consrc as "Source"
+	from pg_class r, pg_constraint c
+	where r.oid = c.conrelid
+	   and relname = 'tablename';
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+function adodb_addslashes($s)
+{
+	$len = strlen($s);
+	if ($len == 0) return "''";
+	if (strncmp($s,"'",1) === 0 && substr($s,$len-1) == "'") return $s; // already quoted
+	
+	return "'".addslashes($s)."'";
+}
+
+class ADODB_postgres64 extends ADOConnection{
+	var $databaseType = 'postgres64';
+	var $dataProvider = 'postgres';
+	var $hasInsertID = true;
+	var $_resultid = false;
+  	var $concat_operator='||';
+	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
+    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
+	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
+	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
+	union 
+        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
+	//"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
+	var $isoDates = true; // accepts dates in ISO format
+	var $sysDate = "CURRENT_DATE";
+	var $sysTimeStamp = "CURRENT_TIMESTAMP";
+	var $blobEncodeType = 'C';
+	var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
+		FROM pg_class c, pg_attribute a,pg_type t 
+		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
+AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+
+	// used when schema defined
+	var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
+ and c.relnamespace=n.oid and n.nspname='%s' 
+	and a.attname not like '....%%' AND a.attnum > 0 
+	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
+	
+	// get primary key etc -- from Freek Dijkstra
+	var $metaKeySQL = "SELECT ic.relname AS index_name, a.attname AS column_name,i.indisunique AS unique_key, i.indisprimary AS primary_key 
+	FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a WHERE bc.oid = i.indrelid AND ic.oid = i.indexrelid AND (i.indkey[0] = a.attnum OR i.indkey[1] = a.attnum OR i.indkey[2] = a.attnum OR i.indkey[3] = a.attnum OR i.indkey[4] = a.attnum OR i.indkey[5] = a.attnum OR i.indkey[6] = a.attnum OR i.indkey[7] = a.attnum) AND a.attrelid = bc.oid AND bc.relname = '%s'";
+	
+	var $hasAffectedRows = true;
+	var $hasLimit = false;	// set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
+	// below suggested by Freek Dijkstra 
+	var $true = 'TRUE';		// string that represents TRUE for a database
+	var $false = 'FALSE';		// string that represents FALSE for a database
+	var $fmtDate = "'Y-m-d'";	// used by DBDate() as the default date format used by the database
+	var $fmtTimeStamp = "'Y-m-d H:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
+	var $hasMoveFirst = true;
+	var $hasGenID = true;
+	var $_genIDSQL = "SELECT NEXTVAL('%s')";
+	var $_genSeqSQL = "CREATE SEQUENCE %s START %s";
+	var $_dropSeqSQL = "DROP SEQUENCE %s";
+	var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
+	var $random = 'random()';		/// random function
+	var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
+							// http://bugs.php.net/bug.php?id=25404
+	
+	var $uniqueIisR = true;
+	var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
+	var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
+	
+	// The last (fmtTimeStamp is not entirely correct: 
+	// PostgreSQL also has support for time zones, 
+	// and writes these time in this format: "2001-03-01 18:59:26+02". 
+	// There is no code for the "+02" time zone information, so I just left that out. 
+	// I'm not familiar enough with both ADODB as well as Postgres 
+	// to know what the concequences are. The other values are correct (wheren't in 0.94)
+	// -- Freek Dijkstra 
+
+	function ADODB_postgres64() 
+	{
+	// changes the metaColumnsSQL, adds columns: attnum[6]
+	}
+	
+	function ServerInfo()
+	{
+		if (isset($this->version)) return $this->version;
+		
+		$arr['description'] = $this->GetOne("select version()");
+		$arr['version'] = ADOConnection::_findvers($arr['description']);
+		$this->version = $arr;
+		return $arr;
+	}
+
+	function IfNull( $field, $ifNull ) 
+	{
+		return " coalesce($field, $ifNull) "; 
+	}
+
+	// get the last id - never tested
+	function pg_insert_id($tablename,$fieldname)
+	{
+		$result=pg_exec($this->_connectionID, "SELECT last_value FROM ${tablename}_${fieldname}_seq");
+		if ($result) {
+			$arr = @pg_fetch_row($result,0);
+			pg_freeresult($result);
+			if (isset($arr[0])) return $arr[0];
+		}
+		return false;
+	}
+	
+/* Warning from http://www.php.net/manual/function.pg-getlastoid.php:
+Using a OID as a unique identifier is not generally wise. 
+Unless you are very careful, you might end up with a tuple having 
+a different OID if a database must be reloaded. */
+	function _insertid($table,$column)
+	{
+		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
+		$oid = pg_getlastoid($this->_resultid);
+		// to really return the id, we need the table and column-name, else we can only return the oid != id
+		return empty($table) || empty($column) ? $oid : $this->GetOne("SELECT $column FROM $table WHERE oid=".(int)$oid);
+	}
+
+// I get this error with PHP before 4.0.6 - jlim
+// Warning: This compilation does not support pg_cmdtuples() in adodb-postgres.inc.php on line 44
+   function _affectedrows()
+   {
+   		if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
+	   	return pg_cmdtuples($this->_resultid);
+   }
+   
+	
+		// returns true/false
+	function BeginTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
+	}
+	
+	function RowLock($tables,$where,$col='1 as adodbignore') 
+	{
+		if (!$this->transCnt) $this->BeginTrans();
+		return $this->GetOne("select $col from $tables where $where for update");
+	}
+
+	// returns true/false. 
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true;
+		if (!$ok) return $this->RollbackTrans();
+		
+		$this->transCnt -= 1;
+		return @pg_Exec($this->_connectionID, "commit");
+	}
+	
+	// returns true/false
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt -= 1;
+		return @pg_Exec($this->_connectionID, "rollback");
+	}
+	
+	function MetaTables($ttype=false,$showSchema=false,$mask=false) 
+	{
+		$info = $this->ServerInfo();
+		if ($info['version'] >= 7.3) {
+	    	$this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
+			  and schemaname  not in ( 'pg_catalog','information_schema')
+	union 
+        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
+		}
+		if ($mask) {
+			$save = $this->metaTablesSQL;
+			$mask = $this->qstr(strtolower($mask));
+			if ($info['version']>=7.3)
+				$this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
+ union 
+select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
+			else
+				$this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask 
+ union 
+select viewname,'V' from pg_views where viewname like $mask";
+		}
+		$ret = ADOConnection::MetaTables($ttype,$showSchema);
+		
+		if ($mask) {
+			$this->metaTablesSQL = $save;
+		}
+		return $ret;
+	}
+	
+	
+	// if magic quotes disabled, use pg_escape_string()
+	function qstr($s,$magic_quotes=false)
+	{
+		if (is_bool($s)) return $s ? 'true' : 'false';
+		 
+		if (!$magic_quotes) {
+			if (ADODB_PHPVER >= 0x5200) {
+				return  "'".pg_escape_string($this->_connectionID,$s)."'";
+			} 
+			if (ADODB_PHPVER >= 0x4200) {
+				return  "'".pg_escape_string($s)."'";
+			}
+			if ($this->replaceQuote[0] == '\\'){
+				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
+			}
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+		}
+		
+		// undo magic quotes for "
+		$s = str_replace('\\"','"',$s);
+		return "'$s'";
+	}
+	
+	
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+		if (!$col) $col = $this->sysTimeStamp;
+		$s = 'TO_CHAR('.$col.",'";
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= 'YYYY';
+				break;
+			case 'Q':
+			case 'q':
+				$s .= 'Q';
+				break;
+				
+			case 'M':
+				$s .= 'Mon';
+				break;
+				
+			case 'm':
+				$s .= 'MM';
+				break;
+			case 'D':
+			case 'd':
+				$s .= 'DD';
+				break;
+			
+			case 'H':
+				$s.= 'HH24';
+				break;
+				
+			case 'h':
+				$s .= 'HH';
+				break;
+				
+			case 'i':
+				$s .= 'MI';
+				break;
+			
+			case 's':
+				$s .= 'SS';
+				break;
+			
+			case 'a':
+			case 'A':
+				$s .= 'AM';
+				break;
+				
+			case 'w':
+				$s .= 'D';
+				break;
+			
+			case 'l':
+				$s .= 'DAY';
+				break;
+			
+			 case 'W':
+				$s .= 'WW';
+				break;
+
+			default:
+			// handle escape characters...
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+				else $s .= '"'.$ch.'"';
+				
+			}
+		}
+		return $s. "')";
+	}
+	
+	
+	
+	/* 
+	* Load a Large Object from a file 
+	* - the procedure stores the object id in the table and imports the object using 
+	* postgres proprietary blob handling routines 
+	*
+	* contributed by Mattia Rossi mattia@technologist.com
+	* modified for safe mode by juraj chlebec
+	*/ 
+	function UpdateBlobFile($table,$column,$path,$where,$blobtype='BLOB') 
+	{ 
+		pg_exec ($this->_connectionID, "begin"); 
+		
+		$fd = fopen($path,'r');
+		$contents = fread($fd,filesize($path));
+		fclose($fd);
+		
+		$oid = pg_lo_create($this->_connectionID);
+		$handle = pg_lo_open($this->_connectionID, $oid, 'w');
+		pg_lo_write($handle, $contents);
+		pg_lo_close($handle);
+		
+		// $oid = pg_lo_import ($path); 
+		pg_exec($this->_connectionID, "commit"); 
+		$rs = ADOConnection::UpdateBlob($table,$column,$oid,$where,$blobtype); 
+		$rez = !empty($rs); 
+		return $rez; 
+	} 
+	
+	/*
+	* Deletes/Unlinks a Blob from the database, otherwise it 
+	* will be left behind
+	*
+	* Returns TRUE on success or FALSE on failure.
+	*
+	* contributed by Todd Rogers todd#windfox.net
+	*/
+	function BlobDelete( $blob )
+	{
+		pg_exec ($this->_connectionID, "begin");
+		$result = @pg_lo_unlink($blob);
+		pg_exec ($this->_connectionID, "commit");
+		return( $result );
+	}
+
+	/*
+		Hueristic - not guaranteed to work.
+	*/
+	function GuessOID($oid)
+	{
+		if (strlen($oid)>16) return false;
+		return is_numeric($oid);
+	}
+	
+	/* 
+	* If an OID is detected, then we use pg_lo_* to open the oid file and read the
+	* real blob from the db using the oid supplied as a parameter. If you are storing
+	* blobs using bytea, we autodetect and process it so this function is not needed.
+	*
+	* contributed by Mattia Rossi mattia@technologist.com
+	*
+	* see http://www.postgresql.org/idocs/index.php?largeobjects.html
+	*
+	* Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
+	* added maxsize parameter, which defaults to $db->maxblobsize if not defined.
+	*/ 
+	function BlobDecode($blob,$maxsize=false,$hastrans=true) 
+	{
+		if (!$this->GuessOID($blob)) return $blob;
+		
+		if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
+		$fd = @pg_lo_open($this->_connectionID,$blob,"r");
+		if ($fd === false) {
+			if ($hastrans) @pg_exec($this->_connectionID,"commit");
+			return $blob;
+		}
+		if (!$maxsize) $maxsize = $this->maxblobsize;
+		$realblob = @pg_loread($fd,$maxsize); 
+		@pg_loclose($fd); 
+		if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
+		return $realblob;
+	}
+	
+	/* 
+		See http://www.postgresql.org/idocs/index.php?datatype-binary.html
+	 	
+		NOTE: SQL string literals (input strings) must be preceded with two backslashes 
+		due to the fact that they must pass through two parsers in the PostgreSQL 
+		backend.
+	*/
+	function BlobEncode($blob)
+	{
+		if (ADODB_PHPVER >= 0x5200) return pg_escape_bytea($this->_connectionID, $blob);
+		if (ADODB_PHPVER >= 0x4200) return pg_escape_bytea($blob);
+		
+		/*92=backslash, 0=null, 39=single-quote*/
+		$badch = array(chr(92),chr(0),chr(39)); # \  null  '
+		$fixch = array('\\\\134','\\\\000','\\\\047');
+		return adodb_str_replace($badch,$fixch,$blob);
+		
+		// note that there is a pg_escape_bytea function only for php 4.2.0 or later
+	}
+	
+	// assumes bytea for blob, and varchar for clob
+	function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
+	{
+	
+		if ($blobtype == 'CLOB') {
+    		return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
+		}
+		// do not use bind params which uses qstr(), as blobencode() already quotes data
+		return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
+	}
+	
+	function OffsetDate($dayFraction,$date=false)
+	{		
+		if (!$date) $date = $this->sysDate;
+		else if (strncmp($date,"'",1) == 0) {
+			$len = strlen($date);
+			if (10 <= $len && $len <= 12) $date = 'date '.$date;
+			else $date = 'timestamp '.$date;
+		}
+		
+		
+		return "($date+interval'".($dayFraction * 1440)." minutes')";
+		#return "($date+interval'$dayFraction days')";
+	}
+	
+
+	// for schema support, pass in the $table param "$schema.$tabname".
+	// converts field names to lowercase, $upper is ignored
+	// see http://phplens.com/lens/lensforum/msgs.php?id=14018 for more info
+	function MetaColumns($table,$normalize=true) 
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$schema = false;
+		$false = false;
+		$this->_findschema($table,$schema);
+		
+		if ($normalize) $table = strtolower($table);
+
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+		
+		if ($schema) $rs = $this->Execute(sprintf($this->metaColumnsSQL1,$table,$table,$schema));
+		else $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table,$table));
+		if (isset($savem)) $this->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if ($rs === false) {
+			return $false;
+		}
+		if (!empty($this->metaKeySQL)) {
+			// If we want the primary keys, we have to issue a separate query
+			// Of course, a modified version of the metaColumnsSQL query using a 
+			// LEFT JOIN would have been much more elegant, but postgres does 
+			// not support OUTER JOINS. So here is the clumsy way.
+			
+			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+			
+			$rskey = $this->Execute(sprintf($this->metaKeySQL,($table)));
+			// fetch all result in once for performance.
+			$keys = $rskey->GetArray();
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			
+			$rskey->Close();
+			unset($rskey);
+		}
+
+		$rsdefa = array();
+		if (!empty($this->metaDefaultsSQL)) {
+			$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+			$sql = sprintf($this->metaDefaultsSQL, ($table));
+			$rsdef = $this->Execute($sql);
+			if (isset($savem)) $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+			
+			if ($rsdef) {
+				while (!$rsdef->EOF) {
+					$num = $rsdef->fields['num'];
+					$s = $rsdef->fields['def'];
+					if (strpos($s,'::')===false && substr($s, 0, 1) == "'") { /* quoted strings hack... for now... fixme */
+						$s = substr($s, 1);
+						$s = substr($s, 0, strlen($s) - 1);
+					}
+
+					$rsdefa[$num] = $s;
+					$rsdef->MoveNext();
+				}
+			} else {
+				ADOConnection::outp( "==> SQL => " . $sql);
+			}
+			unset($rsdef);
+		}
+	
+		$retarr = array();
+		while (!$rs->EOF) { 	
+			$fld = new ADOFieldObject();
+			$fld->name = $rs->fields[0];
+			$fld->type = $rs->fields[1];
+			$fld->max_length = $rs->fields[2];
+			$fld->attnum = $rs->fields[6];
+			
+			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
+			if ($fld->max_length <= 0) $fld->max_length = -1;
+			if ($fld->type == 'numeric') {
+				$fld->scale = $fld->max_length & 0xFFFF;
+				$fld->max_length >>= 16;
+			}
+			// dannym
+			// 5 hasdefault; 6 num-of-column
+			$fld->has_default = ($rs->fields[5] == 't');
+			if ($fld->has_default) {
+				$fld->default_value = $rsdefa[$rs->fields[6]];
+			}
+
+			//Freek
+			$fld->not_null = $rs->fields[4] == 't';
+			
+			
+			// Freek
+			if (is_array($keys)) {
+				foreach($keys as $key) {
+					if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't') 
+						$fld->primary_key = true;
+					if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't') 
+						$fld->unique = true; // What name is more compatible?
+				}
+			}
+			
+			if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;	
+			else $retarr[($normalize) ? strtoupper($fld->name) : $fld->name] = $fld;
+			
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		if (empty($retarr))
+			return  $false;
+		else
+			return $retarr;	
+		
+	}
+
+	  function MetaIndexes ($table, $primary = FALSE, $owner = false)
+      {
+         global $ADODB_FETCH_MODE;
+                
+				$schema = false;
+				$this->_findschema($table,$schema);
+
+				if ($schema) { // requires pgsql 7.3+ - pg_namespace used.
+					$sql = '
+SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns" 
+FROM pg_catalog.pg_class c 
+JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid 
+JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+	,pg_namespace n 
+WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\'';
+				} else {
+	                $sql = '
+SELECT c.relname as "Name", i.indisunique as "Unique", i.indkey as "Columns"
+FROM pg_catalog.pg_class c
+JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
+JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
+WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
+    			}
+				            
+                if ($primary == FALSE) {
+                	$sql .= ' AND i.indisprimary=false;';
+                }
+                
+                $save = $ADODB_FETCH_MODE;
+                $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+                if ($this->fetchMode !== FALSE) {
+                        $savem = $this->SetFetchMode(FALSE);
+                }
+                
+                $rs = $this->Execute(sprintf($sql,$table,$table,$schema));
+                if (isset($savem)) {
+                        $this->SetFetchMode($savem);
+                }
+                $ADODB_FETCH_MODE = $save;
+
+                if (!is_object($rs)) {
+                	$false = false;
+					return $false;
+                }
+				
+                $col_names = $this->MetaColumnNames($table,true,true); 
+				//3rd param is use attnum, 
+				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
+                $indexes = array();
+                while ($row = $rs->FetchRow()) {
+                        $columns = array();
+                        foreach (explode(' ', $row[2]) as $col) {
+                                $columns[] = $col_names[$col];
+                        }
+                        
+                        $indexes[$row[0]] = array(
+                                'unique' => ($row[1] == 't'),
+                                'columns' => $columns
+                        );
+                }
+                return $indexes;
+        }
+
+	// returns true or false
+	//
+	// examples:
+	// 	$db->Connect("host=host1 user=user1 password=secret port=4341");
+	// 	$db->Connect('host1','user1','secret');
+	function _connect($str,$user='',$pwd='',$db='',$ctype=0)
+	{
+		
+		if (!function_exists('pg_connect')) return null;
+		
+		$this->_errorMsg = false;
+		
+		if ($user || $pwd || $db) {
+			$user = adodb_addslashes($user);
+			$pwd = adodb_addslashes($pwd);
+			if (strlen($db) == 0) $db = 'template1';
+			$db = adodb_addslashes($db);
+		   	if ($str)  {
+			 	$host = explode(":", $str);
+				if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
+				else $str = '';
+				if (isset($host[1])) $str .= " port=$host[1]";
+				else if (!empty($this->port)) $str .= " port=".$this->port;
+			}
+		   		if ($user) $str .= " user=".$user;
+		   		if ($pwd)  $str .= " password=".$pwd;
+				if ($db)   $str .= " dbname=".$db;
+		}
+
+		//if ($user) $linea = "user=$user host=$linea password=$pwd dbname=$db port=5432";
+		
+		if ($ctype === 1) { // persistent
+			$this->_connectionID = pg_pconnect($str);
+		} else {
+			if ($ctype === -1) { // nconnect, we trick pgsql ext by changing the connection str
+			static $ncnt;
+			
+				if (empty($ncnt)) $ncnt = 1;
+				else $ncnt += 1;
+				
+				$str .= str_repeat(' ',$ncnt);
+			}
+			$this->_connectionID = pg_connect($str);
+		}
+		if ($this->_connectionID === false) return false;
+		$this->Execute("set datestyle='ISO'");
+		
+		$info = $this->ServerInfo();
+		$this->pgVersion = (float) substr($info['version'],0,3);
+		if ($this->pgVersion >= 7.1) { // good till version 999
+			$this->_nestedSQL = true;
+		}
+		return true;
+	}
+	
+	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
+	{
+	 	return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName,-1);
+	}
+	 
+	// returns true or false
+	//
+	// examples:
+	// 	$db->PConnect("host=host1 user=user1 password=secret port=4341");
+	// 	$db->PConnect('host1','user1','secret');
+	function _pconnect($str,$user='',$pwd='',$db='')
+	{
+		return $this->_connect($str,$user,$pwd,$db,1);
+	}
+	
+
+	// returns queryID or false
+	function _query($sql,$inputarr=false)
+	{
+		$this->_errorMsg = false;
+		if ($inputarr) {
+		/*
+			It appears that PREPARE/EXECUTE is slower for many queries.
+			
+			For query executed 1000 times:
+			"select id,firstname,lastname from adoxyz 
+				where firstname not like ? and lastname not like ? and id = ?"
+				
+			with plan = 1.51861286163 secs
+			no plan =   1.26903700829 secs
+
+			
+
+		*/
+			$plan = 'P'.md5($sql);
+				
+			$execp = '';
+			foreach($inputarr as $v) {
+				if ($execp) $execp .= ',';
+				if (is_string($v)) {
+					if (strncmp($v,"'",1) !== 0) $execp .= $this->qstr($v);
+				} else {
+					$execp .= $v;
+				}
+			}
+			
+			if ($execp) $exsql = "EXECUTE $plan ($execp)";
+			else $exsql = "EXECUTE $plan";
+			
+			
+			$rez = @pg_exec($this->_connectionID,$exsql);
+			if (!$rez) {
+			# Perhaps plan does not exist? Prepare/compile plan.
+				$params = '';
+				foreach($inputarr as $v) {
+					if ($params) $params .= ',';
+					if (is_string($v)) {
+						$params .= 'VARCHAR';
+					} else if (is_integer($v)) {
+						$params .= 'INTEGER';
+					} else {
+						$params .= "REAL";
+					}
+				}
+				$sqlarr = explode('?',$sql);
+				//print_r($sqlarr);
+				$sql = '';
+				$i = 1;
+				foreach($sqlarr as $v) {
+					$sql .= $v.' $'.$i;
+					$i++;
+				}
+				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
+				//adodb_pr($s);
+				$rez = pg_exec($this->_connectionID,$s);
+				//echo $this->ErrorMsg();
+			}
+			if ($rez)
+				$rez = pg_exec($this->_connectionID,$exsql);
+		} else {
+			//adodb_backtrace();
+			$rez = pg_exec($this->_connectionID,$sql);
+		}
+		// check if no data returned, then no need to create real recordset
+		if ($rez && pg_numfields($rez) <= 0) {
+			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
+				pg_freeresult($this->_resultid);
+			}
+			$this->_resultid = $rez;
+			return true;
+		}
+		
+		return $rez;
+	}
+	
+	function _errconnect()
+	{
+		if (defined('DB_ERROR_CONNECT_FAILED')) return DB_ERROR_CONNECT_FAILED;
+		else return 'Database connection failed';
+	}
+
+	/*	Returns: the last error message from previous database operation	*/	
+	function ErrorMsg() 
+	{
+		if ($this->_errorMsg !== false) return $this->_errorMsg;
+		if (ADODB_PHPVER >= 0x4300) {
+			if (!empty($this->_resultid)) {
+				$this->_errorMsg = @pg_result_error($this->_resultid);
+				if ($this->_errorMsg) return $this->_errorMsg;
+			}
+			
+			if (!empty($this->_connectionID)) {
+				$this->_errorMsg = @pg_last_error($this->_connectionID);
+			} else $this->_errorMsg = $this->_errconnect();
+		} else {
+			if (empty($this->_connectionID)) $this->_errconnect();
+			else $this->_errorMsg = @pg_errormessage($this->_connectionID);
+		}
+		return $this->_errorMsg;
+	}
+	
+	function ErrorNo()
+	{
+		$e = $this->ErrorMsg();
+		if (strlen($e)) {
+			return ADOConnection::MetaError($e);
+		 }
+		 return 0;
+	}
+
+	// returns true or false
+	function _close()
+	{
+		if ($this->transCnt) $this->RollbackTrans();
+		if ($this->_resultid) {
+			@pg_freeresult($this->_resultid);
+			$this->_resultid = false;
+		}
+		@pg_close($this->_connectionID);
+		$this->_connectionID = false;
+		return true;
+	}
+	
+	
+	/*
+	* Maximum size of C field
+	*/
+	function CharMax()
+	{
+		return 1000000000;  // should be 1 Gb?
+	}
+	
+	/*
+	* Maximum size of X field
+	*/
+	function TextMax()
+	{
+		return 1000000000; // should be 1 Gb?
+	}
+	
+		
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres64 extends ADORecordSet{
+	var $_blobArr;
+	var $databaseType = "postgres64";
+	var $canSeek = true;
+	function ADORecordSet_postgres64($queryID,$mode=false) 
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch ($mode)
+		{
+		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+		
+		case ADODB_FETCH_DEFAULT:
+		case ADODB_FETCH_BOTH:
+		default: $this->fetchMode = PGSQL_BOTH; break;
+		}
+		$this->adodbFetchMode = $mode;
+		$this->ADORecordSet($queryID);
+	}
+	
+	function GetRowAssoc($upper=true)
+	{
+		if ($this->fetchMode == PGSQL_ASSOC && !$upper) return $this->fields;
+		$row = ADORecordSet::GetRowAssoc($upper);
+		return $row;
+	}
+
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$qid = $this->_queryID;
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @pg_numrows($qid):-1;
+		$this->_numOfFields = @pg_numfields($qid);
+		
+		// cache types for blob decode check
+		// apparently pg_fieldtype actually performs an sql query on the database to get the type.
+		if (empty($this->connection->noBlobs))
+		for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
+			if (pg_fieldtype($qid,$i) == 'bytea') {
+				$this->_blobArr[$i] = pg_fieldname($qid,$i);
+			}
+		}
+	}
+
+		/* Use associative array to get fields array */
+	function Fields($colname)
+	{
+		if ($this->fetchMode != PGSQL_NUM) return @$this->fields[$colname];
+		
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+
+	function FetchField($off = 0) 
+	{
+		// offsets begin at 0
+		
+		$o= new ADOFieldObject();
+		$o->name = @pg_fieldname($this->_queryID,$off);
+		$o->type = @pg_fieldtype($this->_queryID,$off);
+		$o->max_length = @pg_fieldsize($this->_queryID,$off);
+		return $o;	
+	}
+
+	function _seek($row)
+	{
+		return @pg_fetch_row($this->_queryID,$row);
+	}
+	
+	function _decode($blob)
+	{
+		if ($blob === NULL) return NULL;
+		eval('$realblob="'.adodb_str_replace(array('"','$'),array('\"','\$'),$blob).'";');
+		return $realblob;	
+	}
+	
+	function _fixblobs()
+	{
+		if ($this->fetchMode == PGSQL_NUM || $this->fetchMode == PGSQL_BOTH) {
+			foreach($this->_blobArr as $k => $v) {
+				$this->fields[$k] = ADORecordSet_postgres64::_decode($this->fields[$k]);
+			}
+		}
+		if ($this->fetchMode == PGSQL_ASSOC || $this->fetchMode == PGSQL_BOTH) {
+			foreach($this->_blobArr as $k => $v) {
+				$this->fields[$v] = ADORecordSet_postgres64::_decode($this->fields[$v]);
+			}
+		}
+	}
+	
+	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
+				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+				if (is_array($this->fields) && $this->fields) {
+					if (isset($this->_blobArr)) $this->_fixblobs();
+					return true;
+				}
+			}
+			$this->fields = false;
+			$this->EOF = true;
+		}
+		return false;
+	}		
+	
+	function _fetch()
+	{
+				
+		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
+        	return false;
+
+		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+		
+		if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+			
+		return (is_array($this->fields));
+	}
+
+	function _close() 
+	{ 
+		return @pg_freeresult($this->_queryID);
+	}
+
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+				case 'MONEY': // stupid, postgres expects money to be a string
+				case 'INTERVAL':
+				case 'CHAR':
+				case 'CHARACTER':
+				case 'VARCHAR':
+				case 'NAME':
+		   		case 'BPCHAR':
+				case '_VARCHAR':
+				case 'INET':
+				case 'MACADDR':
+					if ($len <= $this->blobSize) return 'C';
+				
+				case 'TEXT':
+					return 'X';
+		
+				case 'IMAGE': // user defined type
+				case 'BLOB': // user defined type
+				case 'BIT':	// This is a bit string, not a single bit, so don't return 'L'
+				case 'VARBIT':
+				case 'BYTEA':
+					return 'B';
+				
+				case 'BOOL':
+				case 'BOOLEAN':
+					return 'L';
+				
+				case 'DATE':
+					return 'D';
+				
+				
+				case 'TIMESTAMP WITHOUT TIME ZONE':
+				case 'TIME':
+				case 'DATETIME':
+				case 'TIMESTAMP':
+				case 'TIMESTAMPTZ':
+					return 'T';
+				
+				case 'SMALLINT': 
+				case 'BIGINT': 
+				case 'INTEGER': 
+				case 'INT8': 
+				case 'INT4':
+				case 'INT2':
+					if (isset($fieldobj) &&
+				empty($fieldobj->primary_key) && (!$this->connection->uniqueIisR || empty($fieldobj->unique))) return 'I';
+				
+				case 'OID':
+				case 'SERIAL':
+					return 'R';
+				
+				 default:
+				 	return 'N';
+			}
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-postgres7.inc.php b/adodb/drivers/adodb-postgres7.inc.php
new file mode 100644
index 0000000..eecfdc3
--- /dev/null
+++ b/adodb/drivers/adodb-postgres7.inc.php
@@ -0,0 +1,313 @@
+ADODB_postgres64();
+		if (ADODB_ASSOC_CASE !== 2) {
+			$this->rsPrefix .= 'assoc_';
+		}
+		$this->_bindInputArray = PHP_VERSION >= 5.1;
+	}
+
+	
+	// the following should be compat with postgresql 7.2, 
+	// which makes obsolete the LIMIT limit,offset syntax
+	 function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	 {
+		 $offsetStr = ($offset >= 0) ? " OFFSET ".((integer)$offset) : '';
+		 $limitStr  = ($nrows >= 0)  ? " LIMIT ".((integer)$nrows) : '';
+		 if ($secs2cache)
+		  	$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+		 else
+		  	$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+		
+		return $rs;
+	 }
+ 	/*
+ 	function Prepare($sql)
+	{
+		$info = $this->ServerInfo();
+		if ($info['version']>=7.3) {
+			return array($sql,false);
+		}
+		return $sql;
+	}
+ 	*/
+
+	/*
+		I discovered that the MetaForeignKeys method no longer worked for Postgres 8.3.
+		I went ahead and modified it to work for both 8.2 and 8.3. 
+		Please feel free to include this change in your next release of adodb.
+		 William Kolodny [William.Kolodny#gt-t.net]
+	*/
+	function MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+	  $sql="
+	  SELECT fum.ftblname AS lookup_table, split_part(fum.rf, ')'::text, 1) AS lookup_field,
+	     fum.ltable AS dep_table, split_part(fum.lf, ')'::text, 1) AS dep_field
+	  FROM (
+	  SELECT fee.ltable, fee.ftblname, fee.consrc, split_part(fee.consrc,'('::text, 2) AS lf, 
+	    split_part(fee.consrc, '('::text, 3) AS rf
+	  FROM (
+	      SELECT foo.relname AS ltable, foo.ftblname,
+	          pg_get_constraintdef(foo.oid) AS consrc
+	      FROM (
+	          SELECT c.oid, c.conname AS name, t.relname, ft.relname AS ftblname
+	          FROM pg_constraint c 
+	          JOIN pg_class t ON (t.oid = c.conrelid) 
+	          JOIN pg_class ft ON (ft.oid = c.confrelid)
+	          JOIN pg_namespace nft ON (nft.oid = ft.relnamespace)
+	          LEFT JOIN pg_description ds ON (ds.objoid = c.oid)
+	          JOIN pg_namespace n ON (n.oid = t.relnamespace)
+	          WHERE c.contype = 'f'::\"char\"
+	          ORDER BY t.relname, n.nspname, c.conname, c.oid
+	          ) foo
+	      ) fee) fum
+	  WHERE fum.ltable='".strtolower($table)."'
+	  ORDER BY fum.ftblname, fum.ltable, split_part(fum.lf, ')'::text, 1)
+	  ";
+	  $rs = $this->Execute($sql);
+	
+	  if (!$rs || $rs->EOF) return false;
+	
+	  $a = array();
+	  while (!$rs->EOF) {
+	    if ($upper) {
+	      $a[strtoupper($rs->Fields('lookup_table'))][] = strtoupper(str_replace('"','',$rs->Fields('dep_field').'='.$rs->Fields('lookup_field')));
+	    } else {
+	      $a[$rs->Fields('lookup_table')][] = str_replace('"','',$rs->Fields('dep_field').'='.$rs->Fields('lookup_field'));
+	    }
+		$rs->MoveNext();
+	  }
+	
+	  return $a;
+	
+	}
+	
+	// from  Edward Jaramilla, improved version - works on pg 7.4
+	function _old_MetaForeignKeys($table, $owner=false, $upper=false)
+	{
+		$sql = 'SELECT t.tgargs as args
+		FROM
+		pg_trigger t,pg_class c,pg_proc p
+		WHERE
+		t.tgenabled AND
+		t.tgrelid = c.oid AND
+		t.tgfoid = p.oid AND
+		p.proname = \'RI_FKey_check_ins\' AND
+		c.relname = \''.strtolower($table).'\'
+		ORDER BY
+			t.tgrelid';
+		
+		$rs = $this->Execute($sql);
+		
+		if (!$rs || $rs->EOF) return false;
+		
+		$arr = $rs->GetArray();
+		$a = array();
+		foreach($arr as $v) {
+			$data = explode(chr(0), $v['args']);
+			$size = count($data)-1; //-1 because the last node is empty
+			for($i = 4; $i < $size; $i++) {
+				if ($upper) 
+					$a[strtoupper($data[2])][] = strtoupper($data[$i].'='.$data[++$i]);
+				else 
+					$a[$data[2]][] = $data[$i].'='.$data[++$i];
+			}
+		}
+		return $a;
+	}
+
+	function _query($sql,$inputarr=false)
+	{
+		if (! $this->_bindInputArray) {
+			// We don't have native support for parameterized queries, so let's emulate it at the parent
+			return ADODB_postgres64::_query($sql, $inputarr);
+		}
+		$this->_errorMsg = false;
+		// -- added Cristiano da Cunha Duarte
+		if ($inputarr) {
+			$sqlarr = explode('?',trim($sql));
+			$sql = '';
+			$i = 1;
+			$last = sizeof($sqlarr)-1;
+			foreach($sqlarr as $v) {
+				if ($last < $i) $sql .= $v;
+				else $sql .= $v.' $'.$i;
+				$i++;
+			}
+			
+			$rez = pg_query_params($this->_connectionID,$sql, $inputarr);
+		} else {
+			$rez = pg_query($this->_connectionID,$sql);
+		}
+		// check if no data returned, then no need to create real recordset
+		if ($rez && pg_numfields($rez) <= 0) {
+			if (is_resource($this->_resultid) && get_resource_type($this->_resultid) === 'pgsql result') {
+				pg_freeresult($this->_resultid);
+			}
+			$this->_resultid = $rez;
+			return true;
+		}		
+		return $rez;
+	}
+	
+ 	 // this is a set of functions for managing client encoding - very important if the encodings
+	// of your database and your output target (i.e. HTML) don't match
+	//for instance, you may have UNICODE database and server it on-site as WIN1251 etc.
+	// GetCharSet - get the name of the character set the client is using now
+	// the functions should work with Postgres 7.0 and above, the set of charsets supported
+	// depends on compile flags of postgres distribution - if no charsets were compiled into the server
+	// it will return 'SQL_ANSI' always
+	function GetCharSet()
+	{
+		//we will use ADO's builtin property charSet
+		$this->charSet = @pg_client_encoding($this->_connectionID);
+		if (!$this->charSet) {
+			return false;
+		} else {
+			return $this->charSet;
+		}
+	}
+	
+	// SetCharSet - switch the client encoding
+	function SetCharSet($charset_name)
+	{
+		$this->GetCharSet();
+		if ($this->charSet !== $charset_name) {
+			$if = pg_set_client_encoding($this->_connectionID, $charset_name);
+			if ($if == "0" & $this->GetCharSet() == $charset_name) {
+				return true;
+			} else return false;
+		} else return true;
+	}
+
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordSet_postgres7 extends ADORecordSet_postgres64{
+
+	var $databaseType = "postgres7";
+	
+	
+	function ADORecordSet_postgres7($queryID,$mode=false) 
+	{
+		$this->ADORecordSet_postgres64($queryID,$mode);
+	}
+	
+	 	// 10% speedup to move MoveNext to child class
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
+				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+			
+				if (is_array($this->fields)) {
+					if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+					return true;
+				}
+			}
+			$this->fields = false;
+			$this->EOF = true;
+		}
+		return false;
+	}		
+
+}
+
+class ADORecordSet_assoc_postgres7 extends ADORecordSet_postgres64{
+
+	var $databaseType = "postgres7";
+	
+	
+	function ADORecordSet_assoc_postgres7($queryID,$mode=false) 
+	{
+		$this->ADORecordSet_postgres64($queryID,$mode);
+	}
+	
+	function _fetch()
+	{
+		if ($this->_currentRow >= $this->_numOfRows && $this->_numOfRows >= 0)
+        	return false;
+
+		$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+		
+		if ($this->fields) {
+			if (isset($this->_blobArr)) $this->_fixblobs();
+			$this->_updatefields();
+		}
+			
+		return (is_array($this->fields));
+	}
+	
+		// Create associative array
+	function _updatefields()
+	{
+		if (ADODB_ASSOC_CASE == 2) return; // native
+	
+		$arr = array();
+		$lowercase = (ADODB_ASSOC_CASE == 0);
+		
+		foreach($this->fields as $k => $v) {
+			if (is_integer($k)) $arr[$k] = $v;
+			else {
+				if ($lowercase)
+					$arr[strtolower($k)] = $v;
+				else
+					$arr[strtoupper($k)] = $v;
+			}
+		}
+		$this->fields = $arr;
+	}
+	
+	function MoveNext() 
+	{
+		if (!$this->EOF) {
+			$this->_currentRow++;
+			if ($this->_numOfRows < 0 || $this->_numOfRows > $this->_currentRow) {
+				$this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
+			
+				if (is_array($this->fields)) {
+					if ($this->fields) {
+						if (isset($this->_blobArr)) $this->_fixblobs();
+					
+						$this->_updatefields();
+					}
+					return true;
+				}
+			}
+			
+			
+			$this->fields = false;
+			$this->EOF = true;
+		}
+		return false;
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-postgres8.inc.php b/adodb/drivers/adodb-postgres8.inc.php
new file mode 100644
index 0000000..3134e3c
--- /dev/null
+++ b/adodb/drivers/adodb-postgres8.inc.php
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/adodb/drivers/adodb-proxy.inc.php b/adodb/drivers/adodb-proxy.inc.php
new file mode 100644
index 0000000..a7292b8
--- /dev/null
+++ b/adodb/drivers/adodb-proxy.inc.php
@@ -0,0 +1,33 @@
+ADORecordset($id,$mode);
+		}
+	};
+} // define
+	
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-sapdb.inc.php b/adodb/drivers/adodb-sapdb.inc.php
new file mode 100644
index 0000000..8a4bf9a
--- /dev/null
+++ b/adodb/drivers/adodb-sapdb.inc.php
@@ -0,0 +1,184 @@
+curmode = SQL_CUR_USE_ODBC;
+		$this->ADODB_odbc();
+	}
+	
+	function ServerInfo()
+	{
+		$info = ADODB_odbc::ServerInfo();
+		if (!$info['version'] && preg_match('/([0-9.]+)/',$info['description'],$matches)) {
+			$info['version'] = $matches[1];
+		}
+		return $info;
+	}
+
+	function MetaPrimaryKeys($table)
+	{
+		$table = $this->Quote(strtoupper($table));
+
+		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos");
+	}
+		
+ 	function MetaIndexes ($table, $primary = FALSE, $owner = false)
+	{
+		$table = $this->Quote(strtoupper($table));
+
+		$sql = "SELECT INDEXNAME,TYPE,COLUMNNAME FROM INDEXCOLUMNS ".
+			" WHERE TABLENAME=$table".
+			" ORDER BY INDEXNAME,COLUMNNO";
+
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+        	$savem = $this->SetFetchMode(FALSE);
+        }
+        
+        $rs = $this->Execute($sql);
+        if (isset($savem)) {
+        	$this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+        if (!is_object($rs)) {
+        	return FALSE;
+        }
+
+		$indexes = array();
+		while ($row = $rs->FetchRow()) {
+            $indexes[$row[0]]['unique'] = $row[1] == 'UNIQUE';
+            $indexes[$row[0]]['columns'][] = $row[2];
+    	}
+		if ($primary) {
+			$indexes['SYSPRIMARYKEYINDEX'] = array(
+					'unique' => True,	// by definition
+					'columns' => $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table AND mode='KEY' ORDER BY pos"),
+				);
+		}
+        return $indexes;
+	}
+	
+ 	function MetaColumns ($table)
+	{
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+        	$savem = $this->SetFetchMode(FALSE);
+        }
+		$table = $this->Quote(strtoupper($table));
+		
+		$retarr = array();
+		foreach($this->GetAll("SELECT COLUMNNAME,DATATYPE,LEN,DEC,NULLABLE,MODE,\"DEFAULT\",CASE WHEN \"DEFAULT\" IS NULL THEN 0 ELSE 1 END AS HAS_DEFAULT FROM COLUMNS WHERE tablename=$table ORDER BY pos") as $column)
+		{
+			$fld = new ADOFieldObject();
+			$fld->name = $column[0];
+			$fld->type = $column[1];
+			$fld->max_length = $fld->type == 'LONG' ? 2147483647 : $column[2];
+			$fld->scale = $column[3];
+			$fld->not_null = $column[4] == 'NO';
+			$fld->primary_key = $column[5] == 'KEY';
+			if ($fld->has_default = $column[7]) {
+				if ($fld->primary_key && $column[6] == 'DEFAULT SERIAL (1)') {
+					$fld->auto_increment = true;
+					$fld->has_default = false;
+				} else {
+					$fld->default_value = $column[6];
+					switch($fld->type) {
+						case 'VARCHAR':
+						case 'CHARACTER':
+						case 'LONG':
+							$fld->default_value = $column[6];
+							break;
+						default:
+							$fld->default_value = trim($column[6]);
+							break;
+					}
+				}
+			}
+			$retarr[$fld->name] = $fld;	
+		}
+        if (isset($savem)) {
+        	$this->SetFetchMode($savem);
+        }
+        $ADODB_FETCH_MODE = $save;
+
+		return $retarr;
+	}
+	
+	function MetaColumnNames($table)
+	{
+		$table = $this->Quote(strtoupper($table));
+
+		return $this->GetCol("SELECT columnname FROM COLUMNS WHERE tablename=$table ORDER BY pos");
+	}
+	
+	// unlike it seems, this depends on the db-session and works in a multiuser environment
+	function _insertid($table,$column)
+	{
+		return empty($table) ? False : $this->GetOne("SELECT $table.CURRVAL FROM DUAL");
+	}
+
+	/*
+		SelectLimit implementation problems:
+	
+	 	The following will return random 10 rows as order by performed after "WHERE rowno<10"
+	 	which is not ideal...
+		
+	  		select * from table where rowno < 10 order by 1
+	  
+	  	This means that we have to use the adoconnection base class SelectLimit when
+	  	there is an "order by".
+		
+		See http://listserv.sap.com/pipermail/sapdb.general/2002-January/010405.html
+	 */
+	
+};
+ 
+
+class  ADORecordSet_sapdb extends ADORecordSet_odbc {	
+	
+	var $databaseType = "sapdb";		
+	
+	function ADORecordSet_sapdb($id,$mode=false)
+	{
+		$this->ADORecordSet_odbc($id,$mode);
+	}
+}
+
+} //define
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-sqlanywhere.inc.php b/adodb/drivers/adodb-sqlanywhere.inc.php
new file mode 100644
index 0000000..3933d85
--- /dev/null
+++ b/adodb/drivers/adodb-sqlanywhere.inc.php
@@ -0,0 +1,169 @@
+create_blobvar($blobVarName);
+
+	  b) load blob var from file.  $filename must be complete path
+
+	  $dbcon->load_blobvar_from_file($blobVarName, $filename);
+
+	  c) Use the $blobVarName in SQL insert or update statement in the values
+	  clause:
+
+		$recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, blobcol) '
+		.
+	   'VALUES (\'test\', ' . $blobVarName . ')');
+
+	 instead of loading blob from a file, you can also load from 
+	  an unformatted (raw) blob variable:
+	  $dbcon->load_blobvar_from_var($blobVarName, $varName);
+
+	  d) drop blob variable on db server to free up resources:
+	  $dbconn->drop_blobvar($blobVarName);
+
+  Sybase_SQLAnywhere data driver. Requires ODBC.
+
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+if (!defined('_ADODB_ODBC_LAYER')) {
+ include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
+}
+
+if (!defined('ADODB_SYBASE_SQLANYWHERE')){
+
+ define('ADODB_SYBASE_SQLANYWHERE',1);
+
+ class ADODB_sqlanywhere extends ADODB_odbc {
+  	var $databaseType = "sqlanywhere";	
+	var $hasInsertID = true;
+	
+	function ADODB_sqlanywhere()
+	{
+		$this->ADODB_odbc();
+	}
+
+	 function _insertid() {
+  	   return $this->GetOne('select @@identity');
+	 }
+
+  function create_blobvar($blobVarName) {
+   $this->Execute("create variable $blobVarName long binary");
+   return;
+  }
+
+  function drop_blobvar($blobVarName) {
+   $this->Execute("drop variable $blobVarName");
+   return;
+  }
+
+  function load_blobvar_from_file($blobVarName, $filename) {
+   $chunk_size = 1000;
+
+   $fd = fopen ($filename, "rb");
+
+   $integer_chunks = (integer)filesize($filename) / $chunk_size;
+   $modulus = filesize($filename) % $chunk_size;
+   if ($modulus != 0){
+	$integer_chunks += 1;
+   }
+
+   for($loop=1;$loop<=$integer_chunks;$loop++){
+	$contents = fread ($fd, $chunk_size);
+	$contents = bin2hex($contents);
+
+	$hexstring = '';
+
+	for($loop2=0;$loop2qstr($hexstring);
+
+	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
+   }
+
+   fclose ($fd);
+   return;
+  }
+
+  function load_blobvar_from_var($blobVarName, &$varName) {
+   $chunk_size = 1000;
+
+   $integer_chunks = (integer)strlen($varName) / $chunk_size;
+   $modulus = strlen($varName) % $chunk_size;
+   if ($modulus != 0){
+	$integer_chunks += 1;
+   }
+
+   for($loop=1;$loop<=$integer_chunks;$loop++){
+	$contents = substr ($varName, (($loop - 1) * $chunk_size), $chunk_size);
+	$contents = bin2hex($contents);
+
+	$hexstring = '';
+
+	for($loop2=0;$loop2qstr($hexstring);
+
+	$this->Execute("set $blobVarName = $blobVarName || " . $hexstring);
+   }
+
+   return;
+  }
+
+ /*
+  Insert a null into the blob field of the table first.
+  Then use UpdateBlob to store the blob.
+
+  Usage:
+
+  $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)');
+  $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1');
+ */
+  function UpdateBlob($table,$column,&$val,$where,$blobtype='BLOB')
+  {
+   $blobVarName = 'hold_blob';
+   $this->create_blobvar($blobVarName);
+   $this->load_blobvar_from_var($blobVarName, $val);
+   $this->Execute("UPDATE $table SET $column=$blobVarName WHERE $where");
+   $this->drop_blobvar($blobVarName);
+   return true;
+  }
+ }; //class
+
+ class  ADORecordSet_sqlanywhere extends ADORecordSet_odbc {	
+
+  var $databaseType = "sqlanywhere";		
+
+ function ADORecordSet_sqlanywhere($id,$mode=false)
+ {
+  $this->ADORecordSet_odbc($id,$mode);
+ }
+
+
+ }; //class
+
+
+} //define
+?>
diff --git a/adodb/drivers/adodb-sqlite.inc.php b/adodb/drivers/adodb-sqlite.inc.php
new file mode 100644
index 0000000..bb95a42
--- /dev/null
+++ b/adodb/drivers/adodb-sqlite.inc.php
@@ -0,0 +1,398 @@
+fmtDate)."'";
+	case 'sysTimeStamp' : return "'".date($this->sysTimeStamp)."'";
+	}
+  }*/
+	
+	function ServerInfo()
+	{
+		$arr['version'] = sqlite_libversion();
+		$arr['description'] = 'SQLite ';
+		$arr['encoding'] = sqlite_libencoding();
+		return $arr;
+	}
+	
+	function BeginTrans()
+	{	  
+		 if ($this->transOff) return true; 
+		 $ret = $this->Execute("BEGIN TRANSACTION");
+		 $this->transCnt += 1;
+		 return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true; 
+		if (!$ok) return $this->RollbackTrans();
+		$ret = $this->Execute("COMMIT");
+		if ($this->transCnt>0)$this->transCnt -= 1;
+		return !empty($ret);
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true; 
+		$ret = $this->Execute("ROLLBACK");
+		if ($this->transCnt>0)$this->transCnt -= 1;
+		return !empty($ret);
+	}
+	
+	// mark newnham
+	function MetaColumns($table, $normalize=true) 
+	{
+	  global $ADODB_FETCH_MODE;
+	  $false = false;
+	  $save = $ADODB_FETCH_MODE;
+	  $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	  if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
+	  $rs = $this->Execute("PRAGMA table_info('$table')");
+	  if (isset($savem)) $this->SetFetchMode($savem);
+	  if (!$rs) {
+	    $ADODB_FETCH_MODE = $save; 
+	    return $false;
+	  }
+	  $arr = array();
+	  while ($r = $rs->FetchRow()) {
+	    $type = explode('(',$r['type']);
+	    $size = '';
+	    if (sizeof($type)==2)
+	    $size = trim($type[1],')');
+	    $fn = strtoupper($r['name']);
+	    $fld = new ADOFieldObject;
+	    $fld->name = $r['name'];
+	    $fld->type = $type[0];
+	    $fld->max_length = $size;
+	    $fld->not_null = $r['notnull'];
+	    $fld->default_value = $r['dflt_value'];
+	    $fld->scale = 0;
+	    if ($save == ADODB_FETCH_NUM) $arr[] = $fld;	
+	    else $arr[strtoupper($fld->name)] = $fld;
+	  }
+	  $rs->Close();
+	  $ADODB_FETCH_MODE = $save;
+	  return $arr;
+	}
+	
+	function _init($parentDriver)
+	{
+	
+		$parentDriver->hasTransactions = false;
+		$parentDriver->hasInsertID = true;
+	}
+
+	function _insertid()
+	{
+		return sqlite_last_insert_rowid($this->_connectionID);
+	}
+	
+	function _affectedrows()
+	{
+        return sqlite_changes($this->_connectionID);
+    }
+	
+	function ErrorMsg() 
+ 	{
+		if ($this->_logsql) return $this->_errorMsg;
+		return ($this->_errorNo) ? sqlite_error_string($this->_errorNo) : '';
+	}
+ 
+	function ErrorNo() 
+	{
+		return $this->_errorNo;
+	}
+	
+	function SQLDate($fmt, $col=false)
+	{
+		$fmt = $this->qstr($fmt);
+		return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
+	}
+	
+	
+	function _createFunctions()
+	{
+		@sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
+		@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
+	}
+	
+
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sqlite_open')) return null;
+		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
+		
+		$this->_connectionID = sqlite_open($argHostname);
+		if ($this->_connectionID === false) return false;
+		$this->_createFunctions();
+		return true;
+	}
+	
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sqlite_open')) return null;
+		if (empty($argHostname) && $argDatabasename) $argHostname = $argDatabasename;
+		
+		$this->_connectionID = sqlite_popen($argHostname);
+		if ($this->_connectionID === false) return false;
+		$this->_createFunctions();
+		return true;
+	}
+
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr=false)
+	{
+		$rez = sqlite_query($sql,$this->_connectionID);
+		if (!$rez) {
+			$this->_errorNo = sqlite_last_error($this->_connectionID);
+		}
+		
+		return $rez;
+	}
+	
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	{
+		$offsetStr = ($offset >= 0) ? " OFFSET $offset" : '';
+		$limitStr  = ($nrows >= 0)  ? " LIMIT $nrows" : ($offset >= 0 ? ' LIMIT 999999999' : '');
+	  	if ($secs2cache)
+	   		$rs = $this->CacheExecute($secs2cache,$sql."$limitStr$offsetStr",$inputarr);
+	  	else
+	   		$rs = $this->Execute($sql."$limitStr$offsetStr",$inputarr);
+			
+		return $rs;
+	}
+	
+	/*
+		This algorithm is not very efficient, but works even if table locking
+		is not available.
+		
+		Will return false if unable to generate an ID after $MAXLOOPS attempts.
+	*/
+	var $_genSeqSQL = "create table %s (id integer)";
+	
+	function GenID($seq='adodbseq',$start=1)
+	{	
+		// if you have to modify the parameter below, your database is overloaded,
+		// or you need to implement generation of id's yourself!
+		$MAXLOOPS = 100;
+		//$this->debug=1;
+		while (--$MAXLOOPS>=0) {
+			@($num = $this->GetOne("select id from $seq"));
+			if ($num === false) {
+				$this->Execute(sprintf($this->_genSeqSQL ,$seq));	
+				$start -= 1;
+				$num = '0';
+				$ok = $this->Execute("insert into $seq values($start)");
+				if (!$ok) return false;
+			} 
+			$this->Execute("update $seq set id=id+1 where id=$num");
+			
+			if ($this->affected_rows() > 0) {
+				$num += 1;
+				$this->genID = $num;
+				return $num;
+			}
+		}
+		if ($fn = $this->raiseErrorFn) {
+			$fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num);
+		}
+		return false;
+	}
+
+	function CreateSequence($seqname='adodbseq',$start=1)
+	{
+		if (empty($this->_genSeqSQL)) return false;
+		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
+		if (!$ok) return false;
+		$start -= 1;
+		return $this->Execute("insert into $seqname values($start)");
+	}
+	
+	var $_dropSeqSQL = 'drop table %s';
+	function DropSequence($seqname)
+	{
+		if (empty($this->_dropSeqSQL)) return false;
+		return $this->Execute(sprintf($this->_dropSeqSQL,$seqname));
+	}
+	
+	// returns true or false
+	function _close()
+	{
+		return @sqlite_close($this->_connectionID);
+	}
+
+	function MetaIndexes($table, $primary = FALSE, $owner=false, $owner = false)
+	{
+		$false = false;
+		// save old fetch mode
+        global $ADODB_FETCH_MODE;
+        $save = $ADODB_FETCH_MODE;
+        $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+        if ($this->fetchMode !== FALSE) {
+               $savem = $this->SetFetchMode(FALSE);
+        }
+		$SQL=sprintf("SELECT name,sql FROM sqlite_master WHERE type='index' AND tbl_name='%s'", strtolower($table));
+        $rs = $this->Execute($SQL);
+        if (!is_object($rs)) {
+			if (isset($savem)) 
+				$this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+            return $false;
+        }
+
+		$indexes = array ();
+		while ($row = $rs->FetchRow()) {
+			if ($primary && preg_match("/primary/i",$row[1]) == 0) continue;
+            if (!isset($indexes[$row[0]])) {
+
+			$indexes[$row[0]] = array(
+				   'unique' => preg_match("/unique/i",$row[1]),
+				   'columns' => array());
+			}
+			/**
+			  * There must be a more elegant way of doing this,
+			  * the index elements appear in the SQL statement
+			  * in cols[1] between parentheses
+			  * e.g CREATE UNIQUE INDEX ware_0 ON warehouse (org,warehouse)
+			  */
+			$cols = explode("(",$row[1]);
+			$cols = explode(")",$cols[1]);
+			array_pop($cols);
+			$indexes[$row[0]]['columns'] = $cols;
+		}
+		if (isset($savem)) { 
+            $this->SetFetchMode($savem);
+			$ADODB_FETCH_MODE = $save;
+		}
+        return $indexes;
+	}
+
+}
+
+/*--------------------------------------------------------------------------------------
+		 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_sqlite extends ADORecordSet {
+
+	var $databaseType = "sqlite";
+	var $bind = false;
+
+	function ADORecordset_sqlite($queryID,$mode=false)
+	{
+		
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		switch($mode) {
+		case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
+		case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
+		default: $this->fetchMode = SQLITE_BOTH; break;
+		}
+		$this->adodbFetchMode = $mode;
+		
+		$this->_queryID = $queryID;
+	
+		$this->_inited = true;
+		$this->fields = array();
+		if ($queryID) {
+			$this->_currentRow = 0;
+			$this->EOF = !$this->_fetch();
+			@$this->_initrs();
+		} else {
+			$this->_numOfRows = 0;
+			$this->_numOfFields = 0;
+			$this->EOF = true;
+		}
+		
+		return $this->_queryID;
+	}
+
+
+	function FetchField($fieldOffset = -1)
+	{
+		$fld = new ADOFieldObject;
+		$fld->name = sqlite_field_name($this->_queryID, $fieldOffset);
+		$fld->type = 'VARCHAR';
+		$fld->max_length = -1;
+		return $fld;
+	}
+	
+   function _initrs()
+   {
+		$this->_numOfRows = @sqlite_num_rows($this->_queryID);
+		$this->_numOfFields = @sqlite_num_fields($this->_queryID);
+   }
+
+	function Fields($colname)
+	{
+		if ($this->fetchMode != SQLITE_NUM) return $this->fields[$colname];
+		if (!$this->bind) {
+			$this->bind = array();
+			for ($i=0; $i < $this->_numOfFields; $i++) {
+				$o = $this->FetchField($i);
+				$this->bind[strtoupper($o->name)] = $i;
+			}
+		}
+		
+		 return $this->fields[$this->bind[strtoupper($colname)]];
+	}
+	
+   function _seek($row)
+   {
+   		return sqlite_seek($this->_queryID, $row);
+   }
+
+	function _fetch($ignore_fields=false) 
+	{
+		$this->fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
+		return !empty($this->fields);
+	}
+	
+	function _close() 
+	{
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-sqlitepo.inc.php b/adodb/drivers/adodb-sqlitepo.inc.php
new file mode 100644
index 0000000..2bdb99a
--- /dev/null
+++ b/adodb/drivers/adodb-sqlitepo.inc.php
@@ -0,0 +1,62 @@
+ADODB_sqlite();
+   }
+}
+
+/*--------------------------------------------------------------------------------------
+       Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+
+class ADORecordset_sqlitepo extends ADORecordset_sqlite {
+
+   var $databaseType = 'sqlitepo';
+
+   function ADORecordset_sqlitepo($queryID,$mode=false)
+   {
+      $this->ADORecordset_sqlite($queryID,$mode);
+   }
+   
+   // Modified to strip table names from returned fields
+   function _fetch($ignore_fields=false)
+   {
+      $this->fields = array();
+      $fields = @sqlite_fetch_array($this->_queryID,$this->fetchMode);
+      if(is_array($fields))
+         foreach($fields as $n => $v)
+         {
+            if(($p = strpos($n, ".")) !== false)
+               $n = substr($n, $p+1);
+            $this->fields[$n] = $v;
+         }
+
+      return !empty($this->fields);
+   }
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-sybase.inc.php b/adodb/drivers/adodb-sybase.inc.php
new file mode 100644
index 0000000..e333f3d
--- /dev/null
+++ b/adodb/drivers/adodb-sybase.inc.php
@@ -0,0 +1,428 @@
+GetOne('select @@identity');
+	}
+	  // might require begintrans -- committrans
+	function _affectedrows()
+	{
+	   return $this->GetOne('select @@rowcount');
+	}
+
+			  
+	function BeginTrans()
+	{	
+	
+		if ($this->transOff) return true;
+		$this->transCnt += 1;
+		   
+		$this->Execute('BEGIN TRAN');
+		return true;
+	}
+	
+	function CommitTrans($ok=true) 
+	{ 
+		if ($this->transOff) return true;
+		
+		if (!$ok) return $this->RollbackTrans();
+	
+		$this->transCnt -= 1;
+		$this->Execute('COMMIT TRAN');
+		return true;
+	}
+	
+	function RollbackTrans()
+	{
+		if ($this->transOff) return true;
+		$this->transCnt -= 1;
+		$this->Execute('ROLLBACK TRAN');
+		return true;
+	}
+	
+	// http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
+	function RowLock($tables,$where,$col='top 1 null as ignore') 
+	{
+		if (!$this->_hastrans) $this->BeginTrans();
+		$tables = str_replace(',',' HOLDLOCK,',$tables);
+		return $this->GetOne("select $col from $tables HOLDLOCK where $where");
+		
+	}	
+		
+	function SelectDB($dbName) 
+	{
+		$this->database = $dbName;
+		$this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
+		if ($this->_connectionID) {
+			return @sybase_select_db($dbName);		
+		}
+		else return false;	
+	}
+
+	/*	Returns: the last error message from previous database operation
+		Note: This function is NOT available for Microsoft SQL Server.	*/	
+
+	
+	function ErrorMsg()
+	{
+		if ($this->_logsql) return $this->_errorMsg;
+		if (function_exists('sybase_get_last_message'))
+			$this->_errorMsg = sybase_get_last_message();
+		else
+			$this->_errorMsg = isset($php_errormsg) ? $php_errormsg : 'SYBASE error messages not supported on this platform';
+		return $this->_errorMsg;
+	}
+
+	// returns true or false
+	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sybase_connect')) return null;
+		
+		if ($this->charSet) {
+ 			$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword, $this->charSet);
+       	} else {
+       		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
+       	}
+
+		$this->_connectionID = sybase_connect($argHostname,$argUsername,$argPassword);
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	// returns true or false
+	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
+	{
+		if (!function_exists('sybase_connect')) return null;
+		
+		if ($this->charSet) {
+ 			$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword, $this->charSet);
+       	} else {
+       		$this->_connectionID = sybase_pconnect($argHostname,$argUsername,$argPassword);
+       	}
+		if ($this->_connectionID === false) return false;
+		if ($argDatabasename) return $this->SelectDB($argDatabasename);
+		return true;	
+	}
+	
+	// returns query ID if successful, otherwise false
+	function _query($sql,$inputarr=false)
+	{
+	global $ADODB_COUNTRECS;
+	
+		if ($ADODB_COUNTRECS == false && ADODB_PHPVER >= 0x4300)
+			return sybase_unbuffered_query($sql,$this->_connectionID);
+		else
+			return sybase_query($sql,$this->_connectionID);
+	}
+	
+	// See http://www.isug.com/Sybase_FAQ/ASE/section6.2.html#6.2.12
+	function SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0) 
+	{
+		if ($secs2cache > 0) {// we do not cache rowcount, so we have to load entire recordset
+			$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+			return $rs;
+		}
+		
+		$nrows = (integer) $nrows;
+		$offset = (integer) $offset;
+		
+		$cnt = ($nrows >= 0) ? $nrows : 999999999;
+		if ($offset > 0 && $cnt) $cnt += $offset;
+		
+		$this->Execute("set rowcount $cnt"); 
+		$rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
+		$this->Execute("set rowcount 0");
+		
+		return $rs;
+	}
+
+	// returns true or false
+	function _close()
+	{ 
+		return @sybase_close($this->_connectionID);
+	}
+	
+	static function UnixDate($v)
+	{
+		return ADORecordSet_array_sybase::UnixDate($v);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_sybase::UnixTimeStamp($v);
+	}	
+	
+	
+
+	# Added 2003-10-05 by Chris Phillipson
+    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
+    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
+    // Format date column in sql string given an input format that understands Y M D
+    function SQLDate($fmt, $col=false)
+    {
+        if (!$col) $col = $this->sysTimeStamp;
+        $s = '';
+
+        $len = strlen($fmt);
+        for ($i=0; $i < $len; $i++) {
+            if ($s) $s .= '+';
+            $ch = $fmt[$i];
+            switch($ch) {
+            case 'Y':
+            case 'y':
+                $s .= "datename(yy,$col)";
+                break;
+            case 'M':
+                $s .= "convert(char(3),$col,0)";
+                break;
+            case 'm':
+                $s .= "str_replace(str(month($col),2),' ','0')";
+                break;
+            case 'Q':
+            case 'q':
+                $s .= "datename(qq,$col)";
+                break;
+            case 'D':
+            case 'd':
+                $s .= "str_replace(str(datepart(dd,$col),2),' ','0')";
+                break;
+            case 'h':
+                $s .= "substring(convert(char(14),$col,0),13,2)";
+                break;
+
+            case 'H':
+                $s .= "str_replace(str(datepart(hh,$col),2),' ','0')";
+                break;
+
+            case 'i':
+                $s .= "str_replace(str(datepart(mi,$col),2),' ','0')";
+                break;
+            case 's':
+                $s .= "str_replace(str(datepart(ss,$col),2),' ','0')";
+                break;
+            case 'a':
+            case 'A':
+                $s .= "substring(convert(char(19),$col,0),18,2)";
+                break;
+
+            default:
+                if ($ch == '\\') {
+                    $i++;
+                    $ch = substr($fmt,$i,1);
+                }
+                $s .= $this->qstr($ch);
+                break;
+            }
+        }
+        return $s;
+    }
+	
+	# Added 2003-10-07 by Chris Phillipson
+    # Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=5981;uf=0?target=0;window=new;showtoc=true;book=dbrfen8
+    # to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
+    function MetaPrimaryKeys($table)
+    {
+        $sql = "SELECT c.column_name " .
+               "FROM syscolumn c, systable t " .
+               "WHERE t.table_name='$table' AND c.table_id=t.table_id " .
+               "AND t.table_type='BASE' " .
+               "AND c.pkey = 'Y' " .
+               "ORDER BY c.column_id";
+
+        $a = $this->GetCol($sql);
+        if ($a && sizeof($a)>0) return $a;
+        return false;
+    }
+}
+	
+/*--------------------------------------------------------------------------------------
+	 Class Name: Recordset
+--------------------------------------------------------------------------------------*/
+global $ADODB_sybase_mths;
+$ADODB_sybase_mths = array(
+	'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
+	'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);
+
+class ADORecordset_sybase extends ADORecordSet {	
+
+	var $databaseType = "sybase";
+	var $canSeek = true;
+	// _mths works only in non-localised system
+	var  $_mths = array('JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,'JUL'=>7,'AUG'=>8,'SEP'=>9,'OCT'=>10,'NOV'=>11,'DEC'=>12);	
+
+	function ADORecordset_sybase($id,$mode=false)
+	{
+		if ($mode === false) { 
+			global $ADODB_FETCH_MODE;
+			$mode = $ADODB_FETCH_MODE;
+		}
+		if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
+		else $this->fetchMode = $mode;
+		$this->ADORecordSet($id,$mode);
+	}
+	
+	/*	Returns: an object containing field information. 
+		Get column information in the Recordset object. fetchField() can be used in order to obtain information about
+		fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
+		fetchField() is retrieved.	*/
+	function FetchField($fieldOffset = -1) 
+	{
+		if ($fieldOffset != -1) {
+			$o = @sybase_fetch_field($this->_queryID, $fieldOffset);
+		}
+		else if ($fieldOffset == -1) {	/*	The $fieldOffset argument is not provided thus its -1 	*/
+			$o = @sybase_fetch_field($this->_queryID);
+		}
+		// older versions of PHP did not support type, only numeric
+		if ($o && !isset($o->type)) $o->type = ($o->numeric) ? 'float' : 'varchar';
+		return $o;
+	}
+	
+	function _initrs()
+	{
+	global $ADODB_COUNTRECS;
+		$this->_numOfRows = ($ADODB_COUNTRECS)? @sybase_num_rows($this->_queryID):-1;
+		$this->_numOfFields = @sybase_num_fields($this->_queryID);
+	}
+	
+	function _seek($row) 
+	{
+		return @sybase_data_seek($this->_queryID, $row);
+	}		
+
+	function _fetch($ignore_fields=false) 
+	{
+		if ($this->fetchMode == ADODB_FETCH_NUM) {
+			$this->fields = @sybase_fetch_row($this->_queryID);
+		} else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+			$this->fields = @sybase_fetch_row($this->_queryID);
+			if (is_array($this->fields)) {
+				$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
+				return true;
+			}
+			return false;
+		}  else {
+			$this->fields = @sybase_fetch_array($this->_queryID);
+		}
+		if ( is_array($this->fields)) {
+			return true;
+		}
+
+		return false;
+	}
+	
+	/*	close() only needs to be called if you are worried about using too much memory while your script
+		is running. All associated result memory for the specified result identifier will automatically be freed.	*/
+	function _close() {
+		return @sybase_free_result($this->_queryID);		
+	}
+	
+	// sybase/mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
+	{
+		return ADORecordSet_array_sybase::UnixDate($v);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+		return ADORecordSet_array_sybase::UnixTimeStamp($v);
+	}
+}
+
+class ADORecordSet_array_sybase extends ADORecordSet_array {
+	function ADORecordSet_array_sybase($id=-1)
+	{
+		$this->ADORecordSet_array($id);
+	}
+	
+		// sybase/mssql uses a default date like Dec 30 2000 12:00AM
+	static function UnixDate($v)
+	{
+	global $ADODB_sybase_mths;
+	
+		//Dec 30 2000 12:00AM
+		if (!preg_match( "/([A-Za-z]{3})[-/\. ]+([0-9]{1,2})[-/\. ]+([0-9]{4})/"
+			,$v, $rr)) return parent::UnixDate($v);
+			
+		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+		$themth = substr(strtoupper($rr[1]),0,3);
+		$themth = $ADODB_sybase_mths[$themth];
+		if ($themth <= 0) return false;
+		// h-m-s-MM-DD-YY
+		return  mktime(0,0,0,$themth,$rr[2],$rr[3]);
+	}
+	
+	static function UnixTimeStamp($v)
+	{
+	global $ADODB_sybase_mths;
+		//11.02.2001 Toni Tunkkari toni.tunkkari@finebyte.com
+		//Changed [0-9] to [0-9 ] in day conversion
+		if (!preg_match( "/([A-Za-z]{3})[-/\. ]([0-9 ]{1,2})[-/\. ]([0-9]{4}) +([0-9]{1,2}):([0-9]{1,2}) *([apAP]{0,1})/"
+			,$v, $rr)) return parent::UnixTimeStamp($v);
+		if ($rr[3] <= TIMESTAMP_FIRST_YEAR) return 0;
+		
+		$themth = substr(strtoupper($rr[1]),0,3);
+		$themth = $ADODB_sybase_mths[$themth];
+		if ($themth <= 0) return false;
+		
+		switch (strtoupper($rr[6])) {
+		case 'P':
+			if ($rr[4]<12) $rr[4] += 12;
+			break;
+		case 'A':
+			if ($rr[4]==12) $rr[4] = 0;
+			break;
+		default:
+			break;
+		}
+		// h-m-s-MM-DD-YY
+		return  mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
+	}
+}
+?>
diff --git a/adodb/drivers/adodb-sybase_ase.inc.php b/adodb/drivers/adodb-sybase_ase.inc.php
new file mode 100644
index 0000000..5d2023c
--- /dev/null
+++ b/adodb/drivers/adodb-sybase_ase.inc.php
@@ -0,0 +1,119 @@
+metaTablesSQL) {
+			// complicated state saving by the need for backward compat
+			
+			if ($ttype == 'VIEWS'){
+						$sql = str_replace('U', 'V', $this->metaTablesSQL);
+			}elseif (false === $ttype){
+						$sql = str_replace('U',"U' OR type='V", $this->metaTablesSQL);
+			}else{ // TABLES OR ANY OTHER 
+						$sql = $this->metaTablesSQL;
+			}
+			$rs = $this->Execute($sql);
+			
+			if ($rs === false || !method_exists($rs, 'GetArray')){
+					return $false;
+			}
+			$arr = $rs->GetArray();
+
+			$arr2 = array();
+			foreach($arr as $key=>$value){
+					$arr2[] = trim($value['name']);
+			}
+			return $arr2;
+		}
+		return $false;
+	}
+
+	function MetaDatabases()
+	{
+			$arr = array();
+			if ($this->metaDatabasesSQL!='') {
+				$rs = $this->Execute($this->metaDatabasesSQL);
+				if ($rs && !$rs->EOF){
+					while (!$rs->EOF){
+						$arr[] = $rs->Fields('name');
+						$rs->MoveNext();
+					}
+					return $arr;
+				}
+			}
+			return false;
+	}
+
+	// fix a bug which prevent the metaColumns query to be executed for Sybase ASE
+	function MetaColumns($table,$upper=false) 
+	{
+		$false = false;
+		if (!empty($this->metaColumnsSQL)) {
+		
+			$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
+			if ($rs === false) return $false;
+
+			$retarr = array();
+			while (!$rs->EOF) {
+				$fld = new ADOFieldObject();
+				$fld->name = $rs->Fields('field_name');
+				$fld->type = $rs->Fields('type');
+				$fld->max_length = $rs->Fields('width');
+				$retarr[strtoupper($fld->name)] = $fld;
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			return $retarr;	
+		}
+		return $false;
+	}
+	
+	function getProcedureList($schema)
+	{
+			return false;
+	}
+
+	function ErrorMsg()
+	{
+		if (!function_exists('sybase_connect')){
+				return 'Your PHP doesn\'t contain the Sybase connection module!';
+		}
+		return parent::ErrorMsg();	
+	}
+}
+
+class adorecordset_sybase_ase extends ADORecordset_sybase {
+var $databaseType = "sybase_ase";
+function ADORecordset_sybase_ase($id,$mode=false)
+	{
+		$this->ADORecordSet_sybase($id,$mode);
+	}
+	
+}
+?>
\ No newline at end of file
diff --git a/adodb/drivers/adodb-vfp.inc.php b/adodb/drivers/adodb-vfp.inc.php
new file mode 100644
index 0000000..d1ccae3
--- /dev/null
+++ b/adodb/drivers/adodb-vfp.inc.php
@@ -0,0 +1,107 @@
+ADODB_odbc();
+	}
+	
+	function Time()
+	{
+		return time();
+	}
+	
+	function BeginTrans() { return false;}
+	
+	// quote string to be sent back to database
+	function qstr($s,$nofixquotes=false)
+	{
+		if (!$nofixquotes) return  "'".str_replace("\r\n","'+chr(13)+'",str_replace("'",$this->replaceQuote,$s))."'";
+		return "'".$s."'";
+	}
+
+	
+	// TOP requires ORDER BY for VFP
+	function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
+	{
+		$this->hasTop = preg_match('/ORDER[ \t\r\n]+BY/is',$sql) ? 'top' : false;
+		$ret = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
+		return $ret;
+	}
+	
+
+
+};
+ 
+
+class  ADORecordSet_vfp extends ADORecordSet_odbc {	
+	
+	var $databaseType = "vfp";		
+
+	
+	function ADORecordSet_vfp($id,$mode=false)
+	{
+		return $this->ADORecordSet_odbc($id,$mode);
+	}
+
+	function MetaType($t,$len=-1)
+	{
+		if (is_object($t)) {
+			$fieldobj = $t;
+			$t = $fieldobj->type;
+			$len = $fieldobj->max_length;
+		}
+		switch (strtoupper($t)) {
+		case 'C':
+			if ($len <= $this->blobSize) return 'C';
+		case 'M':
+			return 'X';
+			 
+		case 'D': return 'D';
+		
+		case 'T': return 'T';
+		
+		case 'L': return 'L';
+		
+		case 'I': return 'I';
+		
+		default: return 'N';
+		}
+	}
+}
+
+} //define
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-ar.inc.php b/adodb/lang/adodb-ar.inc.php
new file mode 100644
index 0000000..4b75095
--- /dev/null
+++ b/adodb/lang/adodb-ar.inc.php
@@ -0,0 +1,33 @@
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'			    => 'ar',
+	    DB_ERROR			=> '  ',
+	    DB_ERROR_ALREADY_EXISTS	=> ' ',
+	    DB_ERROR_CANNOT_CREATE	=> '  ',
+	    DB_ERROR_CANNOT_DELETE	=> '  ',
+	    DB_ERROR_CANNOT_DROP	=> '  ',
+	    DB_ERROR_CONSTRAINT 	=> '  ',
+	    DB_ERROR_DIVZERO		=> '   ',
+	    DB_ERROR_INVALID		=> ' ',
+	    DB_ERROR_INVALID_DATE	=> '     ',
+	    DB_ERROR_INVALID_NUMBER	=> '   ',
+	    DB_ERROR_MISMATCH		=> ' ',
+	    DB_ERROR_NODBSELECTED	=> '     ',
+	    DB_ERROR_NOSUCHFIELD	=> '    ',
+	    DB_ERROR_NOSUCHTABLE	=> '    ',
+	    DB_ERROR_NOT_CAPABLE	=> '     ',
+	    DB_ERROR_NOT_FOUND		=> '  ',
+	    DB_ERROR_NOT_LOCKED 	=> ' ',
+	    DB_ERROR_SYNTAX		=> '  ',
+	    DB_ERROR_UNSUPPORTED	=> ' ',
+	    DB_ERROR_VALUE_COUNT_ON_ROW => '   ',
+	    DB_ERROR_INVALID_DSN	=> 'DSN  ',
+	    DB_ERROR_CONNECT_FAILED	=> '  ',
+	    0			       => '  ', // DB_OK
+	    DB_ERROR_NEED_MORE_DATA	=> '   ',
+	    DB_ERROR_EXTENSION_NOT_FOUND=> '    ',
+	    DB_ERROR_NOSUCHDB		=> '     ',
+	    DB_ERROR_ACCESS_VIOLATION	=> '  '
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-bg.inc.php b/adodb/lang/adodb-bg.inc.php
new file mode 100644
index 0000000..ee307c1
--- /dev/null
+++ b/adodb/lang/adodb-bg.inc.php
@@ -0,0 +1,37 @@
+
+*/
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'bg',
+            DB_ERROR                    => ' ',
+            DB_ERROR_ALREADY_EXISTS     => ' ',
+            DB_ERROR_CANNOT_CREATE      => '    ',
+            DB_ERROR_CANNOT_DELETE      => '    ',
+            DB_ERROR_CANNOT_DROP        => '    ',
+            DB_ERROR_CONSTRAINT         => ' ',
+            DB_ERROR_DIVZERO            => '  ',
+            DB_ERROR_INVALID            => '',
+            DB_ERROR_INVALID_DATE       => '   ',
+            DB_ERROR_INVALID_NUMBER     => ' ',
+            DB_ERROR_MISMATCH           => ' ',
+            DB_ERROR_NODBSELECTED       => '    ',
+            DB_ERROR_NOSUCHFIELD        => ' ',
+            DB_ERROR_NOSUCHTABLE        => ' ',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+            DB_ERROR_NOT_FOUND          => '  ',
+            DB_ERROR_NOT_LOCKED         => '  ',
+            DB_ERROR_SYNTAX             => ' ',
+            DB_ERROR_UNSUPPORTED        => '  ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => '    ',
+            DB_ERROR_INVALID_DSN        => ' DSN',
+            DB_ERROR_CONNECT_FAILED     => '     ',
+            0	                        => ' ', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => '   ',
+            DB_ERROR_EXTENSION_NOT_FOUND=> '   ',
+            DB_ERROR_NOSUCHDB           => '  ',
+            DB_ERROR_ACCESS_VIOLATION   => '  '
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-bgutf8.inc.php b/adodb/lang/adodb-bgutf8.inc.php
new file mode 100644
index 0000000..5281ed5
--- /dev/null
+++ b/adodb/lang/adodb-bgutf8.inc.php
@@ -0,0 +1,37 @@
+
+*/
+
+$ADODB_LANG_ARRAY = array (
+            'LANG'                      => 'bgutf8',
+            DB_ERROR                    => 'неизвестна грешка',
+            DB_ERROR_ALREADY_EXISTS     => 'вече съществува',
+            DB_ERROR_CANNOT_CREATE      => 'не може да бъде създадена',
+            DB_ERROR_CANNOT_DELETE      => 'не може да бъде изтрита',
+            DB_ERROR_CANNOT_DROP        => 'не може да бъде унищожена',
+            DB_ERROR_CONSTRAINT         => 'нарушено условие',
+            DB_ERROR_DIVZERO            => 'деление на нула',
+            DB_ERROR_INVALID            => 'неправилно',
+            DB_ERROR_INVALID_DATE       => 'некоректна дата или час',
+            DB_ERROR_INVALID_NUMBER     => 'невалиден номер',
+            DB_ERROR_MISMATCH           => 'погрешна употреба',
+            DB_ERROR_NODBSELECTED       => 'не е избрана база данни',
+            DB_ERROR_NOSUCHFIELD        => 'несъществуващо поле',
+            DB_ERROR_NOSUCHTABLE        => 'несъществуваща таблица',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+            DB_ERROR_NOT_FOUND          => 'не е намерена',
+            DB_ERROR_NOT_LOCKED         => 'не е заключена',
+            DB_ERROR_SYNTAX             => 'грешен синтаксис',
+            DB_ERROR_UNSUPPORTED        => 'не се поддържа',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'некоректен брой колони в реда',
+            DB_ERROR_INVALID_DSN        => 'невалиден DSN',
+            DB_ERROR_CONNECT_FAILED     => 'връзката не може да бъде осъществена',
+            0	                        => 'няма грешки', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'предоставените данни са недостатъчни',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'разширението не е намерено',
+            DB_ERROR_NOSUCHDB           => 'несъществуваща база данни',
+            DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-ca.inc.php b/adodb/lang/adodb-ca.inc.php
new file mode 100644
index 0000000..3640ebd
--- /dev/null
+++ b/adodb/lang/adodb-ca.inc.php
@@ -0,0 +1,34 @@
+ 'ca',
+            DB_ERROR                    => 'error desconegut',
+            DB_ERROR_ALREADY_EXISTS     => 'ja existeix',
+            DB_ERROR_CANNOT_CREATE      => 'no es pot crear',
+            DB_ERROR_CANNOT_DELETE      => 'no es pot esborrar',
+            DB_ERROR_CANNOT_DROP        => 'no es pot eliminar',
+            DB_ERROR_CONSTRAINT         => 'violaci de constraint',
+            DB_ERROR_DIVZERO            => 'divisi per zero',
+            DB_ERROR_INVALID            => 'no s vlid',
+            DB_ERROR_INVALID_DATE       => 'la data o l\'hora no sn vlides',
+            DB_ERROR_INVALID_NUMBER     => 'el nombre no s vlid',
+            DB_ERROR_MISMATCH           => 'no hi ha coincidncia',
+            DB_ERROR_NODBSELECTED       => 'cap base de dades seleccionada',
+            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
+            DB_ERROR_NOSUCHTABLE        => 'taula inexistent',
+            DB_ERROR_NOT_CAPABLE        => 'l\'execuci secundria de DB no pot',
+            DB_ERROR_NOT_FOUND          => 'no trobat',
+            DB_ERROR_NOT_LOCKED         => 'no blocat',
+            DB_ERROR_SYNTAX             => 'error de sintaxi',
+            DB_ERROR_UNSUPPORTED        => 'no suportat',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'el nombre de columnes no coincideix amb el nombre de valors en la fila',
+            DB_ERROR_INVALID_DSN        => 'el DSN no s vlid',
+            DB_ERROR_CONNECT_FAILED     => 'connexi fallida',
+            0	                       => 'cap error', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'les dades subministrades sn insuficients',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensi no trobada',
+            DB_ERROR_NOSUCHDB           => 'base de dades inexistent',
+            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficients'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-cn.inc.php b/adodb/lang/adodb-cn.inc.php
new file mode 100644
index 0000000..eb8c7de
--- /dev/null
+++ b/adodb/lang/adodb-cn.inc.php
@@ -0,0 +1,35 @@
+ 'cn',
+            DB_ERROR                    => 'δ֪',
+            DB_ERROR_ALREADY_EXISTS     => 'Ѿ',
+            DB_ERROR_CANNOT_CREATE      => 'ܴ',
+            DB_ERROR_CANNOT_DELETE      => 'ɾ',
+            DB_ERROR_CANNOT_DROP        => 'ܶ',
+            DB_ERROR_CONSTRAINT         => 'Լ',
+            DB_ERROR_DIVZERO            => '0',
+            DB_ERROR_INVALID            => 'Ч',
+            DB_ERROR_INVALID_DATE       => 'Чڻʱ',
+            DB_ERROR_INVALID_NUMBER     => 'Ч',
+            DB_ERROR_MISMATCH           => 'ƥ',
+            DB_ERROR_NODBSELECTED       => 'ûݿⱻѡ',
+            DB_ERROR_NOSUCHFIELD        => 'ûӦֶ',
+            DB_ERROR_NOSUCHTABLE        => 'ûӦı',
+            DB_ERROR_NOT_CAPABLE        => 'ݿ̨',
+            DB_ERROR_NOT_FOUND          => 'ûз',
+            DB_ERROR_NOT_LOCKED         => 'ûб',
+            DB_ERROR_SYNTAX             => '﷨',
+            DB_ERROR_UNSUPPORTED        => '֧',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'ۼֵ',
+            DB_ERROR_INVALID_DSN        => 'ЧԴ (DSN)',
+            DB_ERROR_CONNECT_FAILED     => 'ʧ',
+            0	                       => 'ûд', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ṩݲܷҪ',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'չûб',
+            DB_ERROR_NOSUCHDB           => 'ûӦݿ',
+            DB_ERROR_ACCESS_VIOLATION   => 'ûкʵȨ'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-cz.inc.php b/adodb/lang/adodb-cz.inc.php
new file mode 100644
index 0000000..2424c24
--- /dev/null
+++ b/adodb/lang/adodb-cz.inc.php
@@ -0,0 +1,40 @@
+
+
+$ADODB_LANG_ARRAY = array (
+            'LANG'                      => 'cz',
+            DB_ERROR                    => 'neznm chyba',
+            DB_ERROR_ALREADY_EXISTS     => 'ji? existuje',
+            DB_ERROR_CANNOT_CREATE      => 'nelze vytvo?it',
+            DB_ERROR_CANNOT_DELETE      => 'nelze smazat',
+            DB_ERROR_CANNOT_DROP        => 'nelze odstranit',
+            DB_ERROR_CONSTRAINT         => 'poru?en omezujc podmnky',
+            DB_ERROR_DIVZERO            => 'd?len nulou',
+            DB_ERROR_INVALID            => 'neplatn',
+            DB_ERROR_INVALID_DATE       => 'neplatn datum nebo ?as',
+            DB_ERROR_INVALID_NUMBER     => 'neplatn ?slo',
+            DB_ERROR_MISMATCH           => 'nesouhlas',
+            DB_ERROR_NODBSELECTED       => '?dn databze nen vybrna',
+            DB_ERROR_NOSUCHFIELD        => 'pole nenalezeno',
+            DB_ERROR_NOSUCHTABLE        => 'tabulka nenalezena',
+            DB_ERROR_NOT_CAPABLE        => 'nepodporovno',
+            DB_ERROR_NOT_FOUND          => 'nenalezeno',
+            DB_ERROR_NOT_LOCKED         => 'nezam?eno',
+            DB_ERROR_SYNTAX             => 'syntaktick chyba',
+            DB_ERROR_UNSUPPORTED        => 'nepodporovno',
+            DB_ERROR_VALUE_COUNT_ON_ROW => '',
+            DB_ERROR_INVALID_DSN        => 'neplatn DSN',
+            DB_ERROR_CONNECT_FAILED     => 'p?ipojen selhalo',
+            0	                        => 'bez chyb', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'mlo zdrojovch dat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'roz??en nenalezeno',
+            DB_ERROR_NOSUCHDB           => 'databze neexistuje',
+            DB_ERROR_ACCESS_VIOLATION   => 'nedostate?n prva'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-da.inc.php b/adodb/lang/adodb-da.inc.php
new file mode 100644
index 0000000..ca0e72d
--- /dev/null
+++ b/adodb/lang/adodb-da.inc.php
@@ -0,0 +1,33 @@
+ 'da',
+            DB_ERROR                    => 'ukendt fejl',
+            DB_ERROR_ALREADY_EXISTS     => 'eksisterer allerede',
+            DB_ERROR_CANNOT_CREATE      => 'kan ikke oprette',
+            DB_ERROR_CANNOT_DELETE      => 'kan ikke slette',
+            DB_ERROR_CANNOT_DROP        => 'kan ikke droppe',
+            DB_ERROR_CONSTRAINT         => 'begrænsning krænket',
+            DB_ERROR_DIVZERO            => 'division med nul',
+            DB_ERROR_INVALID            => 'ugyldig',
+            DB_ERROR_INVALID_DATE       => 'ugyldig dato eller klokkeslet',
+            DB_ERROR_INVALID_NUMBER     => 'ugyldigt tal',
+            DB_ERROR_MISMATCH           => 'mismatch',
+            DB_ERROR_NODBSELECTED       => 'ingen database valgt',
+            DB_ERROR_NOSUCHFIELD        => 'felt findes ikke',
+            DB_ERROR_NOSUCHTABLE        => 'tabel findes ikke',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend opgav',
+            DB_ERROR_NOT_FOUND          => 'ikke fundet',
+            DB_ERROR_NOT_LOCKED         => 'ikke låst',
+            DB_ERROR_SYNTAX             => 'syntaksfejl',
+            DB_ERROR_UNSUPPORTED        => 'ikke understøttet',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'resulterende antal felter svarer ikke til forespørgslens antal felter',
+            DB_ERROR_INVALID_DSN        => 'ugyldig DSN',
+            DB_ERROR_CONNECT_FAILED     => 'tilslutning mislykkedes',
+            0	                        => 'ingen fejl', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'utilstrækkelige data angivet',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'udvidelse ikke fundet',
+            DB_ERROR_NOSUCHDB           => 'database ikke fundet',
+            DB_ERROR_ACCESS_VIOLATION   => 'utilstrækkelige rettigheder'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-de.inc.php b/adodb/lang/adodb-de.inc.php
new file mode 100644
index 0000000..244cb2f
--- /dev/null
+++ b/adodb/lang/adodb-de.inc.php
@@ -0,0 +1,33 @@
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'de',
+			DB_ERROR                    => 'Unbekannter Fehler',
+            DB_ERROR_ALREADY_EXISTS     => 'existiert bereits',
+            DB_ERROR_CANNOT_CREATE      => 'kann nicht erstellen',
+            DB_ERROR_CANNOT_DELETE      => 'kann nicht löschen',
+            DB_ERROR_CANNOT_DROP        => 'Tabelle oder Index konnte nicht gelöscht werden',
+            DB_ERROR_CONSTRAINT         => 'Constraint Verletzung',
+            DB_ERROR_DIVZERO            => 'Division durch Null',
+            DB_ERROR_INVALID            => 'ung¨ltig',
+            DB_ERROR_INVALID_DATE       => 'ung¨ltiges Datum oder Zeit',
+            DB_ERROR_INVALID_NUMBER     => 'ung¨ltige Zahl',
+            DB_ERROR_MISMATCH           => 'Unverträglichkeit',
+            DB_ERROR_NODBSELECTED       => 'keine Dantebank ausgewählt',
+            DB_ERROR_NOSUCHFIELD        => 'Feld nicht vorhanden',
+            DB_ERROR_NOSUCHTABLE        => 'Tabelle nicht vorhanden',
+            DB_ERROR_NOT_CAPABLE        => 'Funktion nicht installiert',
+            DB_ERROR_NOT_FOUND          => 'nicht gefunden',
+            DB_ERROR_NOT_LOCKED         => 'nicht gesperrt',
+            DB_ERROR_SYNTAX             => 'Syntaxfehler',
+            DB_ERROR_UNSUPPORTED        => 'nicht Unterst¨tzt',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'Anzahl der zur¨ckgelieferten Felder entspricht nicht der Anzahl der Felder in der Abfrage',
+            DB_ERROR_INVALID_DSN        => 'ung¨ltiger DSN',
+            DB_ERROR_CONNECT_FAILED     => 'Verbindung konnte nicht hergestellt werden',
+            0	                       => 'kein Fehler', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'Nicht gen¨gend Daten geliefert',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'erweiterung nicht gefunden',
+            DB_ERROR_NOSUCHDB           => 'keine Datenbank',
+            DB_ERROR_ACCESS_VIOLATION   => 'ungen¨gende Rechte'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-en.inc.php b/adodb/lang/adodb-en.inc.php
new file mode 100644
index 0000000..6895995
--- /dev/null
+++ b/adodb/lang/adodb-en.inc.php
@@ -0,0 +1,33 @@
+ 'en',
+            DB_ERROR                    => 'unknown error',
+            DB_ERROR_ALREADY_EXISTS     => 'already exists',
+            DB_ERROR_CANNOT_CREATE      => 'can not create',
+            DB_ERROR_CANNOT_DELETE      => 'can not delete',
+            DB_ERROR_CANNOT_DROP        => 'can not drop',
+            DB_ERROR_CONSTRAINT         => 'constraint violation',
+            DB_ERROR_DIVZERO            => 'division by zero',
+            DB_ERROR_INVALID            => 'invalid',
+            DB_ERROR_INVALID_DATE       => 'invalid date or time',
+            DB_ERROR_INVALID_NUMBER     => 'invalid number',
+            DB_ERROR_MISMATCH           => 'mismatch',
+            DB_ERROR_NODBSELECTED       => 'no database selected',
+            DB_ERROR_NOSUCHFIELD        => 'no such field',
+            DB_ERROR_NOSUCHTABLE        => 'no such table',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+            DB_ERROR_NOT_FOUND          => 'not found',
+            DB_ERROR_NOT_LOCKED         => 'not locked',
+            DB_ERROR_SYNTAX             => 'syntax error',
+            DB_ERROR_UNSUPPORTED        => 'not supported',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+            DB_ERROR_INVALID_DSN        => 'invalid DSN',
+            DB_ERROR_CONNECT_FAILED     => 'connect failed',
+            0	                       => 'no error', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
+            DB_ERROR_NOSUCHDB           => 'no such database',
+            DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-es.inc.php b/adodb/lang/adodb-es.inc.php
new file mode 100644
index 0000000..1e0afbb
--- /dev/null
+++ b/adodb/lang/adodb-es.inc.php
@@ -0,0 +1,33 @@
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'es',
+            DB_ERROR                    => 'error desconocido',
+            DB_ERROR_ALREADY_EXISTS     => 'ya existe',
+            DB_ERROR_CANNOT_CREATE      => 'imposible crear',
+            DB_ERROR_CANNOT_DELETE      => 'imposible borrar',
+            DB_ERROR_CANNOT_DROP        => 'imposible hacer drop',
+            DB_ERROR_CONSTRAINT         => 'violacion de constraint',
+            DB_ERROR_DIVZERO            => 'division por cero',
+            DB_ERROR_INVALID            => 'invalido',
+            DB_ERROR_INVALID_DATE       => 'fecha u hora invalida',
+            DB_ERROR_INVALID_NUMBER     => 'numero invalido',
+            DB_ERROR_MISMATCH           => 'error',
+            DB_ERROR_NODBSELECTED       => 'no hay base de datos seleccionada',
+            DB_ERROR_NOSUCHFIELD        => 'campo invalido',
+            DB_ERROR_NOSUCHTABLE        => 'tabla no existe',
+            DB_ERROR_NOT_CAPABLE        => 'capacidad invalida para esta DB',
+            DB_ERROR_NOT_FOUND          => 'no encontrado',
+            DB_ERROR_NOT_LOCKED         => 'no bloqueado',
+            DB_ERROR_SYNTAX             => 'error de sintaxis',
+            DB_ERROR_UNSUPPORTED        => 'no soportado',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'la cantidad de columnas no corresponden a la cantidad de valores',
+            DB_ERROR_INVALID_DSN        => 'DSN invalido',
+            DB_ERROR_CONNECT_FAILED     => 'fallo la conexion',
+            0	                       => 'sin error', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'insuficientes datos',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension no encontrada',
+            DB_ERROR_NOSUCHDB           => 'base de datos no encontrada',
+            DB_ERROR_ACCESS_VIOLATION   => 'permisos insuficientes'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-esperanto.inc.php b/adodb/lang/adodb-esperanto.inc.php
new file mode 100644
index 0000000..16ca00e
--- /dev/null
+++ b/adodb/lang/adodb-esperanto.inc.php
@@ -0,0 +1,35 @@
+ 'eo',
+            DB_ERROR                    => 'nekonata eraro',
+            DB_ERROR_ALREADY_EXISTS     => 'jam ekzistas',
+            DB_ERROR_CANNOT_CREATE      => 'maleblas krei',
+            DB_ERROR_CANNOT_DELETE      => 'maleblas elimini',
+            DB_ERROR_CANNOT_DROP        => 'maleblas elimini (drop)',
+            DB_ERROR_CONSTRAINT         => 'rompo de kondicxoj de provo',
+            DB_ERROR_DIVZERO            => 'divido per 0 (nul)',
+            DB_ERROR_INVALID            => 'malregule',
+            DB_ERROR_INVALID_DATE       => 'malregula dato kaj tempo',
+            DB_ERROR_INVALID_NUMBER     => 'malregula nombro',
+            DB_ERROR_MISMATCH           => 'eraro',
+            DB_ERROR_NODBSELECTED       => 'datumbazo ne elektita',
+            DB_ERROR_NOSUCHFIELD        => 'ne ekzistas kampo',
+            DB_ERROR_NOSUCHTABLE        => 'ne ekzistas tabelo',
+            DB_ERROR_NOT_CAPABLE        => 'DBMS ne povas',
+            DB_ERROR_NOT_FOUND          => 'ne trovita',
+            DB_ERROR_NOT_LOCKED         => 'ne blokita',
+            DB_ERROR_SYNTAX             => 'sintaksa eraro',
+            DB_ERROR_UNSUPPORTED        => 'ne apogata',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'nombrilo de valoroj en linio',
+            DB_ERROR_INVALID_DSN        => 'malregula DSN-o',
+            DB_ERROR_CONNECT_FAILED     => 'konekto malsukcesa',
+            0                               => 'cxio bone', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ne suficxe da datumo',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'etendo ne trovita',
+            DB_ERROR_NOSUCHDB           => 'datumbazo ne ekzistas',
+            DB_ERROR_ACCESS_VIOLATION   => 'ne suficxe da rajto por atingo'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-fa.inc.php b/adodb/lang/adodb-fa.inc.php
new file mode 100644
index 0000000..5594313
--- /dev/null
+++ b/adodb/lang/adodb-fa.inc.php
@@ -0,0 +1,35 @@
+ */
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'fa',
+            DB_ERROR                    => 'خطای ناشناخته',
+            DB_ERROR_ALREADY_EXISTS     => 'وجود دارد',
+            DB_ERROR_CANNOT_CREATE      => 'امکان create وجود ندارد',
+            DB_ERROR_CANNOT_DELETE      => 'امکان حذف وجود ندارد',
+            DB_ERROR_CANNOT_DROP        => 'امکان drop وجود ندارد',
+            DB_ERROR_CONSTRAINT         => 'نقض شرط',
+            DB_ERROR_DIVZERO            => 'تقسیم بر صفر',
+            DB_ERROR_INVALID            => 'نامعتبر',
+            DB_ERROR_INVALID_DATE       => 'زمان یا تاریخ نامعتبر',
+            DB_ERROR_INVALID_NUMBER     => 'عدد نامعتبر',
+            DB_ERROR_MISMATCH           => 'عدم مطابقت',
+            DB_ERROR_NODBSELECTED       => 'بانک اطلاعاتی انتخاب نشده است',
+            DB_ERROR_NOSUCHFIELD        => 'چنین ستونی وجود ندارد',
+            DB_ERROR_NOSUCHTABLE        => 'چنین جدولی وجود ندارد',
+            DB_ERROR_NOT_CAPABLE        => 'backend بانک اطلاعاتی قادر نیست',
+            DB_ERROR_NOT_FOUND          => 'پیدا نشد',
+            DB_ERROR_NOT_LOCKED         => 'قفل نشده',
+            DB_ERROR_SYNTAX             => 'خطای دستوری',
+            DB_ERROR_UNSUPPORTED        => 'پشتیبانی نمی شود',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'شمارش مقادیر روی ردیف',
+            DB_ERROR_INVALID_DSN        => 'DSN نامعتبر',
+            DB_ERROR_CONNECT_FAILED     => 'ارتباط برقرار نشد',
+            0	                       => 'بدون خطا', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'داده ناکافی است',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extension پیدا نشد',
+            DB_ERROR_NOSUCHDB           => 'چنین بانک اطلاعاتی وجود ندارد',
+            DB_ERROR_ACCESS_VIOLATION   => 'حق دسترسی ناکافی'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-fr.inc.php b/adodb/lang/adodb-fr.inc.php
new file mode 100644
index 0000000..066a2a5
--- /dev/null
+++ b/adodb/lang/adodb-fr.inc.php
@@ -0,0 +1,33 @@
+ 'fr',
+	DB_ERROR                    => 'erreur inconnue',
+	DB_ERROR_ALREADY_EXISTS     => 'existe déjà',
+	DB_ERROR_CANNOT_CREATE      => 'crétion impossible',
+	DB_ERROR_CANNOT_DELETE      => 'effacement impossible',
+	DB_ERROR_CANNOT_DROP        => 'suppression impossible',
+	DB_ERROR_CONSTRAINT         => 'violation de contrainte',
+	DB_ERROR_DIVZERO            => 'division par zéro',
+	DB_ERROR_INVALID            => 'invalide',
+	DB_ERROR_INVALID_DATE       => 'date ou heure invalide',
+	DB_ERROR_INVALID_NUMBER     => 'nombre invalide',
+	DB_ERROR_MISMATCH           => 'erreur de concordance',
+	DB_ERROR_NODBSELECTED       => 'pas de base de donnéessélectionnée',
+	DB_ERROR_NOSUCHFIELD        => 'nom de colonne invalide',
+	DB_ERROR_NOSUCHTABLE        => 'table ou vue inexistante',
+	DB_ERROR_NOT_CAPABLE        => 'fonction optionnelle non installée',
+	DB_ERROR_NOT_FOUND          => 'pas trouvé',
+	DB_ERROR_NOT_LOCKED         => 'non verrouillé',
+	DB_ERROR_SYNTAX             => 'erreur de syntaxe',
+	DB_ERROR_UNSUPPORTED        => 'non supporté',
+	DB_ERROR_VALUE_COUNT_ON_ROW => 'valeur insérée trop grande pour colonne',
+	DB_ERROR_INVALID_DSN        => 'DSN invalide',
+	DB_ERROR_CONNECT_FAILED     => 'échec à la connexion',
+	0                        => "pas d'erreur", // DB_OK
+	DB_ERROR_NEED_MORE_DATA     => 'données fournies insuffisantes',
+	DB_ERROR_EXTENSION_NOT_FOUND=> 'extension non trouvée',
+	DB_ERROR_NOSUCHDB           => 'base de données inconnue',
+	DB_ERROR_ACCESS_VIOLATION   => 'droits insuffisants'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-hu.inc.php b/adodb/lang/adodb-hu.inc.php
new file mode 100644
index 0000000..d6f0ef8
--- /dev/null
+++ b/adodb/lang/adodb-hu.inc.php
@@ -0,0 +1,34 @@
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'hu',
+            DB_ERROR                    => 'ismeretlen hiba',
+            DB_ERROR_ALREADY_EXISTS     => 'mr ltezik',
+            DB_ERROR_CANNOT_CREATE      => 'nem sikerlt ltrehozni',
+            DB_ERROR_CANNOT_DELETE      => 'nem sikerlt trlni',
+            DB_ERROR_CANNOT_DROP        => 'nem sikerlt eldobni',
+            DB_ERROR_CONSTRAINT         => 'szablyok megszegse',
+            DB_ERROR_DIVZERO            => 'oszts nullval',
+            DB_ERROR_INVALID            => 'rvnytelen',
+            DB_ERROR_INVALID_DATE       => 'rvnytelen dtum vagy id',
+            DB_ERROR_INVALID_NUMBER     => 'rvnytelen szm',
+            DB_ERROR_MISMATCH           => 'nem megfelel',
+            DB_ERROR_NODBSELECTED       => 'nincs kivlasztott adatbzis',
+            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mez',
+            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen tbla',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend nem tmogatja',
+            DB_ERROR_NOT_FOUND          => 'nem tallhat',
+            DB_ERROR_NOT_LOCKED         => 'nincs lezrva',
+            DB_ERROR_SYNTAX             => 'szintaktikai hiba',
+            DB_ERROR_UNSUPPORTED        => 'nem tmogatott',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron vgzett rtk szmlls',
+            DB_ERROR_INVALID_DSN        => 'hibs DSN',
+            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakozs',
+            0	                       => 'nincs hiba', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'tl kevs az adat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'bvtmny nem tallhat',
+            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatbzis',
+            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosultsg'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-it.inc.php b/adodb/lang/adodb-it.inc.php
new file mode 100644
index 0000000..20c5b93
--- /dev/null
+++ b/adodb/lang/adodb-it.inc.php
@@ -0,0 +1,34 @@
+ 'it',
+            DB_ERROR                    => 'errore sconosciuto',
+            DB_ERROR_ALREADY_EXISTS     => 'esiste già',
+            DB_ERROR_CANNOT_CREATE      => 'non posso creare',
+            DB_ERROR_CANNOT_DELETE      => 'non posso cancellare',
+            DB_ERROR_CANNOT_DROP        => 'non posso eliminare',
+            DB_ERROR_CONSTRAINT         => 'violazione constraint',
+            DB_ERROR_DIVZERO            => 'divisione per zero',
+            DB_ERROR_INVALID            => 'non valido',
+            DB_ERROR_INVALID_DATE       => 'data od ora non valida',
+            DB_ERROR_INVALID_NUMBER     => 'numero non valido',
+            DB_ERROR_MISMATCH           => 'diversi',
+            DB_ERROR_NODBSELECTED       => 'nessun database selezionato',
+            DB_ERROR_NOSUCHFIELD        => 'nessun campo trovato',
+            DB_ERROR_NOSUCHTABLE        => 'nessuna tabella trovata',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend non abilitato',
+            DB_ERROR_NOT_FOUND          => 'non trovato',
+            DB_ERROR_NOT_LOCKED         => 'non bloccato',
+            DB_ERROR_SYNTAX             => 'errore di sintassi',
+            DB_ERROR_UNSUPPORTED        => 'non supportato',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'valore inserito troppo grande per una colonna',
+            DB_ERROR_INVALID_DSN        => 'DSN non valido',
+            DB_ERROR_CONNECT_FAILED     => 'connessione fallita',
+            0                           => 'nessun errore', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'dati inseriti insufficienti',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'estensione non trovata',
+            DB_ERROR_NOSUCHDB           => 'database non trovato',
+            DB_ERROR_ACCESS_VIOLATION   => 'permessi insufficienti'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-nl.inc.php b/adodb/lang/adodb-nl.inc.php
new file mode 100644
index 0000000..abe77b5
--- /dev/null
+++ b/adodb/lang/adodb-nl.inc.php
@@ -0,0 +1,33 @@
+ 'nl',
+            DB_ERROR                    => 'onbekende fout',
+            DB_ERROR_ALREADY_EXISTS     => 'bestaat al',
+            DB_ERROR_CANNOT_CREATE      => 'kan niet aanmaken',
+            DB_ERROR_CANNOT_DELETE      => 'kan niet wissen',
+            DB_ERROR_CANNOT_DROP        => 'kan niet verwijderen',
+            DB_ERROR_CONSTRAINT         => 'constraint overtreding',
+            DB_ERROR_DIVZERO            => 'poging tot delen door nul',
+            DB_ERROR_INVALID            => 'ongeldig',
+            DB_ERROR_INVALID_DATE       => 'ongeldige datum of tijd',
+            DB_ERROR_INVALID_NUMBER     => 'ongeldig nummer',
+            DB_ERROR_MISMATCH           => 'is incorrect',
+            DB_ERROR_NODBSELECTED       => 'geen database geselecteerd',
+            DB_ERROR_NOSUCHFIELD        => 'onbekend veld',
+            DB_ERROR_NOSUCHTABLE        => 'onbekende tabel',
+            DB_ERROR_NOT_CAPABLE        => 'database systeem is niet tot uitvoer in staat',
+            DB_ERROR_NOT_FOUND          => 'niet gevonden',
+            DB_ERROR_NOT_LOCKED         => 'niet vergrendeld',
+            DB_ERROR_SYNTAX             => 'syntaxis fout',
+            DB_ERROR_UNSUPPORTED        => 'niet ondersteund',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'waarde telling op rij',
+            DB_ERROR_INVALID_DSN        => 'ongeldige DSN',
+            DB_ERROR_CONNECT_FAILED     => 'connectie mislukt',
+            0	                       => 'geen fout', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'onvoldoende data gegeven',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie niet gevonden',
+            DB_ERROR_NOSUCHDB           => 'onbekende database',
+            DB_ERROR_ACCESS_VIOLATION   => 'onvoldoende rechten'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-pl.inc.php b/adodb/lang/adodb-pl.inc.php
new file mode 100644
index 0000000..9d9e390
--- /dev/null
+++ b/adodb/lang/adodb-pl.inc.php
@@ -0,0 +1,35 @@
+
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'pl',
+            DB_ERROR                    => 'niezidentyfikowany bd',
+            DB_ERROR_ALREADY_EXISTS     => 'ju istniej',
+            DB_ERROR_CANNOT_CREATE      => 'nie mona stworzy',
+            DB_ERROR_CANNOT_DELETE      => 'nie mona usun',
+            DB_ERROR_CANNOT_DROP        => 'nie mona porzuci',
+            DB_ERROR_CONSTRAINT         => 'pogwacenie uprawnie',
+            DB_ERROR_DIVZERO            => 'dzielenie przez zero',
+            DB_ERROR_INVALID            => 'bdny',
+            DB_ERROR_INVALID_DATE       => 'bdna godzina lub data',
+            DB_ERROR_INVALID_NUMBER     => 'bdny numer',
+            DB_ERROR_MISMATCH           => 'niedopasowanie',
+            DB_ERROR_NODBSELECTED       => 'baza danych nie zostaa wybrana',
+            DB_ERROR_NOSUCHFIELD        => 'nie znaleziono pola',
+            DB_ERROR_NOSUCHTABLE        => 'nie znaleziono tabeli',
+            DB_ERROR_NOT_CAPABLE        => 'nie zdolny',
+            DB_ERROR_NOT_FOUND          => 'nie znaleziono',
+            DB_ERROR_NOT_LOCKED         => 'nie zakmnity',
+            DB_ERROR_SYNTAX             => 'bd skadni',
+            DB_ERROR_UNSUPPORTED        => 'nie obsuguje',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'warto liczona w szeregu',
+            DB_ERROR_INVALID_DSN        => 'bdny DSN',
+            DB_ERROR_CONNECT_FAILED     => 'poczenie nie zostao zrealizowane',
+            0	                       => 'brak bdw', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilo informacji',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'nie znaleziono rozszerzenia',
+            DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
+            DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-pt-br.inc.php b/adodb/lang/adodb-pt-br.inc.php
new file mode 100644
index 0000000..cd28f7e
--- /dev/null
+++ b/adodb/lang/adodb-pt-br.inc.php
@@ -0,0 +1,35 @@
+ 'pt-br',
+            DB_ERROR                    => 'erro desconhecido',
+            DB_ERROR_ALREADY_EXISTS     => 'j existe',
+            DB_ERROR_CANNOT_CREATE      => 'impossvel criar',
+            DB_ERROR_CANNOT_DELETE      => 'impossvel exclur',
+            DB_ERROR_CANNOT_DROP        => 'impossvel remover',
+            DB_ERROR_CONSTRAINT         => 'violao do confinamente',
+            DB_ERROR_DIVZERO            => 'diviso por zero',
+            DB_ERROR_INVALID            => 'invlido',
+            DB_ERROR_INVALID_DATE       => 'data ou hora invlida',
+            DB_ERROR_INVALID_NUMBER     => 'nmero invlido',
+            DB_ERROR_MISMATCH           => 'erro',
+            DB_ERROR_NODBSELECTED       => 'nenhum banco de dados selecionado',
+            DB_ERROR_NOSUCHFIELD        => 'campo invlido',
+            DB_ERROR_NOSUCHTABLE        => 'tabela inexistente',
+            DB_ERROR_NOT_CAPABLE        => 'capacidade invlida para este BD',
+            DB_ERROR_NOT_FOUND          => 'no encontrado',
+            DB_ERROR_NOT_LOCKED         => 'no bloqueado',
+            DB_ERROR_SYNTAX             => 'erro de sintaxe',
+            DB_ERROR_UNSUPPORTED        => 
+'no suportado',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'a quantidade de colunas no corresponde ao de valores',
+            DB_ERROR_INVALID_DSN        => 'DSN invlido',
+            DB_ERROR_CONNECT_FAILED     => 'falha na conexo',
+            0				=> 'sem erro', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'dados insuficientes',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extenso no encontrada',
+            DB_ERROR_NOSUCHDB           => 'banco de dados no encontrado',
+            DB_ERROR_ACCESS_VIOLATION   => 'permisso insuficiente'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-ro.inc.php b/adodb/lang/adodb-ro.inc.php
new file mode 100644
index 0000000..bcd7d13
--- /dev/null
+++ b/adodb/lang/adodb-ro.inc.php
@@ -0,0 +1,35 @@
+ */
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'ro',
+            DB_ERROR                    => 'eroare necunoscuta',
+            DB_ERROR_ALREADY_EXISTS     => 'deja exista',
+            DB_ERROR_CANNOT_CREATE      => 'nu se poate creea',
+            DB_ERROR_CANNOT_DELETE      => 'nu se poate sterge',
+            DB_ERROR_CANNOT_DROP        => 'nu se poate executa drop',
+            DB_ERROR_CONSTRAINT         => 'violare de constrain',
+            DB_ERROR_DIVZERO            => 'se divide la zero',
+            DB_ERROR_INVALID            => 'invalid',
+            DB_ERROR_INVALID_DATE       => 'data sau timp invalide',
+            DB_ERROR_INVALID_NUMBER     => 'numar invalid',
+            DB_ERROR_MISMATCH           => 'nepotrivire-mismatch',
+            DB_ERROR_NODBSELECTED       => 'nu exista baza de date selectata',
+            DB_ERROR_NOSUCHFIELD        => 'camp inexistent',
+            DB_ERROR_NOSUCHTABLE        => 'tabela inexistenta',
+            DB_ERROR_NOT_CAPABLE        => 'functie optionala neinstalata',
+            DB_ERROR_NOT_FOUND          => 'negasit',
+            DB_ERROR_NOT_LOCKED         => 'neblocat',
+            DB_ERROR_SYNTAX             => 'eroare de sintaxa',
+            DB_ERROR_UNSUPPORTED        => 'nu e suportat',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'valoare prea mare pentru coloana',
+            DB_ERROR_INVALID_DSN        => 'DSN invalid',
+            DB_ERROR_CONNECT_FAILED     => 'conectare esuata',
+            0	                       => 'fara eroare', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'data introduse insuficiente',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'extensie negasita',
+            DB_ERROR_NOSUCHDB           => 'nu exista baza de date',
+            DB_ERROR_ACCESS_VIOLATION   => 'permisiuni insuficiente'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-ru1251.inc.php b/adodb/lang/adodb-ru1251.inc.php
new file mode 100644
index 0000000..3a20538
--- /dev/null
+++ b/adodb/lang/adodb-ru1251.inc.php
@@ -0,0 +1,35 @@
+ 'ru1251',
+            DB_ERROR                    => ' ',
+            DB_ERROR_ALREADY_EXISTS     => ' ',
+            DB_ERROR_CANNOT_CREATE      => ' ',
+            DB_ERROR_CANNOT_DELETE      => ' ',
+            DB_ERROR_CANNOT_DROP        => '  (drop)',
+            DB_ERROR_CONSTRAINT         => '  ',
+            DB_ERROR_DIVZERO            => '  0',
+            DB_ERROR_INVALID            => '',
+            DB_ERROR_INVALID_DATE       => '   ',
+            DB_ERROR_INVALID_NUMBER     => ' ',
+            DB_ERROR_MISMATCH           => '',
+            DB_ERROR_NODBSELECTED       => '  ',
+            DB_ERROR_NOSUCHFIELD        => '  ',
+            DB_ERROR_NOSUCHTABLE        => '  ',
+            DB_ERROR_NOT_CAPABLE        => '   ',
+            DB_ERROR_NOT_FOUND          => ' ',
+            DB_ERROR_NOT_LOCKED         => ' ',
+            DB_ERROR_SYNTAX             => ' ',
+            DB_ERROR_UNSUPPORTED        => ' ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => '   ',
+            DB_ERROR_INVALID_DSN        => ' DSN',
+            DB_ERROR_CONNECT_FAILED     => ' ',
+            0                               => ' ', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => '  ',
+            DB_ERROR_EXTENSION_NOT_FOUND=> '  ',
+            DB_ERROR_NOSUCHDB           => '  ',
+            DB_ERROR_ACCESS_VIOLATION   => '  '
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-sv.inc.php b/adodb/lang/adodb-sv.inc.php
new file mode 100644
index 0000000..a9fd698
--- /dev/null
+++ b/adodb/lang/adodb-sv.inc.php
@@ -0,0 +1,33 @@
+ 'en',
+            DB_ERROR                    => 'Oknt fel',
+            DB_ERROR_ALREADY_EXISTS     => 'finns redan',
+            DB_ERROR_CANNOT_CREATE      => 'kan inte skapa',
+            DB_ERROR_CANNOT_DELETE      => 'kan inte ta bort',
+            DB_ERROR_CANNOT_DROP        => 'kan inte slppa',
+            DB_ERROR_CONSTRAINT         => 'begrnsning krnkt',
+            DB_ERROR_DIVZERO            => 'division med noll',
+            DB_ERROR_INVALID            => 'ogiltig',
+            DB_ERROR_INVALID_DATE       => 'ogiltigt datum eller tid',
+            DB_ERROR_INVALID_NUMBER     => 'ogiltigt tal',
+            DB_ERROR_MISMATCH           => 'felaktig matchning',
+            DB_ERROR_NODBSELECTED       => 'ingen databas vald',
+            DB_ERROR_NOSUCHFIELD        => 'inget sdant flt',
+            DB_ERROR_NOSUCHTABLE        => 'ingen sdan tabell',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend klarar det inte',
+            DB_ERROR_NOT_FOUND          => 'finns inte',
+            DB_ERROR_NOT_LOCKED         => 'inte lst',
+            DB_ERROR_SYNTAX             => 'syntaxfel',
+            DB_ERROR_UNSUPPORTED        => 'stds ej',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'vrde rknat p rad',
+            DB_ERROR_INVALID_DSN        => 'ogiltig DSN',
+            DB_ERROR_CONNECT_FAILED     => 'anslutning misslyckades',
+            0	                       => 'inget fel', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'otillrckligt med data angivet',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'utkning hittades ej',
+            DB_ERROR_NOSUCHDB           => 'ingen sdan databas',
+            DB_ERROR_ACCESS_VIOLATION   => 'otillrckliga rttigheter'
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb-uk1251.inc.php b/adodb/lang/adodb-uk1251.inc.php
new file mode 100644
index 0000000..675016d
--- /dev/null
+++ b/adodb/lang/adodb-uk1251.inc.php
@@ -0,0 +1,35 @@
+ 'uk1251',
+            DB_ERROR                    => ' ',
+            DB_ERROR_ALREADY_EXISTS     => ' ',
+            DB_ERROR_CANNOT_CREATE      => ' ',
+            DB_ERROR_CANNOT_DELETE      => ' ',
+            DB_ERROR_CANNOT_DROP        => '  (drop)',
+            DB_ERROR_CONSTRAINT         => '  ',
+            DB_ERROR_DIVZERO            => '  0',
+            DB_ERROR_INVALID            => '',
+            DB_ERROR_INVALID_DATE       => '   ',
+            DB_ERROR_INVALID_NUMBER     => ' ',
+            DB_ERROR_MISMATCH           => '',
+            DB_ERROR_NODBSELECTED       => '  ',
+            DB_ERROR_NOSUCHFIELD        => '  ',
+            DB_ERROR_NOSUCHTABLE        => '  ',
+            DB_ERROR_NOT_CAPABLE        => '   ',
+            DB_ERROR_NOT_FOUND          => ' ',
+            DB_ERROR_NOT_LOCKED         => ' ',
+            DB_ERROR_SYNTAX             => ' ',
+            DB_ERROR_UNSUPPORTED        => ' ',
+            DB_ERROR_VALUE_COUNT_ON_ROW => '   ',
+            DB_ERROR_INVALID_DSN        => ' DSN',
+            DB_ERROR_CONNECT_FAILED     => '\' ',
+            0                               => ' ', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => '  ',
+            DB_ERROR_EXTENSION_NOT_FOUND=> '  ',
+            DB_ERROR_NOSUCHDB           => '  ',
+            DB_ERROR_ACCESS_VIOLATION   => '  '
+);
+?>
\ No newline at end of file
diff --git a/adodb/lang/adodb_th.inc.php b/adodb/lang/adodb_th.inc.php
new file mode 100644
index 0000000..3fdd997
--- /dev/null
+++ b/adodb/lang/adodb_th.inc.php
@@ -0,0 +1,33 @@
+
+$ADODB_LANG_ARRAY = array (
+			'LANG'                      => 'th',
+            DB_ERROR                    => 'error ไม่รู้สาเหตุ',
+            DB_ERROR_ALREADY_EXISTS     => 'มี?ล้ว',
+            DB_ERROR_CANNOT_CREATE      => 'สร้างไม่ได้',
+            DB_ERROR_CANNOT_DELETE      => 'ลบไม่ได้',
+            DB_ERROR_CANNOT_DROP        => 'drop ไม่ได้',
+            DB_ERROR_CONSTRAINT         => 'constraint violation',
+            DB_ERROR_DIVZERO            => 'หา?ด้วยสู?',
+            DB_ERROR_INVALID            => 'ไม่ valid',
+            DB_ERROR_INVALID_DATE       => 'วันที่ เวลา ไม่ valid',
+            DB_ERROR_INVALID_NUMBER     => 'เลขไม่ valid',
+            DB_ERROR_MISMATCH           => 'mismatch',
+            DB_ERROR_NODBSELECTED       => 'ไม่ได้เลือ??านข้อมูล',
+            DB_ERROR_NOSUCHFIELD        => 'ไม่มีฟีลด์นี้',
+            DB_ERROR_NOSUCHTABLE        => 'ไม่มีตารางนี้',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+            DB_ERROR_NOT_FOUND          => 'ไม่พบ',
+            DB_ERROR_NOT_LOCKED         => 'ไม่ได้ล๊อ?',
+            DB_ERROR_SYNTAX             => 'ผิด syntax',
+            DB_ERROR_UNSUPPORTED        => 'ไม่ support',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+            DB_ERROR_INVALID_DSN        => 'invalid DSN',
+            DB_ERROR_CONNECT_FAILED     => 'ไม่สามารถ connect',
+            0	                        => 'no error', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ข้อมูลไม่เพียงพอ',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'ไม่พบ extension',
+            DB_ERROR_NOSUCHDB           => 'ไม่มีข้อมูลนี้',
+            DB_ERROR_ACCESS_VIOLATION   => 'permissions ไม่พอ'
+);
+?>
\ No newline at end of file
diff --git a/adodb/license.txt b/adodb/license.txt
new file mode 100644
index 0000000..2353871
--- /dev/null
+++ b/adodb/license.txt
@@ -0,0 +1,182 @@
+ADOdb is dual licensed using BSD and LGPL. 
+
+In plain English, you do not need to distribute your application  in source code form, nor do you need to distribute ADOdb source code, provided you follow the rest of terms of the BSD license.
+
+For more info about ADOdb, visit http://adodb.sourceforge.net/
+
+BSD Style-License
+=================
+
+Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list 
+of conditions and the following disclaimer. 
+
+Redistributions in binary form must reproduce the above copyright notice, this list 
+of conditions and the following disclaimer in the documentation and/or other materials 
+provided with the distribution. 
+
+Neither the name of the John Lim nor the names of its contributors may be used to 
+endorse or promote products derived from this software without specific prior written 
+permission. 
+
+DISCLAIMER:
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+JOHN LIM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+==========================================================
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999 
+ 
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+ 
+ 
+Preamble
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
+
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
+
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
+
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
+
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
+
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
+
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
+
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
+
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
+
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
+
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
+
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
+
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
+
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
+
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
+
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
+
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
+
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+
+
+a) The modified work must itself be a software library. 
+b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
+c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
+d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. 
+(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
+
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
+
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
+
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
+
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
+
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
+
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
+
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
+
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
+
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
+
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
+
+
+a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
+b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
+c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
+d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
+e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
+
+
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
+b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
+
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+
+NO WARRANTY 
+
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+
+
+END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/adodb/pear/Auth/Container/ADOdb.php b/adodb/pear/Auth/Container/ADOdb.php
new file mode 100644
index 0000000..640c74b
--- /dev/null
+++ b/adodb/pear/Auth/Container/ADOdb.php
@@ -0,0 +1,405 @@
+
+	Richard Tango-Lowy                           
+*/
+
+require_once 'Auth/Container.php';
+require_once 'adodb.inc.php';
+require_once 'adodb-pear.inc.php';
+require_once 'adodb-errorpear.inc.php';
+
+/**
+ * Storage driver for fetching login data from a database using ADOdb-PHP.
+ *
+ * This storage driver can use all databases which are supported
+ * by the ADBdb DB abstraction layer to fetch login data.
+ * See http://php.weblogs.com/adodb for information on ADOdb.
+ * NOTE: The ADOdb directory MUST be in your PHP include_path!
+ *
+ * @author   Richard Tango-Lowy 
+ * @package  Auth
+ * @version  $Revision: 1.3 $
+ */
+class Auth_Container_ADOdb extends Auth_Container
+{
+
+    /**
+     * Additional options for the storage container
+     * @var array
+     */
+    var $options = array();
+
+    /**
+     * DB object
+     * @var object
+     */
+    var $db = null;
+    var $dsn = '';
+	
+    /**
+     * User that is currently selected from the DB.
+     * @var string
+     */
+    var $activeUser = '';
+
+    // {{{ Constructor
+
+    /**
+     * Constructor of the container class
+     *
+     * Initate connection to the database via PEAR::ADOdb
+     *
+     * @param  string Connection data or DB object
+     * @return object Returns an error object if something went wrong
+     */
+    function Auth_Container_ADOdb($dsn)
+    {
+        $this->_setDefaults();
+		
+        if (is_array($dsn)) {
+            $this->_parseOptions($dsn);
+
+            if (empty($this->options['dsn'])) {
+                PEAR::raiseError('No connection parameters specified!');
+            }
+        } else {
+        	// Extract db_type from dsn string.
+            $this->options['dsn'] = $dsn;
+        }
+    }
+
+    // }}}
+    // {{{ _connect()
+
+    /**
+     * Connect to database by using the given DSN string
+     *
+     * @access private
+     * @param  string DSN string
+     * @return mixed  Object on error, otherwise bool
+     */
+     function _connect($dsn)
+    {
+        if (is_string($dsn) || is_array($dsn)) {
+        	if(!$this->db) {
+	        	$this->db = ADONewConnection($dsn);
+	    		if( $err = ADODB_Pear_error() ) {
+	   	    		return PEAR::raiseError($err);
+	    		}
+        	}
+        	
+        } else {
+            return PEAR::raiseError('The given dsn was not valid in file ' . __FILE__ . ' at line ' . __LINE__,
+                                    41,
+                                    PEAR_ERROR_RETURN,
+                                    null,
+                                    null
+                                    );
+        }
+        
+        if(!$this->db) {
+        	return PEAR::raiseError(ADODB_Pear_error());
+        } else {
+        	return true;
+        }
+    }
+
+    // }}}
+    // {{{ _prepare()
+
+    /**
+     * Prepare database connection
+     *
+     * This function checks if we have already opened a connection to
+     * the database. If that's not the case, a new connection is opened.
+     *
+     * @access private
+     * @return mixed True or a DB error object.
+     */
+    function _prepare()
+    {
+    	if(!$this->db) {
+    		$res = $this->_connect($this->options['dsn']);  		
+    	}
+        return true;
+    }
+
+    // }}}
+    // {{{ query()
+
+    /**
+     * Prepare query to the database
+     *
+     * This function checks if we have already opened a connection to
+     * the database. If that's not the case, a new connection is opened.
+     * After that the query is passed to the database.
+     *
+     * @access public
+     * @param  string Query string
+     * @return mixed  a DB_result object or DB_OK on success, a DB
+     *                or PEAR error on failure
+     */
+    function query($query)
+    {
+        $err = $this->_prepare();
+        if ($err !== true) {
+            return $err;
+        }
+        return $this->db->query($query);
+    }
+
+    // }}}
+    // {{{ _setDefaults()
+
+    /**
+     * Set some default options
+     *
+     * @access private
+     * @return void
+     */
+    function _setDefaults()
+    {
+    	$this->options['db_type']	= 'mysql';
+        $this->options['table']       = 'auth';
+        $this->options['usernamecol'] = 'username';
+        $this->options['passwordcol'] = 'password';
+        $this->options['dsn']         = '';
+        $this->options['db_fields']   = '';
+        $this->options['cryptType']   = 'md5';
+    }
+
+    // }}}
+    // {{{ _parseOptions()
+
+    /**
+     * Parse options passed to the container class
+     *
+     * @access private
+     * @param  array
+     */
+    function _parseOptions($array)
+    {
+        foreach ($array as $key => $value) {
+            if (isset($this->options[$key])) {
+                $this->options[$key] = $value;
+            }
+        }
+
+        /* Include additional fields if they exist */
+        if(!empty($this->options['db_fields'])){
+            if(is_array($this->options['db_fields'])){
+                $this->options['db_fields'] = join($this->options['db_fields'], ', ');
+            }
+            $this->options['db_fields'] = ', '.$this->options['db_fields'];
+        }
+    }
+
+    // }}}
+    // {{{ fetchData()
+
+    /**
+     * Get user information from database
+     *
+     * This function uses the given username to fetch
+     * the corresponding login data from the database
+     * table. If an account that matches the passed username
+     * and password is found, the function returns true.
+     * Otherwise it returns false.
+     *
+     * @param   string Username
+     * @param   string Password
+     * @return  mixed  Error object or boolean
+     */
+    function fetchData($username, $password)
+    {
+        // Prepare for a database query
+        $err = $this->_prepare();
+        if ($err !== true) {
+            return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
+
+        // Find if db_fields contains a *, i so assume all col are selected
+        if(strstr($this->options['db_fields'], '*')){
+            $sql_from = "*";
+        }
+        else{
+            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+        }
+        
+        $query = "SELECT ".$sql_from.
+                " FROM ".$this->options['table'].
+                " WHERE ".$this->options['usernamecol']." = " . $this->db->Quote($username);
+        
+        $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+        $rset = $this->db->Execute( $query );
+        $res = $rset->fetchRow();
+
+        if (DB::isError($res)) {
+            return PEAR::raiseError($res->getMessage(), $res->getCode());
+        }
+        if (!is_array($res)) {
+            $this->activeUser = '';
+            return false;
+        }
+        if ($this->verifyPassword(trim($password, "\r\n"),
+                                  trim($res[$this->options['passwordcol']], "\r\n"),
+                                  $this->options['cryptType'])) {
+            // Store additional field values in the session
+            foreach ($res as $key => $value) {
+                if ($key == $this->options['passwordcol'] ||
+                    $key == $this->options['usernamecol']) {
+                    continue;
+                }
+                // Use reference to the auth object if exists
+                // This is because the auth session variable can change so a static call to setAuthData does not make sence
+                if(is_object($this->_auth_obj)){
+                    $this->_auth_obj->setAuthData($key, $value);
+                } else {
+                    Auth::setAuthData($key, $value);
+                }
+            }
+
+            return true;
+        }
+
+        $this->activeUser = $res[$this->options['usernamecol']];
+        return false;
+    }
+
+    // }}}
+    // {{{ listUsers()
+
+    function listUsers()
+    {
+        $err = $this->_prepare();
+        if ($err !== true) {
+            return PEAR::raiseError($err->getMessage(), $err->getCode());
+        }
+
+        $retVal = array();
+
+        // Find if db_fileds contains a *, i so assume all col are selected
+        if(strstr($this->options['db_fields'], '*')){
+            $sql_from = "*";
+        }
+        else{
+            $sql_from = $this->options['usernamecol'] . ", ".$this->options['passwordcol'].$this->options['db_fields'];
+        }
+
+        $query = sprintf("SELECT %s FROM %s",
+                         $sql_from,
+                         $this->options['table']
+                         );
+        $res = $this->db->getAll($query, null, DB_FETCHMODE_ASSOC);
+
+        if (DB::isError($res)) {
+            return PEAR::raiseError($res->getMessage(), $res->getCode());
+        } else {
+            foreach ($res as $user) {
+                $user['username'] = $user[$this->options['usernamecol']];
+                $retVal[] = $user;
+            }
+        }
+        return $retVal;
+    }
+
+    // }}}
+    // {{{ addUser()
+
+    /**
+     * Add user to the storage container
+     *
+     * @access public
+     * @param  string Username
+     * @param  string Password
+     * @param  mixed  Additional information that are stored in the DB
+     *
+     * @return mixed True on success, otherwise error object
+     */
+    function addUser($username, $password, $additional = "")
+    {
+        if (function_exists($this->options['cryptType'])) {
+            $cryptFunction = $this->options['cryptType'];
+        } else {
+            $cryptFunction = 'md5';
+        }
+
+        $additional_key   = '';
+        $additional_value = '';
+
+        if (is_array($additional)) {
+            foreach ($additional as $key => $value) {
+                $additional_key .= ', ' . $key;
+                $additional_value .= ", '" . $value . "'";
+            }
+        }
+
+        $query = sprintf("INSERT INTO %s (%s, %s%s) VALUES ('%s', '%s'%s)",
+                         $this->options['table'],
+                         $this->options['usernamecol'],
+                         $this->options['passwordcol'],
+                         $additional_key,
+                         $username,
+                         $cryptFunction($password),
+                         $additional_value
+                         );
+
+        $res = $this->query($query);
+
+        if (DB::isError($res)) {
+           return PEAR::raiseError($res->getMessage(), $res->getCode());
+        } else {
+          return true;
+        }
+    }
+
+    // }}}
+    // {{{ removeUser()
+
+    /**
+     * Remove user from the storage container
+     *
+     * @access public
+     * @param  string Username
+     *
+     * @return mixed True on success, otherwise error object
+     */
+    function removeUser($username)
+    {
+        $query = sprintf("DELETE FROM %s WHERE %s = '%s'",
+                         $this->options['table'],
+                         $this->options['usernamecol'],
+                         $username
+                         );
+
+        $res = $this->query($query);
+
+        if (DB::isError($res)) {
+           return PEAR::raiseError($res->getMessage(), $res->getCode());
+        } else {
+          return true;
+        }
+    }
+
+    // }}}
+}
+
+function showDbg( $string ) {
+	print "
+-- $string
    ";
+}
+function dump( $var, $str, $vardump = false ) {
+	print "
    $str
    ";
+	( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var ));
+	print "
    ";
+}
+?>
diff --git a/adodb/pear/readme.Auth.txt b/adodb/pear/readme.Auth.txt
new file mode 100644
index 0000000..db28319
--- /dev/null
+++ b/adodb/pear/readme.Auth.txt
@@ -0,0 +1,20 @@
+From: Rich Tango-Lowy (richtl#arscognita.com)
+Date: Sat, May 29, 2004 11:20 am
+
+OK, I hacked out an ADOdb container for PEAR-Auth. The error handling's 
+a bit of a mess, but all the methods work.
+
+Copy ADOdb.php to your pear/Auth/Container/ directory.
+
+Use the ADOdb container exactly as you would the DB
+container, but specify 'ADOdb' instead of 'DB':
+
+$dsn = "mysql://myuser:mypass@localhost/authdb";
+$a = new Auth("ADOdb", $dsn, "loginFunction");
+
+
+-------------------
+
+John Lim adds:
+
+See http://pear.php.net/manual/en/package.authentication.php
diff --git a/adodb/perf/perf-db2.inc.php b/adodb/perf/perf-db2.inc.php
new file mode 100644
index 0000000..7531e59
--- /dev/null
+++ b/adodb/perf/perf-db2.inc.php
@@ -0,0 +1,102 @@
+ array('RATIO',
+			"SELECT 
+				case when sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)=0 then 0 
+				else 100*(1-sum(POOL_DATA_P_READS+POOL_INDEX_P_READS)/sum(POOL_DATA_L_READS+POOL_INDEX_L_READS)) end 
+				FROM TABLE(SNAPSHOT_APPL('',-2)) as t",
+			'=WarnCacheRatio'),
+			
+	'Data Cache',
+		'data cache buffers' => array('DATAC',
+		'select sum(npages) from SYSCAT.BUFFERPOOLS',
+			'See tuning reference.' ),
+		'cache blocksize' => array('DATAC',
+		'select avg(pagesize) from SYSCAT.BUFFERPOOLS',
+			'' ),
+		'data cache size' => array('DATAC',
+		'select sum(npages*pagesize) from SYSCAT.BUFFERPOOLS',
+			'' ),
+	'Connections',
+		'current connections' => array('SESS',
+			"SELECT count(*) FROM TABLE(SNAPSHOT_APPL_INFO('',-2)) as t",
+			''),
+
+		false
+	);
+
+
+	function perf_db2(&$conn)
+	{
+		$this->conn = $conn;
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		$save = $this->conn->LogSQL(false);
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		$qno = rand();
+		$ok = $this->conn->Execute("EXPLAIN PLAN SET QUERYNO=$qno FOR $sql");
+		ob_start();
+		if (!$ok) echo "
    Have EXPLAIN tables been created?
    ";
+		else {
+			$rs = $this->conn->Execute("select * from explain_statement where queryno=$qno");
+			if ($rs) rs2html($rs);
+		}
+		$s = ob_get_contents();
+		ob_end_clean();
+		$this->conn->LogSQL($save);
+		
+		$s .= $this->Tracer($sql);
+		return $s;
+	}
+	
+	
+	function Tables()
+	{
+		$rs = $this->conn->Execute("select tabschema,tabname,card as rows,
+			npages pages_used,fpages pages_allocated, tbspace tablespace  
+			from syscat.tables where tabschema not in ('SYSCAT','SYSIBM','SYSSTAT') order by 1,2");
+		return rs2html($rs,false,false,false,false);
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/perf/perf-informix.inc.php b/adodb/perf/perf-informix.inc.php
new file mode 100644
index 0000000..9dc3e9b
--- /dev/null
+++ b/adodb/perf/perf-informix.inc.php
@@ -0,0 +1,70 @@
+ array('RATIOH',
+		"select round((1-(wt.value / (rd.value + wr.value)))*100,2)
+		from sysmaster:sysprofile wr, sysmaster:sysprofile rd, sysmaster:sysprofile wt
+		where rd.name = 'pagreads' and
+		wr.name = 'pagwrites' and
+		wt.name = 'buffwts'",
+		'=WarnCacheRatio'),
+	'IO',
+		'data reads' => array('IO',
+		"select value from sysmaster:sysprofile where name='pagreads'",
+		'Page reads'),
+		
+		'data writes' => array('IO',
+		"select value from sysmaster:sysprofile where name='pagwrites'",
+		'Page writes'),
+	
+	'Connections',
+		'current connections' => array('SESS',
+		'select count(*) from sysmaster:syssessions',
+		'Number of sessions'),
+	
+	false
+	
+	);
+	
+	function perf_informix(&$conn)
+	{
+		$this->conn = $conn;
+	}
+
+}
+?>
diff --git a/adodb/perf/perf-mssql.inc.php b/adodb/perf/perf-mssql.inc.php
new file mode 100644
index 0000000..0ddd3a8
--- /dev/null
+++ b/adodb/perf/perf-mssql.inc.php
@@ -0,0 +1,164 @@
+ array('RATIO',
+			"select round((a.cntr_value*100.0)/b.cntr_value,2) from master.dbo.sysperfinfo a, master.dbo.sysperfinfo b where a.counter_name = 'Buffer cache hit ratio' and b.counter_name='Buffer cache hit ratio base'",
+			'=WarnCacheRatio'),
+		'prepared sql hit ratio' => array('RATIO',
+			array('dbcc cachestats','Prepared',1,100),
+			''),
+		'adhoc sql hit ratio' => array('RATIO',
+			array('dbcc cachestats','Adhoc',1,100),
+			''),
+	'IO',
+		'data reads' => array('IO',
+		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
+		'data writes' => array('IO',
+		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
+			
+	'Data Cache',
+		'data cache size' => array('DATAC',
+		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
+			'' ),
+		'data cache blocksize' => array('DATAC',
+			"select 8192",'page size'),
+	'Connections',
+		'current connections' => array('SESS',
+			'=sp_who',
+			''),
+		'max connections' => array('SESS',
+			"SELECT @@MAX_CONNECTIONS",
+			''),
+
+		false
+	);
+	
+	
+	function perf_mssql(&$conn)
+	{
+		if ($conn->dataProvider == 'odbc') {
+			$this->sql1 = 'sql1';
+			//$this->explain = false;
+		}
+		$this->conn = $conn;
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		
+		$save = $this->conn->LogSQL(false);
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		
+		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
+		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
+		$sql = str_replace('?',"''",$sql);
+		global $ADODB_FETCH_MODE;
+		
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$rs = $this->conn->Execute($sql);
+		//adodb_printr($rs);
+		$ADODB_FETCH_MODE = $save;
+		if ($rs) {
+			$rs->MoveNext();
+			$s .= '';
+			while (!$rs->EOF) {
+				$s .= '\n"; ## NOTE CORRUPT  tag is intentional!!!!
+				$rs->MoveNext();
+			}
+			$s .= '
     Rows IO CPU     Plan
    '.round($rs->fields[8],1).''.round($rs->fields[9],3).''.round($rs->fields[10],3).'
    '.htmlspecialchars($rs->fields[0])."
    ';
+			
+			$rs->NextRecordSet();
+		}
+		
+		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
+		$this->conn->LogSQL($save);
+		$s .= $this->Tracer($sql);
+		return $s;
+	}
+	
+	function Tables()
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		//$this->conn->debug=1;
+		$s = '';
+		$rs1 = $this->conn->Execute("select distinct name from sysobjects where xtype='U'");
+		if ($rs1) {
+			while (!$rs1->EOF) {
+				$tab = $rs1->fields[0];
+				$tabq = $this->conn->qstr($tab);
+				$rs2 = $this->conn->Execute("sp_spaceused $tabq");
+				if ($rs2) {
+					$s .= '';
+					$rs2->Close();
+				}
+				$rs1->MoveNext();
+			}
+			$rs1->Close();
+		}
+		$ADODB_FETCH_MODE = $save;
+		return $s.'
    tablenamesize_in_kindex sizereserved size
    '.$tab.''.$rs2->fields[3].''.$rs2->fields[4].''.$rs2->fields[2].'
    ';
+	}
+	
+	function sp_who()
+	{
+		$arr = $this->conn->GetArray('sp_who');
+		return sizeof($arr);
+	}
+	
+	function HealthCheck($cli=false)
+	{
+		
+		$this->conn->Execute('dbcc traceon(3604)');
+		$html =  adodb_perf::HealthCheck($cli);
+		$this->conn->Execute('dbcc traceoff(3604)');
+		return $html;
+	}
+	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/perf/perf-mssqlnative.inc.php b/adodb/perf/perf-mssqlnative.inc.php
new file mode 100644
index 0000000..3419389
--- /dev/null
+++ b/adodb/perf/perf-mssqlnative.inc.php
@@ -0,0 +1,164 @@
+ array('RATIO',
+			"select round((a.cntr_value*100.0)/b.cntr_value,2) from master.dbo.sysperfinfo a, master.dbo.sysperfinfo b where a.counter_name = 'Buffer cache hit ratio' and b.counter_name='Buffer cache hit ratio base'",
+			'=WarnCacheRatio'),
+		'prepared sql hit ratio' => array('RATIO',
+			array('dbcc cachestats','Prepared',1,100),
+			''),
+		'adhoc sql hit ratio' => array('RATIO',
+			array('dbcc cachestats','Adhoc',1,100),
+			''),
+	'IO',
+		'data reads' => array('IO',
+		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page reads/sec'"),
+		'data writes' => array('IO',
+		"select cntr_value from master.dbo.sysperfinfo where counter_name = 'Page writes/sec'"),
+			
+	'Data Cache',
+		'data cache size' => array('DATAC',
+		"select cntr_value*8192 from master.dbo.sysperfinfo where counter_name = 'Total Pages' and object_name='SQLServer:Buffer Manager'",
+			'' ),
+		'data cache blocksize' => array('DATAC',
+			"select 8192",'page size'),
+	'Connections',
+		'current connections' => array('SESS',
+			'=sp_who',
+			''),
+		'max connections' => array('SESS',
+			"SELECT @@MAX_CONNECTIONS",
+			''),
+
+		false
+	);
+	
+	
+	function perf_mssqlnative(&$conn)
+	{
+		if ($conn->dataProvider == 'odbc') {
+			$this->sql1 = 'sql1';
+			//$this->explain = false;
+		}
+		$this->conn =& $conn;
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		
+		$save = $this->conn->LogSQL(false);
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		
+		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
+		$this->conn->Execute("SET SHOWPLAN_ALL ON;");
+		$sql = str_replace('?',"''",$sql);
+		global $ADODB_FETCH_MODE;
+		
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$rs =& $this->conn->Execute($sql);
+		//adodb_printr($rs);
+		$ADODB_FETCH_MODE = $save;
+		if ($rs) {
+			$rs->MoveNext();
+			$s .= '';
+			while (!$rs->EOF) {
+				$s .= '\n"; ## NOTE CORRUPT  tag is intentional!!!!
+				$rs->MoveNext();
+			}
+			$s .= '
     Rows IO CPU     Plan
    '.round($rs->fields[8],1).''.round($rs->fields[9],3).''.round($rs->fields[10],3).'
    '.htmlspecialchars($rs->fields[0])."
    ';
+			
+			$rs->NextRecordSet();
+		}
+		
+		$this->conn->Execute("SET SHOWPLAN_ALL OFF;");
+		$this->conn->LogSQL($save);
+		$s .= $this->Tracer($sql);
+		return $s;
+	}
+	
+	function Tables()
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		//$this->conn->debug=1;
+		$s = '';
+		$rs1 = $this->conn->Execute("select distinct name from sysobjects where xtype='U'");
+		if ($rs1) {
+			while (!$rs1->EOF) {
+				$tab = $rs1->fields[0];
+				$tabq = $this->conn->qstr($tab);
+				$rs2 = $this->conn->Execute("sp_spaceused $tabq");
+				if ($rs2) {
+					$s .= '';
+					$rs2->Close();
+				}
+				$rs1->MoveNext();
+			}
+			$rs1->Close();
+		}
+		$ADODB_FETCH_MODE = $save;
+		return $s.'
    tablenamesize_in_kindex sizereserved size
    '.$tab.''.$rs2->fields[3].''.$rs2->fields[4].''.$rs2->fields[2].'
    ';
+	}
+	
+	function sp_who()
+	{
+		$arr = $this->conn->GetArray('sp_who');
+		return sizeof($arr);
+	}
+	
+	function HealthCheck($cli=false)
+	{
+		
+		$this->conn->Execute('dbcc traceon(3604)');
+		$html =  adodb_perf::HealthCheck($cli);
+		$this->conn->Execute('dbcc traceoff(3604)');
+		return $html;
+	}
+	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/perf/perf-mysql.inc.php b/adodb/perf/perf-mysql.inc.php
new file mode 100644
index 0000000..ac35173
--- /dev/null
+++ b/adodb/perf/perf-mysql.inc.php
@@ -0,0 +1,315 @@
+ array('RATIO',
+			'=GetKeyHitRatio',
+			'=WarnCacheRatio'),
+		'InnoDB cache hit ratio' => array('RATIO',
+			'=GetInnoDBHitRatio',
+			'=WarnCacheRatio'),
+		'data cache hit ratio' => array('HIDE', # only if called
+			'=FindDBHitRatio',
+			'=WarnCacheRatio'),
+		'sql cache hit ratio' => array('RATIO',
+			'=GetQHitRatio',
+			''),
+	'IO',
+		'data reads' => array('IO',
+			'=GetReads',
+			'Number of selects (Key_reads is not accurate)'),
+		'data writes' => array('IO',
+			'=GetWrites',
+			'Number of inserts/updates/deletes * coef (Key_writes is not accurate)'),
+		
+	'Data Cache',
+		'MyISAM data cache size' => array('DATAC',
+			array("show variables", 'key_buffer_size'),
+			'' ),
+		'BDB data cache size' => array('DATAC',
+			array("show variables", 'bdb_cache_size'),
+			'' ),
+		'InnoDB data cache size' => array('DATAC',
+			array("show variables", 'innodb_buffer_pool_size'),
+			'' ),
+	'Memory Usage',
+		'read buffer size' => array('CACHE',
+			array("show variables", 'read_buffer_size'),
+			'(per session)'),
+		'sort buffer size' => array('CACHE',
+			array("show variables", 'sort_buffer_size'),
+			'Size of sort buffer (per session)' ),
+		'table cache' => array('CACHE',
+			array("show variables", 'table_cache'),
+			'Number of tables to keep open'),
+	'Connections',	
+		'current connections' => array('SESS',
+			array('show status','Threads_connected'),
+			''),
+		'max connections' => array( 'SESS',
+			array("show variables",'max_connections'),
+			''),
+	
+		false
+	);
+	
+	function perf_mysql(&$conn)
+	{
+		$this->conn = $conn;
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		
+		if (strtoupper(substr(trim($sql),0,6)) !== 'SELECT') return '
    Unable to EXPLAIN non-select statement
    ';
+		$save = $this->conn->LogSQL(false);
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		$sql = str_replace('?',"''",$sql);
+		
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$sql = $this->conn->GetOne("select sql1 from adodb_logsql where sql1 like $sqlq");
+		}
+		
+		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
+		$rs = $this->conn->Execute('EXPLAIN '.$sql);
+		$s .= rs2html($rs,false,false,false,false);
+		$this->conn->LogSQL($save);
+		$s .= $this->Tracer($sql);
+		return $s;
+	}
+	
+	function Tables()
+	{
+		if (!$this->tablesSQL) return false;
+		
+		$rs = $this->conn->Execute($this->tablesSQL);
+		if (!$rs) return false;
+		
+		$html = rs2html($rs,false,false,false,false);
+		return $html;
+	}
+	
+	function GetReads()
+	{
+	global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		
+		$rs = $this->conn->Execute('show status');
+		
+		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!$rs) return 0;
+		$val = 0;
+		while (!$rs->EOF) {
+			switch($rs->fields[0]) {
+			case 'Com_select': 
+				$val = $rs->fields[1];
+				$rs->Close();
+				return $val;
+			}
+			$rs->MoveNext();
+		} 
+		
+		$rs->Close();
+		
+		return $val;
+	}
+	
+	function GetWrites()
+	{
+	global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		
+		$rs = $this->conn->Execute('show status');
+		
+		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!$rs) return 0;
+		$val = 0.0;
+		while (!$rs->EOF) {
+			switch($rs->fields[0]) {
+			case 'Com_insert': 
+				$val += $rs->fields[1]; break;
+			case 'Com_delete': 
+				$val += $rs->fields[1]; break;
+			case 'Com_update': 
+				$val += $rs->fields[1]/2;
+				$rs->Close();
+				return $val;
+			}
+			$rs->MoveNext();
+		} 
+		
+		$rs->Close();
+		
+		return $val;
+	}
+	
+	function FindDBHitRatio()
+	{
+		// first find out type of table
+		//$this->conn->debug=1;
+		
+		global $ADODB_FETCH_MODE;
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		
+		$rs = $this->conn->Execute('show table status');
+		
+		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!$rs) return '';
+		$type = strtoupper($rs->fields[1]);
+		$rs->Close();
+		switch($type){
+		case 'MYISAM':
+		case 'ISAM':
+			return $this->DBParameter('MyISAM cache hit ratio').' (MyISAM)';
+		case 'INNODB':
+			return $this->DBParameter('InnoDB cache hit ratio').' (InnoDB)';
+		default:
+			return $type.' not supported';
+		}
+		
+	}
+	
+	function GetQHitRatio()
+	{
+		//Total number of queries = Qcache_inserts + Qcache_hits + Qcache_not_cached
+		$hits = $this->_DBParameter(array("show status","Qcache_hits"));
+		$total = $this->_DBParameter(array("show status","Qcache_inserts"));
+		$total += $this->_DBParameter(array("show status","Qcache_not_cached"));
+		
+		$total += $hits;
+		if ($total) return round(($hits*100)/$total,2);
+		return 0;
+	}
+	
+	/*
+		Use session variable to store Hit percentage, because MySQL
+		does not remember last value of SHOW INNODB STATUS hit ratio
+		
+		# 1st query to SHOW INNODB STATUS
+		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
+		Buffer pool hit rate 1000 / 1000
+		
+		# 2nd query to SHOW INNODB STATUS
+		0.00 reads/s, 0.00 creates/s, 0.00 writes/s
+		No buffer pool activity since the last printout
+	*/
+	function GetInnoDBHitRatio()
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		
+		$rs = $this->conn->Execute('show innodb status');
+		
+		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if (!$rs || $rs->EOF) return 0;
+		$stat = $rs->fields[0];
+		$rs->Close();
+		$at = strpos($stat,'Buffer pool hit rate');
+		$stat = substr($stat,$at,200);
+		if (preg_match('!Buffer pool hit rate\s*([0-9]*) / ([0-9]*)!',$stat,$arr)) {
+			$val = 100*$arr[1]/$arr[2];
+			$_SESSION['INNODB_HIT_PCT'] = $val;
+			return round($val,2);
+		} else {
+			if (isset($_SESSION['INNODB_HIT_PCT'])) return $_SESSION['INNODB_HIT_PCT'];
+			return 0;
+		}
+		return 0;
+	}
+	
+	function GetKeyHitRatio()
+	{
+		$hits = $this->_DBParameter(array("show status","Key_read_requests"));
+		$reqs = $this->_DBParameter(array("show status","Key_reads"));
+		if ($reqs == 0) return 0;
+		
+		return round(($hits/($reqs+$hits))*100,2);
+	}
+	
+    // start hack 
+    var $optimizeTableLow = 'CHECK TABLE %s FAST QUICK';
+    var $optimizeTableHigh = 'OPTIMIZE TABLE %s';
+    
+    /** 
+     * @see adodb_perf#optimizeTable
+     */
+     function optimizeTable( $table, $mode = ADODB_OPT_LOW) 
+     {
+        if ( !is_string( $table)) return false;
+        
+        $conn = $this->conn;
+        if ( !$conn) return false;
+        
+        $sql = '';
+        switch( $mode) {
+            case ADODB_OPT_LOW : $sql = $this->optimizeTableLow; break;
+            case ADODB_OPT_HIGH : $sql = $this->optimizeTableHigh; break;
+            default : 
+            {
+                // May dont use __FUNCTION__ constant for BC (__FUNCTION__ Added in PHP 4.3.0)
+                ADOConnection::outp( sprintf( "
    %s: '%s' using of undefined mode '%s'
    ", __CLASS__, __FUNCTION__, $mode));
+                return false;
+            }
+        }
+        $sql = sprintf( $sql, $table);
+        
+        return $conn->Execute( $sql) !== false;
+     }
+    // end hack 
+}
+?>
\ No newline at end of file
diff --git a/adodb/perf/perf-oci8.inc.php b/adodb/perf/perf-oci8.inc.php
new file mode 100644
index 0000000..115fc45
--- /dev/null
+++ b/adodb/perf/perf-oci8.inc.php
@@ -0,0 +1,618 @@
+ array('RATIOH',
+			"select round((1-(phy.value / (cur.value + con.value)))*100,2) 
+			from v\$sysstat cur, v\$sysstat con, v\$sysstat phy
+			where cur.name = 'db block gets' and
+			      con.name = 'consistent gets' and
+			      phy.name = 'physical reads'",
+			'=WarnCacheRatio'),
+		
+		'sql cache hit ratio' => array( 'RATIOH',
+			'select round(100*(sum(pins)-sum(reloads))/sum(pins),2)  from v$librarycache',
+			'increase shared_pool_size if too ratio low'),
+			
+		'datadict cache hit ratio' => array('RATIOH',
+		"select      
+           round((1 - (sum(getmisses) / (sum(gets) +          
+   		 sum(getmisses))))*100,2)
+		from  v\$rowcache",
+		'increase shared_pool_size if too ratio low'),
+		
+		'memory sort ratio' => array('RATIOH',
+		"SELECT ROUND((100 * b.VALUE) /DECODE ((a.VALUE + b.VALUE), 
+       0,1,(a.VALUE + b.VALUE)),2)
+FROM   v\$sysstat a, 
+       v\$sysstat b
+WHERE  a.name = 'sorts (disk)'
+AND    b.name = 'sorts (memory)'",
+	"% of memory sorts compared to disk sorts - should be over 95%"),
+
+	'IO',
+		'data reads' => array('IO',
+		"select value from v\$sysstat where name='physical reads'"),
+	
+	'data writes' => array('IO',
+		"select value from v\$sysstat where name='physical writes'"),
+	
+	'Data Cache',
+	
+		'data cache buffers' => array( 'DATAC',
+		"select a.value/b.value  from v\$parameter a, v\$parameter b 
+			where a.name = 'db_cache_size' and b.name= 'db_block_size'",
+			'Number of cache buffers. Tune db_cache_size if the data cache hit ratio is too low.'),
+		'data cache blocksize' => array('DATAC',
+			"select value from v\$parameter where name='db_block_size'",
+			'' ),			
+	
+	'Memory Pools',
+		'Mem Max Target (11g+)' => array( 'DATAC',
+		"select value from v\$parameter where name = 'memory_max_target'",
+			'The memory_max_size is the maximum value to which memory_target can be set.' ),
+	'Memory target (11g+)' => array( 'DATAC',
+		"select value from v\$parameter where name = 'memory_target'",
+			'If memory_target is defined then SGA and PGA targets are consolidated into one memory_target.' ),
+		'SGA Max Size' => array( 'DATAC',
+		"select nvl(value,0)/1024.0/1024 || 'M' from v\$parameter where name = 'sga_max_size'",
+			'The sga_max_size is the maximum value to which sga_target can be set.' ),
+	'SGA target' => array( 'DATAC',
+		"select nvl(value,0)/1024.0/1024 || 'M'  from v\$parameter where name = 'sga_target'",
+			'If sga_target is defined then data cache, shared, java and large pool size can be 0. This is because all these pools are consolidated into one sga_target.' ),
+	'PGA aggr target' => array( 'DATAC',
+		"select value from v\$parameter where name = 'pga_aggregate_target'",
+			'If pga_aggregate_target is defined then this is the maximum memory that can be allocated for cursor operations such as sorts, group by, joins, merges. When in doubt, set it to 20% of sga_target.' ),
+	'data cache size' => array('DATAC',
+			"select value from v\$parameter where name = 'db_cache_size'",
+			'db_cache_size' ),
+		'shared pool size' => array('DATAC',
+			"select value from v\$parameter where name = 'shared_pool_size'",
+			'shared_pool_size, which holds shared sql, stored procedures, dict cache and similar shared structs' ),
+		'java pool size' => array('DATAJ',
+			"select value from v\$parameter where name = 'java_pool_size'",
+			'java_pool_size' ),
+		'large pool buffer size' => array('CACHE',
+			"select value from v\$parameter where name='large_pool_size'",
+			'this pool is for large mem allocations (not because it is larger than shared pool), for MTS sessions, parallel queries, io buffers (large_pool_size) ' ),
+
+		'pga buffer size' => array('CACHE',			
+			"select value from v\$parameter where name='pga_aggregate_target'",
+			'program global area is private memory for sorting, and hash and bitmap merges - since oracle 9i (pga_aggregate_target)' ),
+
+		'dynamic memory usage' => array('CACHE', "select '-' from dual", '=DynMemoryUsage'),
+		
+		'Connections',
+		'current connections' => array('SESS',
+			'select count(*) from sys.v_$session where username is not null',
+			''),
+		'max connections' => array( 'SESS',
+			"select value from v\$parameter where name='sessions'",
+			''),
+
+	'Memory Utilization',		
+		'data cache utilization ratio' => array('RATIOU',
+			"select round((1-bytes/sgasize)*100, 2)
+			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
+			where name = 'free memory' and pool = 'shared pool'",
+		'Percentage of data cache actually in use - should be over 85%'),
+		
+		'shared pool utilization ratio' => array('RATIOU', 
+		'select round((sga.bytes/case when p.value=0 then sga.bytes else to_number(p.value) end)*100,2)
+		from v$sgastat sga, v$parameter p
+		where sga.name = \'free memory\' and sga.pool = \'shared pool\'
+		and p.name = \'shared_pool_size\'',
+		'Percentage of shared pool actually used - too low is bad, too high is worse'),
+		
+		'large pool utilization ratio' => array('RATIOU',
+			"select round((1-bytes/sgasize)*100, 2)
+			from (select sum(bytes) sgasize from sys.v_\$sgastat) s, sys.v_\$sgastat f
+			where name = 'free memory' and pool = 'large pool'",
+		'Percentage of large_pool actually in use - too low is bad, too high is worse'),
+		'sort buffer size' => array('CACHE',
+			"select value from v\$parameter where name='sort_area_size'",
+			'max in-mem sort_area_size (per query), uses memory in pga' ),
+
+		'pga usage at peak' => array('RATIOU',
+		'=PGA','Mb utilization at peak transactions (requires Oracle 9i+)'),
+	'Transactions',
+		'rollback segments' => array('ROLLBACK',
+			"select count(*) from sys.v_\$rollstat",
+			''),
+	
+		'peak transactions' => array('ROLLBACK',
+			"select max_utilization  tx_hwm
+    		from sys.v_\$resource_limit
+    		where resource_name = 'transactions'",
+			'Taken from high-water-mark'),
+		'max transactions' => array('ROLLBACK',
+			"select value from v\$parameter where name = 'transactions'",
+			'max transactions / rollback segments < 3.5 (or transactions_per_rollback_segment)'),
+	'Parameters',	
+		'cursor sharing' => array('CURSOR',
+			"select value from v\$parameter where name = 'cursor_sharing'",
+			'Cursor reuse strategy. Recommended is FORCE (8i+) or SIMILAR (9i+). See cursor_sharing.'),
+		/*
+		'cursor reuse' => array('CURSOR',
+			"select count(*) from (select sql_text_wo_constants, count(*)
+  from t1
+ group by sql_text_wo_constants
+having count(*) > 100)",'These are sql statements that should be using bind variables'),*/
+		'index cache cost' => array('COST',
+			"select value from v\$parameter where name = 'optimizer_index_caching'",
+			'=WarnIndexCost'),
+		'random page cost' => array('COST',
+			"select value from v\$parameter where name = 'optimizer_index_cost_adj'",
+			'=WarnPageCost'),
+		
+	'Backup',
+		'Achivelog Mode' => array('BACKUP', 'select log_mode from v$database', 'To turn on archivelog:
    
+	
    +        SQLPLUS> connect sys as sysdba;
+        SQLPLUS> shutdown immediate;
+
+        SQLPLUS> startup mount exclusive;
+        SQLPLUS> alter database archivelog;
+        SQLPLUS> archive log start;
+        SQLPLUS> alter database open;
+
    '),
+	
+		'DBID' => array('BACKUP','select dbid from v$database','Primary key of database, used for recovery with an RMAN Recovery Catalog'),
+		'Archive Log Dest' => array('BACKUP', "SELECT NVL(v1.value,v2.value) 
+FROM v\$parameter v1, v\$parameter v2 WHERE v1.name='log_archive_dest' AND v2.name='log_archive_dest_10'", ''),
+	
+		'Flashback Area' => array('BACKUP', "select nvl(value,'Flashback Area not used') from v\$parameter where name=lower('DB_RECOVERY_FILE_DEST')", 'Flashback area is a folder where all backup data and logs can be stored and managed by Oracle. If Error: message displayed, then it is not in use.'),
+	
+		'Flashback Usage' => array('BACKUP', "select nvl('-','Flashback Area not used') from v\$parameter where name=lower('DB_RECOVERY_FILE_DEST')", '=FlashUsage', 'Flashback area usage.'),
+		
+		'Control File Keep Time' => array('BACKUP', "select value from v\$parameter where name='control_file_record_keep_time'",'No of days to keep RMAN info in control file. I recommend it be set to x2 or x3 times the frequency of your full backup.'),
+		'Recent RMAN Jobs' => array('BACKUP', "select '-' from dual", "=RMAN"),
+		
+		//		'Control File Keep Time' => array('BACKUP', "select value from v\$parameter where name='control_file_record_keep_time'",'No of days to keep RMAN info in control file. I recommend it be set to x2 or x3 times the frequency of your full backup.'),
+
+		false
+		
+	);
+	
+	
+	function perf_oci8(&$conn)
+	{
+		$savelog = $conn->LogSQL(false);	
+		$this->version = $conn->ServerInfo();
+		$conn->LogSQL($savelog);	
+		$this->conn = $conn;
+	}
+	
+	function RMAN()
+	{
+		$rs = $this->conn->Execute("select * from (select start_time, end_time, operation, status, mbytes_processed, output_device_type  
+			from V\$RMAN_STATUS order by start_time desc) where rownum <=10");
+		
+		$ret = rs2html($rs,false,false,false,false);		
+		return " 
    ".$ret." 
    ";
+		
+	}
+	function DynMemoryUsage()
+	{
+		if (@$this->version['version'] >= 11) {
+			$rs = $this->conn->Execute("select component, current_size/1024./1024 as \"CurrSize (M)\" from  V\$MEMORY_DYNAMIC_COMPONENTS");
+
+		} else
+			$rs = $this->conn->Execute("select name, round(bytes/1024./1024,2) as \"CurrSize (M)\" from  V\$sgainfo");
+
+			
+		$ret = rs2html($rs,false,false,false,false);		
+		return " 
    ".$ret." 
    ";
+	}
+	
+	function FlashUsage()
+	{
+        $rs = $this->conn->Execute("select * from  V\$FLASH_RECOVERY_AREA_USAGE");
+		$ret = rs2html($rs,false,false,false,false);		
+		return " 
    ".$ret." 
    ";
+	}
+	
+	function WarnPageCost($val)
+	{
+		if ($val == 100) $s = 'Too High. ';
+		else $s = '';
+		
+		return $s.'Recommended is 20-50 for TP, and 50 for data warehouses. Default is 100. See optimizer_index_cost_adj. ';
+	}
+	
+	function WarnIndexCost($val)
+	{
+		if ($val == 0) $s = 'Too Low. ';
+		else $s = '';
+		
+		return $s.'Percentage of indexed data blocks expected in the cache.
+			Recommended is 20 (fast disk array) to 30 (slower hard disks). Default is 0.
+			 See optimizer_index_caching.';
+		}
+	
+	function PGA()
+	{
+		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
+		
+		$rs = $this->conn->Execute("select a.mb,a.targ as pga_size_pct,a.pct from 
+	   (select round(pga_target_for_estimate/1024.0/1024.0,0) MB,
+	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
+	   	   from v\$pga_target_advice) a left join
+	   (select round(pga_target_for_estimate/1024.0/1024.0,0) MB,
+	   	   pga_target_factor targ,estd_pga_cache_hit_percentage pct,rownum as r 
+	   	   from v\$pga_target_advice) b on 
+	  a.r = b.r+1 where 
+  		b.pct < 100");
+		if (!$rs) return "Only in 9i or later";
+		$rs->Close();
+		if ($rs->EOF) return "PGA could be too big";
+		
+		return reset($rs->fields);
+	}
+	
+	function Explain($sql,$partial=false) 
+	{
+		$savelog = $this->conn->LogSQL(false);
+		$rs = $this->conn->SelectLimit("select ID FROM PLAN_TABLE");
+		if (!$rs) {
+			echo "
    Missing PLAN_TABLE
    
+
    +CREATE TABLE PLAN_TABLE (
+  STATEMENT_ID                    VARCHAR2(30),
+  TIMESTAMP                       DATE,
+  REMARKS                         VARCHAR2(80),
+  OPERATION                       VARCHAR2(30),
+  OPTIONS                         VARCHAR2(30),
+  OBJECT_NODE                     VARCHAR2(128),
+  OBJECT_OWNER                    VARCHAR2(30),
+  OBJECT_NAME                     VARCHAR2(30),
+  OBJECT_INSTANCE                 NUMBER(38),
+  OBJECT_TYPE                     VARCHAR2(30),
+  OPTIMIZER                       VARCHAR2(255),
+  SEARCH_COLUMNS                  NUMBER,
+  ID                              NUMBER(38),
+  PARENT_ID                       NUMBER(38),
+  POSITION                        NUMBER(38),
+  COST                            NUMBER(38),
+  CARDINALITY                     NUMBER(38),
+  BYTES                           NUMBER(38),
+  OTHER_TAG                       VARCHAR2(255),
+  PARTITION_START                 VARCHAR2(255),
+  PARTITION_STOP                  VARCHAR2(255),
+  PARTITION_ID                    NUMBER(38),
+  OTHER                           LONG,
+  DISTRIBUTION                    VARCHAR2(30)
+);
+
    ";
+			return false;
+		}
+		
+		$rs->Close();
+	//	$this->conn->debug=1;
+	
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		
+		$s = "
    Explain: ".htmlspecialchars($sql)."
    ";	
+		
+		$this->conn->BeginTrans();
+		$id = "ADODB ".microtime();
+
+		$rs = $this->conn->Execute("EXPLAIN PLAN SET STATEMENT_ID='$id' FOR $sql");
+		$m = $this->conn->ErrorMsg();
+		if ($m) {
+			$this->conn->RollbackTrans();
+			$this->conn->LogSQL($savelog);
+			$s .= "
    $m
    ";
+			return $s;
+		}
+		$rs = $this->conn->Execute("
+		select 
+  '
    '||lpad('--', (level-1)*2,'-') || trim(operation) || ' ' || trim(options)||'
    '  as Operation, 
+  object_name,COST,CARDINALITY,bytes
+		FROM plan_table 
+START WITH id = 0  and STATEMENT_ID='$id'  
+CONNECT BY prior id=parent_id and statement_id='$id'");
+		
+		$s .= rs2html($rs,false,false,false,false);
+		$this->conn->RollbackTrans();
+		$this->conn->LogSQL($savelog);
+		$s .= $this->Tracer($sql,$partial);
+		return $s;
+	}
+	
+	
+	function CheckMemory()
+	{
+		if ($this->version['version'] < 9) return 'Oracle 9i or later required';
+		
+		 $rs = $this->conn->Execute("
+select  b.size_for_estimate as cache_mb_estimate, 
+	case when b.size_factor=1 then 
+   		'<<= Current'
+	 when a.estd_physical_read_factor-b.estd_physical_read_factor > 0.001 and b.estd_physical_read_factor<1 then
+		'- BETTER than current by ' || round((1-b.estd_physical_read_factor)/b.estd_physical_read_factor*100,2) || '%'
+	else ' ' end as RATING, 
+   b.estd_physical_read_factor \"Phys. Reads Factor\",
+   round((a.estd_physical_read_factor-b.estd_physical_read_factor)/b.estd_physical_read_factor*100,2) as \"% Improve\"
+   from (select size_for_estimate,size_factor,estd_physical_read_factor,rownum  r from v\$db_cache_advice order by 1) a , 
+   (select size_for_estimate,size_factor,estd_physical_read_factor,rownum r from v\$db_cache_advice order by 1) b where a.r = b.r-1
+  ");
+		if (!$rs) return false;
+		
+		/*
+		The v$db_cache_advice utility show the marginal changes in physical data block reads for different sizes of db_cache_size
+		*/
+		$s = "
    Data Cache Estimate
    ";
+		if ($rs->EOF) {
+			$s .= "
    Cache that is 50% of current size is still too big
    ";
+		} else {
+			$s .= "Ideal size of Data Cache is when %Improve gets close to zero.";
+			$s .= rs2html($rs,false,false,false,false);
+		}
+		return $s;
+	}
+	
+	/*
+		Generate html for suspicious/expensive sql
+	*/
+	function tohtml(&$rs,$type)
+	{
+		$o1 = $rs->FetchField(0);
+		$o2 = $rs->FetchField(1);
+		$o3 = $rs->FetchField(2);
+		if ($rs->EOF) return '
    None found
    ';
+		$check = '';
+		$sql = '';
+		$s = "\n\n';
+		while (!$rs->EOF) {
+			if ($check != $rs->fields[0].'::'.$rs->fields[1]) {
+				if ($check) {
+					$carr = explode('::',$check);
+					$prefix = "';
+					$suffix = '';
+					if (strlen($prefix)>2000) {
+						$prefix = '';
+						$suffix = '';
+					}
+					
+					$s .=  "\n';
+				}
+				$sql = $rs->fields[2];
+				$check = $rs->fields[0].'::'.$rs->fields[1];			
+			} else
+				$sql .= $rs->fields[2];
+			if (substr($sql,strlen($sql)-1) == "\0") $sql = substr($sql,0,strlen($sql)-1);
+			$rs->MoveNext();
+		}
+		$rs->Close();
+		
+		$carr = explode('::',$check);
+		$prefix = "';
+		$suffix = '';
+		if (strlen($prefix)>2000) {
+			$prefix = '';
+			$suffix = '';
+		}
+		$s .=  "\n';
+					
+		return $s."
    ".$o1->name.''.$o2->name.''.$o3->name.'
    ".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'
    ".$carr[0].''.$carr[1].''.$prefix.$sql.$suffix.'
    \n\n";
+	}
+	
+	// code thanks to Ixora. 
+	// http://www.ixora.com.au/scripts/query_opt.htm
+	// requires oracle 8.1.7 or later
+	function SuspiciousSQL($numsql=10)
+	{
+		$sql = "
+select
+  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
+  s.executions  executes,
+  p.sql_text
+from
+  ( 
+    select
+      address,
+      buffer_gets,
+      executions,
+      pct,
+      rank() over (order by buffer_gets desc)  ranking
+    from
+      ( 
+	select
+	  address,
+	  buffer_gets,
+	  executions,
+	  100 * ratio_to_report(buffer_gets) over ()  pct
+	from
+	  sys.v_\$sql
+	where
+	  command_type != 47 and module != 'T.O.A.D.'
+      )
+    where
+      buffer_gets > 50 * executions
+  )  s,
+  sys.v_\$sqltext  p
+where
+  s.ranking <= $numsql and
+  p.address = s.address
+order by
+  1 desc, s.address, p.piece";
+
+  		global $ADODB_CACHE_MODE;
+  		if (isset($_GET['expsixora']) && isset($_GET['sql'])) {
+				$partial = empty($_GET['part']);
+				echo "".$this->Explain($_GET['sql'],$partial)."\n";
+		}
+
+		if (isset($_GET['sql'])) return $this->_SuspiciousSQL($numsql);
+		
+		$s = '';
+		$timer = time();
+		$s .= $this->_SuspiciousSQL($numsql);
+		$timer = time() - $timer;
+		
+		if ($timer > $this->noShowIxora) return $s;
+		$s .= '
    ';
+		
+		$save = $ADODB_CACHE_MODE;
+		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
+		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		
+		$savelog = $this->conn->LogSQL(false);
+		$rs = $this->conn->SelectLimit($sql);
+		$this->conn->LogSQL($savelog);
+		
+		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		$ADODB_CACHE_MODE = $save;
+		if ($rs) {
+			$s .= "\n
    Ixora Suspicious SQL
    ";
+			$s .= $this->tohtml($rs,'expsixora');
+		}
+		
+		return $s;
+	}
+	
+	// code thanks to Ixora. 
+	// http://www.ixora.com.au/scripts/query_opt.htm
+	// requires oracle 8.1.7 or later
+	function ExpensiveSQL($numsql = 10)
+	{
+		$sql = "
+select
+  substr(to_char(s.pct, '99.00'), 2) || '%'  load,
+  s.executions  executes,
+  p.sql_text
+from
+  ( 
+    select
+      address,
+      disk_reads,
+      executions,
+      pct,
+      rank() over (order by disk_reads desc)  ranking
+    from
+      (
+	select
+	  address,
+	  disk_reads,
+	  executions,
+	  100 * ratio_to_report(disk_reads) over ()  pct
+	from
+	  sys.v_\$sql
+	where
+	  command_type != 47 and module != 'T.O.A.D.'
+      )
+    where
+      disk_reads > 50 * executions
+  )  s,
+  sys.v_\$sqltext  p
+where
+  s.ranking <= $numsql and
+  p.address = s.address
+order by
+  1 desc, s.address, p.piece
+";
+		global $ADODB_CACHE_MODE;
+  		if (isset($_GET['expeixora']) && isset($_GET['sql'])) {
+			$partial = empty($_GET['part']);	
+			echo "".$this->Explain($_GET['sql'],$partial)."\n";
+		}
+		if (isset($_GET['sql'])) {
+			 $var = $this->_ExpensiveSQL($numsql);
+			 return $var;
+		}
+		
+		$s = '';		
+		$timer = time();
+		$s .= $this->_ExpensiveSQL($numsql);
+		$timer = time() - $timer;
+		if ($timer > $this->noShowIxora) return $s;
+		
+		$s .= '
    ';
+		$save = $ADODB_CACHE_MODE;
+		$ADODB_CACHE_MODE = ADODB_FETCH_NUM;
+		if ($this->conn->fetchMode !== false) $savem = $this->conn->SetFetchMode(false);
+		
+		$savelog = $this->conn->LogSQL(false);
+		$rs = $this->conn->Execute($sql);
+		$this->conn->LogSQL($savelog);
+		
+		if (isset($savem)) $this->conn->SetFetchMode($savem);
+		$ADODB_CACHE_MODE = $save;
+		
+		if ($rs) {
+			$s .= "\n
    Ixora Expensive SQL
    ";
+			$s .= $this->tohtml($rs,'expeixora');
+		}
+	
+		return $s;
+	}
+	
+	function clearsql() 
+	{
+		$perf_table = adodb_perf::table();
+	// using the naive "delete from $perf_table where created<".$this->conn->sysTimeStamp will cause the table to lock, possibly
+	// for a long time
+		$sql = 
+"DECLARE cnt pls_integer;
+BEGIN
+	cnt := 0;
+	FOR rec IN (SELECT ROWID AS rr FROM $perf_table WHERE createdconn->Execute($sql);
+	}
+	
+}
+?>
\ No newline at end of file
diff --git a/adodb/perf/perf-postgres.inc.php b/adodb/perf/perf-postgres.inc.php
new file mode 100644
index 0000000..7cb9ea2
--- /dev/null
+++ b/adodb/perf/perf-postgres.inc.php
@@ -0,0 +1,153 @@
+ array('RATIO',
+			"select case when count(*)=3 then 'TRUE' else 'FALSE' end from pg_settings where (name='stats_block_level' or name='stats_row_level' or name='stats_start_collector') and setting='on' ",
+			'Value must be TRUE to enable hit ratio statistics (stats_start_collector,stats_row_level and stats_block_level must be set to true in postgresql.conf)'),
+		'data cache hit ratio' => array('RATIO',
+			"select case when blks_hit=0 then 0 else round( ((1-blks_read::float/blks_hit)*100)::numeric, 2) end from pg_stat_database where datname='\$DATABASE'",
+			'=WarnCacheRatio'),
+	'IO',
+		'data reads' => array('IO',
+		'select sum(heap_blks_read+toast_blks_read) from pg_statio_user_tables',
+		),
+		'data writes' => array('IO',
+		'select round((sum(n_tup_ins/4.0+n_tup_upd/8.0+n_tup_del/4.0)/16)::numeric,2) from pg_stat_user_tables',
+		'Count of inserts/updates/deletes * coef'),
+
+	'Data Cache',
+		'data cache buffers' => array('DATAC',
+			"select setting from pg_settings where name='shared_buffers'",
+			'Number of cache buffers. Tuning'),
+		'cache blocksize' => array('DATAC',
+			'select 8192',
+			'(estimate)' ),
+		'data cache size' => array( 'DATAC',
+		"select setting::integer*8192 from pg_settings where name='shared_buffers'",
+			'' ),
+		'operating system cache size' => array( 'DATA',
+		"select setting::integer*8192 from pg_settings where name='effective_cache_size'",
+			'(effective cache size)' ),
+	'Memory Usage',
+	# Postgres 7.5 changelog: Rename server parameters SortMem and VacuumMem to work_mem and maintenance_work_mem;
+		'sort/work buffer size' => array('CACHE',
+			"select setting::integer*1024 from pg_settings where name='sort_mem' or name = 'work_mem' order by name",
+			'Size of sort buffer (per query)' ),
+	'Connections',
+		'current connections' => array('SESS',
+			'select count(*) from pg_stat_activity',
+			''),
+		'max connections' => array('SESS',
+			"select setting from pg_settings where name='max_connections'",
+			''),
+	'Parameters',
+		'rollback buffers' => array('COST',
+			"select setting from pg_settings where name='wal_buffers'",
+			'WAL buffers'),
+		'random page cost' => array('COST',
+			"select setting from pg_settings where name='random_page_cost'",
+			'Cost of doing a seek (default=4). See random_page_cost'),
+		false
+	);
+	
+	function perf_postgres(&$conn)
+	{
+		$this->conn = $conn;
+	}
+	
+	var $optimizeTableLow  = 'VACUUM %s'; 
+	var $optimizeTableHigh = 'VACUUM ANALYZE %s';
+
+/**
+ * @see adodb_perf#optimizeTable
+ */
+
+	function optimizeTable($table, $mode = ADODB_OPT_LOW) 
+	{
+	    if(! is_string($table)) return false;
+	    
+	    $conn = $this->conn;
+	    if (! $conn) return false;
+	    
+	    $sql = '';
+	    switch($mode) {
+	        case ADODB_OPT_LOW : $sql = $this->optimizeTableLow;  break;
+	        case ADODB_OPT_HIGH: $sql = $this->optimizeTableHigh; break;
+	        default            : 
+	        {
+	            ADOConnection::outp(sprintf("
    %s: '%s' using of undefined mode '%s'
    ", __CLASS__, 'optimizeTable', $mode));
+	            return false;
+	        }
+	    }
+	    $sql = sprintf($sql, $table);
+	    
+	    return $conn->Execute($sql) !== false;  
+	}
+	
+	function Explain($sql,$partial=false)
+	{
+		$save = $this->conn->LogSQL(false);
+		
+		if ($partial) {
+			$sqlq = $this->conn->qstr($sql.'%');
+			$arr = $this->conn->GetArray("select distinct distinct sql1 from adodb_logsql where sql1 like $sqlq");
+			if ($arr) {
+				foreach($arr as $row) {
+					$sql = reset($row);
+					if (crc32($sql) == $partial) break;
+				}
+			}
+		}
+		$sql = str_replace('?',"''",$sql);
+		$s = '
    Explain: '.htmlspecialchars($sql).'
    ';
+		$rs = $this->conn->Execute('EXPLAIN '.$sql);
+		$this->conn->LogSQL($save);
+		$s .= '
    ';
+		if ($rs)
+			while (!$rs->EOF) {
+				$s .= reset($rs->fields)."\n";
+				$rs->MoveNext();
+			}
+		$s .= '
    ';
+		$s .= $this->Tracer($sql,$partial);
+		return $s;
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/pivottable.inc.php b/adodb/pivottable.inc.php
new file mode 100644
index 0000000..48890b8
--- /dev/null
+++ b/adodb/pivottable.inc.php
@@ -0,0 +1,187 @@
+databaseType,'access') !== false; 
+		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
+	
+	//$hidecnt = false;
+	
+ 	if ($where) $where = "\nWHERE $where";
+	if (!is_array($colfield)) $colarr = $db->GetCol("select distinct $colfield from $tables $where order by 1");
+	if (!$aggfield) $hidecnt = false;
+	
+	$sel = "$rowfields, ";
+	if (is_array($colfield)) {
+		foreach ($colfield as $k => $v) {
+			$k = trim($k);
+			if (!$hidecnt) {
+				$sel .= $iif ? 
+					"\n\t$aggfn(IIF($v,1,0)) AS \"$k\", "
+					:
+					"\n\t$aggfn(CASE WHEN $v THEN 1 ELSE 0 END) AS \"$k\", ";
+			}
+			if ($aggfield) {
+				$sel .= $iif ?
+					"\n\t$aggfn(IIF($v,$aggfield,0)) AS \"$sumlabel$k\", "
+					:
+					"\n\t$aggfn(CASE WHEN $v THEN $aggfield ELSE 0 END) AS \"$sumlabel$k\", ";
+			}
+		} 
+	} else {
+		foreach ($colarr as $v) {
+			if (!is_numeric($v)) $vq = $db->qstr($v);
+			else $vq = $v;
+			$v = trim($v);
+			if (strlen($v) == 0	) $v = 'null';
+			if (!$hidecnt) {
+				$sel .= $iif ?
+					"\n\t$aggfn(IIF($colfield=$vq,1,0)) AS \"$v\", "
+					:
+					"\n\t$aggfn(CASE WHEN $colfield=$vq THEN 1 ELSE 0 END) AS \"$v\", ";
+			}
+			if ($aggfield) {
+				if ($hidecnt) $label = $v;
+				else $label = "{$v}_$aggfield";
+				$sel .= $iif ?
+					"\n\t$aggfn(IIF($colfield=$vq,$aggfield,0)) AS \"$label\", "
+					:
+					"\n\t$aggfn(CASE WHEN $colfield=$vq THEN $aggfield ELSE 0 END) AS \"$label\", ";
+			}
+		}
+	}
+	if ($aggfield && $aggfield != '1'){
+		$agg = "$aggfn($aggfield)";
+		$sel .= "\n\t$agg as \"$sumlabel$aggfield\", ";		
+	}
+	
+	if ($showcount)
+		$sel .= "\n\tSUM(1) as Total";
+	else
+		$sel = substr($sel,0,strlen($sel)-2);
+	
+	
+	// Strip aliases
+	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
+	
+	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
+	
+	return $sql;
+ }
+
+/* EXAMPLES USING MS NORTHWIND DATABASE */
+if (0) {
+
+# example1
+#
+# Query the main "product" table
+# Set the rows to CompanyName and QuantityPerUnit
+# and the columns to the Categories
+# and define the joins to link to lookup tables 
+# "categories" and "suppliers"
+#
+
+ $sql = PivotTableSQL(
+ 	$gDB,  											# adodb connection
+ 	'products p ,categories c ,suppliers s',  		# tables
+	'CompanyName,QuantityPerUnit',					# row fields
+	'CategoryName',									# column fields 
+	'p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID' # joins/where
+);
+ print "
    $sql";
+ $rs = $gDB->Execute($sql);
+ rs2html($rs);
+ 
+/*
+Generated SQL:
+
+SELECT CompanyName,QuantityPerUnit, 
+	SUM(CASE WHEN CategoryName='Beverages' THEN 1 ELSE 0 END) AS "Beverages", 
+	SUM(CASE WHEN CategoryName='Condiments' THEN 1 ELSE 0 END) AS "Condiments", 
+	SUM(CASE WHEN CategoryName='Confections' THEN 1 ELSE 0 END) AS "Confections", 
+	SUM(CASE WHEN CategoryName='Dairy Products' THEN 1 ELSE 0 END) AS "Dairy Products", 
+	SUM(CASE WHEN CategoryName='Grains/Cereals' THEN 1 ELSE 0 END) AS "Grains/Cereals", 
+	SUM(CASE WHEN CategoryName='Meat/Poultry' THEN 1 ELSE 0 END) AS "Meat/Poultry", 
+	SUM(CASE WHEN CategoryName='Produce' THEN 1 ELSE 0 END) AS "Produce", 
+	SUM(CASE WHEN CategoryName='Seafood' THEN 1 ELSE 0 END) AS "Seafood", 
+	SUM(1) as Total 
+FROM products p ,categories c ,suppliers s  WHERE p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
+GROUP BY CompanyName,QuantityPerUnit
+*/
+//=====================================================================
+
+# example2
+#
+# Query the main "product" table
+# Set the rows to CompanyName and QuantityPerUnit
+# and the columns to the UnitsInStock for diiferent ranges
+# and define the joins to link to lookup tables 
+# "categories" and "suppliers"
+#
+ $sql = PivotTableSQL(
+ 	$gDB,										# adodb connection
+ 	'products p ,categories c ,suppliers s',	# tables
+	'CompanyName,QuantityPerUnit',				# row fields
+												# column ranges
+array(										
+' 0 ' => 'UnitsInStock <= 0',
+"1 to 5" => '0 < UnitsInStock and UnitsInStock <= 5',
+"6 to 10" => '5 < UnitsInStock and UnitsInStock <= 10',
+"11 to 15"  => '10 < UnitsInStock and UnitsInStock <= 15',
+"16+" =>'15 < UnitsInStock'
+),
+	' p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID', # joins/where
+	'UnitsInStock', 							# sum this field
+	'Sum'										# sum label prefix
+);
+ print "
    $sql";
+ $rs = $gDB->Execute($sql);
+ rs2html($rs);
+ /*
+ Generated SQL:
+ 
+SELECT CompanyName,QuantityPerUnit, 
+	SUM(CASE WHEN UnitsInStock <= 0 THEN UnitsInStock ELSE 0 END) AS "Sum  0 ", 
+	SUM(CASE WHEN 0 < UnitsInStock and UnitsInStock <= 5 THEN UnitsInStock ELSE 0 END) AS "Sum 1 to 5", 
+	SUM(CASE WHEN 5 < UnitsInStock and UnitsInStock <= 10 THEN UnitsInStock ELSE 0 END) AS "Sum 6 to 10", 
+	SUM(CASE WHEN 10 < UnitsInStock and UnitsInStock <= 15 THEN UnitsInStock ELSE 0 END) AS "Sum 11 to 15", 
+	SUM(CASE WHEN 15 < UnitsInStock THEN UnitsInStock ELSE 0 END) AS "Sum 16+",
+	SUM(UnitsInStock) AS "Sum UnitsInStock", 
+	SUM(1) as Total 
+FROM products p ,categories c ,suppliers s  WHERE  p.CategoryID = c.CategoryID and s.SupplierID= p.SupplierID 
+GROUP BY CompanyName,QuantityPerUnit
+ */
+}
+?>
\ No newline at end of file
diff --git a/adodb/readme.txt b/adodb/readme.txt
new file mode 100644
index 0000000..97bdd9e
--- /dev/null
+++ b/adodb/readme.txt
@@ -0,0 +1,62 @@
+>> ADODB Library for PHP4
+
+(c) 2000-2004 John Lim (jlim@natsoft.com.my)
+
+Released under both BSD and GNU Lesser GPL library license. 
+This means you can use it in proprietary products.
+ 
+ 
+>> Introduction
+
+PHP's database access functions are not standardised. This creates a 
+need for a database class library to hide the differences between the 
+different databases (encapsulate the differences) so we can easily 
+switch databases.
+
+We currently support MySQL, Interbase, Sybase, PostgreSQL, Oracle, 
+Microsoft SQL server,  Foxpro ODBC, Access ODBC, Informix, DB2,
+Sybase SQL Anywhere, generic ODBC and Microsoft's ADO. 
+
+We hope more people will contribute drivers to support other databases.
+
+
+>> Documentation and Examples
+
+Refer to the adodb/docs directory for full documentation and examples. 
+There is also a  tutorial tute.htm that contrasts ADODB code with 
+mysql code.
+
+
+>>> Files
+Adodb.inc.php is the main file. You need to include only this file.
+
+Adodb-*.inc.php are the database specific driver code.
+
+Test.php contains a list of test commands to exercise the class library.
+
+Adodb-session.php is the PHP4 session handling code.
+
+Testdatabases.inc.php contains the list of databases to apply the tests on.
+
+Benchmark.php is a simple benchmark to test the throughput of a simple SELECT 
+statement for databases described in testdatabases.inc.php. The benchmark
+tables are created in test.php.
+
+readme.htm is the main documentation.
+
+tute.htm is the tutorial.
+
+
+>> More Info
+
+For more information, including installation see readme.htm
+or visit
+           http://adodb.sourceforge.net/
+
+
+>> Feature Requests and Bug Reports
+
+Email to jlim@natsoft.com.my 
+
+
+ 
\ No newline at end of file
diff --git a/adodb/rsfilter.inc.php b/adodb/rsfilter.inc.php
new file mode 100644
index 0000000..501ffc9
--- /dev/null
+++ b/adodb/rsfilter.inc.php
@@ -0,0 +1,61 @@
+ $v) {
+			$arr[$k] = ucwords($v);
+		}
+	}
+	$rs = RSFilter($rs,'do_ucwords');
+ */
+function RSFilter($rs,$fn)
+{
+	if ($rs->databaseType != 'array') {
+		if (!$rs->connection) return false;
+		
+		$rs = $rs->connection->_rs2rs($rs);
+	}
+	$rows = $rs->RecordCount();
+	for ($i=0; $i < $rows; $i++) {
+		if (is_array ($fn)) {
+        	$obj = $fn[0];
+        	$method = $fn[1];
+        	$obj->$method ($rs->_array[$i],$rs);
+      } else {
+			$fn($rs->_array[$i],$rs);
+      }
+	  
+	}
+	if (!$rs->EOF) {
+		$rs->_currentRow = 0;
+		$rs->fields = $rs->_array[0];
+	}
+	
+	return $rs;
+}
+?>
\ No newline at end of file
diff --git a/adodb/server.php b/adodb/server.php
new file mode 100644
index 0000000..91d6812
--- /dev/null
+++ b/adodb/server.php
@@ -0,0 +1,100 @@
+Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
+$sql = undomq($_REQUEST['sql']);
+
+if (isset($_REQUEST['fetch']))
+	$ADODB_FETCH_MODE = $_REQUEST['fetch'];
+	
+if (isset($_REQUEST['nrows'])) {
+	$nrows = $_REQUEST['nrows'];
+	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
+	$rs = $conn->SelectLimit($sql,$nrows,$offset);
+} else 
+	$rs = $conn->Execute($sql);
+if ($rs){ 
+	//$rs->timeToLive = 1;
+	echo _rs2serialize($rs,$conn,$sql);
+	$rs->Close();
+} else
+	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+
+?>
\ No newline at end of file
diff --git a/adodb/session/adodb-compress-bzip2.php b/adodb/session/adodb-compress-bzip2.php
new file mode 100644
index 0000000..f6a5f29
--- /dev/null
+++ b/adodb/session/adodb-compress-bzip2.php
@@ -0,0 +1,118 @@
+_block_size;
+	}
+
+	/**
+	 */
+	function setBlockSize($block_size) {
+		assert('$block_size >= 1');
+		assert('$block_size <= 9');
+		$this->_block_size = (int) $block_size;
+	}
+
+	/**
+	 */
+	function getWorkLevel() {
+		return $this->_work_level;
+	}
+
+	/**
+	 */
+	function setWorkLevel($work_level) {
+		assert('$work_level >= 0');
+		assert('$work_level <= 250');
+		$this->_work_level = (int) $work_level;
+	}
+
+	/**
+	 */
+	function getMinLength() {
+		return $this->_min_length;
+	}
+
+	/**
+	 */
+	function setMinLength($min_length) {
+		assert('$min_length >= 0');
+		$this->_min_length = (int) $min_length;
+	}
+
+	/**
+	 */
+	function ADODB_Compress_Bzip2($block_size = null, $work_level = null, $min_length = null) {
+		if (!is_null($block_size)) {
+			$this->setBlockSize($block_size);
+		}
+
+		if (!is_null($work_level)) {
+			$this->setWorkLevel($work_level);
+		}
+
+		if (!is_null($min_length)) {
+			$this->setMinLength($min_length);
+		}
+	}
+
+	/**
+	 */
+	function write($data, $key) {
+		if (strlen($data) < $this->_min_length) {
+			return $data;
+		}
+
+		if (!is_null($this->_block_size)) {
+			if (!is_null($this->_work_level)) {
+				return bzcompress($data, $this->_block_size, $this->_work_level);
+			} else {
+				return bzcompress($data, $this->_block_size);
+			}
+		}
+
+		return bzcompress($data);
+	}
+
+	/**
+	 */
+	function read($data, $key) {
+		return $data ? bzdecompress($data) : $data;
+	}
+
+}
+
+return 1;
+
+?>
diff --git a/adodb/session/adodb-compress-gzip.php b/adodb/session/adodb-compress-gzip.php
new file mode 100644
index 0000000..af74e85
--- /dev/null
+++ b/adodb/session/adodb-compress-gzip.php
@@ -0,0 +1,93 @@
+_level;
+	}
+
+	/**
+	 */
+	function setLevel($level) {
+		assert('$level >= 0');
+		assert('$level <= 9');
+		$this->_level = (int) $level;
+	}
+
+	/**
+	 */
+	function getMinLength() {
+		return $this->_min_length;
+	}
+
+	/**
+	 */
+	function setMinLength($min_length) {
+		assert('$min_length >= 0');
+		$this->_min_length = (int) $min_length;
+	}
+
+	/**
+	 */
+	function ADODB_Compress_Gzip($level = null, $min_length = null) {
+		if (!is_null($level)) {
+			$this->setLevel($level);
+		}
+
+		if (!is_null($min_length)) {
+			$this->setMinLength($min_length);
+		}
+	}
+
+	/**
+	 */
+	function write($data, $key) {
+		if (strlen($data) < $this->_min_length) {
+			return $data;
+		}
+
+		if (!is_null($this->_level)) {
+			return gzcompress($data, $this->_level);
+		} else {
+			return gzcompress($data);
+		}
+	}
+
+	/**
+	 */
+	function read($data, $key) {
+		return $data ? gzuncompress($data) : $data;
+	}
+
+}
+
+return 1;
+
+?>
\ No newline at end of file
diff --git a/adodb/session/adodb-cryptsession.php b/adodb/session/adodb-cryptsession.php
new file mode 100644
index 0000000..bb144da
--- /dev/null
+++ b/adodb/session/adodb-cryptsession.php
@@ -0,0 +1,27 @@
+
\ No newline at end of file
diff --git a/adodb/session/adodb-cryptsession2.php b/adodb/session/adodb-cryptsession2.php
new file mode 100644
index 0000000..0b0d3b9
--- /dev/null
+++ b/adodb/session/adodb-cryptsession2.php
@@ -0,0 +1,27 @@
+
\ No newline at end of file
diff --git a/adodb/session/adodb-encrypt-mcrypt.php b/adodb/session/adodb-encrypt-mcrypt.php
new file mode 100644
index 0000000..d6e858c
--- /dev/null
+++ b/adodb/session/adodb-encrypt-mcrypt.php
@@ -0,0 +1,109 @@
+_cipher;
+	}
+
+	/**
+	 */
+	function setCipher($cipher) {
+		$this->_cipher = $cipher;
+	}
+
+	/**
+	 */
+	function getMode() {
+		return $this->_mode;
+	}
+
+	/**
+	 */
+	function setMode($mode) {
+		$this->_mode = $mode;
+	}
+
+	/**
+	 */
+	function getSource() {
+		return $this->_source;
+	}
+
+	/**
+	 */
+	function setSource($source) {
+		$this->_source = $source;
+	}
+
+	/**
+	 */
+	function ADODB_Encrypt_MCrypt($cipher = null, $mode = null, $source = null) {
+		if (!$cipher) {
+			$cipher = MCRYPT_RIJNDAEL_256;
+		}
+		if (!$mode) {
+			$mode = MCRYPT_MODE_ECB;
+		}
+		if (!$source) {
+			$source = MCRYPT_RAND;
+		}
+
+		$this->_cipher = $cipher;
+		$this->_mode = $mode;
+		$this->_source = $source;
+	}
+
+	/**
+	 */
+	function write($data, $key) {
+		$iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
+		$iv = mcrypt_create_iv($iv_size, $this->_source);
+		return mcrypt_encrypt($this->_cipher, $key, $data, $this->_mode, $iv);
+	}
+
+	/**
+	 */
+	function read($data, $key) {
+		$iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
+		$iv = mcrypt_create_iv($iv_size, $this->_source);
+		$rv = mcrypt_decrypt($this->_cipher, $key, $data, $this->_mode, $iv);
+		return rtrim($rv, "\0");
+	}
+
+}
+
+return 1;
+
+?>
diff --git a/adodb/session/adodb-encrypt-md5.php b/adodb/session/adodb-encrypt-md5.php
new file mode 100644
index 0000000..f2209cc
--- /dev/null
+++ b/adodb/session/adodb-encrypt-md5.php
@@ -0,0 +1,39 @@
+encrypt($data, $key);
+	}
+
+	/**
+	 */
+	function read($data, $key) {
+		$md5crypt = new MD5Crypt();
+		return $md5crypt->decrypt($data, $key);
+	}
+
+}
+
+return 1;
+
+?>
\ No newline at end of file
diff --git a/adodb/session/adodb-encrypt-secret.php b/adodb/session/adodb-encrypt-secret.php
new file mode 100644
index 0000000..4dc11ee
--- /dev/null
+++ b/adodb/session/adodb-encrypt-secret.php
@@ -0,0 +1,48 @@
+
diff --git a/adodb/session/adodb-encrypt-sha1.php b/adodb/session/adodb-encrypt-sha1.php
new file mode 100644
index 0000000..16f603e
--- /dev/null
+++ b/adodb/session/adodb-encrypt-sha1.php
@@ -0,0 +1,32 @@
+encrypt($data, $key);
+
+	}
+
+
+	function read($data, $key) 
+	{
+		$sha1crypt = new SHA1Crypt();
+		return $sha1crypt->decrypt($data, $key);
+
+	}
+}
+
+
+
+return 1;
+?>
\ No newline at end of file
diff --git a/adodb/session/adodb-sess.txt b/adodb/session/adodb-sess.txt
new file mode 100644
index 0000000..d23dac4
--- /dev/null
+++ b/adodb/session/adodb-sess.txt
@@ -0,0 +1,131 @@
+John,
+
+I have been an extremely satisfied ADODB user for several years now.
+
+To give you something back for all your hard work, I've spent the last 3
+days rewriting the adodb-session.php code.
+
+----------
+What's New
+----------
+
+Here's a list of the new code's benefits:
+
+* Combines the functionality of the three files:
+
+adodb-session.php
+adodb-session-clob.php
+adodb-cryptsession.php
+
+each with very similar functionality, into a single file adodb-session.php.
+This will ease maintenance and support issues.
+
+* Supports multiple encryption and compression schemes.
+  Currently, we support:
+
+  MD5Crypt (crypt.inc.php)
+  MCrypt
+  Secure (Horde's emulation of MCrypt, if MCrypt module is not available.)
+  GZip
+  BZip2
+
+These can be stacked, so if you want to compress and then encrypt your
+session data, it's easy.
+Also, the built-in MCrypt functions will be *much* faster, and more secure,
+than the MD5Crypt code.
+
+* adodb-session.php contains a single class ADODB_Session that encapsulates
+all functionality.
+  This eliminates the use of global vars and defines (though they are
+supported for backwards compatibility).
+
+* All user defined parameters are now static functions in the ADODB_Session
+class.
+
+New parameters include:
+
+* encryptionKey(): Define the encryption key used to encrypt the session.
+Originally, it was a hard coded string.
+
+* persist(): Define if the database will be opened in persistent mode.
+Originally, the user had to call adodb_sess_open().
+
+* dataFieldName(): Define the field name used to store the session data, as
+'DATA' appears to be a reserved word in the following cases:
+	ANSI SQL
+	IBM DB2
+	MS SQL Server
+	Postgres
+	SAP
+
+* filter(): Used to support multiple, simulataneous encryption/compression
+schemes.
+
+* Debug support is improved thru _rsdump() function, which is called after
+every database call.
+
+------------
+What's Fixed
+------------
+
+The new code includes several bug fixes and enhancements:
+
+* sesskey is compared in BINARY mode for MySQL, to avoid problems with
+session keys that differ only by case.
+  Of course, the user should define the sesskey field as BINARY, to
+correctly fix this problem, otherwise performance will suffer.
+
+* In ADODB_Session::gc(), if $expire_notify is true, the multiple DELETES in
+the original code have been optimized to a single DELETE.
+
+* In ADODB_Session::destroy(), since "SELECT expireref, sesskey FROM $table
+WHERE sesskey = $qkey" will only return a single value, we don't loop on the
+result, we simply process the row, if any.
+
+* We close $rs after every use.
+
+---------------
+What's the Same
+---------------
+
+I know backwards compatibility is *very* important to you.  Therefore, the
+new code is 100% backwards compatible.
+
+If you like my code, but don't "trust" it's backwards compatible, maybe we
+offer it as beta code, in a new directory for a release or two?
+
+------------
+What's To Do
+------------
+
+I've vascillated over whether to use a single function to get/set
+parameters:
+
+$user = ADODB_Session::user(); 	// get
+ADODB_Session::user($user);		// set
+
+or to use separate functions (which is the PEAR/Java way):
+
+$user = ADODB_Session::getUser();
+ADODB_Session::setUser($user);
+
+I've chosen the former as it's makes for a simpler API, and reduces the
+amount of code, but I'd be happy to change it to the latter.
+
+Also, do you think the class should be a singleton class, versus a static
+class?
+
+Let me know if you find this code useful, and will be including it in the
+next release of ADODB.
+
+If so, I will modify the current documentation to detail the new
+functionality.  To that end, what file(s) contain the documentation?  Please
+send them to me if they are not publically available.
+
+Also, if there is *anything* in the code that you like to see changed, let
+me know.
+
+Thanks,
+
+Ross
+
diff --git a/adodb/session/adodb-session-clob.php b/adodb/session/adodb-session-clob.php
new file mode 100644
index 0000000..532151b
--- /dev/null
+++ b/adodb/session/adodb-session-clob.php
@@ -0,0 +1,24 @@
+
\ No newline at end of file
diff --git a/adodb/session/adodb-session-clob2.php b/adodb/session/adodb-session-clob2.php
new file mode 100644
index 0000000..6aed573
--- /dev/null
+++ b/adodb/session/adodb-session-clob2.php
@@ -0,0 +1,24 @@
+
\ No newline at end of file
diff --git a/adodb/session/adodb-session.php b/adodb/session/adodb-session.php
new file mode 100644
index 0000000..5699025
--- /dev/null
+++ b/adodb/session/adodb-session.php
@@ -0,0 +1,934 @@
+Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
+	
+	/* it is possible that the update statement fails due to a collision */
+	if (!$ok) {
+		session_id($old_id);
+		if (empty($ck)) $ck = session_get_cookie_params();
+		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
+		return false;
+	}
+	
+	return true;
+}
+
+/*
+    Generate database table for session data
+    @see http://phplens.com/lens/lensforum/msgs.php?id=12280
+    @return 0 if failure, 1 if errors, 2 if successful.
+	@author Markus Staab http://www.public-4u.de
+*/
+function adodb_session_create_table($schemaFile=null,$conn = null)
+{
+    // set default values
+    if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema.xml';
+    if ($conn===null) $conn = ADODB_Session::_conn();
+
+	if (!$conn) return 0;
+
+    $schema = new adoSchema($conn);
+    $schema->ParseSchema($schemaFile);
+    return $schema->ExecuteSchema();
+}
+
+/*!
+	\static
+*/
+class ADODB_Session {
+	/////////////////////
+	// getter/setter methods
+	/////////////////////
+	
+	/*
+	
+	function Lock($lock=null)
+	{
+	static $_lock = false;
+	
+		if (!is_null($lock)) $_lock = $lock;
+		return $lock;
+	}
+	*/
+	/*!
+	*/
+	function driver($driver = null) {
+		static $_driver = 'mysql';
+		static $set = false;
+
+		if (!is_null($driver)) {
+			$_driver = trim($driver);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
+				return $GLOBALS['ADODB_SESSION_DRIVER'];
+			}
+		}
+
+		return $_driver;
+	}
+
+	/*!
+	*/
+	function host($host = null) {
+		static $_host = 'localhost';
+		static $set = false;
+
+		if (!is_null($host)) {
+			$_host = trim($host);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
+				return $GLOBALS['ADODB_SESSION_CONNECT'];
+			}
+		}
+
+		return $_host;
+	}
+
+	/*!
+	*/
+	function user($user = null) {
+		static $_user = 'root';
+		static $set = false;
+
+		if (!is_null($user)) {
+			$_user = trim($user);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_USER'])) {
+				return $GLOBALS['ADODB_SESSION_USER'];
+			}
+		}
+
+		return $_user;
+	}
+
+	/*!
+	*/
+	function password($password = null) {
+		static $_password = '';
+		static $set = false;
+
+		if (!is_null($password)) {
+			$_password = $password;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
+				return $GLOBALS['ADODB_SESSION_PWD'];
+			}
+		}
+
+		return $_password;
+	}
+
+	/*!
+	*/
+	function database($database = null) {
+		static $_database = 'xphplens_2';
+		static $set = false;
+
+		if (!is_null($database)) {
+			$_database = trim($database);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_DB'])) {
+				return $GLOBALS['ADODB_SESSION_DB'];
+			}
+		}
+
+		return $_database;
+	}
+
+	/*!
+	*/
+	function persist($persist = null) 
+	{
+		static $_persist = true;
+
+		if (!is_null($persist)) {
+			$_persist = trim($persist);
+		}
+
+		return $_persist;
+	}
+
+	/*!
+	*/
+	function lifetime($lifetime = null) {
+		static $_lifetime;
+		static $set = false;
+
+		if (!is_null($lifetime)) {
+			$_lifetime = (int) $lifetime;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
+				return $GLOBALS['ADODB_SESS_LIFE'];
+			}
+		}
+		if (!$_lifetime) {
+			$_lifetime = ini_get('session.gc_maxlifetime');
+			if ($_lifetime <= 1) {
+				// bug in PHP 4.0.3 pl 1  -- how about other versions?
+				//print "
    Session Error: PHP.INI setting session.gc_maxlifetimenot set: $lifetime
    ";
+				$_lifetime = 1440;
+			}
+		}
+
+		return $_lifetime;
+	}
+
+	/*!
+	*/
+	function debug($debug = null) {
+		static $_debug = false;
+		static $set = false;
+
+		if (!is_null($debug)) {
+			$_debug = (bool) $debug;
+
+			$conn = ADODB_Session::_conn();
+			if ($conn) {
+				$conn->debug = $_debug;
+			}
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
+				return $GLOBALS['ADODB_SESS_DEBUG'];
+			}
+		}
+
+		return $_debug;
+	}
+
+	/*!
+	*/
+	function expireNotify($expire_notify = null) {
+		static $_expire_notify;
+		static $set = false;
+
+		if (!is_null($expire_notify)) {
+			$_expire_notify = $expire_notify;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
+				return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
+			}
+		}
+
+		return $_expire_notify;
+	}
+
+	/*!
+	*/
+	function table($table = null) {
+		static $_table = 'sessions';
+		static $set = false;
+
+		if (!is_null($table)) {
+			$_table = trim($table);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
+				return $GLOBALS['ADODB_SESSION_TBL'];
+			}
+		}
+
+		return $_table;
+	}
+
+	/*!
+	*/
+	function optimize($optimize = null) {
+		static $_optimize = false;
+		static $set = false;
+
+		if (!is_null($optimize)) {
+			$_optimize = (bool) $optimize;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (defined('ADODB_SESSION_OPTIMIZE')) {
+				return true;
+			}
+		}
+
+		return $_optimize;
+	}
+
+	/*!
+	*/
+	function syncSeconds($sync_seconds = null) {
+		static $_sync_seconds = 60;
+		static $set = false;
+
+		if (!is_null($sync_seconds)) {
+			$_sync_seconds = (int) $sync_seconds;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (defined('ADODB_SESSION_SYNCH_SECS')) {
+				return ADODB_SESSION_SYNCH_SECS;
+			}
+		}
+
+		return $_sync_seconds;
+	}
+
+	/*!
+	*/
+	function clob($clob = null) {
+		static $_clob = false;
+		static $set = false;
+
+		if (!is_null($clob)) {
+			$_clob = strtolower(trim($clob));
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
+				return $GLOBALS['ADODB_SESSION_USE_LOBS'];
+			}
+		}
+
+		return $_clob;
+	}
+
+	/*!
+	*/
+	function dataFieldName($data_field_name = null) {
+		static $_data_field_name = 'data';
+
+		if (!is_null($data_field_name)) {
+			$_data_field_name = trim($data_field_name);
+		}
+
+		return $_data_field_name;
+	}
+
+	/*!
+	*/
+	function filter($filter = null) {
+		static $_filter = array();
+
+		if (!is_null($filter)) {
+			if (!is_array($filter)) {
+				$filter = array($filter);
+			}
+			$_filter = $filter;
+		}
+
+		return $_filter;
+	}
+
+	/*!
+	*/
+	function encryptionKey($encryption_key = null) {
+		static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
+
+		if (!is_null($encryption_key)) {
+			$_encryption_key = $encryption_key;
+		}
+
+		return $_encryption_key;
+	}
+
+	/////////////////////
+	// private methods
+	/////////////////////
+
+	/*!
+	*/
+	function _conn($conn=null) {
+		return $GLOBALS['ADODB_SESS_CONN'];
+	}
+
+	/*!
+	*/
+	function _crc($crc = null) {
+		static $_crc = false;
+
+		if (!is_null($crc)) {
+			$_crc = $crc;
+		}
+
+		return $_crc;
+	}
+
+	/*!
+	*/
+	function _init() {
+		session_module_name('user');
+		session_set_save_handler(
+			array('ADODB_Session', 'open'),
+			array('ADODB_Session', 'close'),
+			array('ADODB_Session', 'read'),
+			array('ADODB_Session', 'write'),
+			array('ADODB_Session', 'destroy'),
+			array('ADODB_Session', 'gc')
+		);
+	}
+
+
+	/*!
+	*/
+	function _sessionKey() {
+		// use this function to create the encryption key for crypted sessions
+		// crypt the used key, ADODB_Session::encryptionKey() as key and session_id() as salt
+		return crypt(ADODB_Session::encryptionKey(), session_id());
+	}
+
+	/*!
+	*/
+	function _dumprs($rs) {
+		$conn	= ADODB_Session::_conn();
+		$debug	= ADODB_Session::debug();
+
+		if (!$conn) {
+			return;
+		}
+
+		if (!$debug) {
+			return;
+		}
+
+		if (!$rs) {
+			echo "
    \$rs is null or false
    \n";
+			return;
+		}
+
+		//echo "
    \nAffected_Rows=",$conn->Affected_Rows(),"
    \n";
+
+		if (!is_object($rs)) {
+			return;
+		}
+
+		require_once ADODB_SESSION.'/../tohtml.inc.php';
+		rs2html($rs);
+	}
+
+	/////////////////////
+	// public methods
+	/////////////////////
+	
+	function config($driver, $host, $user, $password, $database=false,$options=false)
+	{
+		ADODB_Session::driver($driver);
+		ADODB_Session::host($host);
+		ADODB_Session::user($user);
+		ADODB_Session::password($password);
+		ADODB_Session::database($database);
+		
+		if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
+		
+		if (isset($options['table'])) ADODB_Session::table($options['table']);
+		if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
+		if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
+	}
+
+	/*!
+		Create the connection to the database.
+
+		If $conn already exists, reuse that connection
+	*/
+	function open($save_path, $session_name, $persist = null) 
+	{
+		$conn = ADODB_Session::_conn();
+
+		if ($conn) {
+			return true;
+		}
+
+		$database	= ADODB_Session::database();
+		$debug		= ADODB_Session::debug();
+		$driver		= ADODB_Session::driver();
+		$host		= ADODB_Session::host();
+		$password	= ADODB_Session::password();
+		$user		= ADODB_Session::user();
+
+		if (!is_null($persist)) {
+			ADODB_Session::persist($persist);
+		} else {
+			$persist = ADODB_Session::persist();
+		}
+
+# these can all be defaulted to in php.ini
+#		assert('$database');
+#		assert('$driver');
+#		assert('$host');
+
+		$conn = ADONewConnection($driver);
+
+		if ($debug) {
+			$conn->debug = true;
+//			ADOConnection::outp( " driver=$driver user=$user pwd=$password db=$database ");
+		}
+
+		if ($persist) {
+			switch($persist) {
+			default:
+			case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
+			case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
+			case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
+			}
+		} else {
+			$ok = $conn->Connect($host, $user, $password, $database);
+		}
+
+		if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
+		else
+			ADOConnection::outp('
    Session: connection failed
    ', false);
+		
+
+		return $ok;
+	}
+
+	/*!
+		Close the connection
+	*/
+	function close() 
+	{
+/*
+		$conn = ADODB_Session::_conn();
+		if ($conn) $conn->Close();
+*/
+		return true;
+	}
+
+	/*
+		Slurp in the session variables and return the serialized string
+	*/
+	function read($key) 
+	{
+		$conn	= ADODB_Session::_conn();
+		$data	= ADODB_Session::dataFieldName();
+		$filter	= ADODB_Session::filter();
+		$table	= ADODB_Session::table();
+
+		if (!$conn) {
+			return '';
+		}
+
+		//assert('$table');
+
+		$qkey = $conn->quote($key);
+		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+	
+		$sql = "SELECT $data FROM $table WHERE sesskey = $binary $qkey AND expiry >= " . time();
+		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
+		  developer has commited elsewhere... :(
+		 */
+		#if (ADODB_Session::Lock())
+		#	$rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), $data);
+		#else
+		
+			$rs = $conn->Execute($sql);
+		//ADODB_Session::_dumprs($rs);
+		if ($rs) {
+			if ($rs->EOF) {
+				$v = '';
+			} else {
+				$v = reset($rs->fields);
+				$filter = array_reverse($filter);
+				foreach ($filter as $f) {
+					if (is_object($f)) {
+						$v = $f->read($v, ADODB_Session::_sessionKey());
+					}
+				}
+				$v = rawurldecode($v);
+			}
+
+			$rs->Close();
+
+			ADODB_Session::_crc(strlen($v) . crc32($v));
+			return $v;
+		}
+
+		return '';
+	}
+
+	/*!
+		Write the serialized data to a database.
+
+		If the data has not been modified since the last read(), we do not write.
+	*/
+	function write($key, $val) 
+	{
+	global $ADODB_SESSION_READONLY;
+	
+		if (!empty($ADODB_SESSION_READONLY)) return;
+		
+		$clob			= ADODB_Session::clob();
+		$conn			= ADODB_Session::_conn();
+		$crc			= ADODB_Session::_crc();
+		$data			= ADODB_Session::dataFieldName();
+		$debug			= ADODB_Session::debug();
+		$driver			= ADODB_Session::driver();
+		$expire_notify	= ADODB_Session::expireNotify();
+		$filter			= ADODB_Session::filter();
+		$lifetime		= ADODB_Session::lifetime();
+		$table			= ADODB_Session::table();
+	
+		if (!$conn) {
+			return false;
+		}
+		$qkey = $conn->qstr($key);
+	
+		//assert('$table');
+
+		$expiry = time() + $lifetime;
+
+		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+		// crc32 optimization since adodb 2.1
+		// now we only update expiry date, thx to sebastian thom in adodb 2.32
+		if ($crc !== false && $crc == (strlen($val) . crc32($val))) {
+			if ($debug) {
+				ADOConnection::outp( '
    Session: Only updating date - crc32 not changed
    ');
+			}
+			
+			$expirevar = '';
+			if ($expire_notify) {
+				$var = reset($expire_notify);
+				global $$var;
+				if (isset($$var)) {
+					$expirevar = $$var;
+				}
+			}
+			
+			
+			$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
+			$rs = $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
+			return true;
+		}
+		$val = rawurlencode($val);
+		foreach ($filter as $f) {
+			if (is_object($f)) {
+				$val = $f->write($val, ADODB_Session::_sessionKey());
+			}
+		}
+
+		$arr = array('sesskey' => $key, 'expiry' => $expiry, $data => $val, 'expireref' => '');
+		if ($expire_notify) {
+			$var = reset($expire_notify);
+			global $$var;
+			if (isset($$var)) {
+				$arr['expireref'] = $$var;
+			}
+		}
+
+		if (!$clob) {	// no lobs, simply use replace()
+			$arr[$data] = $val;
+			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
+			
+		} else {
+			// what value shall we insert/update for lob row?
+			switch ($driver) {
+				// empty_clob or empty_lob for oracle dbs
+				case 'oracle':
+				case 'oci8':
+				case 'oci8po':
+				case 'oci805':
+					$lob_value = sprintf('empty_%s()', strtolower($clob));
+					break;
+
+				// null for all other
+				default:
+					$lob_value = 'null';
+					break;
+			}
+			
+			$conn->StartTrans();
+			$expiryref = $conn->qstr($arr['expireref']);
+			// do we insert or update? => as for sesskey
+			$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
+			if ($rs && reset($rs->fields) > 0) {
+				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value, expireref=$expiryref WHERE  sesskey = $qkey";
+			} else {
+				$sql = "INSERT INTO $table (expiry, $data, sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
+			}
+			if ($rs)$rs->Close();
+			
+
+			$err = '';
+			$rs1 = $conn->Execute($sql);
+			if (!$rs1) $err = $conn->ErrorMsg()."\n";
+			
+			$rs2 = $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
+			if (!$rs2) $err .= $conn->ErrorMsg()."\n";
+			
+			$rs = ($rs && $rs2) ? true : false;
+			$conn->CompleteTrans();
+		}
+
+		if (!$rs) {
+			ADOConnection::outp('
    Session Replace: ' . $conn->ErrorMsg() . '
    ', false);
+			return false;
+		}  else {
+			// bug in access driver (could be odbc?) means that info is not committed
+			// properly unless select statement executed in Win2000
+			if ($conn->databaseType == 'access') {
+				$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
+				$rs = $conn->Execute($sql);
+				ADODB_Session::_dumprs($rs);
+				if ($rs) {
+					$rs->Close();
+				}
+			}
+		}/*
+		if (ADODB_Session::Lock()) {
+			$conn->CommitTrans();
+		}*/
+		return $rs ? true : false;
+	}
+
+	/*!
+	*/
+	function destroy($key) {
+		$conn			= ADODB_Session::_conn();
+		$table			= ADODB_Session::table();
+		$expire_notify	= ADODB_Session::expireNotify();
+
+		if (!$conn) {
+			return false;
+		}
+
+		//assert('$table');
+
+		$qkey = $conn->quote($key);
+		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+		if ($expire_notify) {
+			reset($expire_notify);
+			$fn = next($expire_notify);
+			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
+			$sql = "SELECT expireref, sesskey FROM $table WHERE $binary sesskey = $qkey";
+			$rs = $conn->Execute($sql);
+			ADODB_Session::_dumprs($rs);
+			$conn->SetFetchMode($savem);
+			if (!$rs) {
+				return false;
+			}
+			if (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				//assert('$ref');
+				//assert('$key');
+				$fn($ref, $key);
+			}
+			$rs->Close();
+		}
+
+		$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
+		$rs = $conn->Execute($sql);
+		ADODB_Session::_dumprs($rs);
+
+		return $rs ? true : false;
+	}
+
+	/*!
+	*/
+	function gc($maxlifetime) 
+	{
+		$conn			= ADODB_Session::_conn();
+		$debug			= ADODB_Session::debug();
+		$expire_notify	= ADODB_Session::expireNotify();
+		$optimize		= ADODB_Session::optimize();
+		$sync_seconds	= ADODB_Session::syncSeconds();
+		$table			= ADODB_Session::table();
+
+		if (!$conn) {
+			return false;
+		}
+
+
+		$time			= time();
+		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+		if ($expire_notify) {
+			reset($expire_notify);
+			$fn = next($expire_notify);
+			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
+			$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time";
+			$rs = $conn->Execute($sql);
+			ADODB_Session::_dumprs($rs);
+			$conn->SetFetchMode($savem);
+			if ($rs) {
+				$conn->StartTrans();
+				$keys = array();
+				while (!$rs->EOF) {
+					$ref = $rs->fields[0];
+					$key = $rs->fields[1];
+					$fn($ref, $key);
+					$del = $conn->Execute("DELETE FROM $table WHERE sesskey=".$conn->Param('0'),array($key));
+					$rs->MoveNext();
+				}
+				$rs->Close();
+				
+				$conn->CompleteTrans();
+			}
+		} else {
+		
+			if (1) {
+				$sql = "SELECT sesskey FROM $table WHERE expiry < $time";
+				$arr = $conn->GetAll($sql);
+				foreach ($arr as $row) {
+					$sql2 = "DELETE FROM $table WHERE sesskey=".$conn->Param('0');
+					$conn->Execute($sql2,array(reset($row)));
+				}
+			} else {
+				$sql = "DELETE FROM $table WHERE expiry < $time";
+				$rs = $conn->Execute($sql);
+				ADODB_Session::_dumprs($rs);
+				if ($rs) $rs->Close();
+			}
+			if ($debug) {
+				ADOConnection::outp("
    Garbage Collection: $sql
    ");
+			}
+		}
+
+		// suggested by Cameron, "GaM3R" 
+		if ($optimize) {
+			$driver = ADODB_Session::driver();
+
+			if (preg_match('/mysql/i', $driver)) {
+				$sql = "OPTIMIZE TABLE $table";
+			}
+			if (preg_match('/postgres/i', $driver)) {
+				$sql = "VACUUM $table";
+			}
+			if (!empty($sql)) {
+				$conn->Execute($sql);
+			}
+		}
+
+		if ($sync_seconds) {
+			$sql = 'SELECT ';
+			if ($conn->dataProvider === 'oci8') {
+				$sql .= "TO_CHAR({$conn->sysTimeStamp}, 'RRRR-MM-DD HH24:MI:SS')";
+			} else {
+				$sql .= $conn->sysTimeStamp;
+			}
+			$sql .= " FROM $table";
+
+			$rs = $conn->SelectLimit($sql, 1);
+			if ($rs && !$rs->EOF) {
+				$dbts = reset($rs->fields);
+				$rs->Close();
+				$dbt = $conn->UnixTimeStamp($dbts);
+				$t = time();
+
+				if (abs($dbt - $t) >= $sync_seconds) {
+					$msg = __FILE__ .
+						": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: " .
+						" database=$dbt ($dbts), webserver=$t (diff=". (abs($dbt - $t) / 60) . ' minutes)';
+					error_log($msg);
+					if ($debug) {
+						ADOConnection::outp("
    $msg
    ");
+					}
+				}
+			}
+		}
+
+		return true;
+	}
+}
+
+ADODB_Session::_init();
+if (empty($ADODB_SESSION_READONLY))
+	register_shutdown_function('session_write_close');
+
+// for backwards compatability only
+function adodb_sess_open($save_path, $session_name, $persist = true) {
+	return ADODB_Session::open($save_path, $session_name, $persist);
+}
+
+// for backwards compatability only
+function adodb_sess_gc($t)
+{	
+	return ADODB_Session::gc($t);
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/session/adodb-session2.php b/adodb/session/adodb-session2.php
new file mode 100644
index 0000000..dc45b5d
--- /dev/null
+++ b/adodb/session/adodb-session2.php
@@ -0,0 +1,946 @@
+Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
+	
+	/* it is possible that the update statement fails due to a collision */
+	if (!$ok) {
+		session_id($old_id);
+		if (empty($ck)) $ck = session_get_cookie_params();
+		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
+		return false;
+	}
+	
+	return true;
+}
+
+/*
+    Generate database table for session data
+    @see http://phplens.com/lens/lensforum/msgs.php?id=12280
+    @return 0 if failure, 1 if errors, 2 if successful.
+	@author Markus Staab http://www.public-4u.de
+*/
+function adodb_session_create_table($schemaFile=null,$conn = null)
+{
+    // set default values
+    if ($schemaFile===null) $schemaFile = ADODB_SESSION . '/session_schema2.xml';
+    if ($conn===null) $conn = ADODB_Session::_conn();
+
+	if (!$conn) return 0;
+
+    $schema = new adoSchema($conn);
+    $schema->ParseSchema($schemaFile);
+    return $schema->ExecuteSchema();
+}
+
+/*!
+	\static
+*/
+class ADODB_Session {
+	/////////////////////
+	// getter/setter methods
+	/////////////////////
+	
+	/*
+	
+	function Lock($lock=null)
+	{
+	static $_lock = false;
+	
+		if (!is_null($lock)) $_lock = $lock;
+		return $lock;
+	}
+	*/
+	/*!
+	*/
+	static function driver($driver = null) 
+	{
+		static $_driver = 'mysql';
+		static $set = false;
+
+		if (!is_null($driver)) {
+			$_driver = trim($driver);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_DRIVER'])) {
+				return $GLOBALS['ADODB_SESSION_DRIVER'];
+			}
+		}
+
+		return $_driver;
+	}
+
+	/*!
+	*/
+	static function host($host = null) {
+		static $_host = 'localhost';
+		static $set = false;
+
+		if (!is_null($host)) {
+			$_host = trim($host);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_CONNECT'])) {
+				return $GLOBALS['ADODB_SESSION_CONNECT'];
+			}
+		}
+
+		return $_host;
+	}
+
+	/*!
+	*/
+	static function user($user = null) 
+	{
+		static $_user = 'root';
+		static $set = false;
+
+		if (!is_null($user)) {
+			$_user = trim($user);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_USER'])) {
+				return $GLOBALS['ADODB_SESSION_USER'];
+			}
+		}
+
+		return $_user;
+	}
+
+	/*!
+	*/
+	static function password($password = null) 
+	{
+		static $_password = '';
+		static $set = false;
+
+		if (!is_null($password)) {
+			$_password = $password;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_PWD'])) {
+				return $GLOBALS['ADODB_SESSION_PWD'];
+			}
+		}
+
+		return $_password;
+	}
+
+	/*!
+	*/
+	static function database($database = null) 
+	{
+		static $_database = '';
+		static $set = false;
+		
+		if (!is_null($database)) {
+			$_database = trim($database);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_DB'])) {
+				return $GLOBALS['ADODB_SESSION_DB'];
+			}
+		}
+		return $_database;
+	}
+
+	/*!
+	*/
+	static function persist($persist = null) 
+	{
+		static $_persist = true;
+
+		if (!is_null($persist)) {
+			$_persist = trim($persist);
+		}
+
+		return $_persist;
+	}
+
+	/*!
+	*/
+	static function lifetime($lifetime = null) 
+	{
+		static $_lifetime;
+		static $set = false;
+
+		if (!is_null($lifetime)) {
+			$_lifetime = (int) $lifetime;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESS_LIFE'])) {
+				return $GLOBALS['ADODB_SESS_LIFE'];
+			}
+		}
+		if (!$_lifetime) {
+			$_lifetime = ini_get('session.gc_maxlifetime');
+			if ($_lifetime <= 1) {
+				// bug in PHP 4.0.3 pl 1  -- how about other versions?
+				//print "
    Session Error: PHP.INI setting session.gc_maxlifetimenot set: $lifetime
    ";
+				$_lifetime = 1440;
+			}
+		}
+
+		return $_lifetime;
+	}
+
+	/*!
+	*/
+	static function debug($debug = null) 
+	{
+		static $_debug = false;
+		static $set = false;
+
+		if (!is_null($debug)) {
+			$_debug = (bool) $debug;
+
+			$conn = ADODB_Session::_conn();
+			if ($conn) {
+				#$conn->debug = $_debug;
+			}
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESS_DEBUG'])) {
+				return $GLOBALS['ADODB_SESS_DEBUG'];
+			}
+		}
+
+		return $_debug;
+	}
+
+	/*!
+	*/
+	static function expireNotify($expire_notify = null) 
+	{
+		static $_expire_notify;
+		static $set = false;
+
+		if (!is_null($expire_notify)) {
+			$_expire_notify = $expire_notify;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'])) {
+				return $GLOBALS['ADODB_SESSION_EXPIRE_NOTIFY'];
+			}
+		}
+
+		return $_expire_notify;
+	}
+
+	/*!
+	*/
+	static function table($table = null) 
+	{
+		static $_table = 'sessions2';
+		static $set = false;
+
+		if (!is_null($table)) {
+			$_table = trim($table);
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_TBL'])) {
+				return $GLOBALS['ADODB_SESSION_TBL'];
+			}
+		}
+
+		return $_table;
+	}
+
+	/*!
+	*/
+	static function optimize($optimize = null) 
+	{
+		static $_optimize = false;
+		static $set = false;
+
+		if (!is_null($optimize)) {
+			$_optimize = (bool) $optimize;
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (defined('ADODB_SESSION_OPTIMIZE')) {
+				return true;
+			}
+		}
+
+		return $_optimize;
+	}
+
+	/*!
+	*/
+	static function syncSeconds($sync_seconds = null) {
+		//echo ("
    WARNING: ADODB_SESSION::syncSeconds is longer used, please remove this function for your code
    ");
+		
+		return 0;
+	}
+
+	/*!
+	*/
+	static function clob($clob = null) {
+		static $_clob = false;
+		static $set = false;
+
+		if (!is_null($clob)) {
+			$_clob = strtolower(trim($clob));
+			$set = true;
+		} elseif (!$set) {
+			// backwards compatibility
+			if (isset($GLOBALS['ADODB_SESSION_USE_LOBS'])) {
+				return $GLOBALS['ADODB_SESSION_USE_LOBS'];
+			}
+		}
+
+		return $_clob;
+	}
+
+	/*!
+	*/
+	static function dataFieldName($data_field_name = null) {
+		//echo ("
    WARNING: ADODB_SESSION::dataFieldName() is longer used, please remove this function for your code
    ");
+		return '';
+	}
+
+	/*!
+	*/
+	static function filter($filter = null) {
+		static $_filter = array();
+
+		if (!is_null($filter)) {
+			if (!is_array($filter)) {
+				$filter = array($filter);
+			}
+			$_filter = $filter;
+		}
+
+		return $_filter;
+	}
+
+	/*!
+	*/
+	static function encryptionKey($encryption_key = null) {
+		static $_encryption_key = 'CRYPTED ADODB SESSIONS ROCK!';
+
+		if (!is_null($encryption_key)) {
+			$_encryption_key = $encryption_key;
+		}
+
+		return $_encryption_key;
+	}
+
+	/////////////////////
+	// private methods
+	/////////////////////
+
+	/*!
+	*/
+	static function _conn($conn=null) {
+		return isset($GLOBALS['ADODB_SESS_CONN']) ? $GLOBALS['ADODB_SESS_CONN'] : false;
+	}
+
+	/*!
+	*/
+	static function _crc($crc = null) {
+		static $_crc = false;
+
+		if (!is_null($crc)) {
+			$_crc = $crc;
+		}
+
+		return $_crc;
+	}
+
+	/*!
+	*/
+	static function _init() {
+		session_module_name('user');
+		session_set_save_handler(
+			array('ADODB_Session', 'open'),
+			array('ADODB_Session', 'close'),
+			array('ADODB_Session', 'read'),
+			array('ADODB_Session', 'write'),
+			array('ADODB_Session', 'destroy'),
+			array('ADODB_Session', 'gc')
+		);
+	}
+
+
+	/*!
+	*/
+	static function _sessionKey() {
+		// use this function to create the encryption key for crypted sessions
+		// crypt the used key, ADODB_Session::encryptionKey() as key and session_id() as salt
+		return crypt(ADODB_Session::encryptionKey(), session_id());
+	}
+
+	/*!
+	*/
+	static function _dumprs(&$rs) {
+		$conn	= ADODB_Session::_conn();
+		$debug	= ADODB_Session::debug();
+
+		if (!$conn) {
+			return;
+		}
+
+		if (!$debug) {
+			return;
+		}
+
+		if (!$rs) {
+			echo "
    \$rs is null or false
    \n";
+			return;
+		}
+
+		//echo "
    \nAffected_Rows=",$conn->Affected_Rows(),"
    \n";
+
+		if (!is_object($rs)) {
+			return;
+		}
+		$rs = $conn->_rs2rs($rs);
+		
+		require_once ADODB_SESSION.'/../tohtml.inc.php';
+		rs2html($rs);
+		$rs->MoveFirst();
+	}
+
+	/////////////////////
+	// public methods
+	/////////////////////
+	
+	static function config($driver, $host, $user, $password, $database=false,$options=false)
+	{
+		ADODB_Session::driver($driver);
+		ADODB_Session::host($host);
+		ADODB_Session::user($user);
+		ADODB_Session::password($password);
+		ADODB_Session::database($database);
+		
+		if ($driver == 'oci8' || $driver == 'oci8po') $options['lob'] = 'CLOB';
+		
+		if (isset($options['table'])) ADODB_Session::table($options['table']);
+		if (isset($options['lob'])) ADODB_Session::clob($options['lob']);
+		if (isset($options['debug'])) ADODB_Session::debug($options['debug']);
+	}
+
+	/*!
+		Create the connection to the database.
+
+		If $conn already exists, reuse that connection
+	*/
+	static function open($save_path, $session_name, $persist = null) 
+	{
+		$conn = ADODB_Session::_conn();
+
+		if ($conn) {
+			return true;
+		}
+
+		$database	= ADODB_Session::database();
+		$debug		= ADODB_Session::debug();
+		$driver		= ADODB_Session::driver();
+		$host		= ADODB_Session::host();
+		$password	= ADODB_Session::password();
+		$user		= ADODB_Session::user();
+
+		if (!is_null($persist)) {
+			ADODB_Session::persist($persist);
+		} else {
+			$persist = ADODB_Session::persist();
+		}
+
+# these can all be defaulted to in php.ini
+#		assert('$database');
+#		assert('$driver');
+#		assert('$host');
+
+		$conn = ADONewConnection($driver);
+
+		if ($debug) {
+			$conn->debug = true;		
+			ADOConnection::outp( " driver=$driver user=$user db=$database ");
+		}
+		
+		if (empty($conn->_connectionID)) { // not dsn
+			if ($persist) {
+				switch($persist) {
+				default:
+				case 'P': $ok = $conn->PConnect($host, $user, $password, $database); break;
+				case 'C': $ok = $conn->Connect($host, $user, $password, $database); break;
+				case 'N': $ok = $conn->NConnect($host, $user, $password, $database); break;
+				}
+			} else {
+				$ok = $conn->Connect($host, $user, $password, $database);
+			}
+		}
+
+		if ($ok) $GLOBALS['ADODB_SESS_CONN'] = $conn;
+		else
+			ADOConnection::outp('
    Session: connection failed
    ', false);
+		
+
+		return $ok;
+	}
+
+	/*!
+		Close the connection
+	*/
+	static function close() 
+	{
+/*
+		$conn = ADODB_Session::_conn();
+		if ($conn) $conn->Close();
+*/
+		return true;
+	}
+
+	/*
+		Slurp in the session variables and return the serialized string
+	*/
+	static function read($key) 
+	{
+		$conn	= ADODB_Session::_conn();
+		$filter	= ADODB_Session::filter();
+		$table	= ADODB_Session::table();
+
+		if (!$conn) {
+			return '';
+		}
+
+		//assert('$table');
+
+		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+	
+		$sql = "SELECT sessdata FROM $table WHERE sesskey = $binary ".$conn->Param(0)." AND expiry >= " . $conn->sysTimeStamp;
+		/* Lock code does not work as it needs to hold transaction within whole page, and we don't know if 
+		  developer has commited elsewhere... :(
+		 */
+		#if (ADODB_Session::Lock())
+		#	$rs = $conn->RowLock($table, "$binary sesskey = $qkey AND expiry >= " . time(), sessdata);
+		#else
+			$rs = $conn->Execute($sql, array($key));
+		//ADODB_Session::_dumprs($rs);
+		if ($rs) {
+			if ($rs->EOF) {
+				$v = '';
+			} else {
+				$v = reset($rs->fields);
+				$filter = array_reverse($filter);
+				foreach ($filter as $f) {
+					if (is_object($f)) {
+						$v = $f->read($v, ADODB_Session::_sessionKey());
+					}
+				}
+				$v = rawurldecode($v);
+			}
+
+			$rs->Close();
+
+			ADODB_Session::_crc(strlen($v) . crc32($v));
+			return $v;
+		}
+
+		return '';
+	}
+
+	/*!
+		Write the serialized data to a database.
+
+		If the data has not been modified since the last read(), we do not write.
+	*/
+	static function write($key, $oval) 
+	{
+	global $ADODB_SESSION_READONLY;
+	
+		if (!empty($ADODB_SESSION_READONLY)) return;
+		
+		$clob			= ADODB_Session::clob();
+		$conn			= ADODB_Session::_conn();
+		$crc			= ADODB_Session::_crc();
+		$debug			= ADODB_Session::debug();
+		$driver			= ADODB_Session::driver();
+		$expire_notify	= ADODB_Session::expireNotify();
+		$filter			= ADODB_Session::filter();
+		$lifetime		= ADODB_Session::lifetime();
+		$table			= ADODB_Session::table();
+	
+		if (!$conn) {
+			return false;
+		}
+		if ($debug) $conn->debug = 1;
+		$sysTimeStamp = $conn->sysTimeStamp;
+		
+		//assert('$table');
+
+		$expiry = $conn->OffsetDate($lifetime/(24*3600),$sysTimeStamp);
+
+		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+		// crc32 optimization since adodb 2.1
+		// now we only update expiry date, thx to sebastian thom in adodb 2.32
+		if ($crc !== false && $crc == (strlen($oval) . crc32($oval))) {
+			if ($debug) {
+				echo '
    Session: Only updating date - crc32 not changed
    ';
+			}
+			
+			$expirevar = '';
+			if ($expire_notify) {
+				$var = reset($expire_notify);
+				global $$var;
+				if (isset($$var)) {
+					$expirevar = $$var;
+				}
+			}
+			
+			
+			$sql = "UPDATE $table SET expiry = $expiry ,expireref=".$conn->Param('0').", modified = $sysTimeStamp WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= $sysTimeStamp";
+			$rs = $conn->Execute($sql,array($expirevar,$key));
+			return true;
+		}
+		$val = rawurlencode($oval);
+		foreach ($filter as $f) {
+			if (is_object($f)) {
+				$val = $f->write($val, ADODB_Session::_sessionKey());
+			}
+		}
+
+		$expireref = '';
+		if ($expire_notify) {
+			$var = reset($expire_notify);
+			global $$var;
+			if (isset($$var)) {
+				$expireref = $$var;
+			}
+		} 
+
+		if (!$clob) {	// no lobs, simply use replace()
+			$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
+			if ($rs) $rs->Close();
+					
+			if ($rs && reset($rs->fields) > 0) {
+				$sql = "UPDATE $table SET expiry=$expiry, sessdata=".$conn->Param(0).", expireref= ".$conn->Param(1).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('2');
+				
+			} else {
+				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified) 
+					VALUES ($expiry,".$conn->Param('0').", ". $conn->Param('1').", ".$conn->Param('2').", $sysTimeStamp, $sysTimeStamp)";
+			}
+			
+	
+			$rs = $conn->Execute($sql,array($val,$expireref,$key));
+			
+		} else {
+			// what value shall we insert/update for lob row?
+			switch ($driver) {
+				// empty_clob or empty_lob for oracle dbs
+				case 'oracle':
+				case 'oci8':
+				case 'oci8po':
+				case 'oci805':
+					$lob_value = sprintf('empty_%s()', strtolower($clob));
+					break;
+
+				// null for all other
+				default:
+					$lob_value = 'null';
+					break;
+			}
+			
+			$conn->StartTrans();
+			
+			$rs = $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = ".$conn->Param(0),array($key));
+					
+			if ($rs && reset($rs->fields) > 0) {
+				$sql = "UPDATE $table SET expiry=$expiry, sessdata=$lob_value, expireref= ".$conn->Param(0).",modified=$sysTimeStamp WHERE sesskey = ".$conn->Param('1');
+				
+			} else {
+				$sql = "INSERT INTO $table (expiry, sessdata, expireref, sesskey, created, modified) 
+					VALUES ($expiry,$lob_value, ". $conn->Param('0').", ".$conn->Param('1').", $sysTimeStamp, $sysTimeStamp)";
+			}
+			
+			$rs = $conn->Execute($sql,array($expireref,$key));
+			
+			$qkey = $conn->qstr($key);
+			$rs2 = $conn->UpdateBlob($table, 'sessdata', $val, " sesskey=$qkey", strtoupper($clob));
+			if ($debug) echo "
    ",htmlspecialchars($oval), "
    ";
+			$rs = @$conn->CompleteTrans();
+			
+			
+		}
+
+		if (!$rs) {
+			ADOConnection::outp('
    Session Replace: ' . $conn->ErrorMsg() . '
    ', false);
+			return false;
+		}  else {
+			// bug in access driver (could be odbc?) means that info is not committed
+			// properly unless select statement executed in Win2000
+			if ($conn->databaseType == 'access') {
+				$sql = "SELECT sesskey FROM $table WHERE $binary sesskey = $qkey";
+				$rs = $conn->Execute($sql);
+				ADODB_Session::_dumprs($rs);
+				if ($rs) {
+					$rs->Close();
+				}
+			}
+		}/*
+		if (ADODB_Session::Lock()) {
+			$conn->CommitTrans();
+		}*/
+		return $rs ? true : false;
+	}
+
+	/*!
+	*/
+	static function destroy($key) {
+		$conn			= ADODB_Session::_conn();
+		$table			= ADODB_Session::table();
+		$expire_notify	= ADODB_Session::expireNotify();
+
+		if (!$conn) {
+			return false;
+		}
+		$debug			= ADODB_Session::debug();
+		if ($debug) $conn->debug = 1;
+		//assert('$table');
+
+		$qkey = $conn->quote($key);
+		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+		if ($expire_notify) {
+			reset($expire_notify);
+			$fn = next($expire_notify);
+			$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
+			$sql = "SELECT expireref, sesskey FROM $table WHERE $binary sesskey = $qkey";
+			$rs = $conn->Execute($sql);
+			ADODB_Session::_dumprs($rs);
+			$conn->SetFetchMode($savem);
+			if (!$rs) {
+				return false;
+			}
+			if (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				//assert('$ref');
+				//assert('$key');
+				$fn($ref, $key);
+			}
+			$rs->Close();
+		}
+
+		$sql = "DELETE FROM $table WHERE $binary sesskey = $qkey";
+		$rs = $conn->Execute($sql);
+		if ($rs) {
+			$rs->Close();
+		}
+
+		return $rs ? true : false;
+	}
+
+	/*!
+	*/
+	static function gc($maxlifetime) 
+	{
+		$conn			= ADODB_Session::_conn();
+		$debug			= ADODB_Session::debug();
+		$expire_notify	= ADODB_Session::expireNotify();
+		$optimize		= ADODB_Session::optimize();
+		$table			= ADODB_Session::table();
+
+		if (!$conn) {
+			return false;
+		}
+
+
+		$debug			= ADODB_Session::debug();
+		if ($debug) {
+			$conn->debug = 1;
+			$COMMITNUM = 2;
+		} else {
+			$COMMITNUM = 20;
+		}
+		
+		//assert('$table');
+
+		$time = $conn->OffsetDate(-$maxlifetime/24/3600,$conn->sysTimeStamp);
+		$binary = $conn->dataProvider === 'mysql' ? '/*! BINARY */' : '';
+
+		if ($expire_notify) {
+			reset($expire_notify);
+			$fn = next($expire_notify);
+		} else {
+			$fn = false;
+		}
+		
+		$savem = $conn->SetFetchMode(ADODB_FETCH_NUM);
+		$sql = "SELECT expireref, sesskey FROM $table WHERE expiry < $time ORDER BY 2"; # add order by to prevent deadlock
+		$rs = $conn->SelectLimit($sql,1000);
+		ADODB_Session::_dumprs($rs);
+		if ($debug) $conn->SetFetchMode($savem);
+		if ($rs) {
+			$tr = $conn->hasTransactions;
+			if ($tr) $conn->BeginTrans();
+			$keys = array();
+			$ccnt = 0;
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				if ($fn) $fn($ref, $key);
+				$del = $conn->Execute("DELETE FROM $table WHERE sesskey=".$conn->Param('0'),array($key));
+				$rs->MoveNext();
+				$ccnt += 1;
+				if ($tr && $ccnt % $COMMITNUM == 0) {
+					if ($debug) echo "Commit
    \n";
+					$conn->CommitTrans();
+					$conn->BeginTrans();
+				}
+			}
+			$rs->Close();
+			
+			if ($tr) $conn->CommitTrans();
+		}
+		
+
+		// suggested by Cameron, "GaM3R" 
+		if ($optimize) {
+			$driver = ADODB_Session::driver();
+
+			if (preg_match('/mysql/i', $driver)) {
+				$sql = "OPTIMIZE TABLE $table";
+			}
+			if (preg_match('/postgres/i', $driver)) {
+				$sql = "VACUUM $table";
+			}
+			if (!empty($sql)) {
+				$conn->Execute($sql);
+			}
+		}
+
+		
+		return true;
+	}
+}
+
+ADODB_Session::_init();
+if (empty($ADODB_SESSION_READONLY))
+	register_shutdown_function('session_write_close');
+
+// for backwards compatability only
+function adodb_sess_open($save_path, $session_name, $persist = true) {
+	return ADODB_Session::open($save_path, $session_name, $persist);
+}
+
+// for backwards compatability only
+function adodb_sess_gc($t)
+{	
+	return ADODB_Session::gc($t);
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/session/adodb-sessions.mysql.sql b/adodb/session/adodb-sessions.mysql.sql
new file mode 100644
index 0000000..f90de44
--- /dev/null
+++ b/adodb/session/adodb-sessions.mysql.sql
@@ -0,0 +1,16 @@
+-- $CVSHeader$
+
+CREATE DATABASE /*! IF NOT EXISTS */ adodb_sessions;
+
+USE adodb_sessions;
+
+DROP TABLE /*! IF EXISTS */ sessions;
+
+CREATE TABLE /*! IF NOT EXISTS */ sessions (
+	sesskey		CHAR(32)	/*! BINARY */ NOT NULL DEFAULT '',
+	expiry		INT(11)		/*! UNSIGNED */ NOT NULL DEFAULT 0,
+	expireref	VARCHAR(64)	DEFAULT '',
+	data		LONGTEXT	DEFAULT '',
+	PRIMARY KEY	(sesskey),
+	INDEX expiry (expiry)
+);
diff --git a/adodb/session/adodb-sessions.oracle.clob.sql b/adodb/session/adodb-sessions.oracle.clob.sql
new file mode 100644
index 0000000..c5c4f2d
--- /dev/null
+++ b/adodb/session/adodb-sessions.oracle.clob.sql
@@ -0,0 +1,15 @@
+-- $CVSHeader$
+
+DROP TABLE adodb_sessions;
+
+CREATE TABLE sessions (
+	sesskey		CHAR(32)	DEFAULT '' NOT NULL,
+	expiry		INT		DEFAULT 0 NOT NULL,
+	expireref	VARCHAR(64)	DEFAULT '',
+	data		CLOB		DEFAULT '',
+	PRIMARY KEY	(sesskey)
+);
+
+CREATE INDEX ix_expiry ON sessions (expiry);
+
+QUIT;
diff --git a/adodb/session/adodb-sessions.oracle.sql b/adodb/session/adodb-sessions.oracle.sql
new file mode 100644
index 0000000..8fd5a34
--- /dev/null
+++ b/adodb/session/adodb-sessions.oracle.sql
@@ -0,0 +1,16 @@
+-- $CVSHeader$
+
+DROP TABLE adodb_sessions;
+
+CREATE TABLE sessions (
+	sesskey		CHAR(32)	DEFAULT '' NOT NULL,
+	expiry		INT		DEFAULT 0 NOT NULL,
+	expireref	VARCHAR(64)	DEFAULT '',
+	data		VARCHAR(4000)	DEFAULT '',
+	PRIMARY KEY	(sesskey),
+	INDEX expiry (expiry)
+);
+
+CREATE INDEX ix_expiry ON sessions (expiry);
+
+QUIT;
diff --git a/adodb/session/crypt.inc.php b/adodb/session/crypt.inc.php
new file mode 100644
index 0000000..41cb06a
--- /dev/null
+++ b/adodb/session/crypt.inc.php
@@ -0,0 +1,161 @@
+
+class MD5Crypt{
+		function keyED($txt,$encrypt_key)
+		{
+				$encrypt_key = md5($encrypt_key);
+				$ctr=0;
+				$tmp = "";
+				for ($i=0;$ikeyED($tmp,$key));
+		}
+
+		function Decrypt($txt,$key)
+		{
+				$txt = $this->keyED(base64_decode($txt),$key);
+				$tmp = "";
+				for ($i=0;$i= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
+						{
+								$randnumber = rand(48,120);
+						}
+
+						$randomPassword .= chr($randnumber);
+				}
+				return $randomPassword;
+		}
+
+}
+
+
+class SHA1Crypt{
+
+		function keyED($txt,$encrypt_key)
+		{
+
+				$encrypt_key = sha1($encrypt_key);
+				$ctr=0;
+				$tmp = "";
+
+				for ($i=0;$ikeyED($tmp,$key));
+
+		}
+
+
+
+		function Decrypt($txt,$key)
+		{
+
+				$txt = $this->keyED(base64_decode($txt),$key);
+
+				$tmp = "";
+
+				for ($i=0;$i= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
+						{
+								$randnumber = rand(48,120);
+						}
+
+						$randomPassword .= chr($randnumber);
+				}
+
+				return $randomPassword;
+
+		}
+
+
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/session/old/adodb-cryptsession.php b/adodb/session/old/adodb-cryptsession.php
new file mode 100644
index 0000000..9b9fdb4
--- /dev/null
+++ b/adodb/session/old/adodb-cryptsession.php
@@ -0,0 +1,324 @@
+
+	
+  Set tabs to 4 for best viewing.
+  
+  Latest version of ADODB is available at http://php.weblogs.com/adodb
+  ======================================================================
+  
+ This file provides PHP4 session management using the ADODB database
+wrapper library.
+ 
+ Example
+ =======
+ 
+	include('adodb.inc.php');
+	#---------------------------------#
+	include('adodb-cryptsession.php'); 
+	#---------------------------------#
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	print "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
+
+ 
+ Installation
+ ============
+ 1. Create a new database in MySQL or Access "sessions" like
+so:
+ 
+  create table sessions (
+	   SESSKEY char(32) not null,
+	   EXPIRY int(11) unsigned not null,
+	   EXPIREREF varchar(64),
+	   DATA CLOB,
+	  primary key (sesskey)
+  );
+  
+  2. Then define the following parameters. You can either modify
+     this file, or define them before this file is included:
+	 
+  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+	$ADODB_SESSION_CONNECT='server to connect to';
+	$ADODB_SESSION_USER ='user';
+	$ADODB_SESSION_PWD ='password';
+	$ADODB_SESSION_DB ='database';
+	$ADODB_SESSION_TBL = 'sessions'
+	
+  3. Recommended is PHP 4.0.2 or later. There are documented
+session bugs in earlier versions of PHP.
+
+*/
+
+
+include_once('crypt.inc.php');
+
+if (!defined('_ADODB_LAYER')) {
+	include (dirname(__FILE__).'/adodb.inc.php');
+}
+
+ /* if database time and system time is difference is greater than this, then give warning */
+ define('ADODB_SESSION_SYNCH_SECS',60); 
+
+if (!defined('ADODB_SESSION')) {
+
+ define('ADODB_SESSION',1);
+ 
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_LIFE,
+	$ADODB_SESS_DEBUG,
+	$ADODB_SESS_INSERT,
+	$ADODB_SESSION_EXPIRE_NOTIFY,
+	$ADODB_SESSION_TBL; 
+
+	//$ADODB_SESS_DEBUG = true;
+	
+	/* SET THE FOLLOWING PARAMETERS */
+if (empty($ADODB_SESSION_DRIVER)) {
+	$ADODB_SESSION_DRIVER='mysql';
+	$ADODB_SESSION_CONNECT='localhost';
+	$ADODB_SESSION_USER ='root';
+	$ADODB_SESSION_PWD ='';
+	$ADODB_SESSION_DB ='xphplens_2';
+}
+
+if (empty($ADODB_SESSION_TBL)){
+	$ADODB_SESSION_TBL = 'sessions';
+}
+
+if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
+	$ADODB_SESSION_EXPIRE_NOTIFY = false;
+}
+
+function ADODB_Session_Key() 
+{
+$ADODB_CRYPT_KEY = 'CRYPTED ADODB SESSIONS ROCK!';
+
+	/* USE THIS FUNCTION TO CREATE THE ENCRYPTION KEY FOR CRYPTED SESSIONS	*/
+	/* Crypt the used key, $ADODB_CRYPT_KEY as key and session_ID as SALT	*/
+	return crypt($ADODB_CRYPT_KEY, session_ID());
+}
+
+$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
+if ($ADODB_SESS_LIFE <= 1) {
+	// bug in PHP 4.0.3 pl 1  -- how about other versions?
+	//print "
    Session Error: PHP.INI setting session.gc_maxlifetimenot set: $ADODB_SESS_LIFE
    ";
+	$ADODB_SESS_LIFE=1440;
+}
+
+function adodb_sess_open($save_path, $session_name) 
+{
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_DEBUG;
+	
+	$ADODB_SESS_INSERT = false;
+	
+	if (isset($ADODB_SESS_CONN)) return true;
+	
+	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
+	if (!empty($ADODB_SESS_DEBUG)) {
+		$ADODB_SESS_CONN->debug = true;
+		print" conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ";
+	}
+	return $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	
+}
+
+function adodb_sess_close() 
+{
+global $ADODB_SESS_CONN;
+
+	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
+	return true;
+}
+
+function adodb_sess_read($key) 
+{
+$Crypt = new MD5Crypt;
+global $ADODB_SESS_CONN,$ADODB_SESS_INSERT,$ADODB_SESSION_TBL;
+	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
+	if ($rs) {
+		if ($rs->EOF) {
+			$ADODB_SESS_INSERT = true;
+			$v = '';
+		} else {
+			// Decrypt session data
+			$v = rawurldecode($Crypt->Decrypt(reset($rs->fields), ADODB_Session_Key()));
+		}
+		$rs->Close();
+		return $v;
+	}
+	else $ADODB_SESS_INSERT = true;
+	
+	return '';
+}
+
+function adodb_sess_write($key, $val) 
+{
+$Crypt = new MD5Crypt;
+	global $ADODB_SESS_INSERT,$ADODB_SESS_CONN, $ADODB_SESS_LIFE, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	$expiry = time() + $ADODB_SESS_LIFE;
+
+	// encrypt session data..	
+	$val = $Crypt->Encrypt(rawurlencode($val), ADODB_Session_Key());
+	
+	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		global $$var;
+		$arr['expireref'] = $$var;
+	}
+	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,
+	    $arr,
+    	'sesskey',$autoQuote = true);
+
+	if (!$rs) {
+		ADOConnection::outp( '
+-- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'
    ',false);
+	} else {
+		// bug in access driver (could be odbc?) means that info is not commited
+		// properly unless select statement executed in Win2000
+	
+	if ($ADODB_SESS_CONN->databaseType == 'access') $rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
+	}
+	return isset($rs);
+}
+
+function adodb_sess_destroy($key) 
+{
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+	
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$ADODB_SESS_CONN->CommitTrans();
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+	}
+	return $rs ? true : false;
+}
+
+
+function adodb_sess_gc($maxlifetime) {
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY,$ADODB_SESS_DEBUG;
+
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$t = time();
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				//$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			
+			$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+			$ADODB_SESS_CONN->CommitTrans();
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
+		$ADODB_SESS_CONN->Execute($qry);
+	}
+	
+	// suggested by Cameron, "GaM3R" 
+	if (defined('ADODB_SESSION_OPTIMIZE'))
+	{
+	global $ADODB_SESSION_DRIVER;
+	
+		switch( $ADODB_SESSION_DRIVER ) {
+			case 'mysql':
+			case 'mysqlt':
+				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
+				break;
+			case 'postgresql':
+			case 'postgresql7':
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
+				break;
+		}
+	}
+	
+	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
+	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
+	
+	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
+	if ($rs && !$rs->EOF) {
+	
+		$dbts = reset($rs->fields);
+		$rs->Close();
+		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
+		$t = time();
+		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
+			$msg = 
+			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
+			error_log($msg);
+			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- $msg
    ");
+		}
+	}
+	
+	return true;
+}
+
+session_module_name('user'); 
+session_set_save_handler(
+	"adodb_sess_open",
+	"adodb_sess_close",
+	"adodb_sess_read",
+	"adodb_sess_write",
+	"adodb_sess_destroy",
+	"adodb_sess_gc");
+}
+
+/*  TEST SCRIPT -- UNCOMMENT */
+/*
+if (0) {
+
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	print "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
+}
+*/
+?>
diff --git a/adodb/session/old/adodb-session-clob.php b/adodb/session/old/adodb-session-clob.php
new file mode 100644
index 0000000..b4e88e4
--- /dev/null
+++ b/adodb/session/old/adodb-session-clob.php
@@ -0,0 +1,448 @@
+";
+	
+To force non-persistent connections, call adodb_session_open first before session_start():
+
+	include('adodb.inc.php');
+	include('adodb-session.php');
+	adodb_session_open(false,false,false);
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	print "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
+
+ 
+ Installation
+ ============
+ 1. Create this table in your database (syntax might vary depending on your db):
+ 
+  create table sessions (
+	   SESSKEY char(32) not null,
+	   EXPIRY int(11) unsigned not null,
+	   EXPIREREF varchar(64),
+	   DATA CLOB,
+	  primary key (sesskey)
+  );
+
+
+  2. Then define the following parameters in this file:
+  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+	$ADODB_SESSION_CONNECT='server to connect to';
+	$ADODB_SESSION_USER ='user';
+	$ADODB_SESSION_PWD ='password';
+	$ADODB_SESSION_DB ='database';
+	$ADODB_SESSION_TBL = 'sessions'
+	$ADODB_SESSION_USE_LOBS = false; (or, if you wanna use CLOBS (= 'CLOB') or ( = 'BLOB')
+	
+  3. Recommended is PHP 4.1.0 or later. There are documented
+	 session bugs in earlier versions of PHP.
+
+  4. If you want to receive notifications when a session expires, then
+  	 you can tag a session with an EXPIREREF, and before the session
+	 record is deleted, we can call a function that will pass the EXPIREREF
+	 as the first parameter, and the session key as the second parameter.
+	 
+	 To do this, define a notification function, say NotifyFn:
+	 
+	 	function NotifyFn($expireref, $sesskey)
+	 	{
+	 	}
+	 
+	 Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
+	 This is an array with 2 elements, the first being the name of the variable
+	 you would like to store in the EXPIREREF field, and the 2nd is the 
+	 notification function's name.
+	 
+	 In this example, we want to be notified when a user's session 
+	 has expired, so we store the user id in the global variable $USERID, 
+	 store this value in the EXPIREREF field:
+	 
+	 	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+		
+	Then when the NotifyFn is called, we are passed the $USERID as the first
+	parameter, eg. NotifyFn($userid, $sesskey).
+*/
+
+if (!defined('_ADODB_LAYER')) {
+	include (dirname(__FILE__).'/adodb.inc.php');
+}
+
+if (!defined('ADODB_SESSION')) {
+
+ define('ADODB_SESSION',1);
+ 
+ /* if database time and system time is difference is greater than this, then give warning */
+ define('ADODB_SESSION_SYNCH_SECS',60); 
+
+/****************************************************************************************\
+	Global definitions
+\****************************************************************************************/
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_LIFE,
+	$ADODB_SESS_DEBUG,
+	$ADODB_SESSION_EXPIRE_NOTIFY,
+	$ADODB_SESSION_CRC,
+	$ADODB_SESSION_USE_LOBS,
+	$ADODB_SESSION_TBL;
+	
+	if (!isset($ADODB_SESSION_USE_LOBS)) $ADODB_SESSION_USE_LOBS = 'CLOB';
+	
+	$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
+	if ($ADODB_SESS_LIFE <= 1) {
+	 // bug in PHP 4.0.3 pl 1  -- how about other versions?
+	 //print "
    Session Error: PHP.INI setting session.gc_maxlifetimenot set: $ADODB_SESS_LIFE
    ";
+	 	$ADODB_SESS_LIFE=1440;
+	}
+	$ADODB_SESSION_CRC = false;
+	//$ADODB_SESS_DEBUG = true;
+	
+	//////////////////////////////////
+	/* SET THE FOLLOWING PARAMETERS */
+	//////////////////////////////////
+	
+	if (empty($ADODB_SESSION_DRIVER)) {
+		$ADODB_SESSION_DRIVER='mysql';
+		$ADODB_SESSION_CONNECT='localhost';
+		$ADODB_SESSION_USER ='root';
+		$ADODB_SESSION_PWD ='';
+		$ADODB_SESSION_DB ='xphplens_2';
+	}
+	
+	if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
+		$ADODB_SESSION_EXPIRE_NOTIFY = false;
+	}
+	//  Made table name configurable - by David Johnson djohnson@inpro.net
+	if (empty($ADODB_SESSION_TBL)){
+		$ADODB_SESSION_TBL = 'sessions';
+	}
+	
+
+	// defaulting $ADODB_SESSION_USE_LOBS
+	if (!isset($ADODB_SESSION_USE_LOBS) || empty($ADODB_SESSION_USE_LOBS)) {
+		$ADODB_SESSION_USE_LOBS = false;
+	}
+
+	/*
+	$ADODB_SESS['driver'] = $ADODB_SESSION_DRIVER;
+	$ADODB_SESS['connect'] = $ADODB_SESSION_CONNECT;
+	$ADODB_SESS['user'] = $ADODB_SESSION_USER;
+	$ADODB_SESS['pwd'] = $ADODB_SESSION_PWD;
+	$ADODB_SESS['db'] = $ADODB_SESSION_DB;
+	$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
+	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
+	
+	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
+	$ADODB_SESS['table'] = $ADODB_SESS_TBL;
+	*/
+	
+/****************************************************************************************\
+	Create the connection to the database. 
+	
+	If $ADODB_SESS_CONN already exists, reuse that connection
+\****************************************************************************************/
+function adodb_sess_open($save_path, $session_name,$persist=true) 
+{
+GLOBAL $ADODB_SESS_CONN;
+	if (isset($ADODB_SESS_CONN)) return true;
+	
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_DEBUG;
+	
+	// cannot use & below - do not know why...
+	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
+	if (!empty($ADODB_SESS_DEBUG)) {
+		$ADODB_SESS_CONN->debug = true;
+		ADOConnection::outp( " conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ");
+	}
+	if ($persist) $ok = $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	
+	if (!$ok) ADOConnection::outp( "
+-- Session: connection failed
    ",false);
+}
+
+/****************************************************************************************\
+	Close the connection
+\****************************************************************************************/
+function adodb_sess_close() 
+{
+global $ADODB_SESS_CONN;
+
+	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
+	return true;
+}
+
+/****************************************************************************************\
+	Slurp in the session variables and return the serialized string
+\****************************************************************************************/
+function adodb_sess_read($key) 
+{
+global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
+
+	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
+	if ($rs) {
+		if ($rs->EOF) {
+			$v = '';
+		} else 
+			$v = rawurldecode(reset($rs->fields));
+			
+		$rs->Close();
+		
+		// new optimization adodb 2.1
+		$ADODB_SESSION_CRC = strlen($v).crc32($v);
+		
+		return $v;
+	}
+	
+	return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
+}
+
+/****************************************************************************************\
+	Write the serialized data to a database.
+	
+	If the data has not been modified since adodb_sess_read(), we do not write.
+\****************************************************************************************/
+function adodb_sess_write($key, $val) 
+{
+	global
+		$ADODB_SESS_CONN, 
+		$ADODB_SESS_LIFE, 
+		$ADODB_SESSION_TBL,
+		$ADODB_SESS_DEBUG, 
+		$ADODB_SESSION_CRC,
+		$ADODB_SESSION_EXPIRE_NOTIFY,
+		$ADODB_SESSION_DRIVER,			// added
+		$ADODB_SESSION_USE_LOBS;		// added
+
+	$expiry = time() + $ADODB_SESS_LIFE;
+	
+	// crc32 optimization since adodb 2.1
+	// now we only update expiry date, thx to sebastian thom in adodb 2.32
+	if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
+		if ($ADODB_SESS_DEBUG) echo "
+-- Session: Only updating date - crc32 not changed
    ";
+		$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
+		$rs = $ADODB_SESS_CONN->Execute($qry);	
+		return true;
+	}
+	$val = rawurlencode($val);
+	
+	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		global $$var;
+		$arr['expireref'] = $$var;
+	}
+
+	
+	if ($ADODB_SESSION_USE_LOBS === false) {	// no lobs, simply use replace()
+		$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr, 'sesskey',$autoQuote = true);
+		if (!$rs) {
+			$err = $ADODB_SESS_CONN->ErrorMsg();
+		}
+	} else {
+		// what value shall we insert/update for lob row?
+		switch ($ADODB_SESSION_DRIVER) {
+			// empty_clob or empty_lob for oracle dbs
+			case "oracle":
+			case "oci8":
+			case "oci8po":
+			case "oci805":
+				$lob_value = sprintf("empty_%s()", strtolower($ADODB_SESSION_USE_LOBS));
+				break;
+
+			// null for all other
+			default:
+				$lob_value = "null";
+				break;
+		}
+
+		// do we insert or update? => as for sesskey
+		$res = $ADODB_SESS_CONN->Execute("select count(*) as cnt from $ADODB_SESSION_TBL where sesskey = '$key'");
+		if ($res && reset($res->fields) > 0) {
+			$qry = sprintf("update %s set expiry = %d, data = %s where sesskey = '%s'", $ADODB_SESSION_TBL, $expiry, $lob_value, $key);
+		} else {
+			// insert
+			$qry = sprintf("insert into %s (sesskey, expiry, data) values ('%s', %d, %s)", $ADODB_SESSION_TBL, $key, $expiry, $lob_value);
+		}
+
+		$err = "";
+		$rs1 = $ADODB_SESS_CONN->Execute($qry);
+		if (!$rs1) {
+			$err .= $ADODB_SESS_CONN->ErrorMsg()."\n";
+		}
+		$rs2 = $ADODB_SESS_CONN->UpdateBlob($ADODB_SESSION_TBL, 'data', $val, "sesskey='$key'", strtoupper($ADODB_SESSION_USE_LOBS));
+		if (!$rs2) {
+			$err .= $ADODB_SESS_CONN->ErrorMsg()."\n";
+		}
+		$rs = ($rs1 && $rs2) ? true : false;
+	}
+
+	if (!$rs) {
+		ADOConnection::outp( '
+-- Session Replace: '.nl2br($err).'
    ',false);
+	}  else {
+		// bug in access driver (could be odbc?) means that info is not commited
+		// properly unless select statement executed in Win2000
+		if ($ADODB_SESS_CONN->databaseType == 'access') 
+			$rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
+	}
+	return !empty($rs);
+}
+
+function adodb_sess_destroy($key) 
+{
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+	
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$ADODB_SESS_CONN->CommitTrans();
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+	}
+	return $rs ? true : false;
+}
+
+function adodb_sess_gc($maxlifetime) 
+{
+	global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+	
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$t = time();
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			
+			//$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+			$ADODB_SESS_CONN->CommitTrans();
+			
+		}
+	} else {
+		$ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time());
+	
+		if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- Garbage Collection: $qry
    ");
+	}
+	// suggested by Cameron, "GaM3R" 
+	if (defined('ADODB_SESSION_OPTIMIZE')) {
+	global $ADODB_SESSION_DRIVER;
+	
+		switch( $ADODB_SESSION_DRIVER ) {
+			case 'mysql':
+			case 'mysqlt':
+				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
+				break;
+			case 'postgresql':
+			case 'postgresql7':
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
+				break;
+		}
+		if (!empty($opt_qry)) {
+			$ADODB_SESS_CONN->Execute($opt_qry);
+		}
+	}
+	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
+	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
+	
+	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
+	if ($rs && !$rs->EOF) {
+	
+		$dbts = reset($rs->fields);
+		$rs->Close();
+		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
+		$t = time();
+		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
+			$msg = 
+			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
+			error_log($msg);
+			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- $msg
    ");
+		}
+	}
+	
+	return true;
+}
+
+session_module_name('user'); 
+session_set_save_handler(
+	"adodb_sess_open",
+	"adodb_sess_close",
+	"adodb_sess_read",
+	"adodb_sess_write",
+	"adodb_sess_destroy",
+	"adodb_sess_gc");
+}
+
+/*  TEST SCRIPT -- UNCOMMENT */
+
+if (0) {
+
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	ADOConnection::outp( "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ",false);
+}
+
+?>
diff --git a/adodb/session/old/adodb-session.php b/adodb/session/old/adodb-session.php
new file mode 100644
index 0000000..933db12
--- /dev/null
+++ b/adodb/session/old/adodb-session.php
@@ -0,0 +1,439 @@
+";
+	
+To force non-persistent connections, call adodb_session_open first before session_start():
+
+	include('adodb.inc.php');
+	include('adodb-session.php');
+	adodb_sess_open(false,false,false);
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	print "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
+
+ 
+ Installation
+ ============
+ 1. Create this table in your database (syntax might vary depending on your db):
+ 
+  create table sessions (
+	   SESSKEY char(32) not null,
+	   EXPIRY int(11) unsigned not null,
+	   EXPIREREF varchar(64),
+	   DATA text not null,
+	  primary key (sesskey)
+  );
+  
+  For oracle:
+    create table sessions (
+	   SESSKEY char(32) not null,
+	   EXPIRY DECIMAL(16)  not null,
+	   EXPIREREF varchar(64),
+	   DATA varchar(4000) not null,
+	  primary key (sesskey)
+  );
+
+
+  2. Then define the following parameters. You can either modify
+     this file, or define them before this file is included:
+	 
+  	$ADODB_SESSION_DRIVER='database driver, eg. mysql or ibase';
+	$ADODB_SESSION_CONNECT='server to connect to';
+	$ADODB_SESSION_USER ='user';
+	$ADODB_SESSION_PWD ='password';
+	$ADODB_SESSION_DB ='database';
+	$ADODB_SESSION_TBL = 'sessions'
+	
+  3. Recommended is PHP 4.1.0 or later. There are documented
+	 session bugs in earlier versions of PHP.
+
+  4. If you want to receive notifications when a session expires, then
+  	 you can tag a session with an EXPIREREF, and before the session
+	 record is deleted, we can call a function that will pass the EXPIREREF
+	 as the first parameter, and the session key as the second parameter.
+	 
+	 To do this, define a notification function, say NotifyFn:
+	 
+	 	function NotifyFn($expireref, $sesskey)
+	 	{
+	 	}
+	 
+	 Then you need to define a global variable $ADODB_SESSION_EXPIRE_NOTIFY.
+	 This is an array with 2 elements, the first being the name of the variable
+	 you would like to store in the EXPIREREF field, and the 2nd is the 
+	 notification function's name.
+	 
+	 In this example, we want to be notified when a user's session 
+	 has expired, so we store the user id in the global variable $USERID, 
+	 store this value in the EXPIREREF field:
+	 
+	 	$ADODB_SESSION_EXPIRE_NOTIFY = array('USERID','NotifyFn');
+		
+	Then when the NotifyFn is called, we are passed the $USERID as the first
+	parameter, eg. NotifyFn($userid, $sesskey).
+*/
+
+if (!defined('_ADODB_LAYER')) {
+	include (dirname(__FILE__).'/adodb.inc.php');
+}
+
+if (!defined('ADODB_SESSION')) {
+
+ define('ADODB_SESSION',1);
+ 
+ /* if database time and system time is difference is greater than this, then give warning */
+ define('ADODB_SESSION_SYNCH_SECS',60); 
+
+ /*
+	Thanks Joe Li. See http://phplens.com/lens/lensforum/msgs.php?id=11487&x=1
+*/
+function adodb_session_regenerate_id() 
+{
+	$conn = ADODB_Session::_conn();
+	if (!$conn) return false;
+
+	$old_id = session_id();
+	if (function_exists('session_regenerate_id')) {
+		session_regenerate_id();
+	} else {
+		session_id(md5(uniqid(rand(), true)));
+		$ck = session_get_cookie_params();
+		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
+		//@session_start();
+	}
+	$new_id = session_id();
+	$ok = $conn->Execute('UPDATE '. ADODB_Session::table(). ' SET sesskey='. $conn->qstr($new_id). ' WHERE sesskey='.$conn->qstr($old_id));
+	
+	/* it is possible that the update statement fails due to a collision */
+	if (!$ok) {
+		session_id($old_id);
+		if (empty($ck)) $ck = session_get_cookie_params();
+		setcookie(session_name(), session_id(), false, $ck['path'], $ck['domain'], $ck['secure']);
+		return false;
+	}
+	
+	return true;
+}
+
+/****************************************************************************************\
+	Global definitions
+\****************************************************************************************/
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_CONN,
+	$ADODB_SESS_LIFE,
+	$ADODB_SESS_DEBUG,
+	$ADODB_SESSION_EXPIRE_NOTIFY,
+	$ADODB_SESSION_CRC,
+	$ADODB_SESSION_TBL;
+	
+	
+	$ADODB_SESS_LIFE = ini_get('session.gc_maxlifetime');
+	if ($ADODB_SESS_LIFE <= 1) {
+	 // bug in PHP 4.0.3 pl 1  -- how about other versions?
+	 //print "
    Session Error: PHP.INI setting session.gc_maxlifetimenot set: $ADODB_SESS_LIFE
    ";
+	 	$ADODB_SESS_LIFE=1440;
+	}
+	$ADODB_SESSION_CRC = false;
+	//$ADODB_SESS_DEBUG = true;
+	
+	//////////////////////////////////
+	/* SET THE FOLLOWING PARAMETERS */
+	//////////////////////////////////
+	
+	if (empty($ADODB_SESSION_DRIVER)) {
+		$ADODB_SESSION_DRIVER='mysql';
+		$ADODB_SESSION_CONNECT='localhost';
+		$ADODB_SESSION_USER ='root';
+		$ADODB_SESSION_PWD ='';
+		$ADODB_SESSION_DB ='xphplens_2';
+	}
+	
+	if (empty($ADODB_SESSION_EXPIRE_NOTIFY)) {
+		$ADODB_SESSION_EXPIRE_NOTIFY = false;
+	}
+	//  Made table name configurable - by David Johnson djohnson@inpro.net
+	if (empty($ADODB_SESSION_TBL)){
+		$ADODB_SESSION_TBL = 'sessions';
+	}
+	
+	/*
+	$ADODB_SESS['driver'] = $ADODB_SESSION_DRIVER;
+	$ADODB_SESS['connect'] = $ADODB_SESSION_CONNECT;
+	$ADODB_SESS['user'] = $ADODB_SESSION_USER;
+	$ADODB_SESS['pwd'] = $ADODB_SESSION_PWD;
+	$ADODB_SESS['db'] = $ADODB_SESSION_DB;
+	$ADODB_SESS['life'] = $ADODB_SESS_LIFE;
+	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
+	
+	$ADODB_SESS['debug'] = $ADODB_SESS_DEBUG;
+	$ADODB_SESS['table'] = $ADODB_SESS_TBL;
+	*/
+	
+/****************************************************************************************\
+	Create the connection to the database. 
+	
+	If $ADODB_SESS_CONN already exists, reuse that connection
+\****************************************************************************************/
+function adodb_sess_open($save_path, $session_name,$persist=true) 
+{
+GLOBAL $ADODB_SESS_CONN;
+	if (isset($ADODB_SESS_CONN)) return true;
+	
+GLOBAL 	$ADODB_SESSION_CONNECT, 
+	$ADODB_SESSION_DRIVER,
+	$ADODB_SESSION_USER,
+	$ADODB_SESSION_PWD,
+	$ADODB_SESSION_DB,
+	$ADODB_SESS_DEBUG;
+	
+	// cannot use & below - do not know why...
+	$ADODB_SESS_CONN = ADONewConnection($ADODB_SESSION_DRIVER);
+	if (!empty($ADODB_SESS_DEBUG)) {
+		$ADODB_SESS_CONN->debug = true;
+		ADOConnection::outp( " conn=$ADODB_SESSION_CONNECT user=$ADODB_SESSION_USER pwd=$ADODB_SESSION_PWD db=$ADODB_SESSION_DB ");
+	}
+	if ($persist) $ok = $ADODB_SESS_CONN->PConnect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	else $ok = $ADODB_SESS_CONN->Connect($ADODB_SESSION_CONNECT,
+			$ADODB_SESSION_USER,$ADODB_SESSION_PWD,$ADODB_SESSION_DB);
+	
+	if (!$ok) ADOConnection::outp( "
+-- Session: connection failed
    ",false);
+}
+
+/****************************************************************************************\
+	Close the connection
+\****************************************************************************************/
+function adodb_sess_close() 
+{
+global $ADODB_SESS_CONN;
+
+	if ($ADODB_SESS_CONN) $ADODB_SESS_CONN->Close();
+	return true;
+}
+
+/****************************************************************************************\
+	Slurp in the session variables and return the serialized string
+\****************************************************************************************/
+function adodb_sess_read($key) 
+{
+global $ADODB_SESS_CONN,$ADODB_SESSION_TBL,$ADODB_SESSION_CRC;
+
+	$rs = $ADODB_SESS_CONN->Execute("SELECT data FROM $ADODB_SESSION_TBL WHERE sesskey = '$key' AND expiry >= " . time());
+	if ($rs) {
+		if ($rs->EOF) {
+			$v = '';
+		} else 
+			$v = rawurldecode(reset($rs->fields));
+			
+		$rs->Close();
+		
+		// new optimization adodb 2.1
+		$ADODB_SESSION_CRC = strlen($v).crc32($v);
+		
+		return $v;
+	}
+	
+	return ''; // thx to Jorma Tuomainen, webmaster#wizactive.com
+}
+
+/****************************************************************************************\
+	Write the serialized data to a database.
+	
+	If the data has not been modified since adodb_sess_read(), we do not write.
+\****************************************************************************************/
+function adodb_sess_write($key, $val) 
+{
+	global
+		$ADODB_SESS_CONN, 
+		$ADODB_SESS_LIFE, 
+		$ADODB_SESSION_TBL,
+		$ADODB_SESS_DEBUG, 
+		$ADODB_SESSION_CRC,
+		$ADODB_SESSION_EXPIRE_NOTIFY;
+
+	$expiry = time() + $ADODB_SESS_LIFE;
+	
+	// crc32 optimization since adodb 2.1
+	// now we only update expiry date, thx to sebastian thom in adodb 2.32
+	if ($ADODB_SESSION_CRC !== false && $ADODB_SESSION_CRC == strlen($val).crc32($val)) {
+		if ($ADODB_SESS_DEBUG) echo "
+-- Session: Only updating date - crc32 not changed
    ";
+		$qry = "UPDATE $ADODB_SESSION_TBL SET expiry=$expiry WHERE sesskey='$key' AND expiry >= " . time();
+		$rs = $ADODB_SESS_CONN->Execute($qry);	
+		return true;
+	}
+	$val = rawurlencode($val);
+	
+	$arr = array('sesskey' => $key, 'expiry' => $expiry, 'data' => $val);
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		$var = reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		global $$var;
+		$arr['expireref'] = $$var;
+	}
+	$rs = $ADODB_SESS_CONN->Replace($ADODB_SESSION_TBL,$arr,
+    	'sesskey',$autoQuote = true);
+	
+	if (!$rs) {
+		ADOConnection::outp( '
+-- Session Replace: '.$ADODB_SESS_CONN->ErrorMsg().'
    ',false);
+	}  else {
+		// bug in access driver (could be odbc?) means that info is not commited
+		// properly unless select statement executed in Win2000
+		if ($ADODB_SESS_CONN->databaseType == 'access') 
+			$rs = $ADODB_SESS_CONN->Execute("select sesskey from $ADODB_SESSION_TBL WHERE sesskey='$key'");
+	}
+	return !empty($rs);
+}
+
+function adodb_sess_destroy($key) 
+{
+	global $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+	
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$ADODB_SESS_CONN->CommitTrans();
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE sesskey = '$key'";
+		$rs = $ADODB_SESS_CONN->Execute($qry);
+	}
+	return $rs ? true : false;
+}
+
+function adodb_sess_gc($maxlifetime) 
+{
+	global $ADODB_SESS_DEBUG, $ADODB_SESS_CONN, $ADODB_SESSION_TBL,$ADODB_SESSION_EXPIRE_NOTIFY;
+	
+	if ($ADODB_SESSION_EXPIRE_NOTIFY) {
+		reset($ADODB_SESSION_EXPIRE_NOTIFY);
+		$fn = next($ADODB_SESSION_EXPIRE_NOTIFY);
+		$savem = $ADODB_SESS_CONN->SetFetchMode(ADODB_FETCH_NUM);
+		$t = time();
+		$rs = $ADODB_SESS_CONN->Execute("SELECT expireref,sesskey FROM $ADODB_SESSION_TBL WHERE expiry < $t");
+		$ADODB_SESS_CONN->SetFetchMode($savem);
+		if ($rs) {
+			$ADODB_SESS_CONN->BeginTrans();
+			while (!$rs->EOF) {
+				$ref = $rs->fields[0];
+				$key = $rs->fields[1];
+				$fn($ref,$key);
+				$del = $ADODB_SESS_CONN->Execute("DELETE FROM $ADODB_SESSION_TBL WHERE sesskey='$key'");
+				$rs->MoveNext();
+			}
+			$rs->Close();
+			
+			$ADODB_SESS_CONN->CommitTrans();
+			
+		}
+	} else {
+		$qry = "DELETE FROM $ADODB_SESSION_TBL WHERE expiry < " . time();
+		$ADODB_SESS_CONN->Execute($qry);
+	
+		if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- Garbage Collection: $qry
    ");
+	}
+	// suggested by Cameron, "GaM3R" 
+	if (defined('ADODB_SESSION_OPTIMIZE')) {
+	global $ADODB_SESSION_DRIVER;
+	
+		switch( $ADODB_SESSION_DRIVER ) {
+			case 'mysql':
+			case 'mysqlt':
+				$opt_qry = 'OPTIMIZE TABLE '.$ADODB_SESSION_TBL;
+				break;
+			case 'postgresql':
+			case 'postgresql7':
+				$opt_qry = 'VACUUM '.$ADODB_SESSION_TBL;	
+				break;
+		}
+		if (!empty($opt_qry)) {
+			$ADODB_SESS_CONN->Execute($opt_qry);
+		}
+	}
+	if ($ADODB_SESS_CONN->dataProvider === 'oci8') $sql = 'select  TO_CHAR('.($ADODB_SESS_CONN->sysTimeStamp).', \'RRRR-MM-DD HH24:MI:SS\') from '. $ADODB_SESSION_TBL;
+	else $sql = 'select '.$ADODB_SESS_CONN->sysTimeStamp.' from '. $ADODB_SESSION_TBL;
+	
+	$rs = $ADODB_SESS_CONN->SelectLimit($sql,1);
+	if ($rs && !$rs->EOF) {
+	
+		$dbts = reset($rs->fields);
+		$rs->Close();
+		$dbt = $ADODB_SESS_CONN->UnixTimeStamp($dbts);
+		$t = time();
+	
+		if (abs($dbt - $t) >= ADODB_SESSION_SYNCH_SECS) {
+		
+			$msg = 
+			__FILE__.": Server time for webserver {$_SERVER['HTTP_HOST']} not in synch with database: database=$dbt ($dbts), webserver=$t (diff=".(abs($dbt-$t)/3600)." hrs)";
+			error_log($msg);
+			if ($ADODB_SESS_DEBUG) ADOConnection::outp("
+-- $msg
    ");
+		}
+	}
+	
+	return true;
+}
+
+session_module_name('user'); 
+session_set_save_handler(
+	"adodb_sess_open",
+	"adodb_sess_close",
+	"adodb_sess_read",
+	"adodb_sess_write",
+	"adodb_sess_destroy",
+	"adodb_sess_gc");
+}
+
+/*  TEST SCRIPT -- UNCOMMENT */
+
+if (0) {
+
+	session_start();
+	session_register('AVAR');
+	$_SESSION['AVAR'] += 1;
+	ADOConnection::outp( "
+-- \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ",false);
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/session/old/crypt.inc.php b/adodb/session/old/crypt.inc.php
new file mode 100644
index 0000000..b99bbba
--- /dev/null
+++ b/adodb/session/old/crypt.inc.php
@@ -0,0 +1,64 @@
+
+class MD5Crypt{
+		function keyED($txt,$encrypt_key)
+		{
+				$encrypt_key = md5($encrypt_key);
+				$ctr=0;
+				$tmp = "";
+				for ($i=0;$ikeyED($tmp,$key));
+		}
+
+		function Decrypt($txt,$key)
+		{
+				$txt = $this->keyED(base64_decode($txt),$key);
+				$tmp = "";
+				for ($i=0;$i= 58 && $randnumber <= 64) || ($randnumber >= 91 && $randnumber <= 96))
+						{
+								$randnumber = rand(48,120);
+						}
+
+						$randomPassword .= chr($randnumber);
+				}
+				return $randomPassword;
+		}
+
+}
+?>
\ No newline at end of file
diff --git a/adodb/session/session_schema.xml b/adodb/session/session_schema.xml
new file mode 100644
index 0000000..3c61ff6
--- /dev/null
+++ b/adodb/session/session_schema.xml
@@ -0,0 +1,26 @@
+
+
+  
+    table for ADOdb session-management
+
+    
+      session key
+      
+      
+    
+ 
+    
+      
+      
+    
+
+    
+      
+    
+
+    
+      
+      
+    
+  
    
+    
diff --git a/adodb/session/session_schema2.xml b/adodb/session/session_schema2.xml
new file mode 100644
index 0000000..22f8daf
--- /dev/null
+++ b/adodb/session/session_schema2.xml
@@ -0,0 +1,38 @@
+
+
+  
+    table for ADOdb session-management
+
+    
+      session key
+      
+      
+    
+ 
+
+	
+    
+      
+      
+    
+	
+	 	
+	     
+      
+    
+	
+	 	
+	     
+      
+    
+
+    
+      
+    
+
+    
+      
+      
+    
+  
    
+    
diff --git a/adodb/tests/benchmark.php b/adodb/tests/benchmark.php
new file mode 100644
index 0000000..5400f7e
--- /dev/null
+++ b/adodb/tests/benchmark.php
@@ -0,0 +1,84 @@
+
+
+
+
+	ADODB Benchmarks
+ 
+
+
+ADODB Version: $ADODB_version Host: $db->host   Database: $db->database";
+	
+	// perform query once to cache results so we are only testing throughput 
+	$rs = $db->Execute($sql);
+	if (!$rs){
+		print "Error in recordset
    ";
+		return;
+	}	
+	$arr = $rs->GetArray();
+	//$db->debug = true;
+	global $ADODB_COUNTRECS;
+	$ADODB_COUNTRECS = false;
+	$start = microtime();
+	for ($i=0; $i < $max; $i++) {
+		$rs = $db->Execute($sql);	
+		$arr = $rs->GetArray();
+	   //		 print $arr[0][1];
+	}
+	$end =  microtime();
+	$start = explode(' ',$start);
+	$end = explode(' ',$end);
+	
+	//print_r($start);
+	//print_r($end);
+	
+	  //  print_r($arr);
+	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
+	printf ("
    seconds = %8.2f for %d iterations each with %d records
    ",$total,$max, sizeof($arr));
+	flush();
+
+
+		//$db->Close();
+}
+include("testdatabases.inc.php");
+
+?>
+
+
+
+
diff --git a/adodb/tests/client.php b/adodb/tests/client.php
new file mode 100644
index 0000000..7bf145e
--- /dev/null
+++ b/adodb/tests/client.php
@@ -0,0 +1,198 @@
+
+
+';
+ var_dump(parse_url('odbc_mssql://userserver/'));
+ die();
+ 
+include('../adodb.inc.php');
+include('../tohtml.inc.php');
+
+ function send2server($url,$sql)
+ {
+	$url .= '?sql='.urlencode($sql);
+	print "
    $url
    ";
+	$rs = csv2rs($url,$err);
+	if ($err) print $err;
+	return $rs;
+ }
+ 
+ function print_pre($s)
+ {
+ 	print "
    ";print_r($s);print "
    ";
+ }
+
+
+$serverURL = 'http://localhost/php/phplens/adodb/server.php';
+$testhttp = false;
+
+$sql1 = "insertz into products (productname) values ('testprod 1')";
+$sql2 = "insert into products (productname) values ('testprod 1')";
+$sql3 = "insert into products (productname) values ('testprod 2')";
+$sql4 = "delete from products where productid>80";
+$sql5 = 'select * from products';
+	
+if ($testhttp) {
+	print "Client Driver Tests
    ";
+	print "
    Test Error
    ";
+	$rs = send2server($serverURL,$sql1);
+	print_pre($rs);
+	print "
    ";
+	
+	print "
    Test Insert
    ";
+	
+	$rs = send2server($serverURL,$sql2);
+	print_pre($rs);
+	print "
    ";
+	
+	print "
    Test Insert2
    ";
+	
+	$rs = send2server($serverURL,$sql3);
+	print_pre($rs);
+	print "
    ";
+	
+	print "
    Test Delete
    ";
+	
+	$rs = send2server($serverURL,$sql4);
+	print_pre($rs);
+	print "
    ";
+	
+	
+	print "
    Test Select
    ";
+	$rs = send2server($serverURL,$sql5);
+	if ($rs) rs2html($rs);
+	
+	print "
    ";
+}
+
+
+print "
    CLIENT Driver Tests
    ";
+$conn = ADONewConnection('csv');
+$conn->Connect($serverURL);
+$conn->debug = true;
+
+print "
    Bad SQL
    ";
+
+$rs = $conn->Execute($sql1);
+
+print "
    Insert SQL 1
    ";
+$rs = $conn->Execute($sql2);
+
+print "
    Insert SQL 2
    ";
+$rs = $conn->Execute($sql3);
+
+print "
    Select SQL
    ";
+$rs = $conn->Execute($sql5);
+if ($rs) rs2html($rs);
+
+print "
    Delete SQL
    ";
+$rs = $conn->Execute($sql4);
+
+print "
    Select SQL
    ";
+$rs = $conn->Execute($sql5);
+if ($rs) rs2html($rs);
+
+
+/* EXPECTED RESULTS FOR HTTP TEST:
+
+Test Insert
+http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
+
+adorecordset Object
+(
+	[dataProvider] => native
+	[fields] => 
+	[blobSize] => 64
+	[canSeek] => 
+	[EOF] => 1
+	[emptyTimeStamp] =>  
+	[emptyDate] =>  
+	[debug] => 
+	[timeToLive] => 0
+	[bind] => 
+	[_numOfRows] => -1
+	[_numOfFields] => 0
+	[_queryID] => 1
+	[_currentRow] => -1
+	[_closed] => 
+	[_inited] => 
+	[sql] => insert into products (productname) values ('testprod')
+	[affectedrows] => 1
+	[insertid] => 81
+)
+
+
+--------------------------------------------------------------------------------
+
+Test Insert2
+http://localhost/php/adodb/server.php?sql=insert+into+products+%28productname%29+values+%28%27testprod%27%29
+
+adorecordset Object
+(
+	[dataProvider] => native
+	[fields] => 
+	[blobSize] => 64
+	[canSeek] => 
+	[EOF] => 1
+	[emptyTimeStamp] =>  
+	[emptyDate] =>  
+	[debug] => 
+	[timeToLive] => 0
+	[bind] => 
+	[_numOfRows] => -1
+	[_numOfFields] => 0
+	[_queryID] => 1
+	[_currentRow] => -1
+	[_closed] => 
+	[_inited] => 
+	[sql] => insert into products (productname) values ('testprod')
+	[affectedrows] => 1
+	[insertid] => 82
+)
+
+
+--------------------------------------------------------------------------------
+
+Test Delete
+http://localhost/php/adodb/server.php?sql=delete+from+products+where+productid%3E80
+
+adorecordset Object
+(
+	[dataProvider] => native
+	[fields] => 
+	[blobSize] => 64
+	[canSeek] => 
+	[EOF] => 1
+	[emptyTimeStamp] =>  
+	[emptyDate] =>  
+	[debug] => 
+	[timeToLive] => 0
+	[bind] => 
+	[_numOfRows] => -1
+	[_numOfFields] => 0
+	[_queryID] => 1
+	[_currentRow] => -1
+	[_closed] => 
+	[_inited] => 
+	[sql] => delete from products where productid>80
+	[affectedrows] => 2
+	[insertid] => 0
+)
+
+[more stuff deleted]
+ .
+ . 
+ .
+*/
+?>
diff --git a/adodb/tests/pdo.php b/adodb/tests/pdo.php
new file mode 100644
index 0000000..e4c1a46
--- /dev/null
+++ b/adodb/tests/pdo.php
@@ -0,0 +1,94 @@
+";
+try {
+	echo "New Connection\n";
+	
+	
+	$dsn = 'pdo_mysql://root:@localhost/northwind?persist';
+	
+	if (!empty($dsn)) {
+		$DB = NewADOConnection($dsn) || die("CONNECT FAILED");
+		$connstr = $dsn;
+	} else {
+	
+		$DB = NewADOConnection('pdo');
+		
+		echo "Connect\n";
+		
+		$u = ''; $p = '';
+		/*
+		$connstr = 'odbc:nwind';
+		
+		$connstr = 'oci:';
+		$u = 'scott';
+		$p = 'natsoft';
+		
+		
+		$connstr ="sqlite:d:\inetpub\adodb\sqlite.db";
+		*/
+		
+		$connstr = "mysql:dbname=northwind";
+		$u = 'root';
+		
+		$connstr = "pgsql:dbname=test";
+		$u = 'tester';
+		$p = 'test';
+		
+		$DB->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+	
+	}
+	
+	echo "connection string=$connstr\n Execute\n";
+	
+	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs = $DB->Execute("select * from ADOXYZ where id<3");
+	if  ($DB->ErrorNo()) echo "*** errno=".$DB->ErrorNo() . " ".($DB->ErrorMsg())."\n";
+	
+	
+	//print_r(get_class_methods($DB->_stmt));
+	
+	if (!$rs) die("NO RS");
+	
+	echo "Meta\n";
+	for ($i=0; $i < $rs->NumCols(); $i++) {
+		var_dump($rs->FetchField($i));
+		echo "
    ";
+	}
+	
+	echo "FETCH\n";
+	$cnt = 0;
+	while (!$rs->EOF) {
+		adodb_pr($rs->fields); 
+		$rs->MoveNext();
+		if ($cnt++ > 1000) break;
+	}
+	
+	echo "
    --------------------------------------------------------
    \n\n\n";
+	
+	$stmt = $DB->PrepareStmt("select * from ADOXYZ");
+	
+	$rs = $stmt->Execute();
+	$cols = $stmt->NumCols(); // execute required
+	
+	echo "COLS = $cols";
+	for($i=1;$i<=$cols;$i++) {
+		$v = $stmt->_stmt->getColumnMeta($i);
+		var_dump($v);
+	}
+	
+	echo "e=".$stmt->ErrorNo() . " ".($stmt->ErrorMsg())."\n";
+	while ($arr = $rs->FetchRow()) {
+		adodb_pr($arr);
+	}
+	die("DONE\n");
+
+} catch (exception $e) {
+	echo "
    ";
+	echo $e;
+	echo "
    ";
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/tests/test-active-record.php b/adodb/tests/test-active-record.php
new file mode 100644
index 0000000..85fb71c
--- /dev/null
+++ b/adodb/tests/test-active-record.php
@@ -0,0 +1,141 @@
+= 5) {
+			include('../adodb-exceptions.inc.php');
+			echo "
    Exceptions included
    ";
+		}
+	}
+
+	$db = NewADOConnection('mysql://root@localhost/northwind?persist');
+	$db->debug=1;
+	ADOdb_Active_Record::SetDatabaseAdapter($db);
+
+	
+	$db->Execute("CREATE TEMPORARY TABLE `persons` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_color` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+			   
+	$db->Execute("CREATE TEMPORARY TABLE `children` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+					`person_id` int(10) unsigned NOT NULL,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_pet` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+			   
+	class Person extends ADOdb_Active_Record{ function ret($v) {return $v;} }
+	$person = new Person();
+	ADOdb_Active_Record::$_quoteNames = '111';
+	
+	echo "
    Output of getAttributeNames: ";
+	var_dump($person->getAttributeNames());
+	
+	/**
+	 * Outputs the following:
+	 * array(4) {
+	 *    [0]=>
+	 *    string(2) "id"
+	 *    [1]=>
+	 *    string(9) "name_first"
+	 *    [2]=>
+	 *    string(8) "name_last"
+	 *    [3]=>
+	 *    string(13) "favorite_color"
+	 *  }
+	 */
+	
+	$person = new Person();
+	$person->name_first = 'Andi';
+	$person->name_last  = 'Gutmans';
+	$person->save(); // this save() will fail on INSERT as favorite_color is a must fill...
+	
+	
+	$person = new Person();
+	$person->name_first     = 'Andi';
+	$person->name_last      = 'Gutmans';
+	$person->favorite_color = 'blue';
+	$person->save(); // this save will perform an INSERT successfully
+	
+	echo "
    The Insert ID generated:"; print_r($person->id);
+	
+	$person->favorite_color = 'red';
+	$person->save(); // this save() will perform an UPDATE
+	
+	$person = new Person();
+	$person->name_first     = 'John';
+	$person->name_last      = 'Lim';
+	$person->favorite_color = 'lavender';
+	$person->save(); // this save will perform an INSERT successfully
+	
+	// load record where id=2 into a new ADOdb_Active_Record
+	$person2 = new Person();
+	$person2->Load('id=2');
+	
+	$activeArr = $db->GetActiveRecordsClass($class = "Person",$table = "Persons","id=".$db->Param(0),array(2));
+	$person2 = $activeArr[0];
+	echo "
    Name (should be John): ",$person->name_first, " 
     Class (should be Person): ",get_class($person2),"
    ";	
+	
+	$db->Execute("insert into children (person_id,name_first,name_last) values (2,'Jill','Lim')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (2,'Joan','Lim')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (2,'JAMIE','Lim')");
+	
+	$newperson2 = new Person();
+	$person2->HasMany('children','person_id');
+	$person2->Load('id=2');
+	$person2->name_last='green';
+	$c = $person2->children;
+	$person2->save();
+
+	if (is_array($c) && sizeof($c) == 3 && $c[0]->name_first=='Jill' && $c[1]->name_first=='Joan'
+		&& $c[2]->name_first == 'JAMIE') echo "OK Loaded HasMany
    ";
+	else {
+		var_dump($c);
+		echo "error loading hasMany should have 3 array elements Jill Joan Jamie
    ";
+	}
+	
+	class Child extends ADOdb_Active_Record{};
+	$ch = new Child('children',array('id'));
+	$ch->BelongsTo('person','person_id','id');
+	$ch->Load('id=1');
+	if ($ch->name_first !== 'Jill') echo "error in Loading Child
    ";
+	
+	$p = $ch->person;
+	if ($p->name_first != 'John') echo "Error loading belongsTo
    ";
+	else echo "OK loading BelongTo
    ";
+
+	$p->hasMany('children','person_id');
+	$p->LoadRelations('children', "	Name_first like 'J%' order by id",1,2);
+	if (sizeof($p->children) == 2 && $p->children[1]->name_first == 'JAMIE') echo "OK LoadRelations
    ";
+	else echo "error LoadRelations
    ";
+	
+		$db->Execute("CREATE TEMPORARY TABLE `persons2` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_color` varchar(100) default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+	
+	$p = new adodb_active_record('persons2');
+	$p->name_first = 'James';
+	
+	$p->name_last = 'James';
+	
+	$p->HasMany('children','person_id');
+	$p->children;
+	var_dump($p);
+	$p->Save();
+?>
\ No newline at end of file
diff --git a/adodb/tests/test-active-recs2.php b/adodb/tests/test-active-recs2.php
new file mode 100644
index 0000000..d35751e
--- /dev/null
+++ b/adodb/tests/test-active-recs2.php
@@ -0,0 +1,77 @@
+Connect("localhost","tester","test","test");
+} else
+	$db = NewADOConnection('oci8://scott:natsoft@/');
+
+
+$arr = $db->ServerInfo();
+echo "
    $db->dataProvider: {$arr['description']}
    ";
+
+$arr = $db->GetActiveRecords('products',' productid<10');
+adodb_pr($arr);
+
+ADOdb_Active_Record::SetDatabaseAdapter($db);
+if  (!$db)  die('failed');
+
+
+
+
+$rec = new ADODB_Active_Record('photos');
+
+$rec = new ADODB_Active_Record('products');
+
+
+adodb_pr($rec->getAttributeNames());
+
+echo "
    ";
+
+
+$rec->load('productid=2');
+adodb_pr($rec);
+
+$db->debug=1;
+
+
+$rec->productname = 'Changie Chan'.rand();
+
+$rec->insert();
+$rec->update();
+
+$rec->productname = 'Changie Chan 99';
+$rec->replace();
+
+
+$rec2 = new ADODB_Active_Record('products');
+$rec->load('productid=3');
+$rec->save();
+
+$rec = new ADODB_Active_record('products');
+$rec->productname = 'John ActiveRec';
+$rec->notes = 22;
+#$rec->productid=0;
+$rec->discontinued=1;
+$rec->Save();
+$rec->supplierid=33;
+$rec->Save();
+$rec->discontinued=0;
+$rec->Save();
+$rec->Delete();
+
+echo "
    Affected Rows after delete=".$db->Affected_Rows()."
    ";
+?>
\ No newline at end of file
diff --git a/adodb/tests/test-active-relations.php b/adodb/tests/test-active-relations.php
new file mode 100644
index 0000000..eb0f636
--- /dev/null
+++ b/adodb/tests/test-active-relations.php
@@ -0,0 +1,87 @@
+debug=1;
+	ADOdb_Active_Record::SetDatabaseAdapter($db);
+
+	$db->Execute("CREATE TEMPORARY TABLE `persons` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_color` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+			   
+	$db->Execute("CREATE TEMPORARY TABLE `children` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+					`person_id` int(10) unsigned NOT NULL,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_pet` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+			   
+	
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Jill','Lim')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
+	
+	ADODB_Active_Record::TableHasMany('persons', 'children','person_id');
+	class person extends ADOdb_Active_Record{}
+	
+	$person = new person();
+#	$person->HasMany('children','person_id');  ## this is affects all other instances of Person
+	
+	$person->name_first     = 'John';
+	$person->name_last      = 'Lim';
+	$person->favorite_color = 'lavender';
+	$person->save(); // this save will perform an INSERT successfully
+	
+	$person2 = new person();
+	$person2->Load('id=1');
+	
+	$c = $person2->children;
+	if (is_array($c) && sizeof($c) == 3 && $c[0]->name_first=='Jill' && $c[1]->name_first=='Joan'
+		&& $c[2]->name_first == 'JAMIE') echo "OK Loaded HasMany
    ";
+	else {
+		var_dump($c);
+		echo "error loading hasMany should have 3 array elements Jill Joan Jamie
    ";
+	}
+	
+	class child extends ADOdb_Active_Record{};
+	ADODB_Active_Record::TableBelongsTo('children','person','person_id','id');
+	$ch = new Child('children',array('id'));
+	
+	$ch->Load('id=1');
+	if ($ch->name_first !== 'Jill') echo "error in Loading Child
    ";
+	
+	$p = $ch->person;
+	if (!$p || $p->name_first != 'John') echo "Error loading belongsTo
    ";
+	else echo "OK loading BelongTo
    ";
+
+	if ($p) {
+		#$p->HasMany('children','person_id');  ## this is affects all other instances of Person
+		$p->LoadRelations('children', 'order by id',1,2);
+		if (sizeof($p->children) == 2 && $p->children[1]->name_first == 'JAMIE') echo "OK LoadRelations
    ";
+		else {
+		 	var_dump($p->children);
+			echo "error LoadRelations
    ";
+		}
+		
+		unset($p->children);
+		$p->LoadRelations('children', " name_first like 'J%' order by id",1,2);
+	}
+	if ($p)
+	foreach($p->children as $c) {
+		echo " Saving $c->name_first 
    ";
+		$c->name_first .= ' K.';
+		$c->Save();
+	}
+
+?>
\ No newline at end of file
diff --git a/adodb/tests/test-active-relationsx.php b/adodb/tests/test-active-relationsx.php
new file mode 100644
index 0000000..fbfddf6
--- /dev/null
+++ b/adodb/tests/test-active-relationsx.php
@@ -0,0 +1,419 @@
+\n", $txt);
+		echo $txt;
+	}
+
+	include_once('../adodb.inc.php');
+	include_once('../adodb-active-recordx.inc.php');
+	
+
+	$db = NewADOConnection('mysql://root@localhost/test');
+	$db->debug=0;
+	ADOdb_Active_Record::SetDatabaseAdapter($db);
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("Preparing database using SQL queries (creating 'people', 'children')\n");
+
+	$db->Execute("DROP TABLE `people`");
+	$db->Execute("DROP TABLE `children`");
+	$db->Execute("DROP TABLE `artists`");
+	$db->Execute("DROP TABLE `songs`");
+
+	$db->Execute("CREATE TABLE `people` (
+	                `id` int(10) unsigned NOT NULL auto_increment,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_color` varchar(100) NOT NULL default '',
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+	$db->Execute("CREATE TABLE `children` (
+					`person_id` int(10) unsigned NOT NULL,
+	                `name_first` varchar(100) NOT NULL default '',
+	                `name_last` varchar(100) NOT NULL default '',
+	                `favorite_pet` varchar(100) NOT NULL default '',
+	                `id` int(10) unsigned NOT NULL auto_increment,
+	                PRIMARY KEY  (`id`)
+	            ) ENGINE=MyISAM;
+	           ");
+	
+	$db->Execute("CREATE TABLE `artists` (
+	                `name` varchar(100) NOT NULL default '',
+	                `artistuniqueid` int(10) unsigned NOT NULL auto_increment,
+	                PRIMARY KEY  (`artistuniqueid`)
+	            ) ENGINE=MyISAM;
+	           ");
+
+	$db->Execute("CREATE TABLE `songs` (
+	                `name` varchar(100) NOT NULL default '',
+	                `artistid` int(10) NOT NULL,
+	                `recordid` int(10) unsigned NOT NULL auto_increment,
+	                PRIMARY KEY  (`recordid`)
+	            ) ENGINE=MyISAM;
+	           ");
+
+	$db->Execute("insert into children (person_id,name_first,name_last,favorite_pet) values (1,'Jill','Lim','tortoise')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'Joan','Lim')");
+	$db->Execute("insert into children (person_id,name_first,name_last) values (1,'JAMIE','Lim')");
+			   
+	$db->Execute("insert into artists (artistuniqueid, name) values(1,'Elvis Costello')");
+	$db->Execute("insert into songs (recordid, name, artistid) values(1,'No Hiding Place', 1)");
+	$db->Execute("insert into songs (recordid, name, artistid) values(2,'American Gangster Time', 1)");
+
+	// This class _implicitely_ relies on the 'people' table (pluralized form of 'person')
+	class Person extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct();
+			$this->hasMany('children');
+		}
+	}
+	// This class _implicitely_ relies on the 'children' table
+	class Child extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct();
+			$this->belongsTo('person');
+		}
+	}
+	// This class _explicitely_ relies on the 'children' table and shares its metadata with Child
+	class Kid extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct('children');
+			$this->belongsTo('person');
+		}
+	}
+	// This class _explicitely_ relies on the 'children' table but does not share its metadata
+	class Rugrat extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct('children', false, false, array('new' => true));
+		}
+	}
+	
+	class Artist extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct('artists', array('artistuniqueid'));
+			$this->hasMany('songs', 'artistid');
+		}
+	}
+	class Song extends ADOdb_Active_Record
+	{
+		function __construct()
+		{
+			parent::__construct('songs', array('recordid'));
+			$this->belongsTo('artist', 'artistid');
+		}
+	}
+
+	ar_echo("Inserting person in 'people' table ('John Lim, he likes lavender')\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$person = new Person();
+	$person->name_first     = 'John';
+	$person->name_last      = 'Lim';
+	$person->favorite_color = 'lavender';
+	$person->save(); // this save will perform an INSERT successfully
+
+	$person = new Person();
+	$person->name_first		= 'Lady';
+	$person->name_last		= 'Cat';
+	$person->favorite_color	= 'green';
+	$person->save();
+	
+	$child = new Child();
+	$child->name_first		= 'Fluffy';
+	$child->name_last		= 'Cat';
+	$child->favorite_pet	= 'Cat Lady';
+	$child->person_id		= $person->id;
+	$child->save();
+	
+	$child = new Child();
+	$child->name_first		= 'Sun';
+	$child->name_last		= 'Cat';
+	$child->favorite_pet	= 'Cat Lady';
+	$child->person_id		= $person->id;
+	$child->save();
+	
+	$err_count = 0;
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("person->Find('id=1') [Lazy Method]\n");
+	ar_echo("person is loaded but its children will be loaded on-demand later on\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$person = new Person();
+	$people = $person->Find('id=1');
+	ar_echo((ar_assert(found($people, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n");
+	ar_echo("\n-- Lazily Loading Children:\n\n");
+	foreach($people as $aperson)
+	{
+		foreach($aperson->children as $achild)
+		{
+			if($achild->name_first);
+		}
+	}
+	ar_echo((ar_assert(found($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'Joan'"))) ? "[OK] Found Joan\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'JAMIE'"))) ? "[OK] Found JAMIE\n" : "[!!] Find failed\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("person->Find('id=1' ... ADODB_WORK_AR) [Worker Method]\n");
+	ar_echo("person is loaded, and so are its children\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$person = new Person();
+	$people = $person->Find('id=1', false, false, array('loading' => ADODB_WORK_AR));
+	ar_echo((ar_assert(found($people, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'Joan'"))) ? "[OK] Found Joan\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'JAMIE'"))) ? "[OK] Found JAMIE\n" : "[!!] Find failed\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("person->Find('id=1' ... ADODB_JOIN_AR) [Join Method]\n");
+	ar_echo("person and its children are loaded using a single query\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$person = new Person();
+	// When I specifically ask for a join, I have to specify which table id I am looking up
+	// otherwise the SQL parser will wonder which table's id that would be.
+	$people = $person->Find('people.id=1', false, false, array('loading' => ADODB_JOIN_AR));
+	ar_echo((ar_assert(found($people, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'Joan'"))) ? "[OK] Found Joan\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'JAMIE'"))) ? "[OK] Found JAMIE\n" : "[!!] Find failed\n");
+		
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("person->Load('people.id=1') [Join Method]\n");
+	ar_echo("Load() always uses the join method since it returns only one row\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$person = new Person();
+	// Under the hood, Load(), since it returns only one row, always perform a join
+	// Therefore we need to clarify which id we are talking about.
+	$person->Load('people.id=1');
+	ar_echo((ar_assert(found($person, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($person, "'favorite_pet' => 'tortoise'"))) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n");
+	ar_echo((ar_assert(found($person, "'name_first' => 'Joan'"))) ? "[OK] Found Joan\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($person, "'name_first' => 'JAMIE'"))) ? "[OK] Found JAMIE\n" : "[!!] Find failed\n");
+	
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("child->Load('children.id=1') [Join Method]\n");
+	ar_echo("We are now loading from the 'children' table, not from 'people'\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$child = new Child();
+	$child->Load('children.id=1');
+	ar_echo((ar_assert(found($child, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($child, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("child->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$child = new Child();
+	$children = $child->Find('id=1', false, false, array('loading' => ADODB_WORK_AR));
+	ar_echo((ar_assert(found($children, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($children, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n");
+	ar_echo((ar_assert(notfound($children, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($children, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Find failed\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("kid->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n");
+	ar_echo("Where we see that kid shares relationships with child because they are stored\n");
+	ar_echo("in the common table's metadata structure.\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$kid = new Kid('children');
+	$kids = $kid->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
+	ar_echo((ar_assert(found($kids, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($kids, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n");
+	ar_echo((ar_assert(notfound($kids, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($kids, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Find failed\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("kid->Find('children.id=1' ... ADODB_LAZY_AR) [Lazy Method]\n");
+	ar_echo("Of course, lazy loading also retrieve medata information...\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$kid = new Kid('children');
+	$kids = $kid->Find('children.id=1', false, false, array('loading' => ADODB_LAZY_AR));
+	ar_echo((ar_assert(found($kids, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($kids, "'favorite_color' => 'lavender'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n");
+	ar_echo("\n-- Lazily Loading People:\n\n");
+	foreach($kids as $akid)
+	{
+		if($akid->person);
+	}
+	ar_echo((ar_assert(found($kids, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n");
+	ar_echo((ar_assert(notfound($kids, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n");
+	ar_echo((ar_assert(notfound($kids, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Found relation when I shouldn't\n");
+	
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n");
+	ar_echo("In rugrat's constructor it is specified that\nit must forget any existing relation\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$rugrat = new Rugrat('children');
+	$rugrats = $rugrat->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
+	ar_echo((ar_assert(found($rugrats, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($rugrats, "'favorite_color' => 'lavender'"))) ? "[OK] No relation found\n" : "[!!] Found relation when I shouldn't\n");
+	ar_echo((ar_assert(notfound($rugrats, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n");
+	ar_echo((ar_assert(notfound($rugrats, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Found relation when I shouldn't\n");
+	
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("kid->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n");
+	ar_echo("Note how only rugrat forgot its relations - kid is fine.\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$kid = new Kid('children');
+	$kids = $kid->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
+	ar_echo((ar_assert(found($kids, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($kids, "'favorite_color' => 'lavender'"))) ? "[OK] I did not forget relation: person\n" : "[!!] I should not have forgotten relation: person\n");
+	ar_echo((ar_assert(notfound($kids, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n");
+	ar_echo((ar_assert(notfound($kids, "'name_first' => 'JAMIE'"))) ? "[OK] No JAMIE relation\n" : "[!!] Found relation when I shouldn't\n");
+	
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("rugrat->Find('children.id=1' ... ADODB_WORK_AR) [Worker Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$rugrat = new Rugrat('children');
+	$rugrats = $rugrat->Find('children.id=1', false, false, array('loading' => ADODB_WORK_AR));
+	$arugrat = $rugrats[0];
+	ar_echo((ar_assert(found($arugrat, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($arugrat, "'favorite_color' => 'lavender'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n");
+	
+	ar_echo("\n-- Loading relations:\n\n");
+	$arugrat->belongsTo('person');
+	$arugrat->LoadRelations('person', 'order by id', 0, 2);
+	ar_echo((ar_assert(found($arugrat, "'favorite_color' => 'lavender'"))) ? "[OK] Found relation: person\n" : "[!!] Missing relation: person\n");
+	ar_echo((ar_assert(found($arugrat, "'name_first' => 'Jill'"))) ? "[OK] Found Jill\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($arugrat, "'name_first' => 'Joan'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n");
+	ar_echo((ar_assert(notfound($arugrat, "'name_first' => 'JAMIE'"))) ? "[OK] No Joan relation\n" : "[!!] Found relation when I shouldn't\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("person->Find('1=1') [Lazy Method]\n");
+	ar_echo("And now for our finale...\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$person = new Person();
+	$people = $person->Find('1=1', false, false, array('loading' => ADODB_LAZY_AR));
+	ar_echo((ar_assert(found($people, "'name_first' => 'John'"))) ? "[OK] Found John\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n");
+	ar_echo((ar_assert(notfound($people, "'name_first' => 'Fluffy'"))) ? "[OK] No Fluffy yet\n" : "[!!] Found Fluffy relation when I shouldn't\n");
+	ar_echo("\n-- Lazily Loading Everybody:\n\n");
+	foreach($people as $aperson)
+	{
+		foreach($aperson->children as $achild)
+		{
+			if($achild->name_first);
+		}
+	}
+	ar_echo((ar_assert(found($people, "'favorite_pet' => 'tortoise'"))) ? "[OK] Found relation: child\n" : "[!!] Missing relation: child\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'Joan'"))) ? "[OK] Found Joan\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'JAMIE'"))) ? "[OK] Found JAMIE\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'Lady'"))) ? "[OK] Found Cat Lady\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'Fluffy'"))) ? "[OK] Found Fluffy\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($people, "'name_first' => 'Sun'"))) ? "[OK] Found Sun\n" : "[!!] Find failed\n");
+	
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("artist->Load('artistuniqueid=1') [Join Method]\n");
+	ar_echo("Yes, we are dabbling in the musical field now..\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$artist = new Artist();
+	$artist->Load('artistuniqueid=1');
+	ar_echo((ar_assert(found($artist, "'name' => 'Elvis Costello'"))) ? "[OK] Found Elvis Costello\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($artist, "'name' => 'No Hiding Place'"))) ? "[OK] Found relation: song\n" : "[!!] Missing relation: song\n");
+
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("song->Load('recordid=1') [Join Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$song = new Song();
+	$song->Load('recordid=1');
+	ar_echo((ar_assert(found($song, "'name' => 'No Hiding Place'"))) ? "[OK] Found song\n" : "[!!] Find failed\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("artist->Find('artistuniqueid=1' ... ADODB_JOIN_AR) [Join Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$artist = new Artist();
+	$artists = $artist->Find('artistuniqueid=1', false, false, array('loading' => ADODB_JOIN_AR));
+	ar_echo((ar_assert(found($artists, "'name' => 'Elvis Costello'"))) ? "[OK] Found Elvis Costello\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($artists, "'name' => 'No Hiding Place'"))) ? "[OK] Found relation: song\n" : "[!!] Missing relation: song\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("song->Find('recordid=1' ... ADODB_JOIN_AR) [Join Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$song = new Song();
+	$songs = $song->Find('recordid=1', false, false, array('loading' => ADODB_JOIN_AR));
+	ar_echo((ar_assert(found($songs, "'name' => 'No Hiding Place'"))) ? "[OK] Found song\n" : "[!!] Find failed\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("artist->Find('artistuniqueid=1' ... ADODB_WORK_AR) [Work Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$artist = new Artist();
+	$artists = $artist->Find('artistuniqueid=1', false, false, array('loading' => ADODB_WORK_AR));
+	ar_echo((ar_assert(found($artists, "'name' => 'Elvis Costello'"))) ? "[OK] Found Elvis Costello\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(found($artists, "'name' => 'No Hiding Place'"))) ? "[OK] Found relation: song\n" : "[!!] Missing relation: song\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("song->Find('recordid=1' ... ADODB_JOIN_AR) [Join Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$song = new Song();
+	$songs = $song->Find('recordid=1', false, false, array('loading' => ADODB_WORK_AR));
+	ar_echo((ar_assert(found($songs, "'name' => 'No Hiding Place'"))) ? "[OK] Found song\n" : "[!!] Find failed\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("artist->Find('artistuniqueid=1' ... ADODB_LAZY_AR) [Lazy Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$artist = new Artist();
+	$artists = $artist->Find('artistuniqueid=1', false, false, array('loading' => ADODB_LAZY_AR));
+	ar_echo((ar_assert(found($artists, "'name' => 'Elvis Costello'"))) ? "[OK] Found Elvis Costello\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($artists, "'name' => 'No Hiding Place'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n");
+	foreach($artists as $anartist)
+	{
+		foreach($anartist->songs as $asong)
+		{
+			if($asong->name);
+		}
+	}
+	ar_echo((ar_assert(found($artists, "'name' => 'No Hiding Place'"))) ? "[OK] Found relation: song\n" : "[!!] Missing relation: song\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("song->Find('recordid=1' ... ADODB_LAZY_AR) [Lazy Method]\n");
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+	$song = new Song();
+	$songs = $song->Find('recordid=1', false, false, array('loading' => ADODB_LAZY_AR));
+	ar_echo((ar_assert(found($songs, "'name' => 'No Hiding Place'"))) ? "[OK] Found song\n" : "[!!] Find failed\n");
+	ar_echo((ar_assert(notfound($songs, "'name' => 'Elvis Costello'"))) ? "[OK] No relation yet\n" : "[!!] Found relation when I shouldn't\n");
+	foreach($songs as $asong)
+	{
+		if($asong->artist);
+	}
+	ar_echo((ar_assert(found($songs, "'name' => 'Elvis Costello'"))) ? "[OK] Found relation: artist\n" : "[!!] Missing relation: artist\n");
+
+	ar_echo("\n\n-------------------------------------------------------------------------------------------------------------------\n");
+	ar_echo("Test suite complete. " . (($err_count > 0) ? "$err_count errors found.\n" : "Success.\n"));
+	ar_echo("-------------------------------------------------------------------------------------------------------------------\n");
+?>
diff --git a/adodb/tests/test-datadict.php b/adodb/tests/test-datadict.php
new file mode 100644
index 0000000..2dbe817
--- /dev/null
+++ b/adodb/tests/test-datadict.php
@@ -0,0 +1,250 @@
+$dbType
    ";
+	$db = NewADOConnection($dbType);
+	$dict = NewDataDictionary($db);
+
+	if (!$dict) continue;
+	$dict->debug = 1;
+	
+	$opts = array('REPLACE','mysql' => 'ENGINE=INNODB', 'oci8' => 'TABLESPACE USERS');
+	
+/*	$flds = array(
+		array('id',	'I',								
+							'AUTO','KEY'),
+							
+		array('name' => 'firstname', 'type' => 'varchar','size' => 30,
+							'DEFAULT'=>'Joan'),
+							
+		array('lastname','varchar',28,
+							'DEFAULT'=>'Chen','key'),
+							
+		array('averylonglongfieldname','X',1024,
+							'NOTNULL','default' => 'test'),
+							
+		array('price','N','7.2',
+							'NOTNULL','default' => '0.00'),
+							
+		array('MYDATE', 'D', 
+							'DEFDATE'),
+		array('TS','T',
+							'DEFTIMESTAMP')
+	);*/
+	
+	$flds = "
+ID            I           AUTO KEY,
+FIRSTNAME     VARCHAR(30) DEFAULT 'Joan' INDEX idx_name,
+LASTNAME      VARCHAR(28) DEFAULT 'Chen' key INDEX idx_name INDEX idx_lastname,
+averylonglongfieldname X(1024) DEFAULT 'test',
+price         N(7.2)  DEFAULT '0.00',
+MYDATE        D      DEFDATE INDEX idx_date,
+BIGFELLOW     X      NOTNULL,
+TS_SECS            T      DEFTIMESTAMP,
+TS_SUBSEC   TS DEFTIMESTAMP
+";
+
+
+	$sqla = $dict->CreateDatabase('KUTU',array('postgres'=>"LOCATION='/u01/postdata'"));
+	$dict->SetSchema('KUTU');
+	
+	$sqli = ($dict->CreateTableSQL('testtable',$flds, $opts));
+	$sqla = array_merge($sqla,$sqli);
+	
+	$sqli = $dict->CreateIndexSQL('idx','testtable','price,firstname,lastname',array('BITMAP','FULLTEXT','CLUSTERED','HASH'));
+	$sqla = array_merge($sqla,$sqli);
+	$sqli = $dict->CreateIndexSQL('idx2','testtable','price,lastname');//,array('BITMAP','FULLTEXT','CLUSTERED'));
+	$sqla = array_merge($sqla,$sqli);
+	
+	$addflds = array(array('height', 'F'),array('weight','F'));
+	$sqli = $dict->AddColumnSQL('testtable',$addflds);
+	$sqla = array_merge($sqla,$sqli);
+	$addflds = array(array('height', 'F','NOTNULL'),array('weight','F','NOTNULL'));
+	$sqli = $dict->AlterColumnSQL('testtable',$addflds);
+	$sqla = array_merge($sqla,$sqli);
+	
+	
+	printsqla($dbType,$sqla);
+	
+	if (file_exists('d:\inetpub\wwwroot\php\phplens\adodb\adodb.inc.php'))
+	if ($dbType == 'mysqlt') {
+		$db->Connect('localhost', "root", "", "test");
+		$dict->SetSchema('');
+		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+		if ($sqla2) printsqla($dbType,$sqla2);
+	}
+	if ($dbType == 'postgres') {
+		if (@$db->Connect('localhost', "tester", "test", "test"));
+		$dict->SetSchema('');
+		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+		if ($sqla2) printsqla($dbType,$sqla2);
+	}
+	
+	if ($dbType == 'odbc_mssql') {
+		$dsn = $dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=localhost;Database=northwind;";
+		if (@$db->Connect($dsn, "sa", "natsoft", "test"));
+		$dict->SetSchema('');
+		$sqla2 = $dict->ChangeTableSQL('adoxyz',$flds);
+		if ($sqla2) printsqla($dbType,$sqla2);
+	}
+	
+	
+	
+	adodb_pr($dict->databaseType);
+	printsqla($dbType, $dict->DropColumnSQL('table',array('my col','`col2_with_Quotes`','A_col3','col3(10)')));
+	printsqla($dbType, $dict->ChangeTableSQL('adoxyz','LASTNAME varchar(32)'));
+	
+}
+
+function printsqla($dbType,$sqla)
+{
+	print "
    ";
+	//print_r($dict->MetaTables());
+	foreach($sqla as $s) {
+		$s = htmlspecialchars($s);
+		print "$s;\n";
+		if ($dbType == 'oci8') print "/\n";
+	}
+	print "
    ";
+}
+
+/***
+
+Generated SQL:
+
+mysql
+
+CREATE DATABASE KUTU;
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               INTEGER NOT NULL AUTO_INCREMENT,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) NOT NULL DEFAULT 'Chen',
+averylonglongfieldname LONGTEXT NOT NULL,
+price            NUMERIC(7,2) NOT NULL DEFAULT 0.00,
+MYDATE           DATE DEFAULT CURDATE(),
+                 PRIMARY KEY (id, lastname)
+)TYPE=ISAM;
+CREATE FULLTEXT INDEX idx ON KUTU.testtable (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD height           DOUBLE;
+ALTER TABLE KUTU.testtable  ADD weight           DOUBLE;
+ALTER TABLE KUTU.testtable  MODIFY COLUMN height           DOUBLE NOT NULL;
+ALTER TABLE KUTU.testtable  MODIFY COLUMN weight           DOUBLE NOT NULL;
+
+
+--------------------------------------------------------------------------------
+
+oci8
+
+CREATE USER KUTU IDENTIFIED BY tiger;
+/
+GRANT CREATE SESSION, CREATE TABLE,UNLIMITED TABLESPACE,CREATE SEQUENCE TO KUTU;
+/
+DROP TABLE KUTU.testtable CASCADE CONSTRAINTS;
+/
+CREATE TABLE KUTU.testtable (
+id               NUMBER(16) NOT NULL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname CLOB NOT NULL,
+price            NUMBER(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATE DEFAULT TRUNC(SYSDATE),
+                 PRIMARY KEY (id, lastname)
+)TABLESPACE USERS;
+/
+DROP SEQUENCE KUTU.SEQ_testtable;
+/
+CREATE SEQUENCE KUTU.SEQ_testtable;
+/
+CREATE OR REPLACE TRIGGER KUTU.TRIG_SEQ_testtable BEFORE insert ON KUTU.testtable 
+		FOR EACH ROW
+		BEGIN
+		  select KUTU.SEQ_testtable.nextval into :new.id from dual;
+		END;
+/
+CREATE BITMAP INDEX idx ON KUTU.testtable (firstname,lastname);
+/
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+/
+ALTER TABLE testtable ADD (
+ height           NUMBER,
+ weight           NUMBER);
+/
+ALTER TABLE testtable MODIFY(
+ height           NUMBER NOT NULL,
+ weight           NUMBER NOT NULL);
+/
+
+
+--------------------------------------------------------------------------------
+
+postgres
+AlterColumnSQL not supported for PostgreSQL
+
+
+CREATE DATABASE KUTU LOCATION='/u01/postdata';
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               SERIAL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname TEXT NOT NULL,
+price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATE DEFAULT CURRENT_DATE,
+                 PRIMARY KEY (id, lastname)
+);
+CREATE INDEX idx ON KUTU.testtable USING HASH (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD height           FLOAT8;
+ALTER TABLE KUTU.testtable  ADD weight           FLOAT8;
+
+
+--------------------------------------------------------------------------------
+
+odbc_mssql
+
+CREATE DATABASE KUTU;
+DROP TABLE KUTU.testtable;
+CREATE TABLE KUTU.testtable (
+id               INT IDENTITY(1,1) NOT NULL,
+firstname        VARCHAR(30) DEFAULT 'Joan',
+lastname         VARCHAR(28) DEFAULT 'Chen' NOT NULL,
+averylonglongfieldname TEXT NOT NULL,
+price            NUMERIC(7,2) DEFAULT 0.00 NOT NULL,
+MYDATE           DATETIME DEFAULT GetDate(),
+                 PRIMARY KEY (id, lastname)
+);
+CREATE CLUSTERED INDEX idx ON KUTU.testtable (firstname,lastname);
+CREATE INDEX idx2 ON KUTU.testtable (price,lastname);
+ALTER TABLE KUTU.testtable  ADD
+ height           REAL,
+ weight           REAL;
+ALTER TABLE KUTU.testtable  ALTER COLUMN height           REAL NOT NULL;
+ALTER TABLE KUTU.testtable  ALTER COLUMN weight           REAL NOT NULL;
+
+
+--------------------------------------------------------------------------------
+*/
+
+
+echo "
    Test XML Schema
    ";
+$ff = file('xmlschema.xml');
+echo "
    ";
+foreach($ff as $xml) echo htmlspecialchars($xml);
+echo "
    ";
+include_once('test-xmlschema.php');
+?>
\ No newline at end of file
diff --git a/adodb/tests/test-perf.php b/adodb/tests/test-perf.php
new file mode 100644
index 0000000..37406d2
--- /dev/null
+++ b/adodb/tests/test-perf.php
@@ -0,0 +1,50 @@
+ $v) {
+		if (strncmp($k,'test',4) == 0) $_SESSION['_db'] = $k;
+	}
+} 
+
+if (isset($_SESSION['_db'])) {
+	$_db = $_SESSION['_db'];
+	$_GET[$_db] = 1;
+	$$_db = 1;
+}
+
+echo "
    Performance Monitoring
    ";
+include_once('testdatabases.inc.php');
+
+
+function testdb($db) 
+{
+	if (!$db) return;
+	echo "";print_r($db->ServerInfo()); echo " user=".$db->user."";
+	
+	$perf = NewPerfMonitor($db); 
+	
+	# unit tests
+	if (0) {
+		//$DB->debug=1;
+		echo "Data Cache Size=".$perf->DBParameter('data cache size').'
    ';
+		echo $perf->HealthCheck();
+		echo($perf->SuspiciousSQL());
+		echo($perf->ExpensiveSQL());
+		echo($perf->InvalidSQL());
+		echo $perf->Tables();
+	
+		echo "
    ";
+		echo $perf->HealthCheckCLI();
+		$perf->Poll(3);
+		die();
+	}
+	
+	if ($perf) $perf->UI(3);
+}
+ 
+?>
diff --git a/adodb/tests/test-pgblob.php b/adodb/tests/test-pgblob.php
new file mode 100644
index 0000000..c190e5b
--- /dev/null
+++ b/adodb/tests/test-pgblob.php
@@ -0,0 +1,88 @@
+Param(false);
+		$x = (rand() % 10) + 1;
+		$db->debug= ($i==1);
+		$id = $db->GetOne($sql,
+			array('Z%','Z%',$x));
+		if($id != $offset+$x) {
+			print "
    Error at $x";
+			break;
+		}
+	}
+}
+
+include_once('../adodb.inc.php');
+$db = NewADOConnection('postgres7');
+$db->PConnect('localhost','tester','test','test') || die("failed connection");
+
+$enc = "GIF89a%01%00%01%00%80%FF%00%C0%C0%C0%00%00%00%21%F9%04%01%00%00%00%00%2C%00%00%00%00%01%00%01%00%00%01%012%00%3Bt_clear.gif%0D";
+$val = rawurldecode($enc);
+
+$MAX = 1000;
+
+adodb_pr($db->ServerInfo());
+
+echo "
    Testing PREPARE/EXECUTE PLAN
    ";
+
+
+$db->_bindInputArray = true; // requires postgresql 7.3+ and ability to modify database
+$t = getmicrotime();
+doloop();
+echo '
    ',$MAX,' times, with plan=',getmicrotime() - $t,'
    ';
+
+
+$db->_bindInputArray = false;
+$t = getmicrotime();
+doloop();
+echo '
    ',$MAX,' times, no plan=',getmicrotime() - $t,'
    ';
+
+
+
+echo "
    Testing UPDATEBLOB
    ";
+$db->debug=1;
+
+### TEST BEGINS
+
+$db->Execute("insert into photos (id,name) values(9999,'dot.gif')");
+$db->UpdateBlob('photos','photo',$val,'id=9999');
+$v = $db->GetOne('select photo from photos where id=9999');
+
+
+### CLEANUP
+
+$db->Execute("delete from photos where id=9999");
+
+### VALIDATION
+
+if ($v !== $val) echo "*** ERROR: Inserted value does not match downloaded val";
+else echo "*** OK: Passed";
+
+echo "
    ";
+echo "INSERTED: ", $enc;
+echo "
    ";
+echo"RETURNED: ", rawurlencode($v);
+echo "
    ";
+echo "INSERTED: ", $val;
+echo "
    ";
+echo "RETURNED: ", $v;
+
+?>
\ No newline at end of file
diff --git a/adodb/tests/test-php5.php b/adodb/tests/test-php5.php
new file mode 100644
index 0000000..b1173af
--- /dev/null
+++ b/adodb/tests/test-php5.php
@@ -0,0 +1,115 @@
+PHP ".PHP_VERSION."\n";
+try {
+
+$dbt = 'oci8po';
+
+try {
+switch($dbt) {
+case 'oci8po':
+	$db = NewADOConnection("oci8po");
+	
+	$db->Connect('localhost','scott','natsoft','sherkhan');
+	break;
+default:
+case 'mysql':
+	$db = NewADOConnection("mysql");
+	$db->Connect('localhost','root','','northwind');
+	break;
+	
+case 'mysqli':
+	$db = NewADOConnection("mysqli://root:@localhost/northwind");
+	//$db->Connect('localhost','root','','test');
+	break;
+}
+} catch (exception $e){
+	echo "Connect Failed";
+	adodb_pr($e);
+	die();
+}
+
+$db->debug=1;
+
+$cnt = $db->GetOne("select count(*) from adoxyz where ?Prepare("select * from adoxyz where ?ErrorMsg(),"\n";
+$rs = $db->Execute($stmt,array(10,20));
+
+echo  "
     Foreach Iterator Test (rand=".rand().")
    ";
+$i = 0;
+foreach($rs as $v) {
+	$i += 1;
+	echo "rec $i: "; $s1 = adodb_pr($v,true); $s2 = adodb_pr($rs->fields,true);
+	if ($s1 != $s2 && !empty($v)) {adodb_pr($s1); adodb_pr($s2);}
+	else echo "passed
    ";
+	flush();
+}
+
+$rs = new ADORecordSet_empty();
+foreach($rs as $v) {
+	echo "
    empty ";var_dump($v);
+}
+
+
+if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
+else echo "Count $i is correct
    ";
+
+$rs = $db->Execute("select bad from badder");
+
+} catch (exception $e) {
+	adodb_pr($e);
+	echo "
    adodb_backtrace:
    \n";
+	$e = adodb_backtrace($e->gettrace());
+}
+
+$rs = $db->Execute("select distinct id, firstname,lastname from adoxyz order by id");
+echo "Result=\n",$rs,"
    ";
+
+echo "
    Active Record
    ";
+
+	include_once("../adodb-active-record.inc.php");
+	ADOdb_Active_Record::SetDatabaseAdapter($db);
+	
+try {
+	class City extends ADOdb_Active_Record{};
+	$a = new City();
+
+} catch(exception $e){
+	echo $e->getMessage();
+}
+
+try {
+	
+	$a = new City();
+	
+	echo "
    Successfully created City()
    ";
+	#var_dump($a->GetPrimaryKeys());
+	$a->city = 'Kuala Lumpur';
+	$a->Save();
+	$a->Update();
+	#$a->SetPrimaryKeys(array('city'));	
+	$a->country = "M'sia";
+	$a->save();
+	$a->Delete();
+} catch(exception $e){
+	echo $e->getMessage();
+}
+
+//include_once("test-active-record.php");
+?>
\ No newline at end of file
diff --git a/adodb/tests/test-xmlschema.php b/adodb/tests/test-xmlschema.php
new file mode 100644
index 0000000..2d15c11
--- /dev/null
+++ b/adodb/tests/test-xmlschema.php
@@ -0,0 +1,54 @@
+Connect( 'localhost', 'root', '', 'test' ) || die('fail connect1');
+
+// To create a schema object and build the query array.
+$schema = new adoSchema( $db );
+
+// To upgrade an existing schema object, use the following 
+// To upgrade an existing database to the provided schema,
+// uncomment the following line:
+#$schema->upgradeSchema();
+
+print "SQL to build xmlschema.xml:\n
    ";
+// Build the SQL array
+$sql = $schema->ParseSchema( "xmlschema.xml" );
+
+var_dump( $sql );
+print "
    \n";
+
+// Execute the SQL on the database
+//$result = $schema->ExecuteSchema( $sql );
+
+// Finally, clean up after the XML parser
+// (PHP won't do this for you!)
+//$schema->Destroy();
+
+
+
+print "SQL to build xmlschema-mssql.xml:\n
    ";
+
+$db2 = ADONewConnection('mssql');
+$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
+
+$db2->Execute("drop table simple_table");
+
+$schema = new adoSchema( $db2 );
+$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
+
+print_r( $sql );
+print "
    \n";
+
+$db2->debug=1;
+
+foreach ($sql as $s)
+$db2->Execute($s);
+?>
\ No newline at end of file
diff --git a/adodb/tests/test.php b/adodb/tests/test.php
new file mode 100644
index 0000000..5334c44
--- /dev/null
+++ b/adodb/tests/test.php
@@ -0,0 +1,1748 @@
+$msg
    ";
+	flush();
+}
+
+function CheckWS($conn)
+{
+global $ADODB_EXTENSION;
+
+	include_once('../session/adodb-session.php');
+	if (defined('CHECKWSFAIL')){ echo " TESTING $conn ";flush();}
+	$saved = $ADODB_EXTENSION;
+	$db = ADONewConnection($conn);
+	$ADODB_EXTENSION = $saved;
+	if (headers_sent()) {
+		print "
    White space detected in adodb-$conn.inc.php or include file...
    ";
+		//die();
+	}
+}
+
+function do_strtolower(&$arr)
+{
+	foreach($arr as $k => $v) {
+		if (is_object($v)) $arr[$k] = adodb_pr($v,true);
+		else $arr[$k] = strtolower($v);
+	}
+}
+
+
+function CountExecs($db, $sql, $inputarray)
+{
+global $EXECS;  $EXECS++;
+}
+
+function CountCachedExecs($db, $secs2cache, $sql, $inputarray)
+{
+global $CACHED; $CACHED++;
+}
+
+// the table creation code is specific to the database, so we allow the user 
+// to define their own table creation stuff
+
+function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
+{
+GLOBAL $ADODB_vers,$ADODB_CACHE_DIR,$ADODB_FETCH_MODE,$ADODB_COUNTRECS;
+
+	//adodb_pr($db);
+	
+?>	
    
+	
    
+	
     
    
+	
    
+Execute('select lastname,firstname,lastname,id from ADOXYZ');
+	$arr = $rs->GetAssoc();
+	echo "
    ";print_r($arr);
+	die();*/
+	
+	if (!$db) die("testdb: database not inited");
+	GLOBAL $EXECS, $CACHED;
+	
+	$EXECS = 0;
+	$CACHED = 0;
+	//$db->Execute("drop table adodb_logsql");
+	if ((rand()%3) == 0) @$db->Execute("delete from adodb_logsql");
+	$db->debug=1;
+	
+	$db->fnExecute = 'CountExecs';
+	$db->fnCacheExecute = 'CountCachedExecs';
+	
+	if (empty($_GET['nolog'])) {
+		echo "
    SQL Logging enabled
    ";
+		$db->LogSQL();/*
+		$sql =
+"SELECT t1.sid, t1.sid, t1.title, t1.hometext, t1.notes, t1.aid, t1.informant, 
+t2.url, t2.email, t1.catid, t3.title, t1.topic, t4.topicname, t4.topicimage, 
+t4.topictext, t1.score, t1.ratings, t1.counter, t1.comments, t1.acomm 
+FROM `nuke_stories` `t1`, `nuke_authors` `t2`, `nuke_stories_cat` `t3`, `nuke_topics` `t4` 
+	WHERE ((t2.aid=t1.aid) AND (t3.catid=t1.catid) AND (t4.topicid=t1.topic) 
+	AND ((t1.alanguage='german') OR (t1.alanguage='')) AND (t1.ihome='0')) 
+	ORDER BY t1.time DESC";
+		$db->SelectLimit($sql);
+		echo $db->ErrorMsg();*/
+	}
+	$ADODB_CACHE_DIR = dirname(TempNam('/tmp','testadodb'));
+	$db->debug = false;
+	//print $db->UnixTimeStamp('2003-7-22 23:00:00');
+	
+	$phpv = phpversion();
+	if (defined('ADODB_EXTENSION')) $ext = '   Extension '.ADODB_EXTENSION.' installed';
+	else $ext = '';
+	print "
    ADODB Version: $ADODB_vers Host: $db->host   Database: $db->database   PHP: $phpv $ext
    ";
+	
+	flush();
+
+	if (function_exists('date_default_timezone_set')) date_default_timezone_set('Asia/Kuala_Lumpur');
+	
+	$arr = $db->ServerInfo();
+	print_r($arr);
+	echo E_ALL,' ',E_STRICT, "
    ";
+	$e = error_reporting(E_ALL | E_STRICT);
+	echo error_reporting(),'
    ';
+	flush();
+	#$db->debug=1;
+	$tt  = $db->Time(); 
+	if ($tt == 0) echo '
    $db->Time failed';
+	else echo "
    db->Time: ".date('d-m-Y H:i:s',$tt);
+	echo '
    ';
+	
+	echo "Date=",$db->UserDate('2002-04-07'),'
    ';
+	print "date1 (1969-02-20) = ".$db->DBDate('1969-2-20');
+	print "
    date1 (1999-02-20) = ".$db->DBDate('1999-2-20');
+	print "
    date1.1 1999 = ".$db->DBDate("'1999'");
+	print "
    date2 (1970-1-2) = ".$db->DBDate(24*3600)."
    ";
+	print "ts1 (1999-02-20 13:40:50) = ".$db->DBTimeStamp('1999-2-20 1:40:50 pm');
+	print "
    ts1.1 (1999-02-20 13:40:00) = ".$db->DBTimeStamp('1999-2-20 13:40');
+	print "
    ts2 (1999-02-20) = ".$db->DBTimeStamp('1999-2-20');
+	print "
    ts3 (1970-1-2 +/- timezone) = ".$db->DBTimeStamp(24*3600);
+	print "
     Fractional TS (1999-2-20 13:40:50.91): ".$db->DBTimeStamp($db->UnixTimeStamp('1999-2-20 13:40:50.91+1'));
+	 $dd = $db->UnixDate('1999-02-20');
+	print "
    unixdate 1999-02-20 = ".date('Y-m-d',$dd)."
    ";
+	print "
    ts4 =".($db->UnixTimeStamp("19700101000101")+8*3600);
+	print "
    ts5 =".$db->DBTimeStamp($db->UnixTimeStamp("20040110092123"));
+	print "
    ts6 =".$db->UserTimeStamp("20040110092123");
+	print "
    ts7 =".$db->DBTimeStamp("20040110092123");
+	flush();
+	// mssql too slow in failing bad connection
+	if (false && $db->databaseType != 'mssql') {
+		print "
    Testing bad connection. Ignore following error msgs:
    ";
+		$db2 = ADONewConnection();
+		$rez = $db2->Connect("bad connection");
+		$err = $db2->ErrorMsg();
+		print "Error='$err'
    ";
+		if ($rez) print "Cannot check if connection failed. The Connect() function returned true.
    ";
+	}
+	#error_reporting($e);
+	flush();
+
+	//$ADODB_COUNTRECS=false;
+	$rs=$db->Execute('select * from ADOXYZ order by id');
+	if($rs === false) $create = true;
+	else $rs->Close();
+	
+	//if ($db->databaseType !='vfp') $db->Execute("drop table ADOXYZ");
+	
+	if ($create) {
+		if (false && $db->databaseType == 'ibase') {
+			print "Please create the following table for testing:
    $createtab
    ";
+			return;
+		} else {
+			$db->debug = 99;
+		#	$e = error_reporting(E_ALL-E_WARNING);
+			$db->Execute($createtab);
+		#	error_reporting($e);
+		}
+	}
+	#error_reporting(E_ALL);
+	echo "
    Testing Metatypes
    ";
+	$t = $db->MetaType('varchar');
+	if ($t != 'C') Err("Bad Metatype for varchar");
+	
+	$rs = $db->Execute("delete from ADOXYZ"); // some ODBC drivers will fail the drop so we delete
+	if ($rs) {
+		if(! $rs->EOF) print "Error: RecordSet returned by Execute('delete...') should show EOF
    ";
+		$rs->Close();
+	} else print "err=".$db->ErrorMsg();
+
+	print "
    Test select on empty table, FetchField when EOF, and GetInsertSQL
    ";
+	$rs = $db->Execute("select id,firstname from ADOXYZ where id=9999");
+	if ($rs && !$rs->EOF) print "Error: RecordSet returned by Execute(select...') on empty table should show EOF
    ";
+	if ($rs->EOF && (($ox = $rs->FetchField(0)) && !empty($ox->name))) {
+		$record['id'] = 99;
+		$record['firstname'] = 'John';
+		$sql =  $db->GetInsertSQL($rs, $record);
+		if (strtoupper($sql) != strtoupper("INSERT INTO ADOXYZ ( id, firstname ) VALUES ( 99, 'John' )")) Err("GetInsertSQL does not work on empty table: $sql");
+	} else {
+		Err("FetchField does not work on empty recordset, meaning GetInsertSQL will fail...");
+	}
+	if ($rs) $rs->Close();
+	flush();
+	//$db->debug=true;	
+	print "
    Testing Commit: ";
+	$time = $db->DBDate(time());
+	if (!$db->BeginTrans()) {
+		print 'Transactions not supported
    ';
+		if ($db->hasTransactions) Err("hasTransactions should be false");
+	} else { /* COMMIT */
+		if (!$db->hasTransactions) Err("hasTransactions should be true");
+		if ($db->transCnt != 1) Err("Invalid transCnt = $db->transCnt (should be 1)");
+		$rs = $db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (99,'Should Not','Exist (Commit)',$time)");
+		if ($rs && $db->CommitTrans()) {
+			$rs->Close();
+			$rs = $db->Execute("select * from ADOXYZ where id=99");
+			if ($rs === false || $rs->EOF) {
+				print 'Data not saved
    ';
+				$rs = $db->Execute("select * from ADOXYZ where id=99");
+				print_r($rs);
+				die();
+			} else print 'OK
    ';
+			if ($rs) $rs->Close();
+		} else {
+			if (!$rs) {
+				print "Insert failed
    ";
+				$db->RollbackTrans();
+			} else print "Commit failed
    ";
+		}
+		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
+		
+		/* ROLLBACK */	
+		if (!$db->BeginTrans()) print "
    Error in BeginTrans()
    ";
+		print "
    Testing Rollback: ";
+		$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values (100,'Should Not','Exist (Rollback)',$time)");
+		if ($db->RollbackTrans()) {
+			$rs = $db->Execute("select * from ADOXYZ where id=100");
+			if ($rs && !$rs->EOF) print 'Fail: Data should rollback
    ';
+			else print 'OK
    ';
+			if ($rs) $rs->Close();
+		} else
+			print "Commit failed
    ";
+			
+		$rs = $db->Execute('delete from ADOXYZ where id>50');
+		if ($rs) $rs->Close();
+		
+		if ($db->transCnt != 0) Err("Invalid transCnt = $db->transCnt (should be 0)");
+	}
+	
+	if (1) {
+		print "
    Testing MetaDatabases()
    ";
+		print_r( $db->MetaDatabases());
+
+		print "
    Testing MetaTables() and MetaColumns()
    ";
+		$a = $db->MetaTables();
+		if ($a===false) print "MetaTables not supported
    ";
+		else {
+			print "Array of tables and views: "; 
+			foreach($a as $v) print " ($v) ";
+			print '
    ';
+		}
+		
+		$a = $db->MetaTables('VIEW');
+		if ($a===false) print "MetaTables not supported (views)
    ";
+		else {
+			print "Array of views: "; 
+			foreach($a as $v) print " ($v) ";
+			print '
    ';
+		}
+		
+		$a = $db->MetaTables(false,false,'aDo%');
+		if ($a===false) print "MetaTables not supported (mask)
    ";
+		else {
+			print "Array of ado%: "; 
+			foreach($a as $v) print " ($v) ";
+			print '
    ';
+		}
+		
+		$a = $db->MetaTables('TABLE');
+		if ($a===false) print "MetaTables not supported
    ";
+		else {
+			print "Array of tables: "; 
+			foreach($a as $v) print " ($v) ";
+			print '
    ';
+		}
+		
+		$db->debug=0;
+		$rez = $db->MetaColumns("NOSUCHTABLEHERE");
+		if ($rez !== false) {
+			Err("MetaColumns error handling failed");
+			var_dump($rez);
+		}
+		$db->debug=1;
+		$a = $db->MetaColumns('ADOXYZ');
+		if ($a===false) print "MetaColumns not supported
    ";
+		else {
+			print "
    Columns of ADOXYZ: 
    ";
+			foreach($a as $v) {print_r($v); echo "
    ";}
+			echo "    ";
+		}
+		
+		print "
    Testing MetaIndexes
    ";
+		
+		$a = $db->MetaIndexes(('ADOXYZ'),true);
+		if ($a===false) print "MetaIndexes not supported
    ";
+		else {
+			print "
    Indexes of ADOXYZ: 
    ";
+			adodb_pr($a);
+			echo "    ";
+		}
+		print "
    Testing MetaPrimaryKeys
    ";
+		$a = $db->MetaPrimaryKeys('ADOXYZ');
+		var_dump($a);
+	}
+	$rs = $db->Execute('delete from ADOXYZ');
+	if ($rs) $rs->Close();
+	
+	$db->debug = false;
+	
+	
+	switch ($db->databaseType) {
+	case 'vfp':
+		
+		if (0) {
+			// memo test
+			$rs = $db->Execute("select data from memo");
+			rs2html($rs);
+		}
+		break;
+
+	case 'postgres7':
+	case 'postgres64':
+	case 'postgres':
+	case 'ibase':
+		print "
    Encode=".$db->BlobEncode("abc\0d\"'
+ef")."
    ";//'
+
+		print "
    Testing Foreign Keys
    ";
+		$arr = $db->MetaForeignKeys('ADOXYZ',false,true);
+		print_r($arr);
+		if (!$arr) Err("No MetaForeignKeys");
+		break;
+	
+	case 'odbc_mssql':
+	case 'mssqlpo':
+		print "
    Testing Foreign Keys
    ";
+		$arr = $db->MetaForeignKeys('Orders',false,true);
+		print_r($arr);
+		if (!$arr) Err("Bad MetaForeignKeys");
+		if ($db->databaseType == 'odbc_mssql') break;
+	
+	case 'mssql': 
+	
+		
+/*
+ASSUME Northwind available...
+
+CREATE PROCEDURE SalesByCategory
+	@CategoryName nvarchar(15), @OrdYear nvarchar(4) = '1998'
+AS
+IF @OrdYear != '1996' AND @OrdYear != '1997' AND @OrdYear != '1998' 
+BEGIN
+	SELECT @OrdYear = '1998'
+END
+
+SELECT ProductName,
+	TotalPurchase=ROUND(SUM(CONVERT(decimal(14,2), OD.Quantity * (1-OD.Discount) * OD.UnitPrice)), 0)
+FROM [Order Details] OD, Orders O, Products P, Categories C
+WHERE OD.OrderID = O.OrderID 
+	AND OD.ProductID = P.ProductID 
+	AND P.CategoryID = C.CategoryID
+	AND C.CategoryName = @CategoryName
+	AND SUBSTRING(CONVERT(nvarchar(22), O.OrderDate, 111), 1, 4) = @OrdYear
+GROUP BY ProductName
+ORDER BY ProductName
+GO
+
+
+CREATE PROCEDURE ADODBTestSP
+@a nvarchar(25)
+AS
+SELECT GETDATE() AS T, @a AS A
+GO
+*/
+		print "
    Testing Stored Procedures for mssql
    ";
+		$saved = $db->debug;
+		$db->debug=true;
+		$assoc = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		$cmd = $db->PrepareSP('ADODBTestSP');
+		$ss = "You should see me in the output.";
+		$db->InParameter($cmd,$ss,'a');
+		$rs = $db->Execute($cmd);
+		#var_dump($rs->fields);
+		echo $rs->fields['T']." --- ".$rs->fields['A']."---
    ";
+
+		$cat = 'Dairy Products';
+		$yr = '1998';
+		
+		$stmt = $db->PrepareSP('SalesByCategory');
+		$db->InParameter($stmt,$cat,'CategoryName');
+		$db->InParameter($stmt,$yr,'OrdYear');
+		$rs = $db->Execute($stmt);
+		rs2html($rs);
+		
+		$cat = 'Grains/Cereals';
+		$yr = 1998;
+		
+		$stmt = $db->PrepareSP('SalesByCategory');
+		$db->InParameter($stmt,$cat,'CategoryName');
+		$db->InParameter($stmt,$yr,'OrdYear');
+		$rs = $db->Execute($stmt);
+		rs2html($rs);
+		
+		$ADODB_FETCH_MODE = $assoc;
+		
+		/*
+		Test out params - works in PHP 4.2.3 and 4.3.3 and 4.3.8 but not 4.3.0:
+		
+			CREATE PROCEDURE at_date_interval 
+				@days INTEGER, 
+				@start VARCHAR(20) OUT, 
+				@end VARCHAR(20) OUT 	
+			AS 
+			BEGIN 
+				set @start = CONVERT(VARCHAR(20), getdate(), 101) 
+				set @end =CONVERT(VARCHAR(20), dateadd(day, @days, getdate()), 101 ) 
+			END
+			GO
+		*/
+		$db->debug=1;
+		$stmt = $db->PrepareSP('at_date_interval');
+		$days = 10;
+		$begin_date = '';
+		$end_date = '';
+		$db->InParameter($stmt,$days,'days', 4, SQLINT4); 
+		$db->OutParameter($stmt,$begin_date,'start', 20, SQLVARCHAR ); 
+		$db->OutParameter($stmt,$end_date,'end', 20, SQLVARCHAR ); 
+		$db->Execute($stmt);
+		if (empty($begin_date) or empty($end_date) or $begin_date == $end_date) {
+			Err("MSSQL SP Test for OUT Failed");
+			print "begin=$begin_date end=$end_date
    ";
+		} else print "(Today +10days) = (begin=$begin_date end=$end_date)
    ";
+	
+		$db->debug = $saved;
+		break;
+	case 'oci8': 
+	case 'oci8po':
+		
+		if (0) {
+		$t = getmicrotime();
+		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+		$arr = $db->GetArray('select * from abalone_tree');
+		$arr = $db->GetArray('select * from abalone_tree');
+		$arr = $db->GetArray('select * from abalone_tree');
+		echo "
    t = ",getmicrotime() - $t,"
    ";
+		die();
+		}
+		
+		# cleanup
+		$db->Execute("delete from photos where id=99 or id=1");
+		$db->Execute("insert into photos (id) values(1)");
+		$db->Execute("update photos set photo=null,descclob=null where id=1");
+		
+		$saved = $db->debug;
+		$db->debug=true;
+		
+		
+
+		/*
+		CREATE TABLE PHOTOS
+		(
+		  ID           NUMBER(16) primary key,
+		  PHOTO        BLOB,
+		  DESCRIPTION  VARCHAR2(4000 BYTE),
+		  DESCCLOB     CLOB
+		);
+		
+		INSERT INTO PHOTOS (ID) VALUES(1);
+		*/
+		$s = '';
+		for ($i = 0; $i <= 500; $i++) {
+			$s .= '1234567890';
+		}
+		
+		$sql = "INSERT INTO photos ( ID, photo) ".
+			"VALUES ( :id, empty_blob() )".
+			" RETURNING photo INTO :xx";
+
+		
+		$blob_data = $s;
+		$id = 99;
+		
+ 		$stmt = $db->PrepareSP($sql);
+		$db->InParameter($stmt, $id, 'id');
+		$blob = $db->InParameter($stmt, $s, 'xx',-1, OCI_B_BLOB);
+		$db->StartTrans();
+		$result = $db->Execute($stmt);
+		$db->CompleteTrans();
+		
+		$s2= $db->GetOne("select photo from photos where id=99");
+		echo "
    ---$s2";
+		if ($s !== $s2) Err("insert blob does not match");
+
+		print "
    Testing Blob: size=".strlen($s)."
    ";
+		$ok = $db->Updateblob('photos','photo',$s,'id=1');
+		if (!$ok) Err("Blob failed 1");
+		else {
+			$s2= $db->GetOne("select photo from photos where id=1");
+			if ($s !== $s2) Err("updateblob does not match");
+		}
+		
+		print "
    Testing Clob: size=".strlen($s)."
    ";
+		$ok = $db->UpdateClob('photos','descclob',$s,'id=1');
+		if (!$ok) Err("Clob failed 1");
+		else {
+			$s2= $db->GetOne("select descclob from photos where id=1");
+			if ($s !== $s2) Err("updateclob does not match");
+		}
+		
+		
+		$s = '';
+		$s2 = '';
+		print "
    Testing Foreign Keys
    ";
+		$arr = $db->MetaForeignKeys('emp','scott');
+		print_r($arr);
+		if (!$arr) Err("Bad MetaForeignKeys");
+/*
+-- TEST PACKAGE
+-- "Set scan off" turns off substitution variables. 
+Set scan off; 
+
+CREATE OR REPLACE PACKAGE Adodb AS
+TYPE TabType IS REF CURSOR RETURN TAB%ROWTYPE;
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR);
+PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) ;
+PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR);
+PROCEDURE data_in(input IN VARCHAR);
+PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER);
+END Adodb;
+/
+
+
+CREATE OR REPLACE PACKAGE BODY Adodb AS
+PROCEDURE open_tab (tabcursor IN OUT TabType,tablenames IN VARCHAR) IS
+	BEGIN
+		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
+	END open_tab;
+
+	PROCEDURE open_tab2 (tabcursor IN OUT TabType,tablenames IN OUT VARCHAR) IS
+	BEGIN
+		OPEN tabcursor FOR SELECT * FROM TAB WHERE tname LIKE tablenames;
+		tablenames := 'TEST';
+	END open_tab2;
+
+PROCEDURE data_out(input IN VARCHAR, output OUT VARCHAR) IS
+	BEGIN
+		output := 'Cinta Hati '||input;
+	END;
+	
+PROCEDURE data_in(input IN VARCHAR) IS
+	ignore varchar(1000);
+	BEGIN
+		ignore := input;
+	END;
+
+PROCEDURE myproc (p1 IN NUMBER, p2 OUT NUMBER) AS
+BEGIN
+p2 := p1;
+END;
+END Adodb;
+/
+
+*/
+
+		print "
    Testing Cursor Variables
    ";
+		$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:zz,'A%'); END;",'zz');
+	
+		if ($rs && !$rs->EOF) {
+			$v = $db->GetOne("SELECT count(*) FROM tab where tname like 'A%'");
+			if ($v == $rs->RecordCount()) print "Test 1 RowCount: OK
    ";
+			else Err("Test 1 RowCount ".$rs->RecordCount().", actual = $v");
+		} else {
+			print "Error in using Cursor Variables 1
    ";
+		}
+		if ($rs) $rs->Close();
+		
+		print "
    Testing Stored Procedures for oci8
    ";
+		
+		$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;");
+		$a1 = 'Malaysia';
+		//$a2 = ''; # a2 doesn't even need to be defined!
+		$db->InParameter($stmt,$a1,'a1');
+		$db->OutParameter($stmt,$a2,'a2');
+		$rs = $db->Execute($stmt);
+		if ($rs) {
+			if ($a2 !== 'Cinta Hati Malaysia') print "Stored Procedure Error: a2 = $a2
    ";
+			else echo  "OK: a2=$a2
    ";
+		} else {
+			print "Error in using Stored Procedure IN/Out Variables
    ";
+		}
+		
+		$tname = 'A%';
+		
+		$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
+		$db->Parameter($stmt,$tname,'tablename');
+		$rs = $db->Execute($stmt);
+		rs2html($rs);
+		
+		$stmt = $db->PrepareSP("begin adodb.data_in(:a1); end;");
+		$db->InParameter($stmt,$a1,'a1');
+		$db->Execute($stmt);
+		
+		$db->debug = $saved;
+		break;
+	
+	default:
+		break;
+	}
+	$arr = array(
+		array(1,'Caroline','Miranda'),
+		array(2,'John','Lim'),
+		array(3,'Wai Hun','See')
+	);
+	//$db->debug=1;
+	print "
    Testing Bulk Insert of 3 rows
    ";
+
+	$sql = "insert into ADOXYZ (id,firstname,lastname) values (".$db->Param('0').",".$db->Param('1').",".$db->Param('2').")";
+	$db->StartTrans();
+	$db->Execute($sql,$arr);
+	$db->CompleteTrans();
+	$rs = $db->Execute('select * from ADOXYZ order by id');
+	if (!$rs || $rs->RecordCount() != 3) Err("Bad bulk insert");
+	
+	rs2html($rs);
+	
+	$db->Execute('delete from ADOXYZ');
+		
+	print "
    Inserting 50 rows
    ";
+
+	for ($i = 0; $i < 5; $i++) {	
+
+	$time = $db->DBDate(time());
+	if (empty($_GET['hide'])) $db->debug = true;
+	switch($db->databaseType){
+	case 'mssqlpo':
+	case 'mssql':
+		$sqlt = "CREATE TABLE mytable (
+  row1 INT  IDENTITY(1,1) NOT NULL,
+  row2 varchar(16),
+  PRIMARY KEY  (row1))";
+  		//$db->debug=1;
+  		if (!$db->Execute("delete from mytable")) 
+			$db->Execute($sqlt);
+			
+		$ok = $db->Execute("insert into mytable (row2) values ('test')");
+		$ins_id=$db->Insert_ID();
+		echo "Insert ID=";var_dump($ins_id);
+		if ($ins_id == 0) Err("Bad Insert_ID()");
+		$ins_id2 = $db->GetOne("select row1 from mytable");
+		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
+		
+		$arr = array(0=>'Caroline',1=>'Miranda');
+		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
+		break;
+	case 'mysqli':
+	case 'mysqlt':
+	case 'mysql':
+		$sqlt = "CREATE TABLE `mytable` (
+  `row1` int(11) NOT NULL auto_increment,
+  `row2` varchar(16) NOT NULL default '',
+  PRIMARY KEY  (`row1`),
+  KEY `myindex` (`row1`,`row2`)
+) ";
+		if (!$db->Execute("delete from mytable")) 
+			$db->Execute($sqlt);
+			
+		$ok = $db->Execute("insert into mytable (row2) values ('test')");
+		$ins_id=$db->Insert_ID();
+		echo "Insert ID=";var_dump($ins_id);
+		if ($ins_id == 0) Err("Bad Insert_ID()");
+		$ins_id2 = $db->GetOne("select row1 from mytable");
+		if ($ins_id != $ins_id2) Err("Bad Insert_ID() 2");
+		
+	default:
+		$arr = array(0=>'Caroline',1=>'Miranda');
+		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,?,?,$time)";
+		break;
+	
+	case 'oci8':
+	case 'oci805':
+		$arr = array('first'=>'Caroline','last'=>'Miranda');
+		$amt = rand() % 100;
+		$sql = "insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+0,:first,:last,$time)";		
+		break;
+	}
+	if ($i & 1) {
+		$sql = $db->Prepare($sql);
+	}
+	$rs = $db->Execute($sql,$arr);
+		
+	if ($rs === false) Err( 'Error inserting with parameters');
+	else $rs->Close();
+	$db->debug = false;
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+1,'John','Lim',$time)");
+	/*$ins_id=$db->Insert_ID();
+	echo "Insert ID=";var_dump($ins_id);*/
+	if ($db->databaseType == 'mysql') if ($ins_id == 0) Err('Bad Insert_ID');
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+2,'Mary','Lamb',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+3,'George','Washington',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+4,'Mr. Alan','Tam',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+5,'Alan',".$db->quote("Turing'ton").",$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created)values ($i*10+6,'Serena','Williams',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+7,'Yat Sun','Sun',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+8,'Wai Hun','See',$time )");
+	$db->Execute("insert into ADOXYZ (id,firstname,lastname,created) values ($i*10+9,'Steven','Oey',$time )");
+	} // for
+	if (1) {
+	$db->debug=1;
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$cnt = $db->GetOne("select count(*) from ADOXYZ");
+	$rs = $db->Execute('update ADOXYZ set id=id+1');	
+	if (!is_object($rs)) {
+		print_r($rs);
+		err("Update should return object");
+	} 
+	if (!$rs) err("Update generated error");
+	
+	$nrows = $db->Affected_Rows();   
+	if ($nrows === false) print "
    Affected_Rows() not supported
    ";
+	else if ($nrows != $cnt)  print "
    Affected_Rows() Error: $nrows returned (should be 50) 
    ";
+	else print "
    Affected_Rows() passed
    ";
+	}
+	
+	if ($db->dataProvider == 'oci8')  $array = array('zid'=>1,'zdate'=>date('Y-m-d',time()));
+	else $array=array(1,date('Y-m-d',time()));
+	
+	
+	#$array = array(1,date('Y-m-d',time()));
+	$id = $db->GetOne("select id from ADOXYZ 
+		where id=".$db->Param('zid')." and created>=".$db->Param('ZDATE')."",
+		$array);
+	if ($id != 1) Err("Bad bind; id=$id");
+	else echo "
    Bind date/integer 1 passed";
+	
+	$array =array(1,$db->BindDate(time()));
+	$id = $db->GetOne("select id from ADOXYZ 
+		where id=".$db->Param('0')." and created>=".$db->Param('1')."",
+		$array);
+	if ($id != 1) Err("Bad bind; id=$id");
+	else echo "
    Bind date/integer 2 passed";
+	
+	$db->debug = false;
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+ //////////////////////////////////////////////////////////////////////////////////////////
+	
+	$rs = $db->Execute("select * from ADOXYZ where firstname = 'not known'");
+	if (!$rs ||  !$rs->EOF) print "
    Error on empty recordset
    ";
+	else if ($rs->RecordCount() != 0) {
+		print "
    Error on RecordCount. Should be 0. Was ".$rs->RecordCount()."
    "; 
+		print_r($rs->fields);
+	}
+	if ($db->databaseType !== 'odbc') {
+		$rs = $db->Execute("select id,firstname,lastname,created,".$db->random." from ADOXYZ order by id");
+		if ($rs) {
+			if ($rs->RecordCount() != 50) {
+				print "
    RecordCount returns ".$rs->RecordCount().", should be 50
    ";
+				adodb_pr($rs->GetArray());
+				$poc = $rs->PO_RecordCount('ADOXYZ');
+				if ($poc == 50) print "
         PO_RecordCount passed
    ";
+				else print "
    PO_RecordCount returns wrong value: $poc
    ";
+			} else print "
    RecordCount() passed
    ";
+			if (isset($rs->fields['firstname'])) print '
    The fields columns can be indexed by column name.
    ';
+			else {
+				Err( '
    The fields columns cannot be indexed by column name.
    ');
+				print_r($rs->fields);
+			}
+			if (empty($_GET['hide'])) rs2html($rs);
+		}
+		else print "
    Error in Execute of SELECT with random
    ";
+	}
+	$val = $db->GetOne("select count(*) from ADOXYZ");
+	 if ($val == 50) print "
    GetOne returns ok
    ";
+	 else print "
    Fail: GetOne returns $val
    ";
+
+	 echo "GetRow Test";
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$val1 = $db->GetRow("select count(*) from ADOXYZ");
+	$val2 = $db->GetRow("select count(*) from ADOXYZ");
+	 if ($val1[0] == 50 and sizeof($val1) == 1 and $val2[0] == 50 and sizeof($val2) == 1) print "
    GetRow returns ok
    ";
+	 else {
+	 	print_r($val);
+	 	print "
    Fail: GetRow returns {$val2[0]}
    ";
+	}
+
+	print "
    FetchObject/FetchNextObject Test
    ";
+	$rs = $db->Execute('select * from ADOXYZ');
+	if ($rs) {
+		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
+		
+		while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
+			if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
+				print_r($o);
+				print "
    Firstname is not string
    ";
+				break;
+			}
+		}
+	} else {
+		print "
    Failed rs
    ";
+		die("
    ADOXYZ table cannot be read - die()");
+	}
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	print "
    FetchObject/FetchNextObject Test 2
    ";
+	#$db->debug=99;
+	$rs = $db->Execute('select * from ADOXYZ');
+	if (empty($rs->connection)) print "Connection object missing from recordset
    ";
+	print_r($rs->fields);
+	while ($o = $rs->FetchNextObject()) { // calls FetchObject internally
+		if (!is_string($o->FIRSTNAME) || !is_string($o->LASTNAME)) {
+			print_r($o);
+			print "
    Firstname is not string
    ";
+			break;
+		}
+	}
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	
+	$savefetch = $ADODB_FETCH_MODE;
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	
+	print "
    CacheSelectLimit  Test...
    ";
+	$db->debug=1;
+	$rs = $db->CacheSelectLimit('select  id, firstname from  ADOXYZ order by id',2);
+	
+	if ($rs && !$rs->EOF) {
+		if (isset($rs->fields[0])) {
+			Err("ASSOC has numeric fields");
+			print_r($rs->fields);
+		}
+		if ($rs->fields['id'] != 1)  {Err("Error"); print_r($rs->fields);};
+		if (trim($rs->fields['firstname']) != 'Caroline')  {print Err("Error 2"); print_r($rs->fields);};
+		
+		$rs->MoveNext();
+		if ($rs->fields['id'] != 2)  {Err("Error 3"); print_r($rs->fields);};
+		$rs->MoveNext();
+		if (!$rs->EOF) {
+			Err("Error EOF");
+			print_r($rs);
+		}
+	}
+	
+	print "
    FETCH_MODE = ASSOC: Should get 1, Caroline
    ";
+	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',2);
+	if ($rs && !$rs->EOF) {
+		if (ADODB_ASSOC_CASE == 2) {
+			$id = 'ID';
+			$fname = 'FIRSTNAME';
+		}else {
+			$id = 'id';
+			$fname = 'firstname';
+		}
+		if ($rs->fields[$id] != 1)  {Err("Error 1"); print_r($rs->fields);};
+		if (trim($rs->fields[$fname]) != 'Caroline')  {Err("Error 2"); print_r($rs->fields);};
+		$rs->MoveNext();
+		if ($rs->fields[$id] != 2)  {Err("Error 3"); print_r($rs->fields);};
+		$rs->MoveNext();
+		if (!$rs->EOF) Err("Error EOF");
+		else if (is_array($rs->fields) || $rs->fields) {
+			Err("Error: ## fields should be set to false on EOF");
+			print_r($rs->fields);
+		}
+	}
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	print "
    FETCH_MODE = NUM: Should get 1, Caroline
    ";
+	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		if (isset($rs->fields['id'])) Err("FETCH_NUM has ASSOC fields");
+		if ($rs->fields[0] != 1)  {Err("Error 1"); print_r($rs->fields);};
+		if (trim($rs->fields[1]) != 'Caroline')  {Err("Error 2");print_r($rs->fields);};
+		$rs->MoveNext();
+		if (!$rs->EOF) Err("Error EOF");
+
+	}
+	$ADODB_FETCH_MODE = $savefetch;
+	
+	$db->debug = false;
+	print "
    GetRowAssoc Upper: Should get 1, Caroline
    ";
+	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		$arr = $rs->GetRowAssoc();
+		if ($arr['ID'] != 1) {Err("Error 1");print_r($arr);};
+		if (trim($arr['FIRSTNAME']) != 'Caroline') {Err("Error 2"); print_r($arr);};
+		$rs->MoveNext();
+		if (!$rs->EOF) Err("Error EOF");
+
+	}
+	print "
    GetRowAssoc Lower: Should get 1, Caroline
    ";
+	$rs = $db->SelectLimit('select id,firstname from ADOXYZ order by id',1);
+	if ($rs && !$rs->EOF) {
+		$arr = $rs->GetRowAssoc(false);
+		if ($arr['id'] != 1) {Err("Error 1"); print_r($arr);};
+		if (trim($arr['firstname']) != 'Caroline') {Err("Error 2"); print_r($arr);};
+
+	}
+	
+	print "
    GetCol Test
    ";
+	$col = $db->GetCol('select distinct firstname from ADOXYZ order by 1');
+	if (!is_array($col)) Err("Col size is wrong");
+	if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col elements wrong");
+	
+	
+	$col = $db->CacheGetCol('select distinct firstname from ADOXYZ order by 1');
+	if (!is_array($col)) Err("Col size is wrong");
+	if (trim($col[0]) != 'Alan' or trim($col[9]) != 'Yat Sun') Err("Col elements wrong");
+
+	$db->debug = true;
+	
+		
+	echo "
    Date Update Test
    ";
+	$zdate = date('Y-m-d',time()+3600*24);
+	$zdate = $db->DBDate($zdate);
+	$db->Execute("update ADOXYZ set created=$zdate where id=1");
+	$row = $db->GetRow("select created,firstname from ADOXYZ where id=1");
+	print_r($row); echo "
    ";
+	
+	
+	
+	print "
    SelectLimit Distinct Test 1: Should see Caroline, John and Mary
    ";
+	$rs = $db->SelectLimit('select distinct * from ADOXYZ order by id',3);
+	
+	
+	if ($rs && !$rs->EOF) {
+		if (trim($rs->fields[1]) != 'Caroline') Err("Error 1 (exp Caroline), ".$rs->fields[1]);
+		$rs->MoveNext();
+		
+		if (trim($rs->fields[1]) != 'John') Err("Error 2 (exp John), ".$rs->fields[1]);
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Mary') Err("Error 3 (exp Mary),".$rs->fields[1]);
+		$rs->MoveNext();
+		if (! $rs->EOF) Err("Error EOF");
+		//rs2html($rs);
+	} else Err("Failed SelectLimit Test 1");
+	
+	print "
    SelectLimit Test 2: Should see Mary, George and Mr. Alan
    ";
+	$rs = $db->SelectLimit('select * from ADOXYZ order by id',3,2);
+	if ($rs && !$rs->EOF) {
+		if (trim($rs->fields[1]) != 'Mary') Err("Error 1 - No Mary, instead: ".$rs->fields[1]);
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'George')Err("Error 2 - No George, instead: ".$rs->fields[1]);
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Mr. Alan') Err("Error 3 - No Mr. Alan, instead: ".$rs->fields[1]);
+		$rs->MoveNext();
+		if (! $rs->EOF) Err("Error EOF");
+	//	rs2html($rs);
+	}
+	 else Err("Failed SelectLimit Test 2 ". ($rs ? 'EOF':'no RS'));
+	
+	print "
    SelectLimit Test 3: Should see Wai Hun and Steven
    ";
+	$db->debug=1;
+	global $A; $A=1;
+	$rs = $db->SelectLimit('select * from ADOXYZ order by id',-1,48);
+	$A=0;
+	if ($rs && !$rs->EOF) {
+		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
+		if (trim($rs->fields[1]) != 'Wai Hun') Err("Error 1 ".$rs->fields[1]);
+		$rs->MoveNext();
+		if (trim($rs->fields[1]) != 'Steven') Err("Error 2 ".$rs->fields[1]);
+		$rs->MoveNext();
+		if (! $rs->EOF) {
+			Err("Error EOF");
+		}
+		//rs2html($rs);
+	}
+	 else Err("Failed SelectLimit Test 3");
+		$db->debug = false;
+	
+	
+	$rs = $db->Execute("select * from ADOXYZ order by id");
+	print "
    Testing Move()
    ";	
+	if (!$rs)Err( "Failed Move SELECT");
+	else {
+		if (!$rs->Move(2)) {
+			if (!$rs->canSeek) print "
    $db->databaseType: Move(), MoveFirst() nor MoveLast() not supported.
    ";
+			else print '
    RecordSet->canSeek property should be set to false
    ';
+		} else {
+			$rs->MoveFirst();
+			if (trim($rs->Fields("firstname")) != 'Caroline') {
+				print "
    $db->databaseType: MoveFirst failed -- probably cannot scroll backwards
    ";
+			}
+			else print "MoveFirst() OK
    ";
+						
+						// Move(3) tests error handling -- MoveFirst should not move cursor
+			$rs->Move(3);
+			if (trim($rs->Fields("firstname")) != 'George') {
+				print '
    '.$rs->Fields("id")."$db->databaseType: Move(3) failed
    ";
+			} else print "Move(3) OK
    ";
+						
+			$rs->Move(7);
+			if (trim($rs->Fields("firstname")) != 'Yat Sun') {
+				print '
    '.$rs->Fields("id")."$db->databaseType: Move(7) failed
    ";
+				print_r($rs);
+			} else print "Move(7) OK
    ";
+			if ($rs->EOF) Err("Move(7) is EOF already");
+			$rs->MoveLast();
+			if (trim($rs->Fields("firstname")) != 'Steven'){
+				 print '
    '.$rs->Fields("id")."$db->databaseType: MoveLast() failed
    ";
+				 print_r($rs);
+			}else print "MoveLast() OK
    ";
+			$rs->MoveNext();
+			if (!$rs->EOF) err("Bad MoveNext");
+			if ($rs->canSeek) {
+				$rs->Move(3);
+				if (trim($rs->Fields("firstname")) != 'George') {
+					print '
    '.$rs->Fields("id")."$db->databaseType: Move(3) after MoveLast failed
    ";
+					
+				} else print "Move(3) after MoveLast() OK
    ";
+			}
+			
+			print "
    Empty Move Test";
+			$rs = $db->Execute("select * from ADOXYZ where id > 0 and id < 0");
+			$rs->MoveFirst();
+			if (!$rs->EOF || $rs->fields) Err("Error in empty move first");
+		}
+	}
+	
+	$rs = $db->Execute('select * from ADOXYZ where id = 2');
+	if ($rs->EOF || !is_array($rs->fields)) Err("Error in select");
+	$rs->MoveNext();
+	if (!$rs->EOF) Err("Error in EOF (xx) ");
+ //	$db->debug=true;
+	print "
    Testing ADODB_FETCH_ASSOC and concat: concat firstname and lastname
    ";
+
+	$save = $ADODB_FETCH_MODE;
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	if ($db->dataProvider == 'postgres') {
+		$sql = "select ".$db->Concat('cast(firstname as varchar)',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
+		$rs = $db->Execute($sql);
+	} else {
+		$sql = "select distinct ".$db->Concat('firstname',$db->qstr(' '),'lastname')." as fullname,id,".$db->sysTimeStamp." as d from ADOXYZ";
+		$rs = $db->Execute($sql);
+	}
+	if ($rs) {
+		if (empty($_GET['hide'])) rs2html($rs);
+	} else {
+		Err( "Failed Concat:".$sql);
+	}
+	$ADODB_FETCH_MODE = $save;
+	print "
    Testing GetArray() ";
+	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	
+	$rs = $db->Execute("select * from ADOXYZ order by id");
+	if ($rs) {
+		$arr = $rs->GetArray(10);
+		if (sizeof($arr) != 10 || trim($arr[1][1]) != 'John' || trim($arr[1][2]) != 'Lim') print $arr[1][1].' '.$arr[1][2]."   ERROR
    ";
+		else print " OK
    ";
+	}
+	
+	$arr = $db->GetArray("select x from ADOXYZ");
+	$e = $db->ErrorMsg(); $e2 = $db->ErrorNo();
+	echo "Testing error handling, should see illegal column 'x' error=$e ($e2) 
    ";
+	if (!$e || !$e2) Err("Error handling did not work");
+	print "Testing FetchNextObject for 1 object ";
+	$rs = $db->Execute("select distinct lastname,firstname from ADOXYZ where firstname='Caroline'");
+	$fcnt = 0;
+	if ($rs)
+	while ($o = $rs->FetchNextObject()) {
+		$fcnt += 1;	
+	}
+	if ($fcnt == 1) print " OK
    ";
+	else print "FAILED
    ";
+	
+	$stmt = $db->Prepare("select * from ADOXYZ where id < 3");
+	$rs = $db->Execute($stmt);
+	if (!$rs) Err("Prepare failed");
+	else {
+		$arr = $rs->GetArray();
+		if (!$arr) Err("Prepare failed 2");
+		if (sizeof($arr) != 2) Err("Prepare failed 3");
+	}
+	print "Testing GetAssoc() ";
+	$savecrecs = $ADODB_COUNTRECS;
+	$ADODB_COUNTRECS = false;
+	//$arr = $db->GetArray("select  lastname,firstname from ADOXYZ");
+	//print_r($arr);
+	print "
    ";
+	$rs = $db->Execute("select distinct lastname,firstname,created from ADOXYZ");
+	
+	if ($rs) {
+		$arr = $rs->GetAssoc();
+		//print_r($arr);
+		if (empty($arr['See']) || trim(reset($arr['See'])) != 'Wai Hun') print $arr['See']."   ERROR
    ";
+		else print " OK 1";
+	}
+	
+	$arr = $db->GetAssoc("select distinct lastname,firstname from ADOXYZ");
+	if ($arr) {
+		//print_r($arr);
+		if (empty($arr['See']) || trim($arr['See']) != 'Wai Hun') print $arr['See']."   ERROR
    ";
+		else print " OK 2
    ";
+	}
+	// Comment this out to test countrecs = false
+	$ADODB_COUNTRECS = $savecrecs;
+	$db->debug=1;
+	$query = $db->Prepare("select count(*) from ADOXYZ");
+	$rs = $db->CacheExecute(10,$query);
+	if (reset($rs->fields) != 50) echo Err("$cnt wrong for Prepare/CacheGetOne");
+	
+	for ($loop=0; $loop < 1; $loop++) {
+	print "Testing GetMenu() and CacheExecute
    ";
+	$db->debug = true;
+	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	
+	
+
+
+	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu('menu','Steven').'
    '; 
+	else print " Fail
    ";
+	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	
+	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu('menu','Steven',false).'
    ';
+	else print " Fail
    ";
+	
+	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	
+	if ($rs) print ' 1st line set to **** , Steven selected: '. $rs->GetMenu('menu','Steven','1st:****').'
    ';
+	else print " Fail
    ";
+	
+
+	
+	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print ' Multiple, Alan selected: '. $rs->GetMenu('menu','Alan',false,true).'
    ';
+	else print " Fail
    ";
+	print '
    ';
+	
+	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) {
+		print ' Multiple, Alan and George selected: '. $rs->GetMenu('menu',array('Alan','George'),false,true);
+		if (empty($rs->connection)) print "Connection object missing from recordset
    ";
+	} else print " Fail
    ";
+	print '
    ';
+	
+	print "Testing GetMenu3()
    ";
+	$rs = $db->Execute("select ".$db->Concat('firstname',"'-'",'id').",id, lastname from ADOXYZ order by lastname,id");
+	if ($rs) print "Grouped Menu: ".$rs->GetMenu3('name');
+	else Err('Grouped Menu GetMenu3()');
+	print "
    ";
+
+	print "Testing GetMenu2() 
    ";
+	$rs = $db->CacheExecute(4,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print 'With blanks, Steven selected:'. $rs->GetMenu2('menu',('Oey')).'
    '; 
+	else print " Fail
    ";
+	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
+	if ($rs) print ' No blanks, Steven selected: '. $rs->GetMenu2('menu',('Oey'),false).'
    ';
+	else print " Fail
    ";
+	}
+	echo "
    CacheExecute
    ";
+
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
+	print_r($rs->fields); echo $rs->fetchMode;echo "
    ";
+	echo $rs->Fields('firstname');
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs = $db->CacheExecute(6,"select distinct firstname,lastname from ADOXYZ");
+	print_r($rs->fields);echo "
    ";
+	echo $rs->Fields('firstname');
+	$db->debug = false;
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	// phplens
+	
+	$sql = 'select * from ADOXYZ where 0=1';
+	echo "
    **Testing '$sql' (phplens compat 1)
    ";
+	$rs = $db->Execute($sql);
+	if (!$rs) err( "No recordset returned for '$sql'");
+	if (!$rs->FieldCount()) err( "No fields returned for $sql");
+	if (!$rs->FetchField(1)) err( "FetchField failed for $sql");
+	
+	$sql = 'select * from ADOXYZ order by 1';
+	echo "
    **Testing '$sql' (phplens compat 2)
    ";
+	$rs = $db->Execute($sql);
+	if (!$rs) err( "No recordset returned for '$sql'
    ".$db->ErrorMsg()."    ");
+	
+	
+	$sql = 'select * from ADOXYZ order by 1,1';
+	echo "
    **Testing '$sql' (phplens compat 3)
    ";
+	$rs = $db->Execute($sql);
+	if (!$rs) err( "No recordset returned for '$sql'
    ".$db->ErrorMsg()."    ");
+	
+	
+	// Move
+	$rs1 = $db->Execute("select id from ADOXYZ where id <= 2 order by 1");
+	$rs2 = $db->Execute("select id from ADOXYZ where id = 3 or id = 4 order by 1");
+
+	if ($rs1) $rs1->MoveLast();
+	if ($rs2) $rs2->MoveLast();
+	
+	if (empty($rs1) || empty($rs2) || $rs1->fields[0] != 2 || $rs2->fields[0] != 4) {
+		$a = $rs1->fields[0];
+		$b = $rs2->fields[0];
+		print "
    Error in multiple recordset test rs1=$a rs2=$b (should be rs1=2 rs2=4)
    ";
+	} else
+		print "
    Testing multiple recordsets OK
    ";
+		
+	
+	echo "
     GenID test: ";
+	for ($i=1; $i <= 10; $i++) 
+		echo  "($i: ",$val = $db->GenID($db->databaseType.'abcseq7' ,5), ") ";
+	if ($val == 0) Err("GenID not supported");
+	
+	if ($val) {
+		$db->DropSequence('abc_seq2');
+		$db->CreateSequence('abc_seq2');
+		$val = $db->GenID('abc_seq2');
+		$db->DropSequence('abc_seq2');
+		$db->CreateSequence('abc_seq2');
+		$val = $db->GenID('abc_seq2');
+		if ($val != 1) Err("Drop and Create Sequence not supported ($val)");
+	}
+	echo "
    ";
+	
+	if (substr($db->dataProvider,0,3) != 'notused') { // used to crash ado
+		$sql = "select firstnames from ADOXYZ";
+		print "
    Testing execution of illegal statement: $sql
    ";
+		if ($db->Execute($sql) === false) {
+			print "
    This returns the following ErrorMsg(): ".$db->ErrorMsg()." and ErrorNo(): ".$db->ErrorNo().'
    ';
+		} else 
+			print "
    Error in error handling -- Execute() should return false
    ";
+	} else 
+		print "
    ADO skipped error handling of bad select statement
    ";
+	
+	print "
    ASSOC TEST 2
    ";
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs = $db->query('select * from ADOXYZ order by id');
+	if ($ee = $db->ErrorMsg()) {
+		Err("Error message=$ee");
+	}
+	if ($ee = $db->ErrorNo()) {
+		Err("Error No = $ee");
+	}
+	print_r($rs->fields);
+	for($i=0;$i<$rs->FieldCount();$i++) 
+	{ 
+		$fld=$rs->FetchField($i); 
+		print "
     Field name is ".$fld->name; 
+		print " ".$rs->Fields($fld->name); 
+	} 
+
+		
+	print "
    BOTH TEST 2
    ";
+	if ($db->dataProvider == 'ado') {
+		print "ADODB_FETCH_BOTH not supported for dataProvider=".$db->dataProvider."
    ";
+	} else {
+		$ADODB_FETCH_MODE = ADODB_FETCH_BOTH;
+		$rs = $db->query('select * from ADOXYZ order by id');
+		for($i=0;$i<$rs->FieldCount();$i++) 
+		{ 
+			$fld=$rs->FetchField($i); 
+			print "
     Field name is ".$fld->name; 
+			print " ".$rs->Fields($fld->name); 
+		} 
+	}
+	
+	print "
    NUM TEST 2
    ";
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	$rs = $db->query('select * from ADOXYZ order by id');
+	for($i=0;$i<$rs->FieldCount();$i++) 
+	{ 
+		$fld=$rs->FetchField($i); 
+		print "
     Field name is ".$fld->name; 
+		print " ".$rs->Fields($fld->name); 
+	} 
+	
+	print "
    ASSOC Test of SelectLimit
    ";
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs = $db->selectlimit('select * from ADOXYZ order by id',3,4);
+	$cnt = 0;
+	while ($rs && !$rs->EOF) {
+		$cnt += 1;
+		if (!isset($rs->fields['firstname'])) {
+			print "
    ASSOC returned numeric field
    ";
+			break;
+		}
+		$rs->MoveNext();
+	}
+	if ($cnt != 3) print "
    Count should be 3, instead it was $cnt
    ";
+	
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	if ($db->sysDate) {
+		$saved = $db->debug;
+		$db->debug = 1;
+		$rs = $db->Execute("select {$db->sysDate} from ADOXYZ where id=1");
+		if (ADORecordSet::UnixDate(date('Y-m-d')) != $rs->UnixDate($rs->fields[0])) {
+			print "
    Invalid date {$rs->fields[0]}
    ";
+		} else
+			print "
    Passed \$sysDate test ({$rs->fields[0]})
    ";
+		
+		print_r($rs->FetchField(0));
+		print time();
+		$db->debug=$saved;
+	} else {
+		print "
    \$db->sysDate not defined
    ";
+	}
+
+	print "
    Test CSV
    ";
+	include_once('../toexport.inc.php');
+	//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'He, he\' he,\'"\' q  from ADOXYZ',10);	
+	
+	print "
    ";
+	print rs2csv($rs);
+	print "
    ";
+	
+	$rs = $db->SelectLimit('select id,firstname,lastname,created,\'The	"young man", he said\' from ADOXYZ',10);	
+	
+	if (PHP_VERSION < 5) {
+		print "
    ";
+		rs2tabout($rs);
+		print "
    ";
+	}
+	#print " CacheFlush ";
+	#$db->CacheFlush();
+	
+	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A');
+	$sql = "SELECT $date from ADOXYZ";
+	print "
    Test SQLDate: ".htmlspecialchars($sql)."
    ";
+	$rs = $db->SelectLimit($sql,1);
+	$d = date('d-m-M-Y-').'Q'.(ceil(date('m')/3.0)).date(' h:i:s A');
+	if (!$rs) Err("SQLDate query returned no recordset");
+	else if ($d != $rs->fields[0]) Err("SQLDate 1 failed expected: 
    act:$d 
    sql:".$rs->fields[0]);
+	
+	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
+	$sql = "SELECT $date from ADOXYZ";
+	print "
    Test SQLDate: ".htmlspecialchars($sql)."
    ";
+	$db->debug=1;
+	$rs = $db->SelectLimit($sql,1);
+	$ts = ADOConnection::UnixDate('1974-02-25');
+	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
+	if (!$rs) {
+		Err("SQLDate query returned no recordset");
+		echo $db->ErrorMsg(),'
    ';
+	} else if ($d != reset($rs->fields)) {
+		Err("SQLDate 2 failed expected: 
    act:$d 
    sql:".$rs->fields[0].' 
    '.$db->ErrorMsg());
+	}
+	
+	
+	print "
    Test Filter
    ";
+	$db->debug = 1;
+	
+	$rs = $db->SelectLimit('select * from ADOXYZ where id < 3 order by id');
+	
+	$rs = RSFilter($rs,'do_strtolower');
+	if (trim($rs->fields[1]) != 'caroline'  && trim($rs->fields[2]) != 'miranda') {
+		err('**** RSFilter failed');
+		print_r($rs->fields);
+	}
+	
+	rs2html($rs);
+		
+	$db->debug=1;
+	
+	
+	print "
    Test Replace
    ";
+	
+	$ret = $db->Replace('ADOXYZ', 
+		array('id'=>1,'firstname'=>'Caroline','lastname'=>'Miranda'),
+		array('id'),
+		$autoq = true);
+	if (!$ret) echo "
    Error in replacing existing record
    ";
+	else {
+		$saved = $db->debug;
+		$db->debug = 0;
+		$savec = $ADODB_COUNTRECS;
+		$ADODB_COUNTRECS = true;
+		$rs = $db->Execute('select * FROM ADOXYZ where id=1');
+		$db->debug = $saved;
+		if ($rs->RecordCount() != 1) {
+			$cnt = $rs->RecordCount();
+			rs2html($rs);
+			print "Error - Replace failed, count=$cnt
    ";
+		}
+		$ADODB_COUNTRECS = $savec;
+	}
+	$ret = $db->Replace('ADOXYZ', 
+		array('id'=>1000,'firstname'=>'Harun','lastname'=>'Al-Rashid'),
+		array('id','firstname'),
+		$autoq = true);
+	if ($ret != 2) print "Replace failed: ";
+	print "test A return value=$ret (2 expected) 
    ";
+	
+	$ret = $db->Replace('ADOXYZ', 
+		array('id'=>1000,'firstname'=>'Sherazade','lastname'=>'Al-Rashid'),
+		'id',
+		$autoq = true);
+	if ($ret != 1) 
+		if ($db->dataProvider == 'ibase' && $ret == 2);
+		else print "Replace failed: ";
+	print "test B return value=$ret (1 or if ibase then 2 expected) 
    ";
+	
+	print "
    rs2rs Test
    ";
+	
+	$rs = $db->Execute('select * from ADOXYZ where id>= 1 order by id');
+	$rs = $db->_rs2rs($rs);
+	$rs->valueX = 'X';
+	$rs->MoveNext();
+	$rs = $db->_rs2rs($rs);
+	if (!isset($rs->valueX)) err("rs2rs does not preserve array recordsets");
+	if (reset($rs->fields) != 1) err("rs2rs does not move to first row: id=".reset($rs->fields));
+
+	/////////////////////////////////////////////////////////////
+	include_once('../pivottable.inc.php');
+	print "
    Pivot Test
    ";
+	$db->debug=true;
+ 	$sql = PivotTableSQL(
+ 		$db,  			# adodb connection
+ 		'ADOXYZ',  		# tables
+		'firstname',	# row fields
+		'lastname',		# column fields 
+		false,			# join
+		'ID', 			# sum
+		'Sum ',			# label for sum
+		'sum',			# aggregate function
+		true
+	);
+	$rs = $db->Execute($sql);
+	if ($rs) rs2html($rs);
+	else Err("Pivot sql error");
+	
+	$pear = false; //true;
+	$db->debug=false;
+	
+	if ($pear) {
+	// PEAR TESTS BELOW
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
+	
+	include_once "PEAR.php";
+	$rs = $db->query('select * from ADOXYZ where id>0 and id<10 order by id');
+	
+	$i = 0;
+	if ($rs && !$rs->EOF) {
+		while ($arr = $rs->fetchRow()) {
+			$i++;
+			//print "$i ";
+			if ($arr[0] != $i) {
+				print_r($arr);
+				print "
    PEAR DB emulation error 1.
    ";
+				$pear = false;
+				break;
+			}
+		}
+		$rs->Close();
+	}
+	
+	
+	if ($i != $db->GetOne('select count(*) from ADOXYZ where id>0 and id<10')) {
+		print "
    PEAR DB emulation error 1.1 EOF ($i)
    ";
+		$pear = false;
+	}
+	
+	$rs = $db->limitQuery('select * from ADOXYZ where id>0 order by id',$i=3,$top=3);
+	$i2 = $i;
+	if ($rs && !$rs->EOF) {
+
+		while (!is_object($rs->fetchInto($arr))) {
+			$i2++;
+			
+	//			print_r($arr);
+	//		print "$i ";print_r($arr);
+			if ($arr[0] != $i2) {
+				print "
    PEAR DB emulation error 2.
    ";
+				$pear = false;
+				break;
+			}
+		}
+		$rs->Close();
+	}
+	if ($i2 != $i+$top) {
+		print "
    PEAR DB emulation error 2.1 EOF (correct=$i+$top, actual=$i2)
    ";
+		$pear = false;
+	}
+	}
+	if ($pear) print "
    PEAR DB emulation passed.
    ";
+	flush();
+
+	
+	$rs = $db->SelectLimit("select ".$db->sysDate." from ADOXYZ",1);
+	$date = $rs->fields[0];
+	if (!$date) Err("Bad sysDate");
+	else {
+		$ds = $db->UserDate($date,"d m Y");
+		if ($ds != date("d m Y")) Err("Bad UserDate: ".$ds.' expected='.date("d m Y"));
+		else echo "Passed UserDate: $ds
    ";
+	}
+	$db->debug=1;
+	if ($db->dataProvider == 'oci8') 
+		$rs = $db->SelectLimit("select to_char(".$db->sysTimeStamp.",'YYYY-MM-DD HH24:MI:SS') from ADOXYZ",1);
+	else 
+		$rs = $db->SelectLimit("select ".$db->sysTimeStamp." from ADOXYZ",1);
+	$date = $rs->fields[0];
+	if (!$date) Err("Bad sysTimeStamp");
+	else {
+		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
+		if ($ds != date("H \\h\\r\\s-d m Y")) Err("Bad UserTimeStamp: ".$ds.", correct is ".date("H \\h\\r\\s-d m Y"));
+		else echo "Passed UserTimeStamp: $ds
    ";
+		
+		$date = 100;
+		$ds = $db->UserTimeStamp($date,"H \\h\\r\\s-d m Y");
+		$ds2 = date("H \\h\\r\\s-d m Y",$date);
+		if ($ds != $ds2) Err("Bad UserTimeStamp 2: $ds: $ds2");
+		else echo "Passed UserTimeStamp 2: $ds
    ";
+	}
+	flush();
+	
+	if ($db->hasTransactions) {
+		$db->debug=1;
+		echo "
    Testing StartTrans CompleteTrans
    ";
+		$db->raiseErrorFn = false;
+		
+		$db->SetTransactionMode('SERIALIZABLE');
+		$db->StartTrans();
+		$rs = $db->Execute('select * from notable');
+			$db->StartTrans();
+				$db->BeginTrans();
+			$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
+				$db->CommitTrans();
+			$db->CompleteTrans();
+		$rez = $db->CompleteTrans();
+		$db->SetTransactionMode('');
+		$db->debug=0;
+		if ($rez !== false) {
+			if (is_null($rez)) Err("Error: _transOK not modified");
+			else Err("Error: CompleteTrans (1) should have failed");
+		} else {
+			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
+			if ($name == "Carolx") Err("Error: CompleteTrans (2) should have failed");
+			else echo "
     -- Passed StartTrans test1 - rolling back
    ";
+		}
+		
+		$db->StartTrans();
+			$db->BeginTrans();
+		$db->Execute("update ADOXYZ set firstname='Carolx' where id=1");
+			$db->RollbackTrans();
+		$rez = $db->CompleteTrans();
+		if ($rez !== true) Err("Error: CompleteTrans (1) should have succeeded");
+		else {
+			$name = $db->GetOne("Select firstname from ADOXYZ where id=1");
+			if (trim($name) != "Carolx") Err("Error: CompleteTrans (2) should have succeeded, returned name=$name");
+			else echo "
     -- Passed StartTrans test2 - commiting
    ";
+		}
+	}
+	flush();
+	$saved = $db->debug;
+	$db->debug=1;
+	$cnt = _adodb_getcount($db, 'select * from ADOXYZ where firstname in (select firstname from ADOXYZ)');
+	echo "Count= $cnt";
+	$db->debug=$saved;
+	
+	global $TESTERRS;
+	$debugerr = true;
+	
+	global $ADODB_LANG;$ADODB_LANG = 'fr';
+	$db->debug = false;
+	$TESTERRS = 0;
+	$db->raiseErrorFn = 'adodb_test_err';
+	global $ERRNO; // from adodb_test_err
+	$db->Execute('select * from nowhere');
+	$metae = $db->MetaError($ERRNO);
+	if ($metae !== DB_ERROR_NOSUCHTABLE) print "
    MetaError=".$metae." wrong, should be ".DB_ERROR_NOSUCHTABLE."
    ";
+	else print "
    MetaError ok (".DB_ERROR_NOSUCHTABLE."): ".$db->MetaErrorMsg($metae)."
    ";
+	if ($TESTERRS != 1) print "raiseErrorFn select nowhere failed
    ";
+	$rs = $db->Execute('select * from ADOXYZ');
+	if ($debugerr) print " Move";
+	$rs->Move(100);
+	$rs->_queryID = false;
+	if ($debugerr) print " MoveNext";
+	$rs->MoveNext();
+	if ($debugerr) print " $rs=false";
+	$rs = false;
+
+	flush();
+	
+	print "
    SetFetchMode() tests
    ";
+	$db->SetFetchMode(ADODB_FETCH_ASSOC);
+	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
+	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;	
+	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
+	//var_dump($rs->fields);
+	if (!isset($rs->fields['firstname'])) Err("BAD FETCH ASSOC");
+	
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;	
+	$db->SetFetchMode(ADODB_FETCH_NUM);
+	$rs = $db->SelectLimit('select firstname from ADOXYZ',1);
+	if (!isset($rs->fields[0])) Err("BAD FETCH NUM");
+	
+	flush();
+	
+	print "
    Test MetaTables again with SetFetchMode()
    ";
+	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+	$db->SetFetchMode(ADODB_FETCH_ASSOC);
+	print_r($db->MetaTables());
+	print "
    ";
+	
+	////////////////////////////////////////////////////////////////////
+	
+	print "
    Testing Bad Connection
    ";
+	flush();
+	
+	if (true || PHP_VERSION < 5)  {
+		if ($db->dataProvider == 'odbtp') $db->databaseType = 'odbtp';
+		$conn = NewADOConnection($db->databaseType);
+		$conn->raiseErrorFn = 'adodb_test_err';
+		if (1) $conn->PConnect('abc','baduser','badpassword');
+		if ($TESTERRS == 2) print "raiseErrorFn tests passed
    ";
+		else print "raiseErrorFn tests failed ($TESTERRS)
    ";
+		
+		flush();
+	}
+	////////////////////////////////////////////////////////////////////
+	
+	global $nocountrecs;
+	
+	if (isset($nocountrecs) && $ADODB_COUNTRECS) err("Error: \$ADODB_COUNTRECS is set");
+	if (empty($nocountrecs) && $ADODB_COUNTRECS==false) err("Error: \$ADODB_COUNTRECS is not set");
+
+	flush();
+?>
+	
    
+	
     
    
+	
    
+Close();
+	if ($rs2) $rs2->Close();
+	if ($rs) $rs->Close();
+	$db->Close();
+	
+	if ($db->transCnt != 0) Err("Error in transCnt=$db->transCnt (should be 0)");
+	
+	
+	printf("
    Total queries=%d; total cached=%d
    ",$EXECS+$CACHED, $CACHED);
+	flush();
+}
+
+function adodb_test_err($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
+{
+global $TESTERRS,$ERRNO;
+
+	$ERRNO = $errno;
+	$TESTERRS += 1;
+	print "** $dbms ($fn): errno=$errno   errmsg=$errmsg ($p1,$p2)
    ";
+}
+
+//--------------------------------------------------------------------------------------
+
+
+@set_time_limit(240); // increase timeout
+
+include("../tohtml.inc.php");
+include("../adodb.inc.php");
+include("../rsfilter.inc.php");
+
+/* White Space Check */
+
+if (isset($_SERVER['argv'][1])) {
+	//print_r($_SERVER['argv']);
+	$_GET[$_SERVER['argv'][1]] = 1;
+}
+
+if (@$_SERVER['COMPUTERNAME'] == 'TIGRESS') {
+	CheckWS('mysqlt');
+	CheckWS('postgres');
+	CheckWS('oci8po');
+	
+	CheckWS('firebird');
+	CheckWS('sybase');
+	if (!ini_get('safe_mode')) CheckWS('informix');
+
+	CheckWS('ado_mssql');
+	CheckWS('ado_access');
+	CheckWS('mssql');
+	
+	CheckWS('vfp');
+	CheckWS('sqlanywhere');
+	CheckWS('db2');
+	CheckWS('access');
+	CheckWS('odbc_mssql');
+	CheckWS('firebird15');
+	//
+	CheckWS('oracle');
+	CheckWS('proxy');
+	CheckWS('fbsql');
+	print "White Space Check complete
    ";
+}
+if (sizeof($_GET) == 0) $testmysql = true;
+
+
+foreach($_GET as $k=>$v)  {
+	//global $$k;
+	$$k = $v;
+}	
+
+?>
+
+ADODB Testing
+
+
    ADODB Test
    
+
+This script tests the following databases: Interbase, Oracle, Visual FoxPro, Microsoft Access (ODBC and ADO), MySQL, MSSQL (ODBC, native, ADO). 
+There is also support for Sybase, PostgreSQL.
    
+For the latest version of ADODB, visit     adodb.sourceforge.net.
    
+
+Test GetInsertSQL/GetUpdateSQL   
+	Sessions  
+	Paging  
+	Perf Monitor
    
+vers=",ADOConnection::Version();
+
+
+
+?>
+
    ADODB Database Library  (c) 2000-2010 John Lim. All rights reserved. Released under BSD and LGPL, PHP .
    
+
+
diff --git a/adodb/tests/test2.php b/adodb/tests/test2.php
new file mode 100644
index 0000000..ff9e969
--- /dev/null
+++ b/adodb/tests/test2.php
@@ -0,0 +1,26 @@
+debug=1;
+	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
+	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
+		. 'DATA SOURCE=' . $access . ';';
+		
+	echo "
    PHP ",PHP_VERSION,"
    ";
+	
+	$db->Connect($myDSN) || die('fail');
+	
+	print_r($db->ServerInfo());
+	
+	try {
+	$rs = $db->Execute("select $db->sysTimeStamp,* from adoxyz where id>02xx");
+	print_r($rs->fields);
+	} catch(exception $e) {
+	print_r($e);
+	echo "
     Date m/d/Y =",$db->UserDate($rs->fields[4],'m/d/Y');
+	}
+?>
\ No newline at end of file
diff --git a/adodb/tests/test3.php b/adodb/tests/test3.php
new file mode 100644
index 0000000..97d531a
--- /dev/null
+++ b/adodb/tests/test3.php
@@ -0,0 +1,44 @@
+Connect('','scott','natsoft');
+$db->debug=1;
+
+$cnt = $db->GetOne("select count(*) from adoxyz");
+$rs = $db->Execute("select * from adoxyz order by id");
+
+$i = 0;
+foreach($rs as $k => $v) {
+	$i += 1;
+	echo $k; adodb_pr($v);
+	flush();
+}
+
+if ($i != $cnt) die("actual cnt is $i, cnt should be $cnt\n");
+
+
+
+$rs = $db->Execute("select bad from badder");
+
+} catch (exception $e) {
+	adodb_pr($e);
+	$e = adodb_backtrace($e->trace);
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/tests/test4.php b/adodb/tests/test4.php
new file mode 100644
index 0000000..7fcd7c6
--- /dev/null
+++ b/adodb/tests/test4.php
@@ -0,0 +1,143 @@
+PConnect("", "sa", "natsoft", "northwind"); // connect to MySQL, testdb
+
+$conn = ADONewConnection("mysql");  // create a connection
+$conn->PConnect("localhost", "root", "", "test"); // connect to MySQL, testdb
+
+
+#$conn = ADONewConnection('oci8po');
+#$conn->Connect('','scott','natsoft');
+
+if (PHP_VERSION  >= 5) {
+	$connstr = "mysql:dbname=northwind";
+	$u = 'root';$p='';
+	$conn = ADONewConnection('pdo');
+	$conn->Connect($connstr, $u, $p);
+}
+//$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+
+
+$conn->debug=1;
+$conn->Execute("delete from adoxyz where lastname like 'Smi%'");
+
+$rs = $conn->Execute($sql); // Execute the query and get the empty recordset
+$record = array(); // Initialize an array to hold the record data to insert
+
+if (strpos($conn->databaseType,'mysql')===false) $record['id'] = 751;
+$record["firstname"] = 'Jann';
+$record["lastname"] = "Smitts";
+$record["created"] = time();
+
+$insertSQL = $conn->GetInsertSQL($rs, $record);
+$conn->Execute($insertSQL); // Insert the record into the database
+
+if (strpos($conn->databaseType,'mysql')===false) $record['id'] = 752;
+// Set the values for the fields in the record
+$record["firstname"] = 'anull';
+$record["lastname"] = "Smith\$@//";
+$record["created"] = time();
+
+if (isset($_GET['f'])) $ADODB_FORCE_TYPE = $_GET['f'];
+
+//$record["id"] = -1;
+
+// Pass the empty recordset and the array containing the data to insert
+// into the GetInsertSQL function. The function will process the data and return
+// a fully formatted insert sql statement.
+$insertSQL = $conn->GetInsertSQL($rs, $record);
+$conn->Execute($insertSQL); // Insert the record into the database
+
+
+
+$insertSQL2 = $conn->GetInsertSQL($table='ADOXYZ', $record);
+if ($insertSQL != $insertSQL2) echo "
    Walt's new stuff failed: $insertSQL2
    ";
+//==========================
+// This code tests an update
+
+$sql = "
+SELECT * 
+FROM ADOXYZ WHERE lastname=".$conn->Param('var'). " ORDER BY 1"; 
+// Select a record to update 
+
+$varr = array('var'=>$record['lastname'].'');
+$rs = $conn->Execute($sql,$varr); // Execute the query and get the existing record to update
+if (!$rs || $rs->EOF) print "
    No record found!
    ";
+
+$record = array(); // Initialize an array to hold the record data to update
+
+
+// Set the values for the fields in the record
+$record["firstName"] = "Caroline".rand();
+//$record["lasTname"] = ""; // Update Caroline's lastname from Miranda to Smith
+$record["creAted"] = '2002-12-'.(rand()%30+1);
+$record['num'] = '';
+// Pass the single record recordset and the array containing the data to update
+// into the GetUpdateSQL function. The function will process the data and return
+// a fully formatted update sql statement.
+// If the data has not changed, no recordset is returned
+
+$updateSQL = $conn->GetUpdateSQL($rs, $record);
+$conn->Execute($updateSQL,$varr); // Update the record in the database
+if ($conn->Affected_Rows() != 1)print "
    Error1 : Rows Affected=".$conn->Affected_Rows().", should be 1
    ";
+
+$record["firstName"] = "Caroline".rand();
+$record["lasTname"] = "Smithy Jones"; // Update Caroline's lastname from Miranda to Smith
+$record["creAted"] = '2002-12-'.(rand()%30+1);
+$record['num'] = 331;
+$updateSQL = $conn->GetUpdateSQL($rs, $record);
+$conn->Execute($updateSQL,$varr); // Update the record in the database
+if ($conn->Affected_Rows() != 1)print "
    Error 2: Rows Affected=".$conn->Affected_Rows().", should be 1
    ";
+
+$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
+//adodb_pr($rs);
+rs2html($rs);
+
+$record["firstName"] = "Carol-new-".rand();
+$record["lasTname"] = "Smithy"; // Update Caroline's lastname from Miranda to Smith
+$record["creAted"] = '2002-12-'.(rand()%30+1);
+$record['num'] = 331;
+
+$conn->AutoExecute('ADOXYZ',$record,'UPDATE', "lastname like 'Sm%'");
+$rs = $conn->Execute("select * from ADOXYZ where lastname like 'Sm%'");
+//adodb_pr($rs);
+rs2html($rs);
+}
+
+
+testsql();
+?>
\ No newline at end of file
diff --git a/adodb/tests/test5.php b/adodb/tests/test5.php
new file mode 100644
index 0000000..f53ea23
--- /dev/null
+++ b/adodb/tests/test5.php
@@ -0,0 +1,47 @@
+debug=1;
+	$conn->PConnect("localhost","root","","xphplens");
+	print $conn->databaseType.':'.$conn->GenID().'
    ';
+}
+
+if (0) {
+	$conn = ADONewConnection("oci8");  // create a connection
+	$conn->debug=1;
+	$conn->PConnect("falcon", "scott", "tiger", "juris8.ecosystem.natsoft.com.my"); // connect to MySQL, testdb
+	print $conn->databaseType.':'.$conn->GenID();
+}
+
+if (0) {
+	$conn = ADONewConnection("ibase");  // create a connection
+	$conn->debug=1;
+	$conn->Connect("localhost:c:\\Interbase\\Examples\\Database\\employee.gdb", "sysdba", "masterkey", ""); // connect to MySQL, testdb
+	print $conn->databaseType.':'.$conn->GenID().'
    ';
+}
+
+if (0) {
+	$conn = ADONewConnection('postgres');
+	$conn->debug=1;
+	@$conn->PConnect("susetikus","tester","test","test");
+	print $conn->databaseType.':'.$conn->GenID().'
    ';
+}
+?>
diff --git a/adodb/tests/test_rs_array.php b/adodb/tests/test_rs_array.php
new file mode 100644
index 0000000..1de37b2
--- /dev/null
+++ b/adodb/tests/test_rs_array.php
@@ -0,0 +1,47 @@
+InitArray($array,$typearr);
+
+while (!$rs->EOF) {
+	print_r($rs->fields);echo "
    ";
+	$rs->MoveNext();
+}
+
+echo "
     1 Seek
    ";
+$rs->Move(1);
+while (!$rs->EOF) {
+	print_r($rs->fields);echo "
    ";
+	$rs->MoveNext();
+}
+
+echo "
     2 Seek
    ";
+$rs->Move(2);
+while (!$rs->EOF) {
+	print_r($rs->fields);echo "
    ";
+	$rs->MoveNext();
+}
+
+echo "
     3 Seek
    ";
+$rs->Move(3);
+while (!$rs->EOF) {
+	print_r($rs->fields);echo "
    ";
+	$rs->MoveNext();
+}
+
+
+
+die();
+?>
\ No newline at end of file
diff --git a/adodb/tests/testcache.php b/adodb/tests/testcache.php
new file mode 100644
index 0000000..35c1e77
--- /dev/null
+++ b/adodb/tests/testcache.php
@@ -0,0 +1,29 @@
+
+
+PConnect('nwind');
+} else {
+	$db = ADONewConnection('mysql');
+	$db->PConnect('mangrove','root','','xphplens');
+}
+if (isset($cache)) $rs = $db->CacheExecute(120,'select * from products');
+else $rs = $db->Execute('select * from products');
+
+$arr = $rs->GetArray();
+print sizeof($arr);
+?>
\ No newline at end of file
diff --git a/adodb/tests/testdatabases.inc.php b/adodb/tests/testdatabases.inc.php
new file mode 100644
index 0000000..fa355a3
--- /dev/null
+++ b/adodb/tests/testdatabases.inc.php
@@ -0,0 +1,454 @@
+
+
+
    
+
    
+> Access
    
+> Interbase
    
+> MSSQL
    
+ > MySQL
    
+> MySQL ODBC
    
+> MySQLi
+
    
+
    		> SQLite
    
+> MySQL Proxy
    
+> Oracle (oci8) 
    
+> PostgreSQL
    
+> PostgreSQL ODBC
    
+    		
+> PgSQL PDO
    
+> MySQL PDO
    
+> SQLite PDO
    
+> Access PDO
    
+> MSSQL PDO
    
+
+> OCI PDO
    
+
+    		> DB2
    
+> VFP+ODBTP
    
+> ADO (for mssql and access)
    
+> $ADODB_COUNTRECS=false
    
+> No SQL Logging
    
+> ADOdb time test
+
    
+
+
+
+FETCH MODE IS NOT ADODB_FETCH_DEFAULT";
+
+if (isset($nocountrecs)) $ADODB_COUNTRECS = false;
+
+// cannot test databases below, but we include them anyway to check
+// if they parse ok...
+
+if (sizeof($_GET) || !isset($_SERVER['HTTP_HOST'])) {
+	echo "
    ";
+	ADOLoadCode2("sybase"); 
+	ADOLoadCode2("postgres");
+	ADOLoadCode2("postgres7");
+	ADOLoadCode2("firebird");
+	ADOLoadCode2("borland_ibase");
+	ADOLoadCode2("informix");
+	ADOLoadCode2('mysqli');
+	if (defined('ODBC_BINMODE_RETURN')) {
+		ADOLoadCode2("sqlanywhere");
+		ADOLoadCode2("access");
+	}
+	ADOLoadCode2("mysql");
+	ADOLoadCode2("oci8");
+}
+
+function ADOLoadCode2($d)
+{
+	ADOLoadCode($d);
+	$c = ADONewConnection($d);
+	echo "Loaded $d ",($c ? 'ok' : 'extension not installed'),"
    ";
+}
+
+flush();
+if (!empty($testpostgres)) {
+	//ADOLoadCode("postgres");
+
+	$db = ADONewConnection('postgres');
+	print "
    Connecting $db->databaseType...
    ";
+	if ($db->Connect("localhost","tester","test","test")) {
+		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname varchar,created date)");
+	}else
+		print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.
    ".$db->ErrorMsg();
+}
+
+if (!empty($testpgodbc)) { 
+	
+	$db = ADONewConnection('odbc');
+	$db->hasTransactions = false;
+	print "
    Connecting $db->databaseType...
    ";
+	
+	if ($db->PConnect('Postgresql')) {
+		$db->hasTransactions = true;
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
+	} else print "ERROR: PostgreSQL requires a database called test on server, user tester, password test.
    ".$db->ErrorMsg();
+}
+
+if (!empty($testibase)) {
+	//$_GET['nolog'] = true;
+	$db = ADONewConnection('firebird');
+	print "
    Connecting $db->databaseType...
    ";
+	if ($db->PConnect("localhost:d:\\firebird\\151\\examples\\EMPLOYEE.fdb", "sysdba", "masterkey", ""))
+		testdb($db,"create table ADOXYZ (id integer, firstname char(24), lastname char(24),price numeric(12,2),created date)");
+	 else print "ERROR: Interbase test requires a database called employee.gdb".'
    '.$db->ErrorMsg();
+	
+}
+
+
+if (!empty($testsqlite)) {
+	$path =urlencode('d:\inetpub\adodb\sqlite.db');
+	$dsn = "sqlite://$path/";
+	$db = ADONewConnection($dsn);
+	//echo $dsn;
+	
+	//$db = ADONewConnection('sqlite');
+	
+
+	if ($db && $db->PConnect("d:\\inetpub\\adodb\\sqlite.db", "", "", "")) {
+		print "
    Connecting $db->databaseType...
    ";
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	} else 
+		print "ERROR: SQLite";
+	
+}
+
+if (!empty($testpdopgsql)) {
+	$connstr = "pgsql:dbname=test";
+	$u = 'tester';$p='test';
+	$db = ADONewConnection('pdo');
+	print "
    Connecting $db->databaseType...
    ";
+	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+	testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
+}
+
+if (!empty($testpdomysql)) {
+	$connstr = "mysql:dbname=northwind";
+	$u = 'root';$p='';
+	$db = ADONewConnection('pdo');
+	print "
    Connecting $db->databaseType...
    ";
+	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+	
+	testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
+}
+
+if (!empty($testpdomssql)) {
+	$connstr = "mssql:dbname=northwind";
+	$u = 'sa';$p='natsoft';
+	$db = ADONewConnection('pdo');
+	print "
    Connecting $db->databaseType...
    ";
+	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+	
+	testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
+}
+
+if (!empty($testpdosqlite)) {
+	$connstr = "sqlite:d:/inetpub/adodb/sqlite-pdo.db3";
+	$u = '';$p='';
+	$db = ADONewConnection('pdo');
+	$db->hasTransactions = false;
+	print "
    Connecting $db->databaseType...
    ";
+	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+	testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
+}
+
+if (!empty($testpdoaccess)) {
+	$connstr = 'odbc:nwind';
+	$u = '';$p='';
+	$db = ADONewConnection('pdo');
+	$db->hasTransactions = false;
+	print "
    Connecting $db->databaseType...
    ";
+	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+	testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
+}
+
+if (!empty($testpdoora)) {
+	$connstr = 'oci:';
+	$u = 'scott';$p='natsoft';
+	$db = ADONewConnection('pdo');
+	#$db->hasTransactions = false;
+	print "
    Connecting $db->databaseType...
    ";
+	$db->Connect($connstr,$u,$p) || die("CONNECT FAILED");
+	testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
+}
+
+// REQUIRES ODBC DSN CALLED nwind
+if (!empty($testaccess)) {
+	$db = ADONewConnection('access');
+	print "
    Connecting $db->databaseType...
    ";
+	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
+	$dsn = "nwind";
+	$dsn = "Driver={Microsoft Access Driver (*.mdb)};Dbq=$access;Uid=Admin;Pwd=;";
+	
+	//$dsn =  'Provider=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=' . $access . ';';
+	if ($db->PConnect($dsn, "", "", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	else print "ERROR: Access test requires a Windows ODBC DSN=nwind, Access driver";
+	
+}
+
+if (!empty($testaccess) && !empty($testado)) { // ADO ACCESS
+
+	$db = ADONewConnection("ado_access");
+	print "
    Connecting $db->databaseType...
    ";
+	
+	$access = 'd:\inetpub\wwwroot\php\NWIND.MDB';
+	$myDSN =  'PROVIDER=Microsoft.Jet.OLEDB.4.0;'
+		. 'DATA SOURCE=' . $access . ';';
+		//. 'USER ID=;PASSWORD=;';
+	$_GET['nolog'] = 1;
+	if ($db->PConnect($myDSN, "", "", "")) {
+		print "ADO version=".$db->_connectionID->version."
    ";
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	} else print "ERROR: Access test requires a Access database $access".'
    '.$db->ErrorMsg();
+	
+}
+
+if (!empty($testvfp)) { // ODBC
+	$db = ADONewConnection('vfp');
+	print "
    Connecting $db->databaseType...
    ";flush();
+
+	if ( $db->PConnect("vfp-adoxyz")) {
+		testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
+	 } else print "ERROR: Visual FoxPro test requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
+	
+	echo "
    ";
+	$db = ADONewConnection('odbtp');
+	
+	if ( $db->PConnect('localhost','DRIVER={Microsoft Visual FoxPro Driver};SOURCETYPE=DBF;SOURCEDB=d:\inetpub\adodb;EXCLUSIVE=NO;')) {
+	print "
    Connecting $db->databaseType...
    ";flush();
+	testdb($db,"create table d:\\inetpub\\adodb\\ADOXYZ (id int, firstname char(24), lastname char(24),created date)");
+	 } else print "ERROR: Visual FoxPro odbtp requires a Windows ODBC DSN=vfp-adoxyz, VFP driver";
+	
+}
+
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysql)) { // MYSQL
+
+
+	if (PHP_VERSION >= 5 || $_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
+	else $server = "mangrove";
+	$user = 'root'; $password = ''; $database = 'northwind';
+	$db = ADONewConnection("mysqlt://$user:$password@$server/$database?persist");
+	print "
    Connecting $db->databaseType...
    ";
+	
+	if (true || $db->PConnect($server, "root", "", "northwind")) {
+		//$db->Execute("DROP TABLE ADOXYZ") || die('fail drop');
+		//$db->debug=1;$db->Execute('drop table ADOXYZ');
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) Type=InnoDB");
+	} else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
+}
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysqli)) { // MYSQL
+
+	$db = ADONewConnection('mysqli');
+	print "
    Connecting $db->databaseType...
    ";
+	if (PHP_VERSION >= 5 || $_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
+	else $server = "mangrove";
+	if ($db->PConnect($server, "root", "", "northwind")) {
+		//$db->debug=1;$db->Execute('drop table ADOXYZ');
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)");
+	} else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
+}
+
+
+// REQUIRES MySQL server at localhost with database 'test'
+if (!empty($testmysqlodbc)) { // MYSQL
+	
+	$db = ADONewConnection('odbc');
+	$db->hasTransactions = false;
+	print "
    Connecting $db->databaseType...
    ";
+	if ($_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
+	else $server = "mangrove";
+	if ($db->PConnect('mysql', "root", ""))
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
+	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
+}
+
+if (!empty($testproxy)){
+	$db = ADONewConnection('proxy');
+	print "
    Connecting $db->databaseType...
    ";
+	if ($_SERVER['HTTP_HOST'] == 'localhost') $server = 'localhost';
+
+	if ($db->PConnect('http://localhost/php/phplens/adodb/server.php'))
+		testdb($db,
+		"create table ADOXYZ (id int, firstname char(24), lastname char(24), created date) type=innodb");
+	else print "ERROR: MySQL test requires a MySQL server on localhost, userid='admin', password='', database='test'".'
    '.$db->ErrorMsg();
+
+}
+
+ADOLoadCode('oci805');
+ADOLoadCode("oci8po");
+	
+if (!empty($testoracle)) {
+	$dsn = "oci8po";//://scott:natsoft@kk2?persist";
+	$db = ADONewConnection($dsn );//'oci8');
+	
+	//$db->debug=1;
+	print "
    Connecting $db->databaseType...
    ";
+	if ($db->Connect('192.168.0.138', "scott", "natsoft",'SID=natsoft'))
+		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+	else 
+		print "ERROR: Oracle test requires an Oracle server setup with scott/natsoft".'
    '.$db->ErrorMsg();
+
+}
+ADOLoadCode("oracle"); // no longer supported
+if (false && !empty($testoracle)) { 
+	
+	$db = ADONewConnection();
+	print "
    Connecting $db->databaseType...
    ";
+	if ($db->PConnect("", "scott", "tiger", "natsoft.domain"))
+		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+	else print "ERROR: Oracle test requires an Oracle server setup with scott/tiger".'
    '.$db->ErrorMsg();
+
+}
+
+ADOLoadCode("odbc_db2"); // no longer supported
+if (!empty($testdb2)) {
+	if (PHP_VERSION>=5.1) {
+		$db = ADONewConnection("db2");
+		print "
    Connecting $db->databaseType...
    ";
+		
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect('localhost','natsoft','guest','test')) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'
    '.$db->ErrorMsg();
+	} else { 
+		$db = ADONewConnection("odbc_db2");
+		print "
    Connecting $db->databaseType...
    ";
+		
+		$dsn = "db2test";
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect($dsn)) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'
    '.$db->ErrorMsg();
+	}
+echo "
    ";
+flush();
+	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";
+	
+	$db = ADONewConnection('odbtp');
+	if ($db->Connect('127.0.0.1',$dsn)) {
+		
+		$db->debug=1;
+		 $arr = $db->GetArray( "||SQLProcedures" ); adodb_pr($arr);
+	     $arr = $db->GetArray( "||SQLProcedureColumns|||GET_ROUTINE_SAR" );adodb_pr($arr);
+	
+		testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+	} else echo ("ERROR Connection");
+	echo $db->ErrorMsg();
+}
+
+
+$server = 'localhost';
+
+
+
+ADOLoadCode("mssqlpo");
+if (false && !empty($testmssql)) { // MS SQL Server -- the extension is buggy -- probably better to use ODBC
+	$db = ADONewConnection("mssqlpo");
+	//$db->debug=1;
+	print "
    Connecting $db->databaseType...
    ";
+	
+	$ok = $db->Connect('','sa','natsoft','northwind');
+	echo $db->ErrorMsg();
+	if ($ok /*or $db->PConnect("mangrove", "sa", "natsoft", "ai")*/) {
+		AutoDetect_MSSQL_Date_Order($db);
+	//	$db->Execute('drop table adoxyz');
+		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
+	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='$server', userid='adodb', password='natsoft', database='ai'".'
    '.$db->ErrorMsg();
+	
+}
+
+
+ADOLoadCode('odbc_mssql');
+if (!empty($testmssql)) { // MS SQL Server via ODBC
+	$db = ADONewConnection();
+	
+	print "
    Connecting $db->databaseType...
    ";
+	
+	$dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=$server;Database=northwind;";
+	$dsn = 'condor';
+	if ($db->PConnect($dsn, "sa", "natsoft", ""))  {
+		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
+	}
+	else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with DSN setup";
+
+}
+
+ADOLoadCode("ado_mssql");
+if (!empty($testmssql) && !empty($testado) ) { // ADO ACCESS MSSQL -- thru ODBC -- DSN-less
+	
+	$db = ADONewConnection("ado_mssql");
+	//$db->debug=1;
+	print "
    Connecting DSN-less $db->databaseType...
    ";
+	
+	$myDSN="PROVIDER=MSDASQL;DRIVER={SQL Server};"
+		. "SERVER=$server;DATABASE=NorthWind;UID=adodb;PWD=natsoft;Trusted_Connection=No";
+
+		
+	if ($db->PConnect($myDSN, "", "", ""))
+		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
+	else print "ERROR: MSSQL test 2 requires MS SQL 7";
+	
+}
+
+if (!empty($testmssql) && !empty($testado)) { // ADO ACCESS MSSQL with OLEDB provider
+
+	$db = ADONewConnection("ado_mssql");
+	print "
    Connecting DSN-less OLEDB Provider $db->databaseType...
    ";
+	//$db->debug=1;
+	$myDSN="SERVER=localhost;DATABASE=northwind;Trusted_Connection=yes";
+	if ($db->PConnect($myDSN, "adodb", "natsoft", 'SQLOLEDB')) {
+		testdb($db,"create table ADOXYZ (id int, firstname char(24), lastname char(24),created datetime)");
+	} else print "ERROR: MSSQL test 2 requires a MS SQL 7 on a server='mangrove', userid='sa', password='', database='ai'";
+
+}
+
+
+if (extension_loaded('odbtp') && !empty($testmssql)) { // MS SQL Server via ODBC
+	$db = ADONewConnection('odbtp');
+	
+	$dsn = "PROVIDER=MSDASQL;Driver={SQL Server};Server=$server;Database=northwind;uid=adodb;pwd=natsoft";
+	
+	if ($db->PConnect('localhost',$dsn, "", ""))  {
+		print "
    Connecting $db->databaseType...
    ";				
+		testdb($db,"create table ADOXYZ (id int, firstname char(24) null, lastname char(24) null,created datetime null)");
+	}
+	else print "ERROR: MSSQL test 1 requires a MS SQL 7 server setup with DSN setup";
+
+}
+
+
+print "
    Tests Completed
    ";
+
+?>
diff --git a/adodb/tests/testgenid.php b/adodb/tests/testgenid.php
new file mode 100644
index 0000000..14b48ce
--- /dev/null
+++ b/adodb/tests/testgenid.php
@@ -0,0 +1,36 @@
+Execute("drop table $table");
+	//$db->debug=true;
+	
+	$ctr = 5000;
+	$lastnum = 0;
+	
+	while (--$ctr >= 0) {
+		$num = $db->GenID($table);
+		if ($num === false) {	
+			print "GenID returned false";
+			break;
+		}
+		if ($lastnum + 1 == $num) print " $num ";
+		else {
+			print " $num ";
+			flush();
+		}
+		$lastnum = $num;
+	}
+}
+?>
\ No newline at end of file
diff --git a/adodb/tests/testmssql.php b/adodb/tests/testmssql.php
new file mode 100644
index 0000000..f502632
--- /dev/null
+++ b/adodb/tests/testmssql.php
@@ -0,0 +1,76 @@
+Connect('127.0.0.1','adodb','natsoft','northwind') or die('Fail');
+
+$conn->debug =1;
+$query = 'select * from products';
+$conn->SetFetchMode(ADODB_FETCH_ASSOC);
+$rs = $conn->Execute($query);
+echo "
    ";
+while( !$rs->EOF ) {
+	$output[] = $rs->fields;
+	var_dump($rs->fields);
+	$rs->MoveNext();
+	print "
    ";
+}
+die();
+
+
+$p = $conn->Prepare('insert into products (productname,unitprice,dcreated) values (?,?,?)');
+echo "
    ";
+print_r($p);
+
+$conn->debug=1;
+$conn->Execute($p,array('John'.rand(),33.3,$conn->DBDate(time())));
+
+$p = $conn->Prepare('select * from products where productname like ?');
+$arr = $conn->getarray($p,array('V%'));
+print_r($arr);
+die();
+
+//$conn = ADONewConnection("mssql");
+//$conn->Connect('mangrove','sa','natsoft','ai');
+
+//$conn->Connect('mangrove','sa','natsoft','ai');
+$conn->debug=1;
+$conn->Execute('delete from blobtest');
+
+$conn->Execute('insert into blobtest (id) values(1)');
+$conn->UpdateBlobFile('blobtest','b1','../cute_icons_for_site/adodb.gif','id=1');
+$rs = $conn->Execute('select b1 from blobtest where id=1');
+
+$output = "c:\\temp\\test_out-".date('H-i-s').".gif"; 
+print "Saving file $output, size=".strlen($rs->fields[0])."
    ";
+$fd = fopen($output, "wb"); 
+fwrite($fd, $rs->fields[0]); 
+fclose($fd); 
+
+print " View Image";
+//$rs = $conn->Execute('SELECT id,SUBSTRING(b1, 1, 10) FROM blobtest');
+//rs2html($rs);
+?>
\ No newline at end of file
diff --git a/adodb/tests/testoci8.php b/adodb/tests/testoci8.php
new file mode 100644
index 0000000..dc0663e
--- /dev/null
+++ b/adodb/tests/testoci8.php
@@ -0,0 +1,83 @@
+
+
+PConnect('','scott','natsoft');
+	if (!empty($testblob)) {
+		$varHoldingBlob = 'ABC DEF GEF John TEST';
+		$num = time()%10240;
+		// create table atable (id integer, ablob blob);
+		$db->Execute('insert into ATABLE (id,ablob) values('.$num.',empty_blob())');
+		$db->UpdateBlob('ATABLE', 'ablob', $varHoldingBlob, 'id='.$num, 'BLOB');
+		
+		$rs = $db->Execute('select * from atable');
+		
+		if (!$rs) die("Empty RS");
+		if ($rs->EOF) die("EOF RS");
+		rs2html($rs);
+	}
+	$stmt = $db->Prepare('select * from adoxyz where id=?');
+	for ($i = 1; $i <= 10; $i++) {
+	$rs = $db->Execute(
+		$stmt,
+		array($i));
+			
+		if (!$rs) die("Empty RS");
+		if ($rs->EOF) die("EOF RS");
+		rs2html($rs);
+	}
+}
+if (1) {
+	$db = ADONewConnection('oci8');
+	$db->PConnect('','scott','natsoft');
+	$db->debug = true;
+	$db->Execute("delete from emp where ename='John'");
+	print $db->Affected_Rows().'
    ';
+	$stmt = $db->Prepare('insert into emp (empno, ename) values (:empno, :ename)');
+	$rs = $db->Execute($stmt,array('empno'=>4321,'ename'=>'John'));
+	// prepare not quite ready for prime time
+	//$rs = $db->Execute($stmt,array('empno'=>3775,'ename'=>'John'));
+	if (!$rs) die("Empty RS");
+	
+	$db->setfetchmode(ADODB_FETCH_NUM);
+	
+	$vv = 'A%';
+	$stmt = $db->PrepareSP("BEGIN adodb.open_tab2(:rs,:tt); END;",true);
+	$db->OutParameter($stmt, $cur, 'rs', -1, OCI_B_CURSOR);
+	$db->OutParameter($stmt, $vv, 'tt');
+	$rs = $db->Execute($stmt);
+	while (!$rs->EOF) {
+		adodb_pr($rs->fields);
+		$rs->MoveNext();
+	}
+	echo " val = $vv";
+
+}
+
+if (0) {
+	$db = ADONewConnection('odbc_oracle');
+	if (!$db->PConnect('local_oracle','scott','tiger')) die('fail connect');
+	$db->debug = true;
+	$rs = $db->Execute(
+		'select * from adoxyz where firstname=? and trim(lastname)=?',
+		array('first'=>'Caroline','last'=>'Miranda'));
+	if (!$rs) die("Empty RS");
+	if ($rs->EOF) die("EOF RS");
+	rs2html($rs);
+}
+?>
\ No newline at end of file
diff --git a/adodb/tests/testoci8cursor.php b/adodb/tests/testoci8cursor.php
new file mode 100644
index 0000000..e88c8b6
--- /dev/null
+++ b/adodb/tests/testoci8cursor.php
@@ -0,0 +1,111 @@
+PConnect('','scott','natsoft');
+	$db->debug = 99;
+
+
+/*
+*/
+
+	define('MYNUM',5);
+	
+
+	$rs = $db->ExecuteCursor("BEGIN adodb.open_tab(:RS,'A%'); END;");
+	
+	if ($rs && !$rs->EOF) {
+		print "Test 1 RowCount: ".$rs->RecordCount()."
    ";
+	} else {
+		print "Error in using Cursor Variables 1
    ";
+	}
+	
+	print "
    Testing Stored Procedures for oci8
    ";
+	
+	$stid = $db->PrepareSP('BEGIN adodb.myproc('.MYNUM.', :myov); END;');
+	$db->OutParameter($stid, $myov, 'myov');
+	$db->Execute($stid);
+	if ($myov != MYNUM) print "
    Error with myproc
    ";
+	
+	
+	$stmt = $db->PrepareSP("BEGIN adodb.data_out(:a1, :a2); END;",true);
+	$a1 = 'Malaysia';
+	//$a2 = ''; # a2 doesn't even need to be defined!
+	$db->InParameter($stmt,$a1,'a1');
+	$db->OutParameter($stmt,$a2,'a2');
+	$rs = $db->Execute($stmt);
+	if ($rs) {
+		if ($a2 !== 'Cinta Hati Malaysia') print "Stored Procedure Error: a2 = $a2
    ";
+		else echo  "OK: a2=$a2
    ";
+	} else {
+		print "Error in using Stored Procedure IN/Out Variables
    ";
+	}
+	
+	
+	$tname = 'A%';
+	
+	$stmt = $db->PrepareSP('select * from tab where tname like :tablename');
+	$db->Parameter($stmt,$tname,'tablename');
+	$rs = $db->Execute($stmt);
+	rs2html($rs);
+		
+		
+?>
\ No newline at end of file
diff --git a/adodb/tests/testpaging.php b/adodb/tests/testpaging.php
new file mode 100644
index 0000000..b0433ce
--- /dev/null
+++ b/adodb/tests/testpaging.php
@@ -0,0 +1,86 @@
+PConnect('localhost','tester','test','test');
+}
+
+if ($driver == 'access') {
+	$db = NewADOConnection('access');
+	$db->PConnect("nwind", "", "", "");
+}
+
+if ($driver == 'ibase') {
+	$db = NewADOConnection('ibase');
+	$db->PConnect("localhost:e:\\firebird\\examples\\employee.gdb", "sysdba", "masterkey", "");
+	$sql = 'select distinct firstname, lastname  from adoxyz  order  by  firstname';
+
+}
+if ($driver == 'mssql') {
+	$db = NewADOConnection('mssql');
+	$db->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
+}
+if ($driver == 'oci8') {
+	$db = NewADOConnection('oci8');
+	$db->Connect('','scott','natsoft');
+	
+$sql = "select * from (select  ID, firstname as \"First Name\", lastname as \"Last Name\" from adoxyz 
+	 order  by  1)";
+}
+
+if ($driver == 'access') {
+	$db = NewADOConnection('access');
+	$db->Connect('nwind');
+}
+
+if (empty($driver) or $driver == 'mysql') {
+	$db = NewADOConnection('mysql');
+	$db->Connect('localhost','root','','test');
+}
+
+//$db->pageExecuteCountRows = false;
+
+$db->debug = true;
+
+if (0) {
+$rs = $db->Execute($sql);
+include_once('../toexport.inc.php');
+print "
    ";
+print rs2csv($rs); # return a string
+
+print '
    ';
+$rs->MoveFirst(); # note, some databases do not support MoveFirst
+print rs2tab($rs); # return a string
+
+print '
    ';
+$rs->MoveFirst();
+rs2tabout($rs); # send to stdout directly
+print "
    ";
+}
+
+$pager = new ADODB_Pager($db,$sql);
+$pager->showPageLinks = true;
+$pager->linksPerPage = 10;
+$pager->cache = 60;
+$pager->Render($rows=7);
+?>
\ No newline at end of file
diff --git a/adodb/tests/testpear.php b/adodb/tests/testpear.php
new file mode 100644
index 0000000..dd06318
--- /dev/null
+++ b/adodb/tests/testpear.php
@@ -0,0 +1,34 @@
+setFetchMode(ADODB_FETCH_ASSOC);
+$rs = $db->Query('select firstname,lastname from adoxyz');
+$cnt = 0;
+while ($arr = $rs->FetchRow()) {
+	print_r($arr);
+	print "
    ";
+	$cnt += 1;
+}
+
+if ($cnt != 50) print "Error in \$cnt = $cnt";
+?>
\ No newline at end of file
diff --git a/adodb/tests/testsessions.php b/adodb/tests/testsessions.php
new file mode 100644
index 0000000..5c2d32d
--- /dev/null
+++ b/adodb/tests/testsessions.php
@@ -0,0 +1,98 @@
+Notify Expiring=$ref, sessionkey=$key
    ";
+}
+
+//-------------------------------------------------------------------
+	
+error_reporting(E_ALL);
+
+
+ob_start();
+include('../session/adodb-cryptsession2.php');
+
+$options['debug'] = 1;
+$db = 'oci8';
+
+#### CONNECTION
+switch($db) {
+case 'oci8': 
+	$options['table'] = 'adodb_sessions2';
+	ADOdb_Session::config('oci8', '', 'jcollect_bkrm', 'natsoft', '',$options);
+	break;
+
+case 'postgres':
+	$options['table'] = 'sessions2';
+	ADOdb_Session::config('postgres', 'localhost', 'tester', 'test', 'test',$options);
+	break;
+	
+case 'mysql':
+default:
+	$options['table'] = 'sessions2';
+	ADOdb_Session::config('mysql', 'localhost', 'root', '', 'xphplens_2',$options);
+	break;
+
+
+}
+	
+
+	
+#### SETUP NOTIFICATION
+	$USER = 'JLIM'.rand();
+	$ADODB_SESSION_EXPIRE_NOTIFY = array('USER','NotifyExpire');
+
+	adodb_session_create_table();
+	session_start();
+
+	adodb_session_regenerate_id();
+	
+### SETUP SESSION VARIABLES 
+	if (empty($_SESSION['MONKEY'])) $_SESSION['MONKEY'] = array(1,'abc',44.41);
+	else $_SESSION['MONKEY'][0] += 1;
+	if (!isset($_GET['nochange'])) @$_SESSION['AVAR'] += 1;
+
+	
+### START DISPLAY
+	print "
    PHP ".PHP_VERSION."
    ";
+	print "
    \$_SESSION['AVAR']={$_SESSION['AVAR']}
    ";
+	
+	print "
     Cookies: ";
+	print_r($_COOKIE);
+	
+	var_dump($_SESSION['MONKEY']);
+	
+### RANDOMLY PERFORM Garbage Collection
+### In real-production environment, this is done for you
+### by php's session extension, which calls adodb_sess_gc()
+### automatically for you. See php.ini's
+### session.cookie_lifetime and session.gc_probability
+
+	if (rand() % 5 == 0) {
+	
+		print "
    Garbage Collection
    ";
+		adodb_sess_gc(10);
+		
+		if (rand() % 2 == 0) {
+			print "
    Random own session destroy
    ";
+			session_destroy();
+		}
+	} else {
+		$DB = ADODB_Session::_conn();
+		$sessk = $DB->qstr('%AZ'.rand().time());
+		$olddate = $DB->DBTimeStamp(time()-30*24*3600);
+		$rr = $DB->qstr(rand());
+		$DB->Execute("insert into {$options['table']} (sesskey,expiry,expireref,sessdata,created,modified) values ($sessk,$olddate, $rr,'',$olddate,$olddate)");
+	}
+?>
\ No newline at end of file
diff --git a/adodb/tests/time.php b/adodb/tests/time.php
new file mode 100644
index 0000000..65e9e08
--- /dev/null
+++ b/adodb/tests/time.php
@@ -0,0 +1,18 @@
+
+" );
+echo( "Converted: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
+
+?>
\ No newline at end of file
diff --git a/adodb/tests/tmssql.php b/adodb/tests/tmssql.php
new file mode 100644
index 0000000..4975787
--- /dev/null
+++ b/adodb/tests/tmssql.php
@@ -0,0 +1,80 @@
+mssql";
+	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
+	mssql_select_db('northwind',$db);
+	
+	$rs = mssql_query('select getdate() as date',$db);
+	$o = mssql_fetch_row($rs);
+	print_r($o);
+	mssql_free_result($rs);
+	
+	print "
    Delete
    "; flush();
+	$rs2 = mssql_query('delete from adoxyz',$db);
+	$p = mssql_num_rows($rs2);
+	mssql_free_result($rs2);
+
+}
+
+function tpear()
+{
+include_once('DB.php');
+
+	print "
    PEAR
    ";
+	$username = 'adodb';
+	$password = 'natsoft';
+	$hostname = 'JAGUAR\vsdotnet';
+	$databasename = 'northwind';
+	
+	$dsn = "mssql://$username:$password@$hostname/$databasename";
+	$conn = DB::connect($dsn);
+	print "date=".$conn->GetOne('select getdate()')."
    ";
+	@$conn->query('create table tester (id integer)');
+	print "
    Delete
    "; flush();
+	$rs = $conn->query('delete from tester');
+	print "date=".$conn->GetOne('select getdate()')."
    ";
+}
+
+function tadodb()
+{
+include_once('../adodb.inc.php');
+
+	print "
    ADOdb
    ";
+	$conn = NewADOConnection('mssql');
+	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
+//	$conn->debug=1;
+	print "date=".$conn->GetOne('select getdate()')."
    ";
+	$conn->Execute('create table tester (id integer)');
+	print "
    Delete
    "; flush();
+	$rs = $conn->Execute('delete from tester');
+	print "date=".$conn->GetOne('select getdate()')."
    ";
+}
+
+
+$ACCEPTIP = '127.0.0.1';
+
+$remote = $_SERVER["REMOTE_ADDR"]; 
+
+if (!empty($ACCEPTIP))
+ if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
+ 	die("Unauthorised client: '$remote'");
+	
+?>
+mssql
+pear
+adodb
+
\ No newline at end of file
diff --git a/adodb/tests/xmlschema-mssql.xml b/adodb/tests/xmlschema-mssql.xml
new file mode 100644
index 0000000..db2c343
--- /dev/null
+++ b/adodb/tests/xmlschema-mssql.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+id
+
+
+id
+
+
+
+
    
+  
+    SQL to be executed only on specific platforms
+    
+      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
+    
+    
+      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
+    
+	
+      INSERT into simple_table ( name, description ) values ( '12', 'Microsoft stuff' )
+    
+  
+    
\ No newline at end of file
diff --git a/adodb/tests/xmlschema.xml b/adodb/tests/xmlschema.xml
new file mode 100644
index 0000000..ea48ae2
--- /dev/null
+++ b/adodb/tests/xmlschema.xml
@@ -0,0 +1,33 @@
+
+
+  
+    
+      An integer row that's a primary key and autoincrements
+      
+      
+    
+    
+      A 16 character varchar row that can't be null
+      
+    
+    
+      row1
+      row2
+    
+  
    
+  
+    SQL to be executed only on specific platforms
+    
+      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
+    
+    
+      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
+    
+	
+      insert into mytable ( row1, row2 ) values ( 12, 'Microsoft stuff' )
+    
+  
+  
+    
+  
    
+    
\ No newline at end of file
diff --git a/adodb/toexport.inc.php b/adodb/toexport.inc.php
new file mode 100644
index 0000000..6975b51
--- /dev/null
+++ b/adodb/toexport.inc.php
@@ -0,0 +1,134 @@
+FieldTypesArray();
+		reset($fieldTypes);
+		$i = 0;
+		while(list(,$o) = each($fieldTypes)) {
+		
+			$v = ($o) ? $o->name : 'Field'.($i++);
+			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
+			$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+			$elements[] = $v;
+			
+		}
+		$s .= implode($sep, $elements).$NEWLINE;
+	}
+	$hasNumIndex = isset($rs->fields[0]);
+	
+	$line = 0;
+	$max = $rs->FieldCount();
+	
+	while (!$rs->EOF) {
+		$elements = array();
+		$i = 0;
+		
+		if ($hasNumIndex) {
+			for ($j=0; $j < $max; $j++) {
+				$v = $rs->fields[$j];
+				if (!is_object($v)) $v = trim($v);
+				else $v = 'Object';
+				if ($escquote) $v = str_replace($quote,$escquotequote,$v);
+				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+				
+				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+				else $elements[] = $v;
+			}
+		} else { // ASSOCIATIVE ARRAY
+			foreach($rs->fields as $v) {
+				if ($escquote) $v = str_replace($quote,$escquotequote,trim($v));
+				$v = strip_tags(str_replace("\n", $replaceNewLine, str_replace("\r\n",$replaceNewLine,str_replace($sep,$sepreplace,$v))));
+				
+				if (strpos($v,$sep) !== false || strpos($v,$quote) !== false) $elements[] = "$quote$v$quote";
+				else $elements[] = $v;
+			}
+		}
+		$s .= implode($sep, $elements).$NEWLINE;
+		$rs->MoveNext();
+		$line += 1;
+		if ($fp && ($line % $BUFLINES) == 0) {
+			if ($fp === true) echo $s;
+			else fwrite($fp,$s);
+			$s = '';
+		}
+	}
+	
+	if ($fp) {
+		if ($fp === true) echo $s;
+		else fwrite($fp,$s);
+		$s = '';
+	}
+	
+	return $s;
+}
+?>
\ No newline at end of file
diff --git a/adodb/tohtml.inc.php b/adodb/tohtml.inc.php
new file mode 100644
index 0000000..7624566
--- /dev/null
+++ b/adodb/tohtml.inc.php
@@ -0,0 +1,201 @@
+
+*/ 
+
+// specific code for tohtml
+GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
+
+$ADODB_ROUND=4; // rounding
+$gSQLMaxRows = 1000; // max no of rows to download
+$gSQLBlockRows=20; // max no of rows per table block
+
+// RecordSet to HTML Table
+//------------------------------------------------------------
+// Convert a recordset to a html table. Multiple tables are generated
+// if the number of rows is > $gSQLBlockRows. This is because
+// web browsers normally require the whole table to be downloaded
+// before it can be rendered, so we break the output into several
+// smaller faster rendering tables.
+//
+// $rs: the recordset
+// $ztabhtml: the table tag attributes (optional)
+// $zheaderarray: contains the replacement strings for the headers (optional)
+//
+//  USAGE:
+//	include('adodb.inc.php');
+//	$db = ADONewConnection('mysql');
+//	$db->Connect('mysql','userid','password','database');
+//	$rs = $db->Execute('select col1,col2,col3 from table');
+//	rs2html($rs, 'BORDER=2', array('Title1', 'Title2', 'Title3'));
+//	$rs->Close();
+//
+// RETURNS: number of rows displayed
+
+
+function rs2html(&$rs,$ztabhtml=false,$zheaderarray=false,$htmlspecialchars=true,$echo = true)
+{
+$s ='';$rows=0;$docnt = false;
+GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
+
+	if (!$rs) {
+		printf(ADODB_BAD_RS,'rs2html');
+		return false;
+	}
+	
+	if (! $ztabhtml) $ztabhtml = "BORDER='1' WIDTH='98%'";
+	//else $docnt = true;
+	$typearr = array();
+	$ncols = $rs->FieldCount();
+	$hdr = "\n\n";
+	for ($i=0; $i < $ncols; $i++) {	
+		$field = $rs->FetchField($i);
+		if ($field) {
+			if ($zheaderarray) $fname = $zheaderarray[$i];
+			else $fname = htmlspecialchars($field->name);	
+			$typearr[$i] = $rs->MetaType($field->type,$field->max_length);
+ 			//print " $field->name $field->type $typearr[$i] ";
+		} else {
+			$fname = 'Field '.($i+1);
+			$typearr[$i] = 'C';
+		}
+		if (strlen($fname)==0) $fname = ' ';
+		$hdr .= "";
+	}
+	$hdr .= "\n";
+	if ($echo) print $hdr."\n\n";
+	else $html = $hdr;
+	
+	// smart algorithm - handles ADODB_FETCH_MODE's correctly by probing...
+	$numoffset = isset($rs->fields[0]) ||isset($rs->fields[1]) || isset($rs->fields[2]);
+	while (!$rs->EOF) {
+		
+		$s .= "\n";
+		
+		for ($i=0; $i < $ncols; $i++) {
+			if ($i===0) $v=($numoffset) ? $rs->fields[0] : reset($rs->fields);
+			else $v = ($numoffset) ? $rs->fields[$i] : next($rs->fields);
+			
+			$type = $typearr[$i];
+			switch($type) {
+			case 'D':
+				if (strpos($v,':') !== false);
+				else {
+					if (empty($v)) {
+					$s .= "\n";
+					} else {
+						$s .= "	\n";				
+					}
+					break;
+				}
+			case 'T':
+				if (empty($v)) $s .= "\n";
+				else $s .= "	\n";
+			break;
+			
+			case 'N':
+				if (abs(abs($v) - round($v,0)) < 0.00000001)
+					$v = round($v);
+				else
+					$v = round($v,$ADODB_ROUND);
+			case 'I':
+				$vv = stripslashes((trim($v)));
+				if (strlen($vv) == 0) $vv .= ' ';
+				$s .= "	\n";
+			   	
+			break;
+			/*
+			case 'B':
+				if (substr($v,8,2)=="BM" ) $v = substr($v,8);
+				$mtime = substr(str_replace(' ','_',microtime()),2);
+				$tmpname = "tmp/".uniqid($mtime).getmypid();
+				$fd = @fopen($tmpname,'a');
+				@ftruncate($fd,0);
+				@fwrite($fd,$v);
+				@fclose($fd);
+				if (!function_exists ("mime_content_type")) {
+				  function mime_content_type ($file) {
+				    return exec("file -bi ".escapeshellarg($file));
+				  }
+				}
+				$t = mime_content_type($tmpname);
+				$s .= (substr($t,0,5)=="image") ? " \\n" : " \\n";
+				break;
+			*/
+
+			default:
+				if ($htmlspecialchars) $v = htmlspecialchars(trim($v));
+				$v = trim($v);
+				if (strlen($v) == 0) $v = ' ';
+				$s .= "	\n";
+			  
+			}
+		} // for
+		$s .= "\n\n";
+			  
+		$rows += 1;
+		if ($rows >= $gSQLMaxRows) {
+			$rows = "
    Truncated at $gSQLMaxRows
    ";
+			break;
+		} // switch
+
+		$rs->MoveNext();
+	
+	// additional EOF check to prevent a widow header
+		if (!$rs->EOF && $rows % $gSQLBlockRows == 0) {
+	
+		//if (connection_aborted()) break;// not needed as PHP aborts script, unlike ASP
+			if ($echo) print $s . "
    $fname
       ".$rs->UserDate($v,"D d, M Y") ."   ".$rs->UserTimeStamp($v,"D d, M Y, H:i:s") ."".$vv ."$t$t". str_replace("\n",'
    ',stripslashes($v)) ."
    \n\n";
+			else $html .= $s ."\n\n";
+			$s = $hdr;
+		}
+	} // while
+
+	if ($echo) print $s."\n\n";
+	else $html .= $s."\n\n";
+	
+	if ($docnt) if ($echo) print "
    ".$rows." Rows
    ";
+	
+	return ($echo) ? $rows : $html;
+ }
+ 
+// pass in 2 dimensional array
+function arr2html(&$arr,$ztabhtml='',$zheaderarray='')
+{
+	if (!$ztabhtml) $ztabhtml = 'BORDER=1';
+	
+	$s = "";//';print_r($arr);
+
+	if ($zheaderarray) {
+		$s .= '';
+		for ($i=0; $i\n";
+		} else $s .= "	\n";
+		$s .= "\n\n";
+	}
+	$s .= '
     
    ';
+	print $s;
+}
+
+?>
\ No newline at end of file
diff --git a/adodb/xmlschema.dtd b/adodb/xmlschema.dtd
new file mode 100644
index 0000000..4a055da
--- /dev/null
+++ b/adodb/xmlschema.dtd
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+] >
\ No newline at end of file
diff --git a/adodb/xmlschema03.dtd b/adodb/xmlschema03.dtd
new file mode 100644
index 0000000..a7c8864
--- /dev/null
+++ b/adodb/xmlschema03.dtd
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+]>
\ No newline at end of file
diff --git a/adodb/xsl/convert-0.1-0.2.xsl b/adodb/xsl/convert-0.1-0.2.xsl
new file mode 100644
index 0000000..6cd9e5b
--- /dev/null
+++ b/adodb/xsl/convert-0.1-0.2.xsl
@@ -0,0 +1,205 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+			0.2
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+			
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/convert-0.1-0.3.xsl b/adodb/xsl/convert-0.1-0.3.xsl
new file mode 100644
index 0000000..381aa4f
--- /dev/null
+++ b/adodb/xsl/convert-0.1-0.3.xsl
@@ -0,0 +1,221 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+			0.3
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+				
+			
+			
+			
+				
+				
+					
+				
+				
+					
+						
+					
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+			
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/convert-0.2-0.1.xsl b/adodb/xsl/convert-0.2-0.1.xsl
new file mode 100644
index 0000000..61841b4
--- /dev/null
+++ b/adodb/xsl/convert-0.2-0.1.xsl
@@ -0,0 +1,207 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+			0.1
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+			
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/convert-0.2-0.3.xsl b/adodb/xsl/convert-0.2-0.3.xsl
new file mode 100644
index 0000000..26bd9e9
--- /dev/null
+++ b/adodb/xsl/convert-0.2-0.3.xsl
@@ -0,0 +1,281 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+			0.3
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+				
+			
+			
+			
+				
+					
+						
+					
+				
+				
+					
+				
+				
+					
+						
+					
+					
+				
+				
+					
+					
+						
+					
+				
+			
+			
+			
+			
+			
+				
+					
+				
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+			
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+			
+			
+				
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+					
+				
+				
+					
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+				
+			
+			
+			
+				
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/remove-0.2.xsl b/adodb/xsl/remove-0.2.xsl
new file mode 100644
index 0000000..9b10a52
--- /dev/null
+++ b/adodb/xsl/remove-0.2.xsl
@@ -0,0 +1,54 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+Uninstallation Schema
+
+		
+		
+			0.2
+			
+			
+				
+			
+		
+	
+	
+	
+	
+		
+			
+				
+				
+				
+					
+				
+				
+				
+					
+				
+				
+				
+				
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/adodb/xsl/remove-0.3.xsl b/adodb/xsl/remove-0.3.xsl
new file mode 100644
index 0000000..768e092
--- /dev/null
+++ b/adodb/xsl/remove-0.3.xsl
@@ -0,0 +1,54 @@
+
+
+	
+	
+	
+	
+		
+ADODB XMLSchema
+http://adodb-xmlschema.sourceforge.net
+
+		
+		
+Uninstallation Schema
+
+		
+		
+			0.3
+			
+			
+				
+			
+		
+	
+	
+	
+	
+		
+			
+				
+				
+				
+					
+				
+				
+				
+					
+				
+				
+				
+				
+				
+			
+		
+	
+	
+	
+	
+		
+			
+		
+	
+
\ No newline at end of file
diff --git a/apropos.php b/apropos.php
index 425abc7..6c3f28f 100644
--- a/apropos.php
+++ b/apropos.php
@@ -41,80 +41,74 @@ session_start();
 
 include_once('variables.php');
 include_once( 'i18n.php' );
-if (file_exists('bandeaux_local.php'))
-	include_once('bandeaux_local.php');
-else
-	include_once('bandeaux.php');
+if (file_exists('bandeaux_local.php')) {
+  include_once('bandeaux_local.php');
+} else {
+  include_once('bandeaux.php');
+}
 
-	//affichage de la page
-	echo ''."\n";
-	echo ''."\n";
-	echo ''."\n";
-	echo ''."\n";
-	echo ''.NOMAPPLICATION.''."\n";
-	echo ''."\n";
-	echo ''."\n";
-	echo ''."\n";
+//affichage de la page
+echo ''."\n";
+echo ''."\n";
+echo ''."\n";
+echo ''."\n";
+echo ''.NOMAPPLICATION.''."\n";
+echo ''."\n";
+echo ''."\n";
+echo ''."\n";
 
-    //debut du formulaire
-    echo '
    '."\n";
+//debut du formulaire
+echo ''."\n";
 
-	//bandeaux de tete
-	logo();
-	bandeau_tete();
+//bandeaux de tete
+logo();
+bandeau_tete();
 bandeau_titre(_("About"));
-	sous_bandeau();
+sous_bandeau();
 
-	//blablabla
-	echo '
    '."\n";
+echo '
    '."\n";
 
-	if (NOMAPPLICATION!="STUdS !"){
-		echo 'Application d\'origine

    '."\n";
-		echo 'L\'application '.NOMAPPLICATION.' est une instance du logiciel STUdS ! développé à l\'Université de Strasbourg depuis 2008.

    '."\n";
-	}
+if (NOMAPPLICATION!="STUdS !") {
+  echo 'Application d\'origine

    '."\n";
+  echo 'L\'application '.NOMAPPLICATION.' est une instance du logiciel STUdS ! développé à l\'Université de Strasbourg depuis 2008.

    '."\n";
+}
 
-	echo 'Licence Logicielle de '.NOMAPPLICATION.'

    '."\n";
-	echo NOMAPPLICATION.' est placé sous la licence logicielle libre CeCILL-B.

    '."\n";
+echo 'Licence Logicielle de '.NOMAPPLICATION.'

    '."\n";
+echo NOMAPPLICATION.' est placé sous la licence logicielle libre CeCILL-B.

    '."\n";
 
-	echo 'Technologies utilisées

    '."\n";
-	echo '- PHP
    '."\n";
-	echo '- PostgreSQL
    '."\n";
-	echo '- Apache
    '."\n";
-	echo '- Subversion
    '."\n";
-	echo '- iCalcreator
    '."\n";
-	echo '- FPDF
    '."\n";
-	echo '- Icônes : Deleket, PixelMixer et DryIcons

    '."\n";
-	
-	echo 'Compatibilités des navigateurs

    '."\n";
-	echo '- Firefox
    '."\n";
-	echo '- Opéra
    '."\n";
-	echo '- Konqueror
    '."\n";
-	echo '- Links
    '."\n";
-	echo '- Safari
    '."\n";
-	echo '- IE

    '."\n";
+echo 'Technologies utilisées

    '."\n";
+echo '- PHP
    '."\n";
+echo '- PostgreSQL
    '."\n";
+echo '- Apache
    '."\n";
+echo '- Subversion
    '."\n";
+echo '- iCalcreator
    '."\n";
+echo '- FPDF
    '."\n";
+echo '- Icônes : Deleket, PixelMixer et DryIcons

    '."\n";
 
-	echo 'Validations des pages

    '."\n";
-	echo '- Toutes les pages disposent de la validation HTML 4.01 Strict du W3C. 
    - La CSS dispose de la validation CSS 2.1 du W3C.'."\n";
- 	echo '
    '."\n"; 
-	echo 'Valid HTML 4.01 StrictCSS Valide !'."\n";
- 	echo'
    '."\n"; 
+echo 'Compatibilités des navigateurs

    '."\n";
+echo '- Firefox
    '."\n";
+echo '- Opéra
    '."\n";
+echo '- Konqueror
    '."\n";
+echo '- Links
    '."\n";
+echo '- Safari
    '."\n";
+echo '- IE

    '."\n";
 
-	echo 'Propositions améliorations de '.NOMAPPLICATION.'

    '."\n";
-	
-	echo 'Si quelquechose venait à vous manquer, vous pouvez nous en faire part via le formulaire en ligne. 
    '."\n";
+echo 'Validations des pages

    '."\n";
+echo '- Toutes les pages disposent de la validation HTML 4.01 Strict du W3C. 
    - La CSS dispose de la validation CSS 2.1 du W3C.'."\n";
+echo '
    '."\n";
+echo 'Valid HTML 4.01 StrictCSS Valide !'."\n";
+echo'
    '."\n";
 
-	echo 'Les dernières améliorations de '.NOMAPPLICATION.' sont visibles dans le fichier CHANGELOG.

    '."\n";
-	
-	echo 'Remerciements

    '."\n";
-	echo 'Pour leurs contributions techniques ou ergonomiques : Guy, Christophe, Julien, Pierre, Romaric, Matthieu, Catherine, Christine, Olivier, Emmanuel et Florence 

    '."\n";
+echo 'Propositions améliorations de '.NOMAPPLICATION.'

    '."\n";
+echo 'Si quelquechose venait à vous manquer, vous pouvez nous en faire part via le formulaire en ligne. 
    '."\n";
+echo 'Les dernières améliorations de '.NOMAPPLICATION.' sont visibles dans le fichier CHANGELOG.

    '."\n";
 
-	
+echo 'Remerciements

    '."\n";
+echo 'Pour leurs contributions techniques ou ergonomiques : Guy, Christophe, Julien, Pierre, Romaric, Matthieu, Catherine, Christine, Olivier, Emmanuel et Florence 

    '."\n";
 
-	echo '
    '."\n";
-	
-	bandeau_pied_mobile();
-	echo ''."\n";
-	echo ''."\n";
-	echo ''."\n";
+echo '
    '."\n";
 
-?>
+bandeau_pied_mobile();
+echo ''."\n";
+echo ''."\n";
+echo ''."\n";
\ No newline at end of file
diff --git a/bandeaux.php b/bandeaux.php
index 2824125..f6d9a30 100644
--- a/bandeaux.php
+++ b/bandeaux.php
@@ -41,75 +41,96 @@
 include_once('fonctions.php');
 
 //le logo
-function logo (){
-  if(defined('LOGOBANDEAU'))
+function logo ()
+{
+  if(defined('LOGOBANDEAU')) {
     echo ''."\n";
+  }
 }
 
+
 #le bandeau principal
-function bandeau_tete(){
-	echo '
    '.NOMAPPLICATION.'
    '."\n";
+function bandeau_tete()
+{
+  echo '
    '.NOMAPPLICATION.'
    '."\n";
 }
 
+
 // bandeaux de titre
-function bandeau_titre($titre){
-	echo '
    '. $titre .'
    '."\n";
+function bandeau_titre($titre)
+{
+  echo '
    '. $titre .'
    '."\n";
 }
 
-function liste_lang() {
+
+function liste_lang()
+{
   global $ALLOWED_LANGUAGES;
+  
   $str = '';
-  foreach ($ALLOWED_LANGUAGES as $k => $v )
+  foreach ($ALLOWED_LANGUAGES as $k => $v ) {
     $str .= '' . $v . '' . "\n" ;
+  }
+  
   return $str;
 }
 
+
 #Les sous-bandeaux contenant les boutons de navigation
-function sous_bandeau(){
+function sous_bandeau()
+{
   echo '
    ' .
-    ''. _("Home") .'' .
-    ''. _("Example") .'' .
-    ''. _("Contact") .'' .
-    //''. _("Sources") .'' . //not implemented
-    ''. _("About") .'' .
-    ''. _("Admin") .'' .
-
-    '' .
-    liste_lang() . ''.
-
-    '
    ' . "\n";
+       ''. _("Home") .'' .
+       ''. _("Example") .'' .
+       ''. _("Contact") .'' .
+       //''. _("Sources") .'' . //not implemented
+       ''. _("About") .'' .
+       ''. _("Admin") .'' .
+       '' .
+       liste_lang() . ''.
+       '
    ' . "\n"; } -function sous_bandeau_admin(){ + + +function sous_bandeau_admin() +{ echo '
    ' . - ''. _("Home") .''; - if(is_readable('logs_studs.txt')) + ''. _("Home") .''; + + if(is_readable('logs_studs.txt')) { echo ''. _("Logs") .''; + } + echo ''. _("Cleaning") .'' . - - '' . - liste_lang() . ''. - - '
    '."\n"; + '' . + liste_lang() . ''. + ''."\n"; } -function sous_bandeau_choix(){ + + +function sous_bandeau_choix() +{ echo '
    ' . - ''. _("Home") .'' . - '
    '."\n"; + ''. _("Home") .'' . + ''."\n"; } #les bandeaux de pied -function sur_bandeau_pied(){ - echo '
    '."\n"; -} -function bandeau_pied(){ - echo '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; -} -function bandeau_pied_mobile(){ - echo '
    '."\n" . - '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; +function sur_bandeau_pied() +{ + echo '
    '."\n"; } +function bandeau_pied() +{ + echo '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; +} -?> + +function bandeau_pied_mobile() +{ + echo '
    '."\n" . + '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; +} \ No newline at end of file diff --git a/block_enter.js b/block_enter.js index 9e25913..9808500 100644 --- a/block_enter.js +++ b/block_enter.js @@ -1,14 +1,20 @@ -if (document.layers) - document.captureEvents(Event.KEYPRESS); - -function process_keypress(e) { - if(window.event){ - if (window.event.type == "keypress" & window.event.keyCode == 13) - return !(window.event.type == "keypress" & window.event.keyCode == 13); - } - if(e){ - if (e.type == "keypress" & e.keyCode == 13) - return !e; - } +if (document.layers) { + document.captureEvents(Event.KEYPRESS); } -document.onkeypress = process_keypress; + +function process_keypress(e) +{ + if(window.event) { + if (window.event.type == "keypress" & window.event.keyCode == 13) { + return !(window.event.type == "keypress" & window.event.keyCode == 13); + } + } + + if(e) { + if (e.type == "keypress" & e.keyCode == 13) { + return !e; + } + } +} + +document.onkeypress = process_keypress; \ No newline at end of file diff --git a/choix_autre.php b/choix_autre.php index 37f304d..eb21269 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -39,181 +39,168 @@ session_start(); include_once('creation_sondage.php'); -if (file_exists('bandeaux_local.php')) - include_once('bandeaux_local.php'); -else - include_once('bandeaux.php'); + +if (file_exists('bandeaux_local.php')) { + include_once('bandeaux_local.php'); +} else { + include_once('bandeaux.php'); +} //si les variables de session ne sont pas valides, il y a une erreur -if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SESSION["mail"]){ - - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - logo(); - bandeau_tete(); - bandeau_titre(_("Error!")); - echo '
    '."\n"; - print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; - print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; - echo '


    '."\n"; - echo '
    '."\n"; - //bandeau de pied - bandeau_pied(); - echo ''."\n"; - echo ''."\n"; - -} -else { - - //partie creation du sondage dans la base SQL - //On prépare les données pour les inserer dans la base - if ($_POST["confirmecreation_x"]){ - - //recuperation des données de champs textes - for ($i=0;$i<$_SESSION["nbrecases"]+1;$i++){ - if ($_POST["choix"][$i]){ - $toutchoix.=','; - $toutchoix.=str_replace(","," ",$_POST["choix"][$i]); - } - } - - $toutchoix=str_replace("'","°",$toutchoix); - $toutchoix=substr("$toutchoix",1); - - $_SESSION["toutchoix"]=$toutchoix; - - if ($_POST["champdatefin"]){ - $registredate=explode("/",$_POST["champdatefin"]); - if (mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2])>time()+250000){ - $_SESSION["champdatefin"]=mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]); - } - } - else{ - $_SESSION["champdatefin"]=time()+15552000; - } - - //format du sondage AUTRE - $_SESSION["formatsondage"]="A".$_SESSION["studsplus"]; - - ajouter_sondage(); - - } - - - // recuperation des sujets pour sondage AUTRE - for ($i=0;$i<$_SESSION["nbrecases"];$i++){ - if (!preg_match(';<|>|";',$_POST["choix"][$i])){ - $_SESSION["choix$i"]=$_POST["choix"][$i]; - } - else {$erreur_injection="yes";} - } - - //nombre de cases par défaut - if(!$_SESSION["nbrecases"]){ - $_SESSION["nbrecases"]=10; - } - if ($_POST["ajoutcases"]||$_POST["ajoutcases_x"]){ - $_SESSION["nbrecases"]=$_SESSION["nbrecases"]+5; - } - - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; - echo ''; - - echo ''."\n"; - echo ''."\n"; - - - echo '
    '."\n"; - logo(); - bandeau_tete(); - bandeau_titre(_("Poll subjects (2 on 2)")); - sous_bandeau_choix(); - - echo '
    '."\n"; - echo '
    '. _("Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:") .'

    '."\n"; - echo ''."\n"; - - //affichage des cases texte de formulaire - for ($i=0;$i<$_SESSION["nbrecases"];$i++){ - $j=$i+1; - echo ''."\n"; - } - - echo '
    '. _("Choice") .' '.$j.' :
    '."\n"; - - //focus javascript sur premiere case - echo ''."\n"; - - //ajout de cases supplementaires - echo ''."\n"; - echo ''."\n"; - echo '
    '. _("5 choices more") .'
    '."\n"; - echo'
    '."\n"; - - echo ''."\n"; - echo ''."\n"; - echo '
    '. _("Next") .'
    '."\n"; - - //test de remplissage des cases - for ($i=0;$i<$_SESSION["nbrecases"];$i++){ - if ($_POST["choix"][$i]!=""){$testremplissage="ok";} - } - - //message d'erreur si aucun champ renseigné - if ($testremplissage!="ok"&&($_POST["fin_sondage_autre"]||$_POST["fin_sondage_autre_x"])){ - print "
    " . _("Enter at least one choice") . "

    "."\n"; - $erreur="yes"; - } - - if ($erreur_injection){ - print "" . _("Characters \" < and > are not permitted") . "

    \n"; - } - - if (($_POST["fin_sondage_autre"]||$_POST["fin_sondage_autre_x"])&&!$erreur&&!$erreur_injection){ - - //demande de la date de fin du sondage - - echo '
    '."\n"; - echo '
    '."\n"; - echo '
    '. _("Your poll will be automatically removed after 6 months.
    You can fix another removal date for it.") .'

    '."\n"; - - echo _("Removal date (optional)") .' : '. _("(DD/MM/YYYY)") ."\n"; - echo '
    '."\n"; - echo '
    '."\n"; - echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; - echo '
    '."\n"; - echo '
    '."\n"; - - echo ''."\n"; - echo ''."\n"; - echo '
    '. _("Create the poll") .'
    '."\n"; - } - - - //fin du formulaire et bandeau de pied - echo ''."\n"; - echo ''."\n"; - echo '


    '."\n"; - echo '
    '."\n"; - //bandeau de pied - bandeau_pied_mobile(); - - echo ''."\n"; - echo ''."\n"; - -} - -?> +if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SESSION["mail"]) { + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Error!")); + echo '
    '."\n"; + print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; + echo '


    '."\n"; + echo '
    '."\n"; + //bandeau de pied + bandeau_pied(); + echo ''."\n"; + echo ''."\n"; +} else { + //partie creation du sondage dans la base SQL + //On prépare les données pour les inserer dans la base + + if ($_POST["confirmecreation_x"]) { + //recuperation des données de champs textes + for ($i=0;$i<$_SESSION["nbrecases"]+1;$i++) { + if ($_POST["choix"][$i]) { + $toutchoix.=','; + $toutchoix.=str_replace(","," ",$_POST["choix"][$i]); + } + } + + $toutchoix=str_replace("'","°",$toutchoix); + $toutchoix=substr("$toutchoix",1); + $_SESSION["toutchoix"]=$toutchoix; + + if ($_POST["champdatefin"]) { + $registredate=explode("/",$_POST["champdatefin"]); + if (mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2])>time()+250000) { + $_SESSION["champdatefin"]=mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]); + } + } else { + $_SESSION["champdatefin"]=time()+15552000; + } + + //format du sondage AUTRE + $_SESSION["formatsondage"]="A".$_SESSION["studsplus"]; + + ajouter_sondage(); + } + + // recuperation des sujets pour sondage AUTRE + for ($i=0;$i<$_SESSION["nbrecases"];$i++) { + if (!preg_match(';<|>|";',$_POST["choix"][$i])) { + $_SESSION["choix$i"]=$_POST["choix"][$i]; + } else { + $erreur_injection="yes"; + } + } + + //nombre de cases par défaut + if (!$_SESSION["nbrecases"]) { + $_SESSION["nbrecases"]=10; + } + + if ($_POST["ajoutcases"]||$_POST["ajoutcases_x"]) { + $_SESSION["nbrecases"]=$_SESSION["nbrecases"]+5; + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''; + echo ''."\n"; + echo ''."\n"; + + echo '
    '."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Poll subjects (2 on 2)")); + sous_bandeau_choix(); + + echo '
    '."\n"; + echo '
    '. _("Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:") .'

    '."\n"; + echo ''."\n"; + + //affichage des cases texte de formulaire + for ($i=0;$i<$_SESSION["nbrecases"];$i++) { + $j=$i+1; + echo ''."\n"; + } + + echo '
    '. _("Choice") .' '.$j.' :
    '."\n"; + + //focus javascript sur premiere case + echo ''."\n"; + + //ajout de cases supplementaires + echo ''."\n"; + echo ''."\n"; + echo '
    '. _("5 choices more") .'
    '."\n"; + echo'
    '."\n"; + + echo ''."\n"; + echo ''."\n"; + echo '
    '. _("Next") .'
    '."\n"; + + //test de remplissage des cases + for ($i=0;$i<$_SESSION["nbrecases"];$i++) { + if ($_POST["choix"][$i]!="") { + $testremplissage="ok"; + } + } + + //message d'erreur si aucun champ renseigné + if ($testremplissage!="ok"&&($_POST["fin_sondage_autre"]||$_POST["fin_sondage_autre_x"])) { + print "
    " . _("Enter at least one choice") . "

    "."\n"; + $erreur="yes"; + } + + if ($erreur_injection) { + print "" . _("Characters \" < and > are not permitted") . "

    \n"; + } + + if (($_POST["fin_sondage_autre"]||$_POST["fin_sondage_autre_x"])&&!$erreur&&!$erreur_injection) { + //demande de la date de fin du sondage + echo '
    '."\n"; + echo '
    '."\n"; + echo '
    '. _("Your poll will be automatically removed after 6 months.
    You can fix another removal date for it.") .'

    '."\n"; + echo _("Removal date (optional)") .' : '. _("(DD/MM/YYYY)") ."\n"; + echo '
    '."\n"; + echo '
    '."\n"; + echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; + echo '
    '."\n"; + echo '
    '."\n"; + echo ''."\n"; + echo ''."\n"; + echo '
    '. _("Create the poll") .'
    '."\n"; + } + + //fin du formulaire et bandeau de pied + echo ''."\n"; + echo ''."\n"; + echo '


    '."\n"; + echo '
    '."\n"; + //bandeau de pied + bandeau_pied_mobile(); + echo ''."\n"; + echo ''."\n"; +} \ No newline at end of file diff --git a/choix_date.php b/choix_date.php index 2bd4891..bd26459 100644 --- a/choix_date.php +++ b/choix_date.php @@ -40,555 +40,511 @@ session_start(); include_once('creation_sondage.php'); -if (file_exists('bandeaux_local.php')) - include_once('bandeaux_local.php'); -else - include_once('bandeaux.php'); + +if (file_exists('bandeaux_local.php')) { + include_once('bandeaux_local.php'); +} else { + include_once('bandeaux.php'); +} //si les variables de session ne snot pas valides, il y a une erreur -if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SESSION["mail"]){ - - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - logo(); - bandeau_tete(); - bandeau_titre(_("Error!")); - echo '
    '."\n"; - print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; - print _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.' . "\n"; - echo '


    '."\n"; - echo '
    '."\n"; - //bandeau de pied - //sur_bandeau_pied(); - bandeau_pied(); - - echo ''."\n"; - echo ''."\n"; - -} - -//sinon on peut afficher le calendrier normalement -else { - -//partie creation du sondage dans la base SQL -//On prépare les données pour les inserer dans la base -if ($_POST["confirmation"]||$_POST["confirmation_x"]){ - for ($i=0;$i 0 && $_SESSION["mois"] < 13) - $motmois=strftime('%B', mktime(0, 0, 0, $_SESSION["mois"], 10)); -else - $motmois=strftime('%B'); - -//debut de la page web -echo ''."\n"; -echo ''."\n"; -echo ''."\n"; -echo ''."\n"; -echo ''.NOMAPPLICATION.''."\n"; -echo ''."\n"; -echo ''; - -echo ''."\n"; -echo ''."\n"; - -//Debut du formulaire et bandeaux de tete -echo '
    '."\n"; -logo(); -bandeau_tete(); -bandeau_titre(_("Poll dates (2 on 2)")); -sous_bandeau_choix(); - -//affichage de l'aide pour les jours -echo '
    '."\n"; -echo _("Select your dates amoung the free days (green). The selected days are in blue.
    You can unselect a day previously selected by clicking again on it.") ."\n"; -echo '
    '."\n"; - -//debut du tableau qui affiche le calendrier -echo '
    '."\n"; -echo ''."\n"; -echo ''."\n"; -echo '
    '.$motmois.' '.$_SESSION["annee"].'
    '."\n"; -echo ''."\n"; - -echo ''."\n"; -//affichage des jours de la semaine en haut du tableau -for($i = 0; $i < 7; $i++) - echo ''; -echo ''."\n"; - - -//ajout d'une entrée dans la variable de session qui contient toutes les dates -if ($_POST["choixjourajout"]){ - if (!isset($_SESSION["totalchoixjour"])){ - $_SESSION["totalchoixjour"]=array(); +if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SESSION["mail"]) { + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Error!")); + echo '
    '."\n"; + print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; + print _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.' . "\n"; + echo '


    '."\n"; + echo '
    '."\n"; + //bandeau de pied + //sur_bandeau_pied(); + bandeau_pied(); + echo ''."\n"; + echo ''."\n"; +} else { //sinon on peut afficher le calendrier normalement + //partie creation du sondage dans la base SQL + //On prépare les données pour les inserer dans la base + if ($_POST["confirmation"]||$_POST["confirmation_x"]) { + for ($i=0;$i 0 && $_SESSION["mois"] < 13) { + $motmois=strftime('%B', mktime(0, 0, 0, $_SESSION["mois"], 10)); + } else { + $motmois=strftime('%B'); + } + + //debut de la page web + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''; + echo ''."\n"; + echo ''."\n"; + + //Debut du formulaire et bandeaux de tete + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Poll dates (2 on 2)")); + sous_bandeau_choix(); + + //affichage de l'aide pour les jours + echo '
    '."\n"; + echo _("Select your dates amoung the free days (green). The selected days are in blue.
    You can unselect a day previously selected by clicking again on it.") ."\n"; + echo '
    '."\n"; + + //debut du tableau qui affiche le calendrier + echo '
    '."\n"; + echo '
    '. strftime('%A',mktime(0,0,0,0,$i,10)) .'
    '."\n"; + echo ''."\n"; + echo '
    '.$motmois.' '.$_SESSION["annee"].'
    '."\n"; + echo ''."\n"; + echo ''."\n"; + + //affichage des jours de la semaine en haut du tableau + for($i = 0; $i < 7; $i++) { + echo ''; + } + + echo ''."\n"; + + //ajout d'une entrée dans la variable de session qui contient toutes les dates + if ($_POST["choixjourajout"]) { + if (!isset($_SESSION["totalchoixjour"])) { + $_SESSION["totalchoixjour"]=array(); + } + + // Test pour éviter les doublons dans la variable qui contient toutes les dates + $journeuf=true; + for ($i=0;$i'."\n"; + + for ($i=0;$i<$nbrejourmois+$premierjourmois;$i++) { + $numerojour=$i-$premierjourmois+1; + + // On saute a la ligne tous les 7 jours + if (($i%7)==0&&$i!=0) { + echo ''."\n"; + } + + // On affiche les jours precedants en gris et incliquables + if ($i<$premierjourmois) { + echo ''."\n"; + } else { + for ($j=0;$j'."\n"; + $dejafait=$numerojour; + } + } + + //Si pas de bouton ROUGE alors on affiche un bouton VERT ou GRIS avec le numéro du jour dessus + if ($dejafait!=$numerojour) { + //bouton vert + if (($numerojour>=$jourAJ&&$_SESSION["mois"]==$moisAJ&&$_SESSION["annee"]==$anneeAJ)||($_SESSION["mois"]>$moisAJ&&$_SESSION["annee"]==$anneeAJ)||$_SESSION["annee"]>$anneeAJ) { + echo ''."\n"; + } else { //bouton gris + echo ''."\n"; + } + } + } + } + + //fin du tableau + echo ''."\n"; + echo '
    '. strftime('%A',mktime(0,0,0,0,$i,10)) .'
    '.$numerojour.'
    '."\n"; + echo '
    '."\n"; + + //traitement de l'entrée des heures dans les cases texte + $errheure = $erreur = false; + if ($_POST["choixheures"]||$_POST["choixheures_x"]) { + //On sauvegarde les heures deja entrées + for ($i=0;$i'."\n"; + + //affichage de tous les jours choisis + if ($_SESSION["totalchoixjour"]&&(!$_POST["choixheures_x"]||$erreur)) { + //affichage des jours + echo '
    '."\n"; + echo '

    '. _("Selected days") .' :

    '."\n"; + //affichage de l'aide pour les jours + echo _("For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'

    '."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$i<$_SESSION["nbrecaseshoraires"];$i++) { + $j=$i+1; + echo ''."\n"; + } + + if ($_SESSION["nbrecaseshoraires"]<10) { + echo ''."\n"; + } + + echo ''."\n"; + + //affichage de la liste des jours choisis + for ($i=0;$i'."\n"; + if ($_SESSION["langue"]=="EN") { + echo ''."\n"; + } else { + echo ''."\n"; + } + + $affichageerreurfindeligne=false; + + //affichage des cases d'horaires + for ($j=0;$j<$_SESSION["nbrecaseshoraires"];$j++) { + //si on voit une erreur, le fond de la case est rouge + if ($errheure[$i][$j]) { + echo ''."\n"; + $affichageerreurfindeligne=true; + } else { //sinon la case est vide normalement + echo ''."\n"; + } + } + + if ($affichageerreurfindeligne) { + echo ''."\n"; + } + + echo ''."\n"; + } + + echo '
    '. _("Time") .' '.$j.'
    '.date("l, F jS Y",$_SESSION["totalchoixjour"][$i]).' : '.strftime(_("%A, den %e. %B %Y"),$_SESSION["totalchoixjour"][$i]).' : '. _("Bad format!") .'
    '."\n"; + + //affichage des boutons de formulaire pour annuler, effacer les jours ou créer le sondage + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo''."\n"; + echo ''."\n"; + echo '

    '. _("Next") .'
    '."\n"; + + //si un seul jour et aucunes horaires choisies, : message d'erreur + if (($_POST["choixheures"]||$_POST["choixheures_x"])&&(count($_SESSION["totalchoixjour"])=="1"&&$_POST["horaires0"][0]==""&&$_POST["horaires0"][1]==""&&$_POST["horaires0"][2]==""&&$_POST["horaires0"][3]==""&&$_POST["horaires0"][4]=="")) { + echo '
    '. _("Enter more choices for the voters") .'
    '."\n"; + $erreur=true; + } } -// Test pour éviter les doublons dans la variable qui contient toutes les dates - $journeuf=true; - for ($i=0;$i'."\n"; - -for ($i=0;$i<$nbrejourmois+$premierjourmois;$i++){ - - $numerojour=$i-$premierjourmois+1; - -// On saute a la ligne tous les 7 jours - if (($i%7)==0&&$i!=0){ - echo ''."\n"; - } - -// On affiche les jours precedants en gris et incliquables - if ($i<$premierjourmois){ - echo ''."\n"; - } - else{ - - for ($j=0;$j'."\n"; - $dejafait=$numerojour; - } - } - //Si pas de bouton ROUGE alors on affiche un bouton VERT ou GRIS avec le numéro du jour dessus - if ($dejafait!=$numerojour){ - - //bouton vert - if (($numerojour>=$jourAJ&&$_SESSION["mois"]==$moisAJ&&$_SESSION["annee"]==$anneeAJ)||($_SESSION["mois"]>$moisAJ&&$_SESSION["annee"]==$anneeAJ)||$_SESSION["annee"]>$anneeAJ){ - echo ''."\n"; - } - //bouton gris - else{ - echo ''.$numerojour.''."\n"; - } - } - } -} - -//fin du tableau -echo ''."\n"; -echo ''."\n"; -echo ''."\n"; - -//traitement de l'entrée des heures dans les cases texte -$errheure = $erreur = false; -if ($_POST["choixheures"]||$_POST["choixheures_x"]){ - //On sauvegarde les heures deja entrées - for ($i=0;$i'."\n"; - -//affichage de tous les jours choisis -if ($_SESSION["totalchoixjour"]&&(!$_POST["choixheures_x"]||$erreur)){ - - //affichage des jours - echo '
    '."\n"; - echo '

    '. _("Selected days") .' :

    '."\n"; - //affichage de l'aide pour les jours - echo _("For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'

    '."\n"; - echo ''."\n"; - - echo ''."\n"; - echo ''."\n"; - for ($i=0;$i<$_SESSION["nbrecaseshoraires"];$i++){ - $j=$i+1; - echo ''."\n"; - } - if ($_SESSION["nbrecaseshoraires"]<10){ - echo ''."\n"; - } - echo ''."\n"; - - //affichage de la liste des jours choisis - for ($i=0;$i'."\n"; - if ($_SESSION["langue"]=="EN") - echo ''."\n"; - else - echo ''."\n"; - $affichageerreurfindeligne=false; - //affichage des cases d'horaires - for ($j=0;$j<$_SESSION["nbrecaseshoraires"];$j++){ - //si on voit une erreur, le fond de la case est rouge - if ($errheure[$i][$j]){ - echo ''."\n"; - $affichageerreurfindeligne=true; - } - //sinon la case est vide normalement - else { - echo ''."\n"; - } - } - if ($affichageerreurfindeligne){ - echo ''."\n"; - } - echo ''."\n"; - } - echo '
    '. _("Time") .' '.$j.'
    '.date("l, F jS Y",$_SESSION["totalchoixjour"][$i]).' : '.strftime(_("%A, den %e. %B %Y"),$_SESSION["totalchoixjour"][$i]).' : '. _("Bad format!") .'
    '."\n"; - - //affichage des boutons de formulaire pour annuler, effacer les jours ou créer le sondage - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo''."\n"; - echo ''."\n"; - echo '

    '. _("Next") .'
    '."\n"; - //si un seul jour et aucunes horaires choisies, : message d'erreur - if (($_POST["choixheures"]||$_POST["choixheures_x"])&&(count($_SESSION["totalchoixjour"])=="1"&&$_POST["horaires0"][0]==""&&$_POST["horaires0"][1]==""&&$_POST["horaires0"][2]==""&&$_POST["horaires0"][3]==""&&$_POST["horaires0"][4]=="")){ - echo '
    '. _("Enter more choices for the voters") .'
    '."\n"; - $erreur=true; - } -} - //s'il n'y a pas d'erreur et que le bouton de creation est activé, on demande confirmation - if ( ! $erreur &&($_POST["choixheures"]||$_POST["choixheures_x"])){ - $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1; - $jour_arret=$_SESSION["totalchoixjour"][$taille_tableau]+200000; - if ($_SESSION["langue"]=="EN") - $date_fin=date("l, F jS Y",$jour_arret); - else - $date_fin=strftime(_("%A, den %e. %B %Y"),$jour_arret); - echo '
    '. _("Your poll will expire automatically 2 days after the last date of your poll.") .'

    '. _("Removal date") .' : '.$date_fin.'

    '."\n"; - echo '
    '."\n"; - echo '
    '."\n"; - echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; - echo'
    '."\n"; - // echo'

    '."\n"; - // echo 'Pour finir la création du sondage, cliquez sur le bouton ajout ci-dessous'."\n"; - // echo '

    '."\n"; - echo ''."\n"; - echo ''."\n"; - echo''."\n"; - echo '
    '. _("Back to hours") .'
    '. _("Create the poll") .'
    '."\n"; - } - echo ''."\n"; - echo ''."\n"; - -echo ''."\n"; -//fin du formulaire et bandeau de pied -echo ''."\n"; -//bandeau de pied -echo '



    '."\n"; - -echo ''."\n"; -bandeau_pied_mobile(); -echo ''."\n"; -echo ''."\n"; - -//bouton de nettoyage de tous les jours choisis -if ($_POST["reset"]){ - - for ($i=0;$i'; -} - -} - -?> + //s'il n'y a pas d'erreur et que le bouton de creation est activé, on demande confirmation + if ( ! $erreur &&($_POST["choixheures"]||$_POST["choixheures_x"])) { + $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1; + $jour_arret=$_SESSION["totalchoixjour"][$taille_tableau]+200000; + if ($_SESSION["langue"]=="EN") { + $date_fin=date("l, F jS Y",$jour_arret); + } else { + $date_fin=strftime(_("%A, den %e. %B %Y"),$jour_arret); + } + + echo '
    '. _("Your poll will expire automatically 2 days after the last date of your poll.") .'

    '. _("Removal date") .' : '.$date_fin.'

    '."\n"; + echo '
    '."\n"; + echo '
    '."\n"; + echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; + echo'
    '."\n"; + // echo'

    '."\n"; + // echo 'Pour finir la création du sondage, cliquez sur le bouton ajout ci-dessous'."\n"; + // echo '

    '."\n"; + echo ''."\n"; + echo ''."\n"; + echo''."\n"; + echo '
    '. _("Back to hours") .'
    '. _("Create the poll") .'
    '."\n"; + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + //fin du formulaire et bandeau de pied + echo ''."\n"; + //bandeau de pied + echo '



    '."\n"; + echo ''."\n"; + bandeau_pied_mobile(); + echo ''."\n"; + echo ''."\n"; + + //bouton de nettoyage de tous les jours choisis + if ($_POST["reset"]) { + for ($i=0;$i'; + } +} \ No newline at end of file diff --git a/contacts.php b/contacts.php index 6d19c67..e163b34 100644 --- a/contacts.php +++ b/contacts.php @@ -41,118 +41,104 @@ session_start(); include_once('variables.php'); include_once( 'i18n.php' ); -if (file_exists('bandeaux_local.php')) - include_once('bandeaux_local.php'); -else - include_once('bandeaux.php'); +if (file_exists('bandeaux_local.php')) { + include_once('bandeaux_local.php'); +} else { + include_once('bandeaux.php'); +} // action du bouton annuler -if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isset($_POST['nom']) && !empty($_POST['nom']) && isset($_POST['question']) && !empty($_POST['question'])){ +if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isset($_POST['nom']) && !empty($_POST['nom']) && isset($_POST['question']) && !empty($_POST['question'])) { + $message=str_replace("\\","",$_POST["question"]); + + //envoi des mails + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail (ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers); + if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + } + + //affichage de la page de confirmation d'envoi + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Make your polls")); + echo '
    '."\n"; + print "

    " . _("Your message has been sent!") . "



    "."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; + echo '


    '."\n"; + echo '
    '."\n"; + bandeau_pied(); + session_unset(); +} else { + $post_var = array('question', 'nom', 'adresse_mail', ); + foreach ($post_var as $var) { + if (isset($_POST[$var]) && !empty($_POST[$var])) { + $_SESSION[$var] = $_POST[$var]; + } else { + $_SESSION[$var] = null; + } + } + + //affichage de la page + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //debut du formulaire + echo '
    '."\n"; + + //bandeaux de tete + logo(); + bandeau_tete(); + bandeau_titre(_("Contact us")); + sous_bandeau(); + echo '
    '."\n"; + echo _("If you have questions, you can send a message here.") .'

    '."\n"; - $message=str_replace("\\","",$_POST["question"]); - - //envoi des mails - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail (ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers); - if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])){ - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); - } + echo _("Your name") .' :
    '."\n"; + echo ''; - //affichage de la page de confirmation d'envoi - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - logo(); - bandeau_tete(); - bandeau_titre(_("Make your polls")); - - echo '
    '."\n"; - print "

    " . _("Your message has been sent!") . "



    "."\n"; - print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; - echo '


    '."\n"; - echo '
    '."\n"; - - bandeau_pied(); + if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && $_SESSION["nom"]=="") { + echo ' '. _("Enter a name") .''; + } - session_unset(); + echo '

    '."\n"; + echo _("Your email address ") .' :
    '."\n"; + echo ''."\n"; -} + echo '

    '; -else { - $post_var = array('question', 'nom', 'adresse_mail', ); - foreach ($post_var as $var) { - if (isset($_POST[$var]) && !empty($_POST[$var])) { - $_SESSION[$var] = $_POST[$var]; - } else { - $_SESSION[$var] = null; - } - } + echo _("Question") .' :
    '."\n"; + echo ''; - //affichage de la page - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; + if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && $_SESSION["question"]=="") { + echo '  Il faut poser une question !'; + } - //debut du formulaire - echo ''."\n"; - - //bandeaux de tete - logo(); - bandeau_tete(); - bandeau_titre(_("Contact us")); - sous_bandeau(); - - //blablabla - echo '
    '."\n"; - echo _("If you have questions, you can send a message here.") .'

    '."\n"; - - echo _("Your name") .' :
    '."\n"; - echo ''; - - if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && $_SESSION["nom"]==""){ - echo ' '. _("Enter a name") .''; - } - - echo '

    '."\n"; - echo _("Your email address ") .' :
    '."\n"; - echo ''."\n"; - - - echo '

    '; - - echo _("Question") .' :
    '."\n"; - echo ''; - - if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && $_SESSION["question"]==""){ - echo '  Il faut poser une question !'; - } - - echo '


    '."\n"; - echo ''."\n"; - echo ''."\n"; - echo '
    '. _("Send your question") .'
    '."\n"; - echo '


    '."\n"; - echo '
    '."\n"; - echo ''."\n"; - - //bandeau de pied - bandeau_pied(); - - echo ''."\n"; - echo ''."\n"; - -} - -?> + echo '


    '."\n"; + echo ''."\n"; + echo ''."\n"; + echo '
    '. _("Send your question") .'
    '."\n"; + echo '


    '."\n"; + echo '
    '."\n"; + echo ''."\n"; + //bandeau de pied + bandeau_pied(); + echo ''."\n"; + echo ''."\n"; +} \ No newline at end of file diff --git a/creation_sondage.php b/creation_sondage.php index c0ce1f9..fa4fb25 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -43,59 +43,57 @@ include_once('fonctions.php'); //Generer une chaine de caractere unique et aleatoire -function random($car) { - $string = ""; - $chaine = "abcdefghijklmnopqrstuvwxyz123456789"; - srand((double)microtime()*1000000); - for($i=0; $i<$car; $i++) { - $string .= $chaine[rand()%strlen($chaine)]; - } - return $string; +function random($car) +{ + $string = ""; + $chaine = "abcdefghijklmnopqrstuvwxyz123456789"; + srand((double)microtime()*1000000); + for($i=0; $i<$car; $i++) { + $string .= $chaine[rand()%strlen($chaine)]; + } + return $string; } -function ajouter_sondage(){ - $sondage=random(16); - $sondage_admin=$sondage.random(8); - -if ($_SESSION["formatsondage"]=="A"||$_SESSION["formatsondage"]=="A+"){ - - //extraction de la date de fin choisie - if ($_SESSION["champdatefin"]){ - if ($_SESSION["champdatefin"]>time()+250000){ - $date_fin=$_SESSION["champdatefin"]; - } - } - else{$date_fin=time()+15552000;} -} - -if ($_SESSION["formatsondage"]=="D"||$_SESSION["formatsondage"]=="D+"){ - - //Calcul de la date de fin du sondage - $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1; - $date_fin=$_SESSION["totalchoixjour"][$taille_tableau]+200000; -} - - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - - global $connect; - $connect->Execute('insert into sondage ' . - '(id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) ' . - 'VALUES '. - "('$sondage','$_SESSION[commentaires]', '$_SESSION[adresse]', '$_SESSION[nom]', '$_SESSION[titre]','$sondage_admin', FROM_UNIXTIME('$date_fin'), '$_SESSION[formatsondage]','$_SESSION[mailsonde]' )"); - $connect->Execute("insert into sujet_studs values ('$sondage', '$_SESSION[toutchoix]' )"); - - - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), "" . _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.") . "\n\n".stripslashes($_SESSION["nom"])." " . _("hast just created a poll called") . " : \"".stripslashes($_SESSION["titre"])."\".\n" . _("Thanks for filling the poll at the link above") . " :\n\n".get_server_name()."studs.php?sondage=$sondage \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION,$headers); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), - _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above") . - " :\n\n".get_server_name()."adminstuds.php?sondage=$sondage_admin \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION,$headers); - - $date=date('H:i:s d/m/Y:'); - error_log($date . " CREATION: $sondage\t$_SESSION[formatsondage]\t$_SESSION[nom]\t$_SESSION[adresse]\t \t$_SESSION[toutchoix]\n", 3, 'admin/logs_studs.txt'); - - header("Location:studs.php?sondage=$sondage"); - - exit(); - session_unset(); -} -?> +function ajouter_sondage() +{ + $sondage=random(16); + $sondage_admin=$sondage.random(8); + + if ($_SESSION["formatsondage"]=="A"||$_SESSION["formatsondage"]=="A+") { + //extraction de la date de fin choisie + if ($_SESSION["champdatefin"]) { + if ($_SESSION["champdatefin"]>time()+250000) { + $date_fin=$_SESSION["champdatefin"]; + } + } else { + $date_fin=time()+15552000; + } + } + + if ($_SESSION["formatsondage"]=="D"||$_SESSION["formatsondage"]=="D+") { + //Calcul de la date de fin du sondage + $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1; + $date_fin=$_SESSION["totalchoixjour"][$taille_tableau]+200000; + } + + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + + global $connect; + + $connect->Execute('insert into sondage ' . + '(id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) ' . + 'VALUES '. + "('$sondage','$_SESSION[commentaires]', '$_SESSION[adresse]', '$_SESSION[nom]', '$_SESSION[titre]','$sondage_admin', FROM_UNIXTIME('$date_fin'), '$_SESSION[formatsondage]','$_SESSION[mailsonde]' )"); + $connect->Execute("insert into sujet_studs values ('$sondage', '$_SESSION[toutchoix]' )"); + + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), "" . _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.") . "\n\n".stripslashes($_SESSION["nom"])." " . _("hast just created a poll called") . " : \"".stripslashes($_SESSION["titre"])."\".\n" . _("Thanks for filling the poll at the link above") . " :\n\n".get_server_name()."studs.php?sondage=$sondage \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION,$headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), + _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above") . + " :\n\n".get_server_name()."adminstuds.php?sondage=$sondage_admin \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION,$headers); + + $date=date('H:i:s d/m/Y:'); + error_log($date . " CREATION: $sondage\t$_SESSION[formatsondage]\t$_SESSION[nom]\t$_SESSION[adresse]\t \t$_SESSION[toutchoix]\n", 3, 'admin/logs_studs.txt'); + header("Location:studs.php?sondage=$sondage"); + exit(); + session_unset(); +} \ No newline at end of file diff --git a/errors/error-forbidden.php b/errors/error-forbidden.php index edc9f15..c0c6e74 100644 --- a/errors/error-forbidden.php +++ b/errors/error-forbidden.php @@ -62,6 +62,4 @@ echo ''."\n"; sur_bandeau_pied(); bandeau_pied(); echo ''."\n"; -echo ''."\n"; - -?> +echo ''."\n"; \ No newline at end of file diff --git a/exportcsv.php b/exportcsv.php index 750c707..9bd8fad 100644 --- a/exportcsv.php +++ b/exportcsv.php @@ -39,8 +39,9 @@ include_once('fonctions.php'); -if(!isset($_GET['numsondage']) || ! preg_match(";^[\w\d]{16}$;i", $_GET['numsondage'])) - header('Location: studs.php'); +if(!isset($_GET['numsondage']) || ! preg_match(";^[\w\d]{16}$;i", $_GET['numsondage'])) { + header('Location: studs.php'); +} $user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage=" . $_GET['numsondage'] . " ORDER BY id_users"); @@ -48,56 +49,55 @@ $dsondage = get_sondage_from_id($_GET['numsondage']); $nbcolonnes=substr_count($dsondage->sujet,',')+1; $toutsujet=explode(",",$dsondage->sujet); -#$toutsujet=str_replace("°","'",$toutsujet); +#$toutsujet=str_replace("°","'",$toutsujet); //affichage des sujets du sondage - $input.=";"; -for ($i=0;$toutsujet[$i];$i++){ - if ($dsondage->format=="D"||$dsondage->format=="D+"){ - $input.=''.date("j/n/Y",$toutsujet[$i]).';'; - } - else{ - $input.=''.$toutsujet[$i].';'; - } +for ($i=0;$toutsujet[$i];$i++) { + if ($dsondage->format=="D"||$dsondage->format=="D+") { + $input.=''.date("j/n/Y",$toutsujet[$i]).';'; + } else { + $input.=''.$toutsujet[$i].';'; + } } + $input.="\r\n"; -if (strpos($dsondage->sujet,'@') !== false){ - $input.=";"; - for ($i=0;$toutsujet[$i];$i++){ - $heures=explode("@",$toutsujet[$i]); - $input.=''.$heures[1].';'; - } - $input.="\r\n"; +if (strpos($dsondage->sujet,'@') !== false) { + $input.=";"; + for ($i=0;$toutsujet[$i];$i++) { + $heures=explode("@",$toutsujet[$i]); + $input.=''.$heures[1].';'; + } + + $input.="\r\n"; } while ( $data=$user_studs->FetchNextObject(false)) { -// Le nom de l'utilisateur - $nombase=str_replace("°","'",$data->nom); - $input.=$nombase.';'; -//affichage des resultats - $ensemblereponses=$data->reponses; - for ($k=0;$k<$nbcolonnes;$k++){ - $car=substr($ensemblereponses,$k,1); - if ($car=="1"){ - $input.='OK;'; - $somme[$k]++; - } - else { - $input.=';'; - } - } - $input.="\r\n"; + // Le nom de l'utilisateur + $nombase=str_replace("°","'",$data->nom); + $input.=$nombase.';'; + //affichage des resultats + $ensemblereponses=$data->reponses; + for ($k=0;$k<$nbcolonnes;$k++) { + $car=substr($ensemblereponses,$k,1); + if ($car=="1") { + $input.='OK;'; + $somme[$k]++; + } else { + $input.=';'; + } + } + + $input.="\r\n"; } $filesize = strlen( $input ); $filename=$_GET["numsondage"].".csv"; - header( 'Content-Type: text/csv; charset=utf-8' ); - header( 'Content-Length: '.$filesize ); - header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); - header( 'Cache-Control: max-age=10' ); +header( 'Content-Type: text/csv; charset=utf-8' ); +header( 'Content-Length: '.$filesize ); +header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); +header( 'Cache-Control: max-age=10' ); echo $input; - die(); -?> +die(); \ No newline at end of file diff --git a/exportics.php b/exportics.php index 6df0a42..3703e08 100644 --- a/exportics.php +++ b/exportics.php @@ -43,15 +43,12 @@ header('Location: studs.php'); $meilleursujet=$_SESSION["meilleursujet"]; - session_start(); require_once('iCalcreator/iCalcreator.class.php'); $v = new vcalendar(); // create a new calendar instance $v->setConfig( 'unique_id', $_SESSION["numsondage"] ); // set Your unique id $v->setProperty( 'method', 'PUBLISH' ); // required of some calendar software - - $vevent = new vevent(); // create an event calendar component /* @@ -61,25 +58,29 @@ $vevent = new vevent(); // create an event calendar component */ $adate = strtok($meilleursujet, "@"); $dtstart = $dtend = array( - 'year'=>intval(date("Y",$adate)), - 'month'=>intval(date("n",$adate)), - 'day'=>intval(date("j",$adate)), - 'hour'=>0, - 'min'=>0, - 'sec'=>0 - ); + 'year'=>intval(date("Y",$adate)), + 'month'=>intval(date("n",$adate)), + 'day'=>intval(date("j",$adate)), + 'hour'=>0, + 'min'=>0, + 'sec'=>0 +); + $double_time = false; -if(strpos($meilleursujet, '-') !== false) +if(strpos($meilleursujet, '-') !== false) { $double_time = true; +} $dtstart['hour'] = intval(strtok(":Hh")); $a = intval(strtok(":Hh-")); $b = intval(strtok(":Hh-")); -if($b === false) { - if($double_time) + +if ($b === false) { + if($double_time) { $dtend['hour'] = $a; - else + } else { $dtstart['min'] = $a; + } } else { $dtstart['min'] = $a; $dtend['hour'] = $b; @@ -97,9 +98,6 @@ $vevent->setProperty( 'summary', $_SESSION["sondagetitre"] ); $v->setComponent ( $vevent ); // add event to calendar $v->setConfig( "language", "fr" ); -$v->setConfig( "directory", "export" ); +$v->setConfig( "directory", "export" ); $v->setConfig( "filename", $_SESSION["numsondage"].".ics" ); // set file name - -$v->returnCalendar(); - -?> +$v->returnCalendar(); \ No newline at end of file diff --git a/exportpdf.php b/exportpdf.php index 342d39e..1731f2c 100644 --- a/exportpdf.php +++ b/exportpdf.php @@ -81,6 +81,4 @@ $PDF->SetFont('Arial','B',8); $PDF->Text(35,275,"Cette lettre de convocation a t gnre automatiquement par ".NOMAPPLICATION." sur ".get_server_name()); //Sortie -$PDF->Output(); - -?> +$PDF->Output(); \ No newline at end of file diff --git a/fonctions.php b/fonctions.php index 33d91c5..960f336 100644 --- a/fonctions.php +++ b/fonctions.php @@ -37,38 +37,46 @@ // //========================================================================== -if(ini_get('date.timezone') == '') +if(ini_get('date.timezone') == '') { date_default_timezone_set("Europe/Paris"); +} include_once('variables.php'); include_once('i18n.php'); require_once('adodb/adodb.inc.php'); -function connexion_base(){ - $DB = NewADOConnection(BASE_TYPE); - $DB->Connect(SERVEURBASE, USERBASE, USERPASSWD, BASE); - //$DB->debug = true; - return $DB; +function connexion_base() +{ + $DB = NewADOConnection(BASE_TYPE); + $DB->Connect(SERVEURBASE, USERBASE, USERPASSWD, BASE); + //$DB->debug = true; + return $DB; } -function get_server_name() { + +function get_server_name() +{ $scheme = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? 'https' : 'http'; - $url = sprintf("%s://%s%s", $scheme, - STUDS_URL, - dirname($_SERVER["SCRIPT_NAME"])); - if (!preg_match("|/$|", $url)){ - $url = $url."/"; - } - return $url; + $url = sprintf("%s://%s%s", $scheme, STUDS_URL, dirname($_SERVER["SCRIPT_NAME"])); + + if (!preg_match("|/$|", $url)) { + $url = $url."/"; + } + + return $url; } -function get_sondage_from_id($id) { + +function get_sondage_from_id($id) +{ global $connect; + // Ouverture de la base de données if(preg_match(";^[\w\d]{16}$;i",$id)) { $sql = 'SELECT sondage.*,sujet_studs.sujet FROM sondage - LEFT OUTER JOIN sujet_studs ON sondage.id_sondage = sujet_studs.id_sondage - WHERE sondage.id_sondage = '.$connect->Param('id_sondage'); + LEFT OUTER JOIN sujet_studs ON sondage.id_sondage = sujet_studs.id_sondage + WHERE sondage.id_sondage = '.$connect->Param('id_sondage'); + $sql = $connect->Prepare($sql); $sondage=$connect->Execute($sql, array($id)); @@ -80,9 +88,71 @@ function get_sondage_from_id($id) { $psondage->date_fin = strtotime($psondage->date_fin); return $psondage; } + return false; } + +function is_error($cerr) +{ + global $err; + if ( $err == 0 ) { + return false; + } + + return (($err & $cerr) != 0 ); +} + + +function is_user() +{ + return isset($_SERVER['REMOTE_USER']) || (isset($_SESSION['nom'])); +} + + +function print_header($js = false) +{ + echo ' + + + + '.NOMAPPLICATION.' + '; + + if($js) { + echo ''; + } + + echo ''; +} + + +function check_table_sondage() +{ + global $connect; + $tables = $connect->MetaTables('TABLES'); + if (in_array("sondage", $tables)) { + return true; + } + return false; +} + + +/** + * Vérifie une adresse e-mail selon les normes RFC + * @param string $email l'adresse e-mail a vérifier + * @return bool vrai si l'adresse est correcte, faux sinon + * @see http://fightingforalostcause.net/misc/2006/compare-email-regex.php + * @see http://svn.php.net/viewvc/php/php-src/trunk/ext/filter/logical_filters.c?view=markup + */ +function validateEmail($email) +{ + $pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD'; + + return (bool)preg_match($pattern, $email); +} + + $connect=connexion_base(); define('COMMENT_EMPTY', 0x0000000001); @@ -95,55 +165,4 @@ define('NO_POLL_ID', 0x0001000000); define('INVALID_EMAIL', 0x0010000000); define('TITLE_EMPTY', 0x0100000000); define('INVALID_DATE', 0x1000000000); -$err = 0; - -function is_error($cerr) { - global $err; - if ( $err == 0 ) - return false; - return (($err & $cerr) != 0 ); -} - - -function is_user() { - return isset($_SERVER['REMOTE_USER']) || (isset($_SESSION['nom'])); -} - -function print_header($js = false) { - ?> - - - - - <?php echo NOMAPPLICATION; ?> - -'; -echo ''; -} - -function check_table_sondage() { - global $connect; - $tables = $connect->MetaTables('TABLES'); - if (in_array("sondage", $tables)) - return true; - return false; -} - - - -/** - * Vérifie une adresse e-mail selon les normes RFC - * @param string $email l'adresse e-mail a vérifier - * @return bool vrai si l'adresse est correcte, faux sinon - * @see http://fightingforalostcause.net/misc/2006/compare-email-regex.php - * @see http://svn.php.net/viewvc/php/php-src/trunk/ext/filter/logical_filters.c?view=markup - */ -function validateEmail($email) { - $pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD'; - - return (bool)preg_match($pattern, $email); -} - -?> +$err = 0; \ No newline at end of file diff --git a/i18n.php b/i18n.php index fbb2709..3ca9a33 100644 --- a/i18n.php +++ b/i18n.php @@ -1,18 +1,14 @@ +$_SESSION['langue'] = strtoupper($a[0]); \ No newline at end of file diff --git a/index.php b/index.php index 3cce186..019e43d 100644 --- a/index.php +++ b/index.php @@ -38,10 +38,11 @@ //========================================================================== include_once('fonctions.php'); -if (is_readable('bandeaux_local.php')) - include_once('bandeaux_local.php'); -else - include_once('bandeaux.php'); +if (is_readable('bandeaux_local.php')) { + include_once('bandeaux_local.php'); +} else { + include_once('bandeaux.php'); +} session_start(); @@ -65,14 +66,12 @@ bandeau_titre(_("Make your polls")); sous_bandeau(); echo '
    '."\n"; - echo '

    '.NOMAPPLICATION.'
    '. _("What is it about?") .'

    '; echo '

    '. _("Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'

    '."\n".'
    '."\n"; - echo '
    '. _("Make a poll") .'' . - '' . - '' . _('Make a poll') . '' . - '
    ' . "\n"; + '' . + '' . _('Make a poll') . '' . + '
    ' . "\n"; echo '
    '."\n"; echo '

    '."\n"; @@ -83,8 +82,4 @@ echo ''."\n"; bandeau_pied(); echo ''."\n"; -echo ''."\n"; - - - -?> +echo ''."\n"; \ No newline at end of file diff --git a/infos_sondage.php b/infos_sondage.php index 1348fa0..0737a8c 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -39,68 +39,70 @@ session_start(); include_once('fonctions.php'); -if (file_exists('bandeaux_local.php')) - include_once('bandeaux_local.php'); -else - include_once('bandeaux.php'); +if (file_exists('bandeaux_local.php')) { + include_once('bandeaux_local.php'); +} else { + include_once('bandeaux.php'); +} #tests -if (($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ - $_SESSION["titre"]=$_POST["titre"]; - $_SESSION["nom"]=$_POST["nom"]; - $_SESSION["adresse"]=$_POST["adresse"]; - $_SESSION["commentaires"]=$_POST["commentaires"]; - - unset($_SESSION["studsplus"]); - if ($_POST["studsplus"]) - $_SESSION["studsplus"] = '+'; - - unset($_SESSION["mailsonde"]); - if ($_POST["mailsonde"]) - $_SESSION["mailsonde"] = true; - - if(!filter_var($_POST["adresse"], FILTER_VALIDATE_EMAIL) || strpos($_POST["adresse"], '@') === false) { - $erreur_adresse = true; - } - if (preg_match(';<|>|";',$_POST["titre"])){ - $erreur_injection_titre = true; - } - if (preg_match(';<|>|";',$_POST["nom"])){ - $erreur_injection_nom = true; - } - if (preg_match(';<|>|";',$_POST["commentaires"])){ - $erreur_injection_commentaires = true; - } - - // Si pas d'erreur dans l'adresse alors on change de page vers date ou autre - if ($_POST["titre"] && $_POST["nom"] && $_POST["adresse"] && - ! $erreur_adresse && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom ){ - if ($_POST["creation_sondage_date"]||$_POST["creation_sondage_date_x"]){ - header("Location:choix_date.php"); - exit(); - } - - if ($_POST["creation_sondage_autre"]||$_POST["creation_sondage_autre_x"]){ - header("Location:choix_autre.php"); - exit(); - } - } - - //En cas d'erreur, recuperation des variables deja entrées - if (empty($_POST["titre"]) || empty($_POST["adresse"]) || empty($_POST["nom"])) { - $_SESSION["titre"]=$_POST["titre"]; - $_SESSION["nom"]=$_POST["nom"]; - $_SESSION["adresse"]=$_POST["adresse"]; - $_SESSION["commentaires"]=$_POST["commentaires"]; - } - +if (($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { + $_SESSION["titre"]=$_POST["titre"]; + $_SESSION["nom"]=$_POST["nom"]; + $_SESSION["adresse"]=$_POST["adresse"]; + $_SESSION["commentaires"]=$_POST["commentaires"]; + + unset($_SESSION["studsplus"]); + if ($_POST["studsplus"]) { + $_SESSION["studsplus"] = '+'; + } + + unset($_SESSION["mailsonde"]); + if ($_POST["mailsonde"]) { + $_SESSION["mailsonde"] = true; + } + + if(!filter_var($_POST["adresse"], FILTER_VALIDATE_EMAIL) || strpos($_POST["adresse"], '@') === false) { + $erreur_adresse = true; + } + + if (preg_match(';<|>|";',$_POST["titre"])) { + $erreur_injection_titre = true; + } + + if (preg_match(';<|>|";',$_POST["nom"])) { + $erreur_injection_nom = true; + } + + if (preg_match(';<|>|";',$_POST["commentaires"])) { + $erreur_injection_commentaires = true; + } + + // Si pas d'erreur dans l'adresse alors on change de page vers date ou autre + if ($_POST["titre"] && $_POST["nom"] && $_POST["adresse"] && ! $erreur_adresse && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom ) { + if ($_POST["creation_sondage_date"]||$_POST["creation_sondage_date_x"]) { + header("Location:choix_date.php"); + exit(); + } + + if ($_POST["creation_sondage_autre"]||$_POST["creation_sondage_autre_x"]) { + header("Location:choix_autre.php"); + exit(); + } + } + + //En cas d'erreur, recuperation des variables deja entrées + if (empty($_POST["titre"]) || empty($_POST["adresse"]) || empty($_POST["nom"])) { + $_SESSION["titre"]=$_POST["titre"]; + $_SESSION["nom"]=$_POST["nom"]; + $_SESSION["adresse"]=$_POST["adresse"]; + $_SESSION["commentaires"]=$_POST["commentaires"]; + } } //affichage de la page - print_header(true); echo ''."\n"; - //affichage des bandeaux de tete logo(); bandeau_tete(); @@ -108,10 +110,10 @@ echo '
    '. _("Poll creation (1 on 2)") .'
    '."\n"; sous_bandeau(); // premier sondage ? test l'existence des schémas SQL avant d'aller plus loin -if(! check_table_sondage() ) { +if(!check_table_sondage()) { echo '

    ' . - _("STUdS is not properly installed, please check the 'INSTALL' to setup the database before continuing") . - "

    "."\n"; + _("STUdS is not properly installed, please check the 'INSTALL' to setup the database before continuing") . + "

    "."\n"; bandeau_pied(); echo ''."\n"; echo ''."\n"; @@ -128,44 +130,50 @@ echo '
    '. _("You are in the poll creation section.
    Required fields canno echo ''."\n"; echo ''."\n"; -if (!$_SESSION["titre"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ - print ""."\n"; -} -elseif ($erreur_injection_titre){ - print "
    "."\n"; +if (!$_SESSION["titre"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { + print ""."\n"; +} elseif ($erreur_injection_titre) { + print "
    "."\n"; } + echo ''."\n"; echo ''."\n"; -if ($erreur_injection_commentaires){ - print "
    "."\n"; + +if ($erreur_injection_commentaires) { + print "
    "."\n"; } + echo ''."\n"; echo ''."\n"; -else - echo ''."\n"; -if (!$_SESSION["nom"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ - print ""."\n"; + +if (isset($_SERVER['REMOTE_USER'])) { + echo ''.$_SESSION["nom"].''."\n"; +} else { + echo ''."\n"; } -elseif ($erreur_injection_nom){ - print "
    "."\n"; + +if (!$_SESSION["nom"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { + print ""."\n"; +} elseif ($erreur_injection_nom) { + print "
    "."\n"; } + echo ''."\n"; echo ''."\n"; -else - echo ''."\n"; -if (!$_SESSION["adresse"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ - print ""."\n"; + +if (isset($_SERVER['REMOTE_USER'])) { + echo ''.$_SESSION["adresse"].''."\n"; +} else { + echo ''."\n"; } -elseif ($erreur_adresse&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])){ - print ""."\n"; + +if (!$_SESSION["adresse"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { + print ""."\n"; +} elseif ($erreur_adresse&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { + print ""."\n"; } echo ''."\n"; - echo '
    '. _("Poll title *: ") .'" . _("Enter a title") . "" . _("Characters < > and \" are not permitted") . "" . _("Enter a title") . "" . _("Characters < > and \" are not permitted") . "
    '. _("Comments: ") .'" . _("Characters < > and \" are not permitted") . "" . _("Characters < > and \" are not permitted") . "
    '. _("Your name*: ") .''; -if (isset($_SERVER['REMOTE_USER'])) - echo ''.$_SESSION["nom"].'" . _("Enter a name") . "" . _("Characters < > and \" are not permitted") . "" . _("Enter a name") . "" . _("Characters < > and \" are not permitted") . "
    '. _("Your e-mail address *: ") .''; -if (isset($_SERVER['REMOTE_USER'])) - echo ''.$_SESSION["adresse"].'" . _("Enter an email address") . " " . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "" . _("Enter an email address") . " " . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "
    '."\n"; //focus javascript sur le premier champ @@ -176,11 +184,20 @@ echo ''."\n"; echo '
    '. _("The fields marked with * are required!") .'

    '."\n"; #affichage du cochage par défaut -if (!$_SESSION["studsplus"]&&!$_POST["creation_sondage_date"]&&!$_POST["creation_sondage_autre"]&&!$_POST["creation_sondage_date_x"]&&!$_POST["creation_sondage_autre_x"]){$_SESSION["studsplus"]="+";} +if (!$_SESSION["studsplus"]&&!$_POST["creation_sondage_date"]&&!$_POST["creation_sondage_autre"]&&!$_POST["creation_sondage_date_x"]&&!$_POST["creation_sondage_autre_x"]) { + $_SESSION["studsplus"]="+"; +} + +if ($_SESSION["studsplus"]=="+") { + $cocheplus="checked"; +} -if ($_SESSION["studsplus"]=="+"){$cocheplus="checked";} echo ''. _(" Voters can modify their vote themselves.") .'
    '."\n"; -if ($_SESSION["mailsonde"]){$cochemail="checked";} + +if ($_SESSION["mailsonde"]) { + $cochemail="checked"; +} + echo ''. _(" To receive an email for each new vote.") .'
    '."\n"; //affichage des boutons pour choisir sondage date ou autre @@ -188,8 +205,7 @@ echo '
    '."\n"; echo ' '."\n"; echo ''."\n"; echo ' '."\n"; -echo ''."\n"; +echo ''."\n"; echo '
    '. _("Schedule an event") .'
    '. _("Make a choice") .'
    '."\n"; echo '


    '."\n"; echo ''."\n"; @@ -197,5 +213,4 @@ echo ''."\n"; //bandeau de pied bandeau_pied(); echo ''."\n"; -echo ''."\n"; -?> +echo ''."\n"; \ No newline at end of file diff --git a/maintenance.php b/maintenance.php index 738e013..576c9a8 100644 --- a/maintenance.php +++ b/maintenance.php @@ -60,6 +60,4 @@ echo ''."\n"; sur_bandeau_pied(); bandeau_pied(); echo ''."\n"; -echo ''."\n"; - -?> +echo ''."\n"; \ No newline at end of file diff --git a/scripts/migration_date.php b/scripts/migration_date.php index 230ab3f..40bf6c8 100644 --- a/scripts/migration_date.php +++ b/scripts/migration_date.php @@ -40,51 +40,37 @@ //ouverture de la connection avec la base SQL $connect = pg_connect("host= dbname= user="); - $sondage=pg_exec($connect, "select * from sondage where format='D' or format='D+'"); -for ($i=0;$iid_sondage." "; - $sujets=pg_exec($connect, "select sujet from sujet_studs where id_sondage='$dsondage->id_sondage'"); - $dsujets=pg_fetch_object($sujets,0); - - $nouvelledateaffiche=""; - $anciensujethoraires=explode(",",$dsujets->sujet); - - for ($j=0;$j '.$nouvelledate.'@'.$ancientsujet[1].'
    '; - $nouvelledateaffiche.=$nouvelledate.'@'.$ancientsujet[1].','; - - - } - } - - else{ - - if (preg_match(";(\d{1,2})/(\d{1,2})/(\d{4});",$anciensujethoraires[$j],$registredate)){ - $nouvelledate=mktime(0,0,0,$registredate[2],$registredate[1],$registredate[3]); -// echo $anciensujethoraires[$j].' ---- > '.$nouvelledate.'
    '; - $nouvelledateaffiche.=$nouvelledate.','; - - } - } - } - $nouvelledateaffiche=substr($nouvelledateaffiche,0,-1); - print $dsujets->sujet.' donne '.$nouvelledateaffiche.'\n\n'; -// pg_exec($connect,"update sujet_studs set sujet='$nouvelledateaffiche' where id_sondage='$dsondage->id_sondage'"); - -} - - -?> +for ($i=0;$iid_sondage." "; + $sujets=pg_exec($connect, "select sujet from sujet_studs where id_sondage='$dsondage->id_sondage'"); + $dsujets=pg_fetch_object($sujets,0); + + $nouvelledateaffiche=""; + $anciensujethoraires=explode(",",$dsujets->sujet); + + for ($j=0;$j '.$nouvelledate.'@'.$ancientsujet[1].'
    '; + $nouvelledateaffiche.=$nouvelledate.'@'.$ancientsujet[1].','; + } + } else { + if (preg_match(";(\d{1,2})/(\d{1,2})/(\d{4});",$anciensujethoraires[$j],$registredate)) { + $nouvelledate=mktime(0,0,0,$registredate[2],$registredate[1],$registredate[3]); + // echo $anciensujethoraires[$j].' ---- > '.$nouvelledate.'
    '; + $nouvelledateaffiche.=$nouvelledate.','; + } + } + } + + $nouvelledateaffiche=substr($nouvelledateaffiche,0,-1); + print $dsujets->sujet.' donne '.$nouvelledateaffiche.'\n\n'; + // pg_exec($connect,"update sujet_studs set sujet='$nouvelledateaffiche' where id_sondage='$dsondage->id_sondage'"); +} \ No newline at end of file diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php index e183b6d..280ac7f 100644 --- a/scripts/nettoyage_sondage.php +++ b/scripts/nettoyage_sondage.php @@ -43,22 +43,17 @@ include_once('../fonctions.php'); $date_courante=date("U"); $date=date('H:i:s d/m/Y:'); - //ouverture de la connection avec la base SQL $sondage=$connect->Execute("select * from sondage"); -while ( $dsondage=$sondage->FetchNextObject(false)) { - - if ($date_courante > strtotime($dsondage->date_fin)){ - - //destruction des données dans la base - $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. - 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . - 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . - "WHERE id_sondage = '$dsondage->id_sondage' "); - - // ecriture des traces dans le fichier de logs - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", '../admin/logs_studs.txt'); - } -} -?> +while ($dsondage=$sondage->FetchNextObject(false)) { + if ($date_courante > strtotime($dsondage->date_fin)) { + //destruction des données dans la base + $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . + 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . + "WHERE id_sondage = '$dsondage->id_sondage' "); + // ecriture des traces dans le fichier de logs + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", '../admin/logs_studs.txt'); + } +} \ No newline at end of file diff --git a/scripts/phpVar2getText.php b/scripts/phpVar2getText.php index be7e6bd..cb22655 100644 --- a/scripts/phpVar2getText.php +++ b/scripts/phpVar2getText.php @@ -1,24 +1,25 @@ .inc + build un assoc array + preg_replace les appels wrappés dans gettext() dans le php principal + generate un .po + + ( + echo -e "\x27\2\x27,/p' lang/en.inc; + echo '); ?>' + ) > /tmp/lang.mod + (manually tweak 2 double quotes) +*/ - choppe un fichier $vara="traduction"; dans .inc - build un assoc array - preg_replace les appels wrappés dans gettext() dans le php principal - - generate un .po - - ( - echo -e "\x27\2\x27,/p' lang/en.inc; - echo '); ?>' - ) > /tmp/lang.mod - (manually tweak 2 double quotes) - */ - - // drop a $l which contain the array -if(isset($_SERVER['PHP_SELF'])) +// drop a $l which contain the array +if(isset($_SERVER['PHP_SELF'])) { die(); // die if not run with php-cli +} + require_once('/tmp/lang.mod'); $mypath = '/var/www/studs'; @@ -43,19 +44,23 @@ msgstr "" '; - /* helpers */ -function stripN($a) { +function stripN($a) +{ return preg_replace("/\n/","\\n", $a); } -function addDQ($a) { + +function addDQ($a) +{ return addcslashes($a,'"'); } /* low priority for weak regexps (small variable length) at the end, please */ -function cmp($a, $b) { +function cmp($a, $b) +{ return (mb_strlen($a) < mb_strlen($b)); } + uksort($l, 'cmp'); /* @@ -79,12 +84,15 @@ foreach($l as $k => $v) { } foreach (new DirectoryIterator('.') as $fileInfo) { - if($fileInfo->isDot()) continue; + if($fileInfo->isDot()) { + continue; + } + $name = $fileInfo->getFilename(); // process php files - if(!preg_match('/\.php$/' , $name) || - preg_match('/phpVar2getText/', $name)) + if(!preg_match('/\.php$/' , $name) || preg_match('/phpVar2getText/', $name)) { continue; + } $orig = file_get_contents($name); $a = preg_replace($match0, $repl0, $orig, -1, $b); @@ -114,16 +122,14 @@ foreach(array('fr_FR','es_ES','de_DE', 'en_GB') as $i) { foreach(array_unique($l) as $k => $v) { /* poedit is strict with its syntax */ $po_ready_v = stripN(addDQ($v)); - if($f == 'en') - $a .= 'msgid "' . $po_ready_v . '"' . "\n" . - 'msgstr "' . $po_ready_v . '"' . "\n\n"; - else + if($f == 'en') { + $a .= 'msgid "' . $po_ready_v . '"' . "\n" . 'msgstr "' . $po_ready_v . '"' . "\n\n"; + } else { $a .= 'msgid "' . $po_ready_v . '"' . "\n" . /* ${$k} the key (var name) in the orig (EN) array to look for as a raw $var while the .inc is included in the context */ 'msgstr "' . stripN(addDQ(${$k})) . '"' . "\n\n"; + } } file_put_contents('locale/' . $f . '_' . $g . '/LC_MESSAGES/Studs.po', $header . $a); -} - -?> +} \ No newline at end of file diff --git a/scripts/recherche_adresse.pl b/scripts/recherche_adresse.pl index b7cd63c..0c5886d 100644 --- a/scripts/recherche_adresse.pl +++ b/scripts/recherche_adresse.pl @@ -38,16 +38,9 @@ #!/usr/bin/perl - open (FILE,"../admin/logs_studs.txt"); -while (){ - - /.*\t(.*u-strasbg.fr)\t.*/; - - print $1."\n"; - - +while () { + /.*\t(.*u-strasbg.fr)\t.*/; + print $1."\n"; } - - diff --git a/scripts/recherche_adresse_admin.php b/scripts/recherche_adresse_admin.php index 421aa31..b023b03 100644 --- a/scripts/recherche_adresse_admin.php +++ b/scripts/recherche_adresse_admin.php @@ -40,18 +40,10 @@ //ouverture de la connection avec la base SQL $connect = pg_connect("host= dbname= user="); - $sondage=pg_exec($connect, "select distinct mail_admin from sondage "); for ($i=0;$imail_admin, "; -// print "$dsondage->mail_admin\n"; - - -} - - -?> + $dsondage=pg_fetch_object($sondage,$i); + print "$dsondage->mail_admin, "; + // print "$dsondage->mail_admin\n"; +} \ No newline at end of file diff --git a/sources/sources.php b/sources/sources.php index 74a7587..04d9fc9 100644 --- a/sources/sources.php +++ b/sources/sources.php @@ -61,6 +61,4 @@ echo ''."\n"; // Affichage du bandeau de pied bandeau_pied(); echo ''."\n"; -echo ''."\n"; - -?> +echo ''."\n"; \ No newline at end of file diff --git a/studs.php b/studs.php index e96c1c1..e940f79 100644 --- a/studs.php +++ b/studs.php @@ -39,10 +39,11 @@ session_start(); -if (file_exists('bandeaux_local.php')) - include_once('bandeaux_local.php'); -else - include_once('bandeaux.php'); +if (file_exists('bandeaux_local.php')) { + include_once('bandeaux_local.php'); +} else { + include_once('bandeaux.php'); +} include_once('fonctions.php'); // Le fichier studs.php sert a afficher les résultats d'un sondage à un simple utilisateur. @@ -53,59 +54,64 @@ $numsondage = false; if(isset($_GET["sondage"])) { $numsondage=$_GET["sondage"]; $_SESSION["numsondage"] = $numsondage; - } +} + if(isset($_POST["sondage"])) { $numsondage=$_POST["sondage"]; $_SESSION["numsondage"] = $numsondage; - } -elseif(isset($_COOKIE["sondage"])) { +} elseif(isset($_COOKIE["sondage"])) { $numsondage=$_COOKIE["sondage"]; -} -elseif(isset($_SESSION["numsondage"])) { +} elseif(isset($_SESSION["numsondage"])) { $numsondage=$_SESSION["numsondage"]; } -if($numsondage) { +if ($numsondage) { $dsondage = get_sondage_from_id($numsondage); - if(!$dsondage) + if(!$dsondage) { $err |= NO_POLL; -} -else + } +} else { $err |= NO_POLL_ID; - +} //output a CSV and die() if(isset($_GET['export']) && $Sondage) { - if($_GET['export'] == 'csv') + if($_GET['export'] == 'csv') { require_once('exportcsv.php'); - if($_GET['export'] == 'ics' && $Sondage->is_date) + } + + if($_GET['export'] == 'ics' && $Sondage->is_date) { require_once('exportics.php'); + } + die(); - } +} // quand on ajoute un commentaire utilisateur if(isset($_POST['ajoutcomment'])) { - if (isset($_SERVER['REMOTE_USER'])) + if (isset($_SERVER['REMOTE_USER'])) { $comment_user = $_SESSION['nom']; - elseif(isset($_POST["commentuser"]) && ! empty($_POST["commentuser"])) + } elseif(isset($_POST["commentuser"]) && ! empty($_POST["commentuser"])) { $comment_user = $connect->qstr(strip_tags($_POST["commentuser"])); - elseif(isset($_POST["commentuser"])) + } elseif(isset($_POST["commentuser"])) { $err |= COMMENT_USER_EMPTY; - else + } else { $comment_user = _('anonyme'); - if(empty($_POST["comment"])) + } + + if(empty($_POST["comment"])) { $err |= COMMENT_EMPTY; + } - if (isset($_POST["comment"]) && - ! is_error(COMMENT_EMPTY) && ! is_error(NO_POLL) && - ! is_error(COMMENT_USER_EMPTY)) { + if (isset($_POST["comment"]) && ! is_error(COMMENT_EMPTY) && ! is_error(NO_POLL) && ! is_error(COMMENT_USER_EMPTY)) { if( ! $connect->Execute('INSERT INTO comments ' . - '(id_sondage, comment, usercomment) VALUES ("'. - $numsondage . '","'. - $connect->qstr(strip_tags($_POST['comment'])). - '","' . - $comment_user .'")') ); - $err |= COMMENT_INSERT_FAILED; + '(id_sondage, comment, usercomment) VALUES ("'. + $numsondage . '","'. + $connect->qstr(strip_tags($_POST['comment'])). + '","' . + $comment_user .'")') ) { + $err |= COMMENT_INSERT_FAILED; + } } } @@ -113,55 +119,51 @@ if(isset($_POST['ajoutcomment'])) { // Action quand on clique le bouton participer $user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' ORDER BY id_users"); $nbcolonnes=substr_count($dsondage->sujet,',')+1; -if ( ! is_error(NO_POLL) && isset($_POST["boutonp"]) ){ +if (!is_error(NO_POLL) && isset($_POST["boutonp"])) { //Si le nom est bien entré - if (! isset($_POST["nom"]) || empty($_POST['nom'])) + if (! isset($_POST["nom"]) || empty($_POST['nom'])) { $err |= NAME_EMPTY; - if(! is_error(NAME_EMPTY) && - (!isset($_SERVER['REMOTE_USER']) || $_POST["nom"] == $_SESSION["nom"]) ) { - for ($i=0;$i<$nbcolonnes;$i++){ + } + + if(!is_error(NAME_EMPTY) && (!isset($_SERVER['REMOTE_USER']) || $_POST["nom"] == $_SESSION["nom"])) { + for ($i=0;$i<$nbcolonnes;$i++) { // Si la checkbox est enclenchée alors la valeur est 1 - if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1'){ - $nouveauchoix.="1"; - } - // sinon c'est 0 - else { - $nouveauchoix.="0"; + if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1') { + $nouveauchoix.="1"; + } else { // sinon c'est 0 + $nouveauchoix.="0"; } } while($user = $user_studs->FetchNextObject(false)) { - if ($_POST["nom"]==$user->nom) - $err |= NAME_TAKEN; + if ($_POST["nom"]==$user->nom) { + $err |= NAME_TAKEN; + } } // Ecriture des choix de l'utilisateur dans la base - if (! is_error(NAME_TAKEN) && ! is_error(NAME_EMPTY)) { + if (!is_error(NAME_TAKEN) && ! is_error(NAME_EMPTY)) { // TODO: throw error $nom=substr($_POST["nom"],0,64); $connect->Execute('INSERT INTO user_studs (nom,id_sondage,reponses) VALUES ("' . - $nom . '","' . - $numsondage . '","' . - $nouveauchoix . '")'); + $nom . '","' . + $numsondage . '","' . + $nouveauchoix . '")'); - if ($dsondage->mailsonde || - /* compatibility for non boolean DB */ - $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { - - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$dsondage->mail_admin", - "[".NOMAPPLICATION."] "._("Poll's participation")." : $dsondage->titre", - - "\"$nom\" ". - _("has filled a line.\nYou can find your poll at the link") . " :\n\n". - get_server_name()."/studs.php?sondage=$numsondage \n\n" . - _("Thanks for your confidence.") . "\n". NOMAPPLICATION, - $headers); + if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$dsondage->mail_admin", + "[".NOMAPPLICATION."] "._("Poll's participation")." : $dsondage->titre", + "\"$nom\" ". + _("has filled a line.\nYou can find your poll at the link") . " :\n\n". + get_server_name()."/studs.php?sondage=$numsondage \n\n" . + _("Thanks for your confidence.") . "\n". NOMAPPLICATION, + $headers); } } - } - else + } else { $err |= NAME_EMPTY; + } } print_header(true); @@ -175,28 +177,30 @@ if($err != 0) { bandeau_titre(_("Error!")); echo '
      '."\n"; - if(is_error(NAME_EMPTY)) + if(is_error(NAME_EMPTY)) { echo '
    • ' . _("Enter a name !") . "
      • \n"; - if(is_error(NAME_TAKEN)) + } + if(is_error(NAME_TAKEN)) { echo '
    • ' . - _("The name you've chosen already exist in this poll!") . - "
      • \n"; - if(is_error(COMMENT_EMPTY) || is_error(COMMENT_USER_EMPTY)) + _("The name you've chosen already exist in this poll!") . + "\n"; + } + if(is_error(COMMENT_EMPTY) || is_error(COMMENT_USER_EMPTY)) { echo '
    • ' . - _("Enter a name and a comment!") . - "
      • \n"; - if(is_error(COMMENT_INSERT_FAILED) ) + _("Enter a name and a comment!") . + "\n"; + } + if(is_error(COMMENT_INSERT_FAILED) ) { echo '
    • ' . - _("Failed to insert the comment!") . - "
      • \n"; - + _("Failed to insert the comment!") . + "\n"; + } echo '
    '; if(is_error(NO_POLL_ID) || is_error(NO_POLL)) { echo '
    '."\n"; print "

    " . _("This poll doesn't exist !") . "

    "."\n"; - print _("Back to the homepage of") . ' '. NOMAPPLICATION . - '.'."\n"; + print _("Back to the homepage of") . ' '. NOMAPPLICATION . '.'."\n"; echo '



    '."\n"; echo '
    '."\n"; bandeau_pied(); @@ -205,400 +209,391 @@ if($err != 0) { echo ''."\n"; die(); } - } +} echo '
    '."\n"; //affichage du titre du sondage - $titre=str_replace("\\","",$dsondage->titre); - echo '

    '.$titre.'

    '."\n"; +$titre=str_replace("\\","",$dsondage->titre); +echo '

    '.$titre.'

    '."\n"; //affichage du nom de l'auteur du sondage echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'

    '."\n"; //affichage des commentaires du sondage - if ($dsondage->commentaires){ - echo _("Comments") .' :
    '."\n"; - $commentaires=$dsondage->commentaires; - $commentaires=str_replace("\\","",$commentaires); - echo $commentaires; +if ($dsondage->commentaires) { + echo _("Comments") .' :
    '."\n"; + $commentaires=$dsondage->commentaires; + $commentaires=str_replace("\\","",$commentaires); + echo $commentaires; + echo '
    '."\n"; +} - echo '
    '."\n"; - } - echo '
    '."\n"; +echo '
    '."\n"; echo '
    '."\n"; -echo '
    '."\n"; - +echo ''."\n"; echo ''; - - echo '
    '."\n"; - - echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line.") ."\n"; - - echo '

    '."\n"; +echo '
    '."\n"; +echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line.") ."\n"; +echo '

    '."\n"; // Debut de l'affichage des resultats du sondage - echo ''."\n"; +echo '
    '."\n"; //On récupere les données et les sujets du sondage - $nblignes=$user_studs->RecordCount(); +$nblignes=$user_studs->RecordCount(); - - //on teste pour voir si une ligne doit etre modifiée +//on teste pour voir si une ligne doit etre modifiée $testmodifier = false; $ligneamodifier = -1; - for ($i=0;$i<$nblignes;$i++){ - if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])){ - $ligneamodifier=$i; - } - //test pour voir si une ligne est a modifier - if ($_POST['validermodifier'.$i.'_x']){ - $modifier=$i; - $testmodifier=true; - } - } - //si le test est valide alors on affiche des checkbox pour entrer de nouvelles valeurs - if ($testmodifier){ +for ($i=0;$i<$nblignes;$i++) { + if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { + $ligneamodifier=$i; + } + + //test pour voir si une ligne est a modifier + if ($_POST['validermodifier'.$i.'_x']) { + $modifier=$i; + $testmodifier=true; + } +} - for ($i=0;$i<$nbcolonnes;$i++){ - //recuperation des nouveaux choix de l'utilisateur - if (isset($_POST["choix$i"]) && $_POST["choix$i"] == 1){ - $nouveauchoix.="1"; - } - else { - $nouveauchoix.="0"; - } - } +//si le test est valide alors on affiche des checkbox pour entrer de nouvelles valeurs +if ($testmodifier) { + for ($i=0;$i<$nbcolonnes;$i++) { + //recuperation des nouveaux choix de l'utilisateur + if (isset($_POST["choix$i"]) && $_POST["choix$i"] == 1) { + $nouveauchoix.="1"; + } else { + $nouveauchoix.="0"; + } + } + + $compteur=0; + while ($data=$user_studs->FetchNextObject(false) ) { + //mise a jour des données de l'utilisateur dans la base SQL + if ($compteur==$modifier) { + $connect->Execute("UPDATE user_studs SET reponses='$nouveauchoix' WHERE nom='$data->nom' AND id_users='$data->id_users'"); + if ($dsondage->mailsonde=="yes") { + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : $dsondage->titre", "\"$data->nom\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + } + } + + $compteur++; + } +} - $compteur=0; - while ($data=$user_studs->FetchNextObject(false) ) { - //mise a jour des données de l'utilisateur dans la base SQL - if ($compteur==$modifier){ - $connect->Execute("UPDATE user_studs SET reponses='$nouveauchoix' WHERE nom='$data->nom' AND id_users='$data->id_users'"); - if ($dsondage->mailsonde=="yes"){ - - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : $dsondage->titre", "\"$data->nom\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); - } - } - $compteur++; - } - } - //recuperation des utilisateurs du sondage - $user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' ORDER BY id_users"); - +$user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' ORDER BY id_users"); //reformatage des données des sujets du sondage - $toutsujet=explode(",",$dsondage->sujet); +$toutsujet=explode(",",$dsondage->sujet); //si le sondage est un sondage de date -if ($dsondage->format=="D"||$dsondage->format=="D+"){ - -//affichage des sujets du sondage - echo ''."\n"; - echo ''."\n"; - - //affichage des années - $colspan=1; - for ($i=0;$i'.date('Y', intval($toutsujet[$i])).''."\n"; - $colspan=1; - } - } - echo ''."\n"; - - echo ''."\n"; - echo ''."\n"; - //affichage des mois - $colspan=1; - for ($i=0;$i'.date("F",$cur).''."\n"; - else - echo ''."\n"; - $colspan=1; - } - } - echo ''."\n"; - - echo ''."\n"; - echo ''."\n"; - //affichage des jours - $colspan=1; - for ($i=0;$i'.date("D jS",$cur).''."\n"; - else - echo ''."\n"; - $colspan=1; - } - } - echo ''."\n"; - //affichage des horaires - if (strpos($dsondage->sujet, '@') !== false){ - echo ''."\n"; - echo ''."\n"; - - for ($i=0;$toutsujet[$i];$i++){ - $heures=explode("@",$toutsujet[$i]); - echo ''."\n"; - } - echo ''."\n"; - } +if ($dsondage->format=="D"||$dsondage->format=="D+") { + //affichage des sujets du sondage + echo ''."\n"; + echo ''."\n"; + + //affichage des années + $colspan=1; + for ($i=0;$i'.date('Y', intval($toutsujet[$i])).''."\n"; + $colspan=1; + } + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //affichage des mois + $colspan=1; + for ($i=0;$i'.date("F",$cur).''."\n"; + } else { + echo ''."\n"; + } + $colspan=1; + } + } + + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + + //affichage des jours + $colspan=1; + for ($i=0;$i'.date("D jS",$cur).''."\n"; + } else { + echo ''."\n"; + } + + $colspan=1; + } + } + + echo ''."\n"; + + //affichage des horaires + if (strpos($dsondage->sujet, '@') !== false) { + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$toutsujet[$i];$i++) { + $heures=explode("@",$toutsujet[$i]); + echo ''."\n"; + } + + echo ''."\n"; + } +} else { + $toutsujet=str_replace("°","'",$toutsujet); + + //affichage des sujets du sondage + echo ''."\n"; + echo ''."\n"; + + for ($i=0;$toutsujet[$i];$i++) { + echo ''."\n"; + } + + echo ''."\n"; } -else { - $toutsujet=str_replace("°","'",$toutsujet); - -//affichage des sujets du sondage - echo ''."\n"; - echo ''."\n"; - - for ($i=0;$toutsujet[$i];$i++){ - - echo ''."\n"; - } - echo ''."\n"; - -} - //Usager pré-authentifié dans la liste? - $user_mod = FALSE; +$user_mod = FALSE; + //affichage des resultats actuels $somme = array(); - $compteur = 0; +$compteur = 0; - while ($data=$user_studs->FetchNextObject(false)) { +while ($data=$user_studs->FetchNextObject(false)) { + echo ''."\n"; + echo ''."\n"; + + // Les réponses qu'il a choisit + $ensemblereponses=$data->reponses; + + // ligne d'un usager pré-authentifié + $mod_ok = !isset($_SERVER['REMOTE_USER']) || ($nombase == $_SESSION['nom']); + $user_mod |= $mod_ok; + + // pour chaque colonne + for ($k=0; $k < $nbcolonnes; $k++) { + // on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs + if ($compteur == $ligneamodifier) { + echo ''."\n"; + } else { + $car=substr($ensemblereponses,$k,1); + if ($car=="1") { + echo ''."\n"; + $somme[$k]++; + } else { + echo ''."\n"; + } + } + } + + //a la fin de chaque ligne se trouve les boutons modifier + if ($compteur != $ligneamodifier && ($dsondage->format=="A+"||$dsondage->format=="D+") && $mod_ok) { + echo ''."\n"; + } + + //demande de confirmation pour modification de ligne + for ($i=0;$i<$nblignes;$i++) { + if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])) { + if ($compteur==$i) { + echo ''."\n"; + } + } + } + + $compteur++; + echo ''."\n"; +} - echo ''."\n"; - echo ''."\n"; -// Les réponses qu'il a choisit - $ensemblereponses=$data->reponses; -// ligne d'un usager pré-authentifié - $mod_ok = !isset($_SERVER['REMOTE_USER']) || ($nombase == $_SESSION['nom']); - $user_mod |= $mod_ok; - // pour chaque colonne - for ($k=0; $k < $nbcolonnes; $k++){ - // on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs - if ($compteur == $ligneamodifier) { - echo ''."\n"; - } - else { - $car=substr($ensemblereponses,$k,1); - if ($car=="1"){ - echo ''."\n"; - $somme[$k]++; - } - else { - echo ''."\n"; - } - } - } - - //a la fin de chaque ligne se trouve les boutons modifier - if ($compteur != $ligneamodifier && ($dsondage->format=="A+"||$dsondage->format=="D+") && $mod_ok){ - echo ''."\n"; - } - - //demande de confirmation pour modification de ligne - for ($i=0;$i<$nblignes;$i++){ - if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])){ - if ($compteur==$i){ - echo ''."\n"; - } - } - } - $compteur++; - echo ''."\n"; - } - // affichage de la ligne pour un nouvel utilisateur - if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { - echo ''."\n"; - echo ''."\n"; - -// affichage des cases de formulaire checkbox pour un nouveau choix - for ($i=0;$i<$nbcolonnes;$i++){ - echo ''."\n"; - } - // Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base - echo ''."\n"; - echo ''."\n"; - } +if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { + echo ''."\n"; + echo ''."\n"; + + // affichage des cases de formulaire checkbox pour un nouveau choix + for ($i=0;$i<$nbcolonnes;$i++) { + echo ''."\n"; + } + + // Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base + echo ''."\n"; + echo ''."\n"; +} //determination de la meilleure date - // On cherche la meilleure colonne - for ($i=0;$i<$nbcolonnes;$i++){ - if ($i=="0"){ - $meilleurecolonne=$somme[$i]; - } - if ($somme[$i]>$meilleurecolonne){ - $meilleurecolonne=$somme[$i]; - } - } +for ($i=0;$i<$nbcolonnes;$i++) { + if ($i=="0") { + $meilleurecolonne=$somme[$i]; + } + + if ($somme[$i]>$meilleurecolonne) { + $meilleurecolonne=$somme[$i]; + } +} // Affichage des différentes sommes des colonnes existantes - echo ''."\n"; - echo ''."\n"; +echo ''."\n"; +echo ''."\n"; - for ($i=0;$i<$nbcolonnes;$i++){ - $affichesomme=$somme[$i]; - if ($affichesomme==""){$affichesomme="0";} - echo ''."\n"; - } - echo ''."\n"; - - echo ''."\n"; - echo ''."\n"; - for ($i=0;$i<$nbcolonnes;$i++){ - if ($somme[$i]==$meilleurecolonne&&$somme[$i]){ - echo ''."\n"; - } - else { - echo ''."\n"; - } +for ($i=0;$i<$nbcolonnes;$i++) { + $affichesomme=$somme[$i]; + if ($affichesomme=="") { + $affichesomme="0"; + } + + echo ''."\n"; +} - } - echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +echo ''."\n"; +for ($i=0;$i<$nbcolonnes;$i++) { + if ($somme[$i]==$meilleurecolonne&&$somme[$i]) { + echo ''."\n"; + } else { + echo ''."\n"; + } +} - echo '
    '.strftime("%B",$cur).'
    '.strftime("%a %e",$cur).'
    '.$heures[1].'
    '.strftime("%B",$cur).'
    '.strftime("%a %e",$cur).'
    '.$heures[1].'
    '.$toutsujet[$i].'
    '.$toutsujet[$i].'
    '; + + // Le nom de l'utilisateur + $nombase=str_replace("°","'",$data->nom); + echo $nombase.'OK
    '; - -// Le nom de l'utilisateur - $nombase=str_replace("°","'",$data->nom); - echo $nombase.'OK
    '."\n"; - if (isset($_SERVER['REMOTE_USER'])) - echo ''.$_SESSION['nom']."\n"; - else - echo ''."\n"; - echo '
    '."\n"; + if (isset($_SERVER['REMOTE_USER'])) { + echo ''.$_SESSION['nom']."\n"; + } else { + echo ''."\n"; + } + + echo '
    '. _("Addition") .'
    '. _("Addition") .''.$affichesomme.'
    ' . _('Best choice') . ''.$affichesomme.'
    ' . _('Best choice') . '
    '."\n"; - echo '
    '."\n"; +echo ''."\n"; +echo ''."\n"; +echo '
    '."\n"; // reformatage des données de la base pour les sujets - $toutsujet=explode(",",$dsondage->sujet); - $toutsujet=str_replace("°","'",$toutsujet); +$toutsujet=explode(",",$dsondage->sujet); +$toutsujet=str_replace("°","'",$toutsujet); // On compare le nombre de résultat avec le meilleur et si le résultat est égal // on concatene le resultat dans $meilleursujet +$compteursujet=0; +for ($i=0;$i<$nbcolonnes;$i++) { + if ($somme[$i]==$meilleurecolonne) { + $meilleursujet.=", "; + if ($dsondage->format=="D"||$dsondage->format=="D+") { + $meilleursujetexport=$toutsujet[$i]; + if (strpos($toutsujet[$i],'@') !== false) { + $toutsujetdate=explode("@",$toutsujet[$i]); + if ($_SESSION["langue"]=="EN") { + $meilleursujet.=date("l, F jS Y",$toutsujetdate[0])." " . _("for") ." ".$toutsujetdate[1]; + } else { + $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujetdate[0]). ' ' . _("for") . ' ' . $toutsujetdate[1]; + } + } else { + if ($_SESSION["langue"]=="EN") { + $meilleursujet.=date("l, F jS Y",$toutsujet[$i]); + } else { + $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujet[$i]); + } + } + } else { + $meilleursujet.=$toutsujet[$i]; + } + + $compteursujet++; + } +} - $compteursujet=0; - for ($i=0;$i<$nbcolonnes;$i++){ - if ($somme[$i]==$meilleurecolonne){ - $meilleursujet.=", "; - if ($dsondage->format=="D"||$dsondage->format=="D+"){ - $meilleursujetexport=$toutsujet[$i]; - if (strpos($toutsujet[$i],'@') !== false){ - $toutsujetdate=explode("@",$toutsujet[$i]); - if ($_SESSION["langue"]=="EN") - $meilleursujet.=date("l, F jS Y",$toutsujetdate[0])." " . _("for") ." ".$toutsujetdate[1]; - else - $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujetdate[0]). ' ' . _("for") . ' ' . $toutsujetdate[1]; - } - else { - if ($_SESSION["langue"]=="EN") - $meilleursujet.=date("l, F jS Y",$toutsujet[$i]); - else - $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujet[$i]); - } - } - else - $meilleursujet.=$toutsujet[$i]; - - $compteursujet++; - } - } - $meilleursujet=substr("$meilleursujet",1); - +$meilleursujet=substr("$meilleursujet",1); $vote_str = _('vote'); -if ($meilleurecolonne > 1) + +if ($meilleurecolonne > 1) { $vote_str = _('votes'); +} - echo '

    '."\n"; +echo '

    '."\n"; - // Affichage du meilleur choix - if ($compteursujet=="1"&&$meilleurecolonne){ - print 'Meilleur choix ' . _('The best choice at this time is:') . "$meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; - } - elseif ($meilleurecolonne){ - print 'Meilleur choix ' . _('The bests choices at this time are:') . " $meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; - } - - echo '

    '; - - //affichage des commentaires des utilisateurs existants - $comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); - if ($comment_user->RecordCount() != 0) { +// Affichage du meilleur choix +if ($compteursujet=="1"&&$meilleurecolonne) { + print 'Meilleur choix ' . _('The best choice at this time is:') . "$meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; +} elseif ($meilleurecolonne) { + print 'Meilleur choix ' . _('The bests choices at this time are:') . " $meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; +} - print "
    " . _("Comments of polled people") . " :
    \n"; - while( $dcomment=$comment_user->FetchNextObject(false)) { - print $dcomment->usercomment . ' : ' . $dcomment->comment . '
    '; - } +echo '

    '; - } - - //affichage de la case permettant de rajouter un commentaire par les utilisateurs - print '
    ' . - '

    ' ._("Add a comment in the poll:") . '

    ' . "\n"; +//affichage des commentaires des utilisateurs existants +$comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); +if ($comment_user->RecordCount() != 0) { + print "
    " . _("Comments of polled people") . " :
    \n"; + while( $dcomment=$comment_user->FetchNextObject(false)) { + print $dcomment->usercomment . ' : ' . $dcomment->comment . '
    '; + } +} + +//affichage de la case permettant de rajouter un commentaire par les utilisateurs +print '
    ' .'

    ' ._("Add a comment in the poll:") . '

    ' . "\n"; if (isset($_SERVER['REMOTE_USER']) || isset($_SESSION['nom'])) { echo _("Name") .' : '; echo '
    '."\n"; } + echo ''."\n"; echo '
    '."\n"; echo ''."\n"; // Focus javascript sur la case de texte du formulaire echo ''."\n"; - echo '
    '."\n"; - echo ''; echo ''."\n"; - - bandeau_pied_mobile(); - // Affichage du bandeau de pied - echo ''."\n"; - echo ''."\n"; - -?> +bandeau_pied_mobile(); +// Affichage du bandeau de pied +echo ''."\n"; +echo ''."\n"; \ No newline at end of file From ae1a4cdb5a67decd7280d633ee20bb9d44309f16 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 04:41:43 +0200 Subject: [PATCH 008/129] mail header is in var with bad name --- adminstuds.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminstuds.php b/adminstuds.php index 05824a0..1f0dd94 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -106,7 +106,7 @@ From: %s <%s> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EOF; -$header = sprintf($headers_str, NOMAPPLICATION, ADRESSEMAILADMIN ); +$headers = sprintf($headers_str, NOMAPPLICATION, ADRESSEMAILADMIN ); if (isset($_POST["boutonnouveautitre"])) { From 82ea497112f059ece86cfeb2248fa727f0e6e5e1 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 04:49:16 +0200 Subject: [PATCH 009/129] Add a function to test user params --- fonctions.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fonctions.php b/fonctions.php index 960f336..77c9f80 100644 --- a/fonctions.php +++ b/fonctions.php @@ -153,6 +153,22 @@ function validateEmail($email) } +/** + * Fonction vérifiant l'existance et la valeur non vide d'une clé d'un tableau + * @param string $name La clé à tester + * @param array $tableau Le tableau où rechercher la clé ($_POST par défaut) + * @return bool Vrai si la clé existe et renvoie une valeur non vide + */ +function issetAndNoEmpty($name, $tableau = null) +{ + if ($tableau === null) { + $tableau = $_POST; + } + + return (isset($tableau[$name]) === true && empty($tableau[$name]) === false); +} + + $connect=connexion_base(); define('COMMENT_EMPTY', 0x0000000001); From 2f81f48710a9f148842f30174e82d01f748b8bd8 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 05:03:10 +0200 Subject: [PATCH 010/129] delete php warning --- infos_sondage.php | 81 ++++++++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 29 deletions(-) diff --git a/infos_sondage.php b/infos_sondage.php index 0737a8c..de89495 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -45,59 +45,82 @@ if (file_exists('bandeaux_local.php')) { include_once('bandeaux.php'); } +// On teste toutes les variables pour supprimer l'ensemble des warnings PHP +// On transforme en entites html les données afin éviter les failles XSS +$post_var = array('titre', 'nom', 'adresse', 'commentaires', 'studsplus', 'mailsonde', 'creation_sondage_date', 'creation_sondage_date_x', 'creation_sondage_autre', 'creation_sondage_autre_x',); +foreach ($post_var as $var) { + if (isset($_POST[$var]) === true) { + $$var = htmlentities($_POST[$var], ENT_QUOTES, 'UTF-8'); + } else { + $$var = null; + } +} + +// On initialise egalement la session car sinon bonjour les warning :-) +$session_var = array('titre', 'nom', 'adresse', 'commentaires', 'mailsonde', 'studsplus', ); +foreach ($session_var as $var) { + if (issetAndNoEmpty($var, $_SESSION) === false) { + $_SESSION[$var] = null; + } +} + +// On initialise également les autres variables +$erreur_adresse = false; +$erreur_injection_titre = false; +$erreur_injection_nom = false; +$erreur_injection_commentaires = false; +$cocheplus = ''; +$cochemail = ''; + #tests -if (($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { - $_SESSION["titre"]=$_POST["titre"]; - $_SESSION["nom"]=$_POST["nom"]; - $_SESSION["adresse"]=$_POST["adresse"]; - $_SESSION["commentaires"]=$_POST["commentaires"]; +if (issetAndNoEmpty("creation_sondage_date") || issetAndNoEmpty("creation_sondage_autre") || issetAndNoEmpty("creation_sondage_date_x") || issetAndNoEmpty("creation_sondage_autre_x")){ + $_SESSION["titre"] = $titre; + $_SESSION["nom"] = $nom; + $_SESSION["adresse"] = $adresse; + $_SESSION["commentaires"] = $commentaires; unset($_SESSION["studsplus"]); - if ($_POST["studsplus"]) { - $_SESSION["studsplus"] = '+'; + if ($studsplus !== null) { + $_SESSION["studsplus"] = '+'; + } else { + $_SESSION["studsplus"] = ''; } unset($_SESSION["mailsonde"]); - if ($_POST["mailsonde"]) { + if ($mailsonde !== null) { $_SESSION["mailsonde"] = true; + } else { + $_SESSION["mailsonde"] = false; } - if(!filter_var($_POST["adresse"], FILTER_VALIDATE_EMAIL) || strpos($_POST["adresse"], '@') === false) { + if(validateEmail($adresse) === false) { $erreur_adresse = true; } - if (preg_match(';<|>|";',$_POST["titre"])) { + if (preg_match(';<|>|";',$titre)) { $erreur_injection_titre = true; } - if (preg_match(';<|>|";',$_POST["nom"])) { + if (preg_match(';<|>|";',$nom)) { $erreur_injection_nom = true; } - if (preg_match(';<|>|";',$_POST["commentaires"])) { + if (preg_match(';<|>|";',$commentaires)) { $erreur_injection_commentaires = true; } // Si pas d'erreur dans l'adresse alors on change de page vers date ou autre - if ($_POST["titre"] && $_POST["nom"] && $_POST["adresse"] && ! $erreur_adresse && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom ) { - if ($_POST["creation_sondage_date"]||$_POST["creation_sondage_date_x"]) { + if ($titre && $nom && $adresse && !$erreur_adresse && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom) { + if ($creation_sondage_date !== null || $creation_sondage_date_x !== null) { header("Location:choix_date.php"); exit(); } - if ($_POST["creation_sondage_autre"]||$_POST["creation_sondage_autre_x"]) { + if ($creation_sondage_autre !== null || $creation_sondage_autre_x !== null) { header("Location:choix_autre.php"); exit(); } } - - //En cas d'erreur, recuperation des variables deja entrées - if (empty($_POST["titre"]) || empty($_POST["adresse"]) || empty($_POST["nom"])) { - $_SESSION["titre"]=$_POST["titre"]; - $_SESSION["nom"]=$_POST["nom"]; - $_SESSION["adresse"]=$_POST["adresse"]; - $_SESSION["commentaires"]=$_POST["commentaires"]; - } } //affichage de la page @@ -111,7 +134,7 @@ sous_bandeau(); // premier sondage ? test l'existence des schémas SQL avant d'aller plus loin if(!check_table_sondage()) { - echo '

    ' . + echo '

    '. _("STUdS is not properly installed, please check the 'INSTALL' to setup the database before continuing") . "

    "."\n"; bandeau_pied(); @@ -130,7 +153,7 @@ echo '
    '. _("You are in the poll creation section.
    Required fields canno echo ''."\n"; echo ''."\n"; -if (!$_SESSION["titre"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { +if (!$_SESSION["titre"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) { print ""."\n"; } elseif ($erreur_injection_titre) { print "
    "."\n"; @@ -152,7 +175,7 @@ if (isset($_SERVER['REMOTE_USER'])) { echo ''."\n"; } -if (!$_SESSION["nom"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { +if (!$_SESSION["nom"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) { print ""."\n"; } elseif ($erreur_injection_nom) { print "
    "."\n"; @@ -167,9 +190,9 @@ if (isset($_SERVER['REMOTE_USER'])) { echo ''."\n"; } -if (!$_SESSION["adresse"]&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { +if (!$_SESSION["adresse"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) { print ""."\n"; -} elseif ($erreur_adresse&&($_POST["creation_sondage_date"]||$_POST["creation_sondage_autre"]||$_POST["creation_sondage_date_x"]||$_POST["creation_sondage_autre_x"])) { +} elseif ($erreur_adresse && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) { print ""."\n"; } @@ -184,7 +207,7 @@ echo ''."\n"; echo '
    '. _("The fields marked with * are required!") .'

    '."\n"; #affichage du cochage par défaut -if (!$_SESSION["studsplus"]&&!$_POST["creation_sondage_date"]&&!$_POST["creation_sondage_autre"]&&!$_POST["creation_sondage_date_x"]&&!$_POST["creation_sondage_autre_x"]) { +if (!$_SESSION["studsplus"] && !issetAndNoEmpty('creation_sondage_date') && !issetAndNoEmpty('creation_sondage_autre') && !issetAndNoEmpty('creation_sondage_date_x') && !issetAndNoEmpty('creation_sondage_autre_x')) { $_SESSION["studsplus"]="+"; } From 288330d384f1e69126aabab13f96ab30ebb827b3 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 05:50:13 +0200 Subject: [PATCH 011/129] check session before create it --- creation_sondage.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/creation_sondage.php b/creation_sondage.php index fa4fb25..bf39078 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -37,7 +37,9 @@ // //========================================================================== -session_start(); +if (session_id() == "") { + session_start(); +} include_once('fonctions.php'); From 4831f65e07dc040954c0a699d42a55e647a98022 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 15 May 2011 05:56:11 +0200 Subject: [PATCH 012/129] delete php warning --- choix_date.php | 388 ++++++++++++++++++++++++++++--------------------- 1 file changed, 219 insertions(+), 169 deletions(-) diff --git a/choix_date.php b/choix_date.php index bd26459..907e8a0 100644 --- a/choix_date.php +++ b/choix_date.php @@ -48,7 +48,7 @@ if (file_exists('bandeaux_local.php')) { } //si les variables de session ne snot pas valides, il y a une erreur -if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SESSION["mail"]) { +if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) && !issetAndNoEmpty('commentaires', $_SESSION) && !issetAndNoEmpty('mail', $_SESSION)) { echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -73,18 +73,20 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES } else { //sinon on peut afficher le calendrier normalement //partie creation du sondage dans la base SQL //On prépare les données pour les inserer dans la base - if ($_POST["confirmation"]||$_POST["confirmation_x"]) { - for ($i=0;$i 0 && $_SESSION["mois"] < 13) { @@ -222,42 +243,48 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES //affichage des jours de la semaine en haut du tableau for($i = 0; $i < 7; $i++) { - echo ''; + echo ''; } echo ''."\n"; //ajout d'une entrée dans la variable de session qui contient toutes les dates - if ($_POST["choixjourajout"]) { + if (issetAndNoEmpty('choixjourajout')) { if (!isset($_SESSION["totalchoixjour"])) { $_SESSION["totalchoixjour"]=array(); } // Test pour éviter les doublons dans la variable qui contient toutes les dates - $journeuf=true; - for ($i=0;$i'."\n"; - for ($i=0;$i<$nbrejourmois+$premierjourmois;$i++) { - $numerojour=$i-$premierjourmois+1; + for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) { + $numerojour = $i-$premierjourmois+1; // On saute a la ligne tous les 7 jours - if (($i%7)==0&&$i!=0) { + if (($i%7) == 0 && $i != 0) { echo ''."\n"; } // On affiche les jours precedants en gris et incliquables - if ($i<$premierjourmois) { + if ($i < $premierjourmois) { echo ''."\n"; } else { - for ($j=0;$j'."\n"; - $dejafait=$numerojour; + if (issetAndNoEmpty('totalchoixjour', $_SESSION) === true) { + for ($j = 0; $j < count($_SESSION["totalchoixjour"]); $j++) { + //affichage des boutons ROUGES + if (date("j", $_SESSION["totalchoixjour"][$j]) == $numerojour && date("n", $_SESSION["totalchoixjour"][$j]) == $_SESSION["mois"] && date("Y", $_SESSION["totalchoixjour"][$j]) == $_SESSION["annee"]) { + echo ''."\n"; + $dejafait = $numerojour; + } } } //Si pas de bouton ROUGE alors on affiche un bouton VERT ou GRIS avec le numéro du jour dessus - if ($dejafait!=$numerojour) { + if (isset($dejafait) === false || $dejafait != $numerojour){ //bouton vert - if (($numerojour>=$jourAJ&&$_SESSION["mois"]==$moisAJ&&$_SESSION["annee"]==$anneeAJ)||($_SESSION["mois"]>$moisAJ&&$_SESSION["annee"]==$anneeAJ)||$_SESSION["annee"]>$anneeAJ) { + if (($numerojour >= $jourAJ && $_SESSION["mois"] == $moisAJ && $_SESSION["annee"] == $anneeAJ) || ($_SESSION["mois"] > $moisAJ && $_SESSION["annee"] == $anneeAJ) || $_SESSION["annee"] > $anneeAJ) { echo ''."\n"; } else { //bouton gris echo ''."\n"; @@ -345,85 +374,97 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES //traitement de l'entrée des heures dans les cases texte $errheure = $erreur = false; - if ($_POST["choixheures"]||$_POST["choixheures_x"]) { + if (issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x')) { //On sauvegarde les heures deja entrées - for ($i=0;$i'."\n"; //affichage de tous les jours choisis - if ($_SESSION["totalchoixjour"]&&(!$_POST["choixheures_x"]||$erreur)) { + if (issetAndNoEmpty('totalchoixjour', $_SESSION) && (!issetAndNoEmpty('choixheures_x') || $erreur)) { //affichage des jours echo '
    '."\n"; echo '

    '. _("Selected days") .' :

    '."\n"; @@ -442,12 +483,12 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES echo '    '."\n"; echo ''."\n"; - for ($i=0;$i<$_SESSION["nbrecaseshoraires"];$i++) { - $j=$i+1; + for ($i = 0; $i < $_SESSION["nbrecaseshoraires"]; $i++) { + $j = $i+1; echo ''."\n"; } - if ($_SESSION["nbrecaseshoraires"]<10) { + if ($_SESSION["nbrecaseshoraires"] < 10) { echo ''."\n"; } @@ -457,9 +498,9 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES for ($i=0;$i'."\n"; if ($_SESSION["langue"]=="EN") { - echo ''."\n"; + echo ''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } $affichageerreurfindeligne=false; @@ -467,10 +508,19 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES //affichage des cases d'horaires for ($j=0;$j<$_SESSION["nbrecaseshoraires"];$j++) { //si on voit une erreur, le fond de la case est rouge - if ($errheure[$i][$j]) { + if (isset($errheure[$i][$j]) && $errheure[$i][$j]) { echo ''."\n"; $affichageerreurfindeligne=true; } else { //sinon la case est vide normalement + if (issetAndNoEmpty('horaires'.$i, $_SESSION) === false || issetAndNoEmpty($j, $_SESSION['horaires'.$i]) === false) { + if (issetAndNoEmpty('horaires'.$i, $_SESSION) === true) { + $_SESSION["horaires$i"][$j] = ''; + } else { + $_SESSION["horaires$i"] = array(); + $_SESSION["horaires$i"][$j] = ''; + } + } + echo ''."\n"; } } @@ -493,20 +543,20 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES echo '
    '. _("Poll title *: ") .'" . _("Enter a title") . "" . _("Characters < > and \" are not permitted") . "" . _("Enter a name") . "" . _("Characters < > and \" are not permitted") . "" . _("Enter an email address") . " " . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "'. strftime('%A',mktime(0,0,0,0,$i,10)) .''. strftime('%A',mktime(0,0,0,0, $i,10)) .'
    '.$numerojour.'
    '. _("Time") .' '.$j.''.date("l, F jS Y",$_SESSION["totalchoixjour"][$i]).' : '.date("l, F jS Y", $_SESSION["totalchoixjour"][$i]).' : '.strftime(_("%A, den %e. %B %Y"),$_SESSION["totalchoixjour"][$i]).' : '.strftime(_("%A, den %e. %B %Y"), $_SESSION["totalchoixjour"][$i]).' :
    '."\n"; //si un seul jour et aucunes horaires choisies, : message d'erreur - if (($_POST["choixheures"]||$_POST["choixheures_x"])&&(count($_SESSION["totalchoixjour"])=="1"&&$_POST["horaires0"][0]==""&&$_POST["horaires0"][1]==""&&$_POST["horaires0"][2]==""&&$_POST["horaires0"][3]==""&&$_POST["horaires0"][4]=="")) { + if ((issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x')) && (count($_SESSION["totalchoixjour"])=="1" && $_POST["horaires0"][0]=="" && $_POST["horaires0"][1]=="" && $_POST["horaires0"][2]=="" && $_POST["horaires0"][3]=="" && $_POST["horaires0"][4]=="")) { echo '
    '. _("Enter more choices for the voters") .'
    '."\n"; $erreur=true; } } //s'il n'y a pas d'erreur et que le bouton de creation est activé, on demande confirmation - if ( ! $erreur &&($_POST["choixheures"]||$_POST["choixheures_x"])) { + if (!$erreur && (issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x'))) { $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1; - $jour_arret=$_SESSION["totalchoixjour"][$taille_tableau]+200000; + $jour_arret = $_SESSION["totalchoixjour"][$taille_tableau]+200000; if ($_SESSION["langue"]=="EN") { - $date_fin=date("l, F jS Y",$jour_arret); + $date_fin=date("l, F jS Y", $jour_arret); } else { - $date_fin=strftime(_("%A, den %e. %B %Y"),$jour_arret); + $date_fin=strftime(_("%A, den %e. %B %Y"), $jour_arret); } echo '
    '. _("Your poll will expire automatically 2 days after the last date of your poll.") .'

    '. _("Removal date") .' : '.$date_fin.'

    '."\n"; @@ -536,9 +586,9 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES echo ''."\n"; //bouton de nettoyage de tous les jours choisis - if ($_POST["reset"]) { - for ($i=0;$i Date: Wed, 18 May 2011 03:51:26 +0200 Subject: [PATCH 013/129] French locale correction (thanks to Julien Reitzel) --- locale/fr_FR/LC_MESSAGES/Studs.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 8ba13ae..051cdf3 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -47,7 +47,7 @@ msgstr "Lieu" #: exportpdf.php:75 msgid "Cordially," -msgstr "Cordiallement" +msgstr "Cordialement" #: choix_autre.php:60 #: choix_date.php:61 @@ -432,7 +432,7 @@ msgstr "Nom" #: studs.php:578 msgid "Export to CSV" -msgstr "Export to CSV" +msgstr "Export en CSV" #: studs.php:580 msgid "Export: Spreadsheet" @@ -448,11 +448,11 @@ msgstr "Agenda" #: index.php:69 msgid "What is it about?" -msgstr "A quoi ça sert ?" +msgstr "À quoi ça sert ?" #: index.php:70 msgid "Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." -msgstr "A faire des sondages pour que vous puissiez trouver une date de réunion qui convienne à toutes les personnes concernées.
    Vous pouvez également utiliser cette application pour déterminer à plusieurs un choix quelconque comme un lieu de RV, un thème de réunion ou la marque de votre prochaine machine à café." +msgstr "À faire des sondages pour que vous puissiez trouver une date de réunion qui convienne à toutes les personnes concernées.
    Vous pouvez également utiliser cette application pour déterminer à plusieurs un choix quelconque comme un lieu de RV, un thème de réunion ou la marque de votre prochaine machine à café." #: creation_sondage.php:88 msgid "For sending to the polled users" @@ -544,7 +544,7 @@ msgstr "Si vous souhaitez ajouter une colonne" #: adminstuds.php:175 msgid "You can add a new scheduling date to your poll.
    If you just want to add a new hour to an existant date, put the same date and choose a new hour." -msgstr "Vous pouvez ajouter une date à votre sondage. Si la date existe déjà et que vous ne voulez que rajouter un horaire,
    mettez le jour en entier avec l'horaire ou le créneau supplémentaire il sera intégré normalement au sondage existant." +msgstr "Vous pouvez ajouter une date à votre sondage. Si la date existe déjà et que vous ne voulez rajouter qu'un horaire,
    mettez le jour en entier avec l'horaire ou le créneau supplémentaire et il sera intégré normalement au sondage existant." #: adminstuds.php:176 msgid "Add a date" @@ -590,7 +590,7 @@ msgstr "" #: adminstuds.php:630 msgid "As poll administrator, you can change all the lines of this poll with \"infos\".
    You can, as well, remove a column or a line with \"Cancel\".
    You can also add a new column with \"Add.
    Finally, you can change the informations of this poll like the title, the comments or your email address." -msgstr "En tant qu'administrateur, vous pouvez modifier toutes les lignes de ce sondage avec \"Icone.
    Vous avez aussi la possibilité d'effacer une colonne ou une ligne avec \"Annuler\".
    Si vous avez oublié de mettre un choix vous pouvez rajouter une colonne en cliquant sur \"Annuler\"
    en bout de ligne des noms de colonne. Vous pouvez enfin également modifier les informations
    relatives à ce sondage comme le titre, les commentaires ou encore votre adresse électronique." +msgstr "En tant qu'administrateur, vous pouvez modifier toutes les lignes de ce sondage avec \"Icone.
    Vous avez aussi la possibilité d'effacer une colonne ou une ligne avec \"Annuler\".
    Si vous avez oublié de mettre un choix, vous pouvez rajouter une colonne en cliquant sur \"Annuler\"
    en bout de ligne des noms de colonne. Vous pouvez enfin également modifier les informations
    relatives à ce sondage comme le titre, les commentaires ou encore votre adresse électronique." #: adminstuds.php:669 #: adminstuds.php:689 @@ -627,7 +627,7 @@ msgstr "Si vous souhaitez changer le titre du sondage" #: adminstuds.php:976 msgid "Generate the convocation letter (.PDF), choose the place to meet and validate" -msgstr "Si vous souhaitez produire la lettre de convocation (en PDF), choississez un lieu de réunion et validez" +msgstr "Si vous souhaitez produire la lettre de convocation (en PDF), saisissez un lieu de réunion et validez" #: adminstuds.php:987 msgid "Enter a meeting place!" From c56e3b3b4da3b311e9dfebb836cadfab10d29e0b Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Fri, 20 May 2011 02:52:22 +0200 Subject: [PATCH 014/129] Clean URL and add title of poll in head --- admin/index.php | 2 +- adminstuds.php | 10 +++++----- bandeaux.php | 4 ++-- creation_sondage.php | 19 ++++++++++++++----- fonctions.php | 43 ++++++++++++++++++++++++++++++++++++++----- studs.php | 2 +- 6 files changed, 61 insertions(+), 19 deletions(-) diff --git a/admin/index.php b/admin/index.php index e98749f..dc4a77e 100644 --- a/admin/index.php +++ b/admin/index.php @@ -124,7 +124,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { echo''.$nbuser.''."\n"; echo ''. _("See the poll") .''."\n"; - echo ''. _("Change the poll") .''."\n"; + echo ''. _("Change the poll") .''."\n"; echo ''."\n"; echo ''."\n"; diff --git a/adminstuds.php b/adminstuds.php index 1f0dd94..f806f72 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -117,7 +117,7 @@ if (isset($_POST["boutonnouveautitre"])) { mail ($adresseadmin, _("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION, _("You have changed the title of your poll. \nYou can modify this poll with this link") . - " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin\n\n" . + " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, $headers); @@ -135,7 +135,7 @@ if (isset($_POST["boutonnouveauxcommentaires"])) { mail ($adresseadmin, _("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION, _("You have changed the comments of your poll. \nYou can modify this poll with this link") . - " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin \n\n" . + " :\n\n".getUrlSondage($numsondageadmin, true)." \n\n" . _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, $headers); @@ -154,7 +154,7 @@ if (isset($_POST["boutonnouvelleadresse"])){ mail ($_POST['nouvelleadresse'], _("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION, _("You have changed your email address in your poll. \nYou can modify this poll with this link") . - " :\n\n".get_server_name()."/adminstuds.php?sondage=$numsondageadmin\n\n" . + " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, $headers); @@ -177,7 +177,7 @@ if ($_POST["ajoutsujet_x"]){ sous_bandeau(); //on recupere les données et les sujets du sondage - echo '
    '."\n"; + echo ''."\n"; echo '
    '."\n"; echo "

    " . _("Column's adding") . "



    "."\n"; @@ -639,7 +639,7 @@ $toutsujet=str_replace("@","
    ",$toutsujet); $toutsujet=str_replace("°","'",$toutsujet); $nbcolonnes=substr_count($dsujet->sujet,',')+1; -echo ''."\n"; +echo ''."\n"; echo '
    '."\n"; echo _('As poll administrator, you can change all the lines of this poll with infos.
    You can, as well, remove a column or a line with Cancel.
    You can also add a new column with Add column.
    Finally, you can change the informations of this poll like the title, the comments or your email address.') ."\n"; echo '

    '."\n"; diff --git a/bandeaux.php b/bandeaux.php index f6d9a30..78431b4 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -44,7 +44,7 @@ include_once('fonctions.php'); function logo () { if(defined('LOGOBANDEAU')) { - echo ''."\n"; + echo ''."\n"; } } @@ -81,7 +81,7 @@ function sous_bandeau() { echo '
    ' . ''. _("Home") .'' . - ''. _("Example") .'' . + ''. _("Example") .'' . ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented ''. _("About") .'' . diff --git a/creation_sondage.php b/creation_sondage.php index bf39078..ffdc5fd 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -88,14 +88,23 @@ function ajouter_sondage() "('$sondage','$_SESSION[commentaires]', '$_SESSION[adresse]', '$_SESSION[nom]', '$_SESSION[titre]','$sondage_admin', FROM_UNIXTIME('$date_fin'), '$_SESSION[formatsondage]','$_SESSION[mailsonde]' )"); $connect->Execute("insert into sujet_studs values ('$sondage', '$_SESSION[toutchoix]' )"); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), "" . _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.") . "\n\n".stripslashes($_SESSION["nom"])." " . _("hast just created a poll called") . " : \"".stripslashes($_SESSION["titre"])."\".\n" . _("Thanks for filling the poll at the link above") . " :\n\n".get_server_name()."studs.php?sondage=$sondage \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION,$headers); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), - _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above") . - " :\n\n".get_server_name()."adminstuds.php?sondage=$sondage_admin \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION,$headers); + $message = _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll."); + $message .= "\n\n"; + $message .= stripslashes($_SESSION["nom"])." " . _("hast just created a poll called") . " : \"".stripslashes($_SESSION["titre"])."\".\n"; + $message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION; + + $message_admin = _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above"); + $message_admin .= " :\n\n"."%s \n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION; + + $message = sprintf($message, getUrlSondage($sondage)); + $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); + + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); $date=date('H:i:s d/m/Y:'); error_log($date . " CREATION: $sondage\t$_SESSION[formatsondage]\t$_SESSION[nom]\t$_SESSION[adresse]\t \t$_SESSION[toutchoix]\n", 3, 'admin/logs_studs.txt'); - header("Location:studs.php?sondage=$sondage"); + header("Location:".getUrlSondage($sondage)); exit(); session_unset(); } \ No newline at end of file diff --git a/fonctions.php b/fonctions.php index 77c9f80..8a8cfdc 100644 --- a/fonctions.php +++ b/fonctions.php @@ -110,17 +110,24 @@ function is_user() } -function print_header($js = false) +function print_header($js = false, $nom_sondage = '') { echo ' - - '.NOMAPPLICATION.' - '; + '; + if (empty($nom_sondage) === false) { + echo ' + '.$nom_sondage.' - '.NOMAPPLICATION.''; + } else { + echo ' + '.NOMAPPLICATION.''; + } + echo ' + '; if($js) { - echo ''; + echo ''; } echo ''; @@ -169,6 +176,32 @@ function issetAndNoEmpty($name, $tableau = null) } +/** + * Fonction permettant de générer les URL pour les sondage + * @param string $id L'identifiant du sondage + * @param bool $admin True pour générer une URL pour l'administration d'un sondage, False pour un URL publique + * @return string L'url pour le sondage + */ +function getUrlSondage($id, $admin = false) +{ + if (URL_PROPRE === true) { + if ($admin === true) { + $url = get_server_name().$id.'/admin'; + } else { + $url = get_server_name().$id; + } + } else { + if ($admin === true) { + $url = get_server_name().'adminstuds.php?sondage='.$id; + } else { + $url = get_server_name().'studs.php?sondage='.$id; + } + } + + return $url; +} + + $connect=connexion_base(); define('COMMENT_EMPTY', 0x0000000001); diff --git a/studs.php b/studs.php index e940f79..93e8ac0 100644 --- a/studs.php +++ b/studs.php @@ -166,7 +166,7 @@ if (!is_error(NO_POLL) && isset($_POST["boutonp"])) { } } -print_header(true); +print_header(true, $dsondage->titre); echo ''."\n"; logo(); bandeau_tete(); From c45dfc913475ffc03db42ea2788ad42870104a96 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Fri, 20 May 2011 02:53:25 +0200 Subject: [PATCH 015/129] htaccess for clean URL --- .htaccess | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .htaccess diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..410958e --- /dev/null +++ b/.htaccess @@ -0,0 +1,12 @@ + + RewriteEngine On + + RewriteCond %{REQUEST_FILENAME} -f [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule .* - [L] + + RewriteRule ^([a-z0-9]{16})$ studs.php?sondage=$1 + RewriteRule ^([a-z0-9]{24})/admin$ adminstuds.php?sondage=$1 + # Pour le dernier j'ai honte, mais il y a trop de chose à modifier pour le moment :-) + RewriteRule ^([a-z0-9]{24})/images/(.*)$ images/$2 + \ No newline at end of file From b427472bbf8f8163d3fddd21e29fe554ee402d38 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Fri, 20 May 2011 02:54:14 +0200 Subject: [PATCH 016/129] add constante for clean URL --- variables.php.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/variables.php.template b/variables.php.template index 6cbc8ec..c822c90 100644 --- a/variables.php.template +++ b/variables.php.template @@ -75,6 +75,9 @@ define('LOGOBANDEAU', ''); +// Activation des URL propre (true pour activer, false sinon) +define('URL_PROPRE', false); + if (@file_exists('variables.local.php')) { include('variables.local.php'); } From 7d5c2a6fb846ce7465fd9cb72e8696ef9f15a2f5 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sat, 21 May 2011 18:46:44 +0200 Subject: [PATCH 017/129] Delete php warning and secure SQL --- studs.php | 243 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 149 insertions(+), 94 deletions(-) diff --git a/studs.php b/studs.php index 93e8ac0..43badfe 100644 --- a/studs.php +++ b/studs.php @@ -51,23 +51,23 @@ include_once('fonctions.php'); $numsondage = false; //On récupère le numéro de sondage par le lien web. -if(isset($_GET["sondage"])) { - $numsondage=$_GET["sondage"]; +if(issetAndNoEmpty('sondage', $_GET) === true) { + $numsondage = $_GET["sondage"]; $_SESSION["numsondage"] = $numsondage; } -if(isset($_POST["sondage"])) { - $numsondage=$_POST["sondage"]; +if(issetAndNoEmpty('sondage') === true) { + $numsondage = $_POST["sondage"]; $_SESSION["numsondage"] = $numsondage; -} elseif(isset($_COOKIE["sondage"])) { - $numsondage=$_COOKIE["sondage"]; -} elseif(isset($_SESSION["numsondage"])) { - $numsondage=$_SESSION["numsondage"]; +} elseif(issetAndNoEmpty('sondage', $_COOKIE) === true) { + $numsondage = $_COOKIE["sondage"]; +} elseif(issetAndNoEmpty('numsondage', $_SESSION) === true) { + $numsondage = $_SESSION["numsondage"]; } -if ($numsondage) { +if ($numsondage !== false) { $dsondage = get_sondage_from_id($numsondage); - if(!$dsondage) { + if($dsondage === false) { $err |= NO_POLL; } } else { @@ -75,12 +75,12 @@ if ($numsondage) { } //output a CSV and die() -if(isset($_GET['export']) && $Sondage) { +if(issetAndNoEmpty('export', $_GET) && $dsondage !== false) { if($_GET['export'] == 'csv') { require_once('exportcsv.php'); } - if($_GET['export'] == 'ics' && $Sondage->is_date) { + if($_GET['export'] == 'ics' && $dsondage->is_date) { require_once('exportics.php'); } @@ -88,28 +88,36 @@ if(isset($_GET['export']) && $Sondage) { } // quand on ajoute un commentaire utilisateur -if(isset($_POST['ajoutcomment'])) { - if (isset($_SERVER['REMOTE_USER'])) { - $comment_user = $_SESSION['nom']; - } elseif(isset($_POST["commentuser"]) && ! empty($_POST["commentuser"])) { - $comment_user = $connect->qstr(strip_tags($_POST["commentuser"])); +if(isset($_POST['ajoutcomment']) || isset($_POST['ajoutcomment_x'])) { + if (isset($_SESSION['nom'])) { + // Si le nom vient de la session, on le de-htmlentities + $comment_user = html_entity_decode($_SESSION['nom'], ENT_QUOTES, 'UTF-8'); + } elseif(issetAndNoEmpty('commentuser')) { + $comment_user = $_POST["commentuser"]; } elseif(isset($_POST["commentuser"])) { $err |= COMMENT_USER_EMPTY; } else { $comment_user = _('anonyme'); } - if(empty($_POST["comment"])) { + if(issetAndNoEmpty('comment') === false) { $err |= COMMENT_EMPTY; } - if (isset($_POST["comment"]) && ! is_error(COMMENT_EMPTY) && ! is_error(NO_POLL) && ! is_error(COMMENT_USER_EMPTY)) { - if( ! $connect->Execute('INSERT INTO comments ' . - '(id_sondage, comment, usercomment) VALUES ("'. - $numsondage . '","'. - $connect->qstr(strip_tags($_POST['comment'])). - '","' . - $comment_user .'")') ) { + if (isset($_POST["comment"]) && !is_error(COMMENT_EMPTY) && !is_error(NO_POLL) && !is_error(COMMENT_USER_EMPTY)) { + // protection contre les XSS : htmlentities + $comment = htmlentities($_POST['comment'], ENT_QUOTES, 'UTF-8'); + $comment_user = htmlentities($comment_user, ENT_QUOTES, 'UTF-8'); + + $sql = 'INSERT INTO comments (id_sondage, comment, usercomment) VALUES ('. + $connect->Param('id_sondage').','. + $connect->Param('comment').','. + $connect->Param('comment_user').')'; + + $sql = $connect->Prepare($sql); + $comments = $connect->Execute($sql, array($numsondage, $comment, $comment_user)); + + if ($comments === false) { $err |= COMMENT_INSERT_FAILED; } } @@ -117,15 +125,19 @@ if(isset($_POST['ajoutcomment'])) { // Action quand on clique le bouton participer -$user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' ORDER BY id_users"); -$nbcolonnes=substr_count($dsondage->sujet,',')+1; -if (!is_error(NO_POLL) && isset($_POST["boutonp"])) { +$sql = 'SELECT * FROM user_studs WHERE id_sondage='.$connect->Param('numsondage').' ORDER BY id_users'; +$sql = $connect->Prepare($sql); +$user_studs = $connect->Execute($sql, array($numsondage)); + +$nbcolonnes = substr_count($dsondage->sujet, ',') + 1; +if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"]))) { //Si le nom est bien entré - if (! isset($_POST["nom"]) || empty($_POST['nom'])) { + if (issetAndNoEmpty('nom') === false) { $err |= NAME_EMPTY; } - if(!is_error(NAME_EMPTY) && (!isset($_SERVER['REMOTE_USER']) || $_POST["nom"] == $_SESSION["nom"])) { + if(!is_error(NAME_EMPTY) && (!isset($_SERVER['REMOTE_USER']) || $_POST["nom"] == $_SESSION["nom"])) { + $nouveauchoix = ''; for ($i=0;$i<$nbcolonnes;$i++) { // Si la checkbox est enclenchée alors la valeur est 1 if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1') { @@ -134,21 +146,29 @@ if (!is_error(NO_POLL) && isset($_POST["boutonp"])) { $nouveauchoix.="0"; } } + + $nom=substr($_POST["nom"],0,64); + + // protection contre les XSS : htmlentities + $nom = htmlentities($nom, ENT_QUOTES, 'UTF-8'); while($user = $user_studs->FetchNextObject(false)) { - if ($_POST["nom"]==$user->nom) { + if ($nom == $user->nom) { $err |= NAME_TAKEN; } } // Ecriture des choix de l'utilisateur dans la base - if (!is_error(NAME_TAKEN) && ! is_error(NAME_EMPTY)) { - // TODO: throw error - $nom=substr($_POST["nom"],0,64); - $connect->Execute('INSERT INTO user_studs (nom,id_sondage,reponses) VALUES ("' . - $nom . '","' . - $numsondage . '","' . - $nouveauchoix . '")'); + if (!is_error(NAME_TAKEN) && !is_error(NAME_EMPTY)) { + + $sql = 'INSERT INTO user_studs (nom,id_sondage,reponses) VALUES ('. + $connect->Param('nom').', '. + $connect->Param('numsondage').', '. + $connect->Param('nouveauchoix').')'; + $sql = $connect->Prepare($sql); + + // Todo : Il faudrait lever une erreur en cas d'erreur d'insertion + $connect->Execute($sql, array($nom, $numsondage, $nouveauchoix)); if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; @@ -156,7 +176,7 @@ if (!is_error(NO_POLL) && isset($_POST["boutonp"])) { "[".NOMAPPLICATION."] "._("Poll's participation")." : $dsondage->titre", "\"$nom\" ". _("has filled a line.\nYou can find your poll at the link") . " :\n\n". - get_server_name()."/studs.php?sondage=$numsondage \n\n" . + getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n". NOMAPPLICATION, $headers); } @@ -223,7 +243,7 @@ echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'

    '."\n"; //affichage des commentaires du sondage if ($dsondage->commentaires) { echo _("Comments") .' :
    '."\n"; - $commentaires=$dsondage->commentaires; + $commentaires = $dsondage->commentaires; $commentaires=str_replace("\\","",$commentaires); echo $commentaires; echo '
    '."\n"; @@ -234,6 +254,7 @@ echo '
    '."\n"; echo ''."\n"; echo ''; +// Todo : add CSRF protection echo '
    '."\n"; echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line.") ."\n"; echo '

    '."\n"; @@ -242,25 +263,26 @@ echo '

    '."\n"; echo ''."\n"; //On récupere les données et les sujets du sondage -$nblignes=$user_studs->RecordCount(); +$nblignes = $user_studs->RecordCount(); //on teste pour voir si une ligne doit etre modifiée $testmodifier = false; $ligneamodifier = -1; for ($i=0;$i<$nblignes;$i++) { if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { - $ligneamodifier=$i; + $ligneamodifier = $i; } //test pour voir si une ligne est a modifier - if ($_POST['validermodifier'.$i.'_x']) { - $modifier=$i; - $testmodifier=true; + if (isset($_POST['validermodifier'.$i]) || isset($_POST['validermodifier'.$i.'_x'])) { + $modifier = $i; + $testmodifier = true; } } //si le test est valide alors on affiche des checkbox pour entrer de nouvelles valeurs if ($testmodifier) { + $nouveauchoix = ''; for ($i=0;$i<$nbcolonnes;$i++) { //recuperation des nouveaux choix de l'utilisateur if (isset($_POST["choix$i"]) && $_POST["choix$i"] == 1) { @@ -271,13 +293,16 @@ if ($testmodifier) { } $compteur=0; - while ($data=$user_studs->FetchNextObject(false) ) { + while ($data = $user_studs->FetchNextObject(false) ) { //mise a jour des données de l'utilisateur dans la base SQL - if ($compteur==$modifier) { - $connect->Execute("UPDATE user_studs SET reponses='$nouveauchoix' WHERE nom='$data->nom' AND id_users='$data->id_users'"); + if ($compteur == $modifier) { + $sql = 'UPDATE user_studs SET reponses='.$connect->Param('nouveauchoix').' WHERE nom='.$connect->Param('nom').' AND id_users='.$connect->Param('id_users'); + $sql = $connect->Prepare($sql); + $connect->Execute($sql, array($nouveauchoix, $data->nom, $data->id_users)); + if ($dsondage->mailsonde=="yes") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : $dsondage->titre", "\"$data->nom\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : $dsondage->titre", "\"$data->nom\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); } } @@ -286,10 +311,12 @@ if ($testmodifier) { } //recuperation des utilisateurs du sondage -$user_studs=$connect->Execute("SELECT * FROM user_studs WHERE id_sondage='$numsondage' ORDER BY id_users"); +$sql = 'SELECT * FROM user_studs WHERE id_sondage='.$connect->Param('numsondage').' ORDER BY id_users'; +$sql = $connect->Prepare($sql); +$user_studs = $connect->Execute($sql, array($numsondage)); //reformatage des données des sujets du sondage -$toutsujet=explode(",",$dsondage->sujet); +$toutsujet = explode(",",$dsondage->sujet); //si le sondage est un sondage de date if ($dsondage->format=="D"||$dsondage->format=="D+") { @@ -300,7 +327,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { //affichage des années $colspan=1; for ($i=0;$i'.date('Y', intval($toutsujet[$i])).''."\n"; @@ -317,8 +344,13 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { for ($i=0;$iformat=="D"||$dsondage->format=="D+") { $colspan=1; for ($i=0;$iformat=="D"||$dsondage->format=="D+") { echo ''."\n"; echo ''."\n"; - for ($i=0;$toutsujet[$i];$i++) { + for ($i=0; isset($toutsujet[$i]); $i++) { $heures=explode("@",$toutsujet[$i]); - echo ''."\n"; + if (isset($heures[1]) === true) { + echo ''."\n"; + } else { + echo ''."\n"; + } } echo ''."\n"; @@ -373,7 +413,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; echo ''."\n"; - for ($i=0;$toutsujet[$i];$i++) { + for ($i=0; isset($toutsujet[$i]); $i++) { echo ''."\n"; } @@ -381,13 +421,13 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } //Usager pré-authentifié dans la liste? -$user_mod = FALSE; +$user_mod = false; //affichage des resultats actuels $somme = array(); $compteur = 0; -while ($data=$user_studs->FetchNextObject(false)) { +while ($data = $user_studs->FetchNextObject(false)) { echo ''."\n"; echo ''."\n"; // Les réponses qu'il a choisit - $ensemblereponses=$data->reponses; + $ensemblereponses = $data->reponses; // ligne d'un usager pré-authentifié $mod_ok = !isset($_SERVER['REMOTE_USER']) || ($nombase == $_SESSION['nom']); @@ -413,9 +453,12 @@ while ($data=$user_studs->FetchNextObject(false)) { echo ' />'."\n"; } else { - $car=substr($ensemblereponses,$k,1); - if ($car=="1") { + $car = substr($ensemblereponses, $k, 1); + if ($car == "1") { echo ''."\n"; + if (isset($somme[$k]) === false) { + $somme[$k] = 0; + } $somme[$k]++; } else { echo ''."\n"; @@ -430,8 +473,8 @@ while ($data=$user_studs->FetchNextObject(false)) { //demande de confirmation pour modification de ligne for ($i=0;$i<$nblignes;$i++) { - if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])) { - if ($compteur==$i) { + if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { + if ($compteur == $i) { echo ''."\n"; } } @@ -445,9 +488,8 @@ while ($data=$user_studs->FetchNextObject(false)) { if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { echo ''."\n"; echo ''."\n"; echo ''."\n"; -for ($i=0;$i<$nbcolonnes;$i++) { - $affichesomme=$somme[$i]; - if ($affichesomme=="") { - $affichesomme="0"; +for ($i=0; $i < $nbcolonnes; $i++) { + if (isset($somme[$i]) === true) { + $affichesomme = $somme[$i]; + + if ($affichesomme == "") { + $affichesomme = '0'; + } + } else { + $affichesomme = '0'; } echo ''."\n"; @@ -497,8 +546,9 @@ for ($i=0;$i<$nbcolonnes;$i++) { echo ''."\n"; echo ''."\n"; echo ''."\n"; -for ($i=0;$i<$nbcolonnes;$i++) { - if ($somme[$i]==$meilleurecolonne&&$somme[$i]) { + +for ($i=0; $i < $nbcolonnes; $i++) { + if (isset($somme[$i]) && isset($meilleurecolonne) && $somme[$i] == $meilleurecolonne) { echo ''."\n"; } else { echo ''."\n"; @@ -516,11 +566,13 @@ $toutsujet=str_replace("°","'",$toutsujet); // On compare le nombre de résultat avec le meilleur et si le résultat est égal // on concatene le resultat dans $meilleursujet $compteursujet=0; -for ($i=0;$i<$nbcolonnes;$i++) { - if ($somme[$i]==$meilleurecolonne) { +$meilleursujet = ''; + +for ($i = 0; $i < $nbcolonnes; $i++) { + if (isset($somme[$i]) && isset($meilleurecolonne) && $somme[$i] == $meilleurecolonne) { $meilleursujet.=", "; if ($dsondage->format=="D"||$dsondage->format=="D+") { - $meilleursujetexport=$toutsujet[$i]; + $meilleursujetexport = $toutsujet[$i]; if (strpos($toutsujet[$i],'@') !== false) { $toutsujetdate=explode("@",$toutsujet[$i]); if ($_SESSION["langue"]=="EN") { @@ -536,36 +588,39 @@ for ($i=0;$i<$nbcolonnes;$i++) { } } } else { - $meilleursujet.=$toutsujet[$i]; + $meilleursujet .= $toutsujet[$i]; } $compteursujet++; } } -$meilleursujet=substr("$meilleursujet",1); +$meilleursujet=substr("$meilleursujet", 1); $vote_str = _('vote'); -if ($meilleurecolonne > 1) { +if (isset($meilleurecolonne) && $meilleurecolonne > 1) { $vote_str = _('votes'); } echo '

    '."\n"; // Affichage du meilleur choix -if ($compteursujet=="1"&&$meilleurecolonne) { +if ($compteursujet == "1" && isset($meilleurecolonne)) { print 'Meilleur choix ' . _('The best choice at this time is:') . "$meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; -} elseif ($meilleurecolonne) { +} elseif (isset($meilleurecolonne)) { print 'Meilleur choix ' . _('The bests choices at this time are:') . " $meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; } echo '

    '; //affichage des commentaires des utilisateurs existants -$comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); +$sql = 'select * from comments where id_sondage='.$connect->Param('numsondage').' order by id_comment'; +$sql = $connect->Prepare($sql); +$comment_user=$connect->Execute($sql, array($numsondage)); + if ($comment_user->RecordCount() != 0) { print "
    " . _("Comments of polled people") . " :
    \n"; - while( $dcomment=$comment_user->FetchNextObject(false)) { + while($dcomment = $comment_user->FetchNextObject(false)) { print $dcomment->usercomment . ' : ' . $dcomment->comment . '
    '; } } @@ -573,10 +628,10 @@ if ($comment_user->RecordCount() != 0) { //affichage de la case permettant de rajouter un commentaire par les utilisateurs print '
    ' .'

    ' ._("Add a comment in the poll:") . '

    ' . "\n"; -if (isset($_SERVER['REMOTE_USER']) || isset($_SESSION['nom'])) { +if (isset($_SESSION['nom']) === false) { echo _("Name") .' : '; echo '
    '."\n"; -} +} echo ''."\n"; echo '
    '."\n"; From d43e818c1108d3ecc24741c95c65bc8d51fedc13 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 22 May 2011 02:13:44 +0200 Subject: [PATCH 018/129] Delete php warning and secure SQL --- adminstuds.php | 683 +++++++++++++++++++++++++++++-------------------- 1 file changed, 411 insertions(+), 272 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index f806f72..d63b673 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -52,7 +52,7 @@ $numsondageadmin = false; $sondage = false; // recuperation du numero de sondage admin (24 car.) dans l'URL -if (isset($_GET['sondage']) && !empty($_GET['sondage']) && is_string($_GET['sondage']) && strlen($_GET['sondage']) === 24) { +if (issetAndNoEmpty('sondage', $_GET) && is_string($_GET['sondage']) && strlen($_GET['sondage']) === 24) { $numsondageadmin=$_GET["sondage"]; //on découpe le résultat pour avoir le numéro de sondage (16 car.) $numsondage=substr($numsondageadmin, 0, 16); @@ -106,60 +106,73 @@ From: %s <%s> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EOF; -$headers = sprintf($headers_str, NOMAPPLICATION, ADRESSEMAILADMIN ); +$headers = sprintf($headers_str, NOMAPPLICATION, ADRESSEMAILADMIN); -if (isset($_POST["boutonnouveautitre"])) { - if(! isset($_POST["nouveautitre"]) || empty($_POST["nouveautitre"])) { +if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"])) { + if(issetAndNoEmpty('nouveautitre') === false) { $err |= TITLE_EMPTY; } else { - //envoi du mail pour prevenir l'admin de sondage - mail ($adresseadmin, - _("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION, - _("You have changed the title of your poll. \nYou can modify this poll with this link") . - " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); - //modification de la base SQL avec le nouveau titre - $connect->Execute("UPDATE sondage SET titre = '" . $connect->qstr(strip_tags($_POST['nouveautitre'])) . "' WHERE id_sondage = '" . $numsondage . "'"); + $nouveautitre = htmlentities(html_entity_decode($_POST['nouveautitre'], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); + $sql = 'UPDATE sondage SET titre = '.$connect->Param('nouveautitre').' WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + + //envoi du mail pour prevenir l'admin de sondage + if ($connect->Execute($sql, array($nouveautitre, $numsondage))) { + mail ($adresseadmin, + _("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION, + _("You have changed the title of your poll. \nYou can modify this poll with this link") . + " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); + } } } // si le bouton est activé, quelque soit la valeur du champ textarea -if (isset($_POST["boutonnouveauxcommentaires"])) { - if(! isset($_POST["nouveautitre"]) || empty($_POST["nouveautitre"])) { +if (isset($_POST["boutonnouveauxcommentaires"]) || isset($_POST["boutonnouveauxcommentaires_x"])) { + if(issetAndNoEmpty('nouveautitre') === false) { $err |= COMMENT_EMPTY; } else { - //envoi du mail pour prevenir l'admin de sondage - mail ($adresseadmin, - _("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION, - _("You have changed the comments of your poll. \nYou can modify this poll with this link") . - " :\n\n".getUrlSondage($numsondageadmin, true)." \n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + $commentaires = htmlentities(html_entity_decode($_POST['nouveauxcommentaires'], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); //modification de la base SQL avec les nouveaux commentaires - $connect->Execute("UPDATE sondage SET commentaires = '" . $connect->qstr(strip_tags($nouveauxcommentaires)) . "' WHERE id_sondage = '" . $numsondage . "'"); + $sql = 'UPDATE sondage SET commentaires = '.$connect->Param('commentaires').' WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + + if ($connect->Execute($sql, array($commentaires, $numsondage))) { + //envoi du mail pour prevenir l'admin de sondage + mail ($adresseadmin, + _("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION, + _("You have changed the comments of your poll. \nYou can modify this poll with this link") . + " :\n\n".getUrlSondage($numsondageadmin, true)." \n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); + } } } //si la valeur de la nouvelle adresse est valide et que le bouton est activé -if (isset($_POST["boutonnouvelleadresse"])){ - if(! isset($_POST["nouvelleadresse"]) || empty($_POST["nouvelleadresse"]) || - ! filter_var($_POST["nouvelleadresse"], FILTER_VALIDATE_EMAIL) || strpos($_POST["nouvelleadresse"], '@') === false) { +if (isset($_POST["boutonnouvelleadresse"]) || isset($_POST["boutonnouvelleadresse_x"])) { + if(issetAndNoEmpty('nouvelleadresse') === false || validateEmail($_POST["nouvelleadresse"]) === false) { $err |= INVALID_EMAIL; } else { - //envoi du mail pour prevenir l'admin de sondage - mail ($_POST['nouvelleadresse'], - _("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION, - _("You have changed your email address in your poll. \nYou can modify this poll with this link") . - " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + $nouvelleadresse = htmlentities(html_entity_decode($_POST['nouvelleadresse'], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); //modification de la base SQL avec la nouvelle adresse - $connect->Execute("UPDATE sondage SET mail_admin = '" . $_POST['nouvelleadresse'] . "' WHERE id_sondage = '" . $numsondage . "'"); + $sql = 'UPDATE sondage SET mail_admin = '.$connect->Param('nouvelleadresse').' WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + + if ($connect->Execute($sql, array($nouvelleadresse, $numsondage))) { + //envoi du mail pour prevenir l'admin de sondage + mail ($_POST['nouvelleadresse'], + _("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION, + _("You have changed your email address in your poll. \nYou can modify this poll with this link") . + " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); + } } } @@ -167,8 +180,7 @@ if (isset($_POST["boutonnouvelleadresse"])){ $dsujet=$sujets->FetchObject(false); $dsondage=$sondage->FetchObject(false); -if ($_POST["ajoutsujet_x"]){ - +if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { print_header(true); echo ''."\n"; logo(); @@ -197,22 +209,22 @@ if ($_POST["ajoutsujet_x"]){ echo ''."\n"; echo ''."\n"; echo '

    '. _("Add a start hour (optional)") .' :

    '."\n"; echo ''."\n"; @@ -226,7 +238,7 @@ if ($_POST["ajoutsujet_x"]){ echo '

    '. _("Add a end hour (optional)") .' :

    '."\n"; echo ''."\n"; @@ -254,68 +266,74 @@ if ($_POST["ajoutsujet_x"]){ } //action si bouton confirmation de suppression est activé -if ($_POST["confirmesuppression"]) { +if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x"])) { $nbuser=$user_studs->RecordCount(); $date=date('H:i:s d/m/Y:'); - // on ecrit dans le fichier de logs la suppression du sondage - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 3, 'admin/logs_studs.txt'); - - //envoi du mail a l'administrateur du sondage - mail ($adresseadmin, - _("[ADMINISTRATOR] Removing of your poll") . ' ' . NOMAPPLICATION, - _("You have removed your poll. \nYou can make new polls with this link") . - " :\n\n".get_server_name()."index.php \n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); - //destruction des données dans la base SQL - $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. - 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . - 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . - "WHERE id_sondage = '$numsondage' "); + $sql = 'DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage '. + 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage '. + 'WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + if ($connect->Execute($sql, array($numsondage))) { + // on ecrit dans le fichier de logs la suppression du sondage + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 3, 'admin/logs_studs.txt'); + + //envoi du mail a l'administrateur du sondage + mail ($adresseadmin, + _("[ADMINISTRATOR] Removing of your poll") . ' ' . NOMAPPLICATION, + _("You have removed your poll. \nYou can make new polls with this link") . + " :\n\n".get_server_name()."index.php \n\n" . + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, + $headers); - //affichage de l'ecran de confirmation de suppression de sondage - print_header(); - echo ''."\n"; - logo(); - bandeau_tete(); - bandeau_titre(_("Make your polls")); - - echo '
    '."\n"; - print "

    " . _("Your poll has been removed!") . "



    "; - print _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; - echo '


    '."\n"; - echo '
    '."\n"; - sur_bandeau_pied(); - bandeau_pied(); - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - die(); + //affichage de l'ecran de confirmation de suppression de sondage + print_header(); + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Make your polls")); + + echo '
    '."\n"; + print "

    " . _("Your poll has been removed!") . "



    "; + print _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; + echo '


    '."\n"; + echo '
    '."\n"; + sur_bandeau_pied(); + bandeau_pied(); + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + die(); + } } // quand on ajoute un commentaire utilisateur -if(isset($_POST['ajoutcomment'])) { - if(!isset($_POST["commentuser"]) || empty($_POST["commentuser"])) { +if(isset($_POST['ajoutcomment']) || isset($_POST['ajoutcomment_x'])) { + if(issetAndNoEmpty('commentuser') === false) { $err |= COMMENT_USER_EMPTY; } else { - $comment_user = $connect->qstr(strip_tags($_POST["commentuser"])); + $comment_user = htmlentities(html_entity_decode($_POST["commentuser"], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); } - if(empty($_POST["comment"])) { + + if(issetAndNoEmpty('comment') === false) { $err |= COMMENT_EMPTY; } - if (isset($_POST["comment"]) && - ! is_error(COMMENT_EMPTY) && ! is_error(NO_POLL) && - ! is_error(COMMENT_USER_EMPTY)) { - if( ! $connect->Execute('INSERT INTO comments ' . - '(id_sondage, comment, usercomment) VALUES ("'. - $numsondage . '","'. - $connect->qstr(strip_tags($_POST['comment'])). - '","' . - $comment_user .'")') ); - $err |= COMMENT_INSERT_FAILED; + if (issetAndNoEmpty('comment') && !is_error(COMMENT_EMPTY) && !is_error(NO_POLL) && !is_error(COMMENT_USER_EMPTY)) { + $comment = htmlentities(html_entity_decode($_POST["comment"], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); + + $sql = 'INSERT INTO comments (id_sondage, comment, usercomment) VALUES ('. + $connect->Param('id_sondage').','. + $connect->Param('comment').','. + $connect->Param('comment_user').')'; + $sql = $connect->Prepare($sql); + + $comments = $connect->Execute($sql, array($numsondage, $comment, $comment_user)); + if ($comments === false) { + $err |= COMMENT_INSERT_FAILED; + } } } @@ -350,15 +368,18 @@ echo '
    '."\n"; echo '
    '."\n"; -$nbcolonnes=substr_count($dsujet->sujet,',')+1; -$nblignes=$user_studs->RecordCount(); +$nbcolonnes = substr_count($dsujet->sujet, ',') + 1; +$nblignes = $user_studs->RecordCount(); //si il n'y a pas suppression alors on peut afficher normalement le tableau //action si le bouton participer est cliqué -if ($_POST["boutonp"]||$_POST["boutonp_x"]) { +if (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"])) { //si on a un nom dans la case texte - if ($_POST["nom"]) { + if (issetAndNoEmpty('nom')){ + $nouveauchoix = ''; + $erreur_prenom = false; + for ($i=0;$i<$nbcolonnes;$i++){ //si la checkbox est cochée alors valeur est egale à 1 if (isset($_POST["choix$i"])){ @@ -368,27 +389,29 @@ if ($_POST["boutonp"]||$_POST["boutonp_x"]) { } } - while( $user=$user_studs->FetchNextObject(false)) { - if ($_POST["nom"]==$user->nom){ + $nom = htmlentities(html_entity_decode($_POST["nom"], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); + while($user = $user_studs->FetchNextObject(false)) { + if ($nom == $user->nom){ $erreur_prenom="yes"; } } - if (preg_match(';<|>|"|\';i', $_POST["nom"])) { - $erreur_injection="yes"; - } - // Ecriture des choix de l'utilisateur dans la base - if (!$erreur_prenom&&!$erreur_injection) { - $nom=str_replace("'","°",$_POST["nom"]); - $connect->Execute("INSERT INTO user_studs VALUES ('$nom', '$numsondage', '$nouveauchoix')"); + if (!$erreur_prenom) { + $sql = 'INSERT INTO user_studs (nom, id_sondage, reponses) VALUES ('. + $connect->Param('nom').','. + $connect->Param('numsondage').','. + $connect->Param('nouveauchoix').')'; + + $sql = $connect->Prepare($sql); + $connect->Execute($sql, array($nom, $numsondage, $nouveauchoix)); } } } //action quand on ajoute une colonne au format AUTRE -if ($_POST["ajoutercolonne_x"] && $_POST["nouvellecolonne"]!=""&&($dsondage->format=="A"||$dsondage->format=="A+")) { +if (isset($_POST["ajoutercolonne_x"]) && issetAndNoEmpty('nouvellecolonne') && ($dsondage->format == "A" || $dsondage->format == "A+")) { $nouveauxsujets=$dsujet->sujet; //on rajoute la valeur a la fin de tous les sujets deja entrés @@ -397,22 +420,30 @@ if ($_POST["ajoutercolonne_x"] && $_POST["nouvellecolonne"]!=""&&($dsondage->for $nouveauxsujets=str_replace("'","°",$nouveauxsujets); //mise a jour avec les nouveaux sujets dans la base - $connect->Execute("UPDATE sujet_studs SET sujet = '$nouveauxsujets' WHERE id_sondage = '$numsondage' "); - - //envoi d'un mail pour prévenir l'administrateur du changement - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + $sql = 'UPDATE sujet_studs SET sujet = '.$connect->Param('nouveauxsujets').' WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + if ($connect->Execute($sql, array($nouveauxsujets, $numsondage))) { + //envoi d'un mail pour prévenir l'administrateur du changement + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + mail ("$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . + _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . + " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, + $headers); + } } //action quand on ajoute une colonne au format DATE -if ($_POST["ajoutercolonne_x"] &&($dsondage->format=="D"||$dsondage->format=="D+")) { +if (isset($_POST["ajoutercolonne_x"]) && ($dsondage->format == "D" || $dsondage->format == "D+")) { $nouveauxsujets=$dsujet->sujet; - if ($_POST["nouveaujour"]!="vide"&&$_POST["nouveaumois"]!="vide"&&$_POST["nouvelleannee"]!="vide") { - $nouvelledate=mktime(0,0,0,$_POST["nouveaumois"],$_POST["nouveaujour"],$_POST["nouvelleannee"]); + if (isset($_POST["nouveaujour"]) && $_POST["nouveaujour"] != "vide" && + isset($_POST["nouveaumois"]) && $_POST["nouveaumois"] != "vide" && + isset($_POST["nouvelleannee"]) && $_POST["nouvelleannee"] != "vide") { - if ($_POST["nouvelleheuredebut"]!="vide") { + $nouvelledate=mktime(0, 0, 0, $_POST["nouveaumois"], $_POST["nouveaujour"], $_POST["nouvelleannee"]); + + if (isset($_POST["nouvelleheuredebut"]) && $_POST["nouvelleheuredebut"]!="vide"){ $nouvelledate.="@"; $nouvelledate.=$_POST["nouvelleheuredebut"]; $nouvelledate.="h"; @@ -422,7 +453,7 @@ if ($_POST["ajoutercolonne_x"] &&($dsondage->format=="D"||$dsondage->format=="D+ } } - if ($_POST["nouvelleheurefin"]!="vide") { + if (isset($_POST["nouvelleheurefin"]) && $_POST["nouvelleheurefin"]!="vide"){ $nouvelledate.="-"; $nouvelledate.=$_POST["nouvelleheurefin"]; $nouvelledate.="h"; @@ -432,55 +463,63 @@ if ($_POST["ajoutercolonne_x"] &&($dsondage->format=="D"||$dsondage->format=="D+ } } - if($_POST["nouvelleheuredebut"]=="vide"||($_POST["nouvelleheuredebut"]&&$_POST["nouvelleheurefin"]&&(($_POST["nouvelleheuredebut"]<$_POST["nouvelleheurefin"])||(($_POST["nouvelleheuredebut"]==$_POST["nouvelleheurefin"])&&($_POST["nouvelleminutedebut"]<$_POST["nouvelleminutefin"]))))) { - + if($_POST["nouvelleheuredebut"] == "vide" || ($_POST["nouvelleheuredebut"] && $_POST["nouvelleheurefin"] && (($_POST["nouvelleheuredebut"] < $_POST["nouvelleheurefin"]) || (($_POST["nouvelleheuredebut"] == $_POST["nouvelleheurefin"]) && ($_POST["nouvelleminutedebut"] < $_POST["nouvelleminutefin"]))))) { + $erreur_ajout_date = false; } else { - $erreur_ajout_date="yes"; + $erreur_ajout_date = "yes"; } //on rajoute la valeur dans les valeurs - $datesbase=explode(",",$dsujet->sujet); - $taillebase=sizeof($datesbase); + $datesbase = explode(",",$dsujet->sujet); + $taillebase = sizeof($datesbase); //recherche de l'endroit de l'insertion de la nouvelle date dans les dates deja entrées dans le tableau - if ($nouvelledate<$datesbase[0]) { - $cleinsertion=0; - } elseif ($nouvelledate>$datesbase[$taillebase-1]) { - $cleinsertion=count($datesbase); + if ($nouvelledate < $datesbase[0]) { + $cleinsertion = 0; + } elseif ($nouvelledate > $datesbase[$taillebase-1]) { + $cleinsertion = count($datesbase); } else { - for ($i=0;$i$datesbase[$i]&&$nouvelledate<$datesbase[$j]) { - $cleinsertion=$j; + for ($i = 0; $i < count($datesbase); $i++) { + $j = $i + 1; + if ($nouvelledate > $datesbase[$i] && $nouvelledate < $datesbase[$j]) { + $cleinsertion = $j; } } } - array_splice($datesbase,$cleinsertion,0,$nouvelledate); - $cle=array_search ($nouvelledate,$datesbase); - - for ($i=0;$iExecute("UPDATE sujet_studs SET sujet = '$dateinsertion' WHERE id_sondage = '$numsondage' "); + if (isset($erreur_ajout_date) && !$erreur_ajout_date){ + $sql = 'UPDATE sujet_studs SET sujet = '.$connect->Param('dateinsertion').' WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + $connect->Execute($sql, array($dateinsertion, $numsondage)); + if ($nouvelledate > strtotime($dsondage->date_fin)) { $date_fin=$nouvelledate+200000; - $connect->Execute("UPDATE sondage SET date_fin = '$date_fin' WHERE id_sondage = '$numsondage' "); + $sql = 'UPDATE sondage SET date_fin = '.$connect->Param('date_fin').' WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + $connect->Execute($sql, array($date_fin, $numsondage)); } } //mise a jour des reponses actuelles correspondant au sujet ajouté - while ($data=$user_studs->FetchNextObject(false)) { + $sql = 'UPDATE user_studs SET reponses = '.$connect->Param('reponses').' WHERE nom = '.$connect->Param('nom').' AND id_users='.$connect->Param('id_users'); + $sql = $connect->Prepare($sql); + while ($data = $user_studs->FetchNextObject(false)) { $ensemblereponses=$data->reponses; + $newcar = ''; //parcours de toutes les réponses actuelles - for ($j=0;$j<$nbcolonnes;$j++) { + for ($j = 0; $j < $nbcolonnes; $j++) { $car=substr($ensemblereponses,$j,1); //si les reponses ne concerne pas la colonne ajoutée, on concatene @@ -492,18 +531,18 @@ if ($_POST["ajoutercolonne_x"] &&($dsondage->format=="D"||$dsondage->format=="D+ } //mise a jour des reponses utilisateurs dans la base - if (!$erreur_ajout_date) { - $connect->Execute("update user_studs set reponses='$newcar' where nom='$data->nom' and id_users=$data->id_users"); + if (isset($erreur_ajout_date) && !$erreur_ajout_date){ + $connect->Execute($sql, array($newcar, $data->nom, $data->id_users)); } - - $newcar=""; } //envoi d'un mail pour prévenir l'administrateur du changement - $adresseadmin=$dsondage->mail_admin; + $adresseadmin = $dsondage->mail_admin; + mail ($adresseadmin, _("[ADMINISTRATOR] New column for your poll"), - _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".get_server_name()."/studs.php?sondage=$numsondage \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, + _("You have added a new column in your poll. \nYou can inform the voters of this change with this link"). + " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, $headers); } else { $erreur_ajout_date="yes"; @@ -512,13 +551,15 @@ if ($_POST["ajoutercolonne_x"] &&($dsondage->format=="D"||$dsondage->format=="D+ //suppression de ligne dans la base -for ($i=0;$i<$nblignes;$i++) { - if ($_POST["effaceligne$i"]||$_POST['effaceligne'.$i.'_x']) { +for ($i = 0; $i < $nblignes; $i++) { + if (isset($_POST["effaceligne$i"]) || isset($_POST['effaceligne'.$i.'_x'])) { $compteur=0; + $sql = 'DELETE FROM user_studs WHERE nom = '.$connect->Param('nom').' AND id_users = '.$connect->Param('id_users'); + $sql = $connect->Prepare($sql); while ($data=$user_studs->FetchNextObject(false)) { if ($compteur==$i){ - $connect->Execute("delete from user_studs where nom = '$data->nom' and id_users = '$data->id_users'"); + $connect->Execute($sql, array($data->nom, $data->id_users)); } $compteur++; @@ -528,11 +569,15 @@ for ($i=0;$i<$nblignes;$i++) { //suppression d'un commentaire utilisateur -$comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); +$sql = 'SELECT * FROM comments WHERE id_sondage='.$connect->Param('numsondage').' ORDER BY id_comment'; +$sql = $connect->Prepare($sql); +$comment_user = $connect->Execute($sql, array($numsondage)); $i = 0; while ($dcomment = $comment_user->FetchNextObject(false)) { - if ($_POST['suppressioncomment'.$i.'_x']) { - $connect->Execute("delete from comments where id_comment = '$dcomment->id_comment'"); + if (isset($_POST['suppressioncomment'.$i.'_x'])) { + $sql = 'DELETE FROM comments WHERE id_comment = '.$connect->Param('id_comment'); + $sql = $connect->Prepare($sql); + $connect->Execute($sql, array($dcomment->id_comment)); } $i++; @@ -540,14 +585,17 @@ while ($dcomment = $comment_user->FetchNextObject(false)) { //on teste pour voir si une ligne doit etre modifiée -for ($i=0;$i<$nblignes;$i++) { - if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])) { +$testmodifier = false; +$testligneamodifier = false; + +for ($i = 0; $i < $nblignes; $i++) { + if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { $ligneamodifier=$i; $testligneamodifier="true"; } //test pour voir si une ligne est a modifier - if (isset($_POST["validermodifier$i"])) { + if (isset($_POST["validermodifier$i"]) || isset($_POST['validermodifier'.$i.'_x'])) { $modifier=$i; $testmodifier="true"; } @@ -556,7 +604,8 @@ for ($i=0;$i<$nblignes;$i++) { //si le test est valide alors on affiche des checkbox pour entrer de nouvelles valeurs if ($testmodifier) { - for ($i=0;$i<$nbcolonnes;$i++) { + $nouveauchoix = ''; + for ($i = 0; $i < $nbcolonnes; $i++) { //recuperation des nouveaux choix de l'utilisateur if (isset($_POST["choix$i"])) { $nouveauchoix.="1"; @@ -567,10 +616,12 @@ if ($testmodifier) { $compteur=0; - while ( $data=$user_studs->FetchNextObject(false)) { + while ($data=$user_studs->FetchNextObject(false)) { //mise a jour des données de l'utilisateur dans la base SQL if ($compteur==$modifier) { - $connect->Execute("update user_studs set reponses='$nouveauchoix' where nom='$data->nom' and id_users='$data->id_users'"); + $sql = 'UPDATE user_studs SET reponses = '.$connect->Param('reponses').' WHERE nom = '.$connect->Param('nom').' AND id_users = '.$connect->Param('id_users'); + $sql = $connect->Prepare($sql); + $connect->Execute($sql, array($nouveauchoix, $data->nom, $data->id_users)); } $compteur++; @@ -579,56 +630,87 @@ if ($testmodifier) { //suppression de colonnes dans la base -for ($i=0;$i<$nbcolonnes;$i++) { - if ((isset($_POST["effacecolonne$i"])||isset($_POST['effacecolonne'.$i.'_x']))&&$nbcolonnes>1){ - $toutsujet=explode(",",$dsujet->sujet); - $j=0; +for ($i = 0; $i < $nbcolonnes; $i++) { + if ((isset($_POST["effacecolonne$i"]) || isset($_POST['effacecolonne'.$i.'_x'])) && $nbcolonnes > 1){ + $toutsujet = explode(",",$dsujet->sujet); + $j = 0; + $nouveauxsujets = ''; //parcours de tous les sujets actuels - while ($toutsujet[$j]) { + while (isset($toutsujet[$j])) { //si le sujet n'est pas celui qui a été effacé alors on concatene - if ($i!=$j) { - $nouveauxsujets.=','; - $nouveauxsujets.=$toutsujet[$j]; + if ($i != $j) { + $nouveauxsujets .= ','; + $nouveauxsujets .= $toutsujet[$j]; } $j++; } //on enleve la virgule au début - $nouveauxsujets=substr("$nouveauxsujets",1); + $nouveauxsujets = substr("$nouveauxsujets", 1); //nettoyage des reponses actuelles correspondant au sujet effacé $compteur = 0; - while ($data=$user_studs->FetchNextObject(false)) { - $ensemblereponses=$data->reponses; + $sql = 'UPDATE user_studs SET reponses = '.$connect->Param('reponses').' WHERE nom = '.$connect->Param('nom').' AND id_users = '.$connect->Param('id_users'); + $sql = $connect->Prepare($sql); + + while ($data = $user_studs->FetchNextObject(false)) { + $newcar = ''; + $ensemblereponses = $data->reponses; //parcours de toutes les réponses actuelles - for ($j=0;$j<$nbcolonnes;$j++) { - $car=substr($ensemblereponses,$j,1); + for ($j = 0; $j < $nbcolonnes; $j++) { + $car=substr($ensemblereponses, $j, 1); //si les reponses ne concerne pas la colonne effacée, on concatene - if ($i!=$j) { - $newcar.=$car; + if ($i != $j) { + $newcar .= $car; } } $compteur++; //mise a jour des reponses utilisateurs dans la base - $connect->Execute("update user_studs set reponses='$newcar' where nom='$data->nom' and id_users=$data->id_users"); - $newcar=""; + $connect->Execute($sql, array($newcar, $data->nom, $data->id_users)); } //mise a jour des sujets dans la base - $connect->Execute("update sujet_studs set sujet = '$nouveauxsujets' where id_sondage = '$numsondage' "); + $sql = 'UPDATE sujet_studs SET sujet = '.$connect->Param('nouveauxsujets').' WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + $connect->Execute($sql, array($nouveauxsujets, $numsondage)); } } //recuperation des donnes de la base -$sondage=$connect->Execute("select * from sondage where id_sondage_admin = '$numsondageadmin'"); -$sujets=$connect->Execute("select * from sujet_studs where id_sondage='$numsondage'"); -$user_studs=$connect->Execute("select * from user_studs where id_sondage='$numsondage' order by id_users"); +$sql = 'SELECT * FROM sondage WHERE id_sondage_admin = '.$connect->Param('numsondageadmin'); +$sql = $connect->Prepare($sql); +$sondage = $connect->Execute($sql, array($numsondageadmin)); + +if ($sondage !== false) { + $sql = 'SELECT * FROM sujet_studs WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = $connect->Prepare($sql); + $sujets = $connect->Execute($sql, array($numsondage)); + + $sql = 'SELECT * FROM user_studs WHERE id_sondage = '.$connect->Param('numsondage').' order by id_users'; + $sql = $connect->Prepare($sql); + $user_studs = $connect->Execute($sql, array($numsondage)); +} else { + print_header(false); + echo ''."\n"; + logo(); + bandeau_tete(); + bandeau_titre(_("Error!")); + echo '
    '."\n"; + print "

    " . _("This poll doesn't exist !") . "



    "."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; + echo '



    '."\n"; + echo '
    '."\n"; + bandeau_pied(); + echo''."\n"; + echo ''."\n"; + die(); +} //on recupere les données et les sujets du sondage $dsujet=$sujets->FetchObject(false); @@ -654,7 +736,7 @@ echo '    '."\n"; echo ''."\n"; //boucle pour l'affichage des boutons de suppression de colonne -for ($i=0;$toutsujet[$i];$i++) { +for ($i = 0; isset($toutsujet[$i]); $i++) { echo ''."\n"; } @@ -670,11 +752,23 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { //affichage des années $colspan=1; - for ($i=0;$i'.strftime("%Y",$toutsujet[$i]).''."\n"; + echo ''."\n"; $colspan=1; } } @@ -686,15 +780,27 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; //affichage des mois - $colspan=1; - for ($i=0;$i'.date("F",$toutsujet[$i]).''."\n"; + echo ''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } $colspan=1; @@ -708,15 +814,27 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; //affichage des jours - $colspan=1; - for ($i=0;$i'.date("D jS",$toutsujet[$i]).''."\n"; + echo ''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } $colspan=1; @@ -732,9 +850,13 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; echo ''."\n"; - for ($i=0;$toutsujet[$i];$i++) { - $heures=explode("@",$toutsujet[$i]); - echo ''."\n"; + for ($i = 0; isset($toutsujet[$i]); $i++) { + $heures=explode("@", $toutsujet[$i]); + if (isset($heures[1])) { + echo ''."\n"; + } else { + echo ''."\n"; + } } echo ''."\n"; @@ -748,7 +870,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; echo ''."\n"; - for ($i=0;$toutsujet[$i];$i++) { + for ($i = 0; isset($toutsujet[$i]); $i++) { echo ''."\n"; } @@ -758,11 +880,11 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { //affichage des resultats -$somme[]=0; +$somme[] = 0; $compteur = 0; -while ($data=$user_studs->FetchNextObject(false)) { - $ensemblereponses=$data->reponses; +while ($data = $user_studs->FetchNextObject(false)) { + $ensemblereponses = $data->reponses; echo ''."\n"; echo ''."\n"; @@ -773,10 +895,13 @@ while ($data=$user_studs->FetchNextObject(false)) { //si la ligne n'est pas a changer, on affiche les données if (!$testligneamodifier) { - for ($k=0;$k<$nbcolonnes;$k++) { - $car=substr($ensemblereponses,$k,1); - if ($car=="1") { + for ($k = 0; $k < $nbcolonnes; $k++) { + $car = substr($ensemblereponses, $k, 1); + if ($car == "1") { echo ''."\n"; + if (isset($somme[$k]) === false) { + $somme[$k] = 0; + } $somme[$k]++; } else { echo ''."\n"; @@ -785,21 +910,24 @@ while ($data=$user_studs->FetchNextObject(false)) { } else { //sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs //si c'est bien la ligne a modifier on met les checkbox - if ($compteur=="$ligneamodifier") { - for ($j=0;$j<$nbcolonnes;$j++) { - $car=substr($ensemblereponses,$j,1); - if ($car=="1") { + if ($compteur == "$ligneamodifier") { + for ($j = 0; $j < $nbcolonnes; $j++) { + $car = substr($ensemblereponses, $j, 1); + if ($car == "1") { echo ''."\n"; } else { echo ''."\n"; } } } else { //sinon on affiche les lignes normales - for ($k=0;$k<$nbcolonnes;$k++) { - $car=substr($ensemblereponses,$k,1); + for ($k = 0; $k < $nbcolonnes; $k++) { + $car = substr($ensemblereponses, $k, 1); - if ($car=="1") { + if ($car == "1") { echo ''."\n"; + if (isset($somme[$k]) === false) { + $somme[$k] = 0; + } $somme[$k]++; } else { echo ''."\n"; @@ -814,9 +942,9 @@ while ($data=$user_studs->FetchNextObject(false)) { } //demande de confirmation pour modification de ligne - for ($i=0;$i<$nblignes;$i++) { - if (isset($_POST["modifierligne$i"])||isset($_POST['modifierligne'.$i.'_x'])) { - if ($compteur==$i) { + for ($i = 0; $i < $nblignes; $i++) { + if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { + if ($compteur == $i) { echo ''."\n"; } } @@ -835,7 +963,7 @@ echo '
    '."\n"; echo ''."\n"; //une ligne de checkbox pour le choix du nouvel utilisateur -for ($i=0;$i<$nbcolonnes;$i++) { +for ($i = 0; $i < $nbcolonnes; $i++) { echo ''."\n"; } @@ -844,13 +972,15 @@ echo ''."\n"; echo ''."\n"; echo ''."\n"; -for ($i=0;$i<$nbcolonnes;$i++) { - $affichesomme=$somme[$i]; - - if ($affichesomme=="") { - $affichesomme="0"; +for ($i = 0; $i < $nbcolonnes; $i++) { + if (isset($somme[$i]) === true) { + $affichesomme = $somme[$i]; + } else { + $affichesomme = ''; } - if ($somme[$i]==$meilleurecolonne) { + if ($affichesomme == "") { + $affichesomme = "0"; + } + + if (isset($somme[$i]) === true && isset($meilleurecolonne) === true && $somme[$i] == $meilleurecolonne){ echo ''."\n"; } else { echo ''."\n"; @@ -878,8 +1012,8 @@ echo ''."\n"; echo ''."\n"; echo ''."\n"; -for ($i=0;$i<$nbcolonnes;$i++) { - if ($somme[$i]==$meilleurecolonne&&$somme[$i]) { +for ($i = 0; $i < $nbcolonnes; $i++) { + if (isset($somme[$i]) === true && isset($meilleurecolonne) === true && $somme[$i] == $meilleurecolonne){ echo ''."\n"; } else { echo ''."\n"; @@ -890,25 +1024,25 @@ echo ''."\n"; // S'il a oublié de remplir un nom -if (($_POST["boutonp"]||$_POST["boutonp_x"])&&$_POST["nom"]=="") { +if ((isset($_POST["boutonp"]) || isset($_POST["boutonp_x"])) && $_POST["nom"] == "") { echo ''."\n"; print "'."\n"; } -if ($erreur_prenom) { +if (isset($erreur_prenom) && $erreur_prenom) { echo ''."\n"; print "\n"; echo ''."\n"; } -if ($erreur_injection) { +if (isset($erreur_injection) && $erreur_injection) { echo ''."\n"; print "\n"; echo ''."\n"; } -if ($erreur_ajout_date) { +if (isset($erreur_ajout_date) && $erreur_ajout_date) { echo ''."\n"; print "\n"; echo ''."\n"; @@ -924,28 +1058,30 @@ echo 'document.formulaire.nom.focus();'."\n"; echo ''."\n"; //recuperation des valeurs des sujets et adaptation pour affichage -$toutsujet=explode(",",$dsujet->sujet); +$toutsujet = explode(",", $dsujet->sujet); //recuperation des sujets des meilleures colonnes -$compteursujet=0; -for ($i=0;$i<$nbcolonnes;$i++) { - if ($somme[$i]==$meilleurecolonne) { +$compteursujet = 0; +$meilleursujet = ''; +for ($i = 0; $i < $nbcolonnes; $i++) { + if (isset($somme[$i]) === true && isset($meilleurecolonne) === true && $somme[$i] == $meilleurecolonne){ $meilleursujet.=", "; - if ($dsondage->format=="D"||$dsondage->format=="D+") { - $meilleursujetexport=$toutsujet[$i]; - if (strpos($toutsujet[$i],'@') !== false) { - $toutsujetdate=explode("@",$toutsujet[$i]); - if ($_SESSION["langue"]=="EN") { - $meilleursujet.=date("l, F jS Y",$toutsujetdate[0])." " . _("for") ." ".$toutsujetdate[1]; + if ($dsondage->format == "D" || $dsondage->format == "D+") { + $meilleursujetexport = $toutsujet[$i]; + + if (strpos($toutsujet[$i], '@') !== false) { + $toutsujetdate = explode("@", $toutsujet[$i]); + if ($_SESSION["langue"] == "EN") { + $meilleursujet .= date("l, F jS Y",$toutsujetdate[0])." " . _("for") ." ".$toutsujetdate[1]; } else { - $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujetdate[0]). ' ' . _("for") . ' ' . $toutsujetdate[1]; + $meilleursujet .= strftime(_("%A, den %e. %B %Y"),$toutsujetdate[0]). ' ' . _("for") . ' ' . $toutsujetdate[1]; } } else { - if ($_SESSION["langue"]=="EN") { - $meilleursujet.=date("l, F jS Y",$toutsujet[$i]); + if ($_SESSION["langue"] == "EN") { + $meilleursujet .= date("l, F jS Y",$toutsujet[$i]); } else { - $meilleursujet.=strftime(_("%A, den %e. %B %Y"),$toutsujet[$i]); + $meilleursujet .= strftime(_("%A, den %e. %B %Y"),$toutsujet[$i]); } } } else { @@ -957,21 +1093,21 @@ for ($i=0;$i<$nbcolonnes;$i++) { } //adaptation pour affichage des valeurs -$meilleursujet=substr("$meilleursujet",1); -$meilleursujet=str_replace("°","'",$meilleursujet); +$meilleursujet = substr("$meilleursujet", 1); +$meilleursujet = str_replace("°", "'", $meilleursujet); //ajout du S si plusieurs votes $vote_str = _('vote'); -if ($meilleurecolonne!="1") { +if (isset($meilleurecolonne) && $meilleurecolonne > 1) { $vote_str = _('votes'); } echo '

    '."\n"; //affichage de la phrase annoncant le meilleur sujet -if ($compteursujet=="1"&&$meilleurecolonne) { +if (isset($meilleurecolonne) && $compteursujet == "1") { print "\"Meilleur" . _("The best choice at this time is") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; -} elseif ($meilleurecolonne) { +} elseif (isset($meilleurecolonne)) { print "\"Meilleur " . _("The bests choices at this time are") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; } @@ -988,44 +1124,29 @@ echo '
    '."\n"; //Changer le titre du sondage $adresseadmin=$dsondage->mail_admin; echo _("Change the title") .' :
    ' . - ''. + ''. '

    '."\n"; -echo ''."\n"; - -if ($dsondage->format=="D"||$dsondage->format=="D+") { - echo '
    '."\n"; - echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
    '; - echo ''; - echo ''; - echo ''; - echo '

    '; - echo ''."\n"; - // ''. _("Enter a meeting place!") .'

    '."\n"; -} - -// TODO -if ($_POST["exportpdf_x"]&&!$_POST["lieureunion"]) { - echo ''. _("Enter a meeting place!") .'

    '."\n"; -} //si la valeur du nouveau titre est invalide : message d'erreur -if (($_POST["boutonnouveautitre"]||$_POST["boutonnouveautitre_x"]) && $_POST["nouveautitre"]=="") { +if ((isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"])) && !issetAndNoEmpty('nouveautitre')) { echo ''. _("Enter a new title!") .'

    '."\n"; } //Changer les commentaires du sondage -echo _("Change the comments") .' :



    '."\n"; +echo _("Change the comments") .' :



    '."\n"; //Changer l'adresse de l'administrateur echo _("Change your email address") .' :

    '."\n"; //si l'adresse est invalide ou le champ vide : message d'erreur -if (($_POST["boutonnouvelleadresse"]||$_POST["boutonnouvelleadresse_x"]) && $_POST["nouvelleadresse"]=="") { +if ((isset($_POST["boutonnouvelleadresse"]) || isset($_POST["boutonnouvelleadresse_x"])) && !issetAndNoEmpty('nouvelleadresse')) { echo ''. _("Enter a new email address!") .'

    '."\n"; } //affichage des commentaires des utilisateurs existants -$comment_user=$connect->Execute("select * from comments where id_sondage='$numsondage' order by id_comment"); +$sql = 'SELECT * FROM comments WHERE id_sondage='.$connect->Param('numsondage').' ORDER BY id_comment'; +$sql = $connect->Prepare($sql); +$comment_user = $connect->Execute($sql, array($numsondage)); if ($comment_user->RecordCount() != 0) { print "
    " . _("Comments") . " :
    \n"; @@ -1038,7 +1159,7 @@ if ($comment_user->RecordCount() != 0) { echo '
    '; } -if ($erreur_commentaire_vide=="yes") { +if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide=="yes") { print "" . _("Enter a name and a comment!") . ""; } @@ -1052,11 +1173,29 @@ echo ''."\n"; echo _("Remove your poll") .' :

    '."\n"; -if ($_POST["suppressionsondage"]) { +if (isset($_POST["suppressionsondage"])) { echo _("Confirm removal of your poll") .' : '."\n"; echo '

    '."\n"; } +echo ''."\n"; + +if ($dsondage->format == "D" || $dsondage->format == "D+") { + echo '
    '."\n"; + echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
    '; + echo ''; + echo ''; + echo ''; + echo '

    '; + echo ''."\n"; + // ''. _("Enter a meeting place!") .'

    '."\n"; +} + +// TODO +if (isset($_POST["exportpdf_x"]) && !issetAndNoEmpty('lieureunion')) { + echo ''. _("Enter a meeting place!") .'

    '."\n"; +} + echo ''."\n"; echo '

    '."\n"; From 2bfca20c1a73930d2169eac268601cd35b09a5f0 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 22 May 2011 02:39:49 +0200 Subject: [PATCH 019/129] support line break in comment (poll and user) --- adminstuds.php | 6 +++--- studs.php | 4 ++-- style.css | 8 ++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index d63b673..ac921b0 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -224,7 +224,7 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo '

    '. _("Add a start hour (optional)") .' :

    '."\n"; echo ''."\n"; @@ -238,7 +238,7 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo '

    '. _("Add a end hour (optional)") .' :

    '."\n"; echo ''."\n"; @@ -463,7 +463,7 @@ if (isset($_POST["ajoutercolonne_x"]) && ($dsondage->format == "D" || $dsondage- } } - if($_POST["nouvelleheuredebut"] == "vide" || ($_POST["nouvelleheuredebut"] && $_POST["nouvelleheurefin"] && (($_POST["nouvelleheuredebut"] < $_POST["nouvelleheurefin"]) || (($_POST["nouvelleheuredebut"] == $_POST["nouvelleheurefin"]) && ($_POST["nouvelleminutedebut"] < $_POST["nouvelleminutefin"]))))) { + if($_POST["nouvelleheuredebut"] == "vide" || (isset($_POST["nouvelleheuredebut"]) && isset($_POST["nouvelleheurefin"]) && (($_POST["nouvelleheuredebut"] < $_POST["nouvelleheurefin"]) || (($_POST["nouvelleheuredebut"] == $_POST["nouvelleheurefin"]) && ($_POST["nouvelleminutedebut"] < $_POST["nouvelleminutefin"]))))) { $erreur_ajout_date = false; } else { $erreur_ajout_date = "yes"; diff --git a/studs.php b/studs.php index 43badfe..3090bc4 100644 --- a/studs.php +++ b/studs.php @@ -244,7 +244,7 @@ echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'

    '."\n"; if ($dsondage->commentaires) { echo _("Comments") .' :
    '."\n"; $commentaires = $dsondage->commentaires; - $commentaires=str_replace("\\","",$commentaires); + $commentaires=nl2br(str_replace("\\","",$commentaires)); echo $commentaires; echo '
    '."\n"; } @@ -621,7 +621,7 @@ $comment_user=$connect->Execute($sql, array($numsondage)); if ($comment_user->RecordCount() != 0) { print "
    " . _("Comments of polled people") . " :
    \n"; while($dcomment = $comment_user->FetchNextObject(false)) { - print $dcomment->usercomment . ' : ' . $dcomment->comment . '
    '; + print '

    '.$dcomment->usercomment. ' : ' . nl2br($dcomment->comment) . '
    '; } } diff --git a/style.css b/style.css index e7fe05d..8d87f4d 100644 --- a/style.css +++ b/style.css @@ -373,6 +373,14 @@ p.affichageresultats{ font-size:13px; } +div.comment{ + width:100%; +} + +div.comment span.usercomment{ + font-weight:bold; +} + a.affichageexport{ text-align: center; font-family:arial; From f6caac6e351c46661194c29b52e51fb872f0ecd3 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 22 May 2011 02:42:28 +0200 Subject: [PATCH 020/129] remove js in html header : no js control in keypress for not allow enter --- fonctions.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fonctions.php b/fonctions.php index 8a8cfdc..a9818a2 100644 --- a/fonctions.php +++ b/fonctions.php @@ -126,10 +126,6 @@ function print_header($js = false, $nom_sondage = '') echo ' '; - if($js) { - echo ''; - } - echo ''; } From 7c9a061582a6123338546f247340841c15d2fc8d Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 22 May 2011 04:03:44 +0200 Subject: [PATCH 021/129] Delete php warning and secure SQL --- adminstuds.php | 4 +- choix_autre.php | 95 ++++++++++++++++++++++++++------------------ creation_sondage.php | 28 ++++++++++--- 3 files changed, 82 insertions(+), 45 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index ac921b0..12e0c31 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -361,7 +361,7 @@ if ($dsondage->commentaires){ echo '
    '. _("Comments") .' :
    '."\n"; $commentaires=$dsondage->commentaires; $commentaires=str_replace("\\","",$commentaires); - echo $commentaires; + echo nl2br($commentaires); echo '
    '."\n"; } echo '
    '."\n"; @@ -417,7 +417,7 @@ if (isset($_POST["ajoutercolonne_x"]) && issetAndNoEmpty('nouvellecolonne') && ( //on rajoute la valeur a la fin de tous les sujets deja entrés $nouveauxsujets.=","; $nouveauxsujets.=str_replace(","," ",$_POST["nouvellecolonne"]); - $nouveauxsujets=str_replace("'","°",$nouveauxsujets); + $nouveauxsujets = htmlentities(html_entity_decode($nouveauxsujets, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); //mise a jour avec les nouveaux sujets dans la base $sql = 'UPDATE sujet_studs SET sujet = '.$connect->Param('nouveauxsujets').' WHERE id_sondage = '.$connect->Param('numsondage'); diff --git a/choix_autre.php b/choix_autre.php index eb21269..75a8a9d 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -47,7 +47,7 @@ if (file_exists('bandeaux_local.php')) { } //si les variables de session ne sont pas valides, il y a une erreur -if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SESSION["mail"]) { +if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SESSION) === false || issetAndNoEmpty('adresse', $_SESSION) === false) { echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -72,60 +72,70 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES //partie creation du sondage dans la base SQL //On prépare les données pour les inserer dans la base - if ($_POST["confirmecreation_x"]) { + $erreur = false; + $testdate = true; + $date_selected = ''; + + if (isset($_POST["confirmecreation"]) || isset($_POST["confirmecreation_x"])) { //recuperation des données de champs textes - for ($i=0;$i<$_SESSION["nbrecases"]+1;$i++) { - if ($_POST["choix"][$i]) { + $toutchoix = ''; + for ($i = 0; $i < $_SESSION["nbrecases"] + 1; $i++) { + if (isset($_POST["choix"]) && issetAndNoEmpty($i, $_POST["choix"])) { $toutchoix.=','; - $toutchoix.=str_replace(","," ",$_POST["choix"][$i]); + $toutchoix.=str_replace(",", " ", htmlentities(html_entity_decode($_POST["choix"][$i], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8')); } } - $toutchoix=str_replace("'","°",$toutchoix); $toutchoix=substr("$toutchoix",1); $_SESSION["toutchoix"]=$toutchoix; - if ($_POST["champdatefin"]) { + if (issetAndNoEmpty('champdatefin')) { $registredate=explode("/",$_POST["champdatefin"]); - if (mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2])>time()+250000) { - $_SESSION["champdatefin"]=mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]); + if (is_array($registredate) === false || count($registredate) !== 3) { + $testdate = false; + $date_selected = $_POST["champdatefin"]; + } else { + $time = mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]); + if ($time === false || date('d/m/Y', $time) !== $_POST["champdatefin"]) { + $testdate = false; + $date_selected = $_POST["champdatefin"]; + } else { + if (mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]) > time() + 250000) { + $_SESSION["champdatefin"]=mktime(0,0,0,$registredate[1],$registredate[0],$registredate[2]); + } + } } } else { $_SESSION["champdatefin"]=time()+15552000; } - //format du sondage AUTRE - $_SESSION["formatsondage"]="A".$_SESSION["studsplus"]; - - ajouter_sondage(); - } - - // recuperation des sujets pour sondage AUTRE - for ($i=0;$i<$_SESSION["nbrecases"];$i++) { - if (!preg_match(';<|>|";',$_POST["choix"][$i])) { - $_SESSION["choix$i"]=$_POST["choix"][$i]; + if ($testdate === true) { + //format du sondage AUTRE + $_SESSION["formatsondage"]="A".$_SESSION["studsplus"]; + + ajouter_sondage(); } else { - $erreur_injection="yes"; + $_POST["fin_sondage_autre"] = 'ok'; } } - //nombre de cases par défaut - if (!$_SESSION["nbrecases"]) { + // recuperation des sujets pour sondage AUTRE + $erreur_injection = false; + if (isset($_SESSION["nbrecases"])) { + for ($i = 0; $i < $_SESSION["nbrecases"]; $i++) { + if (isset($_POST["choix"]) && isset($_POST["choix"][$i])) { + $_SESSION["choix$i"]=htmlentities(html_entity_decode($_POST["choix"][$i], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); + } + } + } else { //nombre de cases par défaut $_SESSION["nbrecases"]=10; } - if ($_POST["ajoutcases"]||$_POST["ajoutcases_x"]) { + if (isset($_POST["ajoutcases"]) || isset($_POST["ajoutcases_x"])) { $_SESSION["nbrecases"]=$_SESSION["nbrecases"]+5; } - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; - echo ''; - echo ''."\n"; + print_header(); echo ''."\n"; echo '
    '."\n"; @@ -139,8 +149,11 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES echo '
    '.$heures[1].''.$heures[1].'
    '.$toutsujet[$i].'
    '; @@ -396,7 +436,7 @@ while ($data=$user_studs->FetchNextObject(false)) { echo $nombase.'OK
    '."\n"; - if (isset($_SERVER['REMOTE_USER'])) { - echo ''.$_SESSION['nom']."\n"; + if (isset($_SESSION['nom'])) { + echo ''.$_SESSION['nom']."\n"; } else { echo ''."\n"; } @@ -471,13 +513,15 @@ if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { //determination de la meilleure date // On cherche la meilleure colonne -for ($i=0;$i<$nbcolonnes;$i++) { - if ($i=="0") { - $meilleurecolonne=$somme[$i]; - } - - if ($somme[$i]>$meilleurecolonne) { - $meilleurecolonne=$somme[$i]; +for ($i=0; $i < $nbcolonnes; $i++) { + if (isset($somme[$i]) === true) { + if ($i == "0") { + $meilleurecolonne = $somme[$i]; + } + + if (isset($meilleurecolonne) === false || $somme[$i] > $meilleurecolonne) { + $meilleurecolonne = $somme[$i]; + } } } @@ -485,10 +529,15 @@ for ($i=0;$i<$nbcolonnes;$i++) { echo '
    '. _("Addition") .''.$affichesomme.'
    ' . _('Best choice') . ''.strftime("%Y", $current).''.date("F",$current).''.strftime("%B",$toutsujet[$i]).''.strftime("%B",$current).''.date("D jS",$current).''.strftime("%a %e",$toutsujet[$i]).''.strftime("%a %e",$current).''.$heures[1].''.$heures[1].''.$toutsujet[$i].'
    OKOK$meilleurecolonne) { - $meilleurecolonne=$somme[$i]; +for ($i = 0; $i < $nbcolonnes + 1; $i++) { + if (isset($somme[$i]) === true) { + if ($i == "0") { + $meilleurecolonne = $somme[$i]; + } + + if (isset($somme[$i]) && $somme[$i] > $meilleurecolonne){ + $meilleurecolonne = $somme[$i]; + } } } @@ -860,14 +990,18 @@ echo '
    '. _("Addition") .''.$affichesomme.''.$affichesomme.'
    Meilleur resultat
    " . _("Enter a name !") . "\n"; echo '
    " . _("The name you've chosen already exist in this poll!") . "
    " . _("Characters \" ' < et > are not permitted") . "
    " . _("The date is not correct !") . "
    '."\n"; //affichage des cases texte de formulaire - for ($i=0;$i<$_SESSION["nbrecases"];$i++) { - $j=$i+1; + for ($i = 0; $i < $_SESSION["nbrecases"]; $i++) { + $j = $i + 1; + if (isset($_SESSION["choix$i"]) === false) { + $_SESSION["choix$i"] = ''; + } echo ''."\n"; } @@ -162,28 +175,34 @@ if (!$_SESSION["nom"]&&!$_SESSION["adresse"]&&!$_SESSION["commentaires"]&&!$_SES echo '
    '. _("Choice") .' '.$j.' :
    '."\n"; //test de remplissage des cases + $testremplissage = ''; for ($i=0;$i<$_SESSION["nbrecases"];$i++) { - if ($_POST["choix"][$i]!="") { + if (isset($_POST["choix"]) && issetAndNoEmpty($i, $_POST["choix"])) { $testremplissage="ok"; } } //message d'erreur si aucun champ renseigné - if ($testremplissage!="ok"&&($_POST["fin_sondage_autre"]||$_POST["fin_sondage_autre_x"])) { + if ($testremplissage != "ok" && (isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"]))) { print "
    " . _("Enter at least one choice") . "

    "."\n"; - $erreur="yes"; + $erreur = true; + } + + //message d'erreur si mauvaise date + if ($testdate === false) { + print "
    " . _("Date must be have the format DD/MM/YYYY") . "

    "."\n"; } if ($erreur_injection) { print "" . _("Characters \" < and > are not permitted") . "

    \n"; } - if (($_POST["fin_sondage_autre"]||$_POST["fin_sondage_autre_x"])&&!$erreur&&!$erreur_injection) { + if ((isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"])) && !$erreur && !$erreur_injection) { //demande de la date de fin du sondage echo '
    '."\n"; echo '
    '."\n"; echo '
    '. _("Your poll will be automatically removed after 6 months.
    You can fix another removal date for it.") .'

    '."\n"; - echo _("Removal date (optional)") .' : '. _("(DD/MM/YYYY)") ."\n"; + echo _("Removal date (optional)") .' : '. _("(DD/MM/YYYY)") ."\n"; echo '
    '."\n"; echo '
    '."\n"; echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; diff --git a/creation_sondage.php b/creation_sondage.php index ffdc5fd..4436817 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -78,15 +78,33 @@ function ajouter_sondage() $date_fin=$_SESSION["totalchoixjour"][$taille_tableau]+200000; } + if (is_numeric($date_fin) === false) { + $date_fin = time()+15552000; + } + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; global $connect; - $connect->Execute('insert into sondage ' . - '(id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) ' . - 'VALUES '. - "('$sondage','$_SESSION[commentaires]', '$_SESSION[adresse]', '$_SESSION[nom]', '$_SESSION[titre]','$sondage_admin', FROM_UNIXTIME('$date_fin'), '$_SESSION[formatsondage]','$_SESSION[mailsonde]' )"); - $connect->Execute("insert into sujet_studs values ('$sondage', '$_SESSION[toutchoix]' )"); + $sql = 'INSERT INTO sondage + (id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) + VALUES ( + '.$connect->Param('id_sondage').', + '.$connect->Param('commentaires').', + '.$connect->Param('mail_admin').', + '.$connect->Param('nom_admin').', + '.$connect->Param('titre').', + '.$connect->Param('id_sondage_admin').', + FROM_UNIXTIME('.$date_fin.'), + '.$connect->Param('format').', + '.$connect->Param('mailsonde').' + )'; + $sql = $connect->Prepare($sql); + $res = $connect->Execute($sql, array($sondage, $_SESSION['commentaires'], $_SESSION['adresse'], $_SESSION['nom'], $_SESSION['titre'], $sondage_admin, $_SESSION['formatsondage'], $_SESSION['mailsonde'])); + + $sql = 'INSERT INTO sujet_studs values ('.$connect->Param('sondage').', '.$connect->Param('choix').')'; + $sql = $connect->Prepare($sql); + $connect->Execute($sql, array($sondage, $_SESSION['toutchoix'])); $message = _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll."); $message .= "\n\n"; From 378144a02586e0f19f6b46dfd93ed270c43789e6 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 22 May 2011 04:17:24 +0200 Subject: [PATCH 022/129] Send mail use address without verification, check it before (possibility fail for send spam) --- creation_sondage.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/creation_sondage.php b/creation_sondage.php index 4436817..417f960 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -117,8 +117,10 @@ function ajouter_sondage() $message = sprintf($message, getUrlSondage($sondage)); $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); + if (validateEmail($_SESSION['adresse'])) { + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); + } $date=date('H:i:s d/m/Y:'); error_log($date . " CREATION: $sondage\t$_SESSION[formatsondage]\t$_SESSION[nom]\t$_SESSION[adresse]\t \t$_SESSION[toutchoix]\n", 3, 'admin/logs_studs.txt'); From 9a708f2cef8d008adb1af683471b61e7570c15b7 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 29 May 2011 03:38:56 +0200 Subject: [PATCH 023/129] Allow 'enter' keypress --- block_enter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block_enter.js b/block_enter.js index 9808500..4f1fe14 100644 --- a/block_enter.js +++ b/block_enter.js @@ -17,4 +17,4 @@ function process_keypress(e) } } -document.onkeypress = process_keypress; \ No newline at end of file +//document.onkeypress = process_keypress; \ No newline at end of file From 515ec353d79da27aa761d85532803dd42ff1a0e1 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 29 May 2011 03:39:36 +0200 Subject: [PATCH 024/129] Allow all text in hour --- choix_date.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/choix_date.php b/choix_date.php index 907e8a0..8b6b6ac 100644 --- a/choix_date.php +++ b/choix_date.php @@ -85,7 +85,8 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) $choixdate.=","; $choixdate .= $_SESSION["totalchoixjour"][$i]; $choixdate.="@"; - $choixdate .= $_SESSION["horaires$i"][$j]; + // On remplace la virgule et l'arobase pour ne pas avoir de problème par la suite + $choixdate .= str_replace(array(',', '@'), array(',', '@'), $_SESSION["horaires$i"][$j]); } } } @@ -461,8 +462,8 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) } elseif ($_POST["horaires$i"][$j]=="") { //Si la case est vide unset($_SESSION["horaires$i"][$j]); } else { //pour tout autre format, message d'erreur - $errheure[$i][$j]=true; - $erreur=true; + //$errheure[$i][$j]=true; + //$erreur=true; $_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j]; } } From a736f0eacf9cf168e166f68485a819c8fe0fa5ef Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 29 May 2011 03:44:17 +0200 Subject: [PATCH 025/129] Prepare the 0.6.7 version --- CHANGELOG | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d54d216..83265a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,14 @@ -Les dernières améliorations de STUdS +Les dernières améliorations d'OpenSondage Changelog version 0.6.7 (mai 2011) - fork du projet STUdS (https://sourcesup.cru.fr/projects/studs/) de la version trunk du 15 mai 2011) + - reprise par Simon Leblanc - nettoyage du code (indentation, cohérence de la convention de codage) + - suppression des warning php + - résolution d'une faille de sécurité par injection SQL + - résolution d'une faille de sécurité par injection mail + - correction dans le fichier de langue (merci à Julien Reitzel) + - possibilité de mettre un texte libre pour les horaires +Les dernières améliorations de STUdS Changelog version 0.6.6 (XXX 2011) : - internationalisation avec gettext - abstraction de la base de données avec ADOdb From 9cd069f5f5bb75c758ef1414d205d0bdd165c648 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 29 May 2011 04:04:26 +0200 Subject: [PATCH 026/129] Merge master to Framasoft --- admin/logs_studs.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 admin/logs_studs.txt diff --git a/admin/logs_studs.txt b/admin/logs_studs.txt deleted file mode 100644 index b001278..0000000 --- a/admin/logs_studs.txt +++ /dev/null @@ -1,3 +0,0 @@ - -16:34:47 06/06/2010: SUPPRESSION: u5rbpzr2aja7eajb D+ Raph raph@aze.com 3 17:02:51 06/06/2010: CREATION: pii9tzo2dku973qa A+ azeazeaz zezerer@azedqs.com bloup,plop,foo,bar,pz,wx -03:32:01 15/05/2011: CREATION: e2s2e57elm14tgrb D+ simon contact@leblanc-simon.eu 1305410400,1305496800,1305583200 From 6b4069dc06a0b405f80670c931eb8b47866008d3 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 29 May 2011 05:13:58 +0200 Subject: [PATCH 027/129] Mise en forme pour framasoft --- bandeaux.php | 36 +++++++++++++++----- index.php | 2 +- style.css | 92 +++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 98 insertions(+), 32 deletions(-) diff --git a/bandeaux.php b/bandeaux.php index 78431b4..b3e7db3 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -52,7 +52,7 @@ function logo () #le bandeau principal function bandeau_tete() { - echo '
    '.NOMAPPLICATION.'
    '."\n"; + echo '

    Frama

    date

    '."\n"; } @@ -79,7 +79,7 @@ function liste_lang() #Les sous-bandeaux contenant les boutons de navigation function sous_bandeau() { - echo '
    ' . + /*echo '
    ' . ''. _("Home") .'' . ''. _("Example") .'' . ''. _("Contact") .'' . @@ -88,7 +88,7 @@ function sous_bandeau() ''. _("Admin") .'' . '' . liste_lang() . ''. - '
    ' . "\n"; + '
    ' . "\n";*/ } @@ -110,9 +110,9 @@ function sous_bandeau_admin() function sous_bandeau_choix() { - echo '
    ' . + /*echo '
    ' . ''. _("Home") .'' . - '
    '."\n"; + '
    '."\n";*/ } @@ -125,12 +125,32 @@ function sur_bandeau_pied() function bandeau_pied() { - echo '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; + //echo '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; + echo '
    ' . + ''. _("Home") .'' . + ''. _("Example") .'' . + ''. _("Contact") .'' . + //''. _("Sources") .'' . //not implemented + ''. _("About") .'' . + ''. _("Admin") .'' . + '' . + liste_lang() . ''. + '
    ' . "\n"; } function bandeau_pied_mobile() { - echo '
    '."\n" . - '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; + /*echo '
    '."\n" . + '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n";*/ + echo '
    ' . + ''. _("Home") .'' . + ''. _("Example") .'' . + ''. _("Contact") .'' . + //''. _("Sources") .'' . //not implemented + ''. _("About") .'' . + ''. _("Admin") .'' . + '' . + liste_lang() . ''. + '
    ' . "\n"; } \ No newline at end of file diff --git a/index.php b/index.php index 019e43d..1e00456 100644 --- a/index.php +++ b/index.php @@ -62,7 +62,7 @@ echo ''."\n"; //bandeaux de tete logo(); bandeau_tete(); -bandeau_titre(_("Make your polls")); +bandeau_titre(_("Organiser des rendez-vous simplement, librement.")); sous_bandeau(); echo '
    '."\n"; diff --git a/style.css b/style.css index 8d87f4d..2b54c53 100644 --- a/style.css +++ b/style.css @@ -43,17 +43,39 @@ Le fichier style.css est le fichier de style de studs. Il se trouve à la racine du répertoire studs. Il contient toutes les mises en forme des fichiers PHP de Studs. */ + +body { + margin:0; + background: #F7FAFE; + font-family: "Lucida Grande",Verdana,Arial,sans-serif; + font-size: 14px; +} + /*bandeau de titre*/ +.framorange { + color: #FF8400; + display: inline; + font-family: "bitstream sans","bitstream vera sans",'Helvetica Neue',Helvetica,Arial,'Liberation Sans',FreeSans,"sans-serif"; + font-weight: bold; + text-shadow: 0.05em 0.05em 0.05em #404040; +} +.framamauve { + color: #6B6BB5; + display: inline; + font-family: "bitstream sans","bitstream vera sans",'Helvetica Neue',Helvetica,Arial,'Liberation Sans',FreeSans,"sans-serif"; + font-weight: bold; + text-shadow: 0.05em 0.05em 0.05em #404040; +} + div.bandeau{ - line-height:35px; text-align:center; - background-color: #0b419b; + background-color: #EAEAFF; color:white; vertical-align:middle; - font-size:35px; + font-size:42px; font-family:arial; padding:8px; - height:35px; + height:50px; position:static; top:6px; left:6px; @@ -72,11 +94,12 @@ div.logo{ /*Sous bandeau avec bouton de navigation*/ div.bandeautitre{ height:17px; - background-color: #0077DD; + background-color: #EAEAFF; font-size:14px; font-weight:bold; text-align:center; - color:white; + color:#404040; + font-style: italic; vertical-align:middle; font-family:arial; padding:3px; @@ -87,12 +110,12 @@ div.bandeautitre{ } div.sousbandeau{ height:17px; - background-color: #DDDDDD; + background-color: #C4C4FF; font-size:11px; color:black; vertical-align:middle; font-family:arial; - padding:3px; + padding:5px; position:static; top:80px; left:6px; @@ -100,7 +123,7 @@ div.sousbandeau{ } /*bandeau de pied*/ div.surbandeaupied{ - background-color: #0077DD; + background-color: #EAEAFF; position:absolute; bottom:30px; left:6px; @@ -109,7 +132,7 @@ div.surbandeaupied{ } div.bandeaupied{ text-align:center; - background-color: #0b419b; + background-color: #C4C4FF; color:white; font-size:11px; font-family:arial; @@ -121,7 +144,7 @@ div.bandeaupied{ margin:2px; } div.surbandeaupiedmobile{ - background-color: #0077DD; + background-color: #EAEAFF; position:static; bottom:32px; left:6px; @@ -130,7 +153,7 @@ div.surbandeaupiedmobile{ } div.bandeaupiedmobile{ text-align:center; - background-color: #0b419b; + background-color: #C4C4FF; color:white; font-size:11px; font-family:arial; @@ -139,7 +162,8 @@ div.bandeaupiedmobile{ } /*les boutons se trouvant dans le sousbandeau*/ div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { - background-color: #0b419b; + background-color: #3E779D; + background: -moz-linear-gradient(center top , #3E779D, #65A9D7) repeat scroll 0 0 transparent; height:16px; padding: 2px 6px 2px 6px; vertical-align:middle; @@ -150,6 +174,10 @@ div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { color:white; font-size:10px; text-decoration:none; + border-radius: 14px 14px 14px 14px; + border-top: 1px solid #96D1F8; + box-shadow: 0 1px 0 #000000; + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.4); } span.sousbandeaulangue { margin-left:6px; @@ -157,14 +185,17 @@ span.sousbandeaulangue { float:right; } /*corps de la page index.php*/ -div.corps{ - font-size:12px; - font-family:arial; - position:static; - top:170px; - left:20px; - right:20px; - padding:30px; +div.corps{ + border-top: 3px solid #CCCCCC; + font-size: 14px; + left: 20px; + margin-left: auto; + margin-right: auto; + padding: 30px; + position: static; + right: 20px; + top: 170px; + width: 800px; } div.corps table{ font-family:arial; @@ -181,6 +212,20 @@ div.corpscentre{ margin-left:10%; width:80%; } +div.nouveau_sondage b { + font-size:12px; + font-weight:bold; + line-height:32px; + vertical-align: middle; + display: inline-block; + margin-right:10px; +} +div.nouveau_sondage span { + font-size:12px; + height:32px; + vertical-align: middle; + display: inline-block; +} /*affichage des jours*/ div.jourschoisis { background-color: #DDD; @@ -260,13 +305,13 @@ div.cadre td { } /*case de tableau OK dans affichage de sondage*/ div.cadre td.ok { - background-color: #66FF99; + background-color: #9494CF; font-size:12px; text-align:center; } /*Case de tableau NON dans affichage de sondage*/ div.cadre td.non { - background-color: #FF7777; + background-color: #FFC475; width:35px; } /*Case de tableau VIDE dans affichage de sondage*/ @@ -433,6 +478,7 @@ div.error, div.addcomment { font-size: 13px; } ul.exports { + display:none; /* fonction non fonctionnelle */ text-align:center; list-style-type : none ; } From f003e7134464ea5e3c3bb962137bda844e30f88d Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Tue, 21 Jun 2011 15:52:07 +0200 Subject: [PATCH 028/129] mise a jour du Changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 83265a6..ff34f06 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ Les dernières améliorations d'OpenSondage - résolution d'une faille de sécurité par injection mail - correction dans le fichier de langue (merci à Julien Reitzel) - possibilité de mettre un texte libre pour les horaires + - version Framasoft Les dernières améliorations de STUdS Changelog version 0.6.6 (XXX 2011) : - internationalisation avec gettext From 016dab61912e49c94a04f31d86267d4261488f46 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Tue, 21 Jun 2011 18:19:40 +0200 Subject: [PATCH 029/129] Modif CSS pyg pour Framadate --- style.css | 84 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 20 deletions(-) diff --git a/style.css b/style.css index 2b54c53..ce02978 100644 --- a/style.css +++ b/style.css @@ -57,14 +57,19 @@ body { display: inline; font-family: "bitstream sans","bitstream vera sans",'Helvetica Neue',Helvetica,Arial,'Liberation Sans',FreeSans,"sans-serif"; font-weight: bold; - text-shadow: 0.05em 0.05em 0.05em #404040; + text-shadow: 1px 1px 1px #666; + font-size: 60px; + -webkit-font-smoothing: antialiased; + font-smooth: always; } .framamauve { color: #6B6BB5; display: inline; font-family: "bitstream sans","bitstream vera sans",'Helvetica Neue',Helvetica,Arial,'Liberation Sans',FreeSans,"sans-serif"; font-weight: bold; - text-shadow: 0.05em 0.05em 0.05em #404040; + text-shadow: 1px 1px 1px #666; + font-size: 60px; + -webkit-font-smoothing: antialiased; } div.bandeau{ @@ -82,6 +87,11 @@ div.bandeau{ right:6px; } + +.bandeau > a { + text-decoration:none; +} + div.logo{ height:64px; float:right; @@ -107,6 +117,8 @@ div.bandeautitre{ top:57px; left:6px; right:6px; + margin-bottom: 1em; + border-bottom: 1px solid #CCC; } div.sousbandeau{ height:17px; @@ -115,11 +127,16 @@ div.sousbandeau{ color:black; vertical-align:middle; font-family:arial; - padding:5px; - position:static; - top:80px; + padding: 15px 10px 13px 10px; + position:fixed; + bottom: 0px; + width: 100%; + /* top:80px; left:6px; - right:6px; + right:6px; */ + /* display: none; */ + margin-top: 1.5em; + border-top: 1px solid #999; } /*bandeau de pied*/ div.surbandeaupied{ @@ -165,14 +182,14 @@ div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { background-color: #3E779D; background: -moz-linear-gradient(center top , #3E779D, #65A9D7) repeat scroll 0 0 transparent; height:16px; - padding: 2px 6px 2px 6px; + padding: 3px 8px 3px 8px; vertical-align:middle; text-align:center; margin-left:10px; margin-right:10px; font-family:arial; color:white; - font-size:10px; + font-size:12px; text-decoration:none; border-radius: 14px 14px 14px 14px; border-top: 1px solid #96D1F8; @@ -185,20 +202,29 @@ span.sousbandeaulangue { float:right; } /*corps de la page index.php*/ -div.corps{ - border-top: 3px solid #CCCCCC; - font-size: 14px; - left: 20px; - margin-left: auto; - margin-right: auto; - padding: 30px; - position: static; - right: 20px; - top: 170px; - width: 800px; + +.corps { + font-family: "Lucida Grande",Verdana,Arial,sans-serif; + font-size: 14px; + /* left: 20px; */ + margin-left: auto; + margin-right: auto; + padding-bottom: 30px; + padding-left: 30px; + padding-right: 30px; + padding-top: 30px; + /* position: static; + right: 20px; + top: 170px; */ + width: 800px; + border: 3px solid #CCC; + background-color: #fff; + box-shadow: 5px 5px 5px #666; + } + + div.corps table{ - font-family:arial; font-size:12px; font-weight:bold; } @@ -485,3 +511,21 @@ ul.exports { li.error { color: red; } + +#creation_sondage_date, #creation_sondage_autre { + vertical-align: middle; + margin: 10px; + margin-left: 0; + padding-left: 5px; + border-left: 1px solid #ccc; +} + +#choix_sondage { + width: 300px; +} +#choix_sondage tr:hover { + background: #fcc; +} +.separateur { + line-height: 4em; +} \ No newline at end of file From 078db0772842c48be848a90babfd8bd329252602 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Tue, 21 Jun 2011 19:07:53 +0200 Subject: [PATCH 030/129] Modif CSS pyg pour Framadate --- style.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/style.css b/style.css index ce02978..d937c84 100644 --- a/style.css +++ b/style.css @@ -295,6 +295,7 @@ div.presentationdate { margin-top:10px; margin-left:30%; margin-right: 30%; + background-color: #FFF; } div.presentationdatefin { width:40%; @@ -528,4 +529,12 @@ li.error { } .separateur { line-height: 4em; +} +.formulaire2 { + width:40%; + margin-left: auto; + margin-right: auto; +} +.formulaire2 input[name="lieureunion"] { + width: 350px; } \ No newline at end of file From 588b0e4688da4ffafbb13fd17b63d84316224253 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 Jun 2011 01:21:56 +0200 Subject: [PATCH 031/129] Nombreuses modifs de forme (CSS, graphisme) et qq modifs de fond --- .gitignore | 3 + .htaccess | 4 +- CHANGELOG | 7 + admin/.htaccess | 19 +- adminstuds.php | 4 +- apropos.php | 1 + bandeaux.php | 26 +-- buttons.css | 244 ++++++++++++++++++++++++++ choix_autre.php | 18 +- choix_date.php | 43 +++-- creation_sondage.php | 2 +- fonctions.php | 2 +- images/Framadate_logo.pdn | Bin 0 -> 13810 bytes images/Framadate_logo.png | Bin 0 -> 3241 bytes images/date.png | Bin 0 -> 60015 bytes images/date_300.png | Bin 0 -> 33506 bytes images/date_original.png | Bin 0 -> 13514 bytes images/logo-Framasoft.jpg | Bin 0 -> 3427 bytes images/sondage.png | Bin 0 -> 47027 bytes images/sondage2.png | Bin 0 -> 70717 bytes images/sondage2_300.png | Bin 0 -> 32731 bytes images/sondage2_original.png | Bin 0 -> 13753 bytes images/sondage_300.png | Bin 0 -> 21623 bytes images/sondage_orignal.png | Bin 0 -> 11814 bytes index.php | 29 ++- infos_sondage.php | 75 +++++--- locale/en_GB/LC_MESSAGES/Studs.mo | Bin 12736 -> 13036 bytes locale/en_GB/LC_MESSAGES/Studs.po | 9 + locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 18901 -> 19309 bytes locale/fr_FR/LC_MESSAGES/Studs.old.mo | Bin 0 -> 18901 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 23 ++- print.css | 10 ++ studs.php | 28 +-- style.css | 63 +++++-- 34 files changed, 507 insertions(+), 103 deletions(-) mode change 100644 => 100755 admin/.htaccess create mode 100644 buttons.css create mode 100644 images/Framadate_logo.pdn create mode 100644 images/Framadate_logo.png create mode 100644 images/date.png create mode 100644 images/date_300.png create mode 100644 images/date_original.png create mode 100644 images/logo-Framasoft.jpg create mode 100644 images/sondage.png create mode 100644 images/sondage2.png create mode 100644 images/sondage2_300.png create mode 100644 images/sondage2_original.png create mode 100644 images/sondage_300.png create mode 100644 images/sondage_orignal.png create mode 100644 locale/fr_FR/LC_MESSAGES/Studs.old.mo create mode 100644 print.css diff --git a/.gitignore b/.gitignore index 3bbc6ec..ac4896f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ variables.php +admin/.htaccess +admin/.htpasswd +admin/logs_studs.txt diff --git a/.htaccess b/.htaccess index 410958e..e209fae 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ - +# RewriteEngine On RewriteCond %{REQUEST_FILENAME} -f [OR] @@ -9,4 +9,4 @@ RewriteRule ^([a-z0-9]{24})/admin$ adminstuds.php?sondage=$1 # Pour le dernier j'ai honte, mais il y a trop de chose à modifier pour le moment :-) RewriteRule ^([a-z0-9]{24})/images/(.*)$ images/$2 - \ No newline at end of file +# \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index ff34f06..e5d9916 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,11 @@ Les dernières améliorations d'OpenSondage + + Changelog du 21 juin 2011 (pyg@framasoft.net) + - très nombreuses modifications CSS + - modification adminstuds.php : ajout de classes aux formulaires et ajout de stripslashes à l'affichage (TODO: à généraliser) + - modification infos_sondages.php : simplification du tableau de choix, ajouts de CSS, ajouts de labels pour faciliter la selection + + Changelog version 0.6.7 (mai 2011) - fork du projet STUdS (https://sourcesup.cru.fr/projects/studs/) de la version trunk du 15 mai 2011) - reprise par Simon Leblanc diff --git a/admin/.htaccess b/admin/.htaccess old mode 100644 new mode 100755 index c6b0600..6247675 --- a/admin/.htaccess +++ b/admin/.htaccess @@ -1,7 +1,12 @@ -AuthType basic -AuthName "Administration de STUDS" -# replace with your server path here -# added content to the .htpasswd file with -# htpasswd -mnb -AuthUserFile /var/www/studs/admin/.htpasswd -Require valid-user +authType basic +authName "ADMIN OpenSondage" + +authUserFile /home/framatools/www/opensondage/admin/.htpasswd + +order deny,allow + +# satisfy all + +# allow from all + +require user studs diff --git a/adminstuds.php b/adminstuds.php index 12e0c31..683ccb6 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -1133,7 +1133,7 @@ if ((isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"] } //Changer les commentaires du sondage -echo _("Change the comments") .' :



    '."\n"; +echo _("Change the comments") .' :



    '."\n"; //Changer l'adresse de l'administrateur echo _("Change your email address") .' :

    '."\n"; @@ -1181,7 +1181,7 @@ if (isset($_POST["suppressionsondage"])) { echo ''."\n"; if ($dsondage->format == "D" || $dsondage->format == "D+") { - echo '
    '."\n"; + echo ''."\n"; echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
    '; echo ''; echo ''; diff --git a/apropos.php b/apropos.php index 6c3f28f..d77f8c2 100644 --- a/apropos.php +++ b/apropos.php @@ -71,6 +71,7 @@ echo '
    '."\n"; if (NOMAPPLICATION!="STUdS !") { echo 'Application d\'origine

    '."\n"; echo 'L\'application '.NOMAPPLICATION.' est une instance du logiciel STUdS ! développé à l\'Université de Strasbourg depuis 2008.

    '."\n"; + echo "Pour les besoins de Framadate, STUdS a fait l'objet d'un fork par l'équipe Framasoft. Les sources sont disponibles sur le Github OpenSondage.

    \n"; } echo 'Licence Logicielle de '.NOMAPPLICATION.'

    '."\n"; diff --git a/bandeaux.php b/bandeaux.php index b3e7db3..d956387 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -52,7 +52,7 @@ function logo () #le bandeau principal function bandeau_tete() { - echo '

    Frama

    date

    '."\n"; + echo '
    Framadate
    '."\n"; } @@ -69,7 +69,7 @@ function liste_lang() $str = ''; foreach ($ALLOWED_LANGUAGES as $k => $v ) { - $str .= '' . $v . '' . "\n" ; + $str .= '' . $v . '' . "\n" ; } return $str; @@ -126,13 +126,14 @@ function sur_bandeau_pied() function bandeau_pied() { //echo '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; + echo '
     
    '; echo '
    ' . - ''. _("Home") .'' . - ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Home") .'' . + ''. _("Example") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented - ''. _("About") .'' . - ''. _("Admin") .'' . + ''. _("About") .'' . + ''. _("Admin") .'' . '' . liste_lang() . ''. '
    ' . "\n"; @@ -143,13 +144,14 @@ function bandeau_pied_mobile() { /*echo '
    '."\n" . '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n";*/ + echo '
     
    '; echo '
    ' . - ''. _("Home") .'' . - ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Home") .'' . + ''. _("Example") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented - ''. _("About") .'' . - ''. _("Admin") .'' . + ''. _("About") .'' . + ''. _("Admin") .'' . '' . liste_lang() . ''. '
    ' . "\n"; diff --git a/buttons.css b/buttons.css new file mode 100644 index 0000000..1090579 --- /dev/null +++ b/buttons.css @@ -0,0 +1,244 @@ +/* button +---------------------------------------------- */ +.button { + display: inline-block; + zoom: 1; /* zoom and *display = ie7 hack for display:inline-block */ + *display: inline; + vertical-align: baseline; + margin: 0 2px; + outline: none; + cursor: pointer; + text-align: center; + text-decoration: none; + font: 14px/100% Arial, Helvetica, sans-serif; + padding: .5em 2em .55em; + text-shadow: 0 1px 1px rgba(0,0,0,.3); + -webkit-border-radius: .5em; + -moz-border-radius: .5em; + border-radius: .5em; + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2); + -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2); + box-shadow: 0 1px 2px rgba(0,0,0,.2); +} +.button:hover { + text-decoration: none; +} +.button:active { + position: relative; + top: 1px; +} + +.bigrounded { + -webkit-border-radius: 2em; + -moz-border-radius: 2em; + border-radius: 2em; +} +.medium { + font-size: 12px; + padding: .4em 1.5em .42em; +} +.small { + font-size: 11px; + padding: .2em 1em .275em; +} + +/* color styles +---------------------------------------------- */ + +/* black */ +.black { + color: #d7d7d7; + border: solid 1px #333; + background: #333; + background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#000)); + background: -moz-linear-gradient(top, #666, #000); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#666666', endColorstr='#000000'); +} +.black:hover { + background: #000; + background: -webkit-gradient(linear, left top, left bottom, from(#444), to(#000)); + background: -moz-linear-gradient(top, #444, #000); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#000000'); +} +.black:active { + color: #666; + background: -webkit-gradient(linear, left top, left bottom, from(#000), to(#444)); + background: -moz-linear-gradient(top, #000, #444); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#666666'); +} + +/* gray */ +.gray { + color: #e9e9e9; + border: solid 1px #555; + background: #6e6e6e; + background: -webkit-gradient(linear, left top, left bottom, from(#888), to(#575757)); + background: -moz-linear-gradient(top, #888, #575757); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#888888', endColorstr='#575757'); +} +.gray:hover { + background: #616161; + background: -webkit-gradient(linear, left top, left bottom, from(#757575), to(#4b4b4b)); + background: -moz-linear-gradient(top, #757575, #4b4b4b); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#757575', endColorstr='#4b4b4b'); +} +.gray:active { + color: #afafaf; + background: -webkit-gradient(linear, left top, left bottom, from(#575757), to(#888)); + background: -moz-linear-gradient(top, #575757, #888); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#575757', endColorstr='#888888'); +} + +/* white */ +.white { + color: #606060; + border: solid 1px #b7b7b7; + background: #fff; + background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed)); + background: -moz-linear-gradient(top, #fff, #ededed); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed'); +} +.white:hover { + background: #ededed; + background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#dcdcdc)); + background: -moz-linear-gradient(top, #fff, #dcdcdc); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dcdcdc'); +} +.white:active { + color: #999; + background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff)); + background: -moz-linear-gradient(top, #ededed, #fff); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff'); +} + +/* orange */ +.orange { + color: #fef4e9; + border: solid 1px #da7c0c; + background: #f78d1d; + background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20)); + background: -moz-linear-gradient(top, #faa51a, #f47a20); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20'); +} +.orange:hover { + background: #f47c20; + background: -webkit-gradient(linear, left top, left bottom, from(#f88e11), to(#f06015)); + background: -moz-linear-gradient(top, #f88e11, #f06015); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f88e11', endColorstr='#f06015'); +} +.orange:active { + color: #fcd3a5; + background: -webkit-gradient(linear, left top, left bottom, from(#f47a20), to(#faa51a)); + background: -moz-linear-gradient(top, #f47a20, #faa51a); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f47a20', endColorstr='#faa51a'); +} + +/* red */ +.red { + color: #faddde; + border: solid 1px #980c10; + background: #d81b21; + background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317)); + background: -moz-linear-gradient(top, #ed1c24, #aa1317); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed1c24', endColorstr='#aa1317'); +} +.red:hover { + background: #b61318; + background: -webkit-gradient(linear, left top, left bottom, from(#c9151b), to(#a11115)); + background: -moz-linear-gradient(top, #c9151b, #a11115); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#c9151b', endColorstr='#a11115'); +} +.red:active { + color: #de898c; + background: -webkit-gradient(linear, left top, left bottom, from(#aa1317), to(#ed1c24)); + background: -moz-linear-gradient(top, #aa1317, #ed1c24); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1317', endColorstr='#ed1c24'); +} + +/* blue */ +.blue { + color: #d9eef7; + border: solid 1px #0076a3; + background: #0095cd; + background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5)); + background: -moz-linear-gradient(top, #00adee, #0078a5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5'); +} +.blue:hover { + background: #007ead; + background: -webkit-gradient(linear, left top, left bottom, from(#0095cc), to(#00678e)); + background: -moz-linear-gradient(top, #0095cc, #00678e); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0095cc', endColorstr='#00678e'); +} +.blue:active { + color: #80bed6; + background: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00adee)); + background: -moz-linear-gradient(top, #0078a5, #00adee); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00adee'); +} + +/* rosy */ +.rosy { + color: #fae7e9; + border: solid 1px #b73948; + background: #da5867; + background: -webkit-gradient(linear, left top, left bottom, from(#f16c7c), to(#bf404f)); + background: -moz-linear-gradient(top, #f16c7c, #bf404f); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f16c7c', endColorstr='#bf404f'); +} +.rosy:hover { + background: #ba4b58; + background: -webkit-gradient(linear, left top, left bottom, from(#cf5d6a), to(#a53845)); + background: -moz-linear-gradient(top, #cf5d6a, #a53845); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf5d6a', endColorstr='#a53845'); +} +.rosy:active { + color: #dca4ab; + background: -webkit-gradient(linear, left top, left bottom, from(#bf404f), to(#f16c7c)); + background: -moz-linear-gradient(top, #bf404f, #f16c7c); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bf404f', endColorstr='#f16c7c'); +} + +/* green */ +.green { + color: #e8f0de; + border: solid 1px #538312; + background: #64991e; + background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e)); + background: -moz-linear-gradient(top, #7db72f, #4e7d0e); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e'); +} +.green:hover { + background: #538018; + background: -webkit-gradient(linear, left top, left bottom, from(#6b9d28), to(#436b0c)); + background: -moz-linear-gradient(top, #6b9d28, #436b0c); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6b9d28', endColorstr='#436b0c'); +} +.green:active { + color: #a9c08c; + background: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#7db72f)); + background: -moz-linear-gradient(top, #4e7d0e, #7db72f); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e7d0e', endColorstr='#7db72f'); +} + +/* pink */ +.pink { + color: #feeef5; + border: solid 1px #d2729e; + background: #f895c2; + background: -webkit-gradient(linear, left top, left bottom, from(#feb1d3), to(#f171ab)); + background: -moz-linear-gradient(top, #feb1d3, #f171ab); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#feb1d3', endColorstr='#f171ab'); +} +.pink:hover { + background: #d57ea5; + background: -webkit-gradient(linear, left top, left bottom, from(#f4aacb), to(#e86ca4)); + background: -moz-linear-gradient(top, #f4aacb, #e86ca4); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4aacb', endColorstr='#e86ca4'); +} +.pink:active { + color: #f3c3d9; + background: -webkit-gradient(linear, left top, left bottom, from(#f171ab), to(#feb1d3)); + background: -moz-linear-gradient(top, #f171ab, #feb1d3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f171ab', endColorstr='#feb1d3'); +} diff --git a/choix_autre.php b/choix_autre.php index 75a8a9d..9a787d0 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -170,9 +170,11 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE echo ''."\n"; echo'
    '."\n"; - echo ''."\n"; - echo ''."\n"; - echo '
    '. _("Next") .'
    '."\n"; + //echo ''."\n"; + //echo ''."\n"; + //echo '
    '. _("Next") .'
    '."\n"; + echo ''; + echo '
    '; //test de remplissage des cases $testremplissage = ''; @@ -208,9 +210,13 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; echo '
    '."\n"; echo '
    '."\n"; - echo ''."\n"; - echo ''."\n"; - echo '
    '. _("Create the poll") .'
    '."\n"; + //echo ''."\n"; + //echo ''."\n"; + //echo '
    '. _("Create the poll") .'
    '."\n"; + + echo ''; + echo '
    '; + } //fin du formulaire et bandeau de pied diff --git a/choix_date.php b/choix_date.php index 8b6b6ac..307fa2d 100644 --- a/choix_date.php +++ b/choix_date.php @@ -60,7 +60,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) logo(); bandeau_tete(); bandeau_titre(_("Error!")); - echo '
    '."\n"; + echo '
    '."\n"; print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; print _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.' . "\n"; echo '


    '."\n"; @@ -229,8 +229,11 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) bandeau_titre(_("Poll dates (2 on 2)")); sous_bandeau_choix(); + //ajout pyg pour la cohérence graphique + echo '
    '; + //affichage de l'aide pour les jours - echo '
    '."\n"; + echo '
    '."\n"; echo _("Select your dates amoung the free days (green). The selected days are in blue.
    You can unselect a day previously selected by clicking again on it.") ."\n"; echo '
    '."\n"; @@ -375,7 +378,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) //traitement de l'entrée des heures dans les cases texte $errheure = $erreur = false; - if (issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x')) { + if (issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x') ) { //On sauvegarde les heures deja entrées if (issetAndNoEmpty('totalchoixjour', $_SESSION) === true && issetAndNoEmpty('nbrecaseshoraires', $_SESSION) === true) { for ($i = 0; $i < count($_SESSION["totalchoixjour"]); $i++) { @@ -479,7 +482,8 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo '
    '."\n"; echo '

    '. _("Selected days") .' :

    '."\n"; //affichage de l'aide pour les jours - echo _("For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'

    '."\n"; + //echo _("For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'

    '."\n"; + echo _("For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)") .'

    '."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -539,10 +543,15 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo '
    '."\n"; echo ''."\n"; echo ''."\n"; - echo''."\n"; - echo ''."\n"; +# echo''."\n"; +# echo ''."\n"; echo '

    '. _("Next") .'

    '. _("Next") .'
    '."\n"; + //patch vraiment crado : on donne le nom "choixheures_x" au bouton pour éviter d'avoir à cleaner le code + echo '
    '; + echo '
    '; + + //si un seul jour et aucunes horaires choisies, : message d'erreur if ((issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x')) && (count($_SESSION["totalchoixjour"])=="1" && $_POST["horaires0"][0]=="" && $_POST["horaires0"][1]=="" && $_POST["horaires0"][2]=="" && $_POST["horaires0"][3]=="" && $_POST["horaires0"][4]=="")) { echo '
    '. _("Enter more choices for the voters") .'
    '."\n"; @@ -553,7 +562,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) //s'il n'y a pas d'erreur et que le bouton de creation est activé, on demande confirmation if (!$erreur && (issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x'))) { $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1; - $jour_arret = $_SESSION["totalchoixjour"][$taille_tableau]+200000; + $jour_arret = $_SESSION["totalchoixjour"][$taille_tableau]+2592000; if ($_SESSION["langue"]=="EN") { $date_fin=date("l, F jS Y", $jour_arret); } else { @@ -568,10 +577,17 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) // echo'

    '."\n"; // echo 'Pour finir la création du sondage, cliquez sur le bouton ajout ci-dessous'."\n"; // echo '

    '."\n"; - echo ''."\n"; - echo ''."\n"; - echo''."\n"; - echo '
    '. _("Back to hours") .'
    '. _("Create the poll") .'
    '."\n"; + + //echo ''."\n"; + //echo ''."\n"; + //echo''."\n"; + //echo '
    '. _("Back to hours") .'
    '. _("Create the poll") .'
    '."\n"; + + echo '

    '; + // patch crado : on attribue les noms de boutons avec _x pour faire croire qu'on a cliqué sur une image + echo ''; + echo ''; + echo '
    '; } echo ''."\n"; @@ -580,8 +596,11 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) //fin du formulaire et bandeau de pied echo ''."\n"; //bandeau de pied - echo '



    '."\n"; + //echo '



    '."\n"; echo '
    '."\n"; + + echo '
    '; // ajout pyg pour cohérence graphique + bandeau_pied_mobile(); echo ''."\n"; echo ''."\n"; diff --git a/creation_sondage.php b/creation_sondage.php index 417f960..8e0c863 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -118,7 +118,7 @@ function ajouter_sondage() $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); if (validateEmail($_SESSION['adresse'])) { - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message_admin, $headers); mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); } diff --git a/fonctions.php b/fonctions.php index a9818a2..54a0ff5 100644 --- a/fonctions.php +++ b/fonctions.php @@ -118,7 +118,7 @@ function print_header($js = false, $nom_sondage = '') '; if (empty($nom_sondage) === false) { echo ' - '.$nom_sondage.' - '.NOMAPPLICATION.''; + '.stripslashes($nom_sondage).' - '.NOMAPPLICATION.''; } else { echo ' '.NOMAPPLICATION.''; diff --git a/images/Framadate_logo.pdn b/images/Framadate_logo.pdn new file mode 100644 index 0000000000000000000000000000000000000000..e81647e1e7e70fbf732966c7b88d2aef8c6ae168 GIT binary patch literal 13810 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 literal 0 HcmV?d00001 diff --git a/images/Framadate_logo.png b/images/Framadate_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e4c147a1e5c5782bbbdd153a08a42561b4900f12 GIT binary patch literal 3241 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 ngf~)G#;UqcwlQ(8A9v*IjmyMLkf+=K`wg?Ra literal 0 HcmV?d00001 diff --git a/images/date.png b/images/date.png new file mode 100644 index 0000000000000000000000000000000000000000..c847011e952571975f53e89e9cdaa8852f1b874f GIT binary patch literal 60015 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≫m{EQP0 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 QB*afaMip8uW%lL&0DDlgIRF3v literal 0 HcmV?d00001 diff --git a/images/date_300.png b/images/date_300.png new file mode 100644 index 0000000000000000000000000000000000000000..354bc83211a527d47c0f096b599dbf292ff7f052 GIT binary patch literal 33506 zcmV)JK)b(*P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RW1{Mq;151cE(*OVf9cffpbVF}# zZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HNAOJ~3K~#9!>^*mU6h+(5%$Dmd z6+#KUS1BTP5xbyb?^v;5d427#1snLPSU|-F7O)poR8RyI!GeedL3#@bX_s8T+uNPz z`{UZ)-R|X5EFW+7mtS(3o1J}TcIN4Y%$_|v7z{AR00^{S?N|Ht7hZ^HG#dF}FmTFg zXWH!!1Z-cF_N)E+D=&k=`1OiqJY&pmcQ{=x#P&njezjkJ>17m%D2fz-VB-8`A49|x zfy6`)L;!^NO&Gr`@n8IRtPiM%%@{q^HLEebFQ&QzV%meW|7O6W!Y-)#gUN?uYHHa4 zsBu&BcFcw|VChl%{#JKK^^&6YtIOP#Sv^n^7GEkup?!>8R%vIb1F z#NEfB-}_RPx5eKWQI{>UQ-eC+WjxjF$WcNjd-|YoC)e=wkgd zrly{kCK#ICGUkntJ~h=k5J+3Y)Z9thgAgElTufV94YWow-X_sHqC{gTO#UHhGN9bl5Rm$E@6B<;P#myu{dNOVvYlFV+X*^_8YKY6cu${C9W zDtL%$rWp_7)6aWs_88xisD)=q2L8_vE9XKSnfMHK$OGo29H;|87FN}T8?_0ERy*dN zX0D~coOfX!eOl0n`Mw~nHQNCYee$#Avn_}Jz(tM~ei<+viNE*50 z)6q-fRFl|&M8p{4PY?hEM5MG`kJ^ljG1k6b``?8Cl+YHK6c7Os6UUIGA3`mns>Sty zfp6bb&APbuC1}5rm#kn^Njp}&F3&`C$$3oBB!t916GAl9If)K>eRABZ**W8@*k|=` z%|3cyWIrX@lJS-1BQmD1HyUG%5HfxGbd$-{zWMgE%kTH!bkj}AH=Fx7Xl!Y1cC`Ka zb1tLNXfzu0=2dbbtQ;7s&A2QrgreSOnh351lTu^7Y+R{1-;BoGtC8n<$eu`^i>xS0 zTfGZDlkLpVH?>>v+h}L2k)=vLC)wuN?9S@X>LbzQQ2AUrV9?y1hzNulj3$nv6b{P_ z3FQq&kuoI|jzH{?aDqu7!LStTPkGV6VJH&SdrI2i=`+oMEu#@L^&KQ*OucuJyRl6c zw#kK0exhj_o7h)`0D<^VvOiI&&)cu&Z}jADCaNprUv-P-jq3hQ4wdJXJx<0`)U$}$ zzzhPn{<}{<`*c+U@I0YZ@qYKkC!ej^WHK2Q#;9O6N&A+5yMb~XV~jW2Xyf+fYj+4d zmwTpqzcX%8-AVs4e6nos;nzO#{$t&5k|D|PRE@Z(X( z3I*t=d+vqn4m3Xb=rjC?^ZJ;4V0RVr9Ev8HZmIWl zyl%!L2Xz)fMj#BVeQthW+JGVewm;J}JsCCET{?;xLQ+mKDaKXhdqvtKE&k^fGXTID z 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 literal 0 HcmV?d00001 diff --git a/images/logo-Framasoft.jpg b/images/logo-Framasoft.jpg new file mode 100644 index 0000000000000000000000000000000000000000..097de5005dcb039d917d65807763a3c6f68226be GIT binary patch literal 3427 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 E0Lr0E-~a#s literal 0 HcmV?d00001 diff --git a/images/sondage.png b/images/sondage.png new file mode 100644 index 0000000000000000000000000000000000000000..fbe56b64c8c6495534191da28c8d92fa63c4cb66 GIT binary patch literal 47027 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%0AMALlCWIDwoF1t)_ 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 Z25A#Bg8X}0{Q?3$`r5`?bs7(`{|9y~Ufloy literal 0 HcmV?d00001 diff --git a/images/sondage2_300.png b/images/sondage2_300.png new file mode 100644 index 0000000000000000000000000000000000000000..1dfbdc401e0c36be3b4c72c61dcd58d763644ee3 GIT binary patch literal 32731 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 D1`8yN literal 0 HcmV?d00001 diff --git a/images/sondage_300.png b/images/sondage_300.png new file mode 100644 index 0000000000000000000000000000000000000000..2f26b4f9d2c4d878a727a2d42109ed01c3f33d3c GIT binary patch literal 21623 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'."\n"; echo ''."\n"; //debut du formulaire -echo '
    '."\n"; +echo ''."\n"; //bandeaux de tete logo(); @@ -66,15 +66,28 @@ bandeau_titre(_("Organiser des rendez-vous simplement, librement.")); sous_bandeau(); echo '
    '."\n"; -echo '

    '.NOMAPPLICATION.'
    '. _("What is it about?") .'

    '; -echo '

    '. _("Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'

    '."\n".'
    '."\n"; -echo '
    '. _("Make a poll") .'' . - '' . - '' . _('Make a poll') . '' . - '
    ' . "\n"; +#echo '

    '.NOMAPPLICATION.'
    '. _("What is it about?") .'

    '; +#echo '

    '. _("Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'

    '."\n".'
    '."\n"; +#echo '
    '. _("Make a poll") .''; +# '' . +# '' . _('Make a poll') . '' . +# ''; +#echo '
    ' . "\n"; echo '
    '."\n"; -echo '

    '."\n"; + +echo '
    '; +echo '
    '; +echo ''; +echo '
    '; + +echo '
    '; +echo '
    '; +echo ''; +echo '
    '; + + +echo '
    '."\n"; echo '
    '."\n"; echo '
    '."\n"; //bandeau de pied diff --git a/infos_sondage.php b/infos_sondage.php index de89495..ba506d5 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -47,7 +47,7 @@ if (file_exists('bandeaux_local.php')) { // On teste toutes les variables pour supprimer l'ensemble des warnings PHP // On transforme en entites html les données afin éviter les failles XSS -$post_var = array('titre', 'nom', 'adresse', 'commentaires', 'studsplus', 'mailsonde', 'creation_sondage_date', 'creation_sondage_date_x', 'creation_sondage_autre', 'creation_sondage_autre_x',); +$post_var = array('choix_sondage', 'poursuivre', 'titre', 'nom', 'adresse', 'commentaires', 'studsplus', 'mailsonde', 'creation_sondage_date', 'creation_sondage_date_x', 'creation_sondage_autre', 'creation_sondage_autre_x',); foreach ($post_var as $var) { if (isset($_POST[$var]) === true) { $$var = htmlentities($_POST[$var], ENT_QUOTES, 'UTF-8'); @@ -56,8 +56,9 @@ foreach ($post_var as $var) { } } + // On initialise egalement la session car sinon bonjour les warning :-) -$session_var = array('titre', 'nom', 'adresse', 'commentaires', 'mailsonde', 'studsplus', ); +$session_var = array('choix_sondage', 'titre', 'nom', 'adresse', 'commentaires', 'mailsonde', 'studsplus', ); foreach ($session_var as $var) { if (issetAndNoEmpty($var, $_SESSION) === false) { $_SESSION[$var] = null; @@ -73,7 +74,8 @@ $cocheplus = ''; $cochemail = ''; #tests -if (issetAndNoEmpty("creation_sondage_date") || issetAndNoEmpty("creation_sondage_autre") || issetAndNoEmpty("creation_sondage_date_x") || issetAndNoEmpty("creation_sondage_autre_x")){ +if (issetAndNoEmpty("poursuivre")){ + $_SESSION["choix_sondage"] = $choix_sondage; $_SESSION["titre"] = $titre; $_SESSION["nom"] = $nom; $_SESSION["adresse"] = $adresse; @@ -111,6 +113,8 @@ if (issetAndNoEmpty("creation_sondage_date") || issetAndNoEmpty("creation_sondag // Si pas d'erreur dans l'adresse alors on change de page vers date ou autre if ($titre && $nom && $adresse && !$erreur_adresse && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom) { +/* +# pyg@framasoft.net : inutile. if ($creation_sondage_date !== null || $creation_sondage_date_x !== null) { header("Location:choix_date.php"); exit(); @@ -120,6 +124,23 @@ if (issetAndNoEmpty("creation_sondage_date") || issetAndNoEmpty("creation_sondag header("Location:choix_autre.php"); exit(); } + + if ( $creation_sondage_autre_x !== null) { + header("Location:choix_autre.php"); + exit(); + } +*/ + if ( $poursuivre == "creation_sondage_date" ) { + header("Location:choix_date.php"); + exit(); + } + + if ( $poursuivre == "creation_sondage_autre" ) { + header("Location:choix_autre.php"); + exit(); + } + + } } @@ -144,7 +165,7 @@ if(!check_table_sondage()) { } //debut du formulaire -echo '
    '."\n"; +echo ''."\n"; echo '
    '."\n"; echo '
    '. _("You are in the poll creation section.
    Required fields cannot be left blank") .'

    '."\n"; @@ -152,15 +173,15 @@ echo '
    '. _("You are in the poll creation section.
    Required fields canno //Affichage des différents champs textes a remplir echo ''."\n"; -echo ''."\n"; -if (!$_SESSION["titre"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) { +echo ''."\n"; +if (!$_SESSION["titre"] && issetAndNoEmpty("poursuivre") ) { print ""."\n"; } elseif ($erreur_injection_titre) { print "
    "."\n"; } echo ''."\n"; -echo ''."\n"; +echo ''."\n"; if ($erreur_injection_commentaires) { print "
    "."\n"; @@ -170,12 +191,12 @@ echo ''."\n"; echo ''."\n"; + echo ''.stripslashes($_SESSION["nom"]).''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } -if (!$_SESSION["nom"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) { +if (!$_SESSION["nom"] && issetAndNoEmpty("poursuivre")) { print ""."\n"; } elseif ($erreur_injection_nom) { print "
    "."\n"; @@ -190,9 +211,9 @@ if (isset($_SERVER['REMOTE_USER'])) { echo ''."\n"; } -if (!$_SESSION["adresse"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) { +if (!$_SESSION["adresse"] && issetAndNoEmpty("poursuivre")) { print ""."\n"; -} elseif ($erreur_adresse && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) { +} elseif ($erreur_adresse && issetAndNoEmpty("poursuivre")) { print ""."\n"; } @@ -204,7 +225,7 @@ echo ''."\n"; -echo '
    '. _("The fields marked with * are required!") .'

    '."\n"; +#echo '
    '. _("The fields marked with * are required!") .'

    '."\n"; #affichage du cochage par défaut if (!$_SESSION["studsplus"] && !issetAndNoEmpty('creation_sondage_date') && !issetAndNoEmpty('creation_sondage_autre') && !issetAndNoEmpty('creation_sondage_date_x') && !issetAndNoEmpty('creation_sondage_autre_x')) { @@ -215,22 +236,32 @@ if ($_SESSION["studsplus"]=="+") { $cocheplus="checked"; } -echo ''. _(" Voters can modify their vote themselves.") .'
    '."\n"; +echo '
    '."\n"; if ($_SESSION["mailsonde"]) { $cochemail="checked"; } -echo ''. _(" To receive an email for each new vote.") .'
    '."\n"; +echo '
    '."\n"; //affichage des boutons pour choisir sondage date ou autre -echo '
    '. _("Poll title *: ") .'
    '. _("Poll title *: ") .'" . _("Enter a title") . "" . _("Characters < > and \" are not permitted") . "
    '. _("Comments: ") .'
    '. _("Comments: ") .'" . _("Characters < > and \" are not permitted") . "
    '. _("Your name*: ") .''; if (isset($_SERVER['REMOTE_USER'])) { - echo ''.$_SESSION["nom"].'" . _("Enter a name") . "" . _("Characters < > and \" are not permitted") . "" . _("Enter an email address") . " " . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "
    '."\n"; -echo ' '."\n"; -echo ''."\n"; -echo ' '."\n"; -echo ''."\n"; -echo '
    '. _("Schedule an event") .'
    '. _("Make a choice") .'
    '."\n"; -echo '


    '."\n"; +if ($_POST['choix_sondage']=='date') { + $choix="creation_sondage_date"; +} elseif ($_POST['choix_sondage']=='autre') { + $choix="creation_sondage_autre"; +} +echo ''; +echo '
    '; +echo '
    '; + + + +#echo '
    '."\n"; +#echo ''."\n"; +#echo ''."\n"; +#echo ''."\n"; +#echo '
    '."\n"; +#echo '


    '."\n"; echo '
    '."\n"; echo '
    '."\n"; //bandeau de pied diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo index 5ccc44f7a9d7da3e3948eff4cdebfa9b07863b96..ec3d9c461bcc82392341a249a44b6844f02936f1 100644 GIT binary patch delta 3264 zcmc)L|4&y{9LMn^-vq=^{6?m7MMcmLprJ;T-!Q{3AmGyZ)N0e(vghk_5B>|C@xG69?!BLT&v~D7 zE=T=W-O$fTQLToul^8@+M;Y@O9**Te>F8n1NIZxcco7q@2Zy^b8SloC7>`qJyAXTP zUV-;uBkGYmFa~#d*F$C>m7bh9fXVm;@(yzj``{JSgZ@FiD1n>Rku*%h5^E#s!MiaL z_oH6;F{)!nPy;-U>d<9OG$CUm7)F0iBq8rG8K{v>;Gi3)<3KFOBy2{0YhFhE?k!Zu z4&YGy9@X({Scy^eCIzdp2w$-6vzWvC&EHfmU>3vdhl#zt5sW~+Xgn$-)9^YLV|ScN zZez`Y0tCm9C|??OfK>hQ-FPOF)A}b3~9uTR0iM%q%UR{D&_Cl_NS-^d}q&h z+V(YU<9q~9RY!Ls?>6sX93H|<{0f!98>o!-WRyY7=tusQnm0I+iXEs_o9_4_lCDm?OyG&1uw#enX8ohK4fQ3(IgY>iRkk75F9=;%!XF!VpVx6qN?d z#=WTRb^=G>O&o?p27BgXH0>3r)n1L7%Q|Z_M$+DBuW!Nev|mAG`WR~MTt;Os^t-M6 zfqL*w)C2xSy&z(U_kuXo50h+rAZow5I_kbzwmlzjbYl@B0}Yu% z$J@{KsMPI7t=e}{b9@N3e^1(WCu(utLb7P$*>lQ38mc4NsOu9@i?RUqU0HzIMM2cm zt-)T}|1VL|i}qj!9>g^K#Tw7b)Pu*Oc1JGig)>kcD@A6>EJbyw33Xp9vQEu@)W8m- z26h~E-x(ap`^}$Jv~3cZX!ST1^}{i!jujw%G3BV9w_qi{j+)ckScECVz4l7Xq5UFW zz|WD5WZq^$sbd|e_k4pPrQ|e~>v#z@cPANs6rQ(U#7^3mZTlD#r;&V%+FoZ-+wLkV zGu_g?5yzu;%K+4ivr$ts*|tm4$-f>@W-rvD+AY|It*D;*m=|Rz54D(zFcTLcJI`!H zrF1Xq!*UpvnbB-5l51w8G8sh1U^b(^D<6y^|C^{>;)JXk?cI0{m4SGlXCi8ZeUU$t z!9g8eh{YH{eONls!6JIM9D}Iu$`4qIX<6QPWi{s0{xL))k4pb+FIA%GT#AC^ok`>y05vt#_oESqh}vN55LY~>V2bK(}p z;BAb>81f_&F%pwe*9W0KEW=Q#UX0zb36;6^)=jAAZbSWkJL>nX$a6zx7Zv?*zjwmC zj~ekOs2h*k^IxOxJArz^8Pt70+4dFeMq5SKpCJ|!iNq}8S>h2QK$H;o6En5{YpAF+ z5z~n0iDkr-#G}L_Vm6_4c9r2&9wsIetB7V|3(-~LsZ_AoK}ZLa6j39wK_GL8&LS zOjR`5D~X{*0-=)O5#Ed&Y<;3t|F+f>DYo530hQQX+iKsQQWEKR%l!eT&aHO+^=^ez zQQqWpnra#xe|gaH2Wo2ST%S`@>jZ1+ea=ePt*;7JI)R#o+BzrQ&8p1Gb5e5ysXmT* wIb*`=;I49m+(^}}_h)6apHD50j++-KuXUXTa|_!?rMJbk?-`sQ{eQjuKLvAEng9R* delta 2990 zcmYk-e@vBC9LMp4fCz%WGk*YH6h%;k(o#{-NYfAk3{Vl}=QW9+ia?TaC6HKUGk?x( zveGg)|4FKqRx)FA+FEV7wu*peHY?Vmt+`rc@6Yp`mS=qL>zs3+`AnB#u$Gn=V|(NT$0unD<`IfN6j6Lq65)IdF`iS*$d9L0}i0_w(jI2N~{2CPC& ztO2#a7Sx1J;#lJ|<^q+;bX-I3X}(9T>{rxUX)QiB)10wxcHg z7S6yAF#~&TJC4~cq@9KXjBlE$+=GQIQ!}qe4X_WLOyCghP7K1A#~Z^_GRLhav7h!S z+iqo+jAc5IE^`bg;aOBhK1MC{3i|G)a-E6>9z@14f7^B#%g_xXQ2hzEy%LYoUXPmS zPsmTqZH&hdMpMR?pfdP4R$~n+BYij%|CvPomAWXFuV=Un@5d5s$0OEo@~rDlp;rEp z^)hlVa|P#PFKWWUtSS?y<6*2o4{C#zKosU++Z6JjP33Dk@^K!cq+&ZJ;Z;0oI}h$V6?n zjkaBcT5&n*x;oq6gu1R3HNXp~>kioVEBLz~n-{gvgUm|D_X3hRpZS4`cIy!88S6pm zyiP;4XQMXX3M5%33pK$?)I{o0-|s46%N8R@(#_Igvp)!Y# z*eKU5)QuZar=l4(;7h299YeBfUPn#n66(5dk^N_WLG6hVY;i4YEb6*QWILE7)M?4Z zFvd6Aspy9dsG03Y?qSZLW_}e(j`}!%ym;U1>$Sl(|%7 z4yFM09%;pPe9xN9+0%7Bs0H`Mk$+Wg(4m#x!udFinsMAb_eHWC57T}TJs8DBC76mi z_y%Ui1sM0OhCwYB30R+ja|T!OtVt`OIPa#R=4fr%?l(LtXf`ZC^w` z+M0|?BT-5`Mrg%hgh~goj@U!!S*z#~sbmwn=NMuQQK$2-^eUxQ#6!fx#A0GJkxOhK zR7SWspJ}$P73%1!JWKHSovan%W@0a~g{UR8AsNm&5l`SQqDCF#h&)2ivy})TRFnms z?{q>h9F?_%*Qps3ZC#J!ZCx}FyNOkVHfb@T5=+DodORMYiO~2alGvyUC6mz3O(9kj z1;ip^8KIZae`Oz)Hrv>VD+r#D*+e`@sBCp{UP`m5Yon?>NwhmPcYL#yMxonbmZQ#m z6j4p+nCR#{O{mnnIG>O3*>YDqkoroZ!uBn}9fbB(rS0SY&|QUZX3|VN^jh#lpZ;xR z5gEjz1ZU4F&+yqyBojK_D*nWC#2kXd?Yup7(pAcd?F26i=S>gJ;g(Mk+f?!7)OdD! nOTFa{UQcng$6Hn0wbhgC-{l{j7TC2R_DFEorpVO5|C|2;H@p>m diff --git a/locale/en_GB/LC_MESSAGES/Studs.po b/locale/en_GB/LC_MESSAGES/Studs.po index cd1a11e..a191040 100644 --- a/locale/en_GB/LC_MESSAGES/Studs.po +++ b/locale/en_GB/LC_MESSAGES/Studs.po @@ -658,6 +658,15 @@ msgstr "" msgid "Your poll has been removed!" msgstr "Your poll has been removed!" +#: studs.php:245 +msgid "Share URL" +msgstr "Share URL" + +#: choix_date.php:490 +msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)" +msgstr "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)" + + #~ msgid "" #~ "For each selected day, you can choose, or not, meeting hours in the " #~ "following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a " diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo index 8129fa983c6d659c21839a71c5bc0fc736c60c43..1c90d14b8c0c88fb0999d4cd9ef63d8922a49db4 100644 GIT binary patch delta 4124 zcmZ|ReQ;FO8OQOnAq4Vjeo$;TZ$#XyF z+`D`3InO!wZq7tJUkrP~f6YwXZzwMl(}@1j#(ajSQaDgr#u<}_KFr4e7UD3D$9LT8 zA0vO}JO{ck7jX=Jg`@BqPC;{>G1-uf+#+nMsOUlsX5f09id%3j?m>0<2qxh$?(-P) zwA-G|DD=Jgn2sxP65ffEu@_VE0oVPgehy(4_cuqW(3crOb#w|fpueDIdIj@vMyBI( zR0ln%0S=v0)s zDVmXNnoiXB?nb3_Khl-?IVuw;QQ!LrHJ}SP0~01V6UfD|Mp8_LNty~&s%}Ab(13i$ zY{VNdgzfk!u3!nS;&j?exr;K=iuKs(w%Cql)Mt!ao^}UX4^3PyQ zFDEq9J*f7Rs1(1B%FGF5vgS1Ea~Du+e+{)Hqge-Sx=hpricov0+HK#8>Su#{z8hO< z?+CjWK0$T#6%M0^9iy2aK&|QXn2c}YEIf(a+gw7vV$xWj02ZK9{uo+#9CPpwI1~Sk zB*jc8?b_7g`BY|8X~EqXam}U|eee(}WpANU_zo_^-?-<~EhjUXsO$Myg0oOFUXQD> z3-{p&@@E>@iJSEN2dUh_i8I)MMGSX6ZpS5f7OOFv;WK#Ch)Q(`wG>ozW7PGETw~gBHLk*6V1b^0&rRHv6Gd2xjhK(SkU#SZ2l_ClU9X@v&s6f4fHQFv z=3x~UA;~c<$k@$2n268fXgun+U&X6ok1Q8U_t#kdt2 zyg7mz$cL^UAzhh2x@uN>s`612T*QH~n+~kNy%^Sr-lZZxz$E+~b~3dyZo7sZr;h4S zPe(H;q zF~^Vx!F+&P!@r|an^Nwy%TbTt9jHy&gW4lQSc$Kp-VdLn2J%lFk5^Djn#?1YjuXRF zGN{Z%-JlYGg&Xi3dn22L(v7~RS1nBj`Ru|;s2kjmJUC_ub)#dr4v*ty95=_wjAyPh zfIOVY`FWUv;oGPvg-xiA{K#a@gSe9cjG#KMneXiK<)|fDg{53yhsxM)o>67;AnNl+ zP&fD)YH5z+6#O%0<2T4a!e;yer-OXg8q^1yP%{jnHqUnV{3EDM_>$W`;kN&T8pvhT z9!OotB(MsV*%PRVUci6gzc5YD|EKIcb$AK2Mq?NA!-Lrz)L|29Ktb%lhfp*68r5<3 z&Cb(Mi@LENbv=Sh@eL%2<{BQx${McWS)3B4vZdBZ*)G(sAHv%(g4!&fpfYd~wRQ3b4J>YGibktn(=AO z!7q?~WHRcUwXef*v>WglY(e&^@hs=}0jqEweuML|eueXR@4i}JYdsM!Z17mw!|`51OQn6L z2^0`Jh-q5?9}{|c#7hemt*3q!+03zB{6mZvvKlLy9A6|li6@9+LWOrsY=hm0cM;mu zy+kANG@h5Q!4d*D8iNsW55y5sgHAE5- zFYQ#4iQM=Jw1|ASZR2Pn(QS*hgqL`XxRX#>>=65BP1W6N+!Nv+B9&M|R1psl-z5$a zdJt9WiDkq}Vke=pis&Zvc6csYHLfqIsKEBNd#kOSc^x?=9IGqJV(MTI+5vx{ovPj6 z>Me|ROgJ$nd2NR;Xj_f9uZk8-YfMi#`AqcQ!Y@6Zl4xJ?-ce~*n{9RF`v&^$fnX%F zbR_!w(h*OB9f%B-pDHcr^#v_^tKHq(Wn166WqDQXmL0Ro%VL8F_4tE1h2H3gGz`&v=qz`K;ES?(Ttr?j4LCUN|>#Y`nwBxth@A606%6 s>>G%WI%Kuw4+LzhC{kY=Obhxtdzeem>Kn+9oT_b2u=}IlB`=KmAD6T6EdT%j delta 3863 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 O3HxgsBZq3Aj{65_iKf{A diff --git a/locale/fr_FR/LC_MESSAGES/Studs.old.mo b/locale/fr_FR/LC_MESSAGES/Studs.old.mo new file mode 100644 index 0000000000000000000000000000000000000000..8129fa983c6d659c21839a71c5bc0fc736c60c43 GIT binary patch literal 18901 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

    uWt%c~a26QCyz=P>W+x0ukhN)KQ4Okg%Kr;M zXB6kvS)j8XNHGFFGaLqD*u;)c&-%%^kbeE_5G$<-Q?#+x)iC;e-7vC@P(5ncOIIWd zqU;rdnnZ1DB-q-4cZn_0perm#=3p-7dxyXk=iwULESr7zU_q6+8p_B{zg(c@t{p9U z^KxtBjf<5lhp>yK^nj8_&Vw>2KJIp=A~1@*Ao5Ga8dMB1ibWQm`xvzueT;mEt64Nf z3ziKd8<<8^VHJp>Z;!Xy=M1$885$jFm{l^GqTF)tKpVo*SD;JJ~|5A4n2=*Evi8oIW(7Ig#23hJbi|w zP$p~scf&48oOMObgd%AD5zJy8n?pTveP26n5HWn@;mKnx5K)-C<$a?pmnJoMMRbOK zk6WSKn-sr`0mUq3Y-BC#RNIxTS+KllQ>ye1^aK|2A8jl)g*aBoHG5%!I4Y#YENEct!=A}+wl~7s4fQ4XQ!z7lg?3v06?$;ez69k)5R2W=e zwuEq_j{NEx9GqFvr~FfXzF`{4CTsPPd>FW1ZFt5EkM8&!3`Vq4T`rak; zU%MO)x02kIcCnlFu2)TlHeQ2VKbu5_*=Y%(i&W56_@H@=$A7xEm*>tlB^{z*y@%g{E781&(Q3nX!8yz}Q^=b3;T`o? zI!Z2VOQQBV_Ib{s{rAP2+zMaioO?9#LLE_kMAXIP5CzDG*#>KC#IBRh_zKpDG$^AS xvF*bF+r)YnDAbI?zh?bG7o!t--XWB7cgTW$ch2SzRVC+ZBdM7EsUnd!`fpk%OzHpt literal 0 HcmV?d00001 diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 051cdf3..4251b44 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -129,7 +129,7 @@ msgstr "STUdS n'est pas correctement installé, merci de vous référer au fichi #: infos_sondage.php:125 msgid "You are in the poll creation section.
    Required fields cannot be left blank" -msgstr "Vous avez choisi de créer un nouveau sondage !
    Merci de remplir les champs obligatoires." +msgstr "Vous avez choisi de créer un nouveau sondage !
    Merci de remplir les champs obligatoires, marqués d'une *." #: infos_sondage.php:130 msgid "Poll title *: " @@ -183,17 +183,17 @@ msgstr " Vous souhaitez recevoir un mail à chaque participation d'un sond #: infos_sondage.php:188 msgid "Schedule an event" -msgstr "Sondage pour choisir une date" +msgstr "Créer un sondage spécial dates" #: infos_sondage.php:190 msgid "Make a choice" -msgstr "Autre sondage" +msgstr "Autres sondages" #: infos_sondage.php:192 #: index.php:72 #: index.php:74 msgid "Make a poll" -msgstr "Créer un sondage" +msgstr "Créer un sondage classique" #: choix_date.php:217 msgid "Poll dates (2 on 2)" @@ -211,6 +211,11 @@ msgstr "Jour retenus" msgid "For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." msgstr "Pour chacun des jours que vous avez sélectionné, vous avez la possibilité de choisir ou non, des heures de réunion avec ce format :
    - vide, si vous ne désirez pas mettre d'horaires particuliers,
    - \"8h\", \"8H\" ou \"8:00\" pour proposer une heure de début de réunion,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" pour un créneau,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" pour un créneau avec minutes." +#: choix_date.php:490 +msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)" +msgstr "Pour chacun des jours que vous avez sélectionné, vous avez la possibilité de choisir ou non, des heures de réunion (par exemple : \"8h\", \"8:15\", \"8h-10h\", \"soir\")." + + #: choix_date.php:496 msgid "Time" msgstr "Horaire" @@ -327,7 +332,7 @@ msgstr "Merci de votre confiance." #: adminstuds.php:270 #: adminstuds.php:314 msgid "Make your polls" -msgstr "Se Trouver à l'Université de Strasbourg" +msgstr "Organiser des rendez-vous simplement, librement." #: studs.php:179 #: adminstuds.php:884 @@ -366,7 +371,7 @@ msgstr "Auteur du sondage" #: adminstuds.php:328 #: adminstuds.php:1012 msgid "Comments" -msgstr "Commentaires des sondés" +msgstr "Commentaire de l'auteur" #: studs.php:238 msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." @@ -421,9 +426,13 @@ msgstr "Les meilleurs choix pour l'instant sont :" msgid "Comments of polled people" msgstr "Commentaires de sondés" +#: studs.php:245 +msgid "Share URL" +msgstr "URL a communiquer" + #: studs.php:563 msgid "Add a comment in the poll:" -msgstr "Ajoutez un commentaire dans ce sondage :" +msgstr "Ajoutez un commentaire à ce sondage :" #: studs.php:566 #: adminstuds.php:1027 diff --git a/print.css b/print.css new file mode 100644 index 0000000..90393cd --- /dev/null +++ b/print.css @@ -0,0 +1,10 @@ +.corps { + width: 100% !important; + overflow-x: none; +} +.sousbandeau { + display: none !important; +} +body { + background-color: none !important; +} \ No newline at end of file diff --git a/studs.php b/studs.php index 3090bc4..27a80fb 100644 --- a/studs.php +++ b/studs.php @@ -192,7 +192,7 @@ logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); sous_bandeau(); - +#print_r($_SESSION); if($err != 0) { bandeau_titre(_("Error!")); @@ -217,6 +217,7 @@ if($err != 0) { } echo '

    '; + if(is_error(NO_POLL_ID) || is_error(NO_POLL)) { echo '
    '."\n"; print "

    " . _("This poll doesn't exist !") . "

    "."\n"; @@ -231,14 +232,18 @@ if($err != 0) { } } +echo '
    '; //ajout pyg cohérence graphique +echo '
    Imprimer
    '; echo '
    '."\n"; //affichage du titre du sondage $titre=str_replace("\\","",$dsondage->titre); -echo '

    '.$titre.'

    '."\n"; +echo '

    '.stripslashes($titre).'

    '."\n"; //affichage du nom de l'auteur du sondage -echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'

    '."\n"; +echo _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'
    '."\n"; +echo 'Adresse : http://'. $_SERVER['SERVER_NAME']."/".$_SESSION['numsondage'].'
    '."\n";; + //affichage des commentaires du sondage if ($dsondage->commentaires) { @@ -398,7 +403,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { for ($i=0; isset($toutsujet[$i]); $i++) { $heures=explode("@",$toutsujet[$i]); if (isset($heures[1]) === true) { - echo ''.$heures[1].''."\n"; + echo ''.stripslashes($heures[1]).''."\n"; } else { echo ''."\n"; } @@ -414,7 +419,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; for ($i=0; isset($toutsujet[$i]); $i++) { - echo ''.$toutsujet[$i].''."\n"; + echo ''.stripslashes($toutsujet[$i]).''."\n"; } echo ''."\n"; @@ -433,7 +438,7 @@ while ($data = $user_studs->FetchNextObject(false)) { // Le nom de l'utilisateur $nombase=str_replace("°","'",$data->nom); - echo $nombase.''."\n"; + echo stripslashes($nombase).''."\n"; // Les réponses qu'il a choisit $ensemblereponses = $data->reponses; @@ -489,7 +494,7 @@ if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { echo ''."\n"; echo ''."\n"; if (isset($_SESSION['nom'])) { - echo ''.$_SESSION['nom']."\n"; + echo ''.stripslashes($_SESSION['nom'])."\n"; } else { echo ''."\n"; } @@ -606,9 +611,9 @@ echo '

    '."\n"; // Affichage du meilleur choix if ($compteursujet == "1" && isset($meilleurecolonne)) { - print 'Meilleur choix ' . _('The best choice at this time is:') . "$meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; + print 'Meilleur choix ' . _('The best choice at this time is:') . "".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; } elseif (isset($meilleurecolonne)) { - print 'Meilleur choix ' . _('The bests choices at this time are:') . " $meilleursujet " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; + print 'Meilleur choix ' . _('The bests choices at this time are:') . " ".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; } echo '

    '; @@ -621,7 +626,7 @@ $comment_user=$connect->Execute($sql, array($numsondage)); if ($comment_user->RecordCount() != 0) { print "
    " . _("Comments of polled people") . " :
    \n"; while($dcomment = $comment_user->FetchNextObject(false)) { - print '
    '.$dcomment->usercomment. ' : ' . nl2br($dcomment->comment) . '
    '; + print '
    '.stripslashes($dcomment->usercomment). ' : ' . stripslashes(nl2br($dcomment->comment)) . '
    '; } } @@ -648,6 +653,9 @@ if ( ($dsondage->format == 'D' || $dsondage->format == 'D+') && $compteursujet== echo ''; echo ''."\n"; + +echo '
    '; // ajout pyg cohérence graphique + bandeau_pied_mobile(); // Affichage du bandeau de pied echo ''."\n"; diff --git a/style.css b/style.css index d937c84..b5e1b3f 100644 --- a/style.css +++ b/style.css @@ -44,6 +44,8 @@ du répertoire studs. Il contient toutes les mises en forme des fichiers PHP de Studs. */ +@import url('/buttons.css'); +@import url('print.css') print; body { margin:0; background: #F7FAFE; @@ -178,7 +180,7 @@ div.bandeaupiedmobile{ position:static; } /*les boutons se trouvant dans le sousbandeau*/ -div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { +/* div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { background-color: #3E779D; background: -moz-linear-gradient(center top , #3E779D, #65A9D7) repeat scroll 0 0 transparent; height:16px; @@ -196,11 +198,13 @@ div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a { box-shadow: 0 1px 0 #000000; text-shadow: 0 1px 0 rgba(0, 0, 0, 0.4); } +*/ span.sousbandeaulangue { margin-left:6px; - margin-right:6px; + margin-right:20px; float:right; } + /*corps de la page index.php*/ .corps { @@ -216,11 +220,13 @@ span.sousbandeaulangue { /* position: static; right: 20px; top: 170px; */ - width: 800px; + width: 70em; + overflow-x:auto; border: 3px solid #CCC; background-color: #fff; box-shadow: 5px 5px 5px #666; - + -moz-border-radius: 20px; + border-radius: 20px; } @@ -298,7 +304,7 @@ div.presentationdate { background-color: #FFF; } div.presentationdatefin { - width:40%; + width:60%; padding:10px; font-family:arial; text-align:center; @@ -306,8 +312,8 @@ div.presentationdatefin { border-width:1px; border-style:solid; margin-top: 10px; - margin-left: 30%; - margin-right: 30%; + margin-left: 20%; + margin-right: 20%; position:static; } /*cadre principal de studs.php*/ @@ -390,13 +396,14 @@ div.cadre td.mois { /*affichage du calendrier*/ div.calendrier { padding:10px; - background-color: #AAA; + background-color: #CCC; width:490px; font-size:12px; font-family:arial; - margin-left: 30%; - margin-right: 30%; + margin-left: auto; + margin-right: auto; position:static; + border-radius: 10px; } /*jour de la semaine dans calendrier*/ div.calendrier td.joursemaine { @@ -422,7 +429,7 @@ div.calendrier td.avant { border: 2px; font-family:arial; font-size:13px; - background-color: #DDDDDD; + background-color: #EEEEEE; } /*jour libre dans calendrier*/ div.calendrier td.libre { @@ -436,7 +443,7 @@ div.calendrier td.choisi { width:65px; text-align: center; border: 2px; - background-color: #0077DD; + background-color: #54ADF7; } /* Le paragraphe de fin */ p.affichageresultats{ @@ -484,7 +491,7 @@ div.titregestionadmin{ /*les boutons pour deselectionner un jour deja choisi*/ .OFF { - background-color: #0077DD; + background-color: #54ADF7; } div.nouveau_sondage a { @@ -537,4 +544,34 @@ li.error { } .formulaire2 input[name="lieureunion"] { width: 350px; +} + +.index_date, .index_sondage { + float:left; + width:50%; + text-align:center; +} + + +.index_date .opacity, .index_sondage .opacity { + opacity: 0.6; +} + +.index_date img:hover, .index_sondage img:hover { + opacity: 1; + cursor: pointer; +} + +.poursuivre { + float: right; + margin-right: 50px; +} + +.retour { + float: left; + margin-left: 50px; +} + +.imprimer { + float:right; } \ No newline at end of file From c1de8d106c6bea81f774813d9c812aa8a5f51b07 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 Jun 2011 01:35:26 +0200 Subject: [PATCH 032/129] masquage lien admin --- bandeaux.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bandeaux.php b/bandeaux.php index d956387..f759a84 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -133,7 +133,7 @@ function bandeau_pied() ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented ''. _("About") .'' . - ''. _("Admin") .'' . + //''. _("Admin") .'' . '' . liste_lang() . ''. '
    ' . "\n"; @@ -151,7 +151,7 @@ function bandeau_pied_mobile() ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented ''. _("About") .'' . - ''. _("Admin") .'' . + //''. _("Admin") .'' . '' . liste_lang() . ''. '
    ' . "\n"; From 06a388283eb84b5833ed866d43b55cbac3cce52b Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 Jun 2011 16:52:10 +0200 Subject: [PATCH 033/129] nombreuses modifs : cf changelog 22 et 23 juin --- .gitignore | 2 ++ CHANGELOG | 15 +++++++++++++++ admin/index.php | 8 ++++++-- adminstuds.php | 35 +++++++++++++++++++++++++++------- bandeaux.php | 19 ++++++++++++++---- choix_autre.php | 2 ++ choix_date.php | 1 + contacts.php | 2 ++ creation_sondage.php | 6 +++--- favicon.ico | Bin 1150 -> 1150 bytes images/logo-framadate.png | Bin 0 -> 7339 bytes images/logo-framadate.xcf | Bin 0 -> 26869 bytes index.php | 2 ++ infos_sondage.php | 2 ++ scripts/nettoyage_sondage.php | 7 +++++-- studs.php | 5 +++-- style.css | 13 ++++++++----- 17 files changed, 94 insertions(+), 25 deletions(-) create mode 100644 images/logo-framadate.png create mode 100644 images/logo-framadate.xcf diff --git a/.gitignore b/.gitignore index ac4896f..ec542fe 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ variables.php admin/.htaccess admin/.htpasswd admin/logs_studs.txt +framanav + diff --git a/CHANGELOG b/CHANGELOG index e5d9916..a999e2e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,20 @@ Les dernières améliorations d'OpenSondage + Changelog des 22 et 23 juin (pyg@framasoft.net) + - très nombreuses modifications CSS + - ajout de buttons.css pour des boutons plus propres + - ajout de print.css pour une impression sans la classe "corps" + - refonte de la page d'accueil + - ajout de la framanav + - qq retouches dans les fichiers .po + - date de destruction passée de 2j à 30j + - ajout de l'adresse à transmettre + - ajout d'un bouton imprimer + - généralisation des stripslashes + - fix d'un bug sur une requete (suppression). Reste la seconde partie : https://github.com/leblanc-simon/OpenSondage/issues/8 + - modification du titre en image + - ajout de htmlspecialchars_decode avec param ENT_QUOTES pour l'envoi des emails + Changelog du 21 juin 2011 (pyg@framasoft.net) - très nombreuses modifications CSS - modification adminstuds.php : ajout de classes aux formulaires et ajout de stripslashes à l'affichage (TODO: à généraliser) diff --git a/admin/index.php b/admin/index.php index dc4a77e..2fc0d12 100644 --- a/admin/index.php +++ b/admin/index.php @@ -38,6 +38,7 @@ //========================================================================== + session_start(); include_once('../variables.php'); @@ -59,10 +60,12 @@ echo ''."\n"; echo ''."\n"; //Affichage des bandeaux et début du formulaire +framanav(); logo(); bandeau_tete(); bandeau_titre(_("Polls administrator")); sous_bandeau_admin(); +//print_r($_SESSION); $sondage=$connect->Execute("select * from sondage"); @@ -114,7 +117,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { $user_studs=$connect->Execute( "select * from user_studs where id_sondage='$dsondage->id_sondage'"); $nbuser=$user_studs->RecordCount(); - echo ''.$dsondage->id_sondage.''.$dsondage->format.''.$dsondage->titre.''.$dsondage->nom_admin.''; + echo ''.$dsondage->id_sondage.''.$dsondage->format.''. stripslashes($dsondage->titre).''.stripslashes($dsondage->nom_admin).''; if (strtotime($dsondage->date_fin) > time()) { echo ''.date("d/m/y",strtotime($dsondage->date_fin)).''; @@ -124,7 +127,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { echo''.$nbuser.''."\n"; echo ''. _("See the poll") .''."\n"; - echo ''. _("Change the poll") .''."\n"; + echo ''. _("Change the poll") .''."\n"; echo ''."\n"; echo ''."\n"; @@ -135,6 +138,7 @@ echo ''."\n"; echo'
    '."\n"; // fin du formulaire et de la page web echo ''."\n"; +echo '
     
    '; echo ''."\n"; echo ''."\n"; diff --git a/adminstuds.php b/adminstuds.php index 683ccb6..99833cf 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -78,10 +78,12 @@ if (preg_match(";[\w\d]{24};i", $numsondageadmin)) { if (!$sondage || $sondage->RecordCount() != 1){ print_header(false); echo ''."\n"; - + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); + + echo '
    '."\n"; print "

    " . _("This poll doesn't exist !") . "



    "."\n"; print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; @@ -183,12 +185,17 @@ $dsondage=$sondage->FetchObject(false); if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { print_header(true); echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); sous_bandeau(); //on recupere les données et les sujets du sondage + + echo '
    '."\n"; + + echo '
    '."\n"; echo '
    '."\n"; @@ -258,6 +265,10 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo '



    '."\n"; echo '
    '."\n"; + echo '
    '."\n"; + echo '
     
    '; + + bandeau_pied(); echo''."\n"; @@ -291,10 +302,11 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" //affichage de l'ecran de confirmation de suppression de sondage print_header(); echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); - + echo '
    '."\n"; print "

    " . _("Your poll has been removed!") . "



    "; print _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; @@ -342,10 +354,14 @@ if(isset($_POST['ajoutcomment']) || isset($_POST['ajoutcomment_x'])) { // DEBUT DE L'AFFICHAGE DE LA PAGE HTML print_header(true); echo ''."\n"; +framanav(); logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); sous_bandeau(); + +echo '
    '."\n"; + echo '
    '."\n"; @@ -354,14 +370,14 @@ $titre=str_replace("\\","",$dsondage->titre); echo '

    '.$titre.'

    '."\n"; //affichage du nom de l'auteur du sondage -echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'
    '."\n"; +echo _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'
    '."\n"; //affichage des commentaires du sondage if ($dsondage->commentaires){ echo '
    '. _("Comments") .' :
    '."\n"; $commentaires=$dsondage->commentaires; $commentaires=str_replace("\\","",$commentaires); - echo nl2br($commentaires); + echo stripslashes(nl2br($commentaires)); echo '
    '."\n"; } echo '
    '."\n"; @@ -698,6 +714,7 @@ if ($sondage !== false) { } else { print_header(false); echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); @@ -706,6 +723,8 @@ if ($sondage !== false) { print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; echo '



    '."\n"; echo '
    '."\n"; + + bandeau_pied(); echo''."\n"; echo ''."\n"; @@ -871,7 +890,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; for ($i = 0; isset($toutsujet[$i]); $i++) { - echo ''.$toutsujet[$i].''."\n"; + echo ''.stripslashes($toutsujet[$i]).''."\n"; } echo ''."\n"; @@ -891,7 +910,7 @@ while ($data = $user_studs->FetchNextObject(false)) { //affichage du nom $nombase=str_replace("°","'",$data->nom); - echo ''.$nombase.''."\n"; + echo ''.stripslashes($nombase).''."\n"; //si la ligne n'est pas a changer, on affiche les données if (!$testligneamodifier) { @@ -1152,7 +1171,7 @@ if ($comment_user->RecordCount() != 0) { $i = 0; while ( $dcomment=$comment_user->FetchNextObject(false)) { - print " $dcomment->usercomment : $dcomment->comment
    "; + print " ". stripslashes($dcomment->usercomment) ." : ".stripslashes($dcomment->comment) ."
    "; $i++; } @@ -1201,6 +1220,8 @@ echo '

    '."\n"; //fin de la partie GESTION et beandeau de pied echo '

    '."\n"; +echo '
    '; +echo '
     
    '; bandeau_pied_mobile(); echo ''."\n"; echo ''."\n"; diff --git a/bandeaux.php b/bandeaux.php index f759a84..ca4e19f 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -40,6 +40,17 @@ // pour get_server_name() include_once('fonctions.php'); +function framanav() +{ + if (file_exists($_SERVER['DOCUMENT_ROOT']."/framanav/nav.inc.html")) { + echo "\n".' '."\n";; + echo ''."\n"; + include_once($_SERVER['DOCUMENT_ROOT']."/framanav/nav.inc.html"); + echo ' '."\n"; + } +} + + //le logo function logo () { @@ -52,7 +63,7 @@ function logo () #le bandeau principal function bandeau_tete() { - echo '
    Framadate
    '."\n"; + echo '
    '.NOMAPPLICATION.'
    '."\n"; } @@ -95,13 +106,13 @@ function sous_bandeau() function sous_bandeau_admin() { echo '
    ' . - ''. _("Home") .''; + ''. _("Home") .''; if(is_readable('logs_studs.txt')) { - echo ''. _("Logs") .''; + echo ''. _("Logs") .''; } - echo ''. _("Cleaning") .'' . + echo ''. _("Cleaning") .'' . '' . liste_lang() . ''. '
    '."\n"; diff --git a/choix_autre.php b/choix_autre.php index 9a787d0..93a8e85 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -56,6 +56,7 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE echo ''."\n"; echo ''."\n"; echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); @@ -137,6 +138,7 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE print_header(); echo ''."\n"; + framanav(); echo '
    '."\n"; logo(); diff --git a/choix_date.php b/choix_date.php index 307fa2d..b58e4ca 100644 --- a/choix_date.php +++ b/choix_date.php @@ -57,6 +57,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo ''."\n"; echo ''."\n"; echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); diff --git a/contacts.php b/contacts.php index e163b34..a7b1842 100644 --- a/contacts.php +++ b/contacts.php @@ -97,6 +97,8 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse echo ''."\n"; echo ''."\n"; echo ''."\n"; + +framanav(); //debut du formulaire echo ''."\n"; diff --git a/creation_sondage.php b/creation_sondage.php index 8e0c863..2ab07e8 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -108,7 +108,7 @@ function ajouter_sondage() $message = _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll."); $message .= "\n\n"; - $message .= stripslashes($_SESSION["nom"])." " . _("hast just created a poll called") . " : \"".stripslashes($_SESSION["titre"])."\".\n"; + $message .= stripslashes(htmlspecialchars_decode($_SESSION["nom"],ENT_QUOTES))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n"; $message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION; $message_admin = _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above"); @@ -118,8 +118,8 @@ function ajouter_sondage() $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); if (validateEmail($_SESSION['adresse'])) { - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message_admin, $headers); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $headers); } $date=date('H:i:s d/m/Y:'); diff --git a/favicon.ico b/favicon.ico index 551344a2f254a5e1513c3f2f2ff91aff75e4c222..ded95854f1dd9b33b34aa3e474e985a07cbf1464 100644 GIT binary patch literal 1150 zcmbtTJ4gdT6x_ogh!(NX)|6UVMC=3`L2NASY;A;87M3X@CL*y4ilm4H4n;j7TG&_^ zF&qdgl0wD8K(x3*@Po)1B#b-9Ei9sf?j4i7%$s@l^7fq&mb{};A+MO2jtJ2$qh1M8 zF$pX96k=HBzPYSGLYc&4t=3<)?Ulo1@_Ij!Xb_CaF{f+w_`~$7a53ZF zBd&OASc4vN{7>wQwfWn7Mc3dO%3>bSF}4ZkVf+;*kt|);RYN%!VFyMx3$I z{`5V%ffD`8rh8+` literal 1150 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 R1Bw6u002ovPDHLkV1lmOP!IqB literal 0 HcmV?d00001 diff --git a/images/logo-framadate.xcf b/images/logo-framadate.xcf new file mode 100644 index 0000000000000000000000000000000000000000..871886eac814aedc20f68bb099386f1facce4775 GIT binary patch literal 26869 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 literal 0 HcmV?d00001 diff --git a/index.php b/index.php index cb986cb..adb6a6e 100644 --- a/index.php +++ b/index.php @@ -56,6 +56,8 @@ echo ''."\n"; echo ''."\n"; echo ''."\n"; +framanav(); + //debut du formulaire echo ''."\n"; diff --git a/infos_sondage.php b/infos_sondage.php index ba506d5..9c56dea 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -147,6 +147,8 @@ if (issetAndNoEmpty("poursuivre")){ //affichage de la page print_header(true); echo ''."\n"; +framanav(); + //affichage des bandeaux de tete logo(); bandeau_tete(); diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php index 280ac7f..b905c5f 100644 --- a/scripts/nettoyage_sondage.php +++ b/scripts/nettoyage_sondage.php @@ -49,10 +49,13 @@ $sondage=$connect->Execute("select * from sondage"); while ($dsondage=$sondage->FetchNextObject(false)) { if ($date_courante > strtotime($dsondage->date_fin)) { //destruction des données dans la base - $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. + + $req = 'DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . - "WHERE id_sondage = '$dsondage->id_sondage' "); + "WHERE id_sondage = '$dsondage->id_sondage'; "; + echo $req; + $connect->Execute($req); // ecriture des traces dans le fichier de logs error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", '../admin/logs_studs.txt'); } diff --git a/studs.php b/studs.php index 27a80fb..a62e3d5 100644 --- a/studs.php +++ b/studs.php @@ -173,8 +173,8 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; mail ("$dsondage->mail_admin", - "[".NOMAPPLICATION."] "._("Poll's participation")." : $dsondage->titre", - "\"$nom\" ". + "[".NOMAPPLICATION."] "._("Poll's participation")." : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES).",". + htmlspecialchars_decode("\"$nom\" ",ENT_QUOTES). _("has filled a line.\nYou can find your poll at the link") . " :\n\n". getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n". NOMAPPLICATION, @@ -188,6 +188,7 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] print_header(true, $dsondage->titre); echo ''."\n"; +framanav(); logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); diff --git a/style.css b/style.css index b5e1b3f..77f07b4 100644 --- a/style.css +++ b/style.css @@ -82,11 +82,12 @@ div.bandeau{ font-size:42px; font-family:arial; padding:8px; - height:50px; + height:40px; position:static; top:6px; left:6px; right:6px; + padding-top:35px; } @@ -102,6 +103,7 @@ div.logo{ margin-left: 0; margin-right:0; margin-bottom:auto; + padding-top: 30px; } /*Sous bandeau avec bouton de navigation*/ div.bandeautitre{ @@ -201,7 +203,7 @@ div.bandeaupiedmobile{ */ span.sousbandeaulangue { margin-left:6px; - margin-right:20px; + margin-right:90px; float:right; } @@ -231,8 +233,7 @@ span.sousbandeaulangue { div.corps table{ - font-size:12px; - font-weight:bold; + font-size:12px; } div.corpscentre{ font-size:12px; @@ -556,7 +557,9 @@ li.error { .index_date .opacity, .index_sondage .opacity { opacity: 0.6; } - +.button img { + vertical-align: middle; +} .index_date img:hover, .index_sondage img:hover { opacity: 1; cursor: pointer; From f430a2727ed289167d86937264f7376c6264720b Mon Sep 17 00:00:00 2001 From: pyg77 Date: Fri, 24 Jun 2011 16:33:02 +0200 Subject: [PATCH 034/129] =?UTF-8?q?Mentions=20l=C3=A9gales=20et=20framanav?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apropos.php | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/apropos.php b/apropos.php index d77f8c2..6713a82 100644 --- a/apropos.php +++ b/apropos.php @@ -57,6 +57,8 @@ echo ''."\n"; echo ''."\n"; echo ''."\n"; +framanav(); + //debut du formulaire echo ''."\n"; @@ -68,6 +70,58 @@ sous_bandeau(); echo '
    '."\n"; +echo <<Éditeur et Responsable de la publication + + +

    Alexis Kauffmann (contact)

    + + +

    Les propos tenus sur ce site ne représentent que et uniquement l’opinion de leur auteur, et n’engagent pas les sociétés, entreprises ou collectifs auxquels il contribue ou dont il peut être associé ou employé.

    + + +

    Hébergement

    + + +

    Ce site est hébergé par Framasoft, c/o T. CEZARD, 5 avenue Stephen Pichon 75013 Paris, France. +Cet hébergeur possède à ce jour les éléments d’identification personnelle concernant l'Éditeur (voir http://www.framasoft.net/article4736.html).

    + + +

    Données personnelles

    + + +

    Les données personnelles collectées par Framadate sont uniquement destinées à un usage interne. En aucun cas ces données ne seront cédées ou vendues à des tiers. +Conformément à l’article 39 de la loi du 6 janvier 1978 relative à l’informatique, aux fichiers et aux libertés, vous avez un droit d’accès, de modification et d’opposition sur vos données personnelles enregistrées par le blog. +Dans ce cas, utilisez le formulaire de contact.

    + + +

    Conditions de modération/suppression de sondages

    + + +

    Les sondages de Framadate bénéficient d'une URL aléatoire, mais publique. Si vous souhaitez supprimer un sondage, utilisez l'adresse d'aministration fournie à la création. Vous pouvez exceptionnellement demander la suppression d'un sondage en utilisant la page de contact.

    + +

    Notification des contenus litigieux

    + +

    Conformément à l’article 6 I 5° LCEN, la connaissance des contenus litigieux est présumée acquise par L’Éditeur lorsqu’il lui est notifié, par lettre recommandée avec accusé de réception adressée au siège social de L’Éditeur, la totalité des éléments suivants (i) la date de la notification ; (ii) si le notifiant est une personne physique : ses nom, prénoms, profession, domicile, nationalité, date et lieu de naissance ; si le notifiant est une personne morale : sa forme, sa dénomination, son siège social et l’organe qui la représente légalement ; (iii) les nom et domicile du destinataire ou, s’il s’agit d’une personne morale, sa dénomination et son siège social ; (iv) la description des faits litigieux et leur localisation précise ; (v) les motifs pour lesquels le contenu doit être retiré, comprenant la mention des dispositions légales et des justifications de faits ; (vi) la copie de la correspondance adressée à l’auteur ou à l’éditeur des informations ou activités litigieuses demandant leur interruption, leur retrait ou leur modification, ou la justification de ce que l’auteur ou l’éditeur n’a pu être contacté.

    + + +

    A défaut d’envoi de la totalité de ces éléments, la notification ne sera pas prise en compte par L’Éditeur et ce dernier ne pourra en conséquence être présumé informé d’un contenu litigieux.

    + + +

    L’Éditeur se réserve le droit d’engager des poursuites à l’encontre de toute personne ayant usé abusivement du droit réservé par l’article 6 I 4° LCEN. L’Éditeur vous rappelle que toute personne qui aurait présenté un contenu ou une activité comme étant illicite dans le but d’en obtenir le retrait ou d’en faire cesser la diffusion alors qu’elle a connaissance du caractère inexact de cette information, est susceptible d’encourir une peine d’un an d’emprisonnement et de 15.000 €uros d’amende.

    + + +

    Licences, droits de reproduction

    + + +

    L'application Framadate, basé sur le logiciel OpenSondage, lui-même basé sur STUdS, est publiée sous licence CECILL-B. Les contenus (sondages) sont publiés sous licence Creative Commons BY-SA. Cela signifie que si l'adresse de votre sondage est connue d'un individu, vous autorisez cette personne à utiliser, partager, modifier votre sondage. Si vous souhaitez des sondages 100% privés et avec votre propre licence, installez votre propre logiciel de sondage et n'utilisez pas Framadate.org.

    + + +

    Crédits

    + +mentions; + + if (NOMAPPLICATION!="STUdS !") { echo 'Application d\'origine

    '."\n"; echo 'L\'application '.NOMAPPLICATION.' est une instance du logiciel STUdS ! développé à l\'Université de Strasbourg depuis 2008.

    '."\n"; From 2dde6eb0345c45b958dd1f5f81d5daa0fe89a067 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Fri, 24 Jun 2011 16:42:53 +0200 Subject: [PATCH 035/129] Analytics --- bandeaux.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/bandeaux.php b/bandeaux.php index ca4e19f..88bac56 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -50,6 +50,24 @@ function framanav() } } +function gAnalytics() { +echo << + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-896440-11']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + +gAnalytics; +} + //le logo function logo () @@ -116,6 +134,8 @@ function sous_bandeau_admin() '' . liste_lang() . ''. '
    '."\n"; + + gAnalytics(); } @@ -148,6 +168,7 @@ function bandeau_pied() '' . liste_lang() . ''. '
    ' . "\n"; + gAnalytics(); } @@ -166,4 +187,5 @@ function bandeau_pied_mobile() '' . liste_lang() . ''. '
    ' . "\n"; + gAnalytics(); } \ No newline at end of file From 1a10fe3818bf9cd98c2bb351f339c3fb43af2913 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Fri, 24 Jun 2011 19:45:13 +0200 Subject: [PATCH 036/129] inversion des titres de mails --- creation_sondage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/creation_sondage.php b/creation_sondage.php index 2ab07e8..641ffae 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -118,8 +118,8 @@ function ajouter_sondage() $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); if (validateEmail($_SESSION['adresse'])) { - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $headers); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $headers); + mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $headers); } $date=date('H:i:s d/m/Y:'); From 18f7bf8b1bc737f4570f29ecb97c3fd858b4b444 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Sat, 25 Jun 2011 01:06:15 +0200 Subject: [PATCH 037/129] correction bug envoi mail --- studs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studs.php b/studs.php index a62e3d5..d2b3817 100644 --- a/studs.php +++ b/studs.php @@ -173,7 +173,7 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; mail ("$dsondage->mail_admin", - "[".NOMAPPLICATION."] "._("Poll's participation")." : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES).",". + "[".NOMAPPLICATION."] "._("Poll's participation")." : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES),. htmlspecialchars_decode("\"$nom\" ",ENT_QUOTES). _("has filled a line.\nYou can find your poll at the link") . " :\n\n". getUrlSondage($numsondage)." \n\n" . From a6086a5c39f5d6ca3bc2c5895c29b63d842febf8 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Sat, 25 Jun 2011 11:23:59 +0200 Subject: [PATCH 038/129] regression sur envoi email --- studs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/studs.php b/studs.php index d2b3817..31ef82d 100644 --- a/studs.php +++ b/studs.php @@ -173,8 +173,8 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; mail ("$dsondage->mail_admin", - "[".NOMAPPLICATION."] "._("Poll's participation")." : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES),. - htmlspecialchars_decode("\"$nom\" ",ENT_QUOTES). + "[".NOMAPPLICATION."] "._("Poll's participation")." : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES)."", + htmlspecialchars_decode("\"$nom\" ", ENT_QUOTES). _("has filled a line.\nYou can find your poll at the link") . " :\n\n". getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n". NOMAPPLICATION, From 0eab474e38425dd86b2b3c60d23b5579c6f41f2d Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sat, 25 Jun 2011 19:00:51 +0200 Subject: [PATCH 039/129] =?UTF-8?q?url=20relative=20pour=20bouton.css=20po?= =?UTF-8?q?ur=20que=20cela=20fonctionne=20si=20OpenSondage=20n'est=20pas?= =?UTF-8?q?=20=C3=A0=20la=20racine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style.css b/style.css index 77f07b4..52b6cfe 100644 --- a/style.css +++ b/style.css @@ -44,7 +44,7 @@ du répertoire studs. Il contient toutes les mises en forme des fichiers PHP de Studs. */ -@import url('/buttons.css'); +@import url('./buttons.css'); @import url('print.css') print; body { margin:0; @@ -577,4 +577,4 @@ li.error { .imprimer { float:right; -} \ No newline at end of file +} From d434e6e28d6da24c82fae190ab0fd346263104d4 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sat, 25 Jun 2011 19:52:12 +0200 Subject: [PATCH 040/129] Correction de la requete SQL de suppression de sondage et correction lors de l'utilisation de la fonction error_log --- admin/index.php | 26 +++++++++++++++++--------- scripts/nettoyage_sondage.php | 21 ++++++++++++++------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/admin/index.php b/admin/index.php index 2fc0d12..64fcac0 100644 --- a/admin/index.php +++ b/admin/index.php @@ -74,7 +74,7 @@ echo ''."\n"; // Test et affichage du bouton de confirmation en cas de suppression de sondage $i=0; while($dsondage = $sondage->FetchNextObject(false)) { - if ($_POST["supprimersondage$i"]) { + if (issetAndNoEmpty('supprimersondage'.$i) === true) { echo ''."\n"; echo ''."\n"; @@ -83,17 +83,25 @@ while($dsondage = $sondage->FetchNextObject(false)) { } // Traitement de la confirmation de suppression - if ($_POST["confirmesuppression$i"]) { + if (issetAndNoEmpty('confirmesuppression'.$i) === true) { + // On inclut la routine de suppression $date=date('H:i:s d/m/Y'); - // requetes SQL qui font le ménage dans la base - $connect->Execute('DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. - 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . - 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . - "WHERE id_sondage = '$dsondage->id_sondage' "); + $req = 'DELETE s, su, u, c + FROM + sondage s LEFT JOIN sujet_studs su + ON su.id_sondage = s.id_sondage + LEFT JOIN user_studs u + ON u.id_sondage = s.id_sondage + LEFT JOIN comments c + ON c.id_sondage = s.id_sondage + WHERE s.id_sondage = '.$connect->Param('id_sondage'); + + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($dsondage->id_sondage)); // ecriture des traces dans le fichier de logs - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 'logs_studs.txt'); + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'logs_studs.txt'); } $i++; @@ -143,5 +151,5 @@ echo ''."\n"; echo ''."\n"; // si on annule la suppression, rafraichissement de la page -if ($_POST["annulesuppression"]) { +if (issetAndNoEmpty('annulesuppression') === true) { } \ No newline at end of file diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php index b905c5f..57ab487 100644 --- a/scripts/nettoyage_sondage.php +++ b/scripts/nettoyage_sondage.php @@ -50,13 +50,20 @@ while ($dsondage=$sondage->FetchNextObject(false)) { if ($date_courante > strtotime($dsondage->date_fin)) { //destruction des données dans la base - $req = 'DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. - 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage ' . - 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage ' . - "WHERE id_sondage = '$dsondage->id_sondage'; "; - echo $req; - $connect->Execute($req); + $req = 'DELETE s, su, u, c + FROM + sondage s LEFT JOIN sujet_studs su + ON su.id_sondage = s.id_sondage + LEFT JOIN user_studs u + ON u.id_sondage = s.id_sondage + LEFT JOIN comments c + ON c.id_sondage = s.id_sondage + WHERE s.id_sondage = '.$connect->Param('id_sondage'); + + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($dsondage->id_sondage)); + // ecriture des traces dans le fichier de logs - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", '../admin/logs_studs.txt'); + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, '../admin/logs_studs.txt'); } } \ No newline at end of file From 63ebe90f635d3d749fe7876c797bfd3f33c3758d Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sat, 25 Jun 2011 20:23:40 +0200 Subject: [PATCH 041/129] =?UTF-8?q?Correction=20sur=20plusieurs=20URL=20et?= =?UTF-8?q?=20modification=20de=20la=20fontion=20get=5Fserver=5Fname=20pou?= =?UTF-8?q?r=20supprimer=20des=20probl=C3=A8mes=20dans=20l'administration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/index.php | 4 ++-- apropos.php | 2 +- bandeaux.php | 2 +- fonctions.php | 7 ++++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/admin/index.php b/admin/index.php index 64fcac0..34e9202 100644 --- a/admin/index.php +++ b/admin/index.php @@ -134,8 +134,8 @@ while($dsondage = $sondage->FetchNextObject(false)) { } echo''."\n"; - echo ''."\n"; - echo ''."\n"; + echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; diff --git a/apropos.php b/apropos.php index 6713a82..78024d2 100644 --- a/apropos.php +++ b/apropos.php @@ -74,7 +74,7 @@ echo <<Éditeur et Responsable de la publication -

    Alexis Kauffmann (contact)

    +

    Alexis Kauffmann (contact)

    Les propos tenus sur ce site ne représentent que et uniquement l’opinion de leur auteur, et n’engagent pas les sociétés, entreprises ou collectifs auxquels il contribue ou dont il peut être associé ou employé.

    diff --git a/bandeaux.php b/bandeaux.php index 88bac56..adff57d 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -81,7 +81,7 @@ function logo () #le bandeau principal function bandeau_tete() { - echo '
    '.NOMAPPLICATION.'
    '."\n"; + echo '
    '.NOMAPPLICATION.'
    '."\n"; } diff --git a/fonctions.php b/fonctions.php index 54a0ff5..752b096 100644 --- a/fonctions.php +++ b/fonctions.php @@ -57,7 +57,12 @@ function connexion_base() function get_server_name() { $scheme = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? 'https' : 'http'; - $url = sprintf("%s://%s%s", $scheme, STUDS_URL, dirname($_SERVER["SCRIPT_NAME"])); + + $get = explode('/', dirname($_SERVER["SCRIPT_NAME"])); + $folder = explode('/', str_replace('\\', '/', dirname(__FILE__))); + $communs = array_intersect($get, $folder); + $base = implode('/', $communs); + $url = sprintf("%s://%s%s", $scheme, STUDS_URL, $base); if (!preg_match("|/$|", $url)) { $url = $url."/"; From 5d4e4bbc46c5d7b5e7d8fc6bbe419aa607cb1c11 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sat, 25 Jun 2011 20:24:54 +0200 Subject: [PATCH 042/129] =?UTF-8?q?Interdiction=20d'aller=20dans=20le=20r?= =?UTF-8?q?=C3=A9pertoire=20des=20scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/.htaccess | 1 + 1 file changed, 1 insertion(+) create mode 100644 scripts/.htaccess diff --git a/scripts/.htaccess b/scripts/.htaccess new file mode 100644 index 0000000..3418e55 --- /dev/null +++ b/scripts/.htaccess @@ -0,0 +1 @@ +deny from all \ No newline at end of file From 497e72bf1fcf716847ed8135872536282533ef75 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 27 Jun 2011 00:26:31 +0200 Subject: [PATCH 043/129] Autoriser un utilisateur a pouvoir remplir le sondage pour d'autres utilisateurs --- studs.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/studs.php b/studs.php index 31ef82d..787e3bf 100644 --- a/studs.php +++ b/studs.php @@ -495,10 +495,11 @@ if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { echo '    '."\n"; echo ''."\n"; From 0ceb48915d04d767acefb4d652675e280f3d7ad9 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 27 Jun 2011 00:34:04 +0200 Subject: [PATCH 044/129] Autoriser un utilisateur a pouvoir mettre des commentaires pour d'autres utilisateurs --- studs.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/studs.php b/studs.php index 787e3bf..0bfcf0d 100644 --- a/studs.php +++ b/studs.php @@ -89,7 +89,7 @@ if(issetAndNoEmpty('export', $_GET) && $dsondage !== false) { // quand on ajoute un commentaire utilisateur if(isset($_POST['ajoutcomment']) || isset($_POST['ajoutcomment_x'])) { - if (isset($_SESSION['nom'])) { + if (isset($_SESSION['nom']) && issetAndNoEmpty('commentuser') === false) { // Si le nom vient de la session, on le de-htmlentities $comment_user = html_entity_decode($_SESSION['nom'], ENT_QUOTES, 'UTF-8'); } elseif(issetAndNoEmpty('commentuser')) { @@ -636,9 +636,12 @@ if ($comment_user->RecordCount() != 0) { print '
    ' .'

    ' ._("Add a comment in the poll:") . '

    ' . "\n"; if (isset($_SESSION['nom']) === false) { - echo _("Name") .' : '; - echo '
    '."\n"; -} + $nom = ''; +} else { + $nom = stripslashes($_SESSION['nom']); +} +echo _("Name") .' : '; +echo '
    '."\n"; echo ''."\n"; echo '
    '."\n"; From 8f05ffe46318d1dbe1f004d8f3bc7ef4a9d539f2 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 27 Jun 2011 00:37:17 +0200 Subject: [PATCH 045/129] =?UTF-8?q?Correction=20dans=20l'URL=20affich?= =?UTF-8?q?=C3=A9e=20(probl=C3=A8me=20lorsque=20OpenSondage=20n'est=20pas?= =?UTF-8?q?=20=C3=A0=20la=20racine=20du=20site?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- studs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studs.php b/studs.php index 0bfcf0d..90ca8d5 100644 --- a/studs.php +++ b/studs.php @@ -243,7 +243,7 @@ echo '

    '.stripslashes($titre).'

    '."\n"; //affichage du nom de l'auteur du sondage echo _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'
    '."\n"; -echo 'Adresse : http://'. $_SERVER['SERVER_NAME']."/".$_SESSION['numsondage'].'
    '."\n";; +echo 'Adresse : '.getUrlSondage($dsondage->id_sondage).'
    '."\n";; //affichage des commentaires du sondage From 9e350b58698887aa6997aeab4fe617a518037ead Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 27 Jun 2011 00:39:58 +0200 Subject: [PATCH 046/129] =?UTF-8?q?Le=20formulaire=20prend=20maintenant=20?= =?UTF-8?q?l'url=20compl=C3=A8te=20du=20sondage=20pour=20une=20meilleure?= =?UTF-8?q?=20lisibilit=C3=A9=20lors=20de=20la=20validation=20du=20formula?= =?UTF-8?q?ire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- studs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studs.php b/studs.php index 90ca8d5..0a1ae98 100644 --- a/studs.php +++ b/studs.php @@ -258,7 +258,7 @@ if ($dsondage->commentaires) { echo '
    '."\n"; echo '
    '."\n"; -echo ''."\n"; +echo ''."\n"; echo ''; // Todo : add CSRF protection echo '
    '."\n"; From 022b96e5fa9c28d7e271287de0da974088618cf6 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 27 Jun 2011 01:34:06 +0200 Subject: [PATCH 047/129] Modification de la feuille de style d'impression --- fonctions.php | 3 ++- print.css | 41 +++++++++++++++++++++++++++++++++++++---- studs.php | 6 +++--- style.css | 6 +++++- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/fonctions.php b/fonctions.php index 752b096..adc128b 100644 --- a/fonctions.php +++ b/fonctions.php @@ -129,7 +129,8 @@ function print_header($js = false, $nom_sondage = '') '.NOMAPPLICATION.''; } echo ' - '; + + '; echo ''; } diff --git a/print.css b/print.css index 90393cd..5070c49 100644 --- a/print.css +++ b/print.css @@ -1,10 +1,43 @@ +@import url(./style.css); + .corps { - width: 100% !important; - overflow-x: none; + width: auto; + border:0; + border-radius:0; + box-shadow:none; } .sousbandeau { - display: none !important; + display:none; } body { - background-color: none !important; + background:none; +} + +.imprimer { + display:none; +} + +.casevide { + display:none; +} + +div.cadre div.information { + display:none; +} + +div.cadre td.ok, div.cadre td.non, div.cadre td.somme { + background:none; + border:1px solid black; +} + +div.cadre tr:last-child td { + border:none; +} + +div.cadre tr.ajout_reponse { + display:none; +} + +div.addcomment { + display:none; } \ No newline at end of file diff --git a/studs.php b/studs.php index 0a1ae98..ed7649e 100644 --- a/studs.php +++ b/studs.php @@ -261,9 +261,9 @@ echo '
    '."\n"; echo ''."\n"; echo ''; // Todo : add CSRF protection -echo '
    '."\n"; +echo '
    '."\n"; echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line.") ."\n"; -echo '

    '."\n"; +echo '
    '."\n"; // Debut de l'affichage des resultats du sondage echo '
    '. _("Confirm removal of the poll ") .'"'.$dsondage->id_sondage.'" : '."\n"; echo '
    '.$nbuser.''. _("See the poll") .''. _("Change the poll") .''. _("See the poll") .''. _("Change the poll") .'
    '."\n"; if (isset($_SESSION['nom'])) { - echo ''.stripslashes($_SESSION['nom'])."\n"; + $nom = stripslashes($_SESSION['nom']); } else { - echo ''."\n"; + $nom = ''; } + echo ''."\n"; echo '
    '."\n"; @@ -492,7 +492,7 @@ while ($data = $user_studs->FetchNextObject(false)) { // affichage de la ligne pour un nouvel utilisateur if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; } else { echo ''."\n"; @@ -207,7 +207,7 @@ if (!$_SESSION["nom"] && issetAndNoEmpty("poursuivre")) { echo ''."\n"; echo ''."\n"; } else { echo ''."\n"; @@ -269,4 +269,4 @@ echo ''."\n"; //bandeau de pied bandeau_pied(); echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; diff --git a/studs.php b/studs.php index f113838..7a4b0c8 100644 --- a/studs.php +++ b/studs.php @@ -136,7 +136,7 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] $err |= NAME_EMPTY; } - if(!is_error(NAME_EMPTY) && (!isset($_SERVER['REMOTE_USER']) || $_POST["nom"] == $_SESSION["nom"])) { + if(!is_error(NAME_EMPTY) && (! ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || $_POST["nom"] == $_SESSION["nom"])) { $nouveauchoix = ''; for ($i=0;$i<$nbcolonnes;$i++) { // Si la checkbox est enclenchée alors la valeur est 1 @@ -447,7 +447,7 @@ while ($data = $user_studs->FetchNextObject(false)) { $ensemblereponses = $data->reponses; // ligne d'un usager pré-authentifié - $mod_ok = !isset($_SERVER['REMOTE_USER']) || ($nombase == $_SESSION['nom']); + $mod_ok = !( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || ($nombase == $_SESSION['nom']); $user_mod |= $mod_ok; // pour chaque colonne @@ -493,7 +493,7 @@ while ($data = $user_studs->FetchNextObject(false)) { } // affichage de la ligne pour un nouvel utilisateur -if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { +if (! ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || !$user_mod) { echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; $i++; From 1a9d28afb5c81508b9bfe77d6a653d051075c2c5 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Wed, 11 Jan 2012 02:11:00 +0100 Subject: [PATCH 079/129] =?UTF-8?q?fix=20de=20#43=20par=20la=20suppression?= =?UTF-8?q?=20de=20STUDS=5FDIR=20pour=20=C3=A9viter=20toute=20confusion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- variables.php.template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/variables.php.template b/variables.php.template index b27f59e..7a1214c 100644 --- a/variables.php.template +++ b/variables.php.template @@ -40,10 +40,6 @@ // Nom du serveur define('STUDS_URL', 'www.mon_domaine.coop'); -// Répertoire sous lequel se trouve Studs -// Utilise la racine du serveur telle que définie par STUDS_URL si laissé vide -define('STUDS_DIR', 'mes_sondages/'); - // Nom de l'application define('NOMAPPLICATION', ""); From bebfc4b4e7c3c041b923a95fd063ad731011a47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 11 Jan 2012 20:34:37 +0100 Subject: [PATCH 080/129] Headers separation fix Fix the header separating character (needs to be \r\n). Merge header creation with sendEmail. --- adminstuds.php | 20 ++++++-------------- contacts.php | 9 +++++---- creation_sondage.php | 6 ++---- fonctions.php | 25 +++++++++---------------- studs.php | 7 ++----- 5 files changed, 24 insertions(+), 43 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index 45c7c0b..9ee5b9d 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -103,7 +103,6 @@ $dsondage=$sondage->FetchObject(false); //si la valeur du nouveau titre est valide et que le bouton est activé $adresseadmin = $dsondage->mail_admin; -$headers = makeHeaders() ; if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"])) { if(issetAndNoEmpty('nouveautitre') === false) { @@ -120,8 +119,7 @@ if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"]) _("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION, _("You have changed the title of your poll. \nYou can modify this poll with this link") . " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers ); + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION ); } } } @@ -143,8 +141,7 @@ if (isset($_POST["boutonnouveauxcommentaires"]) || isset($_POST["boutonnouveauxc _("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION, _("You have changed the comments of your poll. \nYou can modify this poll with this link") . " :\n\n".getUrlSondage($numsondageadmin, true)." \n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers ); + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION ); } } } @@ -166,8 +163,7 @@ if (isset($_POST["boutonnouvelleadresse"]) || isset($_POST["boutonnouvelleadress _("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION, _("You have changed your email address in your poll. \nYou can modify this poll with this link") . " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers ); + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION ); } } } @@ -327,8 +323,7 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" _("[ADMINISTRATOR] Removing of your poll") . ' ' . NOMAPPLICATION, _("You have removed your poll. \nYou can make new polls with this link") . " :\n\n".get_server_name()."index.php \n\n" . - _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers ); + _("Thanks for your confidence.") . "\n" . NOMAPPLICATION ); //affichage de l'ecran de confirmation de suppression de sondage print_header(); @@ -471,12 +466,10 @@ if (isset($_POST["ajoutercolonne_x"]) && issetAndNoEmpty('nouvellecolonne') && ( $sql = $connect->Prepare($sql); if ($connect->Execute($sql, array($nouveauxsujets, $numsondage))) { //envoi d'un mail pour prévenir l'administrateur du changement - $headers = makeHeaders() ; sendEmail( "$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . - " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, - $headers ); + " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION ); } } @@ -590,8 +583,7 @@ if (isset($_POST["ajoutercolonne_x"]) && ($dsondage->format == "D" || $dsondage- sendEmail( $adresseadmin, _("[ADMINISTRATOR] New column for your poll"), _("You have added a new column in your poll. \nYou can inform the voters of this change with this link"). - " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, - $headers ); + " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION ); } else { $erreur_ajout_date="yes"; } diff --git a/contacts.php b/contacts.php index ef6c9a3..d1d72c4 100644 --- a/contacts.php +++ b/contacts.php @@ -52,15 +52,16 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse $message=str_replace("\\","",$_POST["question"]); //envoi des mails - $headers = makeHeaders() ; if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { - $headers .= "\r\n".'Reply-To: '.$_POST['adresse_mail']; + $headers = 'Reply-To: '.$_POST['adresse_mail']; + } else { + $headers = '' ; } + sendEmail( ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers ); if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { - $headers = makeHeaders() ; - sendEmail( "$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers ); + sendEmail( "$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION ); } //affichage de la page de confirmation d'envoi diff --git a/creation_sondage.php b/creation_sondage.php index 648be34..f0e2d40 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -82,8 +82,6 @@ function ajouter_sondage() $date_fin = time()+15552000; } - $headers = makeHeaders() ; - global $connect; $sql = 'INSERT INTO sondage @@ -118,8 +116,8 @@ function ajouter_sondage() $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); if (validateEmail($_SESSION['adresse'])) { - sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $headers ); - sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $headers ); + sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin ); + sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message ); } $date=date('H:i:s d/m/Y:'); diff --git a/fonctions.php b/fonctions.php index 169a538..89aa52b 100644 --- a/fonctions.php +++ b/fonctions.php @@ -183,28 +183,21 @@ function sendEmail( $to, $subject, $body, $headers, $param) } ; $subject = '=?UTF-8?B?' . base64_encode( html_entity_decode( $subject, ENT_QUOTES, 'UTF-8' ) ) . '?=' ; + + $encoded_app = '=?UTF-8?B?' . base64_encode( NOMAPPLICATION ) . '?=' ; + + if ( $headers ) $headers .= "\r\n" + $headers .= sprintf( "From: %s <%s>\r\n", $encoded_app, ADRESSEMAILADMIN ) + $headers .= "MIME-Version: 1.0\r\n" + $headers .= "Content-Type: text/plain; charset=UTF-8\r\n" + $headers .= "Content-Transfer-Encoding: 8bit" + $body = html_entity_decode( $body, ENT_QUOTES, 'UTF-8' ) ; mail( $to, $subject, $body, $headers, $param ) ; } -function makeHeaders() { - - $headers_str = << -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -EOF; - - $encoded_app = '=?UTF-8?B?' . base64_encode( NOMAPPLICATION ) . '?=' ; - $headers = sprintf( $headers_str, $encoded_app, ADRESSEMAILADMIN ) ; - - return $headers ; - -} - /** * Fonction vérifiant l'existance et la valeur non vide d'une clé d'un tableau diff --git a/studs.php b/studs.php index c74052b..fd89460 100644 --- a/studs.php +++ b/studs.php @@ -171,14 +171,12 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] $connect->Execute($sql, array($nom, $numsondage, $nouveauchoix)); if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { - $headers = makeHeaders() ; sendEmail( "$dsondage->mail_admin", "[".NOMAPPLICATION."] "._("Poll's participation")." : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')."", html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8'). _("has filled a line.\nYou can find your poll at the link") . " :\n\n". getUrlSondage($numsondage)." \n\n" . - _("Thanks for your confidence.") . "\n". NOMAPPLICATION, - $headers ); + _("Thanks for your confidence.") . "\n". NOMAPPLICATION ); } } } else { @@ -307,8 +305,7 @@ if ($testmodifier) { $connect->Execute($sql, array($nouveauchoix, $data->nom, $data->id_users)); if ($dsondage->mailsonde=="yes") { - $headers = makeHeaders() ; - sendEmail( "$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'), "\"".html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8')."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers ); + sendEmail( "$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'), "\"".html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8')."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION ); } } From a84355c43880a78f460153349a2c3b1a380fa56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 11 Jan 2012 20:45:13 +0100 Subject: [PATCH 081/129] Add some missing semicolon --- fonctions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fonctions.php b/fonctions.php index 89aa52b..521ef69 100644 --- a/fonctions.php +++ b/fonctions.php @@ -186,11 +186,11 @@ function sendEmail( $to, $subject, $body, $headers, $param) $encoded_app = '=?UTF-8?B?' . base64_encode( NOMAPPLICATION ) . '?=' ; - if ( $headers ) $headers .= "\r\n" - $headers .= sprintf( "From: %s <%s>\r\n", $encoded_app, ADRESSEMAILADMIN ) - $headers .= "MIME-Version: 1.0\r\n" - $headers .= "Content-Type: text/plain; charset=UTF-8\r\n" - $headers .= "Content-Transfer-Encoding: 8bit" + if ( $headers ) $headers .= "\r\n" ; + $headers .= sprintf( "From: %s <%s>\r\n", $encoded_app, ADRESSEMAILADMIN ) ; + $headers .= "MIME-Version: 1.0\r\n" ; + $headers .= "Content-Type: text/plain; charset=UTF-8\r\n" ; + $headers .= "Content-Transfer-Encoding: 8bit" ; $body = html_entity_decode( $body, ENT_QUOTES, 'UTF-8' ) ; From 546385a12804908791f9dd4f2808d57e6836286f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 18 Jan 2012 00:24:16 +0100 Subject: [PATCH 082/129] Header encoding done with std functions --- fonctions.php | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/fonctions.php b/fonctions.php index 521ef69..b5b4819 100644 --- a/fonctions.php +++ b/fonctions.php @@ -163,33 +163,24 @@ function validateEmail($email) # Envoi un courrier avec un codage correct de To et Subject # Les en-têtes complémentaires ne sont pas gérés -# Inspiré de http://geoland.org/2007/12/utf8-ready-php-mail-function/ function sendEmail( $to, $subject, $body, $headers, $param) { - $to_list = explode( ',', html_entity_decode( $to, ENT_QUOTES, 'UTF-8' ) ) ; - $to = "" ; - $first = 1 ; - foreach ( $to_list as $one ) { - if ( $first == 0 ) $to .= ',' ; - if ( preg_match( "/ 74 ) $folding = "\n" + else $folding = "" ; + $from = sprintf( "From: %s%s <%s>\n", $encoded_app, $folding, ADRESSEMAILADMIN ) ; - if ( $headers ) $headers .= "\r\n" ; - $headers .= sprintf( "From: %s <%s>\r\n", $encoded_app, ADRESSEMAILADMIN ) ; - $headers .= "MIME-Version: 1.0\r\n" ; - $headers .= "Content-Type: text/plain; charset=UTF-8\r\n" ; + if ( $headers ) $headers .= "\n" ; + $headers .= $from ; + $headers .= "MIME-Version: 1.0\n" ; + $headers .= "Content-Type: text/plain; charset=UTF-8\n" ; $headers .= "Content-Transfer-Encoding: 8bit" ; $body = html_entity_decode( $body, ENT_QUOTES, 'UTF-8' ) ; From 12a07f14071ea155526298bb264aef7ed9ec78d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 18 Jan 2012 00:29:57 +0100 Subject: [PATCH 083/129] Fix the mb_encode_mimeheader call syntax --- fonctions.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fonctions.php b/fonctions.php index b5b4819..e07405f 100644 --- a/fonctions.php +++ b/fonctions.php @@ -167,20 +167,20 @@ function validateEmail($email) function sendEmail( $to, $subject, $body, $headers, $param) { - $subject = mb_encode_mimeheader( html_entity_decode( $subject, ENT_QUOTES, 'UTF-8' ), "UTF-8",,, 9 ) ; + $subject = mb_encode_mimeheader( html_entity_decode( $subject, ENT_QUOTES, 'UTF-8' ), "UTF-8", "B", "\r\n", 9 ) ; - $encoded_app = mb_encode_mimeheader( NOMAPPLICATION, "UTF-8",,, 6 ) ; + $encoded_app = mb_encode_mimeheader( NOMAPPLICATION, "UTF-8", "B", "\r\n", 6 ) ; $size_encoded_app = strlen( $encoded_app ) % 76 ; $size_admin_email = strlen( ADRESSEMAILADMIN ) ; - if ( $size_encoded_app + $size_admin_email + 9 > 74 ) $folding = "\n" + if ( $size_encoded_app + $size_admin_email + 9 > 74 ) $folding = "\r\n" else $folding = "" ; $from = sprintf( "From: %s%s <%s>\n", $encoded_app, $folding, ADRESSEMAILADMIN ) ; - if ( $headers ) $headers .= "\n" ; + if ( $headers ) $headers .= "\r\n" ; $headers .= $from ; - $headers .= "MIME-Version: 1.0\n" ; - $headers .= "Content-Type: text/plain; charset=UTF-8\n" ; + $headers .= "MIME-Version: 1.0\r\n" ; + $headers .= "Content-Type: text/plain; charset=UTF-8\r\n" ; $headers .= "Content-Transfer-Encoding: 8bit" ; $body = html_entity_decode( $body, ENT_QUOTES, 'UTF-8' ) ; From 3908d13b4afd9b3c5383856ded296b68ed056e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 18 Jan 2012 00:33:42 +0100 Subject: [PATCH 084/129] Another syntax fix --- fonctions.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fonctions.php b/fonctions.php index e07405f..e87673c 100644 --- a/fonctions.php +++ b/fonctions.php @@ -173,8 +173,11 @@ function sendEmail( $to, $subject, $body, $headers, $param) $size_encoded_app = strlen( $encoded_app ) % 76 ; $size_admin_email = strlen( ADRESSEMAILADMIN ) ; - if ( $size_encoded_app + $size_admin_email + 9 > 74 ) $folding = "\r\n" - else $folding = "" ; + if ( $size_encoded_app + $size_admin_email + 9 > 74 ) { + $folding = "\r\n" ; + } else { + $folding = "" ; + } ; $from = sprintf( "From: %s%s <%s>\n", $encoded_app, $folding, ADRESSEMAILADMIN ) ; if ( $headers ) $headers .= "\r\n" ; From 86fc583c262fc8d9396f646e5545039eaea3e182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 18 Jan 2012 00:41:23 +0100 Subject: [PATCH 085/129] Force multibyte functions internal encoding --- fonctions.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fonctions.php b/fonctions.php index e87673c..a850d04 100644 --- a/fonctions.php +++ b/fonctions.php @@ -167,6 +167,8 @@ function validateEmail($email) function sendEmail( $to, $subject, $body, $headers, $param) { + mb_internal_encoding("UTF-8"); + $subject = mb_encode_mimeheader( html_entity_decode( $subject, ENT_QUOTES, 'UTF-8' ), "UTF-8", "B", "\r\n", 9 ) ; $encoded_app = mb_encode_mimeheader( NOMAPPLICATION, "UTF-8", "B", "\r\n", 6 ) ; From 87c0dd21f6429bbcf6358bdeaf986955b2e21841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 18 Jan 2012 00:45:31 +0100 Subject: [PATCH 086/129] Replace CRLF in headers by LF --- fonctions.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fonctions.php b/fonctions.php index a850d04..99ea641 100644 --- a/fonctions.php +++ b/fonctions.php @@ -169,23 +169,23 @@ function sendEmail( $to, $subject, $body, $headers, $param) mb_internal_encoding("UTF-8"); - $subject = mb_encode_mimeheader( html_entity_decode( $subject, ENT_QUOTES, 'UTF-8' ), "UTF-8", "B", "\r\n", 9 ) ; + $subject = mb_encode_mimeheader( html_entity_decode( $subject, ENT_QUOTES, 'UTF-8' ), "UTF-8", "B", "\n", 9 ) ; - $encoded_app = mb_encode_mimeheader( NOMAPPLICATION, "UTF-8", "B", "\r\n", 6 ) ; - $size_encoded_app = strlen( $encoded_app ) % 76 ; + $encoded_app = mb_encode_mimeheader( NOMAPPLICATION, "UTF-8", "B", "\n", 6 ) ; + $size_encoded_app = strlen( $encoded_app ) % 75 ; $size_admin_email = strlen( ADRESSEMAILADMIN ) ; if ( $size_encoded_app + $size_admin_email + 9 > 74 ) { - $folding = "\r\n" ; + $folding = "\n" ; } else { $folding = "" ; } ; $from = sprintf( "From: %s%s <%s>\n", $encoded_app, $folding, ADRESSEMAILADMIN ) ; - if ( $headers ) $headers .= "\r\n" ; + if ( $headers ) $headers .= "\n" ; $headers .= $from ; - $headers .= "MIME-Version: 1.0\r\n" ; - $headers .= "Content-Type: text/plain; charset=UTF-8\r\n" ; + $headers .= "MIME-Version: 1.0\n" ; + $headers .= "Content-Type: text/plain; charset=UTF-8\n" ; $headers .= "Content-Transfer-Encoding: 8bit" ; $body = html_entity_decode( $body, ENT_QUOTES, 'UTF-8' ) ; From caf84064df23bd66e30005e61baa83c2f384a282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 18 Jan 2012 00:51:23 +0100 Subject: [PATCH 087/129] Fix last header line size calculation The "From: " prefix size was not taken into accounts when calculating how many characters were on the last header line produced by mb_encode_mimeheader. This is used to check if the e-mail address should be placed on a separate line. --- fonctions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fonctions.php b/fonctions.php index 99ea641..059d639 100644 --- a/fonctions.php +++ b/fonctions.php @@ -172,10 +172,10 @@ function sendEmail( $to, $subject, $body, $headers, $param) $subject = mb_encode_mimeheader( html_entity_decode( $subject, ENT_QUOTES, 'UTF-8' ), "UTF-8", "B", "\n", 9 ) ; $encoded_app = mb_encode_mimeheader( NOMAPPLICATION, "UTF-8", "B", "\n", 6 ) ; - $size_encoded_app = strlen( $encoded_app ) % 75 ; + $size_encoded_app = ( 6 + strlen( $encoded_app ) ) % 75 ; $size_admin_email = strlen( ADRESSEMAILADMIN ) ; - if ( $size_encoded_app + $size_admin_email + 9 > 74 ) { + if ( ( $size_encoded_app + $size_admin_email + 9 ) > 74 ) { $folding = "\n" ; } else { $folding = "" ; From 05c8ba7c66f2b4cb3216b3513ca16bd3a5c2dc65 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 28 Feb 2013 18:26:26 +0100 Subject: [PATCH 088/129] Ne faire apparaitre dans l'admin que les sondages actifs ou expires depuis x mois --- admin/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/index.php b/admin/index.php index 5de0e58..a926cc2 100644 --- a/admin/index.php +++ b/admin/index.php @@ -97,7 +97,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { } -$sondage=$connect->Execute("select * from sondage ORDER BY date_fin ASC"); +$sondage=$connect->Execute("select * from sondage WHERE date_fin > DATE_SUB(now(), INTERVAL 3 MONTH) ORDER BY date_fin ASC"); $nbsondages=$sondage->RecordCount(); echo $nbsondages.' '. _("polls in the database at this time") .'

    '."\n"; From dc7e317efa3f32eec3300fc982dfcc063ee8dc49 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Fri, 1 Mar 2013 11:19:57 +0100 Subject: [PATCH 089/129] =?UTF-8?q?mise=20=C3=A0=20jour=20du=20script=20My?= =?UTF-8?q?SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/.htaccess | 6 +-- install.mysql.sql | 101 +++++++++++++++++++++++++--------------------- 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/admin/.htaccess b/admin/.htaccess index 6247675..f6c1ee9 100755 --- a/admin/.htaccess +++ b/admin/.htaccess @@ -1,12 +1,12 @@ authType basic authName "ADMIN OpenSondage" -authUserFile /home/framatools/www/opensondage/admin/.htpasswd +authUserFile /home/framatools/www/opensondage_dev/admin/.htpasswd -order deny,allow +#order deny,allow # satisfy all # allow from all -require user studs +#require user studs diff --git a/install.mysql.sql b/install.mysql.sql index bd0f086..c873a75 100644 --- a/install.mysql.sql +++ b/install.mysql.sql @@ -1,66 +1,77 @@ -CREATE TABLE IF NOT EXISTS `sondage` ( - `id_sondage` CHAR(16) NOT NULL, - `commentaires` text, - `mail_admin` VARCHAR(128), - `nom_admin` VARCHAR(64), - `titre` text, - `id_sondage_admin` CHAR(24), - `date_fin` TIMESTAMP, - `format` VARCHAR(2), - `mailsonde` BOOLEAN DEFAULT '0', - UNIQUE KEY (`id_sondage`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - --- --- Name: sujet_studs; Type: TABLE; +-- Base de données: `opensondage` -- -CREATE TABLE IF NOT EXISTS `sujet_studs` ( - `id_sondage` CHAR(16) NOT NULL, - `sujet` TEXT, - FOREIGN KEY (`id_sondage`) REFERENCES sondage(id_sondage) on delete cascade -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - +-- -------------------------------------------------------- -- --- Name: user_studs; Type: TABLE; --- - -CREATE TABLE IF NOT EXISTS `user_studs` ( - `id_users` INT(11) unsigned NOT NULL AUTO_INCREMENT, - `nom` VARCHAR(64) NOT NULL, - `id_sondage` CHAR(16) NOT NULL, - `reponses` text NOT NULL, - PRIMARY KEY (`id_users`), - FOREIGN KEY (`id_sondage`) REFERENCES sondage(id_sondage) on delete cascade -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - --- --- Name: comments; Type: TABLE; +-- Structure de la table `comments` -- CREATE TABLE IF NOT EXISTS `comments` ( - `id_comment` INT(11) unsigned NOT NULL AUTO_INCREMENT, - `id_sondage` CHAR(16) NOT NULL, - `comment` text NOT NULL, - `usercomment` text, - PRIMARY KEY (`id_comment`), - FOREIGN KEY (`id_sondage`) REFERENCES sondage(id_sondage) on delete cascade + `id_comment` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_sondage` char(16) NOT NULL, + `comment` text NOT NULL, + `usercomment` text, + PRIMARY KEY (`id_comment`), + KEY `id_sondage` (`id_sondage`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Structure de la table `sondage` +-- + +CREATE TABLE IF NOT EXISTS `sondage` ( + `id_sondage` char(16) NOT NULL, + `commentaires` text, + `mail_admin` varchar(128) DEFAULT NULL, + `nom_admin` varchar(64) DEFAULT NULL, + `titre` text, + `id_sondage_admin` char(24) DEFAULT NULL, + `date_creation` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `date_fin` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `format` varchar(2) DEFAULT NULL, + `mailsonde` tinyint(1) DEFAULT '0', + `statut` int(11) NOT NULL DEFAULT '1' COMMENT '1 = actif ; 0 = inactif ; ', + UNIQUE KEY `id_sondage` (`id_sondage`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- -------------------------------------------------------- -- --- Data for Name: sondage; Type: TABLE DATA; +-- Structure de la table `sujet_studs` -- +CREATE TABLE IF NOT EXISTS `sujet_studs` ( + `id_sondage` char(16) NOT NULL, + `sujet` text, + KEY `id_sondage` (`id_sondage`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + +-- +-- Structure de la table `user_studs` +-- + +CREATE TABLE IF NOT EXISTS `user_studs` ( + `id_users` int(11) unsigned NOT NULL AUTO_INCREMENT, + `nom` varchar(64) NOT NULL, + `id_sondage` char(16) NOT NULL, + `reponses` text NOT NULL, + PRIMARY KEY (`id_users`), + KEY `id_sondage` (`id_sondage`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=160284 ; + + + INSERT INTO `sondage` (`id_sondage`, `commentaires`, `mail_admin`, `nom_admin`, `titre`, `id_sondage_admin`, `date_fin`, `format`) VALUES -('aqg259dth55iuhwm','Repas de Noel du service','Stephanie@saillard.com','Stephanie', +('aqg259dth55iuhwm','Repas de Noel du service','Stephanie@retaillard.com','Stephanie', 'Repas de Noel','aqg259dth55iuhwmy9d8jlwk', FROM_UNIXTIME('1627100361'),'D+'); From f7efca4308ccf0985dbe48ae9e7ca653395b2751 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Fri, 1 Mar 2013 11:21:07 +0100 Subject: [PATCH 090/129] =?UTF-8?q?renommage=20et=20desactivation=20du=20s?= =?UTF-8?q?cript=20PostreSQL,=20pas=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sql | 147 ---------------------------------------------------- 1 file changed, 147 deletions(-) delete mode 100644 install.sql diff --git a/install.sql b/install.sql deleted file mode 100644 index b02c955..0000000 --- a/install.sql +++ /dev/null @@ -1,147 +0,0 @@ ---========================================================================== --- ---Université de Strasbourg - Direction Informatique ---Auteur : Guilhem BORGHESI ---Création : Février 2008 --- ---borghesi@unistra.fr --- ---Ce logiciel est régi par la licence CeCILL-B soumise au droit français et ---respectant les principes de diffusion des logiciels libres. Vous pouvez ---utiliser, modifier et/ou redistribuer ce programme sous les conditions ---de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA ---sur le site "http://www.cecill.info". --- ---Le fait que vous puissiez accéder à cet en-tête signifie que vous avez ---pris connaissance de la licence CeCILL-B, et que vous en avez accepté les ---termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. --- ---========================================================================== --- ---Université de Strasbourg - Direction Informatique ---Author : Guilhem BORGHESI ---Creation : Feb 2008 --- ---borghesi@unistra.fr --- ---This software is governed by the CeCILL-B license under French law and ---abiding by the rules of distribution of free software. You can use, ---modify and/ or redistribute the software under the terms of the CeCILL-B ---license as circulated by CEA, CNRS and INRIA at the following URL ---"http://www.cecill.info". --- ---The fact that you are presently reading this means that you have had ---knowledge of the CeCILL-B license and that you accept its terms. You can ---find a copy of this license in the file LICENSE. --- ---========================================================================== - --- --- PostgreSQL database dump --- - --- --- Name: sondage; Type: TABLE; --- - -CREATE TABLE sondage ( - id_sondage text NOT NULL, - commentaires text, - mail_admin text, - nom_admin text, - titre text, - id_sondage_admin text, - date_fin text, - format text, - mailsonde text -); - - --- --- Name: sujet_studs; Type: TABLE; --- - -CREATE TABLE sujet_studs ( - id_sondage text, - sujet text -); - - --- --- Name: user_studs; Type: TABLE; --- - -CREATE TABLE user_studs ( - nom text, - id_sondage text, - reponses text, - id_users serial NOT NULL -); - - --- --- Name: comments; Type: TABLE; --- - -CREATE TABLE comments ( - id_sondage text, - comment text, - usercomment text, - id_comment serial NOT NULL -); - -CREATE OR REPLACE FUNCTION from_unixtime(integer) RETURNS timestamp AS -'SELECT $1::abstime::timestamp without time zone AS result' LANGUAGE 'SQL'; - --- --- Data for Name: sondage; Type: TABLE DATA; --- - -COPY sondage (id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) FROM stdin; -aqg259dth55iuhwm Repas de Noel du service Stephanie@saillard.com Stephanie Repas de Noel aqg259dth55iuhwmy9d8jlwk 1627100361 D+ -\. - - --- --- Data for Name: sujet_studs; Type: TABLE DATA; --- - -COPY sujet_studs (id_sondage, sujet) FROM stdin; -aqg259dth55iuhwm 1225839600@12h,1225839600@19h,1226012400@12h,1226012400@19h,1226876400@12h,1226876400@19h,1227049200@12h,1227049200@19h,1227826800@12h,1227826800@19h -\. - - --- --- Data for Name: user_studs; Type: TABLE DATA; --- - -COPY user_studs (nom, id_sondage, reponses, id_users) FROM stdin; -marcel aqg259dth55iuhwm 0110111101 933 -paul aqg259dth55iuhwm 1011010111 935 -sophie aqg259dth55iuhwm 1110110000 945 -barack aqg259dth55iuhwm 0110000 948 -takashi aqg259dth55iuhwm 0000110100 951 -albert aqg259dth55iuhwm 1010110 975 -alfred aqg259dth55iuhwm 0110010 1135 -marcs aqg259dth55iuhwm 0100001010 1143 -laure aqg259dth55iuhwm 0011000 1347 -benda aqg259dth55iuhwm 1101101100 1667 -Albert aqg259dth55iuhwm 1111110011 1668 -\. - - --- --- Name: sondage_pkey; Type: CONSTRAINT; --- - -ALTER TABLE ONLY sondage - ADD CONSTRAINT sondage_pkey PRIMARY KEY (id_sondage); - - --- --- Name: user_studs_pkey; Type: CONSTRAINT; --- - -ALTER TABLE ONLY user_studs - ADD CONSTRAINT user_studs_pkey PRIMARY KEY (id_users); - From db05126f0141f77d502059d1d83495dc7ad2426c Mon Sep 17 00:00:00 2001 From: pascalc Date: Mon, 4 Mar 2013 18:55:13 +0100 Subject: [PATCH 091/129] =?UTF-8?q?fix=20issue=201=20:=20permet=20de=20fai?= =?UTF-8?q?re=20fonctionner=20gettext=20avec=20le=20serveur=20de=20dev=20d?= =?UTF-8?q?e=20PHP5.4=20+=20enl=C3=A8ve=20code=20comment=C3=A9=20depuis=20?= =?UTF-8?q?des=20ann=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n.php b/i18n.php index 3ca9a33..439fee7 100644 --- a/i18n.php +++ b/i18n.php @@ -1,5 +1,4 @@ Date: Mon, 4 Mar 2013 19:46:06 +0100 Subject: [PATCH 092/129] =?UTF-8?q?enl=C3=A8ve=20les=20appels=20=C3=A0=20g?= =?UTF-8?q?et=5Fserver=5Fname()=20partout=20sauf=20dans=20un=20appel=20?= =?UTF-8?q?=C3=A0=20sendMail(),=20r=C3=A9=C3=A9criture=20de=20la=20fonctio?= =?UTF-8?q?n=20pour=20cet=20usage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adminstuds.php | 244 ++++++++++++++++++++++++------------------------- bandeaux.php | 79 ++++++++-------- exportpdf.php | 10 +- fonctions.php | 48 ++++------ index.php | 12 +-- 5 files changed, 190 insertions(+), 203 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index bd7adce..019f791 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -10,10 +10,10 @@ //Ce logiciel est régi par la licence CeCILL-B soumise au droit français et //respectant les principes de diffusion des logiciels libres. Vous pouvez //utiliser, modifier et/ou redistribuer ce programme sous les conditions -//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA //sur le site "http://www.cecill.info". // -//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez //pris connaissance de la licence CeCILL-B, et que vous en avez accepté les //termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. // @@ -26,10 +26,10 @@ //borghesi@unistra.fr // //This software is governed by the CeCILL-B license under French law and -//abiding by the rules of distribution of free software. You can use, +//abiding by the rules of distribution of free software. You can use, //modify and/ or redistribute the software under the terms of the CeCILL-B //license as circulated by CEA, CNRS and INRIA at the following URL -//"http://www.cecill.info". +//"http://www.cecill.info". // //The fact that you are presently reading this means that you have had //knowledge of the CeCILL-B license and that you accept its terms. You can @@ -62,12 +62,12 @@ if (preg_match(";[\w\d]{24};i", $numsondageadmin)) { $sql = 'SELECT * FROM sondage WHERE id_sondage_admin = '.$connect->Param('numsondageadmin'); $sql = $connect->Prepare($sql); $sondage = $connect->Execute($sql, array($numsondageadmin)); - + if ($sondage !== false) { $sql = 'SELECT * FROM sujet_studs WHERE id_sondage = '.$connect->Param('numsondage'); $sql = $connect->Prepare($sql); $sujets = $connect->Execute($sql, array($numsondage)); - + $sql = 'SELECT * FROM user_studs WHERE id_sondage = '.$connect->Param('numsondage').' order by id_users'; $sql = $connect->Prepare($sql); $user_studs = $connect->Execute($sql, array($numsondage)); @@ -82,8 +82,8 @@ if (!$sondage || $sondage->RecordCount() != 1){ logo(); bandeau_tete(); bandeau_titre(_("Error!")); - - + + echo '
    '."\n"; print "

    " . _("This poll doesn't exist !") . "



    "."\n"; print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; @@ -91,7 +91,7 @@ if (!$sondage || $sondage->RecordCount() != 1){ echo '
    '."\n"; # sur_bandeau_pied(); bandeau_pied(); - + echo''."\n"; echo ''."\n"; die(); @@ -112,7 +112,7 @@ if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"]) $nouveautitre = htmlentities(html_entity_decode($_POST['nouveautitre'], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); $sql = 'UPDATE sondage SET titre = '.$connect->Param('nouveautitre').' WHERE id_sondage = '.$connect->Param('numsondage'); $sql = $connect->Prepare($sql); - + //envoi du mail pour prevenir l'admin de sondage if ($connect->Execute($sql, array($nouveautitre, $numsondage))) { sendEmail( $adresseadmin, @@ -123,18 +123,18 @@ if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"]) } } } - + // si le bouton est activé, quelque soit la valeur du champ textarea if (isset($_POST["boutonnouveauxcommentaires"]) || isset($_POST["boutonnouveauxcommentaires_x"])) { if(issetAndNoEmpty('nouveautitre') === false) { $err |= COMMENT_EMPTY; } else { $commentaires = htmlentities(html_entity_decode($_POST['nouveauxcommentaires'], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); - + //modification de la base SQL avec les nouveaux commentaires $sql = 'UPDATE sondage SET commentaires = '.$connect->Param('commentaires').' WHERE id_sondage = '.$connect->Param('numsondage'); $sql = $connect->Prepare($sql); - + if ($connect->Execute($sql, array($commentaires, $numsondage))) { //envoi du mail pour prevenir l'admin de sondage sendEmail( $adresseadmin, @@ -152,11 +152,11 @@ if (isset($_POST["boutonnouvelleadresse"]) || isset($_POST["boutonnouvelleadress $err |= INVALID_EMAIL; } else { $nouvelleadresse = htmlentities(html_entity_decode($_POST['nouvelleadresse'], ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); - + //modification de la base SQL avec la nouvelle adresse $sql = 'UPDATE sondage SET mail_admin = '.$connect->Param('nouvelleadresse').' WHERE id_sondage = '.$connect->Param('numsondage'); $sql = $connect->Prepare($sql); - + if ($connect->Execute($sql, array($nouvelleadresse, $numsondage))) { //envoi du mail pour prevenir l'admin de sondage sendEmail( $_POST['nouvelleadresse'], @@ -180,24 +180,24 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { bandeau_tete(); bandeau_titre(_("Make your polls")); sous_bandeau(); - + //on recupere les données et les sujets du sondage - + echo '
    '."\n"; - + echo ''."\n"; - + echo '
    '."\n"; echo "

    " . _("Column's adding") . "



    "."\n"; - + if ($dsondage->format=="A"||$dsondage->format=="A+"){ echo _("Add a new column") .' :
    '; echo '

    '; echo ''."\n"; echo ''."\n"; } else { - //ajout d'une date avec creneau horaire + //ajout d'une date avec creneau horaire echo _("You can add a new scheduling date to your poll.
    If you just want to add a new hour to an existant date, put the same date and choose a new hour.") .'

    '."\n"; echo _("Add a date") .' :

    '."\n"; echo ''."\n"; - + echo '
    '."\n"; echo ''."\n"; echo ''."\n"; - + //affichage des années $colspan=1; for ($i = 0; $i < count($toutsujet); $i++) { $current = $toutsujet[$i]; - + if (strpos($toutsujet[$i], '@') !== false) { $current = substr($toutsujet[$i], 0, strpos($toutsujet[$i], '@')); } - + if (isset($toutsujet[$i+1]) && strpos($toutsujet[$i+1], '@') !== false) { $next = substr($toutsujet[$i+1], 0, strpos($toutsujet[$i+1], '@')); } elseif (isset($toutsujet[$i+1])) { $next = $toutsujet[$i+1]; } - + if (isset($toutsujet[$i+1]) && strftime("%Y",$current) == strftime("%Y",$next)){ $colspan++; } else { @@ -804,28 +804,28 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { $colspan=1; } } - + echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; - + //affichage des mois $colspan = 1; for ($i = 0; $i < count($toutsujet); $i++) { $current = $toutsujet[$i]; - + if (strpos($toutsujet[$i], '@') !== false) { $current = substr($toutsujet[$i], 0, strpos($toutsujet[$i], '@')); } - + if (isset($toutsujet[$i+1]) && strpos($toutsujet[$i+1], '@') !== false) { $next = substr($toutsujet[$i+1], 0, strpos($toutsujet[$i+1], '@')); } elseif (isset($toutsujet[$i+1])) { $next = $toutsujet[$i+1]; } - + if (isset($toutsujet[$i+1]) && strftime("%B", $current) == strftime("%B", $next) && strftime("%Y", $current) == strftime("%Y", $next)){ $colspan++; } else { @@ -834,32 +834,32 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } else { echo ''."\n"; } - + $colspan=1; } } - + echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; - + //affichage des jours $colspan = 1; for ($i = 0; $i < count($toutsujet); $i++) { $current = $toutsujet[$i]; - + if (strpos($toutsujet[$i], '@') !== false) { $current = substr($toutsujet[$i], 0, strpos($toutsujet[$i], '@')); } - + if (isset($toutsujet[$i+1]) && strpos($toutsujet[$i+1], '@') !== false) { $next = substr($toutsujet[$i+1], 0, strpos($toutsujet[$i+1], '@')); } elseif (isset($toutsujet[$i+1])) { $next = $toutsujet[$i+1]; } - + if (isset($toutsujet[$i+1]) && strftime("%a %e",$current)==strftime("%a %e",$next)&&strftime("%B",$current)==strftime("%B",$next)){ $colspan++; } else { @@ -868,20 +868,20 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } else { echo ''."\n"; } - + $colspan=1; } } - + echo ''."\n"; echo ''."\n"; - + //affichage des horaires if (strpos($dsujet->sujet,'@') !== false) { echo ''."\n"; echo ''."\n"; echo ''."\n"; - + for ($i = 0; isset($toutsujet[$i]); $i++) { $heures=explode("@", $toutsujet[$i]); if (isset($heures[1])) { @@ -890,22 +890,22 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; } } - + echo ''."\n"; echo ''."\n"; } } else { $toutsujet=str_replace("°","'",$toutsujet); - + //affichage des sujets du sondage echo ''."\n"; echo ''."\n"; echo ''."\n"; - + for ($i = 0; isset($toutsujet[$i]); $i++) { echo ''."\n"; } - + echo ''."\n"; echo ''."\n"; } @@ -917,14 +917,14 @@ $compteur = 0; while ($data = $user_studs->FetchNextObject(false)) { $ensemblereponses = $data->reponses; - + echo ''."\n"; echo ''."\n"; - + //affichage du nom $nombase=str_replace("°","'",$data->nom); echo ''."\n"; - + //si la ligne n'est pas a changer, on affiche les données if (!$testligneamodifier) { for ($k = 0; $k < $nbcolonnes; $k++) { @@ -940,7 +940,7 @@ while ($data = $user_studs->FetchNextObject(false)) { } } } else { //sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs - + //si c'est bien la ligne a modifier on met les checkbox if ($compteur == "$ligneamodifier") { for ($j = 0; $j < $nbcolonnes; $j++) { @@ -954,7 +954,7 @@ while ($data = $user_studs->FetchNextObject(false)) { } else { //sinon on affiche les lignes normales for ($k = 0; $k < $nbcolonnes; $k++) { $car = substr($ensemblereponses, $k, 1); - + if ($car == "1") { echo ''."\n"; if (isset($somme[$k]) === false) { @@ -967,12 +967,12 @@ while ($data = $user_studs->FetchNextObject(false)) { } } } - + //a la fin de chaque ligne se trouve les boutons modifier if (!$testligneamodifier=="true") { echo ''."\n"; } - + //demande de confirmation pour modification de ligne for ($i = 0; $i < $nblignes; $i++) { if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { @@ -981,7 +981,7 @@ while ($data = $user_studs->FetchNextObject(false)) { } } } - + $compteur++; echo ''."\n"; } @@ -1009,7 +1009,7 @@ for ($i = 0; $i < $nbcolonnes + 1; $i++) { if ($i == "0") { $meilleurecolonne = $somme[$i]; } - + if (isset($somme[$i]) && $somme[$i] > $meilleurecolonne){ $meilleurecolonne = $somme[$i]; } @@ -1028,11 +1028,11 @@ for ($i = 0; $i < $nbcolonnes; $i++) { } else { $affichesomme = ''; } - + if ($affichesomme == "") { $affichesomme = "0"; } - + if (isset($somme[$i]) === true && isset($meilleurecolonne) === true && $somme[$i] == $meilleurecolonne){ echo ''."\n"; } else { @@ -1098,10 +1098,10 @@ $meilleursujet = ''; for ($i = 0; $i < $nbcolonnes; $i++) { if (isset($somme[$i]) === true && isset($meilleurecolonne) === true && $somme[$i] == $meilleurecolonne){ $meilleursujet.=", "; - + if ($dsondage->format == "D" || $dsondage->format == "D+") { $meilleursujetexport = $toutsujet[$i]; - + if (strpos($toutsujet[$i], '@') !== false) { $toutsujetdate = explode("@", $toutsujet[$i]); if ($_SESSION["langue"] == "EN") { @@ -1119,7 +1119,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) { } else { $meilleursujet.=$toutsujet[$i]; } - + $compteursujet++; } } @@ -1181,13 +1181,13 @@ $sql = $connect->Prepare($sql); $comment_user = $connect->Execute($sql, array($numsondage)); if ($comment_user->RecordCount() != 0) { print "
    " . _("Comments") . " :
    \n"; - + $i = 0; while ( $dcomment=$comment_user->FetchNextObject(false)) { print " ". stripslashes($dcomment->usercomment) ." : ".stripslashes($dcomment->comment) ."
    "; $i++; } - + echo '
    '; } @@ -1208,7 +1208,7 @@ echo _("Remove your poll") .' : '."\n"; if ($dsondage->format == "D" || $dsondage->format == "D+") { - echo ''."\n"; + echo ''."\n"; echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
    '; echo ''; echo ''; diff --git a/bandeaux.php b/bandeaux.php index 7f2af3e..bcd2b20 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -1,4 +1,4 @@ - '."\n";; - echo ''."\n"; - include_once($_SERVER['DOCUMENT_ROOT']."/framanav/nav.inc.html"); - echo ' '."\n"; + echo "\n".' '."\n";; + echo ''."\n"; + include_once($_SERVER['DOCUMENT_ROOT']."/framanav/nav.inc.html"); + echo ' '."\n"; } } @@ -73,7 +72,7 @@ function gAnalytics() { function logo () { if(defined('LOGOBANDEAU')) { - echo ''."\n"; + echo ''."\n"; } } @@ -83,11 +82,11 @@ function bandeau_tete() { if ( IMAGE_TITRE ) { - echo '
    '.NOMAPPLICATION.'
    '."\n"; + echo '
    '.NOMAPPLICATION.'
    '."\n"; } else { - echo '
    '.NOMAPPLICATION.'
    '."\n"; + echo '
    '.NOMAPPLICATION.'
    '."\n"; } ; @@ -104,12 +103,12 @@ function bandeau_titre($titre) function liste_lang() { global $ALLOWED_LANGUAGES; - + $str = ''; foreach ($ALLOWED_LANGUAGES as $k => $v ) { $str .= '' . $v . '' . "\n" ; } - + return $str; } @@ -118,12 +117,12 @@ function liste_lang() function sous_bandeau() { /*echo '
    ' . - ''. _("Home") .'' . + ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . - //''. _("Sources") .'' . //not implemented - ''. _("About") .'' . - ''. _("Admin") .'' . + ''. _("Contact") .'' . + //''. _("Sources") .'' . //not implemented + ''. _("About") .'' . + ''. _("Admin") .'' . '' . liste_lang() . ''. '
    ' . "\n";*/ @@ -133,25 +132,25 @@ function sous_bandeau() function sous_bandeau_admin() { echo '
    ' . - ''. _("Home") .''; - + ''. _("Home") .''; + if(is_readable('logs_studs.txt')) { - echo ''. _("Logs") .''; + echo ''. _("Logs") .''; } - - echo ''. _("Cleaning") .'' . + + echo ''. _("Cleaning") .'' . '' . liste_lang() . ''. '
    '."\n"; - - gAnalytics(); + + gAnalytics(); } function sous_bandeau_choix() { /*echo '
    ' . - ''. _("Home") .'' . + ''. _("Home") .'' . '
    '."\n";*/ } @@ -168,16 +167,16 @@ function bandeau_pied() //echo '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; echo '
     
    '; echo '
    ' . - ''. _("Home") .'' . + ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . - //''. _("Sources") .'' . //not implemented - ''. _("About") .'' . - //''. _("Admin") .'' . + ''. _("Contact") .'' . + //''. _("Sources") .'' . //not implemented + ''. _("About") .'' . + //''. _("Admin") .'' . '' . liste_lang() . ''. '
    ' . "\n"; - gAnalytics(); + gAnalytics(); } @@ -187,14 +186,14 @@ function bandeau_pied_mobile() '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n";*/ echo '
     
    '; echo '
    ' . - ''. _("Home") .'' . + ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . - //''. _("Sources") .'' . //not implemented - ''. _("About") .'' . - //''. _("Admin") .'' . + ''. _("Contact") .'' . + //''. _("Sources") .'' . //not implemented + ''. _("About") .'' . + //''. _("Admin") .'' . '' . liste_lang() . ''. '
    ' . "\n"; - gAnalytics(); + gAnalytics(); } diff --git a/exportpdf.php b/exportpdf.php index 68d5edf..2f37f7e 100644 --- a/exportpdf.php +++ b/exportpdf.php @@ -10,10 +10,10 @@ //Ce logiciel est rgi par la licence CeCILL-B soumise au droit franais et //respectant les principes de diffusion des logiciels libres. Vous pouvez //utiliser, modifier et/ou redistribuer ce programme sous les conditions -//de la licence CeCILL-B telle que diffuse par le CEA, le CNRS et l'INRIA +//de la licence CeCILL-B telle que diffuse par le CEA, le CNRS et l'INRIA //sur le site "http://www.cecill.info". // -//Le fait que vous puissiez accder cet en-tte signifie que vous avez +//Le fait que vous puissiez accder cet en-tte signifie que vous avez //pris connaissance de la licence CeCILL-B, et que vous en avez accept les //termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. // @@ -26,10 +26,10 @@ //borghesi@unistra.fr // //This software is governed by the CeCILL-B license under French law and -//abiding by the rules of distribution of free software. You can use, +//abiding by the rules of distribution of free software. You can use, //modify and/ or redistribute the software under the terms of the CeCILL-B //license as circulated by CEA, CNRS and INRIA at the following URL -//"http://www.cecill.info". +//"http://www.cecill.info". // //The fact that you are presently reading this means that you have had //knowledge of the CeCILL-B license and that you accept its terms. You can @@ -78,7 +78,7 @@ $PDF->Text(140,240,utf8_decode($dsondage->nom_admin)); $PDF->SetFont('Arial','B',8); // TODO: translate -$PDF->Text(35,275,"Cette lettre de convocation a t gnre automatiquement par ".NOMAPPLICATION." sur ".get_server_name()); +$PDF->Text(35,275,"Cette lettre de convocation a t gnre automatiquement par ".NOMAPPLICATION." sur ". $_SERVER['SERVER_NAME']); //Sortie $PDF->Output(); diff --git a/fonctions.php b/fonctions.php index db738a4..7f25b44 100644 --- a/fonctions.php +++ b/fonctions.php @@ -10,10 +10,10 @@ //Ce logiciel est régi par la licence CeCILL-B soumise au droit français et //respectant les principes de diffusion des logiciels libres. Vous pouvez //utiliser, modifier et/ou redistribuer ce programme sous les conditions -//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA //sur le site "http://www.cecill.info". // -//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez //pris connaissance de la licence CeCILL-B, et que vous en avez accepté les //termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. // @@ -26,10 +26,10 @@ //borghesi@unistra.fr // //This software is governed by the CeCILL-B license under French law and -//abiding by the rules of distribution of free software. You can use, +//abiding by the rules of distribution of free software. You can use, //modify and/ or redistribute the software under the terms of the CeCILL-B //license as circulated by CEA, CNRS and INRIA at the following URL -//"http://www.cecill.info". +//"http://www.cecill.info". // //The fact that you are presently reading this means that you have had //knowledge of the CeCILL-B license and that you accept its terms. You can @@ -53,47 +53,35 @@ function connexion_base() return $DB; } - function get_server_name() { - $scheme = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? 'https' : 'http'; - - $get = explode('/', dirname($_SERVER["SCRIPT_NAME"])); - $folder = explode('/', str_replace('\\', '/', dirname(__FILE__))); - $communs = array_intersect($get, $folder); - $base = implode('/', $communs); - $url = sprintf("%s://%s%s", $scheme, STUDS_URL, $base); - - if (!preg_match("|/$|", $url)) { - $url = $url."/"; - } - - return $url; + $scheme = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http'; + return $scheme . '//' . $_SERVER['SERVER_NAME'] . '/'; } function get_sondage_from_id($id) { global $connect; - + // Ouverture de la base de données if(preg_match(";^[\w\d]{16}$;i",$id)) { $sql = 'SELECT sondage.*,sujet_studs.sujet FROM sondage LEFT OUTER JOIN sujet_studs ON sondage.id_sondage = sujet_studs.id_sondage WHERE sondage.id_sondage = '.$connect->Param('id_sondage'); - + $sql = $connect->Prepare($sql); $sondage=$connect->Execute($sql, array($id)); - + if ($sondage === false) { return false; } - + $psondage = $sondage->FetchObject(false); $psondage->date_fin = strtotime($psondage->date_fin); return $psondage; } - + return false; } @@ -104,7 +92,7 @@ function is_error($cerr) if ( $err == 0 ) { return false; } - + return (($err & $cerr) != 0 ); } @@ -129,9 +117,9 @@ function print_header($js = false, $nom_sondage = '') '.NOMAPPLICATION.''; } echo ' - - '; - + + '; + echo ''; } @@ -157,7 +145,7 @@ function check_table_sondage() function validateEmail($email) { $pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD'; - + return (bool)preg_match($pattern, $email); } @@ -206,7 +194,7 @@ function issetAndNoEmpty($name, $tableau = null) if ($tableau === null) { $tableau = $_POST; } - + return (isset($tableau[$name]) === true && empty($tableau[$name]) === false); } @@ -232,7 +220,7 @@ function getUrlSondage($id, $admin = false) $url = get_server_name().'studs.php?sondage='.$id; } } - + return $url; } diff --git a/index.php b/index.php index adb6a6e..e81c2cf 100644 --- a/index.php +++ b/index.php @@ -10,10 +10,10 @@ //Ce logiciel est régi par la licence CeCILL-B soumise au droit français et //respectant les principes de diffusion des logiciels libres. Vous pouvez //utiliser, modifier et/ou redistribuer ce programme sous les conditions -//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA //sur le site "http://www.cecill.info". // -//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez //pris connaissance de la licence CeCILL-B, et que vous en avez accepté les //termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. // @@ -26,10 +26,10 @@ //borghesi@unistra.fr // //This software is governed by the CeCILL-B license under French law and -//abiding by the rules of distribution of free software. You can use, +//abiding by the rules of distribution of free software. You can use, //modify and/ or redistribute the software under the terms of the CeCILL-B //license as circulated by CEA, CNRS and INRIA at the following URL -//"http://www.cecill.info". +//"http://www.cecill.info". // //The fact that you are presently reading this means that you have had //knowledge of the CeCILL-B license and that you accept its terms. You can @@ -72,7 +72,7 @@ echo '
    '."\n"; #echo '

    '. _("Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'

    '."\n".'
    '."\n"; #echo '
    '. _("Make a poll") .''; # '' . -# '' . _('Make a poll') . '' . +# '' . _('Make a poll') . '' . # ''; #echo '
    ' . "\n"; @@ -97,4 +97,4 @@ echo ''."\n"; bandeau_pied(); echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; From ccd3e53ae7d2bb3d00c2dc2f230b0f2c31c0cfa8 Mon Sep 17 00:00:00 2001 From: pascalc Date: Mon, 4 Mar 2013 19:53:27 +0100 Subject: [PATCH 093/129] remplacement des define() par des const plus concis --- variables.php.template | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/variables.php.template b/variables.php.template index 2847125..136d606 100644 --- a/variables.php.template +++ b/variables.php.template @@ -38,58 +38,58 @@ //========================================================================== // Nom du serveur -define('STUDS_URL', 'www.mon_domaine.coop'); +const STUDS_URL = 'www.mon_domaine.coop'; // Nom de l'application -define('NOMAPPLICATION', ""); +const NOMAPPLICATION = ""; // adresse mail de l'administrateur de la base -define('ADRESSEMAILADMIN', ''); +const ADRESSEMAILADMIN = ''; // nom de la base de donnees -define('BASE', ''); +const BASE = ''; // nom de l'utilisateur de la base -define('USERBASE', ""); +const USERBASE = ""; // passwd de l'utilisateur de la base -define('USERPASSWD', ''); +const USERPASSWD = ''; // nom du serveur de base de donnees, laisser vide pour utiliser un socket -define('SERVEURBASE', ''); +const SERVEURBASE = ''; // Type de base de données à utiliser (mysql, postgres, ...) // http://phplens.com/lens/adodb/docs-adodb.htm#drivers -define('BASE_TYPE', ''); +const BASE_TYPE = ''; // Langue par défaut de l'application (à choisir dans $ALLOWED_LANGUAGES) -define('LANGUE', 'fr_FR'); +const LANGUE = 'fr_FR'; // Nom et emplacement du logo -define('LOGOBANDEAU', ''); +const LOGOBANDEAU = ''; // Nom et emplacement du logo de la lettre générée en PDF -define('LOGOLETTRE', ''); +const LOGOLETTRE = ''; // Nom et emplacement du fichier image contenant le titre -//define('IMAGE_TITRE', ''); -define('IMAGE_TITRE', 'images/logo-framadate.png'); +//const IMAGE_TITRE', ''; +const IMAGE_TITRE = 'images/logo-framadate.png'; // Activation des URL propre (true pour activer, false sinon) -define('URL_PROPRE', false); +const URL_PROPRE = false; // Activation de Google Analytics (false si inactif, l'identifiant sinon) -define('GOOGLE_ANALYTICS_ID', false); +const GOOGLE_ANALYTICS_ID = false; // Utilisation de l'identité (REMOTE_USER) fournie par le serveur web -define('USE_REMOTE_USER', true); +const USE_REMOTE_USER = true; if (@file_exists('variables.local.php')) { include('variables.local.php'); } // Studs version -define('STUDS_VERSION', '0.6.6'); +const STUDS_VERSION = 0.6.6; // Do not edit the following $ALLOWED_LANGUAGES = array('fr_FR' => 'french', @@ -97,4 +97,3 @@ $ALLOWED_LANGUAGES = array('fr_FR' => 'french', 'es_ES' => 'spanish', 'de_DE' => 'german' ); -?> From 5e7692f19dc7f7cfac59b2314ee7d7f9f11e8c7c Mon Sep 17 00:00:00 2001 From: pascalc Date: Tue, 5 Mar 2013 10:58:01 +0100 Subject: [PATCH 094/129] fix Issue #4: change les boutons post en get sur la page d'accueil pour permettre de faire des liens directs vers les types de sondages --- index.php | 19 ++++++++--------- infos_sondage.php | 52 +++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 37 deletions(-) diff --git a/index.php b/index.php index adb6a6e..6563d95 100644 --- a/index.php +++ b/index.php @@ -10,10 +10,10 @@ //Ce logiciel est régi par la licence CeCILL-B soumise au droit français et //respectant les principes de diffusion des logiciels libres. Vous pouvez //utiliser, modifier et/ou redistribuer ce programme sous les conditions -//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA //sur le site "http://www.cecill.info". // -//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez //pris connaissance de la licence CeCILL-B, et que vous en avez accepté les //termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. // @@ -26,10 +26,10 @@ //borghesi@unistra.fr // //This software is governed by the CeCILL-B license under French law and -//abiding by the rules of distribution of free software. You can use, +//abiding by the rules of distribution of free software. You can use, //modify and/ or redistribute the software under the terms of the CeCILL-B //license as circulated by CEA, CNRS and INRIA at the following URL -//"http://www.cecill.info". +//"http://www.cecill.info". // //The fact that you are presently reading this means that you have had //knowledge of the CeCILL-B license and that you accept its terms. You can @@ -58,9 +58,6 @@ echo ''."\n"; framanav(); -//debut du formulaire -echo '
    '."\n"; - //bandeaux de tete logo(); bandeau_tete(); @@ -80,21 +77,21 @@ echo '
    '."\n"; echo '
    '; echo '
    '; -echo ''; +echo '' + . _('Schedule an event') . ''; echo '
    '; echo '
    '; echo '
    '; -echo ''; +echo ''. _('Make a poll') . ''; echo '
    '; echo '
    '."\n"; echo '
    '."\n"; -echo ''."\n"; //bandeau de pied //sur_bandeau_pied(); bandeau_pied(); echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; diff --git a/infos_sondage.php b/infos_sondage.php index 1384d1a..e7b8482 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -10,10 +10,10 @@ //Ce logiciel est régi par la licence CeCILL-B soumise au droit français et //respectant les principes de diffusion des logiciels libres. Vous pouvez //utiliser, modifier et/ou redistribuer ce programme sous les conditions -//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +//de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA //sur le site "http://www.cecill.info". // -//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +//Le fait que vous puissiez accéder à cet en-tête signifie que vous avez //pris connaissance de la licence CeCILL-B, et que vous en avez accepté les //termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. // @@ -26,10 +26,10 @@ //borghesi@unistra.fr // //This software is governed by the CeCILL-B license under French law and -//abiding by the rules of distribution of free software. You can use, +//abiding by the rules of distribution of free software. You can use, //modify and/ or redistribute the software under the terms of the CeCILL-B //license as circulated by CEA, CNRS and INRIA at the following URL -//"http://www.cecill.info". +//"http://www.cecill.info". // //The fact that you are presently reading this means that you have had //knowledge of the CeCILL-B license and that you accept its terms. You can @@ -64,7 +64,7 @@ foreach ($session_var as $var) { $_SESSION[$var] = null; } } - + // On initialise également les autres variables $erreur_adresse = false; $erreur_injection_titre = false; @@ -80,37 +80,37 @@ if (issetAndNoEmpty("poursuivre")){ $_SESSION["nom"] = $nom; $_SESSION["adresse"] = $adresse; $_SESSION["commentaires"] = $commentaires; - + unset($_SESSION["studsplus"]); if ($studsplus !== null) { $_SESSION["studsplus"] = '+'; } else { $_SESSION["studsplus"] = ''; } - + unset($_SESSION["mailsonde"]); if ($mailsonde !== null) { $_SESSION["mailsonde"] = true; } else { $_SESSION["mailsonde"] = false; } - + if(validateEmail($adresse) === false) { $erreur_adresse = true; } - + if (preg_match(';<|>|";',$titre)) { $erreur_injection_titre = true; } - + if (preg_match(';<|>|";',$nom)) { $erreur_injection_nom = true; } - + if (preg_match(';<|>|";',$commentaires)) { $erreur_injection_commentaires = true; } - + // Si pas d'erreur dans l'adresse alors on change de page vers date ou autre if ($titre && $nom && $adresse && !$erreur_adresse && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom) { /* @@ -119,28 +119,28 @@ if (issetAndNoEmpty("poursuivre")){ header("Location:choix_date.php"); exit(); } - + if ($creation_sondage_autre !== null || $creation_sondage_autre_x !== null) { header("Location:choix_autre.php"); exit(); } - + if ( $creation_sondage_autre_x !== null) { header("Location:choix_autre.php"); exit(); - } -*/ + } +*/ if ( $poursuivre == "creation_sondage_date" ) { header("Location:choix_date.php"); exit(); - } - + } + if ( $poursuivre == "creation_sondage_autre" ) { header("Location:choix_autre.php"); exit(); - } - - + } + + } } @@ -168,7 +168,7 @@ if(!check_table_sondage()) { //debut du formulaire echo ''."\n"; - + echo '
    '."\n"; echo '
    '. _("You are in the poll creation section.
    Required fields cannot be left blank") .'

    '."\n"; @@ -247,10 +247,10 @@ if ($_SESSION["mailsonde"]) { echo '
    '."\n"; //affichage des boutons pour choisir sondage date ou autre -if ($_POST['choix_sondage']=='date') { - $choix="creation_sondage_date"; -} elseif ($_POST['choix_sondage']=='autre') { - $choix="creation_sondage_autre"; +if ($_GET['choix_sondage'] == 'date') { + $choix = "creation_sondage_date"; +} elseif ($_GET['choix_sondage'] == 'autre') { + $choix = "creation_sondage_autre"; } echo ''; echo '
    '; From 1e93bd44f5057e0a996fda8a410339cec108b68f Mon Sep 17 00:00:00 2001 From: pascalc Date: Tue, 5 Mar 2013 14:50:59 +0100 Subject: [PATCH 095/129] =?UTF-8?q?j'ai=20oubli=C3=A9=20un=20:=20dans=20ge?= =?UTF-8?q?t=5Fserver=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fonctions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fonctions.php b/fonctions.php index 7f25b44..5f84fe8 100644 --- a/fonctions.php +++ b/fonctions.php @@ -56,7 +56,7 @@ function connexion_base() function get_server_name() { $scheme = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http'; - return $scheme . '//' . $_SERVER['SERVER_NAME'] . '/'; + return $scheme . '://' . $_SERVER['SERVER_NAME'] . '/'; } From fabe6864db8fbb7f2923b598e68f14688ee8d411 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Wed, 13 Mar 2013 18:29:48 +0100 Subject: [PATCH 096/129] =?UTF-8?q?Meilleure=20int=C3=A9gration=20de=20la?= =?UTF-8?q?=20framanav?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 + bandeaux.php | 10 +-- choix_date.php | 7 +- framanav | 1 + install.postresql.sql.bak | 147 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 161 insertions(+), 7 deletions(-) create mode 100644 .gitmodules create mode 160000 framanav create mode 100644 install.postresql.sql.bak diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8334e1c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "framanav"] + path = framanav + url = https://github.com/framasoft/framanav.git diff --git a/bandeaux.php b/bandeaux.php index bcd2b20..dbc0c85 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -41,11 +41,11 @@ include_once('fonctions.php'); function framanav() { - if (file_exists($_SERVER['DOCUMENT_ROOT']."/framanav/nav.inc.html")) { - echo "\n".' '."\n";; - echo ''."\n"; - include_once($_SERVER['DOCUMENT_ROOT']."/framanav/nav.inc.html"); - echo ' '."\n"; + if (file_exists($_SERVER['DOCUMENT_ROOT']."/framanav/nav.php")) { + //echo "\n".' '."\n";; + //echo ''."\n"; + include_once($_SERVER['DOCUMENT_ROOT']."/framanav/nav.php"); + //echo ' '."\n"; } } diff --git a/choix_date.php b/choix_date.php index b58e4ca..0349ef7 100644 --- a/choix_date.php +++ b/choix_date.php @@ -41,7 +41,7 @@ session_start(); include_once('creation_sondage.php'); -if (file_exists('bandeaux_local.php')) { +if (is_readable('bandeaux_local.php')) { include_once('bandeaux_local.php'); } else { include_once('bandeaux.php'); @@ -224,11 +224,14 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo ''."\n"; //Debut du formulaire et bandeaux de tete - echo ''."\n"; + framanav(); logo(); bandeau_tete(); bandeau_titre(_("Poll dates (2 on 2)")); sous_bandeau_choix(); + + echo ''."\n"; + //ajout pyg pour la cohérence graphique echo '
    '; diff --git a/framanav b/framanav new file mode 160000 index 0000000..637d5e6 --- /dev/null +++ b/framanav @@ -0,0 +1 @@ +Subproject commit 637d5e6ffa33c5bc11e87dee893c76cbdbb005fb diff --git a/install.postresql.sql.bak b/install.postresql.sql.bak new file mode 100644 index 0000000..b02c955 --- /dev/null +++ b/install.postresql.sql.bak @@ -0,0 +1,147 @@ +--========================================================================== +-- +--Université de Strasbourg - Direction Informatique +--Auteur : Guilhem BORGHESI +--Création : Février 2008 +-- +--borghesi@unistra.fr +-- +--Ce logiciel est régi par la licence CeCILL-B soumise au droit français et +--respectant les principes de diffusion des logiciels libres. Vous pouvez +--utiliser, modifier et/ou redistribuer ce programme sous les conditions +--de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA +--sur le site "http://www.cecill.info". +-- +--Le fait que vous puissiez accéder à cet en-tête signifie que vous avez +--pris connaissance de la licence CeCILL-B, et que vous en avez accepté les +--termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. +-- +--========================================================================== +-- +--Université de Strasbourg - Direction Informatique +--Author : Guilhem BORGHESI +--Creation : Feb 2008 +-- +--borghesi@unistra.fr +-- +--This software is governed by the CeCILL-B license under French law and +--abiding by the rules of distribution of free software. You can use, +--modify and/ or redistribute the software under the terms of the CeCILL-B +--license as circulated by CEA, CNRS and INRIA at the following URL +--"http://www.cecill.info". +-- +--The fact that you are presently reading this means that you have had +--knowledge of the CeCILL-B license and that you accept its terms. You can +--find a copy of this license in the file LICENSE. +-- +--========================================================================== + +-- +-- PostgreSQL database dump +-- + +-- +-- Name: sondage; Type: TABLE; +-- + +CREATE TABLE sondage ( + id_sondage text NOT NULL, + commentaires text, + mail_admin text, + nom_admin text, + titre text, + id_sondage_admin text, + date_fin text, + format text, + mailsonde text +); + + +-- +-- Name: sujet_studs; Type: TABLE; +-- + +CREATE TABLE sujet_studs ( + id_sondage text, + sujet text +); + + +-- +-- Name: user_studs; Type: TABLE; +-- + +CREATE TABLE user_studs ( + nom text, + id_sondage text, + reponses text, + id_users serial NOT NULL +); + + +-- +-- Name: comments; Type: TABLE; +-- + +CREATE TABLE comments ( + id_sondage text, + comment text, + usercomment text, + id_comment serial NOT NULL +); + +CREATE OR REPLACE FUNCTION from_unixtime(integer) RETURNS timestamp AS +'SELECT $1::abstime::timestamp without time zone AS result' LANGUAGE 'SQL'; + +-- +-- Data for Name: sondage; Type: TABLE DATA; +-- + +COPY sondage (id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) FROM stdin; +aqg259dth55iuhwm Repas de Noel du service Stephanie@saillard.com Stephanie Repas de Noel aqg259dth55iuhwmy9d8jlwk 1627100361 D+ +\. + + +-- +-- Data for Name: sujet_studs; Type: TABLE DATA; +-- + +COPY sujet_studs (id_sondage, sujet) FROM stdin; +aqg259dth55iuhwm 1225839600@12h,1225839600@19h,1226012400@12h,1226012400@19h,1226876400@12h,1226876400@19h,1227049200@12h,1227049200@19h,1227826800@12h,1227826800@19h +\. + + +-- +-- Data for Name: user_studs; Type: TABLE DATA; +-- + +COPY user_studs (nom, id_sondage, reponses, id_users) FROM stdin; +marcel aqg259dth55iuhwm 0110111101 933 +paul aqg259dth55iuhwm 1011010111 935 +sophie aqg259dth55iuhwm 1110110000 945 +barack aqg259dth55iuhwm 0110000 948 +takashi aqg259dth55iuhwm 0000110100 951 +albert aqg259dth55iuhwm 1010110 975 +alfred aqg259dth55iuhwm 0110010 1135 +marcs aqg259dth55iuhwm 0100001010 1143 +laure aqg259dth55iuhwm 0011000 1347 +benda aqg259dth55iuhwm 1101101100 1667 +Albert aqg259dth55iuhwm 1111110011 1668 +\. + + +-- +-- Name: sondage_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY sondage + ADD CONSTRAINT sondage_pkey PRIMARY KEY (id_sondage); + + +-- +-- Name: user_studs_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY user_studs + ADD CONSTRAINT user_studs_pkey PRIMARY KEY (id_users); + From 1e9cb9e675fadd9ecfa2c16dd5b2a3d420e53c55 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Wed, 13 Mar 2013 18:30:45 +0100 Subject: [PATCH 097/129] =?UTF-8?q?suppression=20d'un=20fichier=20d'instal?= =?UTF-8?q?l=20postgres=20non=20mis=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.postresql.sql.bak | 147 -------------------------------------- 1 file changed, 147 deletions(-) delete mode 100644 install.postresql.sql.bak diff --git a/install.postresql.sql.bak b/install.postresql.sql.bak deleted file mode 100644 index b02c955..0000000 --- a/install.postresql.sql.bak +++ /dev/null @@ -1,147 +0,0 @@ ---========================================================================== --- ---Université de Strasbourg - Direction Informatique ---Auteur : Guilhem BORGHESI ---Création : Février 2008 --- ---borghesi@unistra.fr --- ---Ce logiciel est régi par la licence CeCILL-B soumise au droit français et ---respectant les principes de diffusion des logiciels libres. Vous pouvez ---utiliser, modifier et/ou redistribuer ce programme sous les conditions ---de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA ---sur le site "http://www.cecill.info". --- ---Le fait que vous puissiez accéder à cet en-tête signifie que vous avez ---pris connaissance de la licence CeCILL-B, et que vous en avez accepté les ---termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. --- ---========================================================================== --- ---Université de Strasbourg - Direction Informatique ---Author : Guilhem BORGHESI ---Creation : Feb 2008 --- ---borghesi@unistra.fr --- ---This software is governed by the CeCILL-B license under French law and ---abiding by the rules of distribution of free software. You can use, ---modify and/ or redistribute the software under the terms of the CeCILL-B ---license as circulated by CEA, CNRS and INRIA at the following URL ---"http://www.cecill.info". --- ---The fact that you are presently reading this means that you have had ---knowledge of the CeCILL-B license and that you accept its terms. You can ---find a copy of this license in the file LICENSE. --- ---========================================================================== - --- --- PostgreSQL database dump --- - --- --- Name: sondage; Type: TABLE; --- - -CREATE TABLE sondage ( - id_sondage text NOT NULL, - commentaires text, - mail_admin text, - nom_admin text, - titre text, - id_sondage_admin text, - date_fin text, - format text, - mailsonde text -); - - --- --- Name: sujet_studs; Type: TABLE; --- - -CREATE TABLE sujet_studs ( - id_sondage text, - sujet text -); - - --- --- Name: user_studs; Type: TABLE; --- - -CREATE TABLE user_studs ( - nom text, - id_sondage text, - reponses text, - id_users serial NOT NULL -); - - --- --- Name: comments; Type: TABLE; --- - -CREATE TABLE comments ( - id_sondage text, - comment text, - usercomment text, - id_comment serial NOT NULL -); - -CREATE OR REPLACE FUNCTION from_unixtime(integer) RETURNS timestamp AS -'SELECT $1::abstime::timestamp without time zone AS result' LANGUAGE 'SQL'; - --- --- Data for Name: sondage; Type: TABLE DATA; --- - -COPY sondage (id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde) FROM stdin; -aqg259dth55iuhwm Repas de Noel du service Stephanie@saillard.com Stephanie Repas de Noel aqg259dth55iuhwmy9d8jlwk 1627100361 D+ -\. - - --- --- Data for Name: sujet_studs; Type: TABLE DATA; --- - -COPY sujet_studs (id_sondage, sujet) FROM stdin; -aqg259dth55iuhwm 1225839600@12h,1225839600@19h,1226012400@12h,1226012400@19h,1226876400@12h,1226876400@19h,1227049200@12h,1227049200@19h,1227826800@12h,1227826800@19h -\. - - --- --- Data for Name: user_studs; Type: TABLE DATA; --- - -COPY user_studs (nom, id_sondage, reponses, id_users) FROM stdin; -marcel aqg259dth55iuhwm 0110111101 933 -paul aqg259dth55iuhwm 1011010111 935 -sophie aqg259dth55iuhwm 1110110000 945 -barack aqg259dth55iuhwm 0110000 948 -takashi aqg259dth55iuhwm 0000110100 951 -albert aqg259dth55iuhwm 1010110 975 -alfred aqg259dth55iuhwm 0110010 1135 -marcs aqg259dth55iuhwm 0100001010 1143 -laure aqg259dth55iuhwm 0011000 1347 -benda aqg259dth55iuhwm 1101101100 1667 -Albert aqg259dth55iuhwm 1111110011 1668 -\. - - --- --- Name: sondage_pkey; Type: CONSTRAINT; --- - -ALTER TABLE ONLY sondage - ADD CONSTRAINT sondage_pkey PRIMARY KEY (id_sondage); - - --- --- Name: user_studs_pkey; Type: CONSTRAINT; --- - -ALTER TABLE ONLY user_studs - ADD CONSTRAINT user_studs_pkey PRIMARY KEY (id_users); - From 3c3729cade2b0d906eda3e25ae6f1c580f87e6c7 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Wed, 13 Mar 2013 19:15:21 +0100 Subject: [PATCH 098/129] Meilleur affichage de sondage par date --- choix_date.php | 4 ++-- style.css | 65 +++++++++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/choix_date.php b/choix_date.php index 0349ef7..ff1ae04 100644 --- a/choix_date.php +++ b/choix_date.php @@ -244,7 +244,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) //debut du tableau qui affiche le calendrier echo '
    '."\n"; echo '
    '."\n"; if (isset($_SESSION['nom'])) { $nom = stripslashes($_SESSION['nom']); diff --git a/style.css b/style.css index 52b6cfe..8c4f8f7 100644 --- a/style.css +++ b/style.css @@ -45,7 +45,7 @@ de Studs. */ @import url('./buttons.css'); -@import url('print.css') print; + body { margin:0; background: #F7FAFE; @@ -327,6 +327,10 @@ div.cadre { text-align:center; margin:0 auto; } +/*information au sujet de la participation au sondage*/ +div.cadre div.information { + margin-bottom:20px; +} /*la table des résultats dans l'affichage de sondage*/ div.cadre table.resultats { background-color: white; From 90525cf0745d064a9a6dbbe7ed6bb987ec7f68de Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 27 Jun 2011 01:37:43 +0200 Subject: [PATCH 048/129] =?UTF-8?q?utilisation=20de=20l'url=20de=20base=20?= =?UTF-8?q?pour=20l'affichage=20de=20l'image=20d'ent=C3=AAte=20(probl?= =?UTF-8?q?=C3=A8me=20lors=20de=20l'utilisation=20d'OpenSondage=20en=20deh?= =?UTF-8?q?ors=20de=20la=20racine)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bandeaux.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandeaux.php b/bandeaux.php index adff57d..c79c3c9 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -81,7 +81,7 @@ function logo () #le bandeau principal function bandeau_tete() { - echo '
    '.NOMAPPLICATION.'
    '."\n"; + echo '
    '.NOMAPPLICATION.'
    '."\n"; } From 6e19094c2b825a9fc2ba88279f5b527d16cc0a5d Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 27 Jun 2011 01:56:30 +0200 Subject: [PATCH 049/129] Suppression du logo et de la framanav lors de l'impression --- print.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/print.css b/print.css index 5070c49..ce6664d 100644 --- a/print.css +++ b/print.css @@ -13,6 +13,10 @@ body { background:none; } +.logo { + display:none; +} + .imprimer { display:none; } @@ -40,4 +44,11 @@ div.cadre tr.ajout_reponse { div.addcomment { display:none; +} + +#framanav { + display:none; +} +#donation { + display:none; } \ No newline at end of file From 5b8cbd3900aca1cc3331649db09bef69a61dd343 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Tue, 28 Jun 2011 02:16:14 +0200 Subject: [PATCH 050/129] =?UTF-8?q?mise=20=C3=A0=20jour=20de=20la=20page?= =?UTF-8?q?=20apropos.php=20sp=C3=A9cifiquement=20pour=20Framadate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apropos.php | 316 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 235 insertions(+), 81 deletions(-) diff --git a/apropos.php b/apropos.php index 78024d2..ac48b86 100644 --- a/apropos.php +++ b/apropos.php @@ -71,96 +71,250 @@ sous_bandeau(); echo '
    '."\n"; echo << +
  • Questions fréquentes
    • + +
  • Mentions légales
    • +
  • Crédits
    • +
  • Licence
    • + +
    +

    Questions fréquentes

    +

    Qu'est-ce que +Framadate ?

    +Framadate est un service en ligne permettant de planifier un +rendez-vous rapidement et simplement. Aucune inscription préalable +n'est nécessaire.
    +Framadate est un service du +réseau Framasoft, mis en place par l'association +Framasoft.
    +

    Quelles différences +entre Framadate et STUdS ! ?

    +Framadate est un service basé sur le logiciel libre OpenSondage. +OpenSondage est lui-même basé sur le logiciel STUdS ! développé +par l'Université de Strasbourg.
    +Après avoir testé STUdS, nous avons décidé d'apporter de nombreuses +modifications, notamment ergonomiques, au code source existant. +L'ensemble de ces modifications ne pouvaient entrer dans le cadre +d'utilisation d'un logiciel déjà en production dans une université et +aurait été (fort logiquement) rejetté de la branche principale de +développement. C'est pourquoi nous avons préferer "forker" +STUdS pour créer OpenSondage.
    +

    Quelles différences +entre Framadate et Doodle +?

    +Aujourd'hui, le danger pour le logiciel libre +ne provient plus de Microsoft ou d'Adobe et de leurs logiciels qu'on +installe sans avoir le code source, mais des applications web "dans les +nuages" proposés comme services par des entreprises.
    +
    +Cela pour au moins 4 raisons :
    +1- sécurité +: aucune garantie ne peut vous être apportée quand au fait les données +soient correctement sauvegardées et protégées, ni que le
    +code source "officiel" soit réellement celui que vous utilisez en ligne.
    +2- fiabilité/perennité +: le service peut tomber en panne, et rien ne garanti que la +société Doodle sera toujours là demain et maintiendra le site
    +3- propriété des données +: beaucoup d'entreprises s'autoproclament co-détentrices de vos +contenus "clouds" (ex: Facebook impose une clause de partage des droits +sur vos contenus, vos données, vos photos)
    +4- vie privée +: une entreprise - comme Doodle - doit gagner de l'argent (et il n'y a +aucun mal à cela). Mais si elle est en difficulté financière, elle peut +décider de changer ses conditions d'utilisation et vendre vos données à +des tiers (alors que Framasoft, asso loi 1901 d'intérêt général, n'aura +jamais d'intérêt à le faire).
    +
    +A cela s'ajoute le problème, plus éthique, de la publicité.
    +
    +Les problèmes 1 et 2 concernent aussi Framadate.org : rien ne garanti +la sécurité et la fiabilité du service (d'autant plus que les +administrateurs systèmes de Framasoft sont bénévoles).
    +
    +Par contre :
    +- les problemes 3 et 4 ne sont pas d'actualité avec Framadate, exploité +par une association loi 1901
    +- et surtout, Framadate fait partie d'un projet plus global +(Framatools) qui vise justement à sensibiliser le grand public à la +problématique du "cloud". Cela peut sembler paradoxal, mais bien que +proposant le service Framadate.org, nous allons surtout encourager les +organisations à installer leur propre instance du logiciel afin de +maitriser totalement leurs données.
    +
    +Bref, oui Framadate est inspiré de Doodle.com, et oui Doodle est un +excellent service. Mais Doodle reste une "boite noire" pour +l'utilisateur final qui va sur doodle.com. Framadate.org essaie de +répondre, modestement, à cette problématique en montrant que des +alternatives libres existent et qu'on peut les installer "chez soi".
    +

    Mon sondage +restera-t-il longtemps en ligne ?

    +Le service Framadate est proposée gratuitement par l'association +Framasoft.
    +Framasoft +s'engage à maintenir le service "aussi longtemps que possible", mais ne +peut fournir aucune garantie de date. Si cela ne vous convient pas, +nous vous +encourageons sincèrement à installer vous-même Framadate et à maintenir +vous-même votre propre service. +
    +

    Mentions légales
    +

    Éditeur et Responsable de la publication

    - - -

    Alexis Kauffmann (contact)

    - - -

    Les propos tenus sur ce site ne représentent que et uniquement l’opinion de leur auteur, et n’engagent pas les sociétés, entreprises ou collectifs auxquels il contribue ou dont il peut être associé ou employé.

    - - +

    Editeur : Association Framasoft (cf "Hébergement")

    +

    Responsable de la publication : Alexis Kauffmann 

    +

    Vous pouvez rentrer en contact avec l'Editeur et le +Responsable de la publication en passant par la page "contact".

    +

    Les propos tenus sur ce site ne représentent que et uniquement +l’opinion de leur auteur, et n’engagent pas l'association Framasoft, +les sociétés, entreprises ou collectifs auxquels il contribue ou dont +il peut être associé ou employé.

    Hébergement

    - - -

    Ce site est hébergé par Framasoft, c/o T. CEZARD, 5 avenue Stephen Pichon 75013 Paris, France. -Cet hébergeur possède à ce jour les éléments d’identification personnelle concernant l'Éditeur (voir http://www.framasoft.net/article4736.html).

    - - +

    Ce site est hébergé par Framasoft, c/o T. CEZARD, 5 avenue +Stephen Pichon 75013 Paris, France. +Cet hébergeur possède à ce jour les éléments d’identification +personnelle concernant l'Éditeur (voir http://www.framasoft.net/article4736.html).

    Données personnelles

    - - -

    Les données personnelles collectées par Framadate sont uniquement destinées à un usage interne. En aucun cas ces données ne seront cédées ou vendues à des tiers. -Conformément à l’article 39 de la loi du 6 janvier 1978 relative à l’informatique, aux fichiers et aux libertés, vous avez un droit d’accès, de modification et d’opposition sur vos données personnelles enregistrées par le blog. +

    Les données personnelles collectées par Framadate sont +uniquement destinées à un usage interne. En aucun cas ces données ne +seront cédées ou vendues à des tiers. +Conformément à l’article 39 de la loi du 6 janvier 1978 relative à +l’informatique, aux fichiers et aux libertés, vous avez un droit +d’accès, de modification et d’opposition sur vos données personnelles +enregistrées par le blog. Dans ce cas, utilisez le formulaire de contact.

    - -

    Conditions de modération/suppression de sondages

    - - -

    Les sondages de Framadate bénéficient d'une URL aléatoire, mais publique. Si vous souhaitez supprimer un sondage, utilisez l'adresse d'aministration fournie à la création. Vous pouvez exceptionnellement demander la suppression d'un sondage en utilisant la page de contact.

    - +

    Les sondages de Framadate bénéficient d'une URL aléatoire, +mais publique. Si vous souhaitez supprimer un sondage, utilisez +l'adresse d'aministration fournie à la création. Vous pouvez +exceptionnellement demander la suppression d'un sondage en utilisant la +page de contact.

    Notification des contenus litigieux

    - -

    Conformément à l’article 6 I 5° LCEN, la connaissance des contenus litigieux est présumée acquise par L’Éditeur lorsqu’il lui est notifié, par lettre recommandée avec accusé de réception adressée au siège social de L’Éditeur, la totalité des éléments suivants (i) la date de la notification ; (ii) si le notifiant est une personne physique : ses nom, prénoms, profession, domicile, nationalité, date et lieu de naissance ; si le notifiant est une personne morale : sa forme, sa dénomination, son siège social et l’organe qui la représente légalement ; (iii) les nom et domicile du destinataire ou, s’il s’agit d’une personne morale, sa dénomination et son siège social ; (iv) la description des faits litigieux et leur localisation précise ; (v) les motifs pour lesquels le contenu doit être retiré, comprenant la mention des dispositions légales et des justifications de faits ; (vi) la copie de la correspondance adressée à l’auteur ou à l’éditeur des informations ou activités litigieuses demandant leur interruption, leur retrait ou leur modification, ou la justification de ce que l’auteur ou l’éditeur n’a pu être contacté.

    - - -

    A défaut d’envoi de la totalité de ces éléments, la notification ne sera pas prise en compte par L’Éditeur et ce dernier ne pourra en conséquence être présumé informé d’un contenu litigieux.

    - - -

    L’Éditeur se réserve le droit d’engager des poursuites à l’encontre de toute personne ayant usé abusivement du droit réservé par l’article 6 I 4° LCEN. L’Éditeur vous rappelle que toute personne qui aurait présenté un contenu ou une activité comme étant illicite dans le but d’en obtenir le retrait ou d’en faire cesser la diffusion alors qu’elle a connaissance du caractère inexact de cette information, est susceptible d’encourir une peine d’un an d’emprisonnement et de 15.000 €uros d’amende.

    - - +

    Conformément à l’article 6 I 5° LCEN, la connaissance des +contenus litigieux est présumée acquise par L’Éditeur lorsqu’il lui est +notifié, par lettre recommandée avec accusé de réception adressée au +siège social de L’Éditeur, la totalité des éléments suivants (i) la +date de la notification ; (ii) si le notifiant est une +personne physique : ses nom, prénoms, profession, domicile, +nationalité, date et lieu de naissance ; si le notifiant est +une personne morale : sa forme, sa dénomination, son siège +social et l’organe qui la représente légalement ; (iii) les +nom et domicile du destinataire ou, s’il s’agit d’une personne morale, +sa dénomination et son siège social ; (iv) la description des +faits litigieux et leur localisation précise ; (v) les motifs +pour lesquels le contenu doit être retiré, comprenant la mention des +dispositions légales et des justifications de faits ; (vi) la +copie de la correspondance adressée à l’auteur ou à l’éditeur des +informations ou activités litigieuses demandant leur interruption, leur +retrait ou leur modification, ou la justification de ce que l’auteur ou +l’éditeur n’a pu être contacté.

    +

    A défaut d’envoi de la totalité de ces éléments, la +notification ne sera pas prise en compte par L’Éditeur et ce dernier ne +pourra en conséquence être présumé informé d’un contenu litigieux.

    +

    L’Éditeur se réserve le droit d’engager des poursuites à +l’encontre de toute personne ayant usé abusivement du droit réservé par +l’article 6 I 4° LCEN. L’Éditeur vous rappelle que toute personne qui +aurait présenté un contenu ou une activité comme étant illicite dans le +but d’en obtenir le retrait ou d’en faire cesser la diffusion alors +qu’elle a connaissance du caractère inexact de cette information, est +susceptible d’encourir une peine d’un an d’emprisonnement et de 15.000 +€uros d’amende.

    Licences, droits de reproduction

    - - -

    L'application Framadate, basé sur le logiciel OpenSondage, lui-même basé sur STUdS, est publiée sous licence CECILL-B. Les contenus (sondages) sont publiés sous licence Creative Commons BY-SA. Cela signifie que si l'adresse de votre sondage est connue d'un individu, vous autorisez cette personne à utiliser, partager, modifier votre sondage. Si vous souhaitez des sondages 100% privés et avec votre propre licence, installez votre propre logiciel de sondage et n'utilisez pas Framadate.org.

    - - -

    Crédits

    - +

    L'application Framadate, basé sur le logiciel OpenSondage, +lui-même basé sur STUdS, est publiée sous licence libre CeCILL-B. +Les contenus (sondages) sont publiés sous licence Creative Commons +BY-SA. Cela signifie que si l'adresse de votre sondage est connue d'un +individu, vous autorisez cette personne à utiliser, partager, modifier +votre sondage. Si vous souhaitez des sondages 100% privés et avec votre +propre licence, installez votre propre logiciel de sondage et +n'utilisez pas Framadate.org.

    +
    +

    Crédits

    +Application d'origine
    +
    +L'application Framadate est une instance du logiciel STUdS ! +développé à l'Université de Strasbourg depuis 2008.
    +
    +Pour les besoins de Framadate, STUdS a fait l'objet d'un fork par +l'équipe Framasoft. Les sources sont disponibles sur le Github OpenSondage.
    +
    +Technologies utilisées
    +
    +- PHP
    +- MySQL
    +- Apache
    +- Subversion
    +- iCalcreator
    +- FPDF
    +- Icônes : Deleket, +PixelMixer et DryIcons
    +
    +Compatibilités des navigateurs
    +
    +- Firefox
    +- Opéra
    +- Konqueror
    +- Links
    +- Safari
    +- IE
    +
    +Validations des pages
    +
    +- Toutes les pages disposent de la validation HTML 4.01 Strict du W3C.
    +- La CSS dispose de la validation CSS 2.1 du W3C. +

    Valid HTML 4.01 StrictCSS Valide ! +

    +Propositions améliorations de Framadate
    +
    +Si quelque chose venait à vous manquer, vous pouvez nous en faire part +via le formulaire en ligne. +
    +Les dernières améliorations de Framadate sont visibles dans le fichier CHANGELOG.
    +
    +Remerciements
    +
    +STUdS ! : +Pour leurs contributions techniques ou ergonomiques : Guy, Christophe, +Julien, Pierre, Romaric, Matthieu, Catherine, Christine, Olivier, +Emmanuel et Florence
    +Framadate +:  Simon Leblanc (développement principal), Pierre-Yves Gosset +(développement, graphisme), la communauté Framasoft.
    +
    +

    Licence

    +Framadate est placé, comme STUdS !, +sous la licence logicielle libre CeCILL-B.
    +
    mentions; - -if (NOMAPPLICATION!="STUdS !") { - echo 'Application d\'origine

    '."\n"; - echo 'L\'application '.NOMAPPLICATION.' est une instance du logiciel STUdS ! développé à l\'Université de Strasbourg depuis 2008.

    '."\n"; - echo "Pour les besoins de Framadate, STUdS a fait l'objet d'un fork par l'équipe Framasoft. Les sources sont disponibles sur le Github OpenSondage.

    \n"; -} - -echo 'Licence Logicielle de '.NOMAPPLICATION.'

    '."\n"; -echo NOMAPPLICATION.' est placé sous la licence logicielle libre CeCILL-B.

    '."\n"; - -echo 'Technologies utilisées

    '."\n"; -echo '- PHP
    '."\n"; -echo '- PostgreSQL
    '."\n"; -echo '- Apache
    '."\n"; -echo '- Subversion
    '."\n"; -echo '- iCalcreator
    '."\n"; -echo '- FPDF
    '."\n"; -echo '- Icônes : Deleket, PixelMixer et DryIcons

    '."\n"; - -echo 'Compatibilités des navigateurs

    '."\n"; -echo '- Firefox
    '."\n"; -echo '- Opéra
    '."\n"; -echo '- Konqueror
    '."\n"; -echo '- Links
    '."\n"; -echo '- Safari
    '."\n"; -echo '- IE

    '."\n"; - -echo 'Validations des pages

    '."\n"; -echo '- Toutes les pages disposent de la validation HTML 4.01 Strict du W3C.
    - La CSS dispose de la validation CSS 2.1 du W3C.'."\n"; -echo '

    '."\n"; -echo 'Valid HTML 4.01 StrictCSS Valide !'."\n"; -echo'

    '."\n"; - -echo 'Propositions améliorations de '.NOMAPPLICATION.'

    '."\n"; -echo 'Si quelquechose venait à vous manquer, vous pouvez nous en faire part via le formulaire en ligne.
    '."\n"; -echo 'Les dernières améliorations de '.NOMAPPLICATION.' sont visibles dans le fichier CHANGELOG.

    '."\n"; - -echo 'Remerciements

    '."\n"; -echo 'Pour leurs contributions techniques ou ergonomiques : Guy, Christophe, Julien, Pierre, Romaric, Matthieu, Catherine, Christine, Olivier, Emmanuel et Florence

    '."\n"; - echo '
    '."\n"; bandeau_pied_mobile(); From 894b526effa22288fec4be4845869f95390fdff2 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sat, 2 Jul 2011 23:13:56 +0200 Subject: [PATCH 051/129] Fix issue #11 : Google Analytics n'est plus obligatoire --- bandeaux.php | 18 +++++++++--------- variables.php.template | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/bandeaux.php b/bandeaux.php index c79c3c9..f7d9f27 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -51,21 +51,21 @@ function framanav() } function gAnalytics() { -echo << - var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-896440-11']); - _gaq.push(['_trackPageview']); + _gaq.push([\'_setAccount\', \''.GOOGLE_ANALYTICS_ID.'\']); + _gaq.push([\'_trackPageview\']); (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true; + ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\'; + var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s); })(); - -gAnalytics; +'; + } } diff --git a/variables.php.template b/variables.php.template index c822c90..e37ef0b 100644 --- a/variables.php.template +++ b/variables.php.template @@ -78,6 +78,9 @@ define('LOGOLETTRE', ' Date: Sat, 2 Jul 2011 23:41:10 +0200 Subject: [PATCH 052/129] Fix issue #12 : correction de l'affichage de l'ajout d'une colonne --- adminstuds.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index 99833cf..2cbf51b 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -198,11 +198,14 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo ''."\n"; - echo '
    '."\n"; + echo '
    '."\n"; echo "

    " . _("Column's adding") . "



    "."\n"; if ($dsondage->format=="A"||$dsondage->format=="A+"){ - echo _("Add a new column") .' :


    '."\n"; + echo _("Add a new column") .' :
    '; + echo '

    '; + echo ''."\n"; + echo ''."\n"; } else { //ajout d'une date avec creneau horaire echo _("You can add a new scheduling date to your poll.
    If you just want to add a new hour to an existant date, put the same date and choose a new hour.") .'

    '."\n"; @@ -257,8 +260,9 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo ''."\n"; echo ''."\n"; - echo '

    '."\n"; - echo' '."\n"; + echo '

    '; + echo ''."\n"; + echo ''."\n"; } echo ''."\n"; From 90d8e1c6d060e39e86ef1538fb75c3cd2aca32d7 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 3 Jul 2011 00:10:13 +0200 Subject: [PATCH 053/129] Fix issue #15 : suppression d'un sondage par l'utilisateur actif et mise en forme de la suppression du sondage --- adminstuds.php | 52 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index 2cbf51b..a111504 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -280,20 +280,53 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { die(); } +if (isset($_POST["suppressionsondage_x"])) { + print_header(true); + echo ''."\n"; + framanav(); + logo(); + bandeau_tete(); + bandeau_titre(_("Confirm removal of your poll")); + sous_bandeau(); + echo '
    '."\n"; + echo '
    '."\n"; + echo '
    '."\n"; + echo "

    " . _("Confirm removal of your poll") . "



    "."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo '



    '."\n"; + echo '
    '."\n"; + + echo '
    '."\n"; + echo '
     
    '; + + bandeau_pied(); + + echo''."\n"; + echo ''."\n"; + die(); +} + //action si bouton confirmation de suppression est activé if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x"])) { $nbuser=$user_studs->RecordCount(); $date=date('H:i:s d/m/Y:'); //destruction des données dans la base SQL - $sql = 'DELETE FROM sondage LEFT INNER JOIN sujet_studs ON sujet_studs.id_sondage = sondage.id_sondage '. - 'LEFT INNER JOIN user_studs ON user_studs.id_sondage = sondage.id_sondage '. - 'LEFT INNER JOIN comments ON comments.id_sondage = sondage.id_sondage '. - 'WHERE id_sondage = '.$connect->Param('numsondage'); + $sql = 'DELETE s, su, u, c + FROM + sondage s LEFT JOIN sujet_studs su + ON su.id_sondage = s.id_sondage + LEFT JOIN user_studs u + ON u.id_sondage = s.id_sondage + LEFT JOIN comments c + ON c.id_sondage = s.id_sondage + WHERE s.id_sondage = '.$connect->Param('numsondage'); $sql = $connect->Prepare($sql); if ($connect->Execute($sql, array($numsondage))) { // on ecrit dans le fichier de logs la suppression du sondage - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\t$nbuser\t$dsujets->sujet\n", 3, 'admin/logs_studs.txt'); + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'admin/logs_studs.txt'); //envoi du mail a l'administrateur du sondage mail ($adresseadmin, @@ -311,9 +344,9 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" bandeau_tete(); bandeau_titre(_("Make your polls")); - echo '
    '."\n"; + echo '
    '."\n"; print "

    " . _("Your poll has been removed!") . "



    "; - print _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; + print _("Back to the homepage of ") . ' '.NOMAPPLICATION.'.'."\n"; echo '


    '."\n"; echo '
    '."\n"; sur_bandeau_pied(); @@ -1196,11 +1229,6 @@ echo ''."\n"; echo _("Remove your poll") .' :

    '."\n"; -if (isset($_POST["suppressionsondage"])) { - echo _("Confirm removal of your poll") .' : '."\n"; - echo '

    '."\n"; -} - echo ''."\n"; if ($dsondage->format == "D" || $dsondage->format == "D+") { From 030051921b8da6cb57aab40eae704076303b17e7 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Sun, 3 Jul 2011 01:57:20 +0200 Subject: [PATCH 054/129] =?UTF-8?q?Fix=20issue=20#17=20:=20ajout=20d'un=20?= =?UTF-8?q?reply-to=20+=20v=C3=A9rification=20adresse=20mail=20+=20mise=20?= =?UTF-8?q?en=20forme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contacts.php | 13 +++++++++---- locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 19309 -> 19391 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 4 ++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/contacts.php b/contacts.php index a7b1842..0e4b306 100644 --- a/contacts.php +++ b/contacts.php @@ -52,7 +52,10 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse $message=str_replace("\\","",$_POST["question"]); //envoi des mails - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\r\nContent-Transfer-Encoding: 8bit"; + if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { + $headers .= "\r\n".'Reply-To: '.$_POST['adresse_mail']; + } mail (ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers); if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; @@ -122,6 +125,10 @@ framanav(); echo '

    '."\n"; echo _("Your email address ") .' :
    '."\n"; echo ''."\n"; + + if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && empty($_SESSION["adresse_mail"]) === false && validateEmail($_SESSION["adresse_mail"]) === false) { + echo ' '. _("The address is not correct!") .''; + } echo '

    '; @@ -133,9 +140,7 @@ framanav(); } echo '


    '."\n"; - echo ''."\n"; - echo ''."\n"; - echo '
    '. _("Send your question") .'
    '."\n"; + echo ''; echo '


    '."\n"; echo '
    '."\n"; echo ''."\n"; diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo index 1c90d14b8c0c88fb0999d4cd9ef63d8922a49db4..b4a2568ca7bbf597dd3ac7bdf46ae7a12b74f7c5 100644 GIT binary patch delta 3335 zcmXxld2miw7{~GRN+Kd}B8x~xs3al@VvRL~L?vPkA+?MlmX?U3+9Jf8&_p9Cc0wNEF~gh_Ss28LJZyt2uo+gO8mz&lxDPkGj5*}g)98in%ftYjg5fw9U&12v z$L)@LQSBVTP@Zp2P@paIEvlhgsGioNM(P`4Oh@eDI0@B&2i3t+)cqTrdNu0)T2vCx zp)z~P@mEx4d_y_U^Gyp18gYaUU>{V2spyU4uodQ@reXmq)di^g%1|lYi?nUdqB3y} zb>GjZ4n4yt3~6Z(APGI{NiqcnYlfmyH4)W7E^?1qh;4BVzK%OFlPT~EGv;OL**rxV zS%Ranz^R`{oxhA4$Ybn<4R{yh!^wX;3Vuu!ZJBt~$Wu@^j6roI8`ZH~=llYELcI_* zfQ1ZC*DrNkiFc?MW8;0KM{8&S>bfPU`<6wJe>!7|IG~YMqUr}wDL#kF%vEI2=057W zXQ;V%lYdP~7;4c)qXsYlwU$OW^{J?K<~zp=aTfLU9_PeUR72jZl&u(y8hI^hPQO4u zynu;#4e5h%F)!R|A|3nT8`LMDQvVIM$NLzK-lRJQ8qMPF| z2d7{yrlA+z9)Rh{U`#P8<<+PuIgZN2MO3C9qB8mfXW$Fe`RN^unT;!Ol-~cl6yiCM z7|T})bFdp0V;mkqe&#wm+A#k*#*j8Gq6}<;W6=x8V{gnsl4B~6F_?qsjhE2}zf+y( zn;R6KyI8TP)q0)YC3BJ6M3vYX_aJ>YS5O`K%kdwiDdWRvWEa%im5mzU zJa!t;X7u!;aEgL@^oL^uHl_YI<}oxEPg6agm8XW5px%-)REBCC&!ZOWpQyLTtE=6y z5L8AYP*atKTw-Q-CI1-|HgO;oZ{Q$|B>!>>s$<*G535kGRV`}nPdZ-37Sw-1W#l=M z1kN^p_tEDMwgTWYsn$q4L3IP;SF$l+^=4=Ljjcf4+Ya^X`(u1PN zqo!gY=HpP*13p7uAafG+pqrS3_wgwX=woLlv9H~M@fgN&&uj|KDHNbmSb}P33o>YP z9M{l+N2rGL``fGhE!31O!)}~kjmp?j-ce=pBI^1psP=zEP0f95jm?r92jnr)6x5SJ zs0Okf^HCR;phj4YT0FJR@h?$}@O!6T@6>$<+U>MMt%1H+j=8AJ)}sd6k_Gmg-v161 zv>1X?>;~JS<|qmInRIsQSP7~_Rj5UD0_Wmw)W|Xh+YiXcIO-Ov1E*2v>u@MGA3~>a z4DRw!D5YRwLaP0MuTZJ`0k!(?;25k!Et;e>I}<}tnVW!WFb~zyUAO{IV|y3pcxpWL zNw3(S-eP={daGf~e;$Q03a?=U&cdnbc2Cb>6m_o*yJN8!O?@!3p3F?t8rY6{y>?>_ z9!1ux$sTUZSzL=+jKedHVVRg})a!jcll+gS5I(~GK+HjX7H3BCXSZ!;*YB=pC|`ZN{9Dr=*E_~iYR@`xQoXF?kv zi^l)PHMoq>DqKWNB&rB)2W-sSxRt1N>hmy{uq>B5)Te;b2Ucr$jL#-Yl~$@dG~ghm zj|goWtz51uq4bWm+#M5K-FVdgzfy67b;zBZ@F68H=gdsh2WlZvM8pzIbK~^vv4R6) zrtPG*l-NsXt0A<^5(sUjM5o4*z3T~Gh$h5t;(bC}p^fQ>9~1hHerjzDnC{wUJqc(N zyVf}`iV1%rjp$9RBVHwTSv>;7!``K&Z4|M9(3;$LY+B%hz+-W3*F_yGPr2v*4@7Hb AZU6uP delta 3319 zcmXxm32;qU9LMqVBtepw$kH@Clt^S#u|!HJ5=!i3iZ)CpAsw;`p_VrFw3bwfrB6bO z5?hs`q%)zS_KwbIXD~*qi;ht>)1hUMnwn|9zue(~}& zV=%6?)}Y#{!$_WQ_EMlN(}-&5BC12bphnt+@fZ`~I0Dr`IjV#6QTKaoeJ$$#O{gRu zL1p%Y^*SmuO}ftW&3_a$;-E<9hImwiz0e;s@p&AMnu=T`o2D3b-y&2>YmlbQ7pP2} zMcsD^)uB5WgDswO1`vl{^`sjG25C}JsTziAARD>I_h(v5@doud*nA)9(HhD{eXjs@U!jNm(-||H6B=n1s=gVO;v=ZcoJIy~uAshm z2Q~LkQBxAYJZRBHpazhPT1)+HeKe|_srGys7EoX8wHI!p8hVJe=wiiaDau(%H#O1nPPMzKGpXBc6ieu@pC8Bl2gmS&7rN|0^g=uX z1uJm~Uc>(Aq5E{+OhTo4E@~=Pp)#-ym7(LPOrFPlyo|b@8fVNKI3CB~mzb#i@9N4! zIgyM#a1tiqa^%k(;Da{I6>Ae}@w6v@Eie}SFdow|8A*=GNBVA-pg-=!0NiWq2l0v5 zWlTKNvi$OnBl zg_w$K(5oJup&&0{OZ*;-8QN7_&tS!=p)Azy$VFvno^=aqk)A{CnroQVhfj)OM;w&3(0XH@2aE0+o^PkinY=s19`K z>2xR#HS$zcCUa2j%;?GdYi<^ELaAMfyi?2}WFwdhs5$%tmD-?QPQ4du`%OeG%5u~i zsm4Bd81;U*jq1o>7>-S-DGg-Hg1KuyUQ?7{WPsEn;(k1CVfP~YE$dcfzXscFD=_%nL&G13vQ2_N7zkYLR~eK7|$ z!nvr$Q)$nyLoLF6wtm{ye?oQS0cs5dzsw*o4VBr`sDa+WKk*-QYyaP3<*C8@s5xpq zh#wyG@Sz5CP#vnkLR^g+(IZsDp25y;$V5H32zA|uL-8n*MDrAPV4n=G;WcdMrBIUT zq-;5A)mP&<^r05ZO;iT%q2{i|5U0Vms18oRx3LI2yZHAF6REd+#d+oSzzXW;uo(Le zW98!x^cGME9PaeA3}dJtMveFicEP*IIx=Bd&fI5VDD`aIj`_$sHLel-K42P7#>beB zV@EpMy9&orKaXh`Ig0%AZZIQ9IsYOpKrN09*a{C}3v96UuW$nOGZ>GNqn!@+M}O+M zs0>cG^+F^e%||t#>a+$pmC$qN=ry*9f)4#UX|xN8_X+j9gm{bCv!H=CG5 zY$bH;b1-jW4e_b17vVJGLtnT%GGGyn+YB3d~^8LGD^#R zE8Vf-pERF!ey3Di<2&IVkn|BHKYL|5>cvz}Xpwd$vItGjPG3w&Z0>eS^NC%Aj%|dN zS&}ODNPbp8-e}GL8E8Ux5UU9tl@6vKZXxvk-0Q0g$#ZS=xkB4_U16__B}6bWgwP6F nNxVkX`7%SJqn1+AF@`83v?h1gmxbOAtuOC5E2iFWaHIQw_ikZ2 diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 4251b44..37036f6 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -738,6 +738,10 @@ msgstr "Votre nom" msgid "Your email address " msgstr "Votre adresse électronique " +#: contacts.php:127 +msgid "The address is not correct!" +msgstr "L'adresse saisie n'est pas correcte !" + #: contacts.php:129 msgid "Question" msgstr "Question" From 7ec1a2fc8e984c755d9e0f1bce477d999840f4d4 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 4 Jul 2011 11:36:31 -0700 Subject: [PATCH 055/129] fix issue #19 : convert html entities in the mail send --- studs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studs.php b/studs.php index ed7649e..1bf36d7 100644 --- a/studs.php +++ b/studs.php @@ -308,7 +308,7 @@ if ($testmodifier) { if ($dsondage->mailsonde=="yes") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : $dsondage->titre", "\"$data->nom\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES), "\"".htmlspecialchars_decode($data->nom, ENT_QUOTES)."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); } } From be16c63fd7a63474330cdc07eaaa81b057a46e34 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 4 Jul 2011 21:33:58 +0200 Subject: [PATCH 056/129] First try for issue #13 : OK with Firefox and IE>=8 but not with Webkit --- print.css | 17 +++++++++++++++++ studs.php | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/print.css b/print.css index ce6664d..0e702e0 100644 --- a/print.css +++ b/print.css @@ -42,6 +42,23 @@ div.cadre tr.ajout_reponse { display:none; } +table { + page-break-inside:auto +} + +tr { + page-break-inside:avoid; + page-break-after:auto; +} + +thead { + display:table-header-group; +} + +tfoot { + display:table-footer-group; +} + div.addcomment { display:none; } diff --git a/studs.php b/studs.php index 1bf36d7..e80a2ec 100644 --- a/studs.php +++ b/studs.php @@ -266,7 +266,7 @@ echo _("If you want to vote in this poll, you have to give your name, choose the echo '
    '."\n"; // Debut de l'affichage des resultats du sondage -echo ''."\n"; +echo '
    '."\n".''; //On récupere les données et les sujets du sondage $nblignes = $user_studs->RecordCount(); @@ -426,6 +426,8 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; } +echo ''."\n".''."\n"; + //Usager pré-authentifié dans la liste? $user_mod = false; @@ -532,6 +534,8 @@ for ($i=0; $i < $nbcolonnes; $i++) { } } +echo ''."\n".''."\n"; + // Affichage des différentes sommes des colonnes existantes echo ''."\n"; echo ''."\n"; @@ -563,6 +567,7 @@ for ($i=0; $i < $nbcolonnes; $i++) { } echo ''."\n"; +echo ''."\n"; echo '
    '. _("Addition") .'
    '."\n"; echo '
    '."\n"; From b033b8121d857ecff728c1a5cc0f8b1c9b18af60 Mon Sep 17 00:00:00 2001 From: framatools Date: Mon, 4 Jul 2011 22:08:39 +0200 Subject: [PATCH 057/129] Fix really issue #19 :-) --- studs.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/studs.php b/studs.php index e80a2ec..ceaeb15 100644 --- a/studs.php +++ b/studs.php @@ -173,8 +173,8 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; mail ("$dsondage->mail_admin", - "[".NOMAPPLICATION."] "._("Poll's participation")." : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES)."", - htmlspecialchars_decode("\"$nom\" ", ENT_QUOTES). + "[".NOMAPPLICATION."] "._("Poll's participation")." : ".utf8_decode(html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'))."", + utf8_decode(html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8')). _("has filled a line.\nYou can find your poll at the link") . " :\n\n". getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n". NOMAPPLICATION, @@ -308,7 +308,7 @@ if ($testmodifier) { if ($dsondage->mailsonde=="yes") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES), "\"".htmlspecialchars_decode($data->nom, ENT_QUOTES)."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".utf8_decode(html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')), "\"".utf8_decode(html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8'))."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); } } @@ -669,4 +669,4 @@ echo ''; // ajout pyg cohérence graphique bandeau_pied_mobile(); // Affichage du bandeau de pied echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; From 52f954ed5ec268417f65145e956b2efbacdfa5c3 Mon Sep 17 00:00:00 2001 From: framatools Date: Mon, 4 Jul 2011 22:24:38 +0200 Subject: [PATCH 058/129] UTF 8 error while fix issue #19 : damn issue... --- studs.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/studs.php b/studs.php index ceaeb15..f113838 100644 --- a/studs.php +++ b/studs.php @@ -173,8 +173,8 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; mail ("$dsondage->mail_admin", - "[".NOMAPPLICATION."] "._("Poll's participation")." : ".utf8_decode(html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'))."", - utf8_decode(html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8')). + "[".NOMAPPLICATION."] "._("Poll's participation")." : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')."", + html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8'). _("has filled a line.\nYou can find your poll at the link") . " :\n\n". getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n". NOMAPPLICATION, @@ -308,7 +308,7 @@ if ($testmodifier) { if ($dsondage->mailsonde=="yes") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".utf8_decode(html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')), "\"".utf8_decode(html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8'))."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'), "\"".html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8')."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); } } From de092852c8dc53528a7568f0c15e9289ba4a8765 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 3 Oct 2011 01:51:40 +0200 Subject: [PATCH 059/129] =?UTF-8?q?Ajout=20du=20robots.txt=20pour=20fix?= =?UTF-8?q?=C3=A9=20l'issue=20#26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- robots.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 robots.txt diff --git a/robots.txt b/robots.txt new file mode 100644 index 0000000..c95a7c6 --- /dev/null +++ b/robots.txt @@ -0,0 +1,7 @@ +User-agent: * +Allow: / +Allow: /index.php +Allow: /apropos.php +Allow: /contacts.php +Allow: /infos_sondage.php +Disallow: /* \ No newline at end of file From 63837ebd5587a417b318c9c4385be109865479dd Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Mon, 3 Oct 2011 02:16:12 +0200 Subject: [PATCH 060/129] fix de l'issue #14 --- admin/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/index.php b/admin/index.php index 34e9202..825f02a 100644 --- a/admin/index.php +++ b/admin/index.php @@ -107,7 +107,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { $i++; } -$sondage=$connect->Execute("select * from sondage"); +$sondage=$connect->Execute("select * from sondage ORDER BY date_fin ASC"); $nbsondages=$sondage->RecordCount(); echo $nbsondages.' '. _("polls in the database at this time") .'

    '."\n"; From 5f1825179a65611c055e934266bbf556e2df281c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Thu, 29 Dec 2011 18:57:49 +0100 Subject: [PATCH 061/129] PostgreSQL compatibility: suppress JOIN in DELETE --- admin/index.php | 15 +++++---------- adminstuds.php | 16 ++++++---------- scripts/nettoyage_sondage.php | 16 +++++----------- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/admin/index.php b/admin/index.php index 825f02a..dd9eeb0 100644 --- a/admin/index.php +++ b/admin/index.php @@ -87,15 +87,10 @@ while($dsondage = $sondage->FetchNextObject(false)) { // On inclut la routine de suppression $date=date('H:i:s d/m/Y'); - $req = 'DELETE s, su, u, c - FROM - sondage s LEFT JOIN sujet_studs su - ON su.id_sondage = s.id_sondage - LEFT JOIN user_studs u - ON u.id_sondage = s.id_sondage - LEFT JOIN comments c - ON c.id_sondage = s.id_sondage - WHERE s.id_sondage = '.$connect->Param('id_sondage'); + $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . + 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . + 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . + 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('id_sondage') ; $sql = $connect->Prepare($req); $connect->Execute($sql, array($dsondage->id_sondage)); @@ -152,4 +147,4 @@ echo ''."\n"; // si on annule la suppression, rafraichissement de la page if (issetAndNoEmpty('annulesuppression') === true) { -} \ No newline at end of file +} diff --git a/adminstuds.php b/adminstuds.php index a111504..808dd2d 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -314,15 +314,11 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" $date=date('H:i:s d/m/Y:'); //destruction des données dans la base SQL - $sql = 'DELETE s, su, u, c - FROM - sondage s LEFT JOIN sujet_studs su - ON su.id_sondage = s.id_sondage - LEFT JOIN user_studs u - ON u.id_sondage = s.id_sondage - LEFT JOIN comments c - ON c.id_sondage = s.id_sondage - WHERE s.id_sondage = '.$connect->Param('numsondage'); + $sql = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('numsondage') . '; ' . + 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('numsondage') . '; ' . + 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('numsondage') . '; ' . + 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($sql); if ($connect->Execute($sql, array($numsondage))) { // on ecrit dans le fichier de logs la suppression du sondage @@ -1257,4 +1253,4 @@ echo '
     
    '; bandeau_pied_mobile(); echo ''."\n"; echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php index 57ab487..5bd387d 100644 --- a/scripts/nettoyage_sondage.php +++ b/scripts/nettoyage_sondage.php @@ -49,16 +49,10 @@ $sondage=$connect->Execute("select * from sondage"); while ($dsondage=$sondage->FetchNextObject(false)) { if ($date_courante > strtotime($dsondage->date_fin)) { //destruction des données dans la base - - $req = 'DELETE s, su, u, c - FROM - sondage s LEFT JOIN sujet_studs su - ON su.id_sondage = s.id_sondage - LEFT JOIN user_studs u - ON u.id_sondage = s.id_sondage - LEFT JOIN comments c - ON c.id_sondage = s.id_sondage - WHERE s.id_sondage = '.$connect->Param('id_sondage'); + $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . + 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . + 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . + 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('id_sondage') ; $sql = $connect->Prepare($req); $connect->Execute($sql, array($dsondage->id_sondage)); @@ -66,4 +60,4 @@ while ($dsondage=$sondage->FetchNextObject(false)) { // ecriture des traces dans le fichier de logs error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, '../admin/logs_studs.txt'); } -} \ No newline at end of file +} From 23464be59bccb9c7c6d61f783f2ee9d6fdfa9dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Thu, 29 Dec 2011 20:32:33 +0100 Subject: [PATCH 062/129] Add an option to disable the use of REMOTE_USER --- fonctions.php | 4 ++-- infos_sondage.php | 6 +++--- studs.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fonctions.php b/fonctions.php index adc128b..b7cc066 100644 --- a/fonctions.php +++ b/fonctions.php @@ -111,7 +111,7 @@ function is_error($cerr) function is_user() { - return isset($_SERVER['REMOTE_USER']) || (isset($_SESSION['nom'])); + return ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || (isset($_SESSION['nom'])); } @@ -216,4 +216,4 @@ define('NO_POLL_ID', 0x0001000000); define('INVALID_EMAIL', 0x0010000000); define('TITLE_EMPTY', 0x0100000000); define('INVALID_DATE', 0x1000000000); -$err = 0; \ No newline at end of file +$err = 0; diff --git a/infos_sondage.php b/infos_sondage.php index 9c56dea..1384d1a 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -192,7 +192,7 @@ if ($erreur_injection_commentaires) { echo '
    '. _("Your name*: ") .''; -if (isset($_SERVER['REMOTE_USER'])) { +if (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) { echo ''.stripslashes($_SESSION["nom"]).'
    '. _("Your e-mail address *: ") .''; -if (isset($_SERVER['REMOTE_USER'])) { +if (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) { echo ''.$_SESSION["adresse"].'
    '."\n"; if (isset($_SESSION['nom'])) { From 39185e0960ca20c9410a1c5a115fe7525dc76ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Fri, 30 Dec 2011 01:26:07 +0100 Subject: [PATCH 063/129] =?UTF-8?q?D=C3=A9finition=20de=20l'option=20USE?= =?UTF-8?q?=5FREMOTE=5FUSER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- variables.php.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/variables.php.template b/variables.php.template index e37ef0b..72e60af 100644 --- a/variables.php.template +++ b/variables.php.template @@ -81,6 +81,9 @@ define('URL_PROPRE', false); // Activation de Google Analytics (false si inactif, l'identifiant sinon) define('GOOGLE_ANALYTICS_ID', false); +// Utilisation de l'identité (REMOTE_USER) fournie par le serveur web +define('USE_REMOTE_USER', true); + if (@file_exists('variables.local.php')) { include('variables.local.php'); } From db209fc7db018ef38d1dd14dd9609237472b4762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Fri, 30 Dec 2011 03:34:02 +0100 Subject: [PATCH 064/129] Removal of the hard-wired Framadate logo An option is now available to replace the text title by an image. --- bandeaux.php | 13 +++++++++++-- variables.php.template | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bandeaux.php b/bandeaux.php index f7d9f27..1d97cb4 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -81,7 +81,16 @@ function logo () #le bandeau principal function bandeau_tete() { - echo '
    '.NOMAPPLICATION.'
    '."\n"; + if ( IMAGE_TITRE ) { + + echo '
    '.NOMAPPLICATION.'
    '."\n"; + + } else { + + echo '
    '.NOMAPPLICATION.'">
    '."\n"; + + } ; + } @@ -188,4 +197,4 @@ function bandeau_pied_mobile() liste_lang() . ''. '' . "\n"; gAnalytics(); -} \ No newline at end of file +} diff --git a/variables.php.template b/variables.php.template index e37ef0b..b27f59e 100644 --- a/variables.php.template +++ b/variables.php.template @@ -75,6 +75,10 @@ define('LOGOBANDEAU', ''); +// Nom et emplacement du fichier image contenant le titre +//define('IMAGE_TITRE', ''); +define('IMAGE_TITRE', 'images/logo-framadate.png'); + // Activation des URL propre (true pour activer, false sinon) define('URL_PROPRE', false); From dda612cc699222c449b211d60a0b9d116a303d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Fri, 30 Dec 2011 03:38:13 +0100 Subject: [PATCH 065/129] Remove 2 extraneous characters --- bandeaux.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandeaux.php b/bandeaux.php index 1d97cb4..7f2af3e 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -87,7 +87,7 @@ function bandeau_tete() } else { - echo '
    '.NOMAPPLICATION.'">
    '."\n"; + echo '
    '.NOMAPPLICATION.'
    '."\n"; } ; From aa8523e3182af4838fe90fb723fd8f910ae2ed75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Fri, 30 Dec 2011 04:16:41 +0100 Subject: [PATCH 066/129] Rewritten to use transactions --- admin/index.php | 37 +++++++++++++++++++++++++---------- adminstuds.php | 25 +++++++++++++++++++++-- scripts/nettoyage_sondage.php | 33 +++++++++++++++++++++++-------- 3 files changed, 75 insertions(+), 20 deletions(-) diff --git a/admin/index.php b/admin/index.php index dd9eeb0..6891c87 100644 --- a/admin/index.php +++ b/admin/index.php @@ -86,19 +86,36 @@ while($dsondage = $sondage->FetchNextObject(false)) { if (issetAndNoEmpty('confirmesuppression'.$i) === true) { // On inclut la routine de suppression $date=date('H:i:s d/m/Y'); - - $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . - 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . - 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . - 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('id_sondage') ; - + + $connect->StartTrans(); + + $req = 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('id_sondage') ; $sql = $connect->Prepare($req); $connect->Execute($sql, array($dsondage->id_sondage)); - - // ecriture des traces dans le fichier de logs - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'logs_studs.txt'); + + $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('id_sondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($dsondage->id_sondage)); + + $req = 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('id_sondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($dsondage->id_sondage)); + + $req = 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('id_sondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($dsondage->id_sondage)); + + if (! $connect->HasFailedTrans() ) { + + // ecriture des traces dans le fichier de logs + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'logs_studs.txt'); + + } + + $connect->CompleteTrans(); + } - + $i++; } diff --git a/adminstuds.php b/adminstuds.php index 808dd2d..a374b4c 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -319,8 +319,29 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('numsondage') . '; ' . 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('numsondage') ; - $sql = $connect->Prepare($sql); - if ($connect->Execute($sql, array($numsondage))) { + $connect->StartTrans(); + + $req = 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($numsondage)); + + $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($numsondage)); + + $req = 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($numsondage)); + + $req = 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($numsondage)); + + $suppression_OK = ! $connect->HasFailedTrans() ; + $connect->CompleteTrans(); + + + if ( $suppression_OK ) { // on ecrit dans le fichier de logs la suppression du sondage error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'admin/logs_studs.txt'); diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php index 5bd387d..665ac58 100644 --- a/scripts/nettoyage_sondage.php +++ b/scripts/nettoyage_sondage.php @@ -49,15 +49,32 @@ $sondage=$connect->Execute("select * from sondage"); while ($dsondage=$sondage->FetchNextObject(false)) { if ($date_courante > strtotime($dsondage->date_fin)) { //destruction des données dans la base - $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . - 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . - 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('id_sondage') . '; ' . - 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('id_sondage') ; - + $connect->StartTrans(); + + $req = 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('id_sondage') ; $sql = $connect->Prepare($req); $connect->Execute($sql, array($dsondage->id_sondage)); - - // ecriture des traces dans le fichier de logs - error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, '../admin/logs_studs.txt'); + + $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('id_sondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($dsondage->id_sondage)); + + $req = 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('id_sondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($dsondage->id_sondage)); + + $req = 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('id_sondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($dsondage->id_sondage)); + + if ( ! $connect->HasFailedTrans() ) { + + // ecriture des traces dans le fichier de logs + error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, '../admin/logs_studs.txt'); + + } + + $connect->CompleteTrans(); + } } From 848dcc53702f3b73f9169bc3457d4b3907fbedbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Mon, 9 Jan 2012 01:26:44 +0100 Subject: [PATCH 067/129] Fix encoding for To and Subject headers --- adminstuds.php | 26 +++++++++++++------------- contacts.php | 6 +++--- creation_sondage.php | 6 +++--- fonctions.php | 25 ++++++++++++++++++++++++- studs.php | 6 +++--- 5 files changed, 46 insertions(+), 23 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index a111504..a1e98ad 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -122,12 +122,12 @@ if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"]) //envoi du mail pour prevenir l'admin de sondage if ($connect->Execute($sql, array($nouveautitre, $numsondage))) { - mail ($adresseadmin, + sendEmail( $adresseadmin, _("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION, _("You have changed the title of your poll. \nYou can modify this poll with this link") . " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + $headers ); } } } @@ -145,12 +145,12 @@ if (isset($_POST["boutonnouveauxcommentaires"]) || isset($_POST["boutonnouveauxc if ($connect->Execute($sql, array($commentaires, $numsondage))) { //envoi du mail pour prevenir l'admin de sondage - mail ($adresseadmin, + sendEmail( $adresseadmin, _("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION, _("You have changed the comments of your poll. \nYou can modify this poll with this link") . " :\n\n".getUrlSondage($numsondageadmin, true)." \n\n" . _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + $headers ); } } } @@ -168,12 +168,12 @@ if (isset($_POST["boutonnouvelleadresse"]) || isset($_POST["boutonnouvelleadress if ($connect->Execute($sql, array($nouvelleadresse, $numsondage))) { //envoi du mail pour prevenir l'admin de sondage - mail ($_POST['nouvelleadresse'], + sendEmail( $_POST['nouvelleadresse'], _("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION, _("You have changed your email address in your poll. \nYou can modify this poll with this link") . " :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" . _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + $headers ); } } } @@ -329,12 +329,12 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'admin/logs_studs.txt'); //envoi du mail a l'administrateur du sondage - mail ($adresseadmin, + sendEmail( $adresseadmin, _("[ADMINISTRATOR] Removing of your poll") . ' ' . NOMAPPLICATION, _("You have removed your poll. \nYou can make new polls with this link") . " :\n\n".get_server_name()."index.php \n\n" . _("Thanks for your confidence.") . "\n" . NOMAPPLICATION, - $headers); + $headers ); //affichage de l'ecran de confirmation de suppression de sondage print_header(); @@ -478,10 +478,10 @@ if (isset($_POST["ajoutercolonne_x"]) && issetAndNoEmpty('nouvellecolonne') && ( if ($connect->Execute($sql, array($nouveauxsujets, $numsondage))) { //envoi d'un mail pour prévenir l'administrateur du changement $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . + sendEmail( "$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, - $headers); + $headers ); } } @@ -592,11 +592,11 @@ if (isset($_POST["ajoutercolonne_x"]) && ($dsondage->format == "D" || $dsondage- //envoi d'un mail pour prévenir l'administrateur du changement $adresseadmin = $dsondage->mail_admin; - mail ($adresseadmin, + sendEmail( $adresseadmin, _("[ADMINISTRATOR] New column for your poll"), _("You have added a new column in your poll. \nYou can inform the voters of this change with this link"). " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, - $headers); + $headers ); } else { $erreur_ajout_date="yes"; } @@ -1257,4 +1257,4 @@ echo '
     
    '; bandeau_pied_mobile(); echo ''."\n"; echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; diff --git a/contacts.php b/contacts.php index 0e4b306..3ca5f48 100644 --- a/contacts.php +++ b/contacts.php @@ -56,10 +56,10 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { $headers .= "\r\n".'Reply-To: '.$_POST['adresse_mail']; } - mail (ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers); + sendEmail( ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers ); if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + sendEmail( "$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers ); } //affichage de la page de confirmation d'envoi @@ -148,4 +148,4 @@ framanav(); bandeau_pied(); echo ''."\n"; echo ''."\n"; -} \ No newline at end of file +} diff --git a/creation_sondage.php b/creation_sondage.php index 641ffae..38ae7fe 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -118,8 +118,8 @@ function ajouter_sondage() $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); if (validateEmail($_SESSION['adresse'])) { - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $headers); - mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $headers); + sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $headers ); + sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $headers ); } $date=date('H:i:s d/m/Y:'); @@ -127,4 +127,4 @@ function ajouter_sondage() header("Location:".getUrlSondage($sondage)); exit(); session_unset(); -} \ No newline at end of file +} diff --git a/fonctions.php b/fonctions.php index adc128b..c4f3ada 100644 --- a/fonctions.php +++ b/fonctions.php @@ -161,6 +161,29 @@ function validateEmail($email) return (bool)preg_match($pattern, $email); } +# Envoi un courrier avec un codage correct de To et Subject +# Les en-têtes complémentaires ne sont pas gérés +# Inspiré de http://geoland.org/2007/12/utf8-ready-php-mail-function/ + +function sendEmail( $to, $subject, $body, $headers, $param) +{ + $to_list = explode( ',', $to ) ; + $to = "" ; + $first = 1 ; + + foreach ( $to_list as $one ) { + if ( $first == 0 ) $to .= ',' ; + $to_cut = explode( '<' ,$one, 2 ) ; + $to .= '=?UTF-8?B?' . base64_encode( $to_cut[ 0 ] ) . '?= <' . $to_cut[ 1 ] ; + $first = 0 ; + } ; + + $subject = '=?UTF-8?B?' . base64_encode( $subject ) . '?=' ; + + mail( $to, $subject, $body, $headers, $param ) ; + +} + /** * Fonction vérifiant l'existance et la valeur non vide d'une clé d'un tableau @@ -216,4 +239,4 @@ define('NO_POLL_ID', 0x0001000000); define('INVALID_EMAIL', 0x0010000000); define('TITLE_EMPTY', 0x0100000000); define('INVALID_DATE', 0x1000000000); -$err = 0; \ No newline at end of file +$err = 0; diff --git a/studs.php b/studs.php index f113838..f8446e0 100644 --- a/studs.php +++ b/studs.php @@ -172,13 +172,13 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$dsondage->mail_admin", + sendEmail( "$dsondage->mail_admin", "[".NOMAPPLICATION."] "._("Poll's participation")." : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')."", html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8'). _("has filled a line.\nYou can find your poll at the link") . " :\n\n". getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n". NOMAPPLICATION, - $headers); + $headers ); } } } else { @@ -308,7 +308,7 @@ if ($testmodifier) { if ($dsondage->mailsonde=="yes") { $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; - mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'), "\"".html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8')."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); + sendEmail( "$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'), "\"".html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8')."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers ); } } From 1059a4108a91875ec13d0966e4b7ecd4a60a9fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Mon, 9 Jan 2012 01:55:07 +0100 Subject: [PATCH 068/129] Make it work if To is only an address --- fonctions.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fonctions.php b/fonctions.php index c4f3ada..c601097 100644 --- a/fonctions.php +++ b/fonctions.php @@ -173,8 +173,12 @@ function sendEmail( $to, $subject, $body, $headers, $param) foreach ( $to_list as $one ) { if ( $first == 0 ) $to .= ',' ; - $to_cut = explode( '<' ,$one, 2 ) ; - $to .= '=?UTF-8?B?' . base64_encode( $to_cut[ 0 ] ) . '?= <' . $to_cut[ 1 ] ; + if ( preg_match( "/ Date: Mon, 9 Jan 2012 02:18:25 +0100 Subject: [PATCH 069/129] Fix encoding of the From header --- adminstuds.php | 11 +++-------- contacts.php | 5 +++-- creation_sondage.php | 2 +- fonctions.php | 16 ++++++++++++++++ studs.php | 4 ++-- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index a1e98ad..45c7c0b 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -103,13 +103,7 @@ $dsondage=$sondage->FetchObject(false); //si la valeur du nouveau titre est valide et que le bouton est activé $adresseadmin = $dsondage->mail_admin; -$headers_str = << -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -EOF; -$headers = sprintf($headers_str, NOMAPPLICATION, ADRESSEMAILADMIN); - +$headers = makeHeaders() ; if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"])) { if(issetAndNoEmpty('nouveautitre') === false) { @@ -477,7 +471,8 @@ if (isset($_POST["ajoutercolonne_x"]) && issetAndNoEmpty('nouvellecolonne') && ( $sql = $connect->Prepare($sql); if ($connect->Execute($sql, array($nouveauxsujets, $numsondage))) { //envoi d'un mail pour prévenir l'administrateur du changement - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + $headers = makeHeaders() ; + sendEmail( "$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" . _("You have added a new column in your poll. \nYou can inform the voters of this change with this link") . " : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION, diff --git a/contacts.php b/contacts.php index 3ca5f48..ef6c9a3 100644 --- a/contacts.php +++ b/contacts.php @@ -52,13 +52,14 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse $message=str_replace("\\","",$_POST["question"]); //envoi des mails - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\r\nContent-Transfer-Encoding: 8bit"; + $headers = makeHeaders() ; + if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { $headers .= "\r\n".'Reply-To: '.$_POST['adresse_mail']; } sendEmail( ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers ); if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) { - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + $headers = makeHeaders() ; sendEmail( "$_POST[adresse_mail]", "" . _("[COPY] Someone has sent a question ") . "".NOMAPPLICATION, "" . _("Here is a copy of your question") . " :\n\n".$message." \n\n" . _("We're going to answer your question shortly.") . "\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers ); } diff --git a/creation_sondage.php b/creation_sondage.php index 38ae7fe..beb8487 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -82,7 +82,7 @@ function ajouter_sondage() $date_fin = time()+15552000; } - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + $headers = makeHeaders() ; global $connect; diff --git a/fonctions.php b/fonctions.php index c601097..1e720fa 100644 --- a/fonctions.php +++ b/fonctions.php @@ -188,6 +188,22 @@ function sendEmail( $to, $subject, $body, $headers, $param) } +function makeHeaders() { + + $headers_str = << +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +EOF; + + $encoded_app = '=?UTF-8?B?' . base64_encode( NOMAPPLICATION, ) . '?=' ; + $headers = sprintf( $headers_str, $encoded_app, ADRESSEMAILADMIN ) ; + + return $headers ; + +} + /** * Fonction vérifiant l'existance et la valeur non vide d'une clé d'un tableau diff --git a/studs.php b/studs.php index f8446e0..c74052b 100644 --- a/studs.php +++ b/studs.php @@ -171,7 +171,7 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] $connect->Execute($sql, array($nom, $numsondage, $nouveauchoix)); if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + $headers = makeHeaders() ; sendEmail( "$dsondage->mail_admin", "[".NOMAPPLICATION."] "._("Poll's participation")." : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')."", html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8'). @@ -307,7 +307,7 @@ if ($testmodifier) { $connect->Execute($sql, array($nouveauchoix, $data->nom, $data->id_users)); if ($dsondage->mailsonde=="yes") { - $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; + $headers = makeHeaders() ; sendEmail( "$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'), "\"".html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8')."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers ); } } From bd13da4b58f36e007423f7e36d7dd18620188c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Mon, 9 Jan 2012 02:23:28 +0100 Subject: [PATCH 070/129] Syntax error --- fonctions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fonctions.php b/fonctions.php index 1e720fa..e1b05b4 100644 --- a/fonctions.php +++ b/fonctions.php @@ -197,7 +197,7 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EOF; - $encoded_app = '=?UTF-8?B?' . base64_encode( NOMAPPLICATION, ) . '?=' ; + $encoded_app = '=?UTF-8?B?' . base64_encode( NOMAPPLICATION ) . '?=' ; $headers = sprintf( $headers_str, $encoded_app, ADRESSEMAILADMIN ) ; return $headers ; From 9722388195d27a1efb34a4c94ccd5b5d5a1d0fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Mon, 9 Jan 2012 02:37:39 +0100 Subject: [PATCH 071/129] Fix names with accents in the user mail --- creation_sondage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/creation_sondage.php b/creation_sondage.php index beb8487..648be34 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -108,7 +108,7 @@ function ajouter_sondage() $message = _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll."); $message .= "\n\n"; - $message .= stripslashes(htmlspecialchars_decode($_SESSION["nom"],ENT_QUOTES))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n"; + $message .= stripslashes(html_entity_decode($_SESSION["nom"],ENT_QUOTES,"UTF-8"))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n"; $message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence") . ",\n".NOMAPPLICATION; $message_admin = _("This message should NOT be sended to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above"); From 09d89d117ba24a58516649350764793be38b4b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Tue, 10 Jan 2012 00:27:09 +0100 Subject: [PATCH 072/129] =?UTF-8?q?Always=20decode=20HTML=C2=A0entities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fonctions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fonctions.php b/fonctions.php index e1b05b4..b0cb69c 100644 --- a/fonctions.php +++ b/fonctions.php @@ -167,7 +167,7 @@ function validateEmail($email) function sendEmail( $to, $subject, $body, $headers, $param) { - $to_list = explode( ',', $to ) ; + $to_list = explode( ',', html_entity_decode($to, ENT_QUOTES, 'UTF-8' ) ; $to = "" ; $first = 1 ; @@ -182,7 +182,8 @@ function sendEmail( $to, $subject, $body, $headers, $param) $first = 0 ; } ; - $subject = '=?UTF-8?B?' . base64_encode( $subject ) . '?=' ; + $subject = '=?UTF-8?B?' . base64_encode( html_entity_decode( $subject, ENT_QUOTES, 'UTF-8' ) ) . '?=' ; + $body = html_entity_decode( $body, ENT_QUOTES, 'UTF-8' ) ; mail( $to, $subject, $body, $headers, $param ) ; From 139e4ba9a652c0bc71be84176bf82abf6a9070ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Tue, 10 Jan 2012 00:34:44 +0100 Subject: [PATCH 073/129] Add a missing parenthesis --- fonctions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fonctions.php b/fonctions.php index b0cb69c..169a538 100644 --- a/fonctions.php +++ b/fonctions.php @@ -167,7 +167,7 @@ function validateEmail($email) function sendEmail( $to, $subject, $body, $headers, $param) { - $to_list = explode( ',', html_entity_decode($to, ENT_QUOTES, 'UTF-8' ) ; + $to_list = explode( ',', html_entity_decode( $to, ENT_QUOTES, 'UTF-8' ) ) ; $to = "" ; $first = 1 ; From 93e2d59457864bda3732cdc378f40475509a6954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Tue, 10 Jan 2012 01:10:06 +0100 Subject: [PATCH 074/129] =?UTF-8?q?Fix=20PDF=C2=A0script=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exportpdf.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exportpdf.php b/exportpdf.php index 1731f2c..68d5edf 100644 --- a/exportpdf.php +++ b/exportpdf.php @@ -39,7 +39,7 @@ session_start(); -require_once('fpdf/phpToPDF.php'); +require_once('php2pdf/phpToPDF.php'); include_once('fonctions.php'); $dsondage = get_sondage_from_id($_POST['numsondage']); @@ -81,4 +81,4 @@ $PDF->SetFont('Arial','B',8); $PDF->Text(35,275,"Cette lettre de convocation a t gnre automatiquement par ".NOMAPPLICATION." sur ".get_server_name()); //Sortie -$PDF->Output(); \ No newline at end of file +$PDF->Output(); From c665ece920dd3e94e2a4bbf963c4a46e698c45f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Tue, 10 Jan 2012 21:29:34 +0100 Subject: [PATCH 075/129] Removed a duplicated removal code --- adminstuds.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index a374b4c..af324ce 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -313,12 +313,6 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" $nbuser=$user_studs->RecordCount(); $date=date('H:i:s d/m/Y:'); - //destruction des données dans la base SQL - $sql = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('numsondage') . '; ' . - 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('numsondage') . '; ' . - 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('numsondage') . '; ' . - 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('numsondage') ; - $connect->StartTrans(); $req = 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('numsondage') ; From f86f2e3d76815ef133f0b888b8942ff284c82661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Tue, 10 Jan 2012 23:28:21 +0100 Subject: [PATCH 076/129] Put sondage deletion in a function --- admin/index.php | 22 +--------------------- adminstuds.php | 24 ++---------------------- fonctions.php | 29 ++++++++++++++++++++++++++++- scripts/nettoyage_sondage.php | 21 +-------------------- 4 files changed, 32 insertions(+), 64 deletions(-) diff --git a/admin/index.php b/admin/index.php index 6891c87..34679ac 100644 --- a/admin/index.php +++ b/admin/index.php @@ -87,33 +87,13 @@ while($dsondage = $sondage->FetchNextObject(false)) { // On inclut la routine de suppression $date=date('H:i:s d/m/Y'); - $connect->StartTrans(); - - $req = 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('id_sondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($dsondage->id_sondage)); - - $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('id_sondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($dsondage->id_sondage)); - - $req = 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('id_sondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($dsondage->id_sondage)); - - $req = 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('id_sondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($dsondage->id_sondage)); - - if (! $connect->HasFailedTrans() ) { + if ( remove_sondage( $dsondage->id_sondage ) ) { // ecriture des traces dans le fichier de logs error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'logs_studs.txt'); } - $connect->CompleteTrans(); - } $i++; diff --git a/adminstuds.php b/adminstuds.php index af324ce..9887f22 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -313,29 +313,9 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" $nbuser=$user_studs->RecordCount(); $date=date('H:i:s d/m/Y:'); - $connect->StartTrans(); + remove_sondage( $numsondage ) ; - $req = 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('numsondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($numsondage)); - - $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('numsondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($numsondage)); - - $req = 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('numsondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($numsondage)); - - $req = 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('numsondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($numsondage)); - - $suppression_OK = ! $connect->HasFailedTrans() ; - $connect->CompleteTrans(); - - - if ( $suppression_OK ) { + if ( remove_sondage( $numsondage ) ) { // on ecrit dans le fichier de logs la suppression du sondage error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'admin/logs_studs.txt'); diff --git a/fonctions.php b/fonctions.php index adc128b..16f09b5 100644 --- a/fonctions.php +++ b/fonctions.php @@ -203,6 +203,33 @@ function getUrlSondage($id, $admin = false) return $url; } +function remove_sondage( $numsondage ){ + + $connect->StartTrans(); + + $req = 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($numsondage)); + + $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($numsondage)); + + $req = 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array($numsondage)); + + $req = 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('numsondage') ; + $sql = $connect->Prepare($req); + $connect->Execute($sql, array( $numsondage )); + + $suppression_OK = ! $connect->HasFailedTrans() ; + $connect->CompleteTrans(); + + return $suppression_OK ; + +} + $connect=connexion_base(); @@ -216,4 +243,4 @@ define('NO_POLL_ID', 0x0001000000); define('INVALID_EMAIL', 0x0010000000); define('TITLE_EMPTY', 0x0100000000); define('INVALID_DATE', 0x1000000000); -$err = 0; \ No newline at end of file +$err = 0; diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php index 665ac58..9ed2ca4 100644 --- a/scripts/nettoyage_sondage.php +++ b/scripts/nettoyage_sondage.php @@ -49,32 +49,13 @@ $sondage=$connect->Execute("select * from sondage"); while ($dsondage=$sondage->FetchNextObject(false)) { if ($date_courante > strtotime($dsondage->date_fin)) { //destruction des données dans la base - $connect->StartTrans(); - $req = 'DELETE FROM sondage WHERE id_sondage = ' . $connect->Param('id_sondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($dsondage->id_sondage)); - - $req = 'DELETE FROM sujet_studs WHERE id_sondage = ' . $connect->Param('id_sondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($dsondage->id_sondage)); - - $req = 'DELETE FROM user_studs WHERE id_sondage = ' . $connect->Param('id_sondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($dsondage->id_sondage)); - - $req = 'DELETE FROM comments WHERE id_sondage = ' . $connect->Param('id_sondage') ; - $sql = $connect->Prepare($req); - $connect->Execute($sql, array($dsondage->id_sondage)); - - if ( ! $connect->HasFailedTrans() ) { + if ( remove_sondage( $dsondage->id_sondage ) ) { // ecriture des traces dans le fichier de logs error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, '../admin/logs_studs.txt'); } - $connect->CompleteTrans(); - } } From e3e9683be0f7a53cfd4c661d56f3d50c225a70a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Gu=C3=A9rard?= Date: Wed, 11 Jan 2012 00:02:02 +0100 Subject: [PATCH 077/129] The removal function needs access to the database --- admin/index.php | 2 +- adminstuds.php | 4 +--- fonctions.php | 2 +- scripts/nettoyage_sondage.php | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/admin/index.php b/admin/index.php index 34679ac..aa8dc5b 100644 --- a/admin/index.php +++ b/admin/index.php @@ -87,7 +87,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { // On inclut la routine de suppression $date=date('H:i:s d/m/Y'); - if ( remove_sondage( $dsondage->id_sondage ) ) { + if ( remove_sondage( $connect, $dsondage->id_sondage ) ) { // ecriture des traces dans le fichier de logs error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'logs_studs.txt'); diff --git a/adminstuds.php b/adminstuds.php index 9887f22..2a85c39 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -313,9 +313,7 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" $nbuser=$user_studs->RecordCount(); $date=date('H:i:s d/m/Y:'); - remove_sondage( $numsondage ) ; - - if ( remove_sondage( $numsondage ) ) { + if ( remove_sondage( $connect, $numsondage ) ) { // on ecrit dans le fichier de logs la suppression du sondage error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'admin/logs_studs.txt'); diff --git a/fonctions.php b/fonctions.php index 16f09b5..2e77b86 100644 --- a/fonctions.php +++ b/fonctions.php @@ -203,7 +203,7 @@ function getUrlSondage($id, $admin = false) return $url; } -function remove_sondage( $numsondage ){ +function remove_sondage( $connect, $numsondage ){ $connect->StartTrans(); diff --git a/scripts/nettoyage_sondage.php b/scripts/nettoyage_sondage.php index 9ed2ca4..9b5d163 100644 --- a/scripts/nettoyage_sondage.php +++ b/scripts/nettoyage_sondage.php @@ -50,7 +50,7 @@ while ($dsondage=$sondage->FetchNextObject(false)) { if ($date_courante > strtotime($dsondage->date_fin)) { //destruction des données dans la base - if ( remove_sondage( $dsondage->id_sondage ) ) { + if ( remove_sondage( $connect, $dsondage->id_sondage ) ) { // ecriture des traces dans le fichier de logs error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, '../admin/logs_studs.txt'); From 6b8e3f2b9f9917ee4c04c7afe76e73a9a2efdf54 Mon Sep 17 00:00:00 2001 From: Simon Leblanc Date: Wed, 11 Jan 2012 02:05:53 +0100 Subject: [PATCH 078/129] =?UTF-8?q?fix=20de=20#45=20gr=C3=A2ce=20=C3=A0=20?= =?UTF-8?q?l'application=20du=20patch=20fourni=20par=20[fevrier]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/index.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/admin/index.php b/admin/index.php index aa8dc5b..5de0e58 100644 --- a/admin/index.php +++ b/admin/index.php @@ -72,18 +72,17 @@ $sondage=$connect->Execute("select * from sondage"); echo'
    '."\n"; echo '
    '."\n"; // Test et affichage du bouton de confirmation en cas de suppression de sondage -$i=0; while($dsondage = $sondage->FetchNextObject(false)) { - if (issetAndNoEmpty('supprimersondage'.$i) === true) { + if (issetAndNoEmpty('supprimersondage'.$dsondage->id_sondage) === true) { echo ''."\n"; - echo ''."\n"; echo '
    '. _("Confirm removal of the poll ") .'"'.$dsondage->id_sondage.'" : '."\n"; + echo '
    '. _("Confirm removal of the poll ") .'"'.$dsondage->id_sondage.'" : '."\n"; echo '
    '."\n"; echo '
    '."\n"; } // Traitement de la confirmation de suppression - if (issetAndNoEmpty('confirmesuppression'.$i) === true) { + if (issetAndNoEmpty('confirmesuppression'.$dsondage->id_sondage) === true) { // On inclut la routine de suppression $date=date('H:i:s d/m/Y'); @@ -96,7 +95,6 @@ while($dsondage = $sondage->FetchNextObject(false)) { } - $i++; } $sondage=$connect->Execute("select * from sondage ORDER BY date_fin ASC"); @@ -128,7 +126,7 @@ while($dsondage = $sondage->FetchNextObject(false)) { echo'
    		'.$nbuser.''. _("See the poll") .''. _("Change the poll") .'
    '.strftime("%B",$current).'
    '.strftime("%a %e",$current).'
    '.stripslashes($toutsujet[$i]).'
    '.stripslashes($nombase).'OK
    '.$affichesomme.'
    '."\n"; - echo ''."\n"; + echo ''."\n"; echo '
    '.$motmois.' '.$_SESSION["annee"].'
    '.$motmois.' '.$_SESSION["annee"].'
    '."\n"; echo ''."\n"; echo ''."\n"; @@ -576,7 +576,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo '
    '. _("Your poll will expire automatically 2 days after the last date of your poll.") .'
    '."\n"; From d5c1081b98246ab45834908ff0f198da2730bad9 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 14 Mar 2013 14:24:58 +0100 Subject: [PATCH 101/129] Meilleur affichage du cadre de rappel --- studs.php | 10 +++++----- style.css | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/studs.php b/studs.php index 5b5c51f..deba752 100644 --- a/studs.php +++ b/studs.php @@ -240,17 +240,17 @@ $titre=str_replace("\\","",$dsondage->titre); echo '

    '.stripslashes($titre).'

    '."\n"; //affichage du nom de l'auteur du sondage -echo _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'
    '."\n"; -echo 'Adresse : '.getUrlSondage($dsondage->id_sondage).'
    '."\n";; +echo '
    '. _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'
    '."\n"; +echo '
    '.'Adresse : '.getUrlSondage($dsondage->id_sondage).'
    '."\n";; //affichage des commentaires du sondage if ($dsondage->commentaires) { - echo _("Comments") .' :
    '."\n"; + echo '
    '._("Comments") .' :
    '."\n"; $commentaires = $dsondage->commentaires; $commentaires=nl2br(str_replace("\\","",$commentaires)); - echo $commentaires; - echo '
    '."\n"; + echo ''. $commentaires .''; + echo '
    '."\n"; } echo '
    '."\n"; diff --git a/style.css b/style.css index 0011ecc..d3be3dc 100644 --- a/style.css +++ b/style.css @@ -288,6 +288,11 @@ div.bodydate table{ font-size:12px; font-weight:bold; } + +.mlabel { + font-weight: bold; +} + /*cadre de commentaires*/ div.presentationdate { width:70%; @@ -333,6 +338,7 @@ div.cadre { text-align:center; margin:0 auto; } + /*information au sujet de la participation au sondage*/ div.cadre div.information { margin-bottom:20px; @@ -364,7 +370,7 @@ div.cadre td.vide, div.cadre td.sujet { text-align:center; } -div.cadre td.vide, div.cadre td.ok, div.cadre td.non, div.cadre td.sujet, div.cadre td.nom { +div.cadre td.vide, div.cadre td.ok, div.cadre td.non, div.cadre td.sujet, div.cadre td.nom, div.cadre td.jour { border-right: 1px solid #BBB !important; border-bottom: 1px solid #BBB !important; From 7544805fbdd14e2d3f86db6bd2a92df14a3fae2f Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 14 Mar 2013 14:30:38 +0100 Subject: [PATCH 102/129] regression : affichage du bouton 'continuer' --- choix_autre.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/choix_autre.php b/choix_autre.php index a61a473..b44441c 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -175,9 +175,12 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE //echo '

    '. _("Removal date") .' : '.$date_fin.'

    '."\n"; echo ''."\n"; echo '
    '."\n"; - echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; + echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; echo'
    '."\n"; // echo'

    '."\n"; // echo 'Pour finir la création du sondage, cliquez sur le bouton ajout ci-dessous'."\n"; diff --git a/style.css b/style.css index 8c4f8f7..277b131 100644 --- a/style.css +++ b/style.css @@ -211,7 +211,6 @@ span.sousbandeaulangue { .corps { font-family: "Lucida Grande",Verdana,Arial,sans-serif; - font-size: 14px; /* left: 20px; */ margin-left: auto; margin-right: auto; @@ -233,7 +232,7 @@ span.sousbandeaulangue { div.corps table{ - font-size:12px; + /* font-size:12px; */ } div.corpscentre{ font-size:12px; @@ -273,13 +272,16 @@ div.jourschoisis { /*presenation des pages*/ div.bodydate { padding:10px; - font-family:arial; + text-align:center; +/* font-family:arial; font-size:12px; text-align:center; position:static; top:330px; left:20px; right:20px; + +*/ } div.bodydate table{ font-family:arial; @@ -288,7 +290,7 @@ div.bodydate table{ } /*cadre de commentaires*/ div.presentationdate { - width:40%; + width:70%; font-family:arial; text-align:center; font-size:12px; @@ -300,22 +302,20 @@ div.presentationdate { right:1px; left:1px; margin-top:10px; - margin-left:30%; - margin-right: 30%; + margin-left:15%; + margin-right: 15%; background-color: #FFF; } div.presentationdatefin { - width:60%; + width:90%; padding:10px; - font-family:arial; text-align:center; - font-size:12px; - border-width:1px; - border-style:solid; + border:solid 1px #CCCCCC; margin-top: 10px; - margin-left: 20%; - margin-right: 20%; - position:static; + margin-left: 5%; + margin-right: 5%; + background-color: #FAFAFA; + border-radius: 3px; } /*cadre principal de studs.php*/ div.cadre { @@ -367,7 +367,8 @@ div.cadre td.casevide { background-color: white; text-align:center; } -/*les cases contenant les sommes de chaque colonne dans l'affichage de calendrier*/ +/*les cases contenant les sommes de chaque colonne dans l'affichage de +calendrier*/ div.cadre td.somme { background-color: white; font-weight: bold; @@ -401,23 +402,29 @@ div.cadre td.mois { /*affichage du calendrier*/ div.calendrier { padding:10px; - background-color: #CCC; - width:490px; - font-size:12px; - font-family:arial; + background-color: #CCF; + width:650px; margin-left: auto; margin-right: auto; position:static; border-radius: 10px; } + +div.calendrier td { + height: 40px; +} + +div.calendrier td:hover { + opacity: 0.6; +} + /*jour de la semaine dans calendrier*/ div.calendrier td.joursemaine { - width:65px; + width:91px; text-align: center; - font-family:arial; - font-size:14px; border: 2px; background-color: white; + height: 40px; } div.calendrier td.jourwe { width:65px; @@ -429,7 +436,7 @@ div.calendrier td.jourwe { } /*jour avant le premier jour du mois dans calendrier*/ div.calendrier td.avant { - width:65px; + /* width:65px; */ /* inutile car fixé par .joursemaine */ text-align: center; border: 2px; font-family:arial; @@ -438,14 +445,14 @@ div.calendrier td.avant { } /*jour libre dans calendrier*/ div.calendrier td.libre { - width:65px; + /* width:65px; */ /* inutile car fixé par .joursemaine */ text-align: center; border: 2px; background-color: #66FF99; } /*jour deja selectionné dans calendrier*/ div.calendrier td.choisi { - width:65px; + /* width:65px; */ /* inutile car fixé par .joursemaine */ text-align: center; border: 2px; background-color: #54ADF7; @@ -479,11 +486,15 @@ div.titregestionadmin{ padding:10px; } +.choix_date_mois { + width: 190px; + font-weight: bold; + font-size: larger; +} .bouton { - width: 65px; border:0px; - padding:0px 0 0 0; + padding: 12px 30px 6px; margin:0px; cursor:pointer; font-family:arial; From 11ade09d51ac3ea4879dced9afd3593214d65a4f Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 14 Mar 2013 12:51:30 +0100 Subject: [PATCH 099/129] Meilleur affichage des sondages standard --- choix_autre.php | 6 ++--- style.css | 65 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 58 insertions(+), 13 deletions(-) diff --git a/choix_autre.php b/choix_autre.php index 93a8e85..a61a473 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -175,8 +175,8 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE //echo ''."\n"; //echo ''."\n"; //echo '
    '. _("Next") .'
    '."\n"; - echo ''; - echo '

    '; + //echo ''; + //echo '
    '; //test de remplissage des cases $testremplissage = ''; @@ -206,7 +206,7 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE echo '
    '."\n"; echo '
    '."\n"; echo '
    '. _("Your poll will be automatically removed after 6 months.
    You can fix another removal date for it.") .'

    '."\n"; - echo _("Removal date (optional)") .' : '. _("(DD/MM/YYYY)") ."\n"; + echo _("Removal date (optional)") .' : '. _("(DD/MM/YYYY)") ."\n"; echo '
    '."\n"; echo '
    '."\n"; echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; diff --git a/style.css b/style.css index 277b131..0011ecc 100644 --- a/style.css +++ b/style.css @@ -297,14 +297,15 @@ div.presentationdate { border-width:1px; border-style:solid; border-color:#969696; - position:static; + /* position:static; top:110px; right:1px; - left:1px; + left:1px; */ margin-top:10px; margin-left:15%; margin-right: 15%; - background-color: #FFF; + background-color: #EEF; + border-radius: 5px; } div.presentationdatefin { width:90%; @@ -317,13 +318,18 @@ div.presentationdatefin { background-color: #FAFAFA; border-radius: 3px; } + +.champdatefin { + width: 8em !important; +} + /*cadre principal de studs.php*/ div.cadre { padding:10px; - font-family:arial; +/* font-family:arial; font-size:12px; position:static; - top:235px; + top:235px; */ text-align:center; margin:0 auto; } @@ -339,7 +345,7 @@ div.cadre table.resultats { } div.cadre td { - height:21px; + height:30px; } /*case de tableau OK dans affichage de sondage*/ div.cadre td.ok { @@ -353,10 +359,29 @@ div.cadre td.non { width:35px; } /*Case de tableau VIDE dans affichage de sondage*/ -div.cadre td.vide { +div.cadre td.vide, div.cadre td.sujet { background-color: #DDDDDD; text-align:center; } + +div.cadre td.vide, div.cadre td.ok, div.cadre td.non, div.cadre td.sujet, div.cadre td.nom { + border-right: 1px solid #BBB !important; + border-bottom: 1px solid #BBB !important; + +} + +div.cadre td:hover.vide { + opacity: 0.6; +} + +.resultats tbody tr { + +} + +.resultats tbody tr:hover { + opacity: 0.9; +} + /*Case de tableau contenant les noms dans affichage de sondage*/ div.cadre td.nom { background-color: #DDDDDD; @@ -366,6 +391,7 @@ div.cadre td.nom { div.cadre td.casevide { background-color: white; text-align:center; + border: none !important; } /*les cases contenant les sommes de chaque colonne dans l'affichage de calendrier*/ @@ -384,6 +410,10 @@ div.cadre td.sujet, div.cadre td.jour, div.cadre td.heure { padding:1px 5px; } +td.jour { + min-width: 55px; +} + div.cadre td.annee { border: 2px; background-color: #969696; @@ -465,7 +495,14 @@ p.affichageresultats{ } div.comment{ - width:100%; + + margin-top: 10px; + border-left: 1px dashed #999; + background: #F5F5F5; + padding-left: 25px; + padding-top: 4px; + padding-bottom: 4px; + width: inherit; } div.comment span.usercomment{ @@ -524,9 +561,17 @@ div.nouveau_sondage span { div.error, div.addcomment { text-align:center; border: 1px; - font-family: arial; - font-size: 13px; + /* font-family: arial; + font-size: 13px; */ } + +div.addcomment { + border-top: 1px solid #CCC; + padding-top: 25px; + background: #EFEFEF; + border-radius: 5px; +} + ul.exports { display:none; /* fonction non fonctionnelle */ text-align:center; From ccacf1a072865eb43c7363a7a2af0bc9585fec07 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 14 Mar 2013 14:12:09 +0100 Subject: [PATCH 100/129] ajout d'un placeholder pour le nom --- studs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/studs.php b/studs.php index 190b52a..5b5c51f 100644 --- a/studs.php +++ b/studs.php @@ -496,9 +496,9 @@ if (! ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || !$user_mod) { if (isset($_SESSION['nom'])) { $nom = stripslashes($_SESSION['nom']); } else { - $nom = ''; + $nom = 'Votre nom'; } - echo ''."\n"; + echo ''."\n"; echo '
    '."\n"; //echo ''."\n"; //echo '
    '. _("Next") .'
    '."\n"; - //echo ''; - //echo '
    '; - + +if (!isset($_POST["fin_sondage_autre_x"])) { + echo ''; + echo '
    '; +} + //test de remplissage des cases $testremplissage = ''; for ($i=0;$i<$_SESSION["nbrecases"];$i++) { From 653301ac895200d049ef9b5df300ffd867db7740 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 14 Mar 2013 14:53:15 +0100 Subject: [PATCH 103/129] =?UTF-8?q?mise=20=C3=A0=20jour=20du=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a999e2e..f76ee73 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,20 @@ Les dernières améliorations d'OpenSondage + Changelog version 0.7 (mars 2013) + - Fix : le sondage supprimé n'était pas forcément le sondage sélectionné (cfévrier) + - Fix : suppression de STUDS_DIR pour éviter toute confusion + - Fix : corrections l'en-tete et de l'encodage des e-mails (cfévrier) + - Fix : rend Optionnelle l'utilisation de la variable "REMOTE_USER" (cfévrier) + - Amélioration : ne faire apparaitre dans l'admin que les sondage actifs ou expirés depuis x mois (pyg) + - Amélioration : ajout d'un champs date_creation dans la table "sondage" (pyg) + - Amélioration : permet de faire fonctionner gettext avec le serveur de dev de PHP5.4 + enlève code commenté depuis des années (pascalchevrel) + - Fix : enlève les appels à get_server_name() partout sauf dans un appel à sendMail(), réécriture de la fonction pour cet usage (pascalchevrel) + - Amélioration : remplacement des define() par des const plus concis (pascalchevrel) + - Amélioration : possibilité de faire des liens directs vers les types de sondages à créer (pascalchevrel) + - Amélioration : meilleure intégration de la framanav (pyg) + - Amélioration : nombreuses modifications CSS pour un meilleur affichage (pyg) + + Changelog des 22 et 23 juin (pyg@framasoft.net) - très nombreuses modifications CSS - ajout de buttons.css pour des boutons plus propres @@ -31,6 +46,7 @@ Les dernières améliorations d'OpenSondage - correction dans le fichier de langue (merci à Julien Reitzel) - possibilité de mettre un texte libre pour les horaires - version Framasoft + Les dernières améliorations de STUdS Changelog version 0.6.6 (XXX 2011) : - internationalisation avec gettext From 6c58f774d07ff078a1a95e92b77cf1ca141e2019 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 14 Mar 2013 15:30:28 +0100 Subject: [PATCH 104/129] ajout d'un bouton de validation si on a plus de 8 colonnes --- studs.php | 7 +++++-- variables.php.template | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/studs.php b/studs.php index deba752..12aa4e2 100644 --- a/studs.php +++ b/studs.php @@ -535,7 +535,10 @@ echo ''."\n".''."\n"; // Affichage des différentes sommes des colonnes existantes echo ''."\n"; -echo ''. _("Addition") .''."\n"; +echo ''; +// si on a plus de 8 colonnes, on affiche un second bouton "valider mes choix" +echo ($nbcolonnes>8) ?'' : ""; +echo _("Addition") .''."\n"; for ($i=0; $i < $nbcolonnes; $i++) { if (isset($somme[$i]) === true) { @@ -646,7 +649,7 @@ echo _("Name") .' : '; echo '
    '."\n"; echo ''."\n"; -echo '
    '."\n"; +echo '
    '."\n"; echo ''."\n"; // Focus javascript sur la case de texte du formulaire echo ''."\n"; diff --git a/variables.php.template b/variables.php.template index 136d606..c48cc47 100644 --- a/variables.php.template +++ b/variables.php.template @@ -89,7 +89,7 @@ if (@file_exists('variables.local.php')) { } // Studs version -const STUDS_VERSION = 0.6.6; +const STUDS_VERSION = 0.7; // Do not edit the following $ALLOWED_LANGUAGES = array('fr_FR' => 'french', From b79181d6c579d25021a4a3a5d1f861db873c6478 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 14 Mar 2013 16:07:12 +0100 Subject: [PATCH 105/129] Meilleur affichage des tableaux longs --- style.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/style.css b/style.css index d3be3dc..1dfbf83 100644 --- a/style.css +++ b/style.css @@ -222,7 +222,7 @@ span.sousbandeaulangue { right: 20px; top: 170px; */ width: 70em; - overflow-x:auto; + /* overflow-x:auto; */ border: 3px solid #CCC; background-color: #fff; box-shadow: 5px 5px 5px #666; @@ -337,6 +337,7 @@ div.cadre { top:235px; */ text-align:center; margin:0 auto; + overflow-x: auto; } /*information au sujet de la participation au sondage*/ @@ -370,14 +371,14 @@ div.cadre td.vide, div.cadre td.sujet { text-align:center; } -div.cadre td.vide, div.cadre td.ok, div.cadre td.non, div.cadre td.sujet, div.cadre td.nom, div.cadre td.jour { +div.cadre td.vide, div.cadre td.ok, div.cadre td.non, div.cadre td.sujet, div.cadre td.nom, div.cadre td.jour, div.cadre td.heure, div.cadre td.mois { border-right: 1px solid #BBB !important; border-bottom: 1px solid #BBB !important; } div.cadre td:hover.vide { - opacity: 0.6; + opacity: 0.6; } .resultats tbody tr { @@ -385,7 +386,7 @@ div.cadre td:hover.vide { } .resultats tbody tr:hover { - opacity: 0.9; +/* opacity: 0.9; */ } /*Case de tableau contenant les noms dans affichage de sondage*/ From a0e71d949a931aa8ae86fdd03515683ef15efe10 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 14 Mar 2013 16:14:37 +0100 Subject: [PATCH 106/129] Meilleure impression~ des tableaux longs --- print.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/print.css b/print.css index 0e702e0..dd51d82 100644 --- a/print.css +++ b/print.css @@ -25,6 +25,15 @@ body { display:none; } +div.cadre { + overflow-x: none !important; +} + +{ +table { + page-break-after:always} +} + div.cadre div.information { display:none; } From 0d3d8147414d65c4d999ed39c09759bcad2e4db7 Mon Sep 17 00:00:00 2001 From: goofy-bz Date: Thu, 14 Mar 2013 19:43:09 +0100 Subject: [PATCH 107/129] Update Studs.po Minor typo fixes --- locale/fr_FR/LC_MESSAGES/Studs.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 37036f6..1e75069 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -103,7 +103,7 @@ msgstr "Votre sondage sera automatiquement effacé dans 6 mois.
    N&eacu #: choix_autre.php:193 msgid "Removal date (optional)" -msgstr "Date de fin (optionnelle)" +msgstr "Date de fin (facultative)" #: choix_autre.php:193 msgid "(DD/MM/YYYY)" @@ -201,7 +201,7 @@ msgstr "Choix des dates (2 sur 2)" #: choix_date.php:222 msgid "Select your dates amoung the free days (green). The selected days are in blue.
    You can unselect a day previously selected by clicking again on it." -msgstr "Selectionnez vos dates parmi les jours disponibles qui sont en vert. Une fois selectionnés, les jours apparaissent en bleu.
    Vous pouvez également enlever des jours déjà choisis en recliquant sur la case." +msgstr "Sélectionnez vos dates parmi les jours disponibles qui sont en vert. Une fois selectionnés, les jours apparaissent en bleu.
    Vous pouvez également enlever des jours déjà choisis en recliquant sur la case." #: choix_date.php:487 msgid "Selected days" @@ -209,11 +209,11 @@ msgstr "Jour retenus" #: choix_date.php:489 msgid "For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." -msgstr "Pour chacun des jours que vous avez sélectionné, vous avez la possibilité de choisir ou non, des heures de réunion avec ce format :
    - vide, si vous ne désirez pas mettre d'horaires particuliers,
    - \"8h\", \"8H\" ou \"8:00\" pour proposer une heure de début de réunion,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" pour un créneau,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" pour un créneau avec minutes." +msgstr "Pour chacun des jours que vous avez sélectionnés, vous avez la possibilité de choisir ou non, des heures de réunion avec ce format :
    - vide, si vous ne désirez pas mettre d'horaires particuliers,
    - \"8h\", \"8H\" ou \"8:00\" pour proposer une heure de début de réunion,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" pour un créneau,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" pour un créneau avec minutes." #: choix_date.php:490 msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)" -msgstr "Pour chacun des jours que vous avez sélectionné, vous avez la possibilité de choisir ou non, des heures de réunion (par exemple : \"8h\", \"8:15\", \"8h-10h\", \"soir\")." +msgstr "Pour chacun des jours que vous avez sélectionnés, vous avez la possibilité de choisir ou non, des heures de réunion (par exemple : \"8h\", \"8:15\", \"8h-10h\", \"soir\")." #: choix_date.php:496 @@ -428,7 +428,7 @@ msgstr "Commentaires de sondés" #: studs.php:245 msgid "Share URL" -msgstr "URL a communiquer" +msgstr "URL à communiquer" #: studs.php:563 msgid "Add a comment in the poll:" @@ -561,11 +561,11 @@ msgstr "Pour ajouter une date" #: adminstuds.php:197 msgid "Add a start hour (optional)" -msgstr "Pour ajouter un horaire de début (optionnel)" +msgstr "Pour ajouter un horaire de début (facultatif)" #: adminstuds.php:211 msgid "Add a end hour (optional)" -msgstr "Pour ajouter un horaire de fin (optionnel)" +msgstr "Pour ajouter un horaire de fin (facultatif)" #: adminstuds.php:253 msgid "[ADMINISTRATOR] Removing of your poll" From 40ae3474128d45156fe99f1ed29a42bdf5804254 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Tue, 19 Mar 2013 12:47:01 +0100 Subject: [PATCH 108/129] =?UTF-8?q?FIX=20:=20les=20dates=20ajout=C3=A9es?= =?UTF-8?q?=20a=20posteriori=20etaient=20mal=20classees?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- studs.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/studs.php b/studs.php index 12aa4e2..d708a77 100644 --- a/studs.php +++ b/studs.php @@ -320,6 +320,8 @@ $user_studs = $connect->Execute($sql, array($numsondage)); //reformatage des données des sujets du sondage $toutsujet = explode(",",$dsondage->sujet); +//patch pyg pour réordonner les dates ajoutees a posteriori +sort($toutsujet, SORT_NUMERIC); //si le sondage est un sondage de date if ($dsondage->format=="D"||$dsondage->format=="D+") { From db80ea1fa141b57c88000e0836cb5d77e7b7568a Mon Sep 17 00:00:00 2001 From: pyg77 Date: Tue, 19 Mar 2013 14:41:40 +0100 Subject: [PATCH 109/129] =?UTF-8?q?FIX=20:=20les=20dates=20ajout=C3=A9es?= =?UTF-8?q?=20a=20posteriori=20etaient=20mal=20classees?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adminstuds.php | 1 + 1 file changed, 1 insertion(+) diff --git a/adminstuds.php b/adminstuds.php index 019f791..4418860 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -662,6 +662,7 @@ if ($testmodifier) { for ($i = 0; $i < $nbcolonnes; $i++) { if ((isset($_POST["effacecolonne$i"]) || isset($_POST['effacecolonne'.$i.'_x'])) && $nbcolonnes > 1){ $toutsujet = explode(",",$dsujet->sujet); + sort($toutsujet, SORT_NUMERIC); $j = 0; $nouveauxsujets = ''; From c1c5fa83ca167df31163b9bdabcfe8922cea3c2d Mon Sep 17 00:00:00 2001 From: pyg77 Date: Tue, 19 Mar 2013 14:59:32 +0100 Subject: [PATCH 110/129] Fix : html entities --- locale/fr_FR/LC_MESSAGES/Studs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 1e75069..81bca96 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -428,7 +428,7 @@ msgstr "Commentaires de sondés" #: studs.php:245 msgid "Share URL" -msgstr "URL à communiquer" +msgstr "URL à communiquer" #: studs.php:563 msgid "Add a comment in the poll:" From 0d2f39aa40fe24155f212c756d4e33e3169f1a95 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Wed, 20 Mar 2013 14:21:03 +0100 Subject: [PATCH 111/129] =?UTF-8?q?FIX=20:=20regression=20sur=20classement?= =?UTF-8?q?=20des=20dates=20ajout=C3=A9es=20a=20posteriori?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adminstuds.php | 2 +- studs.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index 4418860..68ed209 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -662,7 +662,7 @@ if ($testmodifier) { for ($i = 0; $i < $nbcolonnes; $i++) { if ((isset($_POST["effacecolonne$i"]) || isset($_POST['effacecolonne'.$i.'_x'])) && $nbcolonnes > 1){ $toutsujet = explode(",",$dsujet->sujet); - sort($toutsujet, SORT_NUMERIC); + //sort($toutsujet, SORT_NUMERIC); $j = 0; $nouveauxsujets = ''; diff --git a/studs.php b/studs.php index d708a77..9699507 100644 --- a/studs.php +++ b/studs.php @@ -321,7 +321,7 @@ $user_studs = $connect->Execute($sql, array($numsondage)); //reformatage des données des sujets du sondage $toutsujet = explode(",",$dsondage->sujet); //patch pyg pour réordonner les dates ajoutees a posteriori -sort($toutsujet, SORT_NUMERIC); +//sort($toutsujet, SORT_NUMERIC); //si le sondage est un sondage de date if ($dsondage->format=="D"||$dsondage->format=="D+") { From 36fd1608afb0eb84372df5ce300b0f4aa801e94c Mon Sep 17 00:00:00 2001 From: pyg77 Date: Mon, 25 Mar 2013 16:58:49 +0100 Subject: [PATCH 112/129] =?UTF-8?q?les=20mails=20de=20cr=C3=A9ation=20de?= =?UTF-8?q?=20sondages=20sont=20maintenant=20envoy=C3=A9s=20avec=20un=20re?= =?UTF-8?q?ply-to=20configur=C3=A9=20sur=20l'adresse=20du=20cr=C3=A9ateur?= =?UTF-8?q?=20du=20sondage=20et=20un=20from=20qui=20n'est=20pas=20obligato?= =?UTF-8?q?irement=20l'adresse=20de=20l'admin=20de=20l'application?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- creation_sondage.php | 4 ++-- fonctions.php | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/creation_sondage.php b/creation_sondage.php index f0e2d40..3e34294 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -116,8 +116,8 @@ function ajouter_sondage() $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true)); if (validateEmail($_SESSION['adresse'])) { - sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin ); - sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message ); + sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $_SESSION['adresse'] ); + sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $_SESSION['adresse'] ); } $date=date('H:i:s d/m/Y:'); diff --git a/fonctions.php b/fonctions.php index 5f84fe8..92837d3 100644 --- a/fonctions.php +++ b/fonctions.php @@ -168,10 +168,20 @@ function sendEmail( $to, $subject, $body, $headers, $param) } else { $folding = "" ; } ; + // si $headers ne contient qu'une adresse email, on la considère comme adresse de reply-to, sinon on met l'adresse de no-reply definie dans variables.php + if (validateEmail($headers)) { + $replyTo = $headers; + $headers = ""; // on reinitialise $headers + } else { + $replyTo = ADRESSEEMAILREPONSEAUTO; + } + + $from = sprintf( "From: %s%s <%s>\n", $encoded_app, $folding, ADRESSEMAILADMIN ) ; if ( $headers ) $headers .= "\n" ; $headers .= $from ; + $headers .= "Reply-To: $replyTo\n"; $headers .= "MIME-Version: 1.0\n" ; $headers .= "Content-Type: text/plain; charset=UTF-8\n" ; $headers .= "Content-Transfer-Encoding: 8bit" ; From addd285ae72761626ab9734d65ce24dc01cc5e10 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Mon, 25 Mar 2013 17:11:16 +0100 Subject: [PATCH 113/129] =?UTF-8?q?ajout=20constante=20de=20r=C3=A9ponse?= =?UTF-8?q?=20aux=20emails?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- variables.php.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/variables.php.template b/variables.php.template index c48cc47..9fabfc8 100644 --- a/variables.php.template +++ b/variables.php.template @@ -46,6 +46,9 @@ const NOMAPPLICATION = ""; // adresse mail de l'administrateur de la base const ADRESSEMAILADMIN = ''; +// adresse mail de reponse lors de l'envoi de messages automatique (il est conseille d'utiliser une adresse de "no-reply") +const ADRESSEMAILREPONSEAUTO = ''; + // nom de la base de donnees const BASE = ''; From 518e407768ced4c768f473727d23dc51b07f76e5 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Wed, 27 Mar 2013 12:39:07 +0100 Subject: [PATCH 114/129] Supprime les bordures autour des images --- style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/style.css b/style.css index 1dfbf83..b6328a6 100644 --- a/style.css +++ b/style.css @@ -53,6 +53,11 @@ body { font-size: 14px; } +img { + border: 0; +} + + /*bandeau de titre*/ .framorange { color: #FF8400; From 21561f888e740f5606802ed9bc348aec36a5ddd4 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 May 2013 14:50:13 +0200 Subject: [PATCH 115/129] update auteurs README --- README | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README b/README index cd9c2b2..db33d71 100644 --- a/README +++ b/README @@ -1,5 +1,11 @@ OpenSondage est un fork du projet STUdS : https://sourcesup.cru.fr/projects/studs/ +OpenSondage est le projet qui motorise framadate.org pour framasoft.org + +Les auteurs principaux d'OpenSondage sont : +- Simon LEBLANC +- Pierre-Yves GOSSET + Les auteurs principaux du projet STUdS sont : - Guilhem BORGHESI - Raphaël DROZ From ac2dd80c960e7a428f212b0ac10df27d92dae21e Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 May 2013 14:59:22 +0200 Subject: [PATCH 116/129] Suppression nav --- framanav | 1 - 1 file changed, 1 deletion(-) delete mode 160000 framanav diff --git a/framanav b/framanav deleted file mode 160000 index 637d5e6..0000000 --- a/framanav +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 637d5e6ffa33c5bc11e87dee893c76cbdbb005fb From 912da29107407e76b9e7e34beef86b308f794de3 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 May 2013 15:26:32 +0200 Subject: [PATCH 117/129] =?UTF-8?q?ajout=20d'une=20propri=C3=A9t=C3=A9=20p?= =?UTF-8?q?our=20imprimer=20en=20paysage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- print.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/print.css b/print.css index dd51d82..006abff 100644 --- a/print.css +++ b/print.css @@ -77,4 +77,6 @@ div.addcomment { } #donation { display:none; -} \ No newline at end of file +} + +@page {size:landscape} \ No newline at end of file From 4dbffd867ceeb32a56edd5623760c5abc9e9ba03 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 May 2013 15:30:39 +0200 Subject: [PATCH 118/129] Correction lien sur images --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 4fb11fa..71437c3 100644 --- a/index.php +++ b/index.php @@ -76,13 +76,13 @@ echo '
    '."\n"; echo '
    '."\n"; echo '
    '; -echo '
    '; +echo '
    '; echo '' . _('Schedule an event') . ''; echo '
    '; echo '
    '; -echo '
    '; +echo '
    '; echo ''. _('Make a poll') . ''; echo '
    '; From a792a639fbac3d06ca5b1e5e813fe13686c14437 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 May 2013 16:02:32 +0200 Subject: [PATCH 119/129] Meilleure impression --- print.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/print.css b/print.css index 006abff..0d06821 100644 --- a/print.css +++ b/print.css @@ -79,4 +79,13 @@ div.addcomment { display:none; } -@page {size:landscape} \ No newline at end of file + +div.cadre td { + font-size: 40% !important; + height: 10px; +} + + +@page { + size:landscape; +} \ No newline at end of file From 356f88f8ae73618f8f309a62b92fb5b8ab8ca73d Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 23 May 2013 16:39:07 +0200 Subject: [PATCH 120/129] modification du lien de la page contact --- bandeaux.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandeaux.php b/bandeaux.php index dbc0c85..a062934 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -169,7 +169,7 @@ function bandeau_pied() echo '
    ' . ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented ''. _("About") .'' . //''. _("Admin") .'' . From 75e21b48e63924a3214d576cc8def70a1dab7282 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Fri, 24 May 2013 13:55:13 +0200 Subject: [PATCH 121/129] ./studs.php --- framanav | 1 + index.php | 1 + studs.php | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 160000 framanav diff --git a/framanav b/framanav new file mode 160000 index 0000000..24d503e --- /dev/null +++ b/framanav @@ -0,0 +1 @@ +Subproject commit 24d503e3e56e9fa095a2cee17576f6f0cb518fcc diff --git a/index.php b/index.php index 71437c3..e574c90 100644 --- a/index.php +++ b/index.php @@ -88,6 +88,7 @@ echo '
    '; echo '
    '."\n"; + echo '
    '."\n"; //bandeau de pied //sur_bandeau_pied(); diff --git a/studs.php b/studs.php index 9699507..a0c774f 100644 --- a/studs.php +++ b/studs.php @@ -539,7 +539,7 @@ echo ''."\n".''."\n"; echo ''."\n"; echo ''; // si on a plus de 8 colonnes, on affiche un second bouton "valider mes choix" -echo ($nbcolonnes>8) ?'' : ""; +echo ($nbcolonnes>8) ?'' : ""; echo _("Addition") .''."\n"; for ($i=0; $i < $nbcolonnes; $i++) { @@ -651,7 +651,7 @@ echo _("Name") .' : '; echo '
    '."\n"; echo ''."\n"; -echo '
    '."\n"; +echo '
    '."\n"; echo ''."\n"; // Focus javascript sur la case de texte du formulaire echo ''."\n"; From 7298915562892368c5759029040071f7b41c00c2 Mon Sep 17 00:00:00 2001 From: pyg77 Date: Thu, 21 Nov 2013 15:02:46 +0100 Subject: [PATCH 122/129] Changelog version 0.7 (mars 2013) --- .gitignore | 5 ++++- admin/.htaccess | 12 ------------ apropos.php | 9 ++++----- bandeaux.php | 13 +++++++------ favicon.ico | Bin 1150 -> 1150 bytes images/logo-framadate.png | Bin 7339 -> 4846 bytes style.css | 10 +++++++--- 7 files changed, 22 insertions(+), 27 deletions(-) delete mode 100755 admin/.htaccess diff --git a/.gitignore b/.gitignore index ec542fe..6ca5781 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ admin/.htaccess admin/.htpasswd admin/logs_studs.txt framanav - +nav +.htaccess +.gitignore +.gitmodules diff --git a/admin/.htaccess b/admin/.htaccess deleted file mode 100755 index f6c1ee9..0000000 --- a/admin/.htaccess +++ /dev/null @@ -1,12 +0,0 @@ -authType basic -authName "ADMIN OpenSondage" - -authUserFile /home/framatools/www/opensondage_dev/admin/.htpasswd - -#order deny,allow - -# satisfy all - -# allow from all - -#require user studs diff --git a/apropos.php b/apropos.php index ac48b86..aa6d44d 100644 --- a/apropos.php +++ b/apropos.php @@ -176,17 +176,16 @@ vous-même votre propre service.

    Éditeur et Responsable de la publication

    Editeur : Association Framasoft (cf "Hébergement")

    -

    Responsable de la publication : Alexis Kauffmann 

    +

    Responsable de la publication : Christophe Masutti

    Vous pouvez rentrer en contact avec l'Editeur et le Responsable de la publication en passant par la page "contact".

    + href="http://contact.framasoft.org">contact".

    Les propos tenus sur ce site ne représentent que et uniquement l’opinion de leur auteur, et n’engagent pas l'association Framasoft, les sociétés, entreprises ou collectifs auxquels il contribue ou dont il peut être associé ou employé.

    Hébergement

    -

    Ce site est hébergé par Framasoft, c/o T. CEZARD, 5 avenue -Stephen Pichon 75013 Paris, France. +

    Ce site est hébergé par Framasoft, 10 bis rue Jangot 69007 Lyon, France. Cet hébergeur possède à ce jour les éléments d’identification personnelle concernant l'Éditeur (voir http://www.framasoft.net/article4736.html).

    @@ -291,7 +290,7 @@ l'équipe Framasoft. Les sources sont disponibles sur le Github Propositions améliorations de Framadate

    Si quelque chose venait à vous manquer, vous pouvez nous en faire part -via le     formulaire en ligne. +via le formulaire en ligne.
    Les dernières améliorations de Framadate sont visibles dans le fichier CHANGELOG.
    diff --git a/bandeaux.php b/bandeaux.php index a062934..d1e1f25 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -41,12 +41,13 @@ include_once('fonctions.php'); function framanav() { - if (file_exists($_SERVER['DOCUMENT_ROOT']."/framanav/nav.php")) { +/* if (file_exists($_SERVER['DOCUMENT_ROOT']."/framanav/nav.php")) { //echo "\n".' '."\n";; //echo ''."\n"; include_once($_SERVER['DOCUMENT_ROOT']."/framanav/nav.php"); //echo ' '."\n"; - } + }*/ + echo ''."\n"; } function gAnalytics() { @@ -71,9 +72,9 @@ function gAnalytics() { //le logo function logo () { - if(defined('LOGOBANDEAU')) { +/* if(defined('LOGOBANDEAU')) { echo ''."\n"; - } + }*/ } @@ -119,7 +120,7 @@ function sous_bandeau() /*echo '
    ' . ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented ''. _("About") .'' . ''. _("Admin") .'' . @@ -188,7 +189,7 @@ function bandeau_pied_mobile() echo '
    ' . ''. _("Home") .'' . ''. _("Example") .'' . - ''. _("Contact") .'' . + ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented ''. _("About") .'' . //''. _("Admin") .'' . diff --git a/favicon.ico b/favicon.ico index ded95854f1dd9b33b34aa3e474e985a07cbf1464..b7486c39c339aae7c524dce6f35242109474f35c 100644 GIT binary patch literal 1150 zcma)5O=#3m5FWu_5ZRO9NiY8Ypooedy4iZ_c}ap7>8Wj!dhl*yE}LXkEG-r-9u)6x zvD)fE^ytNdime`%p1RpuT0z8aH-2C8Qo`bb36shD=9_u*X6A`(!CNW`z6WGvtH@pv zIRXI$B*UTp>#3O|Cj!Hn2zC2oXxP6Z!(M^@1bv&fUO^@XuI&JC64Hhw%4ZsS2C|?q z+9rKn-(HL}H8iv>((TuZ(+EuGP|?o+sOlVt{RKJXa=)Czn8X9as^wV4ZC%j3mIG~H z_Tw~Of>Pid^^EJ>BbR5wdLz`W=d=&_%X`XhJga$eQjm`3H6LHRzPO7V@Mj_Gb<;iy zJq}5N>L^Pt@R_4u*^5`To2^Hh8&6}sp2otO9Cel?GOV%Cw7-OgGf%wVU%I4xm-}us z4-(^3apN-ZKaft2W6uTj=ri2hRRI&y#q+-#QPxJO8iDKbD|xH7Dcwd5iqt`$fLtCcRq}8Cw;3uutUlZjrO^ R(N87(Cq^4N$7a53ZF zBd&OASc4vN{7>wQwfWn7Mc3dO%3>bSF}4ZkVf+;*kt|);RYN%!VFyMx3$I z{`5V%ffD`8rh8+` diff --git a/images/logo-framadate.png b/images/logo-framadate.png index bc5af6fc29d2c3ce4fc86f531ec39726bf95fbb0..b2732510d9770055a9bdc9a4d363087d74986bc0 100644 GIT binary patch literal 4846 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 R1Bw6u002ovPDHLkV1lmOP!IqB diff --git a/style.css b/style.css index b6328a6..b96ba1e 100644 --- a/style.css +++ b/style.css @@ -56,7 +56,11 @@ body { img { border: 0; } - +*, *:before, *:after { + -webkti-box-sizing:content-box; + -moz-box-sizing: content-box; + box-sizing:content-box; +} /*bandeau de titre*/ .framorange { @@ -92,7 +96,7 @@ div.bandeau{ top:6px; left:6px; right:6px; - padding-top:35px; +/* padding-top:35px;*/ } @@ -121,7 +125,7 @@ div.bandeautitre{ font-style: italic; vertical-align:middle; font-family:arial; - padding:3px; + padding:13px; position:static; top:57px; left:6px; From e7107b03074931c77b81bfe417a2559dc02e9e40 Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 21 Nov 2013 15:42:13 +0100 Subject: [PATCH 123/129] Update .gitignore --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6ca5781..baf9949 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,3 @@ admin/logs_studs.txt framanav nav .htaccess -.gitignore -.gitmodules From 78b38f5ce66ee5cac1e1358b6714ed12da061ff2 Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 21 Nov 2013 15:42:36 +0100 Subject: [PATCH 124/129] Delete .htaccess --- .htaccess | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .htaccess diff --git a/.htaccess b/.htaccess deleted file mode 100644 index e209fae..0000000 --- a/.htaccess +++ /dev/null @@ -1,12 +0,0 @@ -# - RewriteEngine On - - RewriteCond %{REQUEST_FILENAME} -f [OR] - RewriteCond %{REQUEST_FILENAME} -d - RewriteRule .* - [L] - - RewriteRule ^([a-z0-9]{16})$ studs.php?sondage=$1 - RewriteRule ^([a-z0-9]{24})/admin$ adminstuds.php?sondage=$1 - # Pour le dernier j'ai honte, mais il y a trop de chose à modifier pour le moment :-) - RewriteRule ^([a-z0-9]{24})/images/(.*)$ images/$2 -# \ No newline at end of file From 25c68e876727cca629f6d3094472c88a3eb7329a Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 21 Nov 2013 15:42:47 +0100 Subject: [PATCH 125/129] Delete .gitmodules --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8334e1c..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "framanav"] - path = framanav - url = https://github.com/framasoft/framanav.git From b1019aa74eac4f570dbe753d972b18a86c6540d4 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 20 Jan 2014 11:59:10 +0100 Subject: [PATCH 126/129] =?UTF-8?q?Supprime=20'(sans=20tenir=20compte=20de?= =?UTF-8?q?s=20disponibilit=C3=A9s=20des=20autres=20sond=C3=A9s)'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/fr_FR/LC_MESSAGES/Studs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 81bca96..99d1a23 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -375,7 +375,7 @@ msgstr "Commentaire de l'auteur" #: studs.php:238 msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." -msgstr "Pour participer à ce sondage, veuillez entrer votre nom, choisir toutes les valeurs qui vous conviennent
    (sans tenir compte des disponibilités des autres sondés) et valider votre choix avec le bouton en bout de ligne." +msgstr "Pour participer à ce sondage, veuillez entrer votre nom, choisir toutes les valeurs qui vous conviennent
    et valider votre choix avec le bouton en bout de ligne." #: studs.php:456 msgid "Participate" From a57553716ba4d18d1a6c9542a524cd88d576612a Mon Sep 17 00:00:00 2001 From: pyledevehat Date: Tue, 21 Jan 2014 13:09:28 +0100 Subject: [PATCH 127/129] Rectification lien vers logs du bandeau admin --- bandeaux.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bandeaux.php b/bandeaux.php index d1e1f25..0f6cbaf 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -136,7 +136,7 @@ function sous_bandeau_admin() ''. _("Home") .''; if(is_readable('logs_studs.txt')) { - echo ''. _("Logs") .''; + echo ''. _("Logs") .''; } echo ''. _("Cleaning") .'' . From 07450ecb2241d52aa53fc0301d9e6a54adb9541d Mon Sep 17 00:00:00 2001 From: FramaJosephK Date: Wed, 11 Jun 2014 19:19:17 +0200 Subject: [PATCH 128/129] =?UTF-8?q?Accessibilit=C3=A9=20:=20title=20contex?= =?UTF-8?q?tualis=C3=A9=20selon=20l'=C3=A9tape=20ou=20les=20erreurs=20du?= =?UTF-8?q?=20formulaire=20-=20attribut=20lang=20sur=20=20et=20liens?= =?UTF-8?q?=20du=20pied=20de=20page=20-=20aria-describeby=20pour=20les=20m?= =?UTF-8?q?sg=20d'erreur=20-=20fix=20points=20de=20validation=20W3C=20-=20?= =?UTF-8?q?fix=20issue=20#45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README | 12 +++-- admin/index.php | 10 ++-- adminstuds.php | 66 ++++++++++++------------ apropos.php | 6 +-- bandeaux.php | 65 +++++++++++------------ buttons.css | 44 ++++++++-------- choix_autre.php | 56 ++++++++++---------- choix_date.php | 24 ++++----- contacts.php | 27 ++++------ errors/error-forbidden.php | 4 +- fonctions.php | 20 ++++---- framanav | 1 - i18n.php | 4 ++ index.php | 20 ++++---- infos_sondage.php | 62 ++++++++++++++-------- locale/de_DE/LC_MESSAGES/Studs.mo | Bin 16852 -> 16739 bytes locale/de_DE/LC_MESSAGES/Studs.po | 4 +- locale/en_GB/LC_MESSAGES/Studs.mo | Bin 13036 -> 12914 bytes locale/en_GB/LC_MESSAGES/Studs.po | 4 +- locale/es_ES/LC_MESSAGES/Studs.mo | Bin 16845 -> 16741 bytes locale/es_ES/LC_MESSAGES/Studs.po | 4 +- locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 19391 -> 19273 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 6 +-- maintenance.php | 8 +-- sources/sources.php | 4 +- studs.php | 82 +++++++++++++++--------------- style.css | 53 ++++++++++++++++--- variables.php.template | 8 +-- 28 files changed, 327 insertions(+), 267 deletions(-) delete mode 160000 framanav diff --git a/README b/README index db33d71..643625a 100644 --- a/README +++ b/README @@ -156,14 +156,16 @@ Technologies utilisées ============================================================================= Compatibilités des navigateurs +Dernière mise à jour le 21 avril 2014 ============================================================================= -- Firefox -- Opera +- Firefox : Ubuntu 13.10/FF28 +-Chrome : Ubuntu13.10/Chromium33 +- Opera (non testé) - Konqueror -- Links -- Safari -- IE +- Links (non testé, inutile) +- Safari (non testé) +- IE : Win7/IE9 ----------------- Janvier 2008 diff --git a/admin/index.php b/admin/index.php index a926cc2..34b5b43 100644 --- a/admin/index.php +++ b/admin/index.php @@ -51,11 +51,11 @@ include_once('../bandeaux.php'); // Affichage des balises standards echo ''."\n"; -echo ''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; -echo 'ADMINISTRATEUR de la base '.NOMAPPLICATION.''."\n"; -echo ''."\n"; +echo ''._("Polls administrator").' - '.NOMAPPLICATION.''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -70,7 +70,7 @@ sous_bandeau_admin(); $sondage=$connect->Execute("select * from sondage"); echo'
    '."\n"; -echo '
    '."\n"; +echo ''."\n"; // Test et affichage du bouton de confirmation en cas de suppression de sondage while($dsondage = $sondage->FetchNextObject(false)) { if (issetAndNoEmpty('supprimersondage'.$dsondage->id_sondage) === true) { @@ -133,9 +133,9 @@ while($dsondage = $sondage->FetchNextObject(false)) { } echo ''."\n"; -echo'
    '."\n"; // fin du formulaire et de la page web echo ''."\n"; +echo'
    '."\n"; echo '
     
    '; echo ''."\n"; echo ''."\n"; diff --git a/adminstuds.php b/adminstuds.php index 68ed209..ed43459 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -76,7 +76,7 @@ if (preg_match(";[\w\d]{24};i", $numsondageadmin)) { //verification de l'existence du sondage, s'il n'existe pas on met une page d'erreur if (!$sondage || $sondage->RecordCount() != 1){ - print_header(false); + print_header(false, _("Error!")); echo ''."\n"; framanav(); logo(); @@ -86,7 +86,7 @@ if (!$sondage || $sondage->RecordCount() != 1){ echo '
    '."\n"; print "

    " . _("This poll doesn't exist !") . "



    "."\n"; - print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; echo '



    '."\n"; echo '
    '."\n"; # sur_bandeau_pied(); @@ -324,7 +324,7 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" echo '
    '."\n"; print "

    " . _("Your poll has been removed!") . "



    "; - print _("Back to the homepage of ") . ' '.NOMAPPLICATION.'.'."\n"; + print _("Back to the homepage of ") . ' '.NOMAPPLICATION.'.'."\n"; echo '


    '."\n"; echo '
    '."\n"; sur_bandeau_pied(); @@ -726,7 +726,7 @@ if ($sondage !== false) { $sql = $connect->Prepare($sql); $user_studs = $connect->Execute($sql, array($numsondage)); } else { - print_header(false); + print_header(false, _("Error!")); echo ''."\n"; framanav(); logo(); @@ -734,7 +734,7 @@ if ($sondage !== false) { bandeau_titre(_("Error!")); echo '
    '."\n"; print "

    " . _("This poll doesn't exist !") . "



    "."\n"; - print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; echo '



    '."\n"; echo '
    '."\n"; @@ -756,7 +756,7 @@ $nbcolonnes=substr_count($dsujet->sujet,',')+1; echo '
    '."\n"; echo '
    '."\n"; -echo _('As poll administrator, you can change all the lines of this poll with infos.
    You can, as well, remove a column or a line with Cancel.
    You can also add a new column with Add column.
    Finally, you can change the informations of this poll like the title, the comments or your email address.') ."\n"; +echo _('As poll administrator, you can change all the lines of this poll with infos.
    You can, as well, remove a column or a line with Cancel.
    You can also add a new column with Add column.
    Finally, you can change the informations of this poll like the title, the comments or your email address.') ."\n"; echo '

    '."\n"; //debut de l'affichage de résultats @@ -767,10 +767,11 @@ $toutsujet=explode(",",$dsujet->sujet); echo ''."\n"; echo ''."\n"; echo ''."\n"; +echo ''."\n"; //boucle pour l'affichage des boutons de suppression de colonne for ($i = 0; isset($toutsujet[$i]); $i++) { - echo ''."\n"; + echo ''."\n"; } echo ''."\n"; @@ -806,7 +807,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -840,7 +841,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -874,7 +875,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; //affichage des horaires @@ -892,7 +893,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; } } else { @@ -907,7 +908,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''.stripslashes($toutsujet[$i]).''."\n"; } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; } @@ -920,7 +921,7 @@ while ($data = $user_studs->FetchNextObject(false)) { $ensemblereponses = $data->reponses; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; //affichage du nom $nombase=str_replace("°","'",$data->nom); @@ -971,14 +972,14 @@ while ($data = $user_studs->FetchNextObject(false)) { //a la fin de chaque ligne se trouve les boutons modifier if (!$testligneamodifier=="true") { - echo ''."\n"; + echo ''."\n"; } //demande de confirmation pour modification de ligne for ($i = 0; $i < $nblignes; $i++) { if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { if ($compteur == $i) { - echo ''."\n"; + echo ''."\n"; } } } @@ -1001,7 +1002,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) { } // Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base -echo ''."\n"; +echo ''."\n"; echo ''."\n"; //determination du meilleur choix @@ -1040,19 +1041,20 @@ for ($i = 0; $i < $nbcolonnes; $i++) { echo ''.$affichesomme.''."\n"; } } - +echo ''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; for ($i = 0; $i < $nbcolonnes; $i++) { if (isset($somme[$i]) === true && isset($meilleurecolonne) === true && $somme[$i] == $meilleurecolonne){ - echo 'Meilleur resultat'."\n"; + echo 'Meilleur resultat'."\n"; } else { echo ''."\n"; } } - +echo ''."\n"; echo ''."\n"; @@ -1139,9 +1141,9 @@ echo '

    '."\n"; //affichage de la phrase annoncant le meilleur sujet if (isset($meilleurecolonne) && $compteursujet == "1") { - print "\"Meilleur" . _("The best choice at this time is") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; + print "\"Meilleur" . _("The best choice at this time is") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; } elseif (isset($meilleurecolonne)) { - print "\"Meilleur " . _("The bests choices at this time are") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; + print "\"Meilleur " . _("The bests choices at this time are") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; } echo '

    '."\n"; @@ -1158,7 +1160,7 @@ echo '
    '."\n"; $adresseadmin=$dsondage->mail_admin; echo _("Change the title") .' :
    ' . ''. - '

    '."\n"; + '

    '."\n"; //si la valeur du nouveau titre est invalide : message d'erreur if ((isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"])) && !issetAndNoEmpty('nouveautitre')) { @@ -1166,10 +1168,10 @@ if ((isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"] } //Changer les commentaires du sondage -echo _("Change the comments") .' :



    '."\n"; +echo _("Change the comments") .' :



    '."\n"; //Changer l'adresse de l'administrateur -echo _("Change your email address") .' :

    '."\n"; +echo _("Change your email address") .' :

    '."\n"; //si l'adresse est invalide ou le champ vide : message d'erreur if ((isset($_POST["boutonnouvelleadresse"]) || isset($_POST["boutonnouvelleadresse_x"])) && !issetAndNoEmpty('nouvelleadresse')) { @@ -1185,7 +1187,7 @@ if ($comment_user->RecordCount() != 0) { $i = 0; while ( $dcomment=$comment_user->FetchNextObject(false)) { - print " ". stripslashes($dcomment->usercomment) ." : ".stripslashes($dcomment->comment) ."
    "; + print " ". stripslashes($dcomment->usercomment) ." : ".stripslashes($dcomment->comment) ."
    "; $i++; } @@ -1200,21 +1202,21 @@ if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide=="yes") { print "
    " . _("Add a comment in the poll") . " :
    \n"; echo _("Name") .' :
    '."\n"; echo ''."\n"; -echo '
    '."\n"; +echo '
    '."\n"; //suppression du sondage echo '
    '."\n"; -echo _("Remove your poll") .' :

    '."\n"; +echo _("Remove your poll") .' :

    '."\n"; echo '

    '."\n"; if ($dsondage->format == "D" || $dsondage->format == "D+") { - echo '
    '."\n"; + echo ''."\n"; echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
    '; echo ''; echo ''; echo ''; - echo '

    '; + echo '

    '; echo '
    '."\n"; // ''. _("Enter a meeting place!") .'

    '."\n"; } @@ -1224,14 +1226,14 @@ if (isset($_POST["exportpdf_x"]) && !issetAndNoEmpty('lieureunion')) { echo ''. _("Enter a meeting place!") .'

    '."\n"; } -echo ''."\n"; +echo ''."\n"; echo '

    '."\n"; //fin de la partie GESTION et beandeau de pied -echo '

    '."\n"; +//echo '

    '."\n"; echo '
    '; echo '
     
    '; bandeau_pied_mobile(); -echo ''."\n"; +//echo ''."\n"; echo ''."\n"; echo ''."\n"; diff --git a/apropos.php b/apropos.php index aa6d44d..0a97166 100644 --- a/apropos.php +++ b/apropos.php @@ -49,10 +49,10 @@ if (file_exists('bandeaux_local.php')) { //affichage de la page echo ''."\n"; -echo ''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; -echo ''.NOMAPPLICATION.''."\n"; +echo ''._("About").' - '.NOMAPPLICATION.''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -319,4 +319,4 @@ echo '
    '."\n"; bandeau_pied_mobile(); echo ''."\n"; echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; diff --git a/bandeaux.php b/bandeaux.php index 0f6cbaf..833460a 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -41,13 +41,11 @@ include_once('fonctions.php'); function framanav() { -/* if (file_exists($_SERVER['DOCUMENT_ROOT']."/framanav/nav.php")) { - //echo "\n".' '."\n";; - //echo ''."\n"; - include_once($_SERVER['DOCUMENT_ROOT']."/framanav/nav.php"); - //echo ' '."\n"; - }*/ + if (file_exists($_SERVER['DOCUMENT_ROOT']."/nav/nav.js")) { + echo "\n".' '."\n";; echo ''."\n"; + echo ' '."\n"; + } } function gAnalytics() { @@ -73,7 +71,7 @@ function gAnalytics() { function logo () { /* if(defined('LOGOBANDEAU')) { - echo ''."\n"; + echo ''."\n"; }*/ } @@ -83,11 +81,11 @@ function bandeau_tete() { if ( IMAGE_TITRE ) { - echo '
    '.NOMAPPLICATION.'
    '."\n"; + echo ''."\n"; } else { - echo '
    '.NOMAPPLICATION.'
    '."\n"; + echo ''."\n"; } ; @@ -97,7 +95,7 @@ function bandeau_tete() // bandeaux de titre function bandeau_titre($titre) { - echo '
    '. $titre .'
    '."\n"; + echo '

    '. $titre .'

    '."\n"; } @@ -107,7 +105,7 @@ function liste_lang() $str = ''; foreach ($ALLOWED_LANGUAGES as $k => $v ) { - $str .= '' . $v . '' . "\n" ; + $str .= '
  • ' . $v . '
    • ' . "\n" ; } return $str; @@ -118,7 +116,7 @@ function liste_lang() function sous_bandeau() { /*echo '
    ' . - ''. _("Home") .'' . + ''. _("Home") .'' . ''. _("Example") .'' . ''. _("Contact") .'' . //''. _("Sources") .'' . //not implemented @@ -133,15 +131,15 @@ function sous_bandeau() function sous_bandeau_admin() { echo '
    ' . - ''. _("Home") .''; + ''. _("Home") .''; if(is_readable('logs_studs.txt')) { - echo ''. _("Logs") .''; + echo ''. _("Logs") .''; } - echo ''. _("Cleaning") .'' . - '' . - liste_lang() . ''. + echo ''. _("Cleaning") .'' . + '
      ' . + liste_lang() . '
    '. '
    '."\n"; gAnalytics(); @@ -166,16 +164,17 @@ function sur_bandeau_pied() function bandeau_pied() { //echo '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n"; - echo '
     
    '; echo '
    ' . - ''. _("Home") .'' . - ''. _("Example") .'' . - ''. _("Contact") .'' . + '' . + '
      ' . + liste_lang() . '
    '. '
    ' . "\n"; gAnalytics(); } @@ -187,14 +186,16 @@ function bandeau_pied_mobile() '
    '. _("Université de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'
    '."\n";*/ echo '
     
    '; echo '
    ' . - ''. _("Home") .'' . - ''. _("Example") .'' . - ''. _("Contact") .'' . + '' . + '
      ' . + liste_lang() . '
    '. '
    ' . "\n"; gAnalytics(); } diff --git a/buttons.css b/buttons.css index 1090579..13acce3 100644 --- a/buttons.css +++ b/buttons.css @@ -71,9 +71,9 @@ .gray { color: #e9e9e9; border: solid 1px #555; - background: #6e6e6e; - background: -webkit-gradient(linear, left top, left bottom, from(#888), to(#575757)); - background: -moz-linear-gradient(top, #888, #575757); + background-color: #575757; + background-image: -webkit-gradient(linear, left top, left bottom, from(#888), to(#575757)); + background-image: -moz-linear-gradient(top, #888, #575757); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#888888', endColorstr='#575757'); } .gray:hover { @@ -114,11 +114,11 @@ /* orange */ .orange { color: #fef4e9; - border: solid 1px #da7c0c; - background: #f78d1d; - background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20)); - background: -moz-linear-gradient(top, #faa51a, #f47a20); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20'); + border: solid 1px #c42710; + background-color: #c42710; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f47a20), to(#c42710)); + background-image: -moz-linear-gradient(top, #f47a20, #c42710); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f47a20', endColorstr='#c42710'); } .orange:hover { background: #f47c20; @@ -158,11 +158,11 @@ /* blue */ .blue { color: #d9eef7; - border: solid 1px #0076a3; - background: #0095cd; - background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5)); - background: -moz-linear-gradient(top, #00adee, #0078a5); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5'); + border: solid 1px #00328B; + background-color: #00328B; + background-image: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00328B)); + background-image: -moz-linear-gradient(top, #0078a5, #00328B); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00328B'); } .blue:hover { background: #007ead; @@ -203,21 +203,21 @@ .green { color: #e8f0de; border: solid 1px #538312; - background: #64991e; - background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e)); - background: -moz-linear-gradient(top, #7db72f, #4e7d0e); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e'); + background-color: #426514; + background-image: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#426514)); + background-image: -moz-linear-gradient(top, #7db72f, #4e7d0e); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e7d0e', endColorstr='#426514'); } .green:hover { - background: #538018; - background: -webkit-gradient(linear, left top, left bottom, from(#6b9d28), to(#436b0c)); - background: -moz-linear-gradient(top, #6b9d28, #436b0c); + background-color: #538018; + background-image: -webkit-gradient(linear, left top, left bottom, from(#6b9d28), to(#436b0c)); + background-image: -moz-linear-gradient(top, #6b9d28, #436b0c); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6b9d28', endColorstr='#436b0c'); } .green:active { color: #a9c08c; - background: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#7db72f)); - background: -moz-linear-gradient(top, #4e7d0e, #7db72f); + background-image: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#7db72f)); + background-image: -moz-linear-gradient(top, #4e7d0e, #7db72f); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e7d0e', endColorstr='#7db72f'); } diff --git a/choix_autre.php b/choix_autre.php index b44441c..c0a6e21 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -48,22 +48,21 @@ if (file_exists('bandeaux_local.php')) { //si les variables de session ne sont pas valides, il y a une erreur if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SESSION) === false || issetAndNoEmpty('adresse', $_SESSION) === false) { - echo ''."\n"; - echo ''."\n"; + echo ''."\n"; + echo ''."\n"; echo ''."\n"; - echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; + echo ''."\n"; + echo ''._("Error!").' - '.NOMAPPLICATION.''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); - echo '
    '."\n"; - print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; - print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; - echo '


    '."\n"; + echo '
    '."\n"; + print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; echo '
    '."\n"; //bandeau de pied bandeau_pied(); @@ -136,7 +135,14 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE $_SESSION["nbrecases"]=$_SESSION["nbrecases"]+5; } - print_header(); + + if( ($testremplissage != "ok" && (isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"]))) || ($testdate === false) || ($erreur_injection) ) { + // S'il y a des erreurs + print_header(false, _("Error!") .' - '. _("Poll subjects (2 on 2)")); + } else { + print_header(false, _("Poll subjects (2 on 2)")); + } + echo ''."\n"; framanav(); @@ -146,8 +152,8 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE bandeau_titre(_("Poll subjects (2 on 2)")); sous_bandeau_choix(); - echo '
    '."\n"; - echo '
    '. _("Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:") .'

    '."\n"; + echo '
    '."\n"; + echo '

    '. _("Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:") .'

    '."\n"; echo ''."\n"; //affichage des cases texte de formulaire @@ -156,7 +162,7 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE if (isset($_SESSION["choix$i"]) === false) { $_SESSION["choix$i"] = ''; } - echo ''."\n"; + echo ''."\n"; } echo '
    '. _("Choice") .' '.$j.' :
    :
    '."\n"; @@ -168,9 +174,8 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE //ajout de cases supplementaires echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo '
    '. _("5 choices more") .''. _("5 choices more") .'
    '."\n"; - echo'
    '."\n"; //echo ''."\n"; //echo ''."\n"; @@ -191,46 +196,43 @@ if (!isset($_POST["fin_sondage_autre_x"])) { //message d'erreur si aucun champ renseigné if ($testremplissage != "ok" && (isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"]))) { - print "
    " . _("Enter at least one choice") . "

    "."\n"; + print "

    " . _("Enter at least one choice") . "

    "."\n"; $erreur = true; } //message d'erreur si mauvaise date if ($testdate === false) { - print "
    " . _("Date must be have the format DD/MM/YYYY") . "

    "."\n"; + print "

    " . _("Date must be have the format DD/MM/YYYY") . "

    "."\n"; } if ($erreur_injection) { - print "" . _("Characters \" < and > are not permitted") . "

    \n"; + print "

    " . _("Characters \" < and > are not permitted") . "

    \n"; } if ((isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"])) && !$erreur && !$erreur_injection) { //demande de la date de fin du sondage - echo '
    '."\n"; echo '
    '."\n"; - echo '
    '. _("Your poll will be automatically removed after 6 months.
    You can fix another removal date for it.") .'

    '."\n"; - echo _("Removal date (optional)") .' : '. _("(DD/MM/YYYY)") ."\n"; + echo '

    '. _("Your poll will be automatically removed after 6 months.
    You can fix another removal date for it.") .'

    '."\n"; + echo ' : '. _("(DD/MM/YYYY)") .''."\n"; echo '
    '."\n"; echo '
    '."\n"; - echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; + echo '

    '. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.").'

    '."\n"; echo '
    '."\n"; - echo '
    '."\n"; //echo '
    '. _("Next") .'
    '."\n"; //echo ''."\n"; //echo '
    '. _("Create the poll") .'
    '."\n"; - echo ''; + echo ''; echo '
    '; } //fin du formulaire et bandeau de pied echo ''."\n"; - echo ''."\n"; - echo '


    '."\n"; + echo ''."\n"; echo '
    '."\n"; //bandeau de pied bandeau_pied_mobile(); echo ''."\n"; echo ''."\n"; -} \ No newline at end of file +} diff --git a/choix_date.php b/choix_date.php index ff1ae04..6126d15 100644 --- a/choix_date.php +++ b/choix_date.php @@ -50,11 +50,11 @@ if (is_readable('bandeaux_local.php')) { //si les variables de session ne snot pas valides, il y a une erreur if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) && !issetAndNoEmpty('commentaires', $_SESSION) && !issetAndNoEmpty('mail', $_SESSION)) { echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; + echo ''._("Error!").' - '.NOMAPPLICATION.''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; framanav(); @@ -63,7 +63,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) bandeau_titre(_("Error!")); echo '
    '."\n"; print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; - print _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.' . "\n"; + print _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.' . "\n"; echo '


    '."\n"; echo '
    '."\n"; //bandeau de pied @@ -214,12 +214,12 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) //debut de la page web echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; - echo ''; + echo ''._("Poll dates (2 on 2)").' - '.NOMAPPLICATION.''."\n"; + echo ''."\n"; + echo ''; echo ''."\n"; echo ''."\n"; @@ -230,7 +230,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) bandeau_titre(_("Poll dates (2 on 2)")); sous_bandeau_choix(); - echo '
    '."\n"; + echo ''."\n"; //ajout pyg pour la cohérence graphique @@ -244,7 +244,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) //debut du tableau qui affiche le calendrier echo '
    '."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo '
    '.$motmois.' '.$_SESSION["annee"].'
    '.$motmois.' '.$_SESSION["annee"].'
    '."\n"; echo ''."\n"; echo ''."\n"; @@ -498,7 +498,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) } if ($_SESSION["nbrecaseshoraires"] < 10) { - echo ''."\n"; + echo ''."\n"; } echo ''."\n"; @@ -621,4 +621,4 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) unset($_SESSION["nbrecaseshoraires"]); echo ''; } -} \ No newline at end of file +} diff --git a/contacts.php b/contacts.php index d1d72c4..2590fd6 100644 --- a/contacts.php +++ b/contacts.php @@ -65,21 +65,20 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse } //affichage de la page de confirmation d'envoi - echo ''."\n"; - echo ''."\n"; + echo ''."\n"; + echo ''."\n"; echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; + echo ''._("Make your polls").' - '.NOMAPPLICATION.''."\n"; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; logo(); bandeau_tete(); bandeau_titre(_("Make your polls")); echo '
    '."\n"; - print "

    " . _("Your message has been sent!") . "



    "."\n"; - print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; - echo '


    '."\n"; + print "

    " . _("Your message has been sent!") . "

    "."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION."."."\n"; echo '
    '."\n"; bandeau_pied(); session_unset(); @@ -94,19 +93,19 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse } //affichage de la page - echo ''."\n"; - echo ''."\n"; + echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; - echo ''.NOMAPPLICATION.''."\n"; - echo ''."\n"; + echo ''._("Contact us").' - '.NOMAPPLICATION.''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; framanav(); //debut du formulaire - echo ''."\n"; + echo ''."\n"; //bandeaux de tete logo(); @@ -132,8 +131,6 @@ framanav(); echo ' '. _("The address is not correct!") .''; } - echo '

    '; - echo _("Question") .' :
    '."\n"; echo ''; @@ -141,9 +138,7 @@ framanav(); echo '  Il faut poser une question !'; } - echo '


    '."\n"; echo ''; - echo '


    '."\n"; echo ''."\n"; echo ''."\n"; //bandeau de pied diff --git a/errors/error-forbidden.php b/errors/error-forbidden.php index c0c6e74..d4af9b8 100644 --- a/errors/error-forbidden.php +++ b/errors/error-forbidden.php @@ -41,7 +41,7 @@ include '../bandeaux.php'; echo ''."\n"; -echo ''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; echo 'Erreur !'."\n"; @@ -62,4 +62,4 @@ echo ''."\n"; sur_bandeau_pied(); bandeau_pied(); echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; diff --git a/fonctions.php b/fonctions.php index 92837d3..9f7513b 100644 --- a/fonctions.php +++ b/fonctions.php @@ -56,7 +56,7 @@ function connexion_base() function get_server_name() { $scheme = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http'; - return $scheme . '://' . $_SERVER['SERVER_NAME'] . '/'; + return $scheme . '://' . $_SERVER['SERVER_NAME'] . dirname($_SERVER['SCRIPT_NAME']).'/'; } @@ -105,10 +105,10 @@ function is_user() function print_header($js = false, $nom_sondage = '') { - echo ' - + echo ' + - '; + '; if (empty($nom_sondage) === false) { echo ' '.stripslashes($nom_sondage).' - '.NOMAPPLICATION.''; @@ -117,8 +117,8 @@ function print_header($js = false, $nom_sondage = '') '.NOMAPPLICATION.''; } echo ' - - '; + + '; echo ''; } @@ -219,15 +219,15 @@ function getUrlSondage($id, $admin = false) { if (URL_PROPRE === true) { if ($admin === true) { - $url = get_server_name().$id.'/admin'; + $url = str_replace('/admin','',get_server_name()).$id.'/admin'; } else { - $url = get_server_name().$id; + $url = str_replace('/admin','',get_server_name()).$id; } } else { if ($admin === true) { - $url = get_server_name().'adminstuds.php?sondage='.$id; + $url = str_replace('/admin','',get_server_name()).'adminstuds.php?sondage='.$id; } else { - $url = get_server_name().'studs.php?sondage='.$id; + $url = str_replace('/admin','',get_server_name()).'studs.php?sondage='.$id; } } diff --git a/framanav b/framanav deleted file mode 160000 index 24d503e..0000000 --- a/framanav +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 24d503e3e56e9fa095a2cee17576f6f0cb518fcc diff --git a/i18n.php b/i18n.php index 439fee7..34c20c7 100644 --- a/i18n.php +++ b/i18n.php @@ -23,3 +23,7 @@ textdomain($domain); /* temp, for compatibility :*/ $a = explode('_', $locale); $_SESSION['langue'] = strtoupper($a[0]); + +/* */ +$lang = ($_SESSION['langue']!='') ? strtolower($_SESSION['langue']) : 'fr'; + diff --git a/index.php b/index.php index e574c90..b1ef0e7 100644 --- a/index.php +++ b/index.php @@ -47,12 +47,12 @@ if (is_readable('bandeaux_local.php')) { session_start(); //affichage de la page -echo ''."\n"; -echo ''."\n"; +echo ''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; -echo ''.NOMAPPLICATION.''."\n"; -echo ''."\n"; +echo ''._("Home").' - '.NOMAPPLICATION.''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -73,17 +73,15 @@ echo '
    '."\n"; # ''; #echo '
    ' . "\n"; -echo '
    '."\n"; - echo '
    '; -echo '
    '; -echo '' - . _('Schedule an event') . ''; +echo '

    '; +echo '' + . _('Schedule an event') . '

    '; echo '
    '; echo '
    '; -echo '
    '; -echo ''. _('Make a poll') . ''; +echo '

    '; +echo ''. _('Make a poll') . '

    '; echo '
    '; diff --git a/infos_sondage.php b/infos_sondage.php index e7b8482..473074d 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -141,18 +141,23 @@ if (issetAndNoEmpty("poursuivre")){ } + } else { + // Title Erreur ! + print_header(true, _("Error!").' - '._("Poll creation (1 on 2)")); } +} else { + // Title OK (formulaire pas encore rempli) + print_header(true, _("Poll creation (1 on 2)")); } //affichage de la page -print_header(true); echo ''."\n"; framanav(); //affichage des bandeaux de tete logo(); bandeau_tete(); -echo '
    '. _("Poll creation (1 on 2)") .'
    '."\n"; +echo '

    '. _("Poll creation (1 on 2)") .'

    '."\n"; sous_bandeau(); // premier sondage ? test l'existence des schémas SQL avant d'aller plus loin @@ -167,56 +172,69 @@ if(!check_table_sondage()) { } //debut du formulaire -echo ''."\n"; +echo ''."\n"; -echo '
    '."\n"; -echo '
    '. _("You are in the poll creation section.
    Required fields cannot be left blank") .'

    '."\n"; +echo '
    '."\n"; +echo '

    '. _("You are in the poll creation section.
    Required fields cannot be left blank") .'

    '."\n"; //Affichage des différents champs textes a remplir -echo '
    '."\n"; +echo '
    '."\n"; -echo ''."\n"; +echo '"."\n"; + // fermeture de la ligne du dessus avec attribut aria-describeby pour avoir les infos concernant l'erreur + // pas très propre mais bon... + echo 'aria-describeby="#poll_title_error">'."\n"; + echo ''."\n"; } elseif ($erreur_injection_titre) { - print "
    "."\n"; + // idem + echo 'aria-describeby="#poll_title_error">'."\n"; + echo ''."\n"; +} else { + // pas d'erreur, pas d'aria + echo '>'."\n"; } echo ''."\n"; -echo ''."\n"; +echo ''."\n"; + echo '"."\n"; +} else { + // pas d'erreur, pas d'aria + echo '>'.stripslashes($_SESSION["commentaires"]).''."\n"; } echo ''."\n"; -echo ''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } if (!$_SESSION["nom"] && issetAndNoEmpty("poursuivre")) { - print ""."\n"; + print ""."\n"; } elseif ($erreur_injection_nom) { - print "
    "."\n"; + print ""."\n"; } echo ''."\n"; -echo ''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } if (!$_SESSION["adresse"] && issetAndNoEmpty("poursuivre")) { - print ""."\n"; + print ""."\n"; } elseif ($erreur_adresse && issetAndNoEmpty("poursuivre")) { - print ""."\n"; + print ""."\n"; } echo ''."\n"; @@ -238,13 +256,13 @@ if ($_SESSION["studsplus"]=="+") { $cocheplus="checked"; } -echo '
    '."\n"; +echo '

    '."\n"; if ($_SESSION["mailsonde"]) { $cochemail="checked"; } -echo '
    '."\n"; +echo '

    '."\n"; //affichage des boutons pour choisir sondage date ou autre if ($_GET['choix_sondage'] == 'date') { @@ -253,7 +271,7 @@ if ($_GET['choix_sondage'] == 'date') { $choix = "creation_sondage_autre"; } echo ''; -echo '
    '; +echo ''; echo '
    '; diff --git a/locale/de_DE/LC_MESSAGES/Studs.mo b/locale/de_DE/LC_MESSAGES/Studs.mo index 87e4b0a94ee56eb514315313831af748be5977cc..caf6a9fc0a6d89b31d3330b8964ca86e7e3792c5 100644 GIT binary patch delta 2000 zcmXZcYix{J9LMqhLt7nFm$q7Jx>VJ48CC6;vMsIIB9v4`UG~M6vO+Xcq-ob}Yz2vp zOAy&6c3nf#dZA{MmEes;#3tKVB;t~|h0P`N<$un3?(X!S zw|N&5`ovC~S?dt949wu#dn%0%tH4oL0V*U!lS!QVjO0WQD<8W-o5FW(!cpgV$h=;jYhJ@@p3}Y)6<8j=L zx1G!AMD3oSGW!7&@nej_EDDL){)2g_mDi#gtj6)!h+0uQ)?g|3aTmtGig1>v5 za98g~o|Vc7wqP-8Vjb8Yuiy&2fn7M3^yv9RRH|R0GLyt?2VoHPJcRlX6%>*G9tu?i z60wMU>V;C&z~vZZLf@cfUPInB@DkLD8;~1kZKypxflBpN)CBHe8up+D{D^ulll`Pi zn;fH%PGK#o!8X)&Jc8=r0;=Pi$Rh0}4!}&Vj8>F~e_;t~pd>a{6Uf3TSctmsYmoD5 zJFo%Iq9z^-aKiE_BVknLCSWC&peERiIk*$G zz%!^VzJw|G2p8)9|3jgdKslc$uBMfhv1(k7t(eM{*ob?P7wmuJM%jXC{)$^r1MEe` ze?^_C>&|Y}r~4j`!dcVJns5!)>i*xSP)Q(CVMZHkM4i?S7XQH&)|*)Jh+q&QLFE;KUhzyL@LM_ScF_DQLz~1+d!H7o!HKkGBUddtTMyx?qcE a@jrvVM&ctX*w!Jhyg+S9=R delta 2115 zcmXZc4NR3)9LMqhHBj+l_>M*BgPB4^Y7v@msIk_>bUHI^OXB6)y{+y;aCwQj-9=8# zIoh<)mQ&K1xJ5CDEbYZwTh7JQRW@8^tW~%gi&?95%f3IKv%&qG|NnV8=lst(&rdC( zZ(a&@rHn}aXl6~5%qHVTelpO<6inh++=^k`?XDldVd8gi6t+(Z?(cAR;$`yPF5aCP z+_x7=*+HC$?`K-_X5tKqTS*Myc>DtylZ}`f+?a`@iSscX3z1uFIcmTgaU8~6+>Cn9 zPM6>B;!f1_pJE$+H8mN`uf1DAI9+tPRBAX&cG%lWpCgt?8W== zd)$T@JS^K#_hsJ^RBAq^5-(2Dc$mftcj0B!%v;?Jhw&cbW2hNjz%@9Cui}DiGY|W) z5{Ga-uARm|zJ)9BA6$rw7`-ajfLelND-F%?5T@ZLs1lvVr|?^My~s1GCSHfD@HpmT zN{-pxSb%e|3}@pGybHVVPQ2i}hPMz;qkJRj-)7KwfJ7eBmz4(>EQ$QtHh#4B$6UVK z#UG+J-{+{!dImLtvo7w(Yaz2Aa54G*nP$Z}g;A-J8!(;zElR^9QIG5kYeRMTE;3mA z09j7EhVzs;nfwJ1f6 zwA{t}aXxVu7UCez#cb+*Kdwe?wiZ+cdNB=8pa%Sfi!UQ5)vjPZ-oPTvCrGMC_RtWrj?5q;Fae#J5PFIHd*W%(I5qpq)FbSm{GRAm}51GnIK+=coO z9hgV`f2Yw)LTh-4dg_4=RL7kdWNuuyB=mwD)QcA)leNcjEN(~5=ruf#M^GI#vapkJ zCoaHt)Oqhm_N@(LC1$d*H1K3IjoCEzA^XBkp*s4_<+FIpQR0WNRe98anjZ`*vKLjk zgSZTjpa%F0diW=5f|L3BXo>SM9UsMYI{#15_>V*eKxQ=HPLx!G2t;^S`n<82NtW9d-$|TeFr0yLXdw z7i#7wP)qb3>PvPNwKx98QoMnhY3cG{5BaE$8&LP{bGG9c&A5YxPC<_n_>qghM0Iek z=k>Icp^)u)EZi7c+S3=F7z&jf9!MX(B)2h^i2C&jucqRKSo~?PB9Vy16EQ#TC44Ut zjd)d2KUNi~^Zd;>L!Vr&*Wf22wRL$t1CzS53cXxE8jpC@G5y!o_+B-4RK)p>#J%;A b*t79S^f^+^^(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." -msgstr "Um an dieser Umfrage Teilzunehmen tragen sie bitte ihren Namen, wählen sie die ihnen passenden Wehrte (ohne die dispo der anderen Teilnehmer zu beachten)
    und bestätigen sie ihre Wahl mit dem Knopf am ende der Ligne." +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line." +msgstr "Um an dieser Umfrage Teilzunehmen tragen sie bitte ihren Namen, wählen sie die ihnen passenden Wehrte
    und bestätigen sie ihre Wahl mit dem Knopf am ende der Ligne." #: studs.php:445 #: adminstuds.php:806 diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo index ec3d9c461bcc82392341a249a44b6844f02936f1..43e14ec8cd59bc04b8486c1eb5564ed57d0b6325 100644 GIT binary patch delta 1900 zcmXZcSx8ku9LMqh#oVr%X^WPXwrJX-S!5w*WMMs6CPk%fW|k6V&_gdJCqa!sLMYqw zK_L=~mP;GKk!GWCJVs$I#$x_R z^DK$RG9GB*Ey$X-$HfOx6STVL9WD;xah~^}HoB47S<7}}G}hxRJcQ%$I;P+gtiz9( ziW^3IW|L{`C;hS5jv06h=U^W;W8xU!Q>bxi>{=DbcP>Kaw52!`%TXI|#!@_q$8Z4C zus+$W3fnyzYiI7Wp zCM?1Gn2GV@&8DNbfJP3DZ8!~&Vmfx?6nyIppI{bFoP`mXgF4GR=OPRvUheu!a31k$ zRH+Z6?oJn~a#wvlyFo(}ccUh_hgzTqwZJ3PAD_GUH7etN)VMG1`47}Mo9HhPg&G&< z;v^gla0yX~#;1`C_s{0jQ0ca!ZfzavjO#IoCtTctx}0}VrGJdt;0M%322uULP?s_| z$&AyrWYk-fi#oc6sBvXDmi4WQMiw5x3_S0AjGA}|^>+M5Ef~X%)y764r(>z84Hclq ztw-*u)uIyfP>Hpm#+^Z~huuU^ugx#RgoWMew@|4O5l2Rge7(%0pva@JrU@h%saaB#|` z4E1_dqF%ebsLC8dW!#E-Th5^tzK$w+kBeWR{@*{1`m5uodk~%Je^^pbJH3Xg&|TDJ z>cv_38dbs=&P^rFz&b2KRpu&EM0<*=TE-0 zcp7KoWz^1JVJUt>eOLhYcj$K1gFwKJHUuvRvO~EsJHkUX=}mE=@`+C){8*ZP@yr1IaHKHlL(Y_NEX+O3`9ehf&S8ZzWSU$A=vKYywB%+&X@N& z=QFzXPW{ppwjIT6 z9L6#{hx2e0AHy70nZy!Yfcs_!W{W5cQ85>D(`zH{#h3AStiflQel_+Web{Ma@iu~5 z(QVXu4#2=zkeI9joZlN;wXJ}x5QBcPZQ62n)8em+0I6yY)#c3{{ zhgxv~s$H3@e-hPhC2D}xsCH{zyb(tu975DW>pac@=g)i!O5H)!sr>@A$HN%ID=to> z4(B5zixyiLPOu0ykqXrFr%;Eo7TH~U5p|1_sI7Yo)$RkF%lLMPLJ6M0BK*x6<7BGi zO4RLGflB%FsEIWqyJWARCe(#$*N>c2`y92flcQ zm4RAhF4l~ic@J*GPf&Y0hV{5$aTvdbRmAV(4LplnBs;=^(!_>P<9vt8$Vegizfa*N z723NiEPn$2?EDqe#J600o{iH=zDHfJpHSEC4k|MdjrwAF z6_bBGXm=GoI6&NwnrSKfq6}4|4pTjr;Y+9#_M%dH81-Q}iOS4U?iSg#b*M}xku})6 zsPD=#?8BRZDjr(yDeuhnW+&!PVEc~#PVIB2*kfd1}S(9Z| zhToMcWOu9u*=5^}92@&OG_b1_GN^cjQ5?f8jFKmri{o()>UkdO!%~1s^=8b(E>z~a zoqec&ccb3_2=#tHs^0^cX{)#?o9Y?sU5!edUIDIxy@_#{dm$(q>`SW^8B{A*V2|sw8T5SRO^3X cin@01jg%j6?(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." -msgstr "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line." +msgstr "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line." #: studs.php:517 #: adminstuds.php:886 diff --git a/locale/es_ES/LC_MESSAGES/Studs.mo b/locale/es_ES/LC_MESSAGES/Studs.mo index ab0a92d3103d65e5e2924916313958d4630b1dbe..b6d9de1b5523b3878aba84cde06504a7983cd141 100644 GIT binary patch delta 2032 zcmXZcdu+{T9LMqRujo!yopNxjX029RQ>KQqPH%M5NmQ01E;F~r(g~XEQq@NK8?r9T zEUCJ680PP4M@dS?dt9p;*MfFwVigScNHAjmcQ+o^Qm5^ta+0xOrIc{twP(yhVJ6>(@qu z_ZpCpZNdot6g9s$aD>1>0v$LAuOVx)yY9v37@|LLxY+=VA|V@%T5u7jVukB3L5;K4 z#eLUrM*V&t?!=?R{a}aXZ<-AzFb~ILHKySX9D!|EgO@QK3wfA{i;<8uVh*q*(^GVHI}b zJe>TtStWjtpWt6uhA~z@73)zM^na(Jv$%}fX*VX}3skBSGt8D_1oixDT#3zCfsb$u zmW?tSi>q-0?!;U?kJV{h?sz|3V) zB>OfMwbKPicI`XV1`eSX@;COwe=reyFqA+hT>J@X8_fLnl7@;S^_^hCv8Wm-L*BIo zs3U4bWu^sHq{s1H>_*i{nEcBk)MvX2weULB_}`#DP(lS7TAPb0rm@$Bs+%h;|)};gjtQuLwyw=A!T3+Ks+shVi?cib-arD-C-(H z@0~@au7Hyy5 zG~A2Y$t}#mFhTu3hRWDn?1MF^Oniw;u^!X03w19%#jF`LUeVBsGRdooE+6&70%s}e xLMcc6a2D#UD^U}zh@VV4<#{u<)h5?@7Qdey@w}4#UP>rlGW2R%yfD9I&}$$q-E#l{ delta 2138 zcmXZce@sKvkb0q`O(_F2A7D{c9ymp zxz5R8=P;Ji+%iM;VYPkZ({}yV;UX~t{=x4`rlwOp19e+|Es`ByvX=e z&_BGuzwa0_WS?OUo?T$x?7;5~WHR97na#y)Bqm#ex^X3@;DeZsjmQ)WqXO>3Z0ryE zZ=#;_Q84~V(4R!jzlg8lA9`fwev&44JWaJ{wdUs{>IIiQeZZK z+t9^n+=-cs$PPYI*6>U8#wHr|z*%FLz$Lo$+6E-p4NK_%#w<9!EeAiGrc8Xa9Gf^q3 z#@XUS1=5I|g7uf^r8Ads?2Bg4kg6-_3bjBzW-B06YIjuoDQ!d5Oc(0NUPo=< zI4ZzP!F6q0881S6p6uBqZZzUy6*MUc$daO4L$e-HsLQggCRasN?qkDv*&O#w&VBM zinXi#Px25p)6WQ*u?LGH^=$9qGW-s86#t-(GJlQ#b`;_^z5i7-6u@457DrGE72RXT z&tB$_P1q!^#U%cyE4v?c*1f3tL#T{RU;>^+W#T+OhL>?Mt|fi?E;QrP4K&(lWZ+Av z6b_;$z7zNXCelBInmC3!>v7aVr^d!pCmhH2_oVeYYsRM2avW#FK_??6RMOiS?}+up z-Cg0n&S<+Ej>jX>cxNo?#$#^0BjUDn#5!9d-EORHwi{!t%Y7;qk92jHjybtg`Q;_u mo!lLXG9HP#Ej`Q+yHCWJ67S+a5@o169&U{>;dJG`x&H$N)(Er! diff --git a/locale/es_ES/LC_MESSAGES/Studs.po b/locale/es_ES/LC_MESSAGES/Studs.po index 3084fce..6685449 100644 --- a/locale/es_ES/LC_MESSAGES/Studs.po +++ b/locale/es_ES/LC_MESSAGES/Studs.po @@ -400,8 +400,8 @@ msgid "Comments" msgstr "Comentarios" #: studs.php:261 -msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." -msgstr "Para participar a esta encuesta, introduzca su nombre, elige todas las valores que son apriopriadas
    (sin tener en cuenta los otros encuestados) y validar su seleccion con el botón verde a la fin de línea." +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line." +msgstr "Para participar a esta encuesta, introduzca su nombre, elige todas las valores que son apriopriadas
    y validar su seleccion con el botón verde a la fin de línea." #: studs.php:445 #: adminstuds.php:806 diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo index b4a2568ca7bbf597dd3ac7bdf46ae7a12b74f7c5..bbe822ca8fc952cf9e5e6810968f2dbbafe7b650 100644 GIT binary patch delta 2349 zcmYM!eN5F=7{Kx8$NL2?uW|__MdDpVUJAh*2ztdggrF8hYvY1~s9iQAUA4HamMgPX zT)=-Q2qr6X)VkSpE}>+KTg#d{=xt2xHNX4vfHb)aM2G7gk~@7A2YQueMx+bBw!i z;d{v3u>U$?J49{UC&LXkP71RL# z!x*$LHv3CZ=gCJMuUzaEX{AwbJvfRw(HZQ=3#dEal_C;{&!PuUC2iU z_{SXbrR8s^#TQQc0x%8(F##XIBqS+Phr}+O7=%3-%=&W38h8h98zRG~)jB{lnt}K6 zVZ4JnUYld?s0o+TZ%1MlA8H`SEGLnvWZLp3>g{r{JN;fBX0X0IM&o|$#$fbY9>);+ z6S$MDowoXgRGv;$ih65mQ8TpN@(t8tJ&JmJrcnc%LCwe<>QN=+lYiQhLt_IrVigWz zIbO0{$~kCYPofQ5QLoQasAu18*^klm$5AtK64|s|Mh(DTU%LLGYI`NHCv&wIw9?5N7$@9Q6Gh@Zv zQO#rx>ihMm^FNMyG}};rPrR?uNTxA@8pui1lwYvCf%;;I)7)VyYVqWtj+dhY8?C;_ z>c5IQ&md|I9K+Y~7u3vp9$eU{SNdpNXW%euE%Z=%I^iJd1fO9Ap0oN(Ga*^#0G#7-k^4l0p0gb%E+CGj+|V)xQI4(Suqu zpQC2tENbR{LQY5iMh$%VT9N0`g{g+fB=Qp?msq_Q!(AeKSYHNd?8LbBB5n8rw&Jg- zk#4LuYvCYjVB?sE(@43rG>^; z96}0J{y_a*NZ(BQumO{?6GQO;24D|{VIMw(?_wt2L=Dif#Vo=y45nXU^<79p^v`!W ze3?<}4~}Rw>^0`l!bR!xbwr*r-t(=nC)x%W->1*~TkY|NaoF#UDzN##PCOA8(dKS_ zW_OpntD`N)_jZ1~Z#1_&{O*|ldhTqf@w9KMXky`iga2ajcLDx?N-hT7eQU4(ytBaw gIQ4-)vpmiS%XGKzaqr#k^p{n9A89y!@mr4k4^#dix&QzG delta 2457 zcmYM!eN0t#7{Kx82!t0wc@arOJAf#lq~TjCsAydbUr;Wi(lx!pHLhLnW!ytr#;(-B znXE0ZZ_N_3+E}^ya$AN}H2o*%TDsl@SGqCMR<>leWm_-b$8%=vazE$!opXOL&+qx2 z3kQt8gT_f~MC7`N6lRG`Lf3;LnHu95T!its8dK1NqtNTz--@@1TQLzs#2?^j;&YgWmvJl(qCWR0j>O~%{9`7v z7Rf_hzyeIgDkol#+Rt-Nd+UUVNIea&IX8w;JBrT{Ie=-XEAPg1{0Lom0ZZ^}WDa6X z6yc|myIEX7Xjz&=Mez36jaqNeT!YASz4 zHx4`P^G!QLi%{=-a5_GXy7CUJ#zVLdBR9F=Bdxh2oA3zMqQNxRVjZr-Zd{6SOnU*k zk;OIP~?Z{tS%2lf7j$s!GmFFUwcNyBw4#F7G$Vywd%*oIT_ z6!MXNzUV{#b<8JiT6~o_0;@3&Yj6(MA<2zWbky++)MEV|_4LF&Y)>p5H6z)mTeSuwJR=QU zRN`K&zyU1B9P+QOL!Hc273U zB>$Sqb{e#!y{LQhK5A-DAnz8riW~&FgSv+qkJu@liyA+JdJK1>7Uf~o8tK8=_yg*D zBAuh9TQmXFFu#=i>t4^HAq6Wi6{}JAY$JY#yKsQoaI;T3P%e4Ytti6)E<+vQByxbH z2X&yUScii+j0@)4nJJlPPoO5kMJ6{IFbQ8oO<_A~NBfaQ%Ncxy3EV{OI56L?atn1! zw&M)$zl@r()0|Pww~&QKWGof-3k{P|Yaw-!-Qh&kJ(`Vt#LbsZ ztQ~biM^KCCV{F79QCC*E*d8E&Q;DOf6X->~KZMILX$h0k^S_#lV>EPN6pJeC0X{`d z-S?=~e+^gT5NgfLUTSAz32NqQk=>Cks1rSgJFpi`gL{lxNc_}e_N%uIn;BomJ&3q5idsSNj9O@z#FK?>m59br;&OU&vKE^aTjVaE`LIV zGLbHf==tvFVijgp*)Iqm>U-fZ=HLa)#-A_|jTQE*)`c1;;~E@`Q_zPx!A^|F6PSP> zI`LT~A^H~`Ov*L(#}Y<8X{2a!_3t?UZ$|ye=M9OLq-43?Cf>&Xd$Cn18HTYk<{drL zRbIHwZ#9NmEVIe`f9s6h(DH|ZrWG=+MxR;V81mQq!e(gmy)Z;uv-y0;@->Hx zVy|cQrn^E-`h3tAh}IRa{XdGGD!!5!eYLbNRyAu{oVzgW4TeoR_cxpMp{-4p&upOE z27kCI6!dTM2mIC)pSQln@-3v5JKh$n8N#7p!~GjYv6i{t#wXn$F%YX=SYsHzSa(^v QVR&Qb$_J98Z&e-t59RGl!2kdN diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 99d1a23..c508df9 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -374,8 +374,8 @@ msgid "Comments" msgstr "Commentaire de l'auteur" #: studs.php:238 -msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line." -msgstr "Pour participer à ce sondage, veuillez entrer votre nom, choisir toutes les valeurs qui vous conviennent
    et valider votre choix avec le bouton en bout de ligne." +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line." +msgstr "Pour participer à ce sondage, veuillez entrer votre nom, choisir toutes les valeurs qui vous conviennent
    et valider votre choix avec le bouton en bout de ligne." #: studs.php:456 msgid "Participate" @@ -395,7 +395,7 @@ msgstr "Meilleur choix" #: adminstuds.php:924 #: adminstuds.php:926 msgid "for" -msgstr "à" +msgstr "à" #: studs.php:534 #: adminstuds.php:947 diff --git a/maintenance.php b/maintenance.php index 576c9a8..ea3f8d2 100644 --- a/maintenance.php +++ b/maintenance.php @@ -39,12 +39,12 @@ include_once('bandeaux.php'); -echo ''."\n"; -echo ''."\n"; +echo ''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; echo 'Maintenance '.NOMAPPLICATION.' '."\n"; -echo ''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; logo(); @@ -60,4 +60,4 @@ echo ''."\n"; sur_bandeau_pied(); bandeau_pied(); echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; diff --git a/sources/sources.php b/sources/sources.php index 04d9fc9..a086386 100644 --- a/sources/sources.php +++ b/sources/sources.php @@ -40,7 +40,7 @@ include '../bandeaux.php'; echo ''."\n"; -echo ''."\n"; +echo ''."\n"; echo ''."\n"; echo ''."\n"; echo 'Sources '.NOMAPPLICATION.''."\n"; @@ -61,4 +61,4 @@ echo ''."\n"; // Affichage du bandeau de pied bandeau_pied(); echo ''."\n"; -echo ''."\n"; \ No newline at end of file +echo ''."\n"; diff --git a/studs.php b/studs.php index a0c774f..16cd29e 100644 --- a/studs.php +++ b/studs.php @@ -183,8 +183,11 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"] $err |= NAME_EMPTY; } } - -print_header(true, $dsondage->titre); +if($err != 0) { + print_header(true, _("Error!").' - '.$dsondage->titre); +} else { + print_header(true, $dsondage->titre); +} echo ''."\n"; framanav(); logo(); @@ -219,9 +222,8 @@ if($err != 0) { if(is_error(NO_POLL_ID) || is_error(NO_POLL)) { echo '
    '."\n"; - print "

    " . _("This poll doesn't exist !") . "

    "."\n"; - print _("Back to the homepage of") . ' '. NOMAPPLICATION . '.'."\n"; - echo '



    '."\n"; + print "

    " . _("This poll doesn't exist !") . "

    "."\n"; + print _("Back to the homepage of") . ' '. NOMAPPLICATION . '.'."\n"; echo '
    '."\n"; bandeau_pied(); @@ -232,16 +234,16 @@ if($err != 0) { } echo '
    '; //ajout pyg cohérence graphique -echo '
    Imprimer
    '; +echo '
    Imprimer
    '; echo '
    '."\n"; //affichage du titre du sondage $titre=str_replace("\\","",$dsondage->titre); -echo '

    '.stripslashes($titre).'

    '."\n"; +echo '

    '.stripslashes($titre).'

    '."\n"; //affichage du nom de l'auteur du sondage -echo '
    '. _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'
    '."\n"; -echo '
    '.'Adresse : '.getUrlSondage($dsondage->id_sondage).'
    '."\n";; +echo '

    '. _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'

    '."\n"; +echo '

    '.'Adresse : '.getUrlSondage($dsondage->id_sondage).'

    '."\n";; //affichage des commentaires du sondage @@ -252,15 +254,13 @@ if ($dsondage->commentaires) { echo ''. $commentaires .''; echo '
    '."\n"; } - -echo '
    '."\n"; echo '
    '."\n"; -echo ''."\n"; +echo ''."\n"; echo ''; // Todo : add CSRF protection echo '
    '."\n"; -echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    (without paying attention to the choices of the other voters) and validate with the plus button at the end of the line.") ."\n"; +echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line.") ."\n"; echo '
    '."\n"; // Debut de l'affichage des resultats du sondage @@ -416,12 +416,12 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { //affichage des sujets du sondage echo '
    '."\n"; - echo ''."\n"; + echo ''."\n"; for ($i=0; isset($toutsujet[$i]); $i++) { - echo ''."\n"; + echo ''."\n"; } - + echo ''."\n"; echo ''."\n"; } @@ -442,7 +442,7 @@ while ($data = $user_studs->FetchNextObject(false)) { $nombase=str_replace("°","'",$data->nom); echo stripslashes($nombase).''."\n"; - // Les réponses qu'il a choisit + // Les réponses qu'il a choisies $ensemblereponses = $data->reponses; // ligne d'un usager pré-authentifié @@ -453,7 +453,7 @@ while ($data = $user_studs->FetchNextObject(false)) { for ($k=0; $k < $nbcolonnes; $k++) { // on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs if ($compteur == $ligneamodifier) { - echo ''."\n"; + echo ''."\n"; } //demande de confirmation pour modification de ligne for ($i=0;$i<$nblignes;$i++) { if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { if ($compteur == $i) { - echo ''."\n"; + echo ''."\n"; } } } @@ -500,13 +500,13 @@ if (! ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || !$user_mod) { } else { $nom = 'Votre nom'; } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; // affichage des cases de formulaire checkbox pour un nouveau choix for ($i=0;$i<$nbcolonnes;$i++) { - echo ''."\n"; + echo ''."\n"; echo ''."\n"; } @@ -537,10 +537,10 @@ echo ''."\n".''."\n"; // Affichage des différentes sommes des colonnes existantes echo ''."\n"; -echo ''."\n"; for ($i=0; $i < $nbcolonnes; $i++) { if (isset($somme[$i]) === true) { @@ -555,19 +555,19 @@ for ($i=0; $i < $nbcolonnes; $i++) { echo ''."\n"; } - +echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; for ($i=0; $i < $nbcolonnes; $i++) { if (isset($somme[$i]) && isset($meilleurecolonne) && $somme[$i] == $meilleurecolonne) { - echo ''."\n"; + echo ''."\n"; } else { echo ''."\n"; } } - +echo ''."\n"; echo ''."\n"; echo ''."\n"; echo '
    '. _("Poll title *: ") .'
    " . _("Enter a title") . "' . _("Enter a title") . '" . _("Characters < > and \" are not permitted") . "' . _("Characters < > and \" are not permitted") . '
    '. _("Comments: ") .'
    ' . _("Characters < > and \" are not permitted") . "
    '. _("Your name*: ") .''; +echo '
    '; if (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) { echo ''.stripslashes($_SESSION["nom"]).'" . _("Enter a name") . "" . _("Enter a name") . "" . _("Characters < > and \" are not permitted") . "" . _("Characters < > and \" are not permitted") . "
    '. _("Your e-mail address *: ") .''; +echo '
    '; if (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) { echo ''.$_SESSION["adresse"].'" . _("Enter an email address") . " " . _("Enter an email address") . " " . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "" . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "
    '.stripslashes($toutsujet[$i]).''.stripslashes($toutsujet[$i]).'
    FetchNextObject(false)) { //a la fin de chaque ligne se trouve les boutons modifier if ($compteur != $ligneamodifier && ($dsondage->format=="A+"||$dsondage->format=="D+") && $mod_ok) { - echo '
    '; +echo ''; // si on a plus de 8 colonnes, on affiche un second bouton "valider mes choix" echo ($nbcolonnes>8) ?'' : ""; -echo _("Addition") .''."\n"; +echo _("Addition") .''.$affichesomme.'
    ' . _('Best choice') . '' . _('Best choice') . '
    '."\n"; @@ -620,9 +620,9 @@ echo '

    '."\n"; // Affichage du meilleur choix if ($compteursujet == "1" && isset($meilleurecolonne)) { - print 'Meilleur choix ' . _('The best choice at this time is:') . "".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; + print 'Meilleur choix ' . _('The best choice at this time is:') . "".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; } elseif (isset($meilleurecolonne)) { - print 'Meilleur choix ' . _('The bests choices at this time are:') . " ".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; + print 'Meilleur choix ' . _('The bests choices at this time are:') . " ".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; } echo '

    '; @@ -640,33 +640,33 @@ if ($comment_user->RecordCount() != 0) { } //affichage de la case permettant de rajouter un commentaire par les utilisateurs -print '
    ' .'

    ' ._("Add a comment in the poll:") . '

    ' . "\n"; +print '
    ' .'
    ' ._("Add a comment in the poll:") . '' . "\n"; if (isset($_SESSION['nom']) === false) { $nom = ''; } else { $nom = stripslashes($_SESSION['nom']); } -echo _("Name") .' : '; -echo '
    '."\n"; - -echo ''."\n"; -echo '
    '."\n"; -echo ''."\n"; +echo '

    : '; +echo '

    '."\n"; +echo '

    :
    '; +echo '

    '."\n"; +echo '

    '."\n"; +echo '
    '."\n"; // Focus javascript sur la case de texte du formulaire echo ''."\n"; echo '
    '."\n"; echo ''; -echo ''."\n"; +echo ''."\n"; -echo '
    '; // ajout pyg cohérence graphique +//echo '
    '; // ajout pyg cohérence graphique bandeau_pied_mobile(); // Affichage du bandeau de pied diff --git a/style.css b/style.css index b96ba1e..946de00 100644 --- a/style.css +++ b/style.css @@ -62,7 +62,17 @@ img { box-sizing:content-box; } +/* a11y rules*/ +a:focus { +outline:#000 dotted 1px; +} + /*bandeau de titre*/ + +h1 { + margin:0; +} + .framorange { color: #FF8400; display: inline; @@ -88,7 +98,7 @@ div.bandeau{ background-color: #EAEAFF; color:white; vertical-align:middle; - font-size:42px; + font-size:1em; font-family:arial; padding:8px; height:40px; @@ -115,7 +125,8 @@ div.logo{ padding-top: 30px; } /*Sous bandeau avec bouton de navigation*/ -div.bandeautitre{ +.bandeautitre{ + margin:0; height:17px; background-color: #EAEAFF; font-size:14px; @@ -125,7 +136,7 @@ div.bandeautitre{ font-style: italic; vertical-align:middle; font-family:arial; - padding:13px; + padding:.9em; position:static; top:57px; left:6px; @@ -134,7 +145,7 @@ div.bandeautitre{ border-bottom: 1px solid #CCC; } div.sousbandeau{ - height:17px; + min-height:17px; background-color: #C4C4FF; font-size:11px; color:black; @@ -148,9 +159,21 @@ div.sousbandeau{ left:6px; right:6px; */ /* display: none; */ - margin-top: 1.5em; + margin-top: 3em; border-top: 1px solid #999; } + +.sousbandeau ul { +margin:0; +padding:0; +display:block; +float:left; +} + +.sousbandeau ul li { +list-style:none; +display:inline; +} /*bandeau de pied*/ div.surbandeaupied{ background-color: #EAEAFF; @@ -210,7 +233,8 @@ div.bandeaupiedmobile{ text-shadow: 0 1px 0 rgba(0, 0, 0, 0.4); } */ -span.sousbandeaulangue { +ul.sousbandeaulangue { + display:block; margin-left:6px; margin-right:90px; float:right; @@ -360,6 +384,7 @@ div.cadre table.resultats { margin:0 auto; } +div.cadre th, div.cadre td { height:30px; } @@ -375,11 +400,13 @@ div.cadre td.non { width:35px; } /*Case de tableau VIDE dans affichage de sondage*/ +div.cadre th.vide, div.cadre th.sujet, div.cadre td.vide, div.cadre td.sujet { background-color: #DDDDDD; text-align:center; + padding:1px 5px; } - +div.cadre th.vide, div.cadre th.ok, div.cadre th.non, div.cadre th.sujet, div.cadre th.nom, div.cadre th.jour, div.cadre th.heure, div.cadre th.mois, div.cadre td.vide, div.cadre td.ok, div.cadre td.non, div.cadre td.sujet, div.cadre td.nom, div.cadre td.jour, div.cadre td.heure, div.cadre td.mois { border-right: 1px solid #BBB !important; border-bottom: 1px solid #BBB !important; @@ -654,3 +681,15 @@ li.error { .imprimer { float:right; } + +.error { + color:red; +} + +.margin-top { + margin-top:1em; +} + +.txt-right { +text-align:right; +} diff --git a/variables.php.template b/variables.php.template index 9fabfc8..0dfe9f6 100644 --- a/variables.php.template +++ b/variables.php.template @@ -95,8 +95,8 @@ if (@file_exists('variables.local.php')) { const STUDS_VERSION = 0.7; // Do not edit the following -$ALLOWED_LANGUAGES = array('fr_FR' => 'french', - 'en_GB' => 'english', - 'es_ES' => 'spanish', - 'de_DE' => 'german' ); +$ALLOWED_LANGUAGES = array('fr_FR' => '
  • Français
    • ', + 'en_GB' => '
  • English
    • ', + 'es_ES' => '
  • Español
    • ', + 'de_DE' => '
  • Deutsch
    • ' ); From 67a9fa1e8ba21799bbb934c41a90c81e1e5841c4 Mon Sep 17 00:00:00 2001 From: FramaJosephK Date: Fri, 4 Jul 2014 11:21:31 +0200 Subject: [PATCH 129/129] =?UTF-8?q?Accessibilit=C3=A9=20et=20ergonomie=20s?= =?UTF-8?q?ur=20choix=5Fdate,=20adminstuds=20-=20remplacement=20bouton=20d?= =?UTF-8?q?e=20langue=20par=20un=20select=20-=20Fix=20export=20CSV=20-=20d?= =?UTF-8?q?=C3=A9coupage=20chaines=20de=20langue=20pour=20enlever=20le=20c?= =?UTF-8?q?ode=20html=20-=20Fix=20//=20et=20port=20dans=20get=5Fserver=5Fn?= =?UTF-8?q?ame?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTHORS.md | 14 ++ CHANGELOG | 12 + adminstuds.php | 367 +++++++++++++++--------------- apropos.php | 182 +++++++-------- bandeaux.php | 72 +++--- buttons.css | 4 +- choix_autre.php | 65 ++---- choix_date.php | 114 ++++------ contacts.php | 69 ++---- creation_sondage.php | 53 ++--- exportcsv.php | 79 +++---- exportics.php | 56 ++--- exportpdf.php | 54 ++--- fonctions.php | 62 ++--- i18n.php | 6 +- index.php | 62 ++--- infos_sondage.php | 67 ++---- locale/de_DE/LC_MESSAGES/Studs.mo | Bin 16739 -> 16121 bytes locale/de_DE/LC_MESSAGES/Studs.po | 108 ++++++--- locale/en_GB/LC_MESSAGES/Studs.mo | Bin 12914 -> 13740 bytes locale/en_GB/LC_MESSAGES/Studs.po | 82 +++++-- locale/es_ES/LC_MESSAGES/Studs.mo | Bin 16741 -> 16223 bytes locale/es_ES/LC_MESSAGES/Studs.po | 54 ++++- locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 19273 -> 19612 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 198 ++++++++++++---- maintenance.php | 58 ++--- studs.php | 112 ++++----- style.css | 130 +++++++---- variables.php.template | 55 ++--- 29 files changed, 1047 insertions(+), 1088 deletions(-) create mode 100644 AUTHORS.md diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 0000000..5b0860a --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,14 @@ +# [Framasoft](http://framadate.org) +* Simon Leblanc (development), +* Pierre-Yves Gosset (development, graphism) +* Pascal Chevrel (development) +* Armony Altinier (accessibility) +* JosephK (development) +* Framasoft community +*For a list of people who have contributed to the codebase, see [GitHub's list of contributors](https://github.com/framasoft/OpenSondage/graphs/contributors).* + +## [STUdS](http://studs.u-strasbg.fr) +* Guilhem Borghesi (borghesi@unistra.fr) +* Raphaël Droz +* Contributors from the University of Strasbourg: Guy, Christophe, Julien, Pierre, Romaric, Matthieu, Catherine, Christine, Olivier, Emmanuel and Florence + diff --git a/CHANGELOG b/CHANGELOG index f76ee73..2595d49 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,16 @@ Les dernières améliorations d'OpenSondage + + Changelog version 0.8 (juillet 2014 Armony - JosephK) + - Améliorations sur l'accessibilité + - Améliorations sur l'ergonomie + - Améliorations sur l'internationalisation (nombreuses phrases en français dans le code) + - Découpage chaines de langue pour virer le code html + - Remise en place de l'export CSV + - Remise en place de get_server_name() pour permettre l'installation dans un sous dossier, en https ou sur un port différent + - Ajout Authors.md + en-têtes refaits + - Fix bug changement de langues en mode URL rewriting (requête GET passée en formulaire POST) + - Fix bug 2 boutons valider lorsqu'on édite un vote + - Fix focus javascript sur "Votre nom" Changelog version 0.7 (mars 2013) - Fix : le sondage supprimé n'était pas forcément le sondage sélectionné (cfévrier) diff --git a/adminstuds.php b/adminstuds.php index ed43459..ece5415 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -1,42 +1,21 @@ RecordCount() != 1){ - print_header(false, _("Error!")); + print_header(false, _("Error!"), '', $lang); echo ''."\n"; framanav(); logo(); @@ -85,9 +64,9 @@ if (!$sondage || $sondage->RecordCount() != 1){ echo '
    '."\n"; - print "

    " . _("This poll doesn't exist !") . "



    "."\n"; + print "

    " . _("This poll doesn't exist !") . "



    "."\n"; print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; - echo '



    '."\n"; + echo '



    '."\n"; echo '
    '."\n"; # sur_bandeau_pied(); bandeau_pied(); @@ -173,7 +152,7 @@ $dsujet=$sujets->FetchObject(false); $dsondage=$sondage->FetchObject(false); if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { - print_header(true); + print_header(true, '', $lang); echo ''."\n"; framanav(); logo(); @@ -185,78 +164,77 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo '
    '."\n"; - echo '
    '."\n"; echo '
    '."\n"; - echo "

    " . _("Column's adding") . "



    "."\n"; + echo "

    " . _("Column's adding") . "



    "."\n"; if ($dsondage->format=="A"||$dsondage->format=="A+"){ - echo _("Add a new column") .' :
    '; - echo '

    '; - echo ''."\n"; - echo ''."\n"; + echo _("Add a new column") .' :
    '; + echo '

    '; + echo ''."\n"; + echo ''."\n"; } else { //ajout d'une date avec creneau horaire - echo _("You can add a new scheduling date to your poll.
    If you just want to add a new hour to an existant date, put the same date and choose a new hour.") .'

    '."\n"; - echo _("Add a date") .' :

    '."\n"; - echo ' '."\n"; + echo ''."\n"; for ($i=1;$i<32;$i++){ - echo ''."\n"; + echo ''."\n"; } - echo ''."\n"; + echo '

    '."\n"; - echo ' '."\n"; + echo ''."\n"; for($i = 1; $i < 13; $i++) { - echo ''."\n"; + echo ''."\n"; } - echo ''."\n"; + echo '

    '."\n"; - echo ' '."\n"; + echo ''."\n"; for ($i = date("Y"); $i < (date("Y") + 5); $i++) { - echo ''."\n"; + echo ''."\n"; } - echo ''."\n"; - echo '

    '. _("Add a start hour (optional)") .' :

    '."\n"; - echo '

    '."\n"; + echo '

    '. _("Add a start hour (optional)") .' :

    '."\n"; + echo '


    '."\n"; - echo ''."\n"; - echo '

    '. _("Add a end hour (optional)") .' :

    '."\n"; - echo '

    '."\n"; + echo '


    '."\n"; + echo '

    '. _("Add a end hour (optional)") .' :

    '."\n"; + echo '


    '."\n"; - echo ''."\n"; + echo '

    '."\n"; + echo '


    '."\n"; - echo '

    '; - echo ''."\n"; - echo ''."\n"; + echo '

    '; + echo ''."\n"; + echo '

    '."\n"; } echo ''."\n"; - echo '



    '."\n"; + echo '



    '."\n"; echo '
    '."\n"; echo '
    '."\n"; @@ -271,7 +249,7 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { } if (isset($_POST["suppressionsondage_x"])) { - print_header(true); + print_header(true, '', $lang); echo ''."\n"; framanav(); logo(); @@ -281,11 +259,11 @@ if (isset($_POST["suppressionsondage_x"])) { echo '
    '."\n"; echo '
    '."\n"; echo '
    '."\n"; - echo "

    " . _("Confirm removal of your poll") . "



    "."\n"; + echo "

    " . _("Confirm removal of your poll") . "



    "."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; - echo '



    '."\n"; + echo '



    '."\n"; echo '
    '."\n"; echo '
    '."\n"; @@ -315,7 +293,7 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" _("Thanks for your confidence.") . "\n" . NOMAPPLICATION ); //affichage de l'ecran de confirmation de suppression de sondage - print_header(); + print_header(false, '', $lang); echo ''."\n"; framanav(); logo(); @@ -323,9 +301,9 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x" bandeau_titre(_("Make your polls")); echo '
    '."\n"; - print "

    " . _("Your poll has been removed!") . "



    "; + print "

    " . _("Your poll has been removed!") . "



    "; print _("Back to the homepage of ") . ' '.NOMAPPLICATION.'.'."\n"; - echo '


    '."\n"; + echo '


    '."\n"; echo '
    '."\n"; sur_bandeau_pied(); bandeau_pied(); @@ -367,7 +345,7 @@ if(isset($_POST['ajoutcomment']) || isset($_POST['ajoutcomment_x'])) { //s'il existe on affiche la page normale // DEBUT DE L'AFFICHAGE DE LA PAGE HTML -print_header(true); +print_header(true, '', $lang); echo ''."\n"; framanav(); logo(); @@ -376,26 +354,27 @@ bandeau_titre(_("Make your polls")); sous_bandeau(); echo '
    '."\n"; - +echo '

    ' . _('Print') . '

    '; +echo '

    ' . _('Export to CSV') . '

    '; echo '
    '."\n"; //affichage du titre du sondage $titre=str_replace("\\","",$dsondage->titre); -echo '

    '.$titre.'

    '."\n"; +echo '

    '.$titre.'

    '."\n"; //affichage du nom de l'auteur du sondage -echo _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'
    '."\n"; - -//affichage des commentaires du sondage -if ($dsondage->commentaires){ - echo '
    '. _("Comments") .' :
    '."\n"; - $commentaires=$dsondage->commentaires; - $commentaires=str_replace("\\","",$commentaires); - echo stripslashes(nl2br($commentaires)); - echo '
    '."\n"; +echo '

    '. _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'

    '."\n"; +echo '

    '._("Public link of the pool") .' : '.getUrlSondage($dsondage->id_sondage).'

    '."\n"; +echo '

    '._("Admin link of the pool") .' : '.getUrlSondage($dsondage->id_sondage, true).'

    '."\n"; +//affichage de la description du sondage +if ($dsondage->commentaires) { + echo '
    '._("Description: ") .'
    '."\n"; + $commentaires = $dsondage->commentaires; + $commentaires=nl2br(str_replace("\\","",$commentaires)); + echo ''. $commentaires .''; + echo '
    '."\n"; } -echo '
    '."\n"; echo '
    '."\n"; @@ -726,16 +705,16 @@ if ($sondage !== false) { $sql = $connect->Prepare($sql); $user_studs = $connect->Execute($sql, array($numsondage)); } else { - print_header(false, _("Error!")); + print_header(false, _("Error!"), '', $lang); echo ''."\n"; framanav(); logo(); bandeau_tete(); bandeau_titre(_("Error!")); echo '
    '."\n"; - print "

    " . _("This poll doesn't exist !") . "



    "."\n"; - print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; - echo '



    '."\n"; + print "

    " . _("This poll doesn't exist !") . "



    "."\n"; + print "" . _("Back to the homepage of ") . " ".NOMAPPLICATION.". "."\n"; + echo '



    '."\n"; echo '
    '."\n"; @@ -750,14 +729,17 @@ $dsujet=$sujets->FetchObject(false); $dsondage=$sondage->FetchObject(false); $toutsujet=explode(",",$dsujet->sujet); -$toutsujet=str_replace("@","
    ",$toutsujet); +$toutsujet=str_replace("@","
    ",$toutsujet); $toutsujet=str_replace("°","'",$toutsujet); $nbcolonnes=substr_count($dsujet->sujet,',')+1; echo '
    '."\n"; -echo '
    '."\n"; -echo _('As poll administrator, you can change all the lines of this poll with infos.
    You can, as well, remove a column or a line with Cancel.
    You can also add a new column with Add column.
    Finally, you can change the informations of this poll like the title, the comments or your email address.') ."\n"; -echo '

    '."\n"; +echo '

    '."\n"; +echo _('As poll administrator, you can change all the lines of this poll with this button ').'' . _('Edit') . '.
    '; +echo _('You can, as well, remove a column or a line with ') . '' . _('Remove the column') . '.
    '; +echo _('You can also add a new column with '). ''. _('Add a colomn') . '.
    '; +echo _('Finally, you can change the informations of this poll like the title, the comments or your email address.') ."\n"; +echo '

    '."\n"; //debut de l'affichage de résultats echo ''."\n"; @@ -767,13 +749,13 @@ $toutsujet=explode(",",$dsujet->sujet); echo ''."\n"; echo ''."\n"; echo ''."\n"; -echo ''."\n"; + //boucle pour l'affichage des boutons de suppression de colonne for ($i = 0; isset($toutsujet[$i]); $i++) { - echo ''."\n"; + echo ''."\n"; } - +echo ''."\n"; echo ''."\n"; //si le sondage est un sondage de date @@ -807,7 +789,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -841,7 +823,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -875,7 +857,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; //affichage des horaires @@ -893,7 +875,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { } } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; } } else { @@ -908,7 +890,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { echo ''."\n"; } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; } @@ -921,7 +903,7 @@ while ($data = $user_studs->FetchNextObject(false)) { $ensemblereponses = $data->reponses; echo ''."\n"; - echo ''."\n"; + echo ''."\n"; //affichage du nom $nombase=str_replace("°","'",$data->nom); @@ -948,9 +930,9 @@ while ($data = $user_studs->FetchNextObject(false)) { for ($j = 0; $j < $nbcolonnes; $j++) { $car = substr($ensemblereponses, $j, 1); if ($car == "1") { - echo ''."\n"; + echo ''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } } } else { //sinon on affiche les lignes normales @@ -972,14 +954,14 @@ while ($data = $user_studs->FetchNextObject(false)) { //a la fin de chaque ligne se trouve les boutons modifier if (!$testligneamodifier=="true") { - echo ''."\n"; + echo ''."\n"; } //demande de confirmation pour modification de ligne for ($i = 0; $i < $nblignes; $i++) { if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { if ($compteur == $i) { - echo ''."\n"; + echo ''."\n"; } } } @@ -988,23 +970,28 @@ while ($data = $user_studs->FetchNextObject(false)) { echo ''."\n"; } +if (!$testligneamodifier=="true") { + //affichage de la case vide de texte pour un nouvel utilisateur + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; -//affichage de la case vide de texte pour un nouvel utilisateur -echo ''."\n"; -echo ''."\n"; -echo ''."\n"; + //une ligne de checkbox pour le choix du nouvel utilisateur + for ($i = 0; $i < $nbcolonnes; $i++) { + echo ''."\n"; + } + + // Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base + echo ''."\n"; + echo ''."\n"; + + //focus en javascript sur le champ texte pour le nom d'utilisateur + echo ''."\n"; -//une ligne de checkbox pour le choix du nouvel utilisateur -for ($i = 0; $i < $nbcolonnes; $i++) { - echo ''."\n"; } -// Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base -echo ''."\n"; -echo ''."\n"; - //determination du meilleur choix for ($i = 0; $i < $nbcolonnes + 1; $i++) { if (isset($somme[$i]) === true) { @@ -1049,7 +1036,7 @@ echo ''."\n"; for ($i = 0; $i < $nbcolonnes; $i++) { if (isset($somme[$i]) === true && isset($meilleurecolonne) === true && $somme[$i] == $meilleurecolonne){ - echo ''."\n"; + echo ''."\n"; } else { echo ''."\n"; } @@ -1061,25 +1048,25 @@ echo ''."\n"; // S'il a oublié de remplir un nom if ((isset($_POST["boutonp"]) || isset($_POST["boutonp_x"])) && $_POST["nom"] == "") { echo ''."\n"; - print "'."\n"; } if (isset($erreur_prenom) && $erreur_prenom) { echo ''."\n"; - print "\n"; + print '\n"; echo ''."\n"; } if (isset($erreur_injection) && $erreur_injection) { echo ''."\n"; - print "\n"; + print '\n"; echo ''."\n"; } if (isset($erreur_ajout_date) && $erreur_ajout_date) { echo ''."\n"; - print "\n"; + print '\n"; echo ''."\n"; } @@ -1087,11 +1074,6 @@ if (isset($erreur_ajout_date) && $erreur_ajout_date) { echo '
    '."\n"; echo '
    '.stripslashes($toutsujet[$i]).'
    '."\n"; + echo '
    '."\n"; + echo '
    '."\n"; -echo '
    '."\n"; -echo '
    Meilleur resultat' . _('Best choice') . '
    " . _("Enter a name !") . "\n"; + print '

    ' . _("Enter a name !") . "

    \n"; echo '
    " . _("The name you've chosen already exist in this poll!") . "

    ' . _("The name you've chosen already exist in this poll!") . "

    " . _("Characters \" ' < et > are not permitted") . "

    ' . _("Characters \" ' < et > are not permitted") . "

    " . _("The date is not correct !") . "

    ' . _("The date is not correct !") . "

    '."\n"; echo '
    '."\n"; -//focus en javascript sur le champ texte pour le nom d'utilisateur -echo ''."\n"; - //recuperation des valeurs des sujets et adaptation pour affichage $toutsujet = explode(",", $dsujet->sujet); @@ -1141,97 +1123,104 @@ echo '

    '."\n"; //affichage de la phrase annoncant le meilleur sujet if (isset($meilleurecolonne) && $compteursujet == "1") { - print "\"Meilleur" . _("The best choice at this time is") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; + print "\"\"" . _("The best choice at this time is") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; } elseif (isset($meilleurecolonne)) { - print "\"Meilleur " . _("The bests choices at this time are") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; + print "\"\" " . _("The bests choices at this time are") . " : $meilleursujet " . _("with") . " $meilleurecolonne " . $vote_str . ".
    \n"; } -echo '

    '."\n"; +echo '

    '."\n"; echo '

    '."\n"; echo ''."\n"; echo '
    '."\n"; +//Suppression du sondage +echo '

    '."\n"; +echo '
    '."\n"; + //Gestion du sondage -echo '
    '. _("Poll's management") .' :
    '."\n"; -echo '

    '."\n"; -echo '
    '."\n"; +echo '

    '. _("Poll's management") .' :'."\n"; +echo '

    '."\n"; +echo '
    '."\n"; //Changer le titre du sondage $adresseadmin=$dsondage->mail_admin; -echo _("Change the title") .' :
    ' . - ''. - '

    '."\n"; +echo '

    ' . + '

    '. + '

    '."\n"; //si la valeur du nouveau titre est invalide : message d'erreur if ((isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"])) && !issetAndNoEmpty('nouveautitre')) { - echo ''. _("Enter a new title!") .'

    '."\n"; + echo '

    '. _("Enter a new title!") .'

    '."\n"; } -//Changer les commentaires du sondage -echo _("Change the comments") .' :



    '."\n"; - //Changer l'adresse de l'administrateur -echo _("Change your email address") .' :

    '."\n"; +echo '

    '. + '

    '. + '

    '."\n"; //si l'adresse est invalide ou le champ vide : message d'erreur if ((isset($_POST["boutonnouvelleadresse"]) || isset($_POST["boutonnouvelleadresse_x"])) && !issetAndNoEmpty('nouvelleadresse')) { - echo ''. _("Enter a new email address!") .'

    '."\n"; + echo '

    '. _("Enter a new email address!") .'

    '."\n"; } +//Changer la description du sondage +echo '

    '. + '

    '. + '

    '."\n"; + +echo '
    '."\n"; + //affichage des commentaires des utilisateurs existants $sql = 'SELECT * FROM comments WHERE id_sondage='.$connect->Param('numsondage').' ORDER BY id_comment'; $sql = $connect->Prepare($sql); $comment_user = $connect->Execute($sql, array($numsondage)); if ($comment_user->RecordCount() != 0) { - print "
    " . _("Comments") . " :
    \n"; + print "
    " . _("Comments of polled people") . " :
    \n"; $i = 0; while ( $dcomment=$comment_user->FetchNextObject(false)) { - print " ". stripslashes($dcomment->usercomment) ." : ".stripslashes($dcomment->comment) ."
    "; + print "
    " . ''.stripslashes($dcomment->usercomment). ' : ' . stripslashes(nl2br($dcomment->comment)) . '
    '; $i++; } - echo '
    '; + echo '
    '; } if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide=="yes") { - print "" . _("Enter a name and a comment!") . ""; + print '

    ' . _("Enter a name and a comment!") . "

    "; } //affichage de la case permettant de rajouter un commentaire par les utilisateurs -print "
    " . _("Add a comment in the poll") . " :
    \n"; -echo _("Name") .' :
    '."\n"; -echo ''."\n"; -echo '
    '."\n"; - -//suppression du sondage -echo '
    '."\n"; -echo _("Remove your poll") .' :

    '."\n"; - -echo '
    '."\n"; +print '
    ' .'
    ' ._("Add a comment in the poll:") . '' . "\n"; +echo '

    :

    '."\n"; +echo '


    '."\n"; +echo '

    '."\n"; +echo '
    '."\n"; +echo '
    '."\n"; +/* Lettre de convocation if ($dsondage->format == "D" || $dsondage->format == "D+") { echo '
    '."\n"; - echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
    '; + echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'
    '; echo ''; echo ''; echo ''; - echo '

    '; + echo '

    '; echo '
    '."\n"; - // ''. _("Enter a meeting place!") .'

    '."\n"; + // ''. _("Enter a meeting place!") .'

    '."\n"; } // TODO if (isset($_POST["exportpdf_x"]) && !issetAndNoEmpty('lieureunion')) { - echo ''. _("Enter a meeting place!") .'

    '."\n"; -} + echo ''. _("Enter a meeting place!") .'

    '."\n"; +} */ echo ''."\n"; -echo '

    '."\n"; +echo '

    '."\n"; //fin de la partie GESTION et beandeau de pied //echo '

    '."\n"; -echo '
    '; +//echo '
    '; echo '
     
    '; bandeau_pied_mobile(); //echo ''."\n"; diff --git a/apropos.php b/apropos.php index 0a97166..abf8a1c 100644 --- a/apropos.php +++ b/apropos.php @@ -1,42 +1,20 @@ Framadate ? Framadate est un service en ligne permettant de planifier un rendez-vous rapidement et simplement. Aucune inscription préalable -n'est nécessaire.
    +n'est nécessaire.
    Framadate est un service du réseau Framasoft, mis en place par l'association -Framasoft.
    +Framasoft.

    Quelles différences entre Framadate et STUdS ! ?

    Framadate est un service basé sur le logiciel libre OpenSondage. OpenSondage est lui-même basé sur le logiciel STUdS ! développé -par l'Université de Strasbourg.
    +par l'Université de Strasbourg.
    Après avoir testé STUdS, nous avons décidé d'apporter de nombreuses modifications, notamment ergonomiques, au code source existant. L'ensemble de ces modifications ne pouvaient entrer dans le cadre @@ -112,59 +90,59 @@ d'utilisation d'un logiciel déjà en production dans une université et aurait été (fort logiquement) rejetté de la branche principale de développement. C'est pourquoi nous avons préferer "forker" -STUdS pour créer OpenSondage.
    +STUdS pour créer OpenSondage.

    Quelles différences entre Framadate et Doodle ?

    Aujourd'hui, le danger pour le logiciel libre ne provient plus de Microsoft ou d'Adobe et de leurs logiciels qu'on installe sans avoir le code source, mais des applications web "dans les -nuages" proposés comme services par des entreprises.
    -
    -Cela pour au moins 4 raisons :
    +nuages" proposés comme services par des entreprises.
    +
    +Cela pour au moins 4 raisons :
    1- sécurité : aucune garantie ne peut vous être apportée quand au fait les données -soient correctement sauvegardées et protégées, ni que le
    -code source "officiel" soit réellement celui que vous utilisez en ligne.
    +soient correctement sauvegardées et protégées, ni que le
    +code source "officiel" soit réellement celui que vous utilisez en ligne.
    2- fiabilité/perennité : le service peut tomber en panne, et rien ne garanti que la -société Doodle sera toujours là demain et maintiendra le site
    +société Doodle sera toujours là demain et maintiendra le site
    3- propriété des données : beaucoup d'entreprises s'autoproclament co-détentrices de vos contenus "clouds" (ex: Facebook impose une clause de partage des droits -sur vos contenus, vos données, vos photos)
    +sur vos contenus, vos données, vos photos)
    4- vie privée : une entreprise - comme Doodle - doit gagner de l'argent (et il n'y a aucun mal à cela). Mais si elle est en difficulté financière, elle peut décider de changer ses conditions d'utilisation et vendre vos données à des tiers (alors que Framasoft, asso loi 1901 d'intérêt général, n'aura -jamais d'intérêt à le faire).
    -
    -A cela s'ajoute le problème, plus éthique, de la publicité.
    -
    +jamais d'intérêt à le faire).
    +
    +A cela s'ajoute le problème, plus éthique, de la publicité.
    +
    Les problèmes 1 et 2 concernent aussi Framadate.org : rien ne garanti la sécurité et la fiabilité du service (d'autant plus que les -administrateurs systèmes de Framasoft sont bénévoles).
    -
    -Par contre :
    +administrateurs systèmes de Framasoft sont bénévoles).
    +
    +Par contre :
    - les problemes 3 et 4 ne sont pas d'actualité avec Framadate, exploité -par une association loi 1901
    +par une association loi 1901
    - et surtout, Framadate fait partie d'un projet plus global (Framatools) qui vise justement à sensibiliser le grand public à la problématique du "cloud". Cela peut sembler paradoxal, mais bien que proposant le service Framadate.org, nous allons surtout encourager les organisations à installer leur propre instance du logiciel afin de -maitriser totalement leurs données.
    -
    +maitriser totalement leurs données.
    +
    Bref, oui Framadate est inspiré de Doodle.com, et oui Doodle est un excellent service. Mais Doodle reste une "boite noire" pour l'utilisateur final qui va sur doodle.com. Framadate.org essaie de répondre, modestement, à cette problématique en montrant que des -alternatives libres existent et qu'on peut les installer "chez soi".
    +alternatives libres existent et qu'on peut les installer "chez soi".

    Mon sondage restera-t-il longtemps en ligne ?

    Le service Framadate est proposée gratuitement par l'association -Framasoft.
    +Framasoft.
    Framasoft s'engage à maintenir le service "aussi longtemps que possible", mais ne peut fournir aucune garantie de date. Si cela ne vous convient pas, @@ -172,7 +150,7 @@ nous vous encourageons sincèrement à installer vous-même Framadate et à maintenir vous-même votre propre service.
    -

    Mentions légales
    +

    Mentions légales

    Éditeur et Responsable de la publication

    Editeur : Association Framasoft (cf "Hébergement")

    @@ -246,40 +224,40 @@ propre licence, installez votre propre logiciel de sondage et n'utilisez pas Framadate.org.

    Crédits

    -Application d'origine
    -
    +Application d'origine
    +
    L'application Framadate est une instance du logiciel STUdS ! -développé à l'Université de Strasbourg depuis 2008.
    -
    +développé à l'Université de Strasbourg depuis 2008.
    +
    Pour les besoins de Framadate, STUdS a fait l'objet d'un fork par l'équipe Framasoft. Les sources sont disponibles sur le Github OpenSondage.
    -
    -Technologies utilisées
    -
    -- PHP
    -- MySQL
    -- Apache
    -- Subversion
    -- iCalcreator
    -- FPDF
    + href="https://github.com/leblanc-simon/OpenSondage">OpenSondage.
    +
    +Technologies utilisées
    +
    +- PHP
    +- MySQL
    +- Apache
    +- Subversion
    +- iCalcreator
    +- FPDF
    - Icônes : Deleket, PixelMixer et DryIcons
    -
    -Compatibilités des navigateurs
    -
    -- Firefox
    -- Opéra
    -- Konqueror
    -- Links
    -- Safari
    -- IE
    -
    -Validations des pages
    -
    -- Toutes les pages disposent de la validation HTML 4.01 Strict du W3C.
    + href="http://dryicons.com">DryIcons
    +
    +Compatibilités des navigateurs
    +
    +- Firefox
    +- Opéra
    +- Konqueror
    +- Links
    +- Safari
    +- IE
    +
    +Validations des pages
    +
    +- Toutes les pages disposent de la validation HTML 4.01 Strict du W3C.
    - La CSS dispose de la validation CSS 2.1 du W3C.

    Valid HTML 4.01 StrictCSS Valide !

    -Propositions améliorations de Framadate
    -
    +Propositions améliorations de Framadate
    +
    Si quelque chose venait à vous manquer, vous pouvez nous en faire part via le formulaire en ligne. -
    +
    Les dernières améliorations de Framadate sont visibles dans le fichier CHANGELOG.
    -
    -Remerciements
    -
    + href="CHANGELOG">CHANGELOG.
    +
    +Remerciements
    +
    STUdS ! : Pour leurs contributions techniques ou ergonomiques : Guy, Christophe, Julien, Pierre, Romaric, Matthieu, Catherine, Christine, Olivier, -Emmanuel et Florence
    +Emmanuel et Florence
    Framadate :  Simon Leblanc (développement principal), Pierre-Yves Gosset -(développement, graphisme), la communauté Framasoft.
    -
    +(développement, graphisme), la communauté Framasoft.
    +

    Licence

    Framadate est placé, comme STUdS !, sous la licence logicielle libre CeCILL-B.
    -
    + href="http://www.cecill.info/licences.fr.html">CeCILL-B.
    +
    mentions; echo '
    '."\n"; diff --git a/bandeaux.php b/bandeaux.php index 833460a..37f1487 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -1,42 +1,21 @@ $v ) { - $str .= '
  • ' . $v . '
    • ' . "\n" ; + if (substr($k,0,2)==$lang) { + $str .= '' . "\n" ; + } else { + $str .= '' . "\n" ; + } } return $str; @@ -173,8 +155,8 @@ function bandeau_pied() '
  • '. _("About") .'
    • ' . //''. _("Admin") .'' . '' . - '
      ' . - liste_lang() . '
    '. + '
    '. '
    ' . "\n"; gAnalytics(); } @@ -194,8 +176,8 @@ function bandeau_pied_mobile() '
  • '. _("About") .'
    • ' . //''. _("Admin") .'' . '' . - '
      ' . - liste_lang() . '
    '. + '
    '. '
    ' . "\n"; gAnalytics(); } diff --git a/buttons.css b/buttons.css index 13acce3..bf03e52 100644 --- a/buttons.css +++ b/buttons.css @@ -34,8 +34,8 @@ border-radius: 2em; } .medium { - font-size: 12px; - padding: .4em 1.5em .42em; + font-size: 12px !important; + padding: .4em 1.5em .42em !important; } .small { font-size: 11px; diff --git a/choix_autre.php b/choix_autre.php index c0a6e21..6274026 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -1,42 +1,21 @@ '."\n"; @@ -153,7 +132,7 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE sous_bandeau_choix(); echo '
    '."\n"; - echo '

    '. _("Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:") .'

    '."\n"; + echo '

    '. _("Your poll aim is to make a choice between different subjects.") . '
    ' . _("Enter the subjects to vote for:") .'

    '."\n"; echo ''."\n"; //affichage des cases texte de formulaire @@ -212,11 +191,11 @@ if (!isset($_POST["fin_sondage_autre_x"])) { if ((isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"])) && !$erreur && !$erreur_injection) { //demande de la date de fin du sondage echo '
    '."\n"; - echo '

    '. _("Your poll will be automatically removed after 6 months.
    You can fix another removal date for it.") .'

    '."\n"; + echo '

    '. _("Your poll will be automatically removed after 6 months."). '
    ' . _("You can fix another removal date for it.") .'

    '."\n"; echo ' : '. _("(DD/MM/YYYY)") .''."\n"; echo '
    '."\n"; echo '
    '."\n"; - echo '

    '. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.").'

    '."\n"; + echo '

    '. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.").'

    '. _("Then, you will receive quickly an email contening the link to your poll for sending it to the voters.").'

    '."\n"; echo '
    '."\n"; //echo '
    '."\n"; //echo ''."\n"; diff --git a/choix_date.php b/choix_date.php index 6126d15..4118b40 100644 --- a/choix_date.php +++ b/choix_date.php @@ -1,42 +1,20 @@ '."\n"; - print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; + print "

    " . _("You haven't filled the first section of the poll creation.") . " !

    "."\n"; print _("Back to the homepage of ") . ' ' . '' . NOMAPPLICATION . '.' . "\n"; - echo '


    '."\n"; echo ''."\n"; //bandeau de pied //sur_bandeau_pied(); @@ -237,21 +214,25 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo '
    '; //affichage de l'aide pour les jours - echo '
    '."\n"; - echo _("Select your dates amoung the free days (green). The selected days are in blue.
    You can unselect a day previously selected by clicking again on it.") ."\n"; + echo '
    '."\n"; + echo '

    '._("Select your dates amoung the free days (green). The selected days are in blue.").'
    '. _("You can unselect a day previously selected by clicking again on it.") .'

    '."\n"; echo '
    '."\n"; //debut du tableau qui affiche le calendrier echo '
    '."\n"; - echo '
    '. _("Create the poll") .'
    '."\n"; - echo ''."\n"; - echo '
    '.$motmois.' '.$_SESSION["annee"].'
    '."\n"; - echo ''."\n"; - echo ''."\n"; + echo '
    '."\n"; + echo ''."\n"; //affichage des jours de la semaine en haut du tableau for($i = 0; $i < 7; $i++) { - echo ''; + echo ''; } echo ''."\n"; @@ -478,27 +459,26 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) } } - echo '
    '."\n"; + echo '
    '."\n"; //affichage de tous les jours choisis if (issetAndNoEmpty('totalchoixjour', $_SESSION) && (!issetAndNoEmpty('choixheures_x') || $erreur)) { //affichage des jours - echo '
    '."\n"; - echo '

    '. _("Selected days") .' :

    '."\n"; + echo '
    '."\n"; + echo '

    '. _("Selected days") .' :

    '."\n"; //affichage de l'aide pour les jours - //echo _("For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'

    '."\n"; - echo _("For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)") .'

    '."\n"; + echo '

    '._("For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)") .'

    '."\n"; echo '
    '; + echo ''."\n"; + echo ''."\n"; + echo $motmois.' '.$_SESSION["annee"]."\n"; + echo ''."\n"; + echo ''."\n"; + echo ''."\n"; + echo '
    '. strftime('%A',mktime(0,0,0,0, $i,10)) .''. strftime('%A',mktime(0,0,0,0, $i,10)) .'
    '."\n"; echo ''."\n"; echo ''."\n"; for ($i = 0; $i < $_SESSION["nbrecaseshoraires"]; $i++) { $j = $i+1; - echo ''."\n"; + echo ''."\n"; } if ($_SESSION["nbrecaseshoraires"] < 10) { - echo ''."\n"; + echo ''."\n"; } echo ''."\n"; @@ -507,9 +487,9 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) for ($i=0;$i'."\n"; if ($_SESSION["langue"]=="EN") { - echo ''."\n"; + echo ''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } $affichageerreurfindeligne=false; @@ -535,7 +515,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) } if ($affichageerreurfindeligne) { - echo ''."\n"; + echo ''."\n"; } echo ''."\n"; @@ -547,18 +527,18 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo '
    '. _("Time") .' '.$j.''. _("Time") .' '.$j.'
    '.date("l, F jS Y", $_SESSION["totalchoixjour"][$i]).' : '.date("l, F jS Y", $_SESSION["totalchoixjour"][$i]).' : '.strftime(_("%A, den %e. %B %Y"), $_SESSION["totalchoixjour"][$i]).' : '.strftime(_("%A, den %e. %B %Y"), $_SESSION["totalchoixjour"][$i]).' : '. _("Bad format!") .'

    '. _("Bad format!") .'

    '."\n"; echo ''."\n"; echo ''."\n"; -# echo''."\n"; +# echo''."\n"; # echo ''."\n"; echo '


    '. _("Next") .'
    '."\n"; //patch vraiment crado : on donne le nom "choixheures_x" au bouton pour éviter d'avoir à cleaner le code - echo '
    '; + echo '
    '; echo '
    '; //si un seul jour et aucunes horaires choisies, : message d'erreur if ((issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x')) && (count($_SESSION["totalchoixjour"])=="1" && $_POST["horaires0"][0]=="" && $_POST["horaires0"][1]=="" && $_POST["horaires0"][2]=="" && $_POST["horaires0"][3]=="" && $_POST["horaires0"][4]=="")) { - echo '
    '. _("Enter more choices for the voters") .'
    '."\n"; + echo '

    '. _("Enter more choices for the voters") .'

    '."\n"; $erreur=true; } } @@ -573,10 +553,10 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) $date_fin=strftime(_("%A, den %e. %B %Y"), $jour_arret); } - echo '
    '. _("Your poll will expire automatically 2 days after the last date of your poll.") .'

    '. _("Removal date") .' : '.$date_fin.'

    '."\n"; + echo '

    '. _("Your poll will expire automatically 2 days after the last date of your poll.") .'

    '. _("Removal date") .' : '.$date_fin.'

    '."\n"; echo '
    '."\n"; echo '
    '."\n"; - echo ''. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'    '."\n"; + echo '

    '. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll."). '

    ' . _("Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'

    '."\n"; echo'
    '."\n"; // echo'

    '."\n"; // echo 'Pour finir la création du sondage, cliquez sur le bouton ajout ci-dessous'."\n"; @@ -594,13 +574,13 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION) echo '

    '; } - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; +/* echo ''."\n"; + echo ''."\n";*/ + echo ''."\n"; //fin du formulaire et bandeau de pied echo ''."\n"; //bandeau de pied - //echo '



    '."\n"; + //echo '



    '."\n"; echo '
    '."\n"; echo '
    '; // ajout pyg pour cohérence graphique diff --git a/contacts.php b/contacts.php index 2590fd6..cdadacf 100644 --- a/contacts.php +++ b/contacts.php @@ -1,41 +1,20 @@ '."\n"; - echo _("If you have questions, you can send a message here.") .'

    '."\n"; + echo _("If you have questions, you can send a message here.") .'

    '."\n"; - echo _("Your name") .' :
    '."\n"; + echo _("Your name") .' :
    '."\n"; echo ''; if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && $_SESSION["nom"]=="") { - echo ' '. _("Enter a name") .''; + echo '

    '. _("Enter a name") .'

    '; } - echo '

    '."\n"; - echo _("Your email address ") .' :
    '."\n"; + echo '

    '."\n"; + echo _("Your email address ") .' :
    '."\n"; echo ''."\n"; if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && empty($_SESSION["adresse_mail"]) === false && validateEmail($_SESSION["adresse_mail"]) === false) { - echo ' '. _("The address is not correct!") .''; + echo '

    '. _("The address is not correct!") .'

    '; } - echo _("Question") .' :
    '."\n"; + echo _("Question") .' :
    '."\n"; echo ''; if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && $_SESSION["question"]=="") { - echo '  Il faut poser une question !'; + echo '

     Il faut poser une question !

    '; } echo ''; diff --git a/creation_sondage.php b/creation_sondage.php index 3e34294..db0bfee 100644 --- a/creation_sondage.php +++ b/creation_sondage.php @@ -1,41 +1,20 @@ Execute("SELECT * FROM user_studs WHERE id_sondage=" . $_GET['numsondage'] . " ORDER BY id_users"); +$sql = 'SELECT * FROM user_studs WHERE id_sondage='.$connect->Param('numsondage').' ORDER BY id_users'; +$sql = $connect->Prepare($sql); +$user_studs = $connect->Execute($sql, array($_GET['numsondage'])); $dsondage = get_sondage_from_id($_GET['numsondage']); $nbcolonnes=substr_count($dsondage->sujet,',')+1; @@ -52,22 +33,26 @@ $toutsujet=explode(",",$dsondage->sujet); #$toutsujet=str_replace("°","'",$toutsujet); //affichage des sujets du sondage -$input.=";"; -for ($i=0;$toutsujet[$i];$i++) { +$input =";"; +foreach ($toutsujet as $value) { if ($dsondage->format=="D"||$dsondage->format=="D+") { - $input.=''.date("j/n/Y",$toutsujet[$i]).';'; + if (strpos($dsondage->sujet,'@') !== false) { + $days=explode("@",$value); + $input.= date("j/n/Y",$days[0]).';'; + } else { + $input.= date("j/n/Y",$values).';'; + } } else { - $input.=''.$toutsujet[$i].';'; + $input.= $value.';'; } } - $input.="\r\n"; if (strpos($dsondage->sujet,'@') !== false) { $input.=";"; - for ($i=0;$toutsujet[$i];$i++) { - $heures=explode("@",$toutsujet[$i]); - $input.=''.$heures[1].';'; + foreach ($toutsujet as $value) { + $heures=explode("@",$value); + $input.= $heures[1].';'; } $input.="\r\n"; @@ -100,4 +85,4 @@ header( 'Content-Length: '.$filesize ); header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); header( 'Cache-Control: max-age=10' ); echo $input; -die(); \ No newline at end of file +die(); diff --git a/exportics.php b/exportics.php index 3703e08..da6eb59 100644 --- a/exportics.php +++ b/exportics.php @@ -1,42 +1,20 @@ setComponent ( $vevent ); // add event to calendar $v->setConfig( "language", "fr" ); $v->setConfig( "directory", "export" ); $v->setConfig( "filename", $_SESSION["numsondage"].".ics" ); // set file name -$v->returnCalendar(); \ No newline at end of file +$v->returnCalendar(); diff --git a/exportpdf.php b/exportpdf.php index 2f37f7e..c9feb18 100644 --- a/exportpdf.php +++ b/exportpdf.php @@ -1,42 +1,20 @@ diff --git a/i18n.php b/i18n.php index 34c20c7..7623301 100644 --- a/i18n.php +++ b/i18n.php @@ -1,8 +1,8 @@ '."\n"; -#echo '

    '.NOMAPPLICATION.'
    '. _("What is it about?") .'

    '; -#echo '

    '. _("Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'

    '."\n".'
    '."\n"; +#echo '

    '.NOMAPPLICATION.'
    '. _("What is it about?") .'

    '; +#echo '

    '. _("Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'

    '."\n".'
    '."\n"; #echo '
    '. _("Make a poll") .''; # '' . # '' . _('Make a poll') . '' . @@ -75,13 +53,13 @@ echo '
    '."\n"; echo '
    '; echo '

    '; -echo '' +echo '
    ' . _('Schedule an event') . '

    '; echo '
    '; echo '
    '; echo '

    '; -echo ''. _('Make a poll') . '

    '; +echo '
    '. _('Make a poll') . '

    '; echo '
    '; diff --git a/infos_sondage.php b/infos_sondage.php index 473074d..ff5bf36 100644 --- a/infos_sondage.php +++ b/infos_sondage.php @@ -1,41 +1,20 @@ '."\n"; echo '
    '."\n"; -echo '

    '. _("You are in the poll creation section.
    Required fields cannot be left blank") .'

    '."\n"; +echo '

    '. _("You are in the poll creation section.").'
    '._("Required fields cannot be left blank.") .'

    '."\n"; //Affichage des différents champs textes a remplir echo ''."\n"; @@ -197,7 +176,7 @@ if (!$_SESSION["titre"] && issetAndNoEmpty("poursuivre") ) { echo ''."\n"; -echo ''."\n"; @@ -245,7 +224,7 @@ echo ''."\n"; -#echo '
    '. _("The fields marked with * are required!") .'

    '."\n"; +#echo '
    '. _("The fields marked with * are required!") .'

    '."\n"; #affichage du cochage par défaut if (!$_SESSION["studsplus"] && !issetAndNoEmpty('creation_sondage_date') && !issetAndNoEmpty('creation_sondage_autre') && !issetAndNoEmpty('creation_sondage_date_x') && !issetAndNoEmpty('creation_sondage_autre_x')) { @@ -276,12 +255,12 @@ echo '
    '; -#echo '
    '."\n"; +#echo '
    '."\n"; #echo ''."\n"; #echo ''."\n"; #echo ''."\n"; #echo '
    '."\n"; -#echo '


    '."\n"; +#echo '


    '."\n"; echo '
    '."\n"; echo ''."\n"; //bandeau de pied diff --git a/locale/de_DE/LC_MESSAGES/Studs.mo b/locale/de_DE/LC_MESSAGES/Studs.mo index caf6a9fc0a6d89b31d3330b8964ca86e7e3792c5..4846308d50fe0ec45fc98042f81e74f70568d583 100644 GIT binary patch delta 4238 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 K<#%|?yZ-^UBP>1u diff --git a/locale/de_DE/LC_MESSAGES/Studs.po b/locale/de_DE/LC_MESSAGES/Studs.po index ae12615..0047abd 100644 --- a/locale/de_DE/LC_MESSAGES/Studs.po +++ b/locale/de_DE/LC_MESSAGES/Studs.po @@ -136,8 +136,11 @@ msgid "Back to the homepage of " msgstr "Kehren sie zur Startseite zurück " #: choix_date.php:220 -msgid "Select your dates amoung the free days (green). The selected days are in blue.
    You can unselect a day previously selected by clicking again on it." -msgstr "Wählen sie ihr Termin unter den in grün angegebenen Tagen an. Die Felder erscheinen in blau wen sie ausgew heltsind.
    Sie können ihre Wahl wiederufen in dem sie das Feld wiederauswählen." +msgid "Select your dates amoung the free days (green). The selected days are in blue." +msgstr "Wählen sie ihr Termin unter den in grün angegebenen Tagen an. Die Felder erscheinen in blau wen sie ausgew heltsind." + +msgid "You can unselect a day previously selected by clicking again on it." +msgstr "Sie können ihre Wahl wiederufen in dem sie das Feld wiederauswählen." #: choix_date.php:233 msgid "monday" @@ -172,8 +175,8 @@ msgid "Selected days" msgstr "Gewälhter Tag" #: choix_date.php:487 -msgid "For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." -msgstr "Für jeden ausgewählten Tag, haben Sie die Möglichkeit die Uhrzeit der Versammlung zu bestimmen in einem der folgenden Formaten :
    - lehr, wenn Sie keine bestimmte Uhrzeit möchten,
    - \"8h\", \"8H\" oder \"8:00\" um den Beginn der Versammlung vorzuschlagen,
    - \"8-11\", \"8h-11h\", \"8H-11H\" oder \"8:00-11:00\" für eine Zeitspanne,
    - \"8h15-11h15\", \"8H15-11H15\" oder \"8:15-11:15\" für ein Zeitspanne mit minuten." +msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)" +msgstr "Für jeden ausgewählten Tag, haben Sie die Möglichkeit die Uhrzeit der Versammlung zu bestimmen (e.g.: \"8h\", \"8:30\", \"8h-10h\", etc.)" #: choix_date.php:494 msgid "Time" @@ -214,8 +217,11 @@ msgstr "Datum an dem die Umfrage gelöscht werden soll" #: choix_date.php:552 #: choix_autre.php:196 -msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters." -msgstr "Als Sie die Herschtelung der Umfrage bestätigt haben werden, werden Sie zur Webseite Ihrer Umfrage automatisch wieder geleitet sein

    Gleichzeitig werden Sie ein E-Mail bekommen in dem ein Link zu ihrer Umfrage ist, um in der erforschten Zukunft zu folgen." +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll." +msgstr "Als Sie die Herschtelung der Umfrage bestätigt haben werden, werden Sie zur Webseite Ihrer Umfrage automatisch wieder geleitet sein" + +msgid "Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgstr "Gleichzeitig werden Sie ein E-Mail bekommen in dem ein Link zu ihrer Umfrage ist, um in der erforschten Zukunft zu folgen." #: choix_date.php:558 msgid "Back to hours" @@ -231,8 +237,12 @@ msgid "Poll creation (1 on 2)" msgstr "Erstellen einer Umfrage (1 / 2)" #: infos_sondage.php:123 -msgid "You are in the poll creation section.
    Required fields cannot be left blank" -msgstr "Sie machten eine neue umfrage erstellen !
    Fullen sie die folgenden Felder aus." +msgid "You are in the poll creation section." +msgstr "Sie machten eine neue umfrage erstellen !" + +msgid "Required fields cannot be left blank." +msgstr "Fullen sie die folgenden Felder aus." + #: infos_sondage.php:128 msgid "Poll title *: " @@ -250,10 +260,10 @@ msgstr "Die Schriftzeichen < > und \" sind nicht genehmigt!" #: infos_sondage.php:136 msgid "Comments: " -msgstr "Komentar (optional): " +msgstr "Komentar : " #: infos_sondage.php:141 -msgid "Your name*: " +msgid "Your name *: " msgstr "Name *: " #: infos_sondage.php:147 @@ -278,12 +288,12 @@ msgid "The fields marked with * are required!" msgstr "Die mit * markierten Felder sind obligatorisch!" #: infos_sondage.php:179 -msgid " Voters can modify their vote themselves." -msgstr " Sie erlauben eine Änderung der linien durch die Befragten" +msgid "Voters can modify their vote themselves." +msgstr "Sie erlauben eine Änderung der linien durch die Befragten" #: infos_sondage.php:181 -msgid " To receive an email for each new vote." -msgstr " Sie möchten eine e-mail bei jeder Beteiligung erhalten" +msgid "To receive an email for each new vote." +msgstr "Sie möchten eine e-mail bei jeder Beteiligung erhalten" #: infos_sondage.php:185 msgid "Schedule an event" @@ -299,12 +309,12 @@ msgid "Make a poll" msgstr "Umfrage erstellen" #: contacts.php:56 -msgid "[CONTACT] You have sent a question " -msgstr "[KONTAKT] Senden von Fragen " +msgid "[CONTACT] You have sent a question" +msgstr "[KONTAKT] Senden von Fragen" #: contacts.php:56 -msgid "You have a question from a user " -msgstr "Sie haben eine benützer Frager " +msgid "You have a question from a user" +msgstr "Sie haben eine benützer Frager" #: contacts.php:56 msgid "User" @@ -319,8 +329,8 @@ msgid "Message" msgstr "Email" #: contacts.php:59 -msgid "[COPY] Someone has sent a question " -msgstr "[KOPIE] Senden einer frage " +msgid "[COPY] Someone has sent a question" +msgstr "[KOPIE] Senden einer frage" #: contacts.php:59 msgid "Here is a copy of your question" @@ -400,8 +410,8 @@ msgid "Comments" msgstr "Kommentar" #: studs.php:261 -msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line." -msgstr "Um an dieser Umfrage Teilzunehmen tragen sie bitte ihren Namen, wählen sie die ihnen passenden Wehrte
    und bestätigen sie ihre Wahl mit dem Knopf am ende der Ligne." +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line." +msgstr "Um an dieser Umfrage teilzunehmen, tragen sie bitte ihren Namen ein, wählen sie alle passenden Werte und bestätigen sie ihre Wahl mit dem Knopf am Ende der Linie." #: studs.php:445 #: adminstuds.php:806 @@ -491,12 +501,20 @@ msgid "What is it about?" msgstr "Warum dies ?" #: index.php:71 -msgid "Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." -msgstr "Ein Datum zu finden das allen Betroffenen passt.
    Sie können ebenfalls benötigen um gemeinsam eine Wahl zu treffen für ein Termin ein Treffpunkt, ein Besprechungsthema oder die Marke ihrer nächsten Kaffeemaschine " +msgid "Making polls to schedule meetings or events, quickly and easily." +msgstr "Ein Datum zu finden das allen Betroffenen passt." + +msgid "You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." +msgstr "Sie können ebenfalls benötigen um gemeinsam eine Wahl zu treffen für ein Termin ein Treffpunkt, ein Besprechungsthema oder die Marke ihrer nächsten Kaffeemaschine " + #: choix_autre.php:144 -msgid "Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:" -msgstr "Sie erstellen eine Umfrage mit mehreren Wahlmglichkeiten
    Geben sie die verschiedenen Wahlmglichkeiten an :" +msgid "Your poll aim is to make a choice between different subjects." +msgstr "Sie erstellen eine Umfrage mit mehreren Wahlmglichkeiten." + +msgid "Enter the subjects to vote for:" +msgstr "Geben sie die verschiedenen Wahlmglichkeiten an :" + #: choix_autre.php:150 msgid "Choice" @@ -515,8 +533,12 @@ msgid "Characters \" < and > are not permitted" msgstr "Die Schriftzeichen < > und \" sind nicht genehmigt !" #: choix_autre.php:191 -msgid "Your poll will be automatically removed after 6 months.
    You can fix another removal date for it." -msgstr "Ihre Umfrage wird automatisch nach 6 Monaten gelscht.
    Sie können dennoch eine andere Frist wählen." +msgid "Your poll will be automatically removed after 6 months." +msgstr "Ihre Umfrage wird automatisch nach 6 Monaten gelscht." + +msgid "You can fix another removal date for it." +msgstr "Sie können dennoch eine andere Frist wählen." + #: choix_autre.php:193 msgid "Removal date (optional)" @@ -535,8 +557,12 @@ msgid "Add a new column" msgstr "Wenn sie eine Spalte einfügen möchten" #: adminstuds.php:121 -msgid "You can add a new scheduling date to your poll.
    If you just want to add a new hour to an existant date, put the same date and choose a new hour." -msgstr "Sie können in ihrer Umfrage ein Datum einfügen. Falls das Datum bereits schon besteht und sie eine Uhrzeit eingeben möchten tragen sie bitte das ganze Datum ein mit der gewünschten Uhrzeit so das dieser in der Umfrage erscheinen kann." +msgid "You can add a new scheduling date to your poll." +msgstr "Sie können in ihrer Umfrage ein Datum einfügen." + +msgid "If you just want to add a new hour to an existant date, put the same date and choose a new hour." +msgstr "Falls das Datum bereits schon besteht und sie eine Uhrzeit eingeben möchten tragen sie bitte das ganze Datum ein mit der gewünschten Uhrzeit so das dieser in der Umfrage erscheinen kann." + #: adminstuds.php:122 msgid "Add a date" @@ -599,8 +625,26 @@ msgid "" msgstr "" #: adminstuds.php:582 -msgid "As poll administrator, you can change all the lines of this poll with \"infos\".
    You can, as well, remove a column or a line with \"Cancel\".
    You can also add a new column with \"Add.
    Finally, you can change the informations of this poll like the title, the comments or your email address." -msgstr "Als administrator können sie alle linien ihrer Umfrage mit \"Icone ändern.
    Sie haben auch die möglichkeit eine Spalte oder eine Linie mit \"Annuler\" zu löschen.
    Falls sie vergessen haben eine Wahlmöglichkeit einzutragen können sie eine Spalte zufügen in dem sie \"rückgängig\"
    auswählen. en bout de ligne des noms de colonne. Sie können ebenfalls informationen wie den Titel die Kommentare oder ihre email adresse ändern. " +msgid "As poll administrator, you can change all the lines of this poll with this button : " +msgstr "Als administrator können sie alle linien ihrer Umfrage mit dieser Taste ändern :" + +msgid "Edit" +msgstr "ändern" + +msgid "You can, as well, remove a column or a line." +msgstr "Sie haben auch die möglichkeit eine Spalte oder eine Linie mit zu löschen." + +msgid "Cancel" +msgstr "Stornieren" + +msgid "You can also add a new column with " +msgstr "Falls sie vergessen haben eine Wahlmöglichkeit einzutragen können sie eine Spalte zufügen in dem sie " + +msgid "Add" +msgstr "rückgängig" + +msgid "Finally, you can change the informations of this poll like the title, the comments or your email address." +msgstr "Sie können ebenfalls informationen wie den Titel die Kommentare oder ihre email adresse ändern. " #: adminstuds.php:851 msgid "The date is not correct !" diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo index 43e14ec8cd59bc04b8486c1eb5564ed57d0b6325..1a76eb3950683a6d9464af1c13aa942da8f6b2a8 100644 GIT binary patch delta 4132 zcmeIz{c}{+9mnyL1VVT)l0bkE#VebHP&OezqZN#V@Srr1HZ+O>q+E6{X3IV#*$pwR zWbp~GDJ^nEGLBY8+By!%RMVlu3`6QTZJFkWYCBFDp9X7XwDy6)DYn`=eSh|z^oRNn z_=9Kiy{~ib-iLF(=bW3%(GxqfZ@ir{LjaZJGaT500_8y!{`*Ezm<5+~h#zJGV=4C4FocIIk!Z1&zY8r7Cw%}xp zA~%>WoQ8d<>jzOUegf6OQ&^1`tP`#d?yE!oOaljXU^PzS{ic!F;C1*APUHRN$5di?8siu$ z2`)H@>uLYgwm-!swCC`aZMXrC;V_orM$$qbOaj$`-KfkBViO+033whgunU+~ z_-FgWmg&I=UF4mn3;8qmb5QDzpfYh3XX10H7yl9&gL&1qFQV?hV$T=R%PQLCsPoIq z$bT!9HcqI=M^Py}iCTXzVl9rMQv5Ge%BPdpB-W!+`4rB@5mc)Gh*|^x#>E(-mmc1M zd-05Qi1)K zBaYxY{0P;tRdbB_5++as$PQ7_{yv8q*(KD7W{_986vyLM)b@*_*1%3{1`BBKw!hzp z4Yc{s24P# zUeJiTuGzNN;pIHCj2h@F7Rr2#;}q@x$EavOA47HI1!Nk{Db$zjW!ruowYvX-N^xN* z=)hc5hZdmbbTR6>eW*n}ge)WT6V!GbL0vzJx&8k;D!Sn!>ctPvPOnJsex`E=xZ8-wZ9!G~-B_4^079w(E3wL5SL_Rk~#+o(LpiDOt? z6MV^DK=u3_ssraysk?|xco`?)64IoREweUZH|^E7{d3d+&!D#NC~8~3iA8vMKJ%|s ze8LHBvm*9}UhJTzq~5kypdQd>&qt6!n~XjGIJVM0f$H!ls0>bA5G=-Pu$Fc;D#Pul zjHj|xl2is!sreXLUuJeVNOdEUJ+l$@B^y8wpU1s8lc&lbqNb**F38Ao>nhZU*CMx= zt*C(vq6UzClFC9VFCpvBe2B+!CMU_Vc?nnIUr-OIuMfUtcj0#01E^L1Hn!mni-Hf? zer%@w4(dZzP4AUq7qwRUkql(b0V)$Y@hnckVQj=-1Q(c3QD3szteADU0oAdmkSv>X zr~!P4EF%;8axk(M)PTCJhjBdZ(^!ZjSfu^`t6asH-(mqjoVORef%=lYgPNLh8d`KW zp%&c=>l)O9TTu76p+5*fD+)QXe7ZY7Xl2Eyun56mlsca;66Dnl;e`OUlEi!#58G73HsAx}i5M$-LR8|sY!~;YV zp|X|eB{VH6X`-3vAqEH)t@0>wka(2XKpY{)%2X>a*N9z2ipUVR5GvXM-_O<9^LW_S1-m8~e~iW!;zpgNX!WbK64w$A z@pa-sB0{tfLqs9bPJEl#PpGUWJYqRfL#XTwFppUmVMDI&pPHQU?{x+m(oR<@9(UYm zB9@G$Gd*r5)f0C5Q@u{aO*)ZIH+i?`xLlFx^qhDs>7||24u5%F*~IO=nM^9_EOq>U zI%~$e$%q#pzWMsvyn<*fVdK3j#N*=&BRhkJ(rin zY=`2ponG#pnOG+7g>%(NDv|J#8LsS64|^Oh;l|YWXpfgp*O@h(_uNRQllJ0XB;!S$ zsM{a*yF#~&@2p)^-|3$Wz3GQ$Z5pndTAAl}R6ppq%scCshb!~y{Gu9n`1zXCdH$i& z=y2(b<9U8#xW3AC*hIMTbV@IBTqo)EIgwPnH<5JuVwq0I_$RAQ_G2Y&UF2}=COYZnGCBN8`00GVsiJ-O#fp(}U(CkmXErwH{}&hbLpA^a delta 3328 zcmd7T`%l$%9LMp`;U<>@2!Y%*j*46quOu1~Bq3UXO5_bu0Z~X1%SuzBqj^i`%J$97 zQs#8E+;q*3mZn*``GZ@wl2u!!Xj`UR%S)~-H|zO2-w&;={(wH)`#e6M@8$FT+|T|+ zH=6wC6T`L{(q^JB(HdsVM|eDvAJUN+V{-5)=HW&3VhlfVn2KqbgV8w7mMgJ0ROe_};VJeHIKgjIGVRSPY&mx!1Wz>gmp++Pk!IGpV*E8Uv*`8!T!k9SPSo5U!BNN#__`+-Q*bFsFZf;T)YLZqX96Yq2P^BC07 zHK0~)8)}X_Q2TegE$=}s&f}<|KZ9!E6;wlRpzi;UT9nc3Nu4XHs9iJ?HFfu6Z|(nT zGWt*>=3zT#<6G7VYFH97J0=s=pkmZ>Gmv#^T2LMHqdK+)_1qhn z&iBpxWVCJ0qFVd|>cwAB4T~P=9xPd?mRDdi)}rS0Bv#?~wmc$>gN5=G+>7gw4PN}IruOX=;a~)eyb5~3EwKy8B&Dc%3)s`!nIQ66&wY}<5+iodpWHzFDycM-u zcA-9e7&SGgZ27Ak#$Od&vNvv_%2B!Q!IFV$>AR>A`WUsCx^O6-Lw1;nVcs;P+1Q3< zsF68{45Il0HIg@xKA1SRoX(ZegBkw~WLmf&uc97YHpCr)t=4U*9=?wG_ztR}-{EBZ z8FjFfaMOof*oZe#=gM?iTaEj%7Vlsg&h!s+50;&%q52v%$5&B33LWnDI1{~;^RONZ zQTMlF69%vnQ%AT5%Y39S=0)U|If@Lfxq{5HNf_y#EB-MyGYiAH;l~JEkCC{=x(!1q zciQ`VPzTFC)KGV0FZ>g=c6u?s(u=A$0rh?gs{Rb5e!m$&MlTL=FPH+1qFju6u)HaEW8WB%COspnm5G}+M;$Gq*?f)fYlvWTA5*vxx#3EuA zF`amX&~WyoEHV{DDY1-bCpHm1DVj_xp>5b^FR~PZ9a3=;!9c11#*86i2(4(QC%6zH zm^632i3ftE|Ng1rvKE`_>PgR$SxPh!PZA7{SxYEs+MW;Qc!%TKtS5?ynfBtd$nhLp zC_k!F0?lqFp^kEu&vEh zqL`RVJWkXRWrX&%&I%=VYw%zRK^;ii<4VayIT5P@>1jfXR_PvMv4*QZ;U$#vT!R1k z>ummhtNz8-5Sg~z!vr#8or~TT&Yakl&d|8>K-a(_9w&6rdB>BT&hfPUPC?$ You can unselect a day previously selected by clicking again on it." -msgstr "Select your dates amoung the free days (green). The selected days are in blue.
    You can unselect a day previously selected by clicking again on it." +msgid "Select your dates amoung the free days (green). The selected days are in blue." +msgstr "Select your dates amoung the free days (green). The selected days are in blue." + +msgid "You can unselect a day previously selected by clicking again on it." +msgstr "You can unselect a day previously selected by clicking again on it." #: choix_date.php:266 msgid "monday" @@ -170,9 +173,9 @@ msgstr "sunday" msgid "Selected days" msgstr "Selected days" -#: choix_date.php:521 -msgid "For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - " -msgstr "" +#: choix_date.php:489 +msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)" +msgstr "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)" #: choix_date.php:528 msgid "Time" @@ -213,8 +216,11 @@ msgstr "Removal date" #: choix_date.php:586 #: choix_autre.php:217 -msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters." -msgstr "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll." +msgstr "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll." + +msgid "Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgstr "Then, you will receive quickly an email contening the link to your poll for sending it to the voters." #: choix_date.php:592 msgid "Back to hours" @@ -226,8 +232,11 @@ msgid "Create the poll" msgstr "Create the poll" #: infos_sondage.php:187 -msgid "You are in the poll creation section.
    Required fields cannot be left blank" -msgstr "You are in the poll creation section.
    Required fields cannot be left blank" +msgid "You are in the poll creation section." +msgstr "You are in the poll creation section." + +msgid "Required fields cannot be left blank." +msgstr "Required fields cannot be left blank." #: infos_sondage.php:192 msgid "Poll title *: " @@ -463,16 +472,22 @@ msgid "What is it about?" msgstr "What is it about?" #: index.php:128 -msgid "Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." -msgstr "Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." +msgid "Making polls to schedule meetings or events, quickly and easily." +msgstr "Making polls to schedule meetings or events, quickly and easily." + +msgid "You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." +msgstr "You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." #: index.php:131 msgid "Make a poll" msgstr "Make a poll" #: choix_autre.php:165 -msgid "Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:" -msgstr "Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:" +msgid "Your poll aim is to make a choice between different subjects." +msgstr "Your poll aim is to make a choice between different subjects." + +msgid "Enter the subjects to vote for:" +msgstr "Enter the subjects to vote for:" #: choix_autre.php:171 msgid "Choice" @@ -491,8 +506,11 @@ msgid "Characters \" < and > are not permitted" msgstr "Characters \" < and > are not permitted" #: choix_autre.php:212 -msgid "Your poll will be automatically removed after 6 months.
    You can fix another removal date for it." -msgstr "Your poll will be automatically removed after 6 months.
    You can fix another removal date for it." +msgid "Your poll will be automatically removed after 6 months." +msgstr "Your poll will be automatically removed after 6 months." + +msgid "You can fix another removal date for it." +msgstr "You can fix another removal date for it." #: choix_autre.php:214 msgid "Removal date (optional)" @@ -511,8 +529,11 @@ msgid "Add a new column" msgstr "Add a new column" #: adminstuds.php:150 -msgid "You can add a new scheduling date to your poll.
    If you just want to add a new hour to an existant date, put the same date and choose a new hour." -msgstr "You can add a new scheduling date to your poll.
    If you just want to add a new hour to an existant date, put the same date and choose a new hour." +msgid "You can add a new scheduling date to your poll." +msgstr "You can add a new scheduling date to your poll." + +msgid "If you just want to add a new hour to an existant date, put the same date and choose a new hour." +msgstr "If you just want to add a new hour to an existant date, put the same date and choose a new hour." #: adminstuds.php:151 msgid "Add a date" @@ -577,8 +598,26 @@ msgstr "" "You can modify this poll with this link" #: adminstuds.php:662 -msgid "As poll administrator, you can change all the lines of this poll with - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a " diff --git a/locale/es_ES/LC_MESSAGES/Studs.mo b/locale/es_ES/LC_MESSAGES/Studs.mo index b6d9de1b5523b3878aba84cde06504a7983cd141..6e907e6c348bb5b34a7cb2a6d7b91928f8306e00 100644 GIT binary patch delta 3886 zcmajgdvKM-8OQN`135{MBoGK8kAKR^U|Jj5lE?>c0Ir2@fHEW`G}FXr4oLXc+T(zd27OhlcCcY_8G+R-!tz4mo9N z?eR|3NP?)0g{*_9kq_JRBdCG>5_SJ4I2Nzr6uge(dB2%VJ{g?JLfue;({L3gVKZu^ z`%pJNgc`vRX5lcZ!|$Ow@DcK7KIKOl_$RjF1RmCg`*1pbj3M0^!&NnyfI4vxs;Bqk zTs(k7_ybJF4U@eQ?L=MIi|SxMY6_0p^CxkX;}=jJ8{}qP|848@$>hJ2hBLOo&+v5N zOw>q=_~D&qi9Ozo%2Wq3DAR{L+Z;n(cM3IS!>GmiGfcsEP*dc-XBj~eMasHwS#Mff>t$}(Arn!-wK#|@~AzKJvNkEp4O;YVvO zD@3J~$}$XKFFt@DT3dK3Rr47tb#XjhUq=Ei#mT7lT2v8&oLMMEP0J&8EORW*2i!R$FHIm z_3K!UBgmu87q&fxdC*j3@)N7?e-Rbkup-jHC{c@W3o5k@sFXLOMzYJc@5L()UkPrf zy))aG+weE2MVd%2HR4R9$rPe8v=+5UTQG+An@%b`!`z43PzF&W9!9ci{)`$)Y>wBV z1sKioVpPYM;|^SF+kb>woFk~Ua{=|@zoOQNk2IRr2rGWhF!Vwyt z!b^ApLxsk$(9INvtsBa)7H>smXaM!V*KjfZ6wlxo(xyzljOzGXsD0%iMZ5Dmg5o3e=0XG4XMDFX{!m@i6YiSiFu(v9H8iR7se_aRq81+fW_sx96WmO~F}Y z?=hdCp5x5%Iu;s7MT;X1wfN?udb$=hk{zhj_n~_JIFcOmUDSimV#Y&iI))mW8Hj^&eh440xF z{4Oekmr$uU>5H;N2qAdU&MHP6*uFXsE%da z$|i$Vs2BYZZ^!BEHoV(x$Avh68sWRBH4(SKyT1gL(Hhha*@DVY8-}(~>87F){T8*c zTtvW+JQl zo2WV0!&J1uR8|wUgwm)NvWCo2Li2bJah&KURPH10C9-rt8AoWn+$c+^JW1>z7Ha-g zlG-Ce{;7tJy^)5E;Y-;weI<*Td|$3eB<7tg?rg9;xx^;ef4gvi>hxXbc^)XIP|> zqWRV8yixcXBmaE5@yi5LY6gj&#Dm0CVm`5(c$oMKq4I!7B*B@~YlyGewu4r_9xwm- zG|VI>6O)K<5GwZ*`UIEhz!oh?EwT;vcnfL+`#Ou~S#-uXdBk~ofdW^W4XwU(ri)fA1jClmN6Dx?X5(UIz;t4{< zPu!&nWnEnaZ!iCrt!wjWBGwRh+BUKAzv=<%L&O~72vJWgAXJKpXNWrDq#GT7+&vM0 z&JATo$2If>gB|VuD!=?B7=g@Y;Sj(asd+bMP* znc5z%PW_(aPE2VEU!L|a$DNjO(j85h?ie>Jb&30MLSgt!Mr&-$qBp)@-_+U_o|04U z#0R>A0e?eB@QpA%b+6_%`qa<*uJFeE*eKuP`dtmJ9pSBouQ~44ym{^ud3A1LQCIf= z>9E(!{l)8?@P*mOqrz88Pdo1Om9yNTvLA=PQ$FgrU8RS@0~O<=+zXX|bN`-OLLckP Pm%4qq)#10QhJ614q1vow delta 4423 zcmajfdvH|c8OQN=1Ek@S3kedg=CD8_F~r~c8*>Iv4CIF+FW;C79Eg*!4u|4u9D-3S zz%4ic_uyynNgRoXaS*=bou9xW&VPfWjY*qJH1g=^$0!MX+ z6_ue6J%^G8t+WR9|3+j*W)AB9H8>ojs7&ob)?)UfuKOmA;`!zTjbeNowX(~o8$UtK zypVs6!%3)#E<`Xi5Y9e9QF{iq2&%B*$$+F>?~#f znUp!|b$lO{qEo1qok8Yg-bG#aPt+C_u<=T1Dbi&opeEdc?2cLFov%TS6ZQJj-uXV% z{ofuz{twak0UcW5eDY29%yO*84jhFCQG50x+V~bKmDBmBA6Fw?W*e%wj$l3h6npRk z&u#|Mbt)ufYE+trs=f^8<3#Tt5!A{b_Ws|4Rh;idt?0*iFTRNfaP(MXEPN5$@H8&R zhTDxNNI4JYE?aXbzqZJ0JqH2Tr;AgWr|<239*o^8JF^`Auk%qf0U1DCx1 z_r3FvQAMaxmD)U1X7f=CDe?Np;)g!Q!gV~~lrpUuT(B8ce8*8MK7|wTG%7>?K&SZF zV4h`4k?fmh)Jj(%*)@-$7VsQuBEQE0_(#meOPH5KCe+XK&Bx?TMfWdMaTM{H(gP=> zYG5vMtyzKEqHU*+=)rOx_$=x{Z`Qd*bO!Z+^H{|H|BOoQM=WbFUPIN)psDVb zO+hW-e$)gXLH+*-D&r^h{pH(ZE}{nd6pJv2w5SG3P(@aWnrJJQU>hpsn@|(qiyH77 zScpHzv-m62ea};oy6zR^5#}uFx#_${_kwZwEjp$n**52q?K6YeNIqVs5vfnJ6g8nO zI0p~oQ}|odfRQFQW4lqAdIA^Y0k8j0$ZnX+$b!>m)Mxoh(J>x1@Jd{VDZGNeMy2j` zK36;N5_VvCy88h-jW*|vE$#>EyU5&4F7Gt;Yi3{tcA~ao9}dKqF< z^x9oRy{~@qs-mk!-Pq(g3-v*nkNTi2MD6ub)Pn-(!$*lnh?|cPC+&o`igh{%FOx~H zciYZuq~?60htNd22_0QT3lS%d5Xyp%jV@05)y#P3y|6Q84WWY77JQY^vCKukX%psm zD8a|eN&6N&O6V9u93VCjl!0^X^%Tnq3fX*_*iYzq+{M(PvUoSa=fNpz)k7PhgIzQC zYyXu}GG{gsa|!L?0^&(R`>5k~qLUawB#5oVeZ)v&5pgf^c_KpWAoMNJ!SK$pjo)2f zdo+HJm%u;Z@t%U_3VY$$lODe5)-`6m7c2f2CqF2I|$xX z^Ptz~yDf8ia7lVNr+R5>i6UYgq2md{A_@o{`ns2OR_hQ<5f&9cBM3B(&FtLz0Mx=-`VllCg z(D4Q0OT_1hDa1}|{+Tr`ZSk2_=KPq-Mr(68*=hB;FBq_cp~y{l&T~4r)zZD0)R^%N zeQpZ0w^!FS-gMKP_I4{6i=?9V^=B3pKa{C2T$J5inDk|@6_xlhTZ>!LVcSY}hO7;- zNF=s7Y%R_5rKyRyG1eZiM~XXI61u5+oCnO-^}b7AzcY{A%IUbcH; zgKuh|&H9hZSP+caA?w!q*xGb=eV_aKRK^_JPDMiT-qNr#{hMn0-qyD^dT(>4Tw`V4 zncU*6Ia5}-KJ%0EwrqLDfShdoq#yY*yDKAU=4XWxNfn7oBj%OHra-Vf90-!P>9Onk ze4|2o3#2O$4_ICCSQo2|TPZuh{?XGOqBCpHN>?(A_tR You can unselect a day previously selected by clicking again on it." -msgstr "Seleccionar sus fechas entre los días disponibles que aparecen en verde. Cuando son seleccionados los días aparecen en azul.
    Usted puede egalemente borrar días en seleccionarlos de nuevo." +msgid "Select your dates amoung the free days (green). The selected days are in blue." +msgstr "Seleccionar sus fechas entre los días disponibles que aparecen en verde. Cuando son seleccionados los días aparecen en azul." + +msgid "You can unselect a day previously selected by clicking again on it." +msgstr "Usted puede egalemente borrar días en seleccionarlos de nuevo." + #: choix_date.php:233 msgid "monday" @@ -170,8 +174,8 @@ msgid "Selected days" msgstr "Días seleccionados" #: choix_date.php:487 -msgid "For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." -msgstr "Para algún día que había seleccionado, Usted puede escoger, o no, de horas de reunión con este formato:
    - vacío,
    - \"8h\", \"8H\" o \"8:00\" para proponer una hora de principio de reunión,
    - \"8-11\", \"8h-11h\", \"8H-11H\" o \"8:00-11:00\" para un hueco,
    - \"8h15-11h15\", \"8H15-11H15\" o \"8:15-11:15\" para un hueco con minutos." +msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)" +msgstr "Para algún día que había seleccionado, Usted puede escoger, o no, de horas de reunión (e.g.: \"8h\", \"8:30\", \"8h-10h\", etc.)" #: choix_date.php:494 msgid "Time" @@ -212,8 +216,12 @@ msgstr "Fecha de borrado" #: choix_date.php:552 #: choix_autre.php:196 -msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters." -msgstr "Cuando Usted confirmarà la creacion de su encuesta, Usted serà automaticamente redigiriendo a la pagina de su encuesta.

    Alora, Usted recibirà rapidamente uno correo electrinico conteniendo el enlace de su encuesta para darlo a los encuestados." +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll." +msgstr "Cuando Usted confirmarà la creacion de su encuesta, Usted serà automaticamente redigiriendo a la pagina de su encuesta." + +msgid "Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgstr "Alora, Usted recibirà rapidamente uno correo electrinico conteniendo el enlace de su encuesta para darlo a los encuestados." + #: choix_date.php:558 msgid "Back to hours" @@ -229,8 +237,12 @@ msgid "Poll creation (1 on 2)" msgstr "Creación de encuesta (1 de 2)" #: infos_sondage.php:123 -msgid "You are in the poll creation section.
    Required fields cannot be left blank" -msgstr "Usted ha eligiendo de crear une nueva encuesta!
    Gracias por completar los campos con una *." +msgid "You are in the poll creation section." +msgstr "Usted ha eligiendo de crear une nueva encuesta!" + +msgid "Required fields cannot be left blank." +msgstr "Gracias por completar los campos con una *." + #: infos_sondage.php:128 msgid "Poll title *: " @@ -400,8 +412,8 @@ msgid "Comments" msgstr "Comentarios" #: studs.php:261 -msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line." -msgstr "Para participar a esta encuesta, introduzca su nombre, elige todas las valores que son apriopriadas
    y validar su seleccion con el botón verde a la fin de línea." +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line." +msgstr "Para participar a esta encuesta, introduzca su nombre, elige todas las valores que son apriopriadas y validar su seleccion con el botón verde a la fin de línea." #: studs.php:445 #: adminstuds.php:806 @@ -600,8 +612,26 @@ msgstr "" "Usted puede cambiar su encuesta al enlace siguiente" #: adminstuds.php:582 -msgid "As poll administrator, you can change all the lines of this poll with \"infos\".
    You can, as well, remove a column or a line with \"Cancel\".
    You can also add a new column with \"Add.
    Finally, you can change the informations of this poll like the title, the comments or your email address." -msgstr "En calidad de administrador, Usted puede cambiar todas la líneas de este encuesta con \"Icone.
    Usted puede también borrar una columna o una línea con \"Annuler\".
    Usted puede añadir une nueva columna con \"Annuler\"
    . Para acabar, Usted puede cambiar las informaciones relativas
    a su encuesta como el titulo, los comentarios o ademas su dirección electrónica." +msgid "As poll administrator, you can change all the lines of this poll with this button : " +msgstr "En calidad de administrador, Usted puede cambiar todas la líneas de este encuesta con este botón :" + +msgid "Edit" +msgstr "Cambio" + +msgid "You can, as well, remove a column or a line." +msgstr "Usted puede también borrar una columna o una línea con " + +msgid "Cancel" +msgstr "Cancelar" + +msgid "You can also add a new column with " +msgstr "Usted puede añadir une nueva columna con " + +msgid "Add" +msgstr "Añadir" + +msgid "Finally, you can change the informations of this poll like the title, the comments or your email address." +msgstr "Para acabar, Usted puede cambiar las informaciones relativas a su encuesta como el titulo, los comentarios o ademas su dirección electrónica." #: adminstuds.php:851 msgid "The date is not correct !" diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo index bbe822ca8fc952cf9e5e6810968f2dbbafe7b650..ae34ba1338342e7e9d5012a37a7d7bf6aa2dc40c 100644 GIT binary patch delta 6224 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 E50R3Cz>h$-Wa}tp_wLAHr-|n8X z-|l|#MNK&FVRYWKxua40WY;7Irb*dOkKVsIZ!fQR6A zk5Z4h?YXQ%#?`?@xDuwrW|#qQf`j00mj|KP`58=MeszKhw$zJI4809yrRSjRv|qAP zxv<#f3MdBRP!_le%J?mAdoPsnk3ezaGf+JHlFJXEc&1+p@0ni>p&~mTAsuik6oYeM zAGidj!DUd6A_&FR?NG+u3B{!cA-2^iD4uv7%D8u-Ea)>h7A6mOHc$%VvXXKtY*tl5 zan+Sj4EP{pR0xiO8(|ZC2-a}~15%Y5LwhN+h({uDA#8Wsr=h%m12 zVkwdHk@jdPb_${NS3o~p5_ex5gJS4;xD&nsW#?;%968e)-~hN8PJ}xlbEsz_pQnGkvVjgCyaGN8m%vPxyArN}bK!Ha z3=UxVEM8SXad`ujBWZ`?iF=`V>If8%{sOLozk%}Jo1;`CoCWJ8{|`{fr{kY+0?Ztz z)FfC1^I#P6r}pr`hI+>3U!eriK-||0Cd1w^6;6Sf5T~fckhQB2>;t#KzHpbcnO{9X z<#Ufx`=LbZ9#$hBcmytmUqIhmu`s>`ulN zK-R8Sz<4Q@4l1&uPM1%?1lmu-7Pj`B+b$;Z#LzS-S+WR9)Pa zP8wE23CdMaVx$9#XZOSY@J%QSc?S-I??XA#FXB`ZsU(nlL*Z~J6O4mT!+Q7!VqNi_{_WB~yvhR;oNqWn`RNAfwG#QWaU9gmfeqvFYWDBmxEV*e^AN7D%9KDiT) zko-SDMOJbWip$?{c@D~l3FXcX4Jg4g9!mdAmY=W}0SD{SsDa?aevz-N0 zL3wY%N~j^uRByulaVkS9=!8FqGQqq#j_X!IiT-A|2wG5r=GRa>@d6aj{Sk`6PoOOP zlDYhPf>qG)@OuDqg{XI#eLEajrBoR1h4B_D$<<1&hChUU_!lTEt)1t@!e%H7dmKs@ zoQ8yp`VdMCcx#;WDuDZFmqX%Jy$w&np|wshz6Ph$&aZRQyrB;NFQj819R#ZS2y#cL zocYdArpw_7+9B8v-UWNXZLmMw0WX6O!d!SB$^z3CI6*ia_N6_`ZC61YVwZb)Cdv7a zrE)criPxgtNQ$^zjNO3lM6&WVNL+guU4^6!bfB(*+&A_`c0H7AT8X*}@obknc;15K zsM6&8We534>RIS+l#RN|Dk?XkD-c1fHlq&IRq(1^l6f9ME$GMS5+sEy#yv)qt6(8O?V4Wz1rY7_I@KRVpD{S&N!MlW;#-Q&Laq04FT0aS{9f>O~)G!rdA6(|99l_n|!P)=6| zG*F(~j+<2aqCReiU@0m@KSC>z6fQNpEOvRjOTo=(5Sojopu5m=v>!=YN?C~Jq50@m zB;}waPmoFpI;0;P_NX?Kx9CAB^%G|Vf=xyw?4Rik1bt0rWKzId9V%?In!JXuHA*kd zh<8@ujE3+mL+9ia7xft7_gQ|k^@1^#b_atD8KwW`%`WXR$k*67v3TkQgXT0g8vamg zENFGlHYB}8H>O;rUrx#I?+*oorWK9o)Zr!l4MvB}NJQ5TKiSXeFVkaEQ+0akI{k3! z8GRrvsN2(*rg#esuer{&0_>;2Fr)s$@p?o0ta!jOqRpnUI@H=4TF*;r;h-;Sl*xi8 z8fLI9dP9Lz_fBgTE7NMdMkox+ii*5OG-Nad)|rOS2%2UT19=f667_|nMsp|@?jAX@ zxY!=sOvSZAt=1biLNUh_&F?Yjvl-KwSK+O^wd(q>=wP9wgc zNkz8W5Q`=m>jTkdBN(t^Q8QAg&!+F!n={IFe&%(3>?7Nhc|O5DJVOu4K00h6z9u-- zBCM!I=7y*~G$K5}{=oh`-B_(NM@IGiBQMp1vr2VMR<4d`#Q6%)1wdPCg}%q2kDc!9ob^O+KQU)c4G}Krau~ygIX7g%1MXI^o+bKT$@j37wGMI zw|`@^BY#Y1b$)vv{d&R2`s~DON_qtBMR`%@4_T)1?d;fBy{NdyxE|Rt$FgFrX1F^& z+A3Eq?=h-pdUTC)j>WW$hEObOG@3?hpox_ZBh*NPE0(R=|C%xH}1ib<)fA|b0$&i{Xn zG@^lMn03Uk`+Z+?Bz)?#b6A$HGb%=PwoOX*B-+XB%w1;ac+r#EGdZPmb@399{`cf) z_GM(3tkxg1>>anzju>lWrn4j8ItUrCi5Gtyj5Eq_ z`0W_E;0{<9Xfz9qi0doyaIVR`QL{XPYub%AUxeh3+I!Ax4uzdXw{Zsq{IS-68IE*c z1K(UAZq|E^HrYs9IMf!3#BqEK`^{!d{CB}bWU92oT@%NwK*;L0$_4P9mrIYk#hwd? z`MV8SrZ3iQXW{>SnS8e)!}eeIUGhTdZ}qk*%XP=pHaqk>&rQ9<)7SY=@LJ`Esoi%; zD5xq!7MEwt4C`alwq9_bd@_5Nu9^Oj{%U%?-cmM8|GsQO($ZL4o80-hK*Dl#dA&Yb zzFFTl<5KC{O<{Ie&VP?@0*&J$g<1)Nu#Xs&YiDgN z4K6$o&vTm)r%U@O9tk2a=(kth8Bz-$!^_m6Q`gijO>$C;;CO8M9A71d;e*r1) B4#5Bb diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index c508df9..da66f96 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -17,6 +17,27 @@ msgstr "" "X-Poedit-Basepath: /var/www/studs\n" "X-Poedit-SearchPath-0: .\n" +msgid "Print" +msgstr "Imprimer" + +msgid "Select the choice " +msgstr "Cocher le choix " + +msgid "Validate my choices" +msgstr "Valider mes choix" + +msgid "Back to the poll" +msgstr "Retour au sondage" + +msgid "Public link of the pool" +msgstr "Lien publique du sondage" + +msgid "Admin link of the pool" +msgstr "Lien d'administration du sondage" + +msgid "Change the language" +msgstr "Changer la langue" + #: exportpdf.php:62 msgid " Convocation" msgstr "Convocation" @@ -73,8 +94,11 @@ msgid "Poll subjects (2 on 2)" msgstr "Choix des sujets (2 sur 2)" #: choix_autre.php:144 -msgid "Your poll aim is to make a choice between different subjects.
    Enter the subjects to vote for:" -msgstr "Vous avez créé un sondage pour déterminer un choix entre plusieurs choses
    Entrez les différents choix à proposer au vote :" +msgid "Your poll aim is to make a choice between different subjects." +msgstr "Vous avez créé un sondage pour déterminer un choix entre plusieurs choses." + +msgid "Enter the subjects to vote for:" +msgstr "Entrez les différents choix à proposer au vote :" #: choix_autre.php:150 msgid "Choice" @@ -98,8 +122,11 @@ msgid "Characters \" < and > are not permitted" msgstr "Les caractères \" < et > ne sont pas autorisés !" #: choix_autre.php:191 -msgid "Your poll will be automatically removed after 6 months.
    You can fix another removal date for it." -msgstr "Votre sondage sera automatiquement effacé dans 6 mois.
    Néanmoins vous pouvez décider ci-dessous d'une date plus rapprochée pour la destruction de votre sondage." +msgid "Your poll will be automatically removed after 6 months." +msgstr "Votre sondage sera automatiquement effacé dans 6 mois." + +msgid "You can fix another removal date for it." +msgstr "Néanmoins vous pouvez décider ci-dessous d'une date plus rapprochée pour la destruction de votre sondage." #: choix_autre.php:193 msgid "Removal date (optional)" @@ -111,8 +138,11 @@ msgstr "(JJ/MM/AAAA)" #: choix_autre.php:196 #: choix_date.php:554 -msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.

    Then, you will receive quickly an email contening the link to your poll for sending it to the voters." -msgstr "Une fois que vous aurez confirmé la création du sondage, vous serez redirigé automatiquement vers la page de votre sondage.

    En même temps, vous recevrez un courrier électronique contenant le lien vers votre sondage pour le faire suivre aux futurs sondés." +msgid "Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll." +msgstr "Une fois que vous aurez confirmé la création du sondage, vous serez redirigé automatiquement vers la page de votre sondage." + +msgid "Then, you will receive quickly an email contening the link to your poll for sending it to the voters." +msgstr "En même temps, vous recevrez un courrier électronique contenant le lien vers votre sondage pour le faire suivre aux futurs sondés." #: choix_autre.php:201 #: choix_date.php:561 @@ -128,8 +158,12 @@ msgid "STUdS is not properly installed, please check the 'INSTALL' to setup the msgstr "STUdS n'est pas correctement installé, merci de vous référer au fichier INSTALL pour initialiser la base de données avant de continuer." #: infos_sondage.php:125 -msgid "You are in the poll creation section.
    Required fields cannot be left blank" -msgstr "Vous avez choisi de créer un nouveau sondage !
    Merci de remplir les champs obligatoires, marqués d'une *." +msgid "You are in the poll creation section." +msgstr "Vous avez choisi de créer un nouveau sondage." + +msgid "Required fields cannot be left blank." +msgstr "Merci de remplir les champs obligatoires, marqués d'une *." + #: infos_sondage.php:130 msgid "Poll title *: " @@ -146,8 +180,8 @@ msgid "Characters < > and \" are not permitted" msgstr "Les caractères < > et \" ne sont pas autorisés !" #: infos_sondage.php:138 -msgid "Comments: " -msgstr "Commentaires : " +msgid "Description: " +msgstr "Description : " #: infos_sondage.php:143 msgid "Your name*: " @@ -200,20 +234,35 @@ msgid "Poll dates (2 on 2)" msgstr "Choix des dates (2 sur 2)" #: choix_date.php:222 -msgid "Select your dates amoung the free days (green). The selected days are in blue.
    You can unselect a day previously selected by clicking again on it." -msgstr "Sélectionnez vos dates parmi les jours disponibles qui sont en vert. Une fois selectionnés, les jours apparaissent en bleu.
    Vous pouvez également enlever des jours déjà choisis en recliquant sur la case." +msgid "Select your dates amoung the free days (green). The selected days are in blue." +msgstr "Sélectionnez vos dates parmi les jours disponibles qui sont en vert. Une fois selectionnés, les jours apparaissent en bleu." + +msgid "You can unselect a day previously selected by clicking again on it." +msgstr "Vous pouvez également enlever des jours déjà choisis en recliquant sur la case." #: choix_date.php:487 msgid "Selected days" msgstr "Jour retenus" #: choix_date.php:489 -msgid "For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes." -msgstr "Pour chacun des jours que vous avez sélectionnés, vous avez la possibilité de choisir ou non, des heures de réunion avec ce format :
    - vide, si vous ne désirez pas mettre d'horaires particuliers,
    - \"8h\", \"8H\" ou \"8:00\" pour proposer une heure de début de réunion,
    - \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" pour un créneau,
    - \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" pour un créneau avec minutes." +msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)" +msgstr "Pour chacun des jours sélectionnés, vous avez la possibilité de choisir ou non, des heures de réunion (par exemple : \"8h\", \"8:30\", \"8h-10h\", \"soir\", etc.)" -#: choix_date.php:490 -msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)" -msgstr "Pour chacun des jours que vous avez sélectionnés, vous avez la possibilité de choisir ou non, des heures de réunion (par exemple : \"8h\", \"8:15\", \"8h-10h\", \"soir\")." +#: choix_date.php:225 +msgid "Previous year" +msgstr "Année précédente" + +msgid "Next year" +msgstr "Année précédente" + +msgid "Previous month" +msgstr "Mois précédent" + +msgid "Next month" +msgstr "Mois suivant" + +msgid "Today" +msgstr "Aujourd'hui" #: choix_date.php:496 @@ -374,8 +423,8 @@ msgid "Comments" msgstr "Commentaire de l'auteur" #: studs.php:238 -msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line." -msgstr "Pour participer à ce sondage, veuillez entrer votre nom, choisir toutes les valeurs qui vous conviennent
    et valider votre choix avec le bouton en bout de ligne." +msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line." +msgstr "Pour participer à ce sondage, veuillez entrer votre nom, choisir toutes les valeurs qui vous conviennent et valider votre choix avec le bouton en bout de ligne." #: studs.php:456 msgid "Participate" @@ -434,6 +483,15 @@ msgstr "URL à communiquer" msgid "Add a comment in the poll:" msgstr "Ajoutez un commentaire à ce sondage :" +msgid "Your comment: " +msgstr "Votre commentaire : " + +msgid "Write your comment" +msgstr "Écrire votre commentaire" + +msgid "Send your comment" +msgstr "Envoyer votre commentaire" + #: studs.php:566 #: adminstuds.php:1027 msgid "Name" @@ -460,8 +518,11 @@ msgid "What is it about?" msgstr "À quoi ça sert ?" #: index.php:70 -msgid "Making polls to schedule meetings or events, quickly and easily.
    You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." -msgstr "À faire des sondages pour que vous puissiez trouver une date de réunion qui convienne à toutes les personnes concernées.
    Vous pouvez également utiliser cette application pour déterminer à plusieurs un choix quelconque comme un lieu de RV, un thème de réunion ou la marque de votre prochaine machine à café." +msgid "Making polls to schedule meetings or events, quickly and easily." +msgstr "À faire des sondages pour que vous puissiez trouver une date de réunion qui convienne à toutes les personnes concernées." + +msgid "You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays." +msgstr "Vous pouvez également utiliser cette application pour déterminer à plusieurs un choix quelconque comme un lieu de RV, un thème de réunion ou la marque de votre prochaine machine à café." #: creation_sondage.php:88 msgid "For sending to the polled users" @@ -520,15 +581,15 @@ msgstr "" "Vous pouvez modifier ce sondage au lien suivant" #: adminstuds.php:122 -msgid "[ADMINISTRATOR] New comments for your poll" -msgstr "[ADMINISTRATEUR] Changement des commentaires du sondage avec " +msgid "[ADMINISTRATOR] New description for your poll" +msgstr "[ADMINISTRATEUR] Changement de la descrpition du sondage avec " #: adminstuds.php:123 msgid "" -"You have changed the comments of your poll. \n" +"You have changed the description of your poll. \n" "You can modify this poll with this link" msgstr "" -"Vous avez fait la modification des commentaires de votre sondage. \n" +"Vous avez modifié la description de votre sondage. \n" "Vous pouvez modifier ce sondage au lien suivant" #: adminstuds.php:141 @@ -552,13 +613,31 @@ msgid "Add a new column" msgstr "Si vous souhaitez ajouter une colonne" #: adminstuds.php:175 -msgid "You can add a new scheduling date to your poll.
    If you just want to add a new hour to an existant date, put the same date and choose a new hour." -msgstr "Vous pouvez ajouter une date à votre sondage. Si la date existe déjà et que vous ne voulez rajouter qu'un horaire,
    mettez le jour en entier avec l'horaire ou le créneau supplémentaire et il sera intégré normalement au sondage existant." +msgid "You can add a new scheduling date to your poll." +msgstr "Vous pouvez ajouter une date à votre sondage." + +msgid "If you just want to add a new hour to an existant date, put the same date and choose a new hour." +msgstr "mettez le jour en entier avec l'horaire ou le créneau supplémentaire et il sera intégré normalement au sondage existant." #: adminstuds.php:176 msgid "Add a date" msgstr "Pour ajouter une date" +msgid "Day" +msgstr "Jour" + +msgid "Month" +msgstr "Mois" + +msgid "Year" +msgstr "Année" + +msgid "Hour" +msgstr "Heure" + +msgid "Min" +msgstr "Min" + #: adminstuds.php:197 msgid "Add a start hour (optional)" msgstr "Pour ajouter un horaire de début (facultatif)" @@ -569,14 +648,14 @@ msgstr "Pour ajouter un horaire de fin (facultatif)" #: adminstuds.php:253 msgid "[ADMINISTRATOR] Removing of your poll" -msgstr "[ADMINISTRATEUR] Suppression de sondage avec " +msgstr "[ADMINISTRATEUR] Suppression de sondage" #: adminstuds.php:254 msgid "" "You have removed your poll. \n" "You can make new polls with this link" msgstr "" -"Vous avez fait la suppression d'un sondage. \n" +"Vous supprimé un sondage. \n" "Vous pouvez faire de nouveaux sondages au lien suivant" #: adminstuds.php:273 @@ -598,18 +677,36 @@ msgstr "" "Vous pouvez informer vos utilisateurs de ce changement en leur envoyant l'adresse suivante" #: adminstuds.php:630 -msgid "As poll administrator, you can change all the lines of this poll with \"infos\".
    You can, as well, remove a column or a line with \"Cancel\".
    You can also add a new column with \"Add.
    Finally, you can change the informations of this poll like the title, the comments or your email address." -msgstr "En tant qu'administrateur, vous pouvez modifier toutes les lignes de ce sondage avec \"Icone.
    Vous avez aussi la possibilité d'effacer une colonne ou une ligne avec \"Annuler\".
    Si vous avez oublié de mettre un choix, vous pouvez rajouter une colonne en cliquant sur \"Annuler\"
    en bout de ligne des noms de colonne. Vous pouvez enfin également modifier les informations
    relatives à ce sondage comme le titre, les commentaires ou encore votre adresse électronique." +msgid "As poll administrator, you can change all the lines of this poll with this button " +msgstr "En tant qu'administrateur, vous pouvez modifier toutes les lignes de ce sondage avec ce bouton " + +msgid "Edit" +msgstr "Modifier" + +msgid "You can, as well, remove a column or a line with " +msgstr "Vous avez aussi la possibilité d'effacer une colonne ou une ligne avec " + +msgid "Remove" +msgstr "Effacer" + +msgid "Remove the column" +msgstr "Effacer la colonne" + +msgid "Validate" +msgstr "Valider" + +msgid "You can also add a new column with " +msgstr "Si vous avez oublié de mettre un choix, vous pouvez rajouter une colonne en cliquant sur " -#: adminstuds.php:669 -#: adminstuds.php:689 -#: adminstuds.php:708 -#: adminstuds.php:720 -#: adminstuds.php:738 -#: adminstuds.php:837 msgid "Add" msgstr "Ajouter" +msgid "Add a column" +msgstr "Ajouter une colonne" + +msgid "Finally, you can change the informations of this poll like the title, the comments or your email address." +msgstr "Vous pouvez enfin également modifier les informations relatives à ce sondage comme le titre, les commentaires ou encore votre adresse électronique." + #: adminstuds.php:894 msgid "Characters \" ' < et > are not permitted" msgstr "Les caractères \" ' < et > ne sont pas autorisés !" @@ -631,8 +728,14 @@ msgid "Poll's management" msgstr "Gestion de votre sondage" #: adminstuds.php:969 +msgid "Poll title: " +msgstr "Titre du sondage : " + msgid "Change the title" -msgstr "Si vous souhaitez changer le titre du sondage" +msgstr "Modifier le titre" + +msgid "Save the new title" +msgstr "Enregistrer le nouveau titre" #: adminstuds.php:976 msgid "Generate the convocation letter (.PDF), choose the place to meet and validate" @@ -647,12 +750,21 @@ msgid "Enter a new title!" msgstr "Veuillez entrer un nouveau titre !" #: adminstuds.php:996 -msgid "Change the comments" -msgstr "Si vous souhaitez changer les commentaires du sondage" +msgid "Change the description" +msgstr "Changer la description" + +msgid "Save the description" +msgstr "Enregistrer la description" #: adminstuds.php:1000 -msgid "Change your email address" -msgstr "Si vous souhaitez changer votre adresse de courrier électronique" +msgid "Your e-mail address: " +msgstr "Votre adresse e-mail : " + +msgid "Change your email" +msgstr "Changer votre adresse" + +msgid "Save your new email" +msgstr "Enregistrer votre adresse email" #: adminstuds.php:1004 msgid "Enter a new email address!" @@ -668,7 +780,7 @@ msgstr "Si vous souhaitez supprimer votre sondage" #: adminstuds.php:1033 msgid "Remove the poll" -msgstr "Suppression du sondage" +msgstr "Supprimer le sondage" #: adminstuds.php:1033 msgid "Cancel" diff --git a/maintenance.php b/maintenance.php index ea3f8d2..95c5932 100644 --- a/maintenance.php +++ b/maintenance.php @@ -1,42 +1,20 @@ '."\n"; @@ -51,9 +29,9 @@ logo(); bandeau_tete(); echo '
    '."\n"; -print "

    L'application ".NOMAPPLICATION." est pour l'instant en maintenance.

    "."\n"; +print "

    L'application ".NOMAPPLICATION." est pour l'instant en maintenance.

    "."\n"; print "Merci de votre compréhension."."\n"; -echo '


    '."\n"; +echo '


    '."\n"; echo '
    '."\n"; // Affichage du bandeau de pied diff --git a/studs.php b/studs.php index 16cd29e..d1c4691 100644 --- a/studs.php +++ b/studs.php @@ -1,42 +1,20 @@ titre); + print_header(true, _("Error!").' - '.$dsondage->titre, $lang); } else { - print_header(true, $dsondage->titre); + print_header(true, $dsondage->titre, $lang); } echo ''."\n"; framanav(); @@ -234,7 +212,8 @@ if($err != 0) { } echo '
    '; //ajout pyg cohérence graphique -echo '
    Imprimer
    '; +echo '

    ' . _('Print') . '

    '; +echo '

    ' . _('Export to CSV') . '

    '; echo '
    '."\n"; //affichage du titre du sondage @@ -243,12 +222,12 @@ echo '

    '.stripslashes($titre).'

    '."\n"; //affichage du nom de l'auteur du sondage echo '

    '. _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'

    '."\n"; -echo '

    '.'Adresse : '.getUrlSondage($dsondage->id_sondage).'

    '."\n";; +echo '

    '._("Public link of the pool") .' : '.getUrlSondage($dsondage->id_sondage).'

    '."\n"; -//affichage des commentaires du sondage +//affichage de la description du sondage if ($dsondage->commentaires) { - echo '
    '._("Comments") .' :
    '."\n"; + echo '
    '._("Description: ") .'
    '."\n"; $commentaires = $dsondage->commentaires; $commentaires=nl2br(str_replace("\\","",$commentaires)); echo ''. $commentaires .''; @@ -260,7 +239,7 @@ echo '
    '; // Todo : add CSRF protection echo '
    '."\n"; -echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you
    and validate with the plus button at the end of the line.") ."\n"; +echo _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.") ."\n"; echo '
    '."\n"; // Debut de l'affichage des resultats du sondage @@ -398,14 +377,14 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") { //affichage des horaires if (strpos($dsondage->sujet, '@') !== false) { echo ''."\n"; - echo ''."\n"; + echo ''."\n"; for ($i=0; isset($toutsujet[$i]); $i++) { $heures=explode("@",$toutsujet[$i]); if (isset($heures[1]) === true) { echo ''.stripslashes($heures[1]).''."\n"; } else { - echo ''."\n"; + echo ''."\n"; } } @@ -453,7 +432,7 @@ while ($data = $user_studs->FetchNextObject(false)) { for ($k=0; $k < $nbcolonnes; $k++) { // on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs if ($compteur == $ligneamodifier) { - echo 'FetchNextObject(false)) { //a la fin de chaque ligne se trouve les boutons modifier if ($compteur != $ligneamodifier && ($dsondage->format=="A+"||$dsondage->format=="D+") && $mod_ok) { - echo ''."\n"; + echo ''."\n"; } //demande de confirmation pour modification de ligne for ($i=0;$i<$nblignes;$i++) { if (isset($_POST["modifierligne$i"]) || isset($_POST['modifierligne'.$i.'_x'])) { if ($compteur == $i) { - echo ''."\n"; + echo ''."\n"; } } } @@ -492,7 +471,7 @@ while ($data = $user_studs->FetchNextObject(false)) { } // affichage de la ligne pour un nouvel utilisateur -if (! ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || !$user_mod) { +if (( !(USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) || !$user_mod) && $ligneamodifier==-1) { echo ''."\n"; echo ''."\n"; if (isset($_SESSION['nom'])) { @@ -500,13 +479,13 @@ if (! ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || !$user_mod) { } else { $nom = 'Votre nom'; } - echo ''."\n"; + echo ''."\n"; echo ''."\n"; // affichage des cases de formulaire checkbox pour un nouveau choix for ($i=0;$i<$nbcolonnes;$i++) { - echo ''."\n"; + echo ''."\n"; echo ''."\n"; + + // Focus javascript sur la case de texte du formulaire + echo ''."\n"; } //determination de la meilleure date @@ -539,7 +521,7 @@ echo ''."\n".''."\n"; echo ''."\n"; echo ''; // si on a plus de 8 colonnes, on affiche un second bouton "valider mes choix" -echo ($nbcolonnes>8) ?'' : ""; +echo ($nbcolonnes>8) ?'' : ""; echo _("Addition") .''."\n"; for ($i=0; $i < $nbcolonnes; $i++) { @@ -620,9 +602,9 @@ echo '

    '."\n"; // Affichage du meilleur choix if ($compteursujet == "1" && isset($meilleurecolonne)) { - print 'Meilleur choix ' . _('The best choice at this time is:') . "".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; + print ' ' . _('The best choice at this time is:') . "".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; } elseif (isset($meilleurecolonne)) { - print 'Meilleur choix ' . _('The bests choices at this time are:') . " ".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; + print ' ' . _('The bests choices at this time are:') . " ".stripslashes($meilleursujet)." " . _('with') . " $meilleurecolonne " . $vote_str . ".\n"; } echo '

    '; @@ -633,7 +615,7 @@ $sql = $connect->Prepare($sql); $comment_user=$connect->Execute($sql, array($numsondage)); if ($comment_user->RecordCount() != 0) { - print "
    " . _("Comments of polled people") . " :
    \n"; + print "
    " . _("Comments of polled people") . " :
    \n"; while($dcomment = $comment_user->FetchNextObject(false)) { print '
    '.stripslashes($dcomment->usercomment). ' : ' . stripslashes(nl2br($dcomment->comment)) . '
    '; } @@ -649,21 +631,21 @@ if (isset($_SESSION['nom']) === false) { } echo '

    : '; echo '

    '."\n"; -echo '

    :
    '; -echo '

    '."\n"; -echo '

    '."\n"; +echo '


    '; +echo '

    '."\n"; +echo '

    '."\n"; echo '
    '."\n"; -// Focus javascript sur la case de texte du formulaire -echo ''."\n"; echo '
    '."\n"; -echo '
      '; +/* Export CSV / ICS + * echo '
        '; echo '
      • ' . _('Export to CSV') . ''.''._("Export: Spreadsheet") .' (.CSV)' . '
        • '; -if ( ($dsondage->format == 'D' || $dsondage->format == 'D+') && $compteursujet=="1" && $meilleurecolonne && file_exists('iCalcreator/iCalcreator.class.php') && false /* TODO: later */) { +if ( ($dsondage->format == 'D' || $dsondage->format == 'D+') && $compteursujet=="1" && $meilleurecolonne && file_exists('iCalcreator/iCalcreator.class.php') && false) { echo '
      • ' . _('Export iCal') . '' .''._("Agenda") .' (.ICS)' . '
        • '; } echo '
      '; +*/ echo ''."\n"; //echo '
    '; // ajout pyg cohérence graphique diff --git a/style.css b/style.css index 946de00..38d9f37 100644 --- a/style.css +++ b/style.css @@ -1,48 +1,19 @@ -/* -========================================================================== - -Université de Strasbourg - Direction Informatique -Auteur : Guilhem BORGHESI -Création : Février 2008 - -borghesi@unistra.fr - -Ce logiciel est régi par la licence CeCILL-B soumise au droit français et -respectant les principes de diffusion des logiciels libres. Vous pouvez -utiliser, modifier et/ou redistribuer ce programme sous les conditions -de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA -sur le site "http://www.cecill.info". - -Le fait que vous puissiez accéder à cet en-tête signifie que vous avez -pris connaissance de la licence CeCILL-B, et que vous en avez accepté les -termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE. - -========================================================================== - -Université de Strasbourg - Direction Informatique -Author : Guilhem BORGHESI -Creation : Feb 2008 - -borghesi@unistra.fr - -This software is governed by the CeCILL-B license under French law and -abiding by the rules of distribution of free software. You can use, -modify and/ or redistribute the software under the terms of the CeCILL-B -license as circulated by CEA, CNRS and INRIA at the following URL -"http://www.cecill.info". - -The fact that you are presently reading this means that you have had -knowledge of the CeCILL-B license and that you accept its terms. You can -find a copy of this license in the file LICENSE. - -========================================================================== -*/ - -/* -Le fichier style.css est le fichier de style de studs. Il se trouve à la racine -du répertoire studs. Il contient toutes les mises en forme des fichiers PHP -de Studs. -*/ +/* This software is governed by the CeCILL-B license. If a copy of this license + * is not distributed with this file, you can obtain one at + * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt + * + * Authors of STUdS (initial project) : Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ + * Authors of OpenSondage : Framasoft (https://github.com/framasoft) + * + * ============================= + * + * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence + * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur + * http://www.cecill.info/licences/Licence_CeCILL_V2.1-fr.txt + * + * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ + * Auteurs d'OpenSondage : Framasoft (https://github.com/framasoft) + */ @import url('./buttons.css'); @@ -328,9 +299,9 @@ div.bodydate table{ /*cadre de commentaires*/ div.presentationdate { - width:70%; + width:66%; font-family:arial; - text-align:center; +/* text-align:center;*/ font-size:12px; border-width:1px; border-style:solid; @@ -344,7 +315,10 @@ div.presentationdate { margin-right: 15%; background-color: #EEF; border-radius: 5px; + padding: 0 20px 20px; } +div.presentationdate h2 {text-align:center} + div.presentationdatefin { width:90%; padding:10px; @@ -374,8 +348,10 @@ div.cadre { } /*information au sujet de la participation au sondage*/ -div.cadre div.information { - margin-bottom:20px; +div.information { + margin:0 auto 20px auto; + max-width:650px; + text-align:justify; } /*la table des résultats dans l'affichage de sondage*/ div.cadre table.resultats { @@ -615,6 +591,13 @@ div.addcomment { border-radius: 5px; } +div.addcomment p { + width:380px; + margin-left : auto; + margin-right: auto; + text-align:left; +} + ul.exports { display:none; /* fonction non fonctionnelle */ text-align:center; @@ -680,6 +663,10 @@ li.error { .imprimer { float:right; + text-align:center; +} +.imprimer a { + width: 90px } .error { @@ -691,5 +678,48 @@ li.error { } .txt-right { -text-align:right; + text-align:right !important; +} +.txt-center { + text-align:center !important; +} + +.sousbandeaulangue select { + border: 1px solid white; + height: 14px; + border-radius: 0.5em 0 0 0.5em; +} +.sousbandeaulangue input { + border: none; + height: 15px; + border-radius: 0 0.5em 0.5em 0; +} + +.clear-left { + clear:left; +} + +.newday { + width:60px; + float:left; +} + +.newmonth { + width:110px; + float:left; +} + +.newyear { + width:70px; + float:left; +} + +.newhour { + width:70px; + float:left; +} + +.newmin { + width:50px; + float:left; } diff --git a/variables.php.template b/variables.php.template index 0dfe9f6..8595150 100644 --- a/variables.php.template +++ b/variables.php.template @@ -1,42 +1,21 @@