Incomplete 'booking' extension added, fixes for registration and refback list
authorRoland Häder <roland@mxchange.org>
Sat, 29 Nov 2008 21:39:50 +0000 (21:39 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 29 Nov 2008 21:39:50 +0000 (21:39 +0000)
.gitattributes
inc/databases.php
inc/extensions/ext-booking.php [new file with mode: 0644]
inc/language/booking_de.php [new file with mode: 0644]
inc/libs/booking_functions.php [new file with mode: 0644]
inc/modules/guest/what-register.php
inc/modules/member/what-refback.php
templates/de/html/ext/ext_booking.tpl [new file with mode: 0644]
templates/de/html/ext/ext_newsletter.tpl

index 52d2aea..1a68632 100644 (file)
@@ -106,6 +106,7 @@ inc/extensions/ext-bank.php -text
 inc/extensions/ext-beg.php -text
 inc/extensions/ext-birthday.php -text
 inc/extensions/ext-bonus.php -text
+inc/extensions/ext-booking.php -text
 inc/extensions/ext-cache.php -text
 inc/extensions/ext-country.php -text
 inc/extensions/ext-debug.php -text
@@ -165,6 +166,7 @@ inc/language/bank_de.php -text
 inc/language/beg_de.php -text
 inc/language/birthday_de.php -text
 inc/language/bonus_de.php -text
+inc/language/booking_de.php -text
 inc/language/cache_de.php -text
 inc/language/country_de.php -text
 inc/language/de.php -text
@@ -208,6 +210,7 @@ inc/libs/admins_functions.php -text
 inc/libs/autopurge_functions.php -text
 inc/libs/beg_functions.php -text
 inc/libs/bonus_functions.php -text
+inc/libs/booking_functions.php -text
 inc/libs/cache_functions.php -text
 inc/libs/country_functions.php -text
 inc/libs/debug_functions.php -text
@@ -1189,6 +1192,7 @@ templates/de/html/ext/ext_bank.tpl -text
 templates/de/html/ext/ext_beg.tpl -text
 templates/de/html/ext/ext_birthday.tpl -text
 templates/de/html/ext/ext_bonus.tpl -text
+templates/de/html/ext/ext_booking.tpl -text
 templates/de/html/ext/ext_cache.tpl -text
 templates/de/html/ext/ext_country.tpl -text
 templates/de/html/ext/ext_debug.tpl -text
index 870470b..d0c971e 100644 (file)
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "578");
+define('CURR_SVN_REVISION', "579");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php
new file mode 100644 (file)
index 0000000..c438f07
--- /dev/null
@@ -0,0 +1,108 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 11/26/2008 *
+ * ================                             Last change: 11/26/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : ext-booking.php                                  *
+ * -------------------------------------------------------------------- *
+ * Short description : User bookings                                    *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Kontoauszug der Mitglieder                       *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+}
+
+// Version number
+$EXT_VERSION = "0.0";
+
+// Auto-set extension version
+if (!isset($EXT_VER)) $EXT_VER = $EXT_VERSION;
+
+// Version history array (add more with , "0.1" and so on)
+$EXT_VER_HISTORY = array("0.0");
+
+switch ($EXT_LOAD_MODE)
+{
+case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
+       // Configuration entries
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `booking_per_page` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `booking_purge` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".($_CONFIG['one_day'] * 3)."";
+
+       // Drop/create table for user bookings
+       $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_user_book`";
+       $SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_user_book`(
+`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`subject` VARCHAR(255) NOT NULL DEFAULT 'missing',
+`mode` ENUM('add','sub') NOT NULL DEFAULT 'add',
+`points` DOUBLE(20,5) UNSIGNED NOT NULL DEFAULT 0.0000,
+INDEX (`userid`),
+PRIMARY KEY(`id`)
+) TYPE=MyISAM COMMENT='Member points booking table'";
+
+       // Admin menu
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_booking','Kontoauszug','Einstellungen am Kontoauszug f&uuml;r Mitglieder vornehmen.', 14)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_booking','Kontoauszug','Kontoausz&uuml;ge aller Ihrer Mitglieder oder eines einzelnen Mitgliedes anzeigen.',10)";
+
+       // Member menu
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','booking','{!POINTS!}-Kontoauszug',5,'Y','Y')";
+       break;
+
+case "remove": // Do stuff when removing extension
+       $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_user_book`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE `what` IN ('config_booking','list_booking') LIMIT 2";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE `what`='booking' LIMIT 1";
+       break;
+
+case "activate": // Do stuff when admin activates this extension
+       // SQL commands to run
+       $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_member_menu` SET visible='Y', locked='N' WHERE what='booking' LIMIT 1";
+       break;
+
+case "deactivate": // Do stuff when admin deactivates this extension
+       // SQL commands to run
+       $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_member_menu` SET locked='Y' WHERE what='booking' LIMIT 1";
+       break;
+
+case "update": // Update an extension
+       switch ($EXT_VER)
+       {
+       case "0.0.1": // SQL queries for v0.0.1
+               $SQLs[] = "";
+
+               // Update notes (these will be set as task text!)
+               $UPDATE_NOTES = "";
+               break;
+       }
+
+default: // Do stuff when extension is loaded
+       break;
+}
+
+//
+?>
diff --git a/inc/language/booking_de.php b/inc/language/booking_de.php
new file mode 100644 (file)
index 0000000..814db50
--- /dev/null
@@ -0,0 +1,41 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 11/26/2008 *
+ * ===============                              Last change: 11/26/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : booking_de.php                                   *
+ * -------------------------------------------------------------------- *
+ * Short description : German langugage support                         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Deutsche Sprachunterstuetzung                    *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+}
+
+//
+?>
diff --git a/inc/libs/booking_functions.php b/inc/libs/booking_functions.php
new file mode 100644 (file)
index 0000000..44fda2d
--- /dev/null
@@ -0,0 +1,55 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 11/26/2008 *
+ * ===============                              Last change: 11/26/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : booking_functions.php                            *
+ * -------------------------------------------------------------------- *
+ * Short description : Functions for booking extension                  *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Funktionen fuer booking-Erweiterung              *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+}
+
+
+// Add a record entry ("mode" can be add/sub!)
+function ADD_BOOKING_RECORD ($subject, $uid, $points, $mode) {
+       // Is the sql_patches updated?
+       if (EXT_VERSION_IS_OLDER("sql_patches", "0.5.7")) {
+               // Abort here
+               return;
+       } // END - if
+
+       // Add record entry here
+       SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_user_book` (`userid`,`subject`,`mode`,`points`) VALUES(%s,'%s','%s',%s)",
+               array($uid, $subject, $mode, $points), __FILE__, __LINE__);
+}
+
+// [EOF]
+?>
index 542db3e..c54d32d 100644 (file)
@@ -428,7 +428,11 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        define('__FAMILY',  SQL_ESCAPE($_POST['family_name']));
        define('__STREET',  SQL_ESCAPE($_POST['street_nr']));
        define('__COUNTRY', SQL_ESCAPE($_POST['cntry']));
-       define('__ZIP',     bigintval($_POST['zip']));
+       if (!empty($_POST['zip'])) {
+               define('__ZIP', bigintval($_POST['zip']));
+       } else {
+               define('__ZIP', "");
+       }
        define('__CITY',    SQL_ESCAPE($_POST['city']));
        define('__ADDY',    SQL_ESCAPE($_POST['addy']));
 
index 9f834fd..89929d7 100644 (file)
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        // User is not logged in
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("refback"))
+} elseif (!EXT_IS_ACTIVE("refback")) {
        // Extension "refback" is not active
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "refback");
        return;
diff --git a/templates/de/html/ext/ext_booking.tpl b/templates/de/html/ext/ext_booking.tpl
new file mode 100644 (file)
index 0000000..102f289
--- /dev/null
@@ -0,0 +1,3 @@
+Ein Kontoauszug aller Auf- und Abbuchungen, die Ihre Mitglieder erhalten haben.
+Sie k&ouml;nnen den Bereinigungsinterval f&uuml;r veraltete Eintr&auml;ge, sowie
+die Anzahl Eintr&auml;ge pro Seite einstellen.
index 5249113..a40479a 100644 (file)
@@ -1,4 +1,4 @@
-Diese Erweiterung ist fester Bestandteil des Grundscriptes und bietet
-Ihnen die M&ouml;glicheit, einen Newsletter an alle Ihre Mitglieder im
-{!MT_WORD!} zu versenden. Ihre Mitglieder k&ouml;nnen - gegen eine von
-Ihnen einstellbare Geb&uuml;hr - auch den Newsletter-Empfang abschalten.
+Diese Erweiterung ist fester Bestandteil des Grundscriptes und bietet Ihnen die
+M&ouml;glicheit, einen Newsletter an alle Ihre Mitglieder im {!MT_WORD!} zu
+versenden. Ihre Mitglieder k&ouml;nnen - gegen eine von Ihnen einstellbare
+Geb&uuml;hr - auch den Newsletter-Empfang abschalten.