From: Roland Häder Date: Mon, 11 Jul 2011 17:19:51 +0000 (+0000) Subject: Extension ext-surfbar continued: X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=074b138e44c79cb56666b412781b17467ec79e6e;hp=3482b953460718915a60361a1073206654abde9e Extension ext-surfbar continued: - Filters for ext-surfbar added - Templates renamed according to naming convention - what-unconfirmed.php requires now ext-mailid to be active - TODOs.txt updated --- diff --git a/.gitattributes b/.gitattributes index 330eed08c1..96bf5151f0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index c6d84be145..d17cf67b65 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -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 @@ -173,9 +173,9 @@ ./inc/modules/member/what-rallyes.php:89: // @TODO Reactivate this: $content['admin'] = '' . $content['login'] . ''; ./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 @@ -251,6 +251,9 @@ ./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 @@ -317,6 +320,13 @@ ./templates/de/html/admin/admin_list_chk_reg.tpl:1: ./templates/de/html/admin/admin_reset_pass_done.tpl:1: ./templates/de/html/admin/admin_send_reset_link.tpl:1: +./templates/de/html/member/member_surfbar_book_dynamic.tpl:1: +./templates/de/html/member/member_surfbar_book_static.tpl:1: +./templates/de/html/member/member_surfbar_list_form.tpl:1: +./templates/de/html/member/member_surfbar_list_row.tpl:1: +./templates/de/html/member/member_surfbar_list.tpl:1: +./templates/de/html/member/member_surfbar_start_dynamic.tpl:1: +./templates/de/html/member/member_surfbar_start_static.tpl:1: ./templates/xml/admin/admin_del_do_surfbar_urls.xml:1: ./templates/xml/admin/admin_del_show_surfbar_urls.xml:1: ### ### template-warnings.log follows: ### ### diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index edf82b0040..f3e8a896b8 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -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 ä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 diff --git a/inc/filter/surfbar_filter.php b/inc/filter/surfbar_filter.php index 0039754f2f..0bd4beb262 100644 --- a/inc/filter/surfbar_filter.php +++ b/inc/filter/surfbar_filter.php @@ -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] ?> diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index da2d55ded9..42ec4152d8 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -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 index 0000000000..ff0f6c78ac --- /dev/null +++ b/inc/modules/member/what-book_surfbar.php @@ -0,0 +1,85 @@ + 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 index 0000000000..13175c5319 --- /dev/null +++ b/inc/modules/member/what-list_surfbar.php @@ -0,0 +1,94 @@ + 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'] = '[{%pipe,translateComma=' . $content['url_views_total'] . '%}]'; + } // 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 index 0000000000..040e82d1de --- /dev/null +++ b/inc/modules/member/what-start_surfbar.php @@ -0,0 +1,73 @@ + 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 index 0000000000..21e430f0e3 --- /dev/null +++ b/inc/modules/member/what-stats_surfbar.php @@ -0,0 +1,54 @@ + diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php index 9846af2bd1..f551ef47b7 100644 --- a/inc/modules/member/what-surfbar_book.php +++ b/inc/modules/member/what-surfbar_book.php @@ -1,85 +1,3 @@ 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 ?> diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index 8ba9f1f09c..d2d14180d9 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -1,94 +1,3 @@ 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'] = '[{%pipe,translateComma=' . $content['url_views_total'] . '%}]'; - } // 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 ?> diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php index 588f0f2097..f551ef47b7 100644 --- a/inc/modules/member/what-surfbar_start.php +++ b/inc/modules/member/what-surfbar_start.php @@ -1,73 +1,3 @@ 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 ?> diff --git a/inc/modules/member/what-surfbar_stats.php b/inc/modules/member/what-surfbar_stats.php index 76170db60c..f551ef47b7 100644 --- a/inc/modules/member/what-surfbar_stats.php +++ b/inc/modules/member/what-surfbar_stats.php @@ -1,54 +1,3 @@ diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 07b38b1ba4..6376feb753 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -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; diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 1389c33d6a..b49e1031e2 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -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 index 0000000000..a71ab240f5 --- /dev/null +++ b/templates/de/html/member/member_book_surfbar_dynamic.tpl @@ -0,0 +1,53 @@ +
+
+
+ URL in Surfbar buchen - Dynamisch: +
+ +
+ URL eingeben: +
+ +
+ Soll die Anzahl Aufrufe begrenzt werden?
+ {--NO--} + {--YES--} +
+ +
+ Aufrufe begrenzen auf: +
+ +
+
+ Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen mindestens + {%pipe,SURFBAR_DETERMINE_COSTS,translateComma=true%} {?POINTS?}. + Surfen Sie mit der Surfbar erhalten Sie mindestens + {%pipe,SURFBAR_DETERMINE_REWARD,translateComma=true%} {?POINTS?} + auf Ihr Konto gutgeschrieben. +
+
+ Sie haben bereits + {%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%} + von maximal + {%config,translateComma=surfbar_max_order%} + erlaubten URLs gebucht. +
+
+ +
+ + +
+
+ + +
+ + + Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf richten sich nach + verschiedenen Faktoren. Schauen Sie unter Surfbar starten + nach, wenn Sie genaueres dazu wissen möchten. + 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 index 0000000000..33e90b141e --- /dev/null +++ b/templates/de/html/member/member_book_surfbar_static.tpl @@ -0,0 +1,39 @@ +
+
+
+ URL in Surfbar buchen - Statisch: +
+ +
+ URL eingeben: +
+ +
+ Soll die Anzahl Aufrufe begrenzt werden?
+ {--NO--} + {--YES--} +
+ +
+ Aufrufe begrenzen auf: +
+ +
+ Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen {%pipe,SURFBAR_DETERMINE_COSTS,translateComma=true%}{?POINTS?}. Surfen Sie mit + der Surfbar erhalten Sie {%pipe,SURFBAR_DETERMINE_REWARD,translateComma=true%} + {?POINTS?} auf Ihr Konto gutgeschrieben.
+
+ Sie haben bereits {%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%} von maximal + {%config,translateComma=surfbar_max_order%} erlaubten URLs gebucht. +
+ +
+ + +
+
+ + + +
diff --git a/templates/de/html/member/member_list_surfbar.tpl b/templates/de/html/member/member_list_surfbar.tpl new file mode 100644 index 0000000000..646e780539 --- /dev/null +++ b/templates/de/html/member/member_list_surfbar.tpl @@ -0,0 +1,33 @@ + + + + + + + + + + + + +$content + + + +
+ {--MEMBER_SURFBAR_LIST_TITLE--} +
+ {--MEMBER_SURFBAR_TEST_URL--} + + {--MEMBER_SURFBAR_STATUS--} + + {--MEMBER_SURFBAR_REGISTERED--} + + {--MEMBER_SURFBAR_LAST_LOCKED--} + + {--MEMBER_SURFBAR_LOCK_REASON--} + + {--MEMBER_SURFBAR_ACTIONS--} +
+ {--MEMBER_SURFBAR_LIST_NOTE--} +
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 index 0000000000..ce51f43919 --- /dev/null +++ b/templates/de/html/member/member_list_surfbar_form.tpl @@ -0,0 +1,7 @@ + +
+ + + +
+ 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 index 0000000000..9d3893c298 --- /dev/null +++ b/templates/de/html/member/member_list_surfbar_row.tpl @@ -0,0 +1,20 @@ + + + {--MEMBER_SURFBAR_TEST_URL--} + + + {%pipe,translateSurfbarUrlStatus=$content[url_status]%} + + + $content[url_registered] + + + $content[url_last_locked] + + + {%pipe,fixEmptyContentToDashes=$content[url_lock_reason]%} + + + $content[actions] + + 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 index 0000000000..5df1807086 --- /dev/null +++ b/templates/de/html/member/member_start_surfbar_dynamic.tpl @@ -0,0 +1,42 @@ +
+
+ Dynamisch vergütete Surfbar ist aktiv +
+ +
+ Bei der dynamischen Vergütung werden Ihnen derzeit mindestens + {%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,translateComma%} + und maximal {%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,translateComma%} + {?POINTS?} Aufschlag zum Basispreis für jede besuchte + Seite vergütet. Diese müssen Sie mindestens + {%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,createFancyTime%} + und maximal + {%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,createFancyTime%} + zusätzlich zur Basiszeit angesehen haben und können die selbe + Seite erst nach zusätzlichen + {%pipe,SURFBAR_CALCULATE_DYNAMIC_LOCK,createFancyTime%} + wieder aufrufen. +
+ +
+ Einige Hinweise zur Berechnung: Die derzeige Mitgliederanzahl von + {%pipe,getTotalConfirmedUser,translateComma%}, die + derzeit die Surfbar nutzenden + {%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%} Mitglieder, die + gesamt in der Surfbar gebuchten + {%pipe,SURFBAR_GET_TOTAL_URLS,translateComma%} + URLs (ohne von unseren Sponsoren), sowie Ihre gebuchten + {%pipe,getMemberId,SURFBAR_GET_TOTAL_USER_URLS,translateComma%} URLs werden als + Berechnungsgrundlage verwendet. Sie erhalten allerdings nur einen + reduzierten Anteil von + {%config,translateComma=surfbar_dynamic_percent%}%. +
+ +
+ Der Basispreis und die Basiszeit sind die Einstellungen aus dem + statischen Vergütungsmodell: + {%config,translateComma=surfbar_static_reward%} + {?POINTS?} bzw. + {%config,createFancyTime=surfbar_static_time%}. +
+
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 index 0000000000..3bedea1733 --- /dev/null +++ b/templates/de/html/member/member_start_surfbar_static.tpl @@ -0,0 +1,16 @@ +
+
+ Statisch vergütete Surfbar ist aktiv +
+
+ Bei der statischen Vergütung werden Ihnen derzeit + {%config,translateComma=surfbar_static_reward%} + {?POINTS?} für jede besuchte Seite vergütet. Diese + müssen Sie + {%config,createFancyTime=surfbar_static_time%} lang + angesehen haben und können die selbe Seite erst nach + {%config,createFancyTime=surfbar_static_lock%} wieder + aufrufen. Es sind insgesamt + $content[surfbar_total_urls] URLs in der Surfbar. +
+
diff --git a/templates/de/html/member/member_surfbar_book_dynamic.tpl b/templates/de/html/member/member_surfbar_book_dynamic.tpl index a71ab240f5..11f5d85d80 100644 --- a/templates/de/html/member/member_surfbar_book_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_book_dynamic.tpl @@ -1,53 +1 @@ -
-
-
- URL in Surfbar buchen - Dynamisch: -
- -
- URL eingeben: -
- -
- Soll die Anzahl Aufrufe begrenzt werden?
- {--NO--} - {--YES--} -
- -
- Aufrufe begrenzen auf: -
- -
-
- Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen mindestens - {%pipe,SURFBAR_DETERMINE_COSTS,translateComma=true%} {?POINTS?}. - Surfen Sie mit der Surfbar erhalten Sie mindestens - {%pipe,SURFBAR_DETERMINE_REWARD,translateComma=true%} {?POINTS?} - auf Ihr Konto gutgeschrieben. -
-
- Sie haben bereits - {%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%} - von maximal - {%config,translateComma=surfbar_max_order%} - erlaubten URLs gebucht. -
-
- -
- - -
-
- - -
- - - Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf richten sich nach - verschiedenen Faktoren. Schauen Sie unter Surfbar starten - nach, wenn Sie genaueres dazu wissen möchten. - + diff --git a/templates/de/html/member/member_surfbar_book_static.tpl b/templates/de/html/member/member_surfbar_book_static.tpl index 33e90b141e..11f5d85d80 100644 --- a/templates/de/html/member/member_surfbar_book_static.tpl +++ b/templates/de/html/member/member_surfbar_book_static.tpl @@ -1,39 +1 @@ -
-
-
- URL in Surfbar buchen - Statisch: -
- -
- URL eingeben: -
- -
- Soll die Anzahl Aufrufe begrenzt werden?
- {--NO--} - {--YES--} -
- -
- Aufrufe begrenzen auf: -
- -
- Jeder Seiten-Aufruf durch andere Mitglieder kostet Ihnen {%pipe,SURFBAR_DETERMINE_COSTS,translateComma=true%}{?POINTS?}. Surfen Sie mit - der Surfbar erhalten Sie {%pipe,SURFBAR_DETERMINE_REWARD,translateComma=true%} - {?POINTS?} auf Ihr Konto gutgeschrieben.
-
- Sie haben bereits {%pipe,SURFBAR_GET_TOTAL_USER_URLS,translateComma%} von maximal - {%config,translateComma=surfbar_max_order%} erlaubten URLs gebucht. -
- -
- - -
-
- - - -
+ diff --git a/templates/de/html/member/member_surfbar_list.tpl b/templates/de/html/member/member_surfbar_list.tpl index 646e780539..11f5d85d80 100644 --- a/templates/de/html/member/member_surfbar_list.tpl +++ b/templates/de/html/member/member_surfbar_list.tpl @@ -1,33 +1 @@ - - - - - - - - - - - - -$content - - - -
- {--MEMBER_SURFBAR_LIST_TITLE--} -
- {--MEMBER_SURFBAR_TEST_URL--} - - {--MEMBER_SURFBAR_STATUS--} - - {--MEMBER_SURFBAR_REGISTERED--} - - {--MEMBER_SURFBAR_LAST_LOCKED--} - - {--MEMBER_SURFBAR_LOCK_REASON--} - - {--MEMBER_SURFBAR_ACTIONS--} -
- {--MEMBER_SURFBAR_LIST_NOTE--} -
+ diff --git a/templates/de/html/member/member_surfbar_list_form.tpl b/templates/de/html/member/member_surfbar_list_form.tpl index ce51f43919..11f5d85d80 100644 --- a/templates/de/html/member/member_surfbar_list_form.tpl +++ b/templates/de/html/member/member_surfbar_list_form.tpl @@ -1,7 +1 @@ - -
- - - -
- + diff --git a/templates/de/html/member/member_surfbar_list_row.tpl b/templates/de/html/member/member_surfbar_list_row.tpl index 9d3893c298..11f5d85d80 100644 --- a/templates/de/html/member/member_surfbar_list_row.tpl +++ b/templates/de/html/member/member_surfbar_list_row.tpl @@ -1,20 +1 @@ - - - {--MEMBER_SURFBAR_TEST_URL--} - - - {%pipe,translateSurfbarUrlStatus=$content[url_status]%} - - - $content[url_registered] - - - $content[url_last_locked] - - - {%pipe,fixEmptyContentToDashes=$content[url_lock_reason]%} - - - $content[actions] - - + diff --git a/templates/de/html/member/member_surfbar_start_dynamic.tpl b/templates/de/html/member/member_surfbar_start_dynamic.tpl index 5df1807086..11f5d85d80 100644 --- a/templates/de/html/member/member_surfbar_start_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_start_dynamic.tpl @@ -1,42 +1 @@ -
-
- Dynamisch vergütete Surfbar ist aktiv -
- -
- Bei der dynamischen Vergütung werden Ihnen derzeit mindestens - {%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,translateComma%} - und maximal {%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,translateComma%} - {?POINTS?} Aufschlag zum Basispreis für jede besuchte - Seite vergütet. Diese müssen Sie mindestens - {%pipe,SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE,createFancyTime%} - und maximal - {%pipe,SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE,createFancyTime%} - zusätzlich zur Basiszeit angesehen haben und können die selbe - Seite erst nach zusätzlichen - {%pipe,SURFBAR_CALCULATE_DYNAMIC_LOCK,createFancyTime%} - wieder aufrufen. -
- -
- Einige Hinweise zur Berechnung: Die derzeige Mitgliederanzahl von - {%pipe,getTotalConfirmedUser,translateComma%}, die - derzeit die Surfbar nutzenden - {%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%} Mitglieder, die - gesamt in der Surfbar gebuchten - {%pipe,SURFBAR_GET_TOTAL_URLS,translateComma%} - URLs (ohne von unseren Sponsoren), sowie Ihre gebuchten - {%pipe,getMemberId,SURFBAR_GET_TOTAL_USER_URLS,translateComma%} URLs werden als - Berechnungsgrundlage verwendet. Sie erhalten allerdings nur einen - reduzierten Anteil von - {%config,translateComma=surfbar_dynamic_percent%}%. -
- -
- Der Basispreis und die Basiszeit sind die Einstellungen aus dem - statischen Vergütungsmodell: - {%config,translateComma=surfbar_static_reward%} - {?POINTS?} bzw. - {%config,createFancyTime=surfbar_static_time%}. -
-
+ diff --git a/templates/de/html/member/member_surfbar_start_static.tpl b/templates/de/html/member/member_surfbar_start_static.tpl index 3bedea1733..11f5d85d80 100644 --- a/templates/de/html/member/member_surfbar_start_static.tpl +++ b/templates/de/html/member/member_surfbar_start_static.tpl @@ -1,16 +1 @@ -
-
- Statisch vergütete Surfbar ist aktiv -
-
- Bei der statischen Vergütung werden Ihnen derzeit - {%config,translateComma=surfbar_static_reward%} - {?POINTS?} für jede besuchte Seite vergütet. Diese - müssen Sie - {%config,createFancyTime=surfbar_static_time%} lang - angesehen haben und können die selbe Seite erst nach - {%config,createFancyTime=surfbar_static_lock%} wieder - aufrufen. Es sind insgesamt - $content[surfbar_total_urls] URLs in der Surfbar. -
-
+