Extension ext-surfbar continued:
authorRoland Häder <roland@mxchange.org>
Mon, 11 Jul 2011 17:19:51 +0000 (17:19 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 11 Jul 2011 17:19:51 +0000 (17:19 +0000)
- Filters for ext-surfbar added
- Templates renamed according to naming convention
- what-unconfirmed.php requires now ext-mailid to be active
- TODOs.txt updated

29 files changed:
.gitattributes
DOCS/TODOs.txt
inc/extensions/ext-surfbar.php
inc/filter/surfbar_filter.php
inc/libs/surfbar_functions.php
inc/modules/member/what-book_surfbar.php [new file with mode: 0644]
inc/modules/member/what-list_surfbar.php [new file with mode: 0644]
inc/modules/member/what-start_surfbar.php [new file with mode: 0644]
inc/modules/member/what-stats_surfbar.php [new file with mode: 0644]
inc/modules/member/what-surfbar_book.php
inc/modules/member/what-surfbar_list.php
inc/modules/member/what-surfbar_start.php
inc/modules/member/what-surfbar_stats.php
inc/modules/member/what-transfer.php
inc/modules/member/what-unconfirmed.php
templates/de/html/member/member_book_surfbar_dynamic.tpl [new file with mode: 0644]
templates/de/html/member/member_book_surfbar_static.tpl [new file with mode: 0644]
templates/de/html/member/member_list_surfbar.tpl [new file with mode: 0644]
templates/de/html/member/member_list_surfbar_form.tpl [new file with mode: 0644]
templates/de/html/member/member_list_surfbar_row.tpl [new file with mode: 0644]
templates/de/html/member/member_start_surfbar_dynamic.tpl [new file with mode: 0644]
templates/de/html/member/member_start_surfbar_static.tpl [new file with mode: 0644]
templates/de/html/member/member_surfbar_book_dynamic.tpl
templates/de/html/member/member_surfbar_book_static.tpl
templates/de/html/member/member_surfbar_list.tpl
templates/de/html/member/member_surfbar_list_form.tpl
templates/de/html/member/member_surfbar_list_row.tpl
templates/de/html/member/member_surfbar_start_dynamic.tpl
templates/de/html/member/member_surfbar_start_static.tpl

index 330eed0..96bf515 100644 (file)
@@ -627,6 +627,7 @@ inc/modules/member/what-bank_withdraw.php svneol=native#text/plain
 inc/modules/member/what-beg.php svneol=native#text/plain
 inc/modules/member/what-beg2.php svneol=native#text/plain
 inc/modules/member/what-bonus.php svneol=native#text/plain
+inc/modules/member/what-book_surfbar.php svneol=native#text/plain
 inc/modules/member/what-booking.php svneol=native#text/plain
 inc/modules/member/what-cash_coupon.php svneol=native#text/plain
 inc/modules/member/what-categories.php svneol=native#text/plain
@@ -635,6 +636,7 @@ inc/modules/member/what-guest.php svneol=native#text/plain
 inc/modules/member/what-holiday.php svneol=native#text/plain
 inc/modules/member/what-html_mail.php svneol=native#text/plain
 inc/modules/member/what-list_coupon.php svneol=native#text/plain
+inc/modules/member/what-list_surfbar.php svneol=native#text/plain
 inc/modules/member/what-logout.php svneol=native#text/plain
 inc/modules/member/what-mydata.php svneol=native#text/plain
 inc/modules/member/what-nickname.php svneol=native#text/plain
@@ -647,7 +649,9 @@ inc/modules/member/what-refback.php svneol=native#text/plain
 inc/modules/member/what-reflinks.php svneol=native#text/plain
 inc/modules/member/what-reflist.php svneol=native#text/plain
 inc/modules/member/what-sponsor_list.php svneol=native#text/plain
+inc/modules/member/what-start_surfbar.php svneol=native#text/plain
 inc/modules/member/what-stats.php svneol=native#text/plain
+inc/modules/member/what-stats_surfbar.php svneol=native#text/plain
 inc/modules/member/what-support.php svneol=native#text/plain
 inc/modules/member/what-surfbar_book.php svneol=native#text/plain
 inc/modules/member/what-surfbar_list.php svneol=native#text/plain
@@ -1640,6 +1644,8 @@ templates/de/html/member/member_bonus.tpl svneol=native#text/plain
 templates/de/html/member/member_bonus_404.tpl svneol=native#text/plain
 templates/de/html/member/member_bonus_row.tpl svneol=native#text/plain
 templates/de/html/member/member_bonus_turbo_row.tpl svneol=native#text/plain
+templates/de/html/member/member_book_surfbar_dynamic.tpl svneol=native#text/plain
+templates/de/html/member/member_book_surfbar_static.tpl svneol=native#text/plain
 templates/de/html/member/member_cash_coupon.tpl svneol=native#text/plain
 templates/de/html/member/member_cat_row.tpl svneol=native#text/plain
 templates/de/html/member/member_cats_footer.tpl svneol=native#text/plain
@@ -1658,6 +1664,9 @@ templates/de/html/member/member_list_beg.tpl svneol=native#text/plain
 templates/de/html/member/member_list_beg_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_coupon.tpl svneol=native#text/plain
 templates/de/html/member/member_list_coupon_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_surfbar.tpl svneol=native#text/plain
+templates/de/html/member/member_list_surfbar_form.tpl svneol=native#text/plain
+templates/de/html/member/member_list_surfbar_row.tpl svneol=native#text/plain
 templates/de/html/member/member_login_js.tpl svneol=native#text/plain
 templates/de/html/member/member_mail_bonus_deleted.tpl svneol=native#text/plain
 templates/de/html/member/member_mail_bonus_new.tpl svneol=native#text/plain
@@ -1720,6 +1729,8 @@ templates/de/html/member/member_reflink_nickname.tpl svneol=native#text/plain
 templates/de/html/member/member_reflink_no_nickname.tpl svneol=native#text/plain
 templates/de/html/member/member_reflinks_row.tpl svneol=native#text/plain
 templates/de/html/member/member_reflinks_table.tpl svneol=native#text/plain
+templates/de/html/member/member_start_surfbar_dynamic.tpl svneol=native#text/plain
+templates/de/html/member/member_start_surfbar_static.tpl svneol=native#text/plain
 templates/de/html/member/member_stats_pool.tpl svneol=native#text/plain
 templates/de/html/member/member_stats_row.tpl svneol=native#text/plain
 templates/de/html/member/member_stats_table.tpl svneol=native#text/plain
index c6d84be..d17cf67 100644 (file)
@@ -82,7 +82,7 @@
 ./inc/libs/sponsor_functions.php:430:                  // @TODO Rewrite this to API function
 ./inc/libs/surfbar_functions.php:1000: // @TODO Invalid salt should be refused
 ./inc/libs/surfbar_functions.php:1081: // @TODO Try to rewrite the following unset()
-./inc/libs/surfbar_functions.php:1598:         // @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:1596:         // @TODO This can be somehow rewritten
 ./inc/libs/surfbar_functions.php:711:// @TODO Can't we use our new expression language instead of this ugly code?
 ./inc/libs/task_functions.php:247:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:51:// @TODO Move all extension-dependent queries into filters
 ./inc/modules/member/what-rallyes.php:89:      // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 ./inc/modules/member/what-refback.php:124:                     // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
 ./inc/modules/member/what-reflinks.php:52:// @TODO Move this into a filter
-./inc/modules/member/what-transfer.php:127:                            // @TODO Rewrite this to a filter
-./inc/modules/member/what-unconfirmed.php:138: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/member/what-unconfirmed.php:203:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
+./inc/modules/member/what-transfer.php:128:                            // @TODO Rewrite this to a filter
+./inc/modules/member/what-unconfirmed.php:144: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/member/what-unconfirmed.php:209:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
 ./inc/modules/order.php:74:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:64:    // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1241:  // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-chk_regs.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_admins.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_email.php:2:// @DEPRECATED
+./inc/modules/member/what-surfbar_book.php:2:// @DEPRECATED
+./inc/modules/member/what-surfbar_start.php:2:// @DEPRECATED
+./inc/modules/member/what-surfbar_stats.php:2:// @DEPRECATED
 ./inc/reset/reset_100_bonus.php:2:// @DEPRECATED
 ./inc/reset/reset_autopurge.php:2:// @DEPRECATED
 ./inc/reset/reset_beg.php:2:// @DEPRECATED
 ./templates/de/html/admin/admin_list_chk_reg.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_send_reset_link.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_surfbar_book_dynamic.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_surfbar_book_static.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_surfbar_list_form.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_surfbar_list_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_surfbar_list.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_surfbar_start_dynamic.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_surfbar_start_static.tpl:1:<!-- @DEPRECATED //-->
 ./templates/xml/admin/admin_del_do_surfbar_urls.xml:1:<!-- @DEPRECATED //-->
 ./templates/xml/admin/admin_del_show_surfbar_urls.xml:1:<!-- @DEPRECATED //-->
 ### ### template-warnings.log follows: ### ###
index edf82b0..f3e8a89 100644 (file)
@@ -179,10 +179,10 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`)",
 
                // Member menus
                addMemberMenuSql('surfbar', NULL, 'Surfbar', 4);
-               addMemberMenuSql('surfbar', 'surfbar_start', 'Surfbar starten', 1);
-               addMemberMenuSql('surfbar', 'surfbar_book', 'Seite buchen', 2);
-               addMemberMenuSql('surfbar', 'surfbar_list', 'Seiten-Management', 3);
-               addMemberMenuSql('surfbar', 'surfbar_stats', 'Seiten-Statistik', 4);
+               addMemberMenuSql('surfbar', 'start_surfbar', 'Surfbar starten', 1);
+               addMemberMenuSql('surfbar', 'book_surfbar', 'Seite buchen', 2);
+               addMemberMenuSql('surfbar', 'list_surfbar', 'Seiten-Management', 3);
+               addMemberMenuSql('surfbar', 'stats_surfbar', 'Seiten-Statistik', 4);
 
                // Admin menus
                addAdminMenuSql('surfbar', NULL, 'Surfbar', 'URLs in der Surfbar verwalten, Einstellungen &auml;ndern und vieles mehr.', 7);
@@ -196,8 +196,9 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`)",
                // Register module
                addModuleSql('surfbar', 'Y', 'Y', 'N', 'N');
 
-               // Register filter
+               // Register filters
                registerFilter('post_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_STATUS', false, true, isExtensionDryRun());
+               registerFilter('pre_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_VALIDATE_DATA', false, true, isExtensionDryRun());
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -215,6 +216,7 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`)",
 
                // Unregister filter
                unregisterFilter(__FUNCTION__, __LINE__, 'post_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_STATUS', true, isExtensionDryRun());
+               unregisterFilter(__FUNCTION__, __LINE__, 'pre_change_surfbar_url_status', 'SURFBAR_CHANGE_URL_VALIDATE_DATA', true, isExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension
index 0039754..0bd4beb 100644 (file)
@@ -64,5 +64,22 @@ function FILTER_SURFBAR_CHANGE_URL_STATUS ($filterData) {
        return $filterData;
 }
 
+// Filter for validating status
+function FILTER_SURFBAR_CHANGE_URL_VALIDATE_DATA ($filterData) {
+       // Is the new status set?
+       if ((!is_string($filterData['new_status'])) || (empty($filterData['new_status']))) {
+               // Abort here, but fine!
+               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newStatus[' . gettype($filterData['new_status']) . ']=' . $filterData['new_status'] . ' - EXIT!');
+               $filterData['abort'] = true;
+       } elseif ($data[$urlId]['url_status'] != $filterData['prev_status']) {
+               // Status is not like prevStatus
+               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $data[$urlId]['url_status'] . '!=' . $filterData['prev_status'] . ' - EXIT!');
+               $filterData['abort'] = false;
+       } // END - if
+
+       // Return filter data
+       return $filterData;
+}
+
 // [EOF]
 ?>
index da2d55d..42ec415 100644 (file)
@@ -1327,43 +1327,41 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
                $data = SURFBAR_GET_URL_DATA($urlId);
        } // END - if
 
-       // Is the new status set?
-       if ((!is_string($newStatus)) || (empty($newStatus))) {
-               // Abort here, but fine!
-               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newStatus[' . gettype($newStatus) . ']=' . $newStatus . ' - EXIT!');
-               return true;
-       } // END - if
+       // Prepare array
+       $filterData =  array(
+               'url_id'      => $urlId,
+               'prev_status' => $prevStatus,
+               'new_status'  => $newStatus,
+               'data'        => $data,
+               'abort'       => null
+       );
 
-       // Is the status like prevStatus is saying?
-       if ($data[$urlId]['url_status'] != $prevStatus) {
-               // No, then abort here
-               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $data[$urlId]['url_status'] . '!=' . $prevStatus . ' - EXIT!');
-               return false;
-       } // END - if
+       // Run pre filter chain
+       $filterData = runFilterChain('pre_change_surfbar_url_status', $filterData);
 
+       // Abort here?
+       if (!is_null($filterData['abort'])) {
+               // Abort here
+               return $filterData['abort'];
+       }
 
        // Update the status now
        // ---------- Comment out for debugging/developing member actions! ---------
-       //SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `status`='%s' WHERE `url_id`=%s LIMIT 1",
-       //      array($newStatus, bigintval($urlId)), __FUNCTION__, __LINE__);
+       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `url_status`='%s' WHERE `url_id`=%s LIMIT 1",
+               array(
+                       $newStatus,
+                       bigintval($urlId)
+               ), __FUNCTION__, __LINE__);
        // ---------- Comment out for debugging/developing member actions! ---------
 
        // Was that fine?
        // ---------- Comment out for debugging/developing member actions! ---------
-       //if (SQL_AFFECTEDROWS() != 1) {
-       //      // No, something went wrong
-       //      return false;
-       //} // END - if
+       if (SQL_AFFECTEDROWS() != 1) {
+               // No, something went wrong
+               return false;
+       } // END - if
        // ---------- Comment out for debugging/developing member actions! ---------
 
-       // Prepare array
-       $filterData =  array(
-               'url_id'      => $urlId,
-               'prev_status' => $prevStatus,
-               'new_status'  => $newStatus,
-               'data'        => $data
-       );
-
        // Run post filter chain
        $filterData = runFilterChain('post_change_surfbar_url_status', $filterData);
 
diff --git a/inc/modules/member/what-book_surfbar.php b/inc/modules/member/what-book_surfbar.php
new file mode 100644 (file)
index 0000000..ff0f6c7
--- /dev/null
@@ -0,0 +1,85 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 09/08/2008 *
+ * ===================                          Last change: 09/08/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-book_surfbar.php                            *
+ * -------------------------------------------------------------------- *
+ * Short description : Members can book new URLs here                   *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Mitglieder koennen URLs buchen                   *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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')) {
+       die();
+} elseif (!isMember()) {
+       // Redirect
+       redirectToIndexMemberOnlyModule();
+}
+
+// Add description as navigation point
+addYouAreHereLink('member', __FILE__);
+
+if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
+       return;
+} // END - if
+
+// Still allowed to book more URLs?
+if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
+       // No more URLs allowed to book!
+       displayMessage('{--MEMBER_SURFBAR_NO_MORE_ALLOWED--}');
+} elseif ((isFormSent()) && (isPostRequestParameterSet('limited'))) {
+       // Is limitation "no" and "limit" is > 0?
+       if (postRequestParameter('limited') == 'N') {
+               // Set it to unlimited
+               setPostRequestParameter('limit', 0);
+       } // END - if
+
+       // By default something went wrong
+       $message = '{--MEMBER_SURFBAR_URL_NOT_ADDED--}';
+
+       // Register the new URL
+       $insertId = SURFBAR_MEMBER_ADD_URL(postRequestParameter('url'), postRequestParameter('limit'));
+
+       // Was this fine?
+       if ($insertId > 0) {
+               // URL added and waiting for unlock
+               $message = '{--MEMBER_SURFBAR_URL_ADDED--}';
+       } // END - if
+
+       // Load message template
+       displayMessage($message);
+} else {
+       // Load surfbar order form
+       loadTemplate(sprintf("member_book_surfbar_%s", strtolower(getSurfbarPaymentModel())));
+}
+
+// [EOF]
+?>
diff --git a/inc/modules/member/what-list_surfbar.php b/inc/modules/member/what-list_surfbar.php
new file mode 100644 (file)
index 0000000..13175c5
--- /dev/null
@@ -0,0 +1,94 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 09/17/2008 *
+ * ===================                          Last change: 09/17/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_surfbar.php                            *
+ * -------------------------------------------------------------------- *
+ * Short description : Surfbar URL statistics                           *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Surfbar-Statistiken                              *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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')) {
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
+}
+
+// Add description as navigation point
+addYouAreHereLink('member', __FILE__);
+
+if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
+       return;
+} // END - if
+
+// Load user URLs
+$urlArray = SURFBAR_GET_USER_URLS();
+
+// Are there entries or form is submitted?
+if ((isFormSent()) && (isPostRequestParameterSet('action')) && (isPostRequestParameterSet('id'))) {
+       // Process the form
+       if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $urlArray)) {
+               // Action performed but shall we display it?
+               if (((postRequestParameter('action') != 'edit') && (postRequestParameter('action') != 'delete')) || (isPostRequestParameterSet('execute'))) {
+                       // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed
+                       displayMessage('{--MEMBER_SURFBAR_ACTION_DONE--}');
+               } // END - if
+       } else {
+               // Something went wrong
+               displayMessage('{--MEMBER_SURFBAR_ACTION_FAILED--}');
+       }
+} elseif (count($urlArray) > 0) {
+       // List all URLs
+       $OUT = '';
+       foreach ($urlArray as $id => $content) {
+               // "Translate"/insert data
+               if ($content['url_views_total'] > 0) {
+                       // Include link to stats
+                       $content['url_views_total'] = '[<a href="{%url=modules.php?module=login&amp;what=list_surfbar%}">{%pipe,translateComma=' . $content['url_views_total'] . '%}</a>]';
+               } // END - if
+               $content['url_registered']  = generateDateTime($content['url_registered'], '2');
+               $content['url_last_locked'] = generateDateTime($content['url_last_locked'], '2');
+               $content['actions']         = SURFBAR_MEMBER_ACTIONS($content['url_id'], $content['url_status']);
+
+               // Load row template
+               $OUT .= loadTemplate('member_list_surfbar_row', true, $content);
+       } // END - foreach
+
+       // Load main template
+       loadTemplate('member_list_surfbar', false, $OUT);
+} else {
+       // No URLs booked so far
+       displayMessage('{--MEMBER_SURFBAR_NO_URLS_FOUND--}');
+}
+
+// [EOF]
+?>
diff --git a/inc/modules/member/what-start_surfbar.php b/inc/modules/member/what-start_surfbar.php
new file mode 100644 (file)
index 0000000..040e82d
--- /dev/null
@@ -0,0 +1,73 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 09/05/2008 *
+ * ===================                          Last change: 09/08/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-start_surfbar.php                           *
+ * -------------------------------------------------------------------- *
+ * Short description : Gives some infos to the surfbar and launch link  *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Gibt ein paar Infos zur Surfbar und Startlink    *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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')) {
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
+}
+
+// Add description as navigation point
+addYouAreHereLink('member', __FILE__);
+
+if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
+       return;
+} // END - if
+
+// Prepare content for output
+$content = array(
+       'surfbar_total_urls'    => SURFBAR_GET_TOTAL_URLS('ACTIVE', 0)
+);
+
+// In dynamic mode we need some more data
+if (getSurfbarPaymentModel() == 'DYNAMIC') {
+       // Prepare content for dynamic surfbar
+       $content = array(
+               'surfbar_total_urls'  => SURFBAR_GET_TOTAL_URLS('ACTIVE', 0),
+       );
+} // END - if
+
+// Load the template
+loadTemplate('member_start_surfbar_' . strtolower(getSurfbarPaymentModel()), false, $content);
+
+// Load surfbar link template
+loadTemplate('member_surfbar_link');
+
+// [EOF]
+?>
diff --git a/inc/modules/member/what-stats_surfbar.php b/inc/modules/member/what-stats_surfbar.php
new file mode 100644 (file)
index 0000000..21e430f
--- /dev/null
@@ -0,0 +1,54 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 09/10/2008 *
+ * ===================                          Last change: 09/10/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-stats_surfbar.php                           *
+ * -------------------------------------------------------------------- *
+ * Short description : Surfbar URL statistics                           *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Surfbar-Statistiken                              *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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')) {
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
+}
+
+// Add description as navigation point
+addYouAreHereLink('member', __FILE__);
+
+if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
+       return;
+} // END - if
+
+// [EOF]
+?>
index 9846af2..f551ef4 100644 (file)
@@ -1,85 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 09/08/2008 *
- * ===================                          Last change: 09/08/2008 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-surfbar_book.php                            *
- * -------------------------------------------------------------------- *
- * Short description : Members can book new URLs here                   *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Mitglieder koennen URLs buchen                   *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * 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')) {
-       die();
-} elseif (!isMember()) {
-       // Redirect
-       redirectToIndexMemberOnlyModule();
-}
-
-// Add description as navigation point
-addYouAreHereLink('member', __FILE__);
-
-if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
-       return;
-} // END - if
-
-// Still allowed to book more URLs?
-if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
-       // No more URLs allowed to book!
-       displayMessage('{--MEMBER_SURFBAR_NO_MORE_ALLOWED--}');
-} elseif ((isFormSent()) && (isPostRequestParameterSet('limited'))) {
-       // Is limitation "no" and "limit" is > 0?
-       if (postRequestParameter('limited') == 'N') {
-               // Set it to unlimited
-               setPostRequestParameter('limit', 0);
-       } // END - if
-
-       // By default something went wrong
-       $message = '{--MEMBER_SURFBAR_URL_NOT_ADDED--}';
-
-       // Register the new URL
-       $insertId = SURFBAR_MEMBER_ADD_URL(postRequestParameter('url'), postRequestParameter('limit'));
-
-       // Was this fine?
-       if ($insertId > 0) {
-               // URL added and waiting for unlock
-               $message = '{--MEMBER_SURFBAR_URL_ADDED--}';
-       } // END - if
-
-       // Load message template
-       displayMessage($message);
-} else {
-       // Load surfbar order form
-       loadTemplate(sprintf("member_surfbar_book_%s", strtolower(getSurfbarPaymentModel())));
-}
-
-// [EOF]
+// @DEPRECATED
 ?>
index 8ba9f1f..d2d1418 100644 (file)
@@ -1,94 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 09/17/2008 *
- * ===================                          Last change: 09/17/2008 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-surfbar_list.php                            *
- * -------------------------------------------------------------------- *
- * Short description : Surfbar URL statistics                           *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Surfbar-Statistiken                              *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * 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')) {
-       die();
-} elseif (!isMember()) {
-       redirectToIndexMemberOnlyModule();
-}
-
-// Add description as navigation point
-addYouAreHereLink('member', __FILE__);
-
-if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
-       return;
-} // END - if
-
-// Load user URLs
-$urlArray = SURFBAR_GET_USER_URLS();
-
-// Are there entries or form is submitted?
-if ((isFormSent()) && (isPostRequestParameterSet('action')) && (isPostRequestParameterSet('id'))) {
-       // Process the form
-       if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $urlArray)) {
-               // Action performed but shall we display it?
-               if (((postRequestParameter('action') != 'edit') && (postRequestParameter('action') != 'delete')) || (isPostRequestParameterSet('execute'))) {
-                       // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed
-                       displayMessage('{--MEMBER_SURFBAR_ACTION_DONE--}');
-               } // END - if
-       } else {
-               // Something went wrong
-               displayMessage('{--MEMBER_SURFBAR_ACTION_FAILED--}');
-       }
-} elseif (count($urlArray) > 0) {
-       // List all URLs
-       $OUT = '';
-       foreach ($urlArray as $id => $content) {
-               // "Translate"/insert data
-               if ($content['url_views_total'] > 0) {
-                       // Include link to stats
-                       $content['url_views_total'] = '[<a href="{%url=modules.php?module=login&amp;what=surfbar_list%}">{%pipe,translateComma=' . $content['url_views_total'] . '%}</a>]';
-               } // END - if
-               $content['url_registered']  = generateDateTime($content['url_registered'], '2');
-               $content['url_last_locked'] = generateDateTime($content['url_last_locked'], '2');
-               $content['actions']         = SURFBAR_MEMBER_ACTIONS($content['url_id'], $content['url_status']);
-
-               // Load row template
-               $OUT .= loadTemplate('member_surfbar_list_row', true, $content);
-       } // END - foreach
-
-       // Load main template
-       loadTemplate('member_surfbar_list', false, $OUT);
-} else {
-       // No URLs booked so far
-       displayMessage('{--MEMBER_SURFBAR_NO_URLS_FOUND--}');
-}
-
-// [EOF]
+// @DEPRECTAED
 ?>
index 588f0f2..f551ef4 100644 (file)
@@ -1,73 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 09/05/2008 *
- * ===================                          Last change: 09/08/2008 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-surfbar_start.php                           *
- * -------------------------------------------------------------------- *
- * Short description : Gives some infos to the surfbar and launch link  *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Gibt ein paar Infos zur Surfbar und Startlink    *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * 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')) {
-       die();
-} elseif (!isMember()) {
-       redirectToIndexMemberOnlyModule();
-}
-
-// Add description as navigation point
-addYouAreHereLink('member', __FILE__);
-
-if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
-       return;
-} // END - if
-
-// Prepare content for output
-$content = array(
-       'surfbar_total_urls'    => SURFBAR_GET_TOTAL_URLS('ACTIVE', 0)
-);
-
-// In dynamic mode we need some more data
-if (getSurfbarPaymentModel() == 'DYNAMIC') {
-       // Prepare content for dynamic surfbar
-       $content = array(
-               'surfbar_total_urls'  => SURFBAR_GET_TOTAL_URLS('ACTIVE', 0),
-       );
-} // END - if
-
-// Load the template
-loadTemplate('member_surfbar_start_' . strtolower(getSurfbarPaymentModel()), false, $content);
-
-// Load surfbar link template
-loadTemplate('member_surfbar_link');
-
-// [EOF]
+// @DEPRECATED
 ?>
index 76170db..f551ef4 100644 (file)
@@ -1,54 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 09/10/2008 *
- * ===================                          Last change: 09/10/2008 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-surfbar_stats.php                           *
- * -------------------------------------------------------------------- *
- * Short description : Surfbar URL statistics                           *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Surfbar-Statistiken                              *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * 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')) {
-       die();
-} elseif (!isMember()) {
-       redirectToIndexMemberOnlyModule();
-}
-
-// Add description as navigation point
-addYouAreHereLink('member', __FILE__);
-
-if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
-       return;
-} // END - if
-
-// [EOF]
+// @DEPRECATED
 ?>
index 07b38b1..6376feb 100644 (file)
@@ -45,6 +45,7 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addYouAreHereLink('member', __FILE__);
 
+// Extension ext-transfer must be avtive
 if ((!isExtensionActive('transfer')) && (!isAdmin())) {
        displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=transfer%}');
        return;
index 1389c33..b49e103 100644 (file)
@@ -45,6 +45,12 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addYouAreHereLink('member', __FILE__);
 
+// Essential extension ext-mailid must be active
+if (!isExtensionActive('mailid')) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
+       return;
+} // END - if
+
 // Shall we display a mail?
 if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
        // Display bonus mail by loading it's full data
@@ -170,7 +176,7 @@ LIMIT 1",
                                break;
 
                        default: // Unknown type detected!
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
+                               debug_report_bug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
                                break;
                }
 
diff --git a/templates/de/html/member/member_book_surfbar_dynamic.tpl b/templates/de/html/member/member_book_surfbar_dynamic.tpl
new file mode 100644 (file)
index 0000000..a71ab24
--- /dev/null
@@ -0,0 +1,53 @@
+<form accept-charset="UTF-8" id="book" action="{%url=modules.php?module=login&amp;what=surfbar_book%}" method="post" onsubmit="return submitForm()" onreset="return resetForm()">
+<div class="table dashed" style="width:600px;margin-top:10px">
+       <div class="table_header bottom" style="padding-top:5px;padding-bottom:5px">
+               <strong>URL in Surfbar buchen - Dynamisch:</strong>
+       </div>
+
+       <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
+               URL eingeben: <input type="text" class="form_field" name="url" size="20" maxlength="255" value="http://" />
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Soll die Anzahl Aufrufe begrenzt werden?<br />
+               <input type="radio" id="limited_no" onclick="return focusLimitedNo()" name="limited" value="N" checked="checked" /> {--NO--}
+               <input type="radio" id="limited_yes" onclick="return focusLimitedYes()" name="limited" value="Y" /> {--YES--}
+       </div>
+
+       <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
+               Aufrufe begrenzen auf: <input type="text" onchange="return changeLimited()" onclick="return focusLimit()" onblur="return blurLimit()" class="form_field" id="limit" name="limit" size="7" maxlength="20" value="-" />
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               <div class="para">
+                       Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen mindestens
+                       <strong>{%pipe,SURFBAR_DETERMINE_COSTS,translateComma=true%} {?POINTS?}</strong>.
+                       Surfen Sie mit der Surfbar erhalten Sie mindestens
+                       <strong>{%pipe,SURFBAR_DETERMINE_REWARD,translateComma=true%} {?POINTS?}</strong>
+                       auf Ihr Konto gutgeschrieben.
+               </div>
+               <div class="para">
+                       Sie haben bereits
+                       <strong>{%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%}</strong>
+                       von maximal
+                       <strong>{%config,translateComma=surfbar_max_order%}</strong>
+                       erlaubten URLs gebucht.
+               </div>
+       </div>
+
+       <div class="table_header top" style="padding-top:5px;padding-bottom:5px">
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
+       </div>
+</div>
+
+<script src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}"
+ type="text/javascript"></script>
+</form>
+
+<span align="center" class="notice" style="padding:5px">
+       Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf richten sich nach
+       verschiedenen Faktoren. Schauen Sie unter <a
+        href="{%url=modules.php?module=login&amp;what=surfbar_start%}">Surfbar starten</a>
+       nach, wenn Sie genaueres dazu wissen m&ouml;chten.
+</span>
diff --git a/templates/de/html/member/member_book_surfbar_static.tpl b/templates/de/html/member/member_book_surfbar_static.tpl
new file mode 100644 (file)
index 0000000..33e90b1
--- /dev/null
@@ -0,0 +1,39 @@
+<form accept-charset="UTF-8" id="book" action="{%url=modules.php?module=login&amp;what=surfbar_book%}" method="post" onsubmit="return SubmitForm()" onreset="return ResetForm()">
+<div class="table dashed" style="width:600px;margin-top:10px">
+       <div class="table_header bottom" style="padding-top:5px;padding-bottom:5px">
+               <strong>URL in Surfbar buchen - Statisch:</strong>
+       </div>
+
+       <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
+               URL eingeben: <input type="text" class="form_field" name="url" size="20" maxlength="255" value="http://" />
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Soll die Anzahl Aufrufe begrenzt werden?<br />
+               <input type="radio" id="limited_no" onclick="return focusLimitedNo()" name="limited" value="N" checked="checked" /> {--NO--}
+               <input type="radio" id="limited_yes" onclick="return focusLimitedYes()" name="limited" value="Y" /> {--YES--}
+       </div>
+
+       <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
+               Aufrufe begrenzen auf: <input type="text" class="form_field" onchange="return changeLimited()" onclick="return focusLimit()" onblur="return blurLimit()" id="limit" name="limit" size="7" maxlength="20" value="-" />
+       </div>
+
+       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
+               Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen <span
+                class="surfbar_points">{%pipe,SURFBAR_DETERMINE_COSTS,translateComma=true%}{?POINTS?}</span>. Surfen Sie mit
+               der Surfbar erhalten Sie <span class="surfbar_points">{%pipe,SURFBAR_DETERMINE_REWARD,translateComma=true%}
+               {?POINTS?}</span> auf Ihr Konto gutgeschrieben.<br />
+               <br />
+               Sie haben bereits <strong>{%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%}</strong> von maximal
+               <strong>{%config,translateComma=surfbar_max_order%}</strong> erlaubten URLs gebucht.
+       </div>
+
+       <div class="table_header top" style="padding-top:5px;padding-bottom:5px">
+               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
+       </div>
+</div>
+
+<script src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}" type="text/javascript"></script>
+
+</form>
diff --git a/templates/de/html/member/member_list_surfbar.tpl b/templates/de/html/member/member_list_surfbar.tpl
new file mode 100644 (file)
index 0000000..646e780
--- /dev/null
@@ -0,0 +1,33 @@
+<table border="0" cellspacing="0" cellpadding="0" width="100%" class="table dashed">
+<tr>
+       <td colspan="6" class="header_column bottom">
+               <strong>{--MEMBER_SURFBAR_LIST_TITLE--}</strong>
+       </td>
+</tr>
+<tr>
+       <td align="center" class="header_column bottom right">
+               <strong>{--MEMBER_SURFBAR_TEST_URL--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--MEMBER_SURFBAR_STATUS--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--MEMBER_SURFBAR_REGISTERED--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--MEMBER_SURFBAR_LAST_LOCKED--}</strong>
+       </td>
+       <td align="center" class="header_column bottom right">
+               <strong>{--MEMBER_SURFBAR_LOCK_REASON--}</strong>
+       </td>
+       <td align="center" class="header_column bottom">
+               <strong>{--MEMBER_SURFBAR_ACTIONS--}</strong>
+       </td>
+</tr>
+$content
+<tr>
+       <td colspan="6" class="table_footer" style="padding-left:5px;padding-right:5px">
+               <span class="notice">{--MEMBER_SURFBAR_LIST_NOTE--}</span>
+       </td>
+</tr>
+</table>
diff --git a/templates/de/html/member/member_list_surfbar_form.tpl b/templates/de/html/member/member_list_surfbar_form.tpl
new file mode 100644 (file)
index 0000000..ce51f43
--- /dev/null
@@ -0,0 +1,7 @@
+<td align="center" width="$content[width]%%">
+       <form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=surfbar_list%}" method="post">
+               <input type="hidden" name="url_id" value="$content[url_id]" />
+               <input type="hidden" name="action" value="$content[action]" />
+               <input type="submit" class="form_submit" name="ok" title="{%pipe,translateMemberSurfbarActionToTitle=$content[action]%}" value="{%pipe,translateMemberSurfbarActionToSubmit=$content[action]%}" />
+       </form>
+</td>
diff --git a/templates/de/html/member/member_list_surfbar_row.tpl b/templates/de/html/member/member_list_surfbar_row.tpl
new file mode 100644 (file)
index 0000000..9d3893c
--- /dev/null
@@ -0,0 +1,20 @@
+<tr>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               <a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank" title="{--MEMBER_TEST_URL--}">{--MEMBER_SURFBAR_TEST_URL--}</a>
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[url_registered]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[url_last_locked]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,fixEmptyContentToDashes=$content[url_lock_reason]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               $content[actions]
+       </td>
+</tr>
diff --git a/templates/de/html/member/member_start_surfbar_dynamic.tpl b/templates/de/html/member/member_start_surfbar_dynamic.tpl
new file mode 100644 (file)
index 0000000..5df1807
--- /dev/null
@@ -0,0 +1,42 @@
+<div class="table dashed" style="width:600px">
+       <div class="table_header bottom">
+               <strong>Dynamisch verg&uuml;tete Surfbar ist aktiv</strong>
+       </div>
+
+       <div style="padding:5px">
+               Bei der dynamischen Verg&uuml;tung werden Ihnen derzeit mindestens
+               <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,translateComma%}</strong>
+               und maximal <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,translateComma%}
+               {?POINTS?}</strong> Aufschlag zum Basispreis f&uuml;r jede besuchte
+               Seite verg&uuml;tet. Diese m&uuml;ssen Sie mindestens
+               <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,createFancyTime%}</strong>
+               und maximal
+               <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,createFancyTime%}</strong>
+               zus&auml;tzlich zur Basiszeit angesehen haben und k&ouml;nnen die selbe
+               Seite erst nach zus&auml;tzlichen
+               <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_LOCK,createFancyTime%}</strong>
+               wieder aufrufen.
+       </div>
+
+       <div style="padding:5px">
+               Einige Hinweise zur Berechnung: Die derzeige Mitgliederanzahl von
+               <strong>{%pipe,getTotalConfirmedUser,translateComma%}</strong>, die
+               derzeit die Surfbar nutzenden
+               <strong>{%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%}</strong> Mitglieder, die
+               gesamt in der Surfbar gebuchten
+               <strong>{%pipe,SURFBAR_GET_TOTAL_URLS,translateComma%}</strong>
+               URLs (ohne von unseren Sponsoren), sowie Ihre gebuchten
+               <strong>{%pipe,getMemberId,SURFBAR_GET_TOTAL_USER_URLS,translateComma%}</strong> URLs werden als
+               Berechnungsgrundlage verwendet. Sie erhalten allerdings nur einen
+               reduzierten Anteil von
+               <strong>{%config,translateComma=surfbar_dynamic_percent%}&#37;</strong>.
+       </div>
+
+       <div style="padding:5px">
+               Der Basispreis und die Basiszeit sind die Einstellungen aus dem
+               statischen Verg&uuml;tungsmodell:
+               <strong>{%config,translateComma=surfbar_static_reward%}
+               {?POINTS?}</strong> bzw.
+               <strong>{%config,createFancyTime=surfbar_static_time%}</strong>.
+       </div>
+</div>
diff --git a/templates/de/html/member/member_start_surfbar_static.tpl b/templates/de/html/member/member_start_surfbar_static.tpl
new file mode 100644 (file)
index 0000000..3bedea1
--- /dev/null
@@ -0,0 +1,16 @@
+<div class="table dashed" style="width:600px">
+       <div class="table_header bottom">
+               <strong>Statisch verg&uuml;tete Surfbar ist aktiv</strong>
+       </div>
+       <div style="padding:5px">
+               Bei der statischen Verg&uuml;tung werden Ihnen derzeit
+               <strong>{%config,translateComma=surfbar_static_reward%}
+               {?POINTS?}</strong> f&uuml;r jede besuchte Seite verg&uuml;tet. Diese
+               m&uuml;ssen Sie
+               <strong>{%config,createFancyTime=surfbar_static_time%}</strong> lang
+               angesehen haben und k&ouml;nnen die selbe Seite erst nach
+               <strong>{%config,createFancyTime=surfbar_static_lock%}</strong> wieder
+               aufrufen. Es sind insgesamt
+               <strong>$content[surfbar_total_urls]</strong> URLs in der Surfbar.
+       </div>
+</div>
index a71ab24..11f5d85 100644 (file)
@@ -1,53 +1 @@
-<form accept-charset="UTF-8" id="book" action="{%url=modules.php?module=login&amp;what=surfbar_book%}" method="post" onsubmit="return submitForm()" onreset="return resetForm()">
-<div class="table dashed" style="width:600px;margin-top:10px">
-       <div class="table_header bottom" style="padding-top:5px;padding-bottom:5px">
-               <strong>URL in Surfbar buchen - Dynamisch:</strong>
-       </div>
-
-       <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-               URL eingeben: <input type="text" class="form_field" name="url" size="20" maxlength="255" value="http://" />
-       </div>
-
-       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
-               Soll die Anzahl Aufrufe begrenzt werden?<br />
-               <input type="radio" id="limited_no" onclick="return focusLimitedNo()" name="limited" value="N" checked="checked" /> {--NO--}
-               <input type="radio" id="limited_yes" onclick="return focusLimitedYes()" name="limited" value="Y" /> {--YES--}
-       </div>
-
-       <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-               Aufrufe begrenzen auf: <input type="text" onchange="return changeLimited()" onclick="return focusLimit()" onblur="return blurLimit()" class="form_field" id="limit" name="limit" size="7" maxlength="20" value="-" />
-       </div>
-
-       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
-               <div class="para">
-                       Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen mindestens
-                       <strong>{%pipe,SURFBAR_DETERMINE_COSTS,translateComma=true%} {?POINTS?}</strong>.
-                       Surfen Sie mit der Surfbar erhalten Sie mindestens
-                       <strong>{%pipe,SURFBAR_DETERMINE_REWARD,translateComma=true%} {?POINTS?}</strong>
-                       auf Ihr Konto gutgeschrieben.
-               </div>
-               <div class="para">
-                       Sie haben bereits
-                       <strong>{%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%}</strong>
-                       von maximal
-                       <strong>{%config,translateComma=surfbar_max_order%}</strong>
-                       erlaubten URLs gebucht.
-               </div>
-       </div>
-
-       <div class="table_header top" style="padding-top:5px;padding-bottom:5px">
-               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
-       </div>
-</div>
-
-<script src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}"
- type="text/javascript"></script>
-</form>
-
-<span align="center" class="notice" style="padding:5px">
-       Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf richten sich nach
-       verschiedenen Faktoren. Schauen Sie unter <a
-        href="{%url=modules.php?module=login&amp;what=surfbar_start%}">Surfbar starten</a>
-       nach, wenn Sie genaueres dazu wissen m&ouml;chten.
-</span>
+<!-- @DEPRECATED //-->
index 33e90b1..11f5d85 100644 (file)
@@ -1,39 +1 @@
-<form accept-charset="UTF-8" id="book" action="{%url=modules.php?module=login&amp;what=surfbar_book%}" method="post" onsubmit="return SubmitForm()" onreset="return ResetForm()">
-<div class="table dashed" style="width:600px;margin-top:10px">
-       <div class="table_header bottom" style="padding-top:5px;padding-bottom:5px">
-               <strong>URL in Surfbar buchen - Statisch:</strong>
-       </div>
-
-       <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-               URL eingeben: <input type="text" class="form_field" name="url" size="20" maxlength="255" value="http://" />
-       </div>
-
-       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
-               Soll die Anzahl Aufrufe begrenzt werden?<br />
-               <input type="radio" id="limited_no" onclick="return focusLimitedNo()" name="limited" value="N" checked="checked" /> {--NO--}
-               <input type="radio" id="limited_yes" onclick="return focusLimitedYes()" name="limited" value="Y" /> {--YES--}
-       </div>
-
-       <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-               Aufrufe begrenzen auf: <input type="text" class="form_field" onchange="return changeLimited()" onclick="return focusLimit()" onblur="return blurLimit()" id="limit" name="limit" size="7" maxlength="20" value="-" />
-       </div>
-
-       <div class="member_input" style="padding-top:5px;padding-bottom:5px">
-               Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen <span
-                class="surfbar_points">{%pipe,SURFBAR_DETERMINE_COSTS,translateComma=true%}{?POINTS?}</span>. Surfen Sie mit
-               der Surfbar erhalten Sie <span class="surfbar_points">{%pipe,SURFBAR_DETERMINE_REWARD,translateComma=true%}
-               {?POINTS?}</span> auf Ihr Konto gutgeschrieben.<br />
-               <br />
-               Sie haben bereits <strong>{%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%}</strong> von maximal
-               <strong>{%config,translateComma=surfbar_max_order%}</strong> erlaubten URLs gebucht.
-       </div>
-
-       <div class="table_header top" style="padding-top:5px;padding-bottom:5px">
-               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL--}" />
-       </div>
-</div>
-
-<script src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}" type="text/javascript"></script>
-
-</form>
+<!-- @DEPRECATED //-->
index 646e780..11f5d85 100644 (file)
@@ -1,33 +1 @@
-<table border="0" cellspacing="0" cellpadding="0" width="100%" class="table dashed">
-<tr>
-       <td colspan="6" class="header_column bottom">
-               <strong>{--MEMBER_SURFBAR_LIST_TITLE--}</strong>
-       </td>
-</tr>
-<tr>
-       <td align="center" class="header_column bottom right">
-               <strong>{--MEMBER_SURFBAR_TEST_URL--}</strong>
-       </td>
-       <td align="center" class="header_column bottom right">
-               <strong>{--MEMBER_SURFBAR_STATUS--}</strong>
-       </td>
-       <td align="center" class="header_column bottom right">
-               <strong>{--MEMBER_SURFBAR_REGISTERED--}</strong>
-       </td>
-       <td align="center" class="header_column bottom right">
-               <strong>{--MEMBER_SURFBAR_LAST_LOCKED--}</strong>
-       </td>
-       <td align="center" class="header_column bottom right">
-               <strong>{--MEMBER_SURFBAR_LOCK_REASON--}</strong>
-       </td>
-       <td align="center" class="header_column bottom">
-               <strong>{--MEMBER_SURFBAR_ACTIONS--}</strong>
-       </td>
-</tr>
-$content
-<tr>
-       <td colspan="6" class="table_footer" style="padding-left:5px;padding-right:5px">
-               <span class="notice">{--MEMBER_SURFBAR_LIST_NOTE--}</span>
-       </td>
-</tr>
-</table>
+<!-- @DEPRECATED //-->
index ce51f43..11f5d85 100644 (file)
@@ -1,7 +1 @@
-<td align="center" width="$content[width]%%">
-       <form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=surfbar_list%}" method="post">
-               <input type="hidden" name="url_id" value="$content[url_id]" />
-               <input type="hidden" name="action" value="$content[action]" />
-               <input type="submit" class="form_submit" name="ok" title="{%pipe,translateMemberSurfbarActionToTitle=$content[action]%}" value="{%pipe,translateMemberSurfbarActionToSubmit=$content[action]%}" />
-       </form>
-</td>
+<!-- @DEPRECATED //-->
index 9d3893c..11f5d85 100644 (file)
@@ -1,20 +1 @@
-<tr>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank" title="{--MEMBER_TEST_URL--}">{--MEMBER_SURFBAR_TEST_URL--}</a>
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[url_registered]
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[url_last_locked]
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,fixEmptyContentToDashes=$content[url_lock_reason]%}
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">
-               $content[actions]
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index 5df1807..11f5d85 100644 (file)
@@ -1,42 +1 @@
-<div class="table dashed" style="width:600px">
-       <div class="table_header bottom">
-               <strong>Dynamisch verg&uuml;tete Surfbar ist aktiv</strong>
-       </div>
-
-       <div style="padding:5px">
-               Bei der dynamischen Verg&uuml;tung werden Ihnen derzeit mindestens
-               <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,translateComma%}</strong>
-               und maximal <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,translateComma%}
-               {?POINTS?}</strong> Aufschlag zum Basispreis f&uuml;r jede besuchte
-               Seite verg&uuml;tet. Diese m&uuml;ssen Sie mindestens
-               <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,createFancyTime%}</strong>
-               und maximal
-               <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,createFancyTime%}</strong>
-               zus&auml;tzlich zur Basiszeit angesehen haben und k&ouml;nnen die selbe
-               Seite erst nach zus&auml;tzlichen
-               <strong>{%pipe,SURFBAR_CALCULATE_DYNAMIC_LOCK,createFancyTime%}</strong>
-               wieder aufrufen.
-       </div>
-
-       <div style="padding:5px">
-               Einige Hinweise zur Berechnung: Die derzeige Mitgliederanzahl von
-               <strong>{%pipe,getTotalConfirmedUser,translateComma%}</strong>, die
-               derzeit die Surfbar nutzenden
-               <strong>{%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%}</strong> Mitglieder, die
-               gesamt in der Surfbar gebuchten
-               <strong>{%pipe,SURFBAR_GET_TOTAL_URLS,translateComma%}</strong>
-               URLs (ohne von unseren Sponsoren), sowie Ihre gebuchten
-               <strong>{%pipe,getMemberId,SURFBAR_GET_TOTAL_USER_URLS,translateComma%}</strong> URLs werden als
-               Berechnungsgrundlage verwendet. Sie erhalten allerdings nur einen
-               reduzierten Anteil von
-               <strong>{%config,translateComma=surfbar_dynamic_percent%}&#37;</strong>.
-       </div>
-
-       <div style="padding:5px">
-               Der Basispreis und die Basiszeit sind die Einstellungen aus dem
-               statischen Verg&uuml;tungsmodell:
-               <strong>{%config,translateComma=surfbar_static_reward%}
-               {?POINTS?}</strong> bzw.
-               <strong>{%config,createFancyTime=surfbar_static_time%}</strong>.
-       </div>
-</div>
+<!-- @DEPRECATED //-->
index 3bedea1..11f5d85 100644 (file)
@@ -1,16 +1 @@
-<div class="table dashed" style="width:600px">
-       <div class="table_header bottom">
-               <strong>Statisch verg&uuml;tete Surfbar ist aktiv</strong>
-       </div>
-       <div style="padding:5px">
-               Bei der statischen Verg&uuml;tung werden Ihnen derzeit
-               <strong>{%config,translateComma=surfbar_static_reward%}
-               {?POINTS?}</strong> f&uuml;r jede besuchte Seite verg&uuml;tet. Diese
-               m&uuml;ssen Sie
-               <strong>{%config,createFancyTime=surfbar_static_time%}</strong> lang
-               angesehen haben und k&ouml;nnen die selbe Seite erst nach
-               <strong>{%config,createFancyTime=surfbar_static_lock%}</strong> wieder
-               aufrufen. Es sind insgesamt
-               <strong>$content[surfbar_total_urls]</strong> URLs in der Surfbar.
-       </div>
-</div>
+<!-- @DEPRECATED //-->