Constant SECS and MINS are now deprecated/removed, surfbar extended with static costs...

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index 832f900abd470d8c1bb27629acb1a177847ed8b9..29ebfff5efde624b8cefeb72998ce07863ba6695 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -56,7 +56,8 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 `userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0',
 `url` VARCHAR(255) NOT NULL DEFAULT '',
 `last_salt` VARCHAR( 255 ) NOT NULL DEFAULT '',
-`reward` DOUBLE(20,5) UNSIGNED  NOT NULL DEFAULT '0.00000',
+`reward` FLOAT(10,5) UNSIGNED  NOT NULL DEFAULT '0.00000',
+`costs` FLOAT(10,5) UNSIGNED  NOT NULL DEFAULT '0.00000',
 `payment_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 `views_total` BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0',
 `status` ENUM('PENDING','CONFIRMED', 'LOCKED') NOT NULL DEFAULT 'CONFIRMED',
@@ -94,10 +95,12 @@ PRIMARY KEY(`id`)
        // Config entries
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_pay_model` ENUM('STATIC','DYNAMIC') NOT NULL DEFAULT 'STATIC'";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_static_reward` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT '0.25000'";
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_static_costs` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT '1.00000'";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_static_time` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '60'";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_static_lock` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '".(60*60)."'";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_notify_admin_unlock` ENUM('N','Y') NOT NULL DEFAULT 'N'";
        $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_dynamic_percent` FLOAT(10,5) UNSIGNED NOT NULL DEFAULT '10.00000'";
+       $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `surfbar_max_order` INT(7) UNSIGNED NOT NULL DEFAULT '10'";
 
        // Member menus
        $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar',NULL,'Surfbar','Y','Y',5)";

diff --git a/inc/functions.php b/inc/functions.php
index aae3aae26a9139227769be974d76e7c08af2fdd2..64ff243e2e37ca28910a18919b330e09dd9fd212 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1378,7 +1378,7 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
                }
                if (ereg("s", $display) || (empty($display)))
                {
-                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">".SECS."</STRONG></TD>\n";
+                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._SECONDS."</STRONG></TD>\n";
                }
                $OUT .= "</TR>\n";
                $OUT .= "<TR>\n";

diff --git a/inc/language/de.php b/inc/language/de.php
index a3b1a13c5b0d343279da2079e4f3ec66b72de040..863d2d5d68e9d849880ef1a2157bf9d8c184593c 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -416,9 +416,6 @@ define('CONTINUE_FRAMETESTER', "Weiter zum Framekiller-Test");
 define('MEMBER_URL_TIME_LOCK', "Sie hatten bereits die selbe URL gebucht:");
 define('MEMBER_LAST_TLOCK', "Ihre letzte Buchung war am");
 define('CONFIG_URL_TLOCK', "Selbe URLs sind buchbar in");
-define('HOURS', "Stunden");
-define('MINS', "Minuten");
-define('SECS', "Sekunden");
 define('_AND', "und");
 define('UNKNOWN_CODE_1', "Es ist w&auml;hrend der Ausf&uuml;hrung ein unbekannter Fehler-Code <strong>");
 define('UNKNOWN_CODE_2', "</strong> enstanden, f&uuml;r den Sie vermutlich nicht verantwortlich sind. Bitte informieren Sie uns &uuml;ber diese Meldung!");

diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php
index 762beb8af3942431b0d2d6326bc41908acf52c67..423f9cd30f01c11627939ad88a52271449cb18f6 100644 (file)
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -39,7 +39,8 @@ if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) {
 
 // General admin text
 define('ADMIN_CONFIG_SURFBAR_TITLE', "Konfiguration der Surfbar");
-define('ADMIN_CONFIG_SURFBAR_STATIC_REWARD', "Statische Vergütung in {!POINTS!}:");
+define('ADMIN_CONFIG_SURFBAR_STATIC_REWARD', "Statische Vergütung:");
+define('ADMIN_CONFIG_SURFBAR_STATIC_COSTS', "Statische Kosten:");
 define('ADMIN_CONFIG_SURFBAR_STATIC_TIME', "Statische Verweildauer bis nächste Seite geladen wird in Sekunden:");
 define('ADMIN_CONFIG_SURFBAR_STATIC_LOCK', "Statische Reload-Sperre (oberes Frame oder ges. Surfbar):");
 define('ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL', "Vergütungsmodel auswählen:");
@@ -47,6 +48,7 @@ define('ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC', "Statische Werte verwenden."
 define('ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC', "Dynamische Werte errechnen.");
 define('ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK', "Admin bei Freigabe von Mailbuchungen informieren, dass die URL in die Surfbar aufgenommen wurde?");
 define('ADMIN_CONFIG_SURFBAR_DYNAMIC_PERCENT', "Prozent auf dynamische Vergütung:");
+define('ADMIN_CONFIG_SURFBAR_MAX_ORDER', "Maximal durch Mitglied in Surfbar buchbare URLs:(*)");
 define('ADMIN_SURFBAR_NOTIFY_UNLOCK_YES', "Ja, Admin(s) informieren.");
 define('ADMIN_SURFBAR_NOTIFY_UNLOCK_NO', "Nein, nicht informieren.");
 define('ADMIN_SURFBAR_NO_REF_LEVELS_FOUND', "Zur Zeit sind keine Referal-Ebenen f&uuml;r die Surfbar eingestellt.<br />\nBitte installieren Sie die Erweiterung <strong>surfbar</strong> neu.");
@@ -61,6 +63,7 @@ define('ADMIN_SURFBAR_LOCK_REASON', "Sperrgrund");
 define('ADMIN_SURFBAR_EDIT_URL', "URL &auml;ndern");
 define('ADMIN_SURFBAR_DEL_URL', "URL l&ouml;schen");
 define('ADMIN_SURFBAR_UNLOCK_URL', "URL ent-/sperren");
+define('ADMIN_CONFIG_SURFBAR_NOTE', "(*): Es sind auch die &Uuml;bertragungen der URLs aus der Mailbuchung einbezogen.");
 
 // Subject lines for admins
 define('ADMIN_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT', "URL in Surfbar gebucht");

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 5af00ce901b202e82a00851e5442f14a18ba9695..b4364a6a49675a517a35558cf8c4bb57573cdea4 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -38,7 +38,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 }
 
 // Admin has added an URL with given user id
-function SURFBAR_ADMIN_ADD_URL ($url, $uid, $reward, $paymentId) {
+function SURFBAR_ADMIN_ADD_URL ($url, $uid, $reward, $costs, $paymentId) {
        // Is this really an admin?
        if (!IS_ADMIN()) {
                // Then leave here
@@ -52,7 +52,7 @@ function SURFBAR_ADMIN_ADD_URL ($url, $uid, $reward, $paymentId) {
        } // END - if
 
        // Register the new URL
-       return SURFBAR_REGISTER_URL($url, $uid, $reward, $paymentId, "CONFIRMED", "unlock");
+       return SURFBAR_REGISTER_URL($url, $uid, $reward, $costs, $paymentId, "CONFIRMED", "unlock");
 }
 // Looks up by an URL
 function SURFBAR_LOOKUP_BY_URL ($url) {
@@ -76,7 +76,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column="id", $order="id", $sort="AS
        } // END - if
 
        // Look up the record
-       $result = SQL_QUERY_ESC("SELECT id, userid, url, reward, views_total, status, registered, last_locked, lock_reason
+       $result = SQL_QUERY_ESC("SELECT id, userid, url, reward, costs, views_total, status, registered, last_locked, lock_reason
 FROM "._MYSQL_PREFIX."_surfbar_urls
 WHERE %s='%s'
 ORDER BY %s %s",
@@ -104,7 +104,7 @@ ORDER BY %s %s",
        return $lastUrlData;
 }
 // Registers an URL with the surfbar. You should have called SURFBAR_LOOKUP_BY_URL() first!
-function SURFBAR_REGISTER_URL ($url, $uid, $reward, $paymentId, $status="PENDING", $addMode="reg") {
+function SURFBAR_REGISTER_URL ($url, $uid, $reward, $paymentId, $costs, $status="PENDING", $addMode="reg") {
        global $_CONFIG;
 
        // Make sure by the user registered URLs are always pending
@@ -116,6 +116,7 @@ function SURFBAR_REGISTER_URL ($url, $uid, $reward, $paymentId, $status="PENDING
                'frametester' => FRAMETESTER($url),
                'uid'         => $uid,
                'reward'      => $reward,
+               'costs'       => $costs,
                'payment_id'  => $paymentId,
                'status'      => $status
        );
@@ -123,9 +124,10 @@ function SURFBAR_REGISTER_URL ($url, $uid, $reward, $paymentId, $status="PENDING
        // Insert the URL into database
        $content['insert_id'] = SURFBAR_INSERT_URL_BY_ARRAY($content);
 
-       // Translate status and reward
+       // Translate status, reward and costs
        $content['status'] = SURFBAR_TRANSLATE_STATUS($content['status']);
        $content['reward'] = TRANSLATE_COMMA($content['reward']);
+       $content['costs']  = TRANSLATE_COMMA($content['costs']);
 
        // If in reg-mode we notify admin
        if (($addMode == "reg") || ($_CONFIG['surfbar_notify_admin_unlock'] == "Y")) {
@@ -142,11 +144,12 @@ function SURFBAR_REGISTER_URL ($url, $uid, $reward, $paymentId, $status="PENDING
 // Inserts an url by given data array and return the insert id
 function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
        // Just run the insert query for now
-       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid, url, reward, payment_id, status) VALUES(%s, '%s', %s, %s, '%s')",
+       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid, url, reward, costs, payment_id, status) VALUES(%s, '%s', %s, %s, %s, '%s')",
                array(
                        bigintval($urlData['uid']),
                        $urlData['url'],
                        (float)$urlData['reward'],
+                       (float)$urlData['costs'],
                        bigintval($urlData['payment_id']),
                        $urlData['status']
                ), __FILE__, __LINE__
@@ -339,10 +342,10 @@ function SURFBAR_PAY_POINTS ($id) {
        $_CONFIG['db_table']    = "surfbar_reflevels";
 
        // Book it to the user
-       ADD_POINTS_REFSYSTEM($GLOBALS['userid'], $SURFBAR_DATA['reward']);
+       ADD_POINTS_REFSYSTEM($GLOBALS['userid'], SURFBAR_GET_DATA('reward'));
 
        // Remove it from the URL owner
-       SUB_POINTS($SURFBAR_DATA['userid'], $SURFBAR_DATA['reward']);
+       SUB_POINTS($SURFBAR_DATA['userid'], SURFBAR_GET_DATA('costs'));
 }
 // Update the salt for validation
 function SURFBAR_UPDATE_SALT() {
@@ -372,7 +375,7 @@ function SURFBAR_GET_NEXT_ID ($id = 0) {
                $randNum = mt_rand(0, $maxRand);
 
                // And query the database
-               $result = SQL_QUERY_ESC("SELECT sb.id, sb.userid, sb.url, sb.last_salt, sb.reward, sb.views_total, p.time, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed
+               $result = SQL_QUERY_ESC("SELECT sb.id, sb.userid, sb.url, sb.last_salt, sb.reward, sb.costs, sb.views_total, p.time, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed
 FROM "._MYSQL_PREFIX."_surfbar_urls AS sb
 LEFT JOIN "._MYSQL_PREFIX."_payments AS p
 ON sb.payment_id=p.id
@@ -385,7 +388,7 @@ LIMIT %d,1",
                );
        } else {
                // Get data from specified id number
-               $result = SQL_QUERY_ESC("SELECT sb.id, sb.userid, sb.url, sb.last_salt, sb.reward, sb.views_total, p.time
+               $result = SQL_QUERY_ESC("SELECT sb.id, sb.userid, sb.url, sb.last_salt, sb.reward, sb.costs, sb.views_total, p.time
 FROM "._MYSQL_PREFIX."_surfbar_urls AS sb
 LEFT JOIN "._MYSQL_PREFIX."_payments AS p
 ON sb.payment_id=p.id
@@ -416,11 +419,13 @@ LIMIT 1",
 
                // Are we in static mode?
                if ($_CONFIG['surfbar_pay_model'] == "STATIC") {
-                       // Then use static reward!
+                       // Then use static reward/costs!
                        $SURFBAR_DATA['reward'] = $_CONFIG['surfbar_static_reward'];
+                       $SURFBAR_DATA['costs']  = $_CONFIG['surfbar_static_costs'];
                } else {
-                       // Calculate dynamic reward and add it
+                       // Calculate dynamic reward/costs and add it
                        $SURFBAR_DATA['reward'] += SURFBAR_CALCULATE_DYNAMIC_REWARD_ADD();
+                       $SURFBAR_DATA['costs']  += SURFBAR_CALCULATE_DYNAMIC_COSTS_ADD();
                }
 
                // Now get the id
@@ -464,6 +469,11 @@ function SURFBAR_GET_REWARD () {
        // Get data element and return its contents
        return SURFBAR_GET_DATA('reward');
 }
+// Getter for costs from cache
+function SURFBAR_GET_COSTS () {
+       // Get data element and return its contents
+       return SURFBAR_GET_DATA('costs');
+}
 // Getter for URL from cache
 function SURFBAR_GET_URL () {
        // Get data element and return its contents

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index b6dd0123ba0633e57409051d7ef24b73cff021db..79b5113d2f6b38a48baa2c655d82968892622907 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -90,11 +90,11 @@ if (isset($_POST['ok'])) {
                define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS($_CONFIG['resend_profile_update'] , "resend_profile_update", "MWD"));
        } else {
                // Normal input boxes
-               define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['online_timeout']."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
-               define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['url_tlock']     ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
-               define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['profile_lock']  ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
-               define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".$_CONFIG['profile_update']."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
-               define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['resend_profile_update'] ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");
+               define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['online_timeout']."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['url_tlock']     ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['profile_lock']  ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".$_CONFIG['profile_update']."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['resend_profile_update'] ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
        }
 
        if ($_CONFIG['order_multi_page'] == "N") {

diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php
index 32eaa9c61cdb9e8b99cca9c5f27c3d323af9b01c..e82ababe57c41d23935cdf23cf3375132ceea986 100644 (file)
--- a/inc/modules/admin/what-config_surfbar.php
+++ b/inc/modules/admin/what-config_surfbar.php
@@ -52,9 +52,11 @@ if (isset($_POST['ok'])) {
        // Prepare content
        $content = array(
                'surfbar_static_reward'   => TRANSLATE_COMMA($_CONFIG['surfbar_static_reward']),
+               'surfbar_static_costs'    => TRANSLATE_COMMA($_CONFIG['surfbar_static_costs']),
                'surfbar_static_time'     => $_CONFIG['surfbar_static_time'],
                'surfbar_static_lock'     => $_CONFIG['surfbar_static_lock'],
-               'surfbar_dynamic_percent' => TRANSLATE_COMMA($_CONFIG['surfbar_dynamic_percent'])
+               'surfbar_dynamic_percent' => TRANSLATE_COMMA($_CONFIG['surfbar_dynamic_percent']),
+               'surfbar_max_order'       => $_CONFIG['surfbar_max_order']
        );
 
        // Prepare payment model for template

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 2a765f9b3a9e51704413552e869d92f09f2cff78..4cfcb50a70d0668806e62bbc6369298c28f50b6a 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -285,7 +285,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL))
   </TD>
   <TD align=\"center\" class=\"top bottom right\" width=\"23%\">
     ".EMAIL_SECONDS.":<br />
-    <STRONG class=\"admin_misc\">".$bonus[5]." ".SECS."
+    <STRONG class=\"admin_misc\">".$bonus[5]." "._SECONDS."
   </TD>
   <TD align=\"center\" class=\"top bottom\">
     ".EMAIL_CATEGORY.":<br />

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 9bbe6a58f80923476f0780deca018533378001dd..10eaf82772c5137a9b459547683b86fc42044ce4 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -573,7 +573,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 
                                        // Finally contruct the message
                                        $MSG = MEMBER_URL_TIME_LOCK."<br />".CONFIG_URL_TLOCK." ".$STD." ".
-                                               HOURS.", ".$MIN." ".MINS." "._AND." ".$SEC." ".SECS."<br />".
+                                               _HOURS.", ".$MIN." "._MINUTES." "._AND." ".$SEC." "._SECONDS."<br />".
                                                MEMBER_LAST_TLOCK.": ".$LORDER;
                                        break;
 

diff --git a/templates/de/html/admin/admin_add_payment.tpl b/templates/de/html/admin/admin_add_payment.tpl
index 9869fce6ac4352ec8e8207b5fd44217d1667b25e..337c00047575af514d4f4d1558cf350a2c439169 100644 (file)
--- a/templates/de/html/admin/admin_add_payment.tpl
+++ b/templates/de/html/admin/admin_add_payment.tpl
@@ -13,7 +13,7 @@
                <TD align="right" width="200">{--ENTER_PAY_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="200"><INPUT type="text" name="t_wait"
-                       class="admin_normal" size="3" maxlength="3">&nbsp;{--SECS--}
+                       class="admin_normal" size="3" maxlength="3">&nbsp;{--_SECONDS--}
                </TD>
        </TR>
        <TR>

diff --git a/templates/de/html/admin/admin_config_home_settings.tpl b/templates/de/html/admin/admin_config_home_settings.tpl
index cb04b3643e50c771b4c05ac73111183e41a26002..30693574e35230f03bd75b342fc65e0f06f0f880 100644 (file)
--- a/templates/de/html/admin/admin_config_home_settings.tpl
+++ b/templates/de/html/admin/admin_config_home_settings.tpl
@@ -19,14 +19,14 @@
                        <OPTION value="-1"$content[-1]>{--ADMIN_INDEX_NO_DELAY--}</OPTION>
                        <OPTION value="0"$content[0]>{--ADMIN_INDEX_MANUAL_FORWARD--}</OPTION>
                        <!-- Fuehren Sie dies einfach so weiter, wenn Sie mehr Werte brauchen //-->
-                       <OPTION value="1"$content[1]>1 {--SECS--}</OPTION>
-                       <OPTION value="2"$content[2]>2 {--SECS--}</OPTION>
-                       <OPTION value="3"$content[3]>3 {--SECS--}</OPTION>
-                       <OPTION value="4"$content[4]>4 {--SECS--}</OPTION>
-                       <OPTION value="5"$content[5]>5 {--SECS--}</OPTION>
-                       <OPTION value="10"$content[10]>10 {--SECS--}</OPTION>
-                       <OPTION value="15"$content[15]>15 {--SECS--}</OPTION>
-                       <OPTION value="30"$content[30]>30 {--SECS--}</OPTION>
+                       <OPTION value="1"$content[1]>1 {--_SECONDS--}</OPTION>
+                       <OPTION value="2"$content[2]>2 {--_SECONDS--}</OPTION>
+                       <OPTION value="3"$content[3]>3 {--_SECONDS--}</OPTION>
+                       <OPTION value="4"$content[4]>4 {--_SECONDS--}</OPTION>
+                       <OPTION value="5"$content[5]>5 {--_SECONDS--}</OPTION>
+                       <OPTION value="10"$content[10]>10 {--_SECONDS--}</OPTION>
+                       <OPTION value="15"$content[15]>15 {--_SECONDS--}</OPTION>
+                       <OPTION value="30"$content[30]>30 {--_SECONDS--}</OPTION>
                        <!-- Laenger sollte es aber nun nicht dauern! //-->
                </SELECT></TD>
        </TR>

diff --git a/templates/de/html/admin/admin_config_home_settings_pro.tpl b/templates/de/html/admin/admin_config_home_settings_pro.tpl
index 80d4d908f45b58fef19085fe00a3cb086ad92fa2..268d0a767011c300c14afd6776554f00c23d23cd 100644 (file)
--- a/templates/de/html/admin/admin_config_home_settings_pro.tpl
+++ b/templates/de/html/admin/admin_config_home_settings_pro.tpl
@@ -19,12 +19,12 @@
                        <OPTION value="-1"{--$content['-1']--}>{--ADMIN_INDEX_MANUAL_FORWARD--}</OPTION>
                        <OPTION value="0"{--$content['0']--}>{--ADMIN_INDEX_NO_DELAY--}</OPTION>
                        <!-- Fuehren Sie dies einfach so weiter, wenn Sie mehr Werte brauchen -->
-                       <OPTION value="1"{--$content['1']--}>1 {--SECS--}</OPTION>
-                       <OPTION value="2"{--$content['2']--}>2 {--SECS--}</OPTION>
-                       <OPTION value="3"{--$content['3']--}>3 {--SECS--}</OPTION>
-                       <OPTION value="4"{--$content['4']--}>4 {--SECS--}</OPTION>
-                       <OPTION value="5"{--$content['5']--}>5 {--SECS--}</OPTION>
-                       <OPTION value="10"{--$content['10']--}>10 {--SECS--}</OPTION>
+                       <OPTION value="1"{--$content['1']--}>1 {--_SECONDS--}</OPTION>
+                       <OPTION value="2"{--$content['2']--}>2 {--_SECONDS--}</OPTION>
+                       <OPTION value="3"{--$content['3']--}>3 {--_SECONDS--}</OPTION>
+                       <OPTION value="4"{--$content['4']--}>4 {--_SECONDS--}</OPTION>
+                       <OPTION value="5"{--$content['5']--}>5 {--_SECONDS--}</OPTION>
+                       <OPTION value="10"{--$content['10']--}>10 {--_SECONDS--}</OPTION>
                </SELECT></TD>
        </TR>
        <TR>

diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl
index 98ad2c155df71f9f79283abf48d6b1a20763b034..3b093322a0eb37e28325f2abef07ff6f380a2c60 100644 (file)
--- a/templates/de/html/admin/admin_config_surfbar.tpl
+++ b/templates/de/html/admin/admin_config_surfbar.tpl
@@ -11,7 +11,16 @@
                        {--ADMIN_CONFIG_SURFBAR_STATIC_REWARD--}
                </TD>
                <TD width="25%">
-                       <INPUT type="text" name="surfbar_static_reward" size="6" maxlength="20" value="$content[surfbar_static_reward]" />
+                       <INPUT type="text" name="surfbar_static_reward" size="6" maxlength="20" value="$content[surfbar_static_reward]" /> {!POINTS!}
+               </TD>
+       </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR>
+               <TD height="30" align="right" style="padding-right:5px">
+                       {--ADMIN_CONFIG_SURFBAR_STATIC_COSTS--}
+               </TD>
+               <TD>
+                       <INPUT type="text" name="surfbar_static_costs" size="6" maxlength="20" value="$content[surfbar_static_costs]" /> {!POINTS!}
                </TD>
        </TR>
        <TR>
@@ -40,6 +49,15 @@
                        <INPUT type="text" name="surfbar_dynamic_percent" size="6" maxlength="20" value="$content[surfbar_dynamic_percent]" />%
                </TD>
        </TR>
+       <TR><TD height="3" colspan="2" class="seperator">&nbsp;</TD></TR>
+       <TR>
+               <TD height="30" align="right" style="padding-right:5px">
+                       {--ADMIN_CONFIG_SURFBAR_MAX_ORDER--}
+               </TD>
+               <TD>
+                       <INPUT type="text" name="surfbar_max_order" size="6" maxlength="20" value="$content[surfbar_max_order]" />
+               </TD>
+       </TR>
        <TR><TD height="8" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
        <TR>
                <TD align="center" colspan="2" class="admin_footer bottom2">
@@ -85,3 +103,7 @@
        </TR>
 </TABLE>
 </FORM>
+
+<DIV class="admin_note">
+       {--ADMIN_CONFIG_SURFBAR_NOTE--}
+</DIV>

diff --git a/templates/de/html/admin/admin_del_payments_row.tpl b/templates/de/html/admin/admin_del_payments_row.tpl
index f4f249ce91008daa05243d612b63e0261e83c84e..c6033357ae8ec0df06e9375977036198310a0d4c 100644 (file)
--- a/templates/de/html/admin/admin_del_payments_row.tpl
+++ b/templates/de/html/admin/admin_del_payments_row.tpl
@@ -7,7 +7,7 @@
 </TR>
 <TR>
        <TD align="center" class="switch_sw$content[sw]">$content[time]
-       {--SECS--} ($content[title]) <INPUT type="hidden"
+       {--_SECONDS--} ($content[title]) <INPUT type="hidden"
                name="id[$content[id]]" value="1" size="35"></TD>
 </TR>
 <TR>

diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl
index f779e0a2ce57c357e808879f245b3c83847bedcb..a3c0e4f50730c6270101fac066a63ab7e6f05bb2 100644 (file)
--- a/templates/de/html/admin/admin_edit_payments_row.tpl
+++ b/templates/de/html/admin/admin_edit_payments_row.tpl
@@ -9,7 +9,7 @@
        <TD class="switch_sw$content[sw]" align="right">{--PAY_TIME--}:&nbsp;</TD>
        <TD class="switch_sw$content[sw]"><INPUT type="text"
                name="time[$content[id]]" class="admin_normal" value="$content[time]"
-               size="3" maxlength="5">{--SECS--}</TD>
+               size="3" maxlength="5">{--_SECONDS--}</TD>
 </TR>
 <TR>
        <TD colspan="2" height="5" class="switch_sw$content[sw] seperator">&nbsp;</TD>

diff --git a/templates/de/html/admin/admin_payments_list_row.tpl b/templates/de/html/admin/admin_payments_list_row.tpl
index 078cb23a564a08b79392d3f7b96fc9826bfbe00f..d09da5bcf88f485d60f3be45838d11045993aa33 100644 (file)
--- a/templates/de/html/admin/admin_payments_list_row.tpl
+++ b/templates/de/html/admin/admin_payments_list_row.tpl
@@ -3,7 +3,7 @@
                type="checkbox" name="sel[$content[id]]" value="1"
                class="admin_normal"></TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">
-       $content[time] {--SECS--}</TD>
+       $content[time] {--_SECONDS--}</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">
        $content[pay]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">

diff --git a/templates/de/html/admin/admin_welcome.tpl b/templates/de/html/admin/admin_welcome.tpl
index d7da82ff7d3adc7df355669f39f8a63b3ed755ec..11a66a0c50c1e9446533f4fcfbd3a4f22b591abf 100644 (file)
--- a/templates/de/html/admin/admin_welcome.tpl
+++ b/templates/de/html/admin/admin_welcome.tpl
@@ -7,7 +7,7 @@
                !</DIV>
                </TD>
                <TD align="center" width="300" class="dashed"><FONT class="tiny">
-               Aktueller Admin: <STRONG title="Erweiterung admins nicht installiert.">{!__ADMIN_LOGIN!}</STRONG>
+               Aktueller Admin:&nbsp;[<STRONG title="Erweiterung admins nicht installiert.">{!__ADMIN_LOGIN!}</STRONG>]
                </FONT></TD>
                <TD align="center" width="100" class="top2 bottom2 right2"><FONT
                        class="tiny"> <A class="menu_blur admin_logout"

diff --git a/templates/de/html/admin/admin_welcome_admins.tpl b/templates/de/html/admin/admin_welcome_admins.tpl
index 86ee23a840051e041b352a320d79b431b5f4d18d..ff34da8b3086dc7a573cd155c2d1903885bc0daa 100644 (file)
--- a/templates/de/html/admin/admin_welcome_admins.tpl
+++ b/templates/de/html/admin/admin_welcome_admins.tpl
@@ -7,8 +7,8 @@
                !</DIV>
                </TD>
                <TD align="center" width="300" class="dashed"><FONT class="tiny">
-               Aktueller Admin: <A
-                       href="{!URL!}/modules.php?module=admin&amp;what=admins_edit&admin={!__ADMIN_ID!}"><STRONG>{!__ADMIN_LOGIN!}</STRONG></A>
+               Aktueller Admin:&nbsp;[<A
+                       href="{!URL!}/modules.php?module=admin&amp;what=admins_edit&admin={!__ADMIN_ID!}"><STRONG>{!__ADMIN_LOGIN!}</STRONG></A>]
                </FONT></TD>
                <TD align="center" width="100" class="top2 bottom2 right2"><FONT
                        class="tiny"> <A class="menu_blur admin_logout"

diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl
index 9365c8589d27258f8eaf4f058b7e0c0faa8fa363..a99bc96a107255d98b26bfcfa617bf251d2bb050 100644 (file)
--- a/templates/de/html/mailid/mailid_timer.tpl
+++ b/templates/de/html/mailid/mailid_timer.tpl
@@ -35,7 +35,7 @@ function StartCounter() {
                                <FORM name="confirm" style="margin-top: 0px; margin-bottom: 0px">
                                {--MEMBER_TIME_COUNTER_1--} <INPUT type="text" name="counter"
                                        size="{--_TIM2_VALUE!}" readonly class="member_normal"
-                                       value="{--_TIME_VALUE!}">&nbsp;{--SECS--}
+                                       value="{--_TIME_VALUE!}">&nbsp;{--_SECONDS--}
                                {--MEMBER_TIME_COUNTER_2--}</FORM>
                                </TD>
                        </TR>

diff --git a/templates/de/html/surfbar/surfbar_frameset.tpl b/templates/de/html/surfbar/surfbar_frameset.tpl
index 3eff74fda202bb811b387301b7cba5cbede75eaa..8ab7566cf16b1ce7ff0402b44bf730b3e3e05e4a 100644 (file)
--- a/templates/de/html/surfbar/surfbar_frameset.tpl
+++ b/templates/de/html/surfbar/surfbar_frameset.tpl
@@ -6,7 +6,7 @@ if (top.frames.length > 0) {
 //-->
 </script>
 <frameset rows="62,*" frameborder="no" border="0" framespacing="0">
-       <frameset cols="*,468" frameborder="no" border="0" framespacing="0">
+       <frameset cols="*,469" frameborder="no" border="0" framespacing="0">
                <frame name="surfbar_top" src="{!URL!}/surfbar.php?frame=top" frameborder="no" scrolling="no" noresize>
                <frame name="surfbar_banner" src="{!URL!}/surfbar.php?frame=banner" frameborder="no" scrolling="no" noresize>
        </frameset>