]> git.mxchange.org Git - mailer.git/commitdiff
Even more rewrites to make usage of EL
authorRoland Häder <roland@mxchange.org>
Tue, 29 Jun 2010 03:04:17 +0000 (03:04 +0000)
committerRoland Häder <roland@mxchange.org>
Tue, 29 Jun 2010 03:04:17 +0000 (03:04 +0000)
61 files changed:
.gitattributes
inc/libs/optimize_functions.php
inc/libs/register_functions.php
inc/libs/surfbar_functions.php
inc/mails/doubler_mails.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-config_points.php
inc/modules/admin/what-extensions.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_sponsor.php
inc/modules/admin/what-list_sponsor_pay.php
inc/modules/admin/what-optimize.php
inc/modules/admin/what-payments.php
inc/modules/admin/what-refbanner.php
inc/modules/admin/what-repair_lang.php
inc/modules/guest/what-mediadata.php
inc/modules/member/what-stats.php
inc/template-functions.php
mailid.php
templates/de/emails/admin/admin_edit_surfbar_urls.tpl
templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl
templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl
templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_confirmed.tpl
templates/de/emails/admin/admin_surfbar_url_depleted.tpl
templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_migrate.tpl
templates/de/emails/admin/admin_surfbar_url_pending.tpl
templates/de/emails/admin/admin_surfbar_url_pending_active.tpl
templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl
templates/de/emails/admin/admin_surfbar_url_reg.tpl
templates/de/emails/admin/admin_surfbar_url_rejected.tpl
templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_unlock.tpl
templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl
templates/de/html/admin/admin_config_payouts_del_row.tpl
templates/de/html/admin/admin_config_payouts_edit_row.tpl
templates/de/html/admin/admin_config_payouts_row.tpl
templates/de/html/admin/admin_extensions_row.tpl
templates/de/html/admin/admin_list_links_row.tpl
templates/de/html/admin/admin_list_payments_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_sponsor_pay_del_row.tpl
templates/de/html/admin/admin_list_sponsor_pay_edit_row.tpl
templates/de/html/admin/admin_list_sponsor_pay_row.tpl
templates/de/html/admin/admin_list_sponsor_row.tpl
templates/de/html/admin/admin_optimize.tpl
templates/de/html/admin/admin_optimize_row.tpl
templates/de/html/admin/admin_payments_list_row.tpl
templates/de/html/admin/admin_points_del_row.tpl
templates/de/html/admin/admin_points_edit_row.tpl
templates/de/html/admin/admin_refbanner_edit_row.tpl
templates/de/html/admin/admin_refbanner_row.tpl
templates/de/html/admin/admin_repair_lang.tpl
templates/de/html/admin/admin_repair_lang_row_404.tpl
templates/de/html/admin/admin_repair_lang_row_diff.tpl
templates/de/html/mailid/mailid_frames.tpl
templates/de/html/mediadata_extra_row.tpl
templates/de/html/mediadata_extra_row2.tpl
templates/de/html/member/member_pool_row.tpl
templates/de/html/show_timings.tpl

index 6211e9b59f3944a05f763169f34f0876e489e709..654153e8671310c986ed4bbff78324dd7651d34a 100644 (file)
@@ -1117,6 +1117,7 @@ templates/de/html/admin/admin_list_notify_emails_row.tpl -text
 templates/de/html/admin/admin_list_online.tpl -text
 templates/de/html/admin/admin_list_online_row.tpl -text
 templates/de/html/admin/admin_list_payments.tpl -text
+templates/de/html/admin/admin_list_payments_row.tpl -text
 templates/de/html/admin/admin_list_payouts.tpl -text
 templates/de/html/admin/admin_list_payouts_banner.tpl -text
 templates/de/html/admin/admin_list_payouts_row.tpl -text
index d97c738ab489605b26803c174ab5e7be71e6e65d..6fae587174774ea89b7646070ad0558c250d8060 100644 (file)
@@ -91,16 +91,12 @@ function repairOptimizeDatabase () {
                array($total_gain), __FUNCTION__, __LINE__);
 
        // Get total runs and total optimization count
-       $result = SQL_QUERY("SELECT COUNT(`id`) AS rows, SUM(`gain`) AS opti FROM `{?_MYSQL_PREFIX?}_optimize_gain`", __FUNCTION__, __LINE__);
-       list($total_rows, $total_opti) = SQL_FETCHROW($result);
+       $result = SQL_QUERY("SELECT COUNT(`id`) AS `total_rows`, SUM(`gain`) AS `total_optimized` FROM `{?_MYSQL_PREFIX?}_optimize_gain`", __FUNCTION__, __LINE__);
+       $ret = merge_array($ret, SQL_FETCHARRAY($result));
 
        // Free memory
        SQL_FREERESULT($result);
 
-       // Transfer data
-       $ret['total_rows'] = $total_rows;
-       $ret['total_opti'] = $total_opti;
-
        // Return array
        return $ret;
 }
index 89539ff5461a68658e4522d65f5888a0b97d1303..4c5c05aeeb6fe22f83b3e1504e8b0ca2e970b375 100644 (file)
@@ -418,7 +418,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                $content = array(
                        'hash'    => $hash,
                        'userid'  => $userid,
-                       'gender'  => translateGender(postRequestParameter('gender')),
+                       'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
                        'surname' => SQL_ESCAPE(postRequestParameter('surname')),
                        'family'  => SQL_ESCAPE(postRequestParameter('family')),
                        'email'   => SQL_ESCAPE(postRequestParameter('email')),
@@ -434,7 +434,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                $content = array(
                        'hash'    => $hash,
                        'userid'  => $userid,
-                       'gender'  => translateGender(postRequestParameter('gender')),
+                       'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
                        'surname' => SQL_ESCAPE(postRequestParameter('surname')),
                        'family'  => SQL_ESCAPE(postRequestParameter('family')),
                        'email'   => SQL_ESCAPE(postRequestParameter('email')),
index 09e25ee44143dac3cf22e7c87de5142b250db058..02c9c01cfa3d1c417ab83f8512ee2414c627d16a 100644 (file)
@@ -596,7 +596,6 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r
        // Prepare content
        $content = merge_array($extraFields, array(
                'url'         => $url,
-               'frametester' => generateFrametesterUrl($url),
                'url_userid'  => $userid,
                'url_status'  => $status,
        ));
index ffb1121bd9ea3f13b528ccaf30c872d9474abfba..10d2b4e4ec839c7b23a0553065df6196a298f896 100644 (file)
@@ -175,16 +175,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                        $DOUBLER_POINTS -= $content['points'];
 
                        // Prepare array
-                       $content = array(
-                               // Doubler transmission id
-                               'id'        => $content['id'],
-                               // Doubled points
-                               'points'    => $content['points'],
-                               // Timemark
-                               'timemark'  => generateDateTime($content['timemark'], 2),
-                               // IP number when the member submitted the doubling form
-                               'remote_ip' => $content['remote_ip'],
-                       );
+                       $content['timemark'] = generateDateTime($content['timemark'], 2);
 
                        // Load mail template and send mail away...
                        $message = loadEmailTemplate('member_doubler', $content, $content['userid']);
index 640dc3aa5a6c21bbe2c4a5add785d32ba25002fe..de84bf55b075d2a925531d85d0bc6628849ced2c 100644 (file)
@@ -54,8 +54,8 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('title')) && (postRequestP
        if (SQL_HASZERONUMS($result)) {
                // Add now
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_payout_types`
-(type, rate, min_points, from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url)
-VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
+(`type`, `rate`, `min_points`, `from_account`, `from_pass`, `engine_url`, `engine_ret_ok`, `engine_ret_failed`, `pass_enc`, `allow_url`)
+VALUES ('%s', %s, %s,'%s','%s','%s','%s','%s','%s','%s')",
                array(
                        postRequestParameter('title'),
                        bigintval(postRequestParameter('rate')),
@@ -107,10 +107,10 @@ WHERE
        `id`=%s
 LIMIT 1",
                                array(
-                                       postRequestParameter('title', $id),
+                                       postRequestParameter('type', $id),
                                        convertCommaToDot(postRequestParameter('rate', $id)),
                                        convertCommaToDot(postRequestParameter('min_points' , $id)),
-                                       postRequestParameter('allow', $id),
+                                       postRequestParameter('allow_url', $id),
                                        bigintval($id)
                                ),__FILE__, __LINE__, false));
                        }
@@ -126,19 +126,13 @@ LIMIT 1",
                $OUT = '';
                foreach (postRequestParameter('sel') as $id => $sel) {
                        // Load data
-                       $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
-                       array(bigintval($id)), __FILE__, __LINE__);
-                       list($title, $rate, $min_points, $allow) = SQL_FETCHROW($result);
+                       $result = SQL_QUERY_ESC("SELECT `id`, `type`, `rate`, `min_points`, `allow_url` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
+                       $content = SQL_FETCHARRAY($result);
                        SQL_FREERESULT($result);
 
                        // Prepare data for the row template
-                       $content = array(
-                               'id'    => $id,
-                               'title' => $title,
-                               'rate'  => translateComma($rate),
-                               'min_points'  => translateComma($min_points),
-                               'allow' => addSelectionBox('yn', $allow, 'allow[' . $id . ']'),
-                       );
+                       $content['allow_url'] = addSelectionBox('yn', $content['allow_url'], 'allow_url[' . $content['id'] . ']');
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_config_payouts_edit_row', true, $content);
@@ -156,7 +150,7 @@ LIMIT 1",
                // Delete entries
                foreach (postRequestParameter('sel') as $id => $sel) {
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
-                       array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, false));
                } // END - foreach
 
                // Run all SQLs
@@ -172,19 +166,11 @@ LIMIT 1",
                        $id = bigintval($id);
 
                        // Load data
-                       $result = SQL_QUERY_ESC("SELECT type, rate, min_points FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
-                       array($id), __FILE__, __LINE__);
-                       list($title, $rate, $min_points) = SQL_FETCHROW($result);
+                       $result = SQL_QUERY_ESC("SELECT `id`, `type`, `rate`, `min_points` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+                               array($id), __FILE__, __LINE__);
+                       $content = SQL_FETCHARRAY($result);
                        SQL_FREERESULT($result);
 
-                       // Prepare data for the row template
-                       $content = array(
-                               'id'    => $id,
-                               'title' => $title,
-                               'rate'  => translateComma($rate),
-                               'min_points'  => translateComma($min_points),
-                       );
-
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_config_payouts_del_row', true, $content);
                } // END - foreach
@@ -211,15 +197,6 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
        // List all payout types
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result_type)) {
-               // Prepare data for the row template
-               $content = array(
-                       'id'           => $content['id'],
-                       'from_account' => $content['from_account'],
-                       'type'         => $content['type'],
-                       'rate'         => translateComma($content['rate']),
-                       'min_points'   => translateComma($content['min_points']),
-               );
-
                // Load row template and switch color
                $OUT .= loadTemplate('admin_config_payouts_row', true, $content);
        } // END - while
index 5a3bb6996db215acf631f9854e916581399a10c5..20f6d0f0ee9d46be762209c0fd69d50afca18118 100644 (file)
@@ -94,8 +94,8 @@ if (isFormSent()) {
                                                setPostRequestParameter('percents', array($id => convertCommaToDot(postRequestParameter('percents', $id))));
 
                                                // Update entry
-                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`='%s', `percents`='%s' WHERE `id`=%s LIMIT 1",
-                                               array(bigintval($value), postRequestParameter('percents', $id), $id), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`=%s, `percents`=%s WHERE `id`=%s LIMIT 1",
+                                                       array(bigintval($value), convertCommaToDot(postRequestParameter('percents', $id)), $id), __FILE__, __LINE__);
                                        }
                                        $message = '{--REF_DEPTHS_SAVED--}';
                                        break;
@@ -188,18 +188,11 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
                // Delete entries
                $OUT = '';
                foreach (postRequestParameter('sel') as $id => $value) {
-                       $result = SQL_QUERY_ESC("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                        $content = SQL_FETCHARRAY($result);
                        SQL_FREERESULT($result);
 
-                       // Prepare data for the row template
-                       $content = array(
-                               'id'       => $id,
-                               'level'    => $content['level'],
-                               'percents' => translateComma($content['percents']),
-                       );
-
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_points_del_row', true, $content);
                } // END - foreach
@@ -210,18 +203,11 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
                // Edit entries
                $OUT = '';
                foreach (postRequestParameter('sel') as $id => $value) {
-                       $result = SQL_QUERY_ESC("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                        $content = SQL_FETCHARRAY($result);
                        SQL_FREERESULT($result);
 
-                       // Prepare data for the row template
-                       $content = array(
-                               'id'       => $id,
-                               'level'    => $content['level'],
-                               'percents' => translateComma($content['percents']),
-                       );
-
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_points_edit_row', true, $content);
                } // END - foreach
index 5c12d48717407748847973276a54751fdb0f76e8..c25ef8fe423ef792f06722c74ab76bddff663ed6 100644 (file)
@@ -252,16 +252,22 @@ switch ($do) {
        case 'overview': // List all registered extensions
                if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
                        // Load extension data with CSS informations
-                       $result = SQL_QUERY("SELECT `id` AS ext_id, `ext_name`, `ext_active`, `ext_has_css` AS ext_css, `ext_version`
-FROM `{?_MYSQL_PREFIX?}_extensions`
+                       $result = SQL_QUERY("SELECT
+       `id` AS ext_id, `ext_name`, `ext_active`, `ext_has_css` AS ext_css, `ext_version`
+FROM
+       `{?_MYSQL_PREFIX?}_extensions`
 ".$where."
-ORDER BY `ext_name` ASC", __FILE__, __LINE__);
+ORDER BY
+       `ext_name` ASC", __FILE__, __LINE__);
                } else {
                        // Load extension data without CSS informations
-                       $result = SQL_QUERY("SELECT `id` AS ext_id, `ext_name`, `ext_active`, `id`, `ext_version`
-FROM `{?_MYSQL_PREFIX?}_extensions`
+                       $result = SQL_QUERY("SELECT
+       `id` AS ext_id, `ext_name`, `ext_active, `ext_version`
+FROM
+       `{?_MYSQL_PREFIX?}_extensions`
 ".$where."
-ORDER BY `ext_name` ASC", __FILE__, __LINE__);
+ORDER BY
+       `ext_name` ASC", __FILE__, __LINE__);
                }
 
                // Are there some entries?
@@ -274,15 +280,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']);
 
                                // Prepare data for the row template
-                               // @TODO Rewrite in template: id->ext_id,name->ext_name,active->ext_active,ver->ext_ver
-                               $content = array(
-                                       'id'      => $content['ext_id'],
-                                       'name'    => $content['ext_name'],
-                                       'active'  => translateYesNo($content['ext_active']),
-                                       'act_val' => $content['ext_active'],
-                                       'css'     => $cssSelection,
-                                       'ver'     => $content['ext_version'],
-                               );
+                               $content['ext_css'] = $cssSelection;
 
                                // Load row template and switch color
                                $OUT .= loadTemplate('admin_extensions_row', true, $content);
index 3d375c350fd9746650ab1a8576a31ac1721264c6..667017a36de03590d0849b1699de6b782b1ff0c7 100644 (file)
@@ -129,7 +129,7 @@ if (isGetRequestParameterSet('userid')) {
                                                        'link'      => $LINK,
                                                        'subject'   => $content['subject'],
                                                        'timestamp' => generateDateTime($content['timestamp'], 0),
-                                                       'cat'       => getCategory($content['cat_id']),
+                                                       'cat_id'    => $content['cat_id'],
                                                );
 
                                                // Load row template
index 7a32072205f7bf817be500aa38423e4acea838c1..1fd3ed52705018c6d95498db6adf69fce8c75fb9 100644 (file)
@@ -143,7 +143,7 @@ ORDER BY
                                'status'          => $content['status'],
                                'sponsor_created' => generateDateTime($content['sponsor_created'], 2),
                                'last_online'     => generateDateTime($content['last_online'], 2),
-                               'points'          => translateComma($content['points_amount'] - $content['points_used']),
+                               'points'          => ($content['points_amount'] - $content['points_used']),
                                'remote_addr'     => $content['remote_addr'],
                        );
 
index 3709b0f646a7ed18cc7bef52c5b7e77236ba2d5e..7375e79285c7b3ebcd28b3e5fd5ec9ffab57adda 100644 (file)
@@ -142,21 +142,11 @@ if (isFormSent('add')) {
        $OUT = '';
        foreach (postRequestParameter('id') as $id => $sel) {
                // Load entry
-               $result = SQL_QUERY_ESC("SELECT `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `id`='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `id`, `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `id`=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
-                       list($name, $rate, $min, $curr) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);
-
-                       // Transfer data to array
-                       $content = array(
-                               'id'   => bigintval($id),
-                               'name' => htmlspecialchars($name),
-                               'rate' => translateComma($rate),
-                               'min'  => bigintval($min),
-                               'curr' => htmlspecialchars($curr)
-                       );
+                       $content = SQL_FETCHARRAY($result);
 
                        if (isFormSent('edit')) {
                                // Edit entry
@@ -169,6 +159,9 @@ if (isFormSent('add')) {
                        // Entry invalid
                        $OUT .= loadTemplate('admin_list_sponsor_pay_404', true, $id);
                }
+
+               // Free result
+               SQL_FREERESULT($result);
        } // END - foreach
 
        // Load main template depending on mode (edit/delete)
@@ -196,15 +189,6 @@ ORDER BY
 
                // List alle found payment types
                while ($content = SQL_FETCHARRAY($result)) {
-                       // Remember data in array
-                       $content = array(
-                               'id'       => $content['id'],
-                               'name'     => $content['pay_name'],
-                               'rate'     => translateComma($content['pay_rate']),
-                               'min'      => $content['pay_min_count'],
-                               'currency' => $content['pay_currency']
-                       );
-
                        // Add row
                        $OUT .= loadTemplate('admin_list_sponsor_pay_row', true, $content);
                } // END - while
index cbf68bdaebdfe534c45a473f3a031b2351eed7d5..2f73c933e6c23f1b352439f277155cd11bb81515 100644 (file)
@@ -77,8 +77,8 @@ foreach ($DATA['tables'] as $row_array) {
                'tpl' => $row_array[0],
                'rep' => $REP,
                'opt' => $OPT,
-               'sum' => translateComma($row_array[3]),
-               'sav' => translateComma($row_array[4]),
+               'sum' => $row_array[3],
+               'sav' => $row_array[4],
        );
 
        // Load row template and switch color
@@ -88,13 +88,9 @@ foreach ($DATA['tables'] as $row_array) {
 // Remember rows
 $content['rows'] = $OUT;
 
-// Prepare data for the template
-$content['total_tabs']      = $DATA['total_tabs'];
-$content['total_size']      = translateComma($DATA['total_size']);
-$content['total_rows']      = $DATA['total_rows'];
-$content['total_optimized'] = translateComma($DATA['total_opti']);
+// Transfer data to $content for template
+$content = merge_array($content, $DATA);
 $content['now_optimized']   = $gain_tabs;
-$content['now_saved']       = translateComma($DATA['total_gain']);
 
 // Load main template
 loadTemplate('admin_optimize', false, $content);
index e5bf264a68f9f42945c946dd504861bb26b72afb..7edb41e4b9b2afd6a5f6ee9631ae87a906cb6c8e 100644 (file)
@@ -144,18 +144,8 @@ if (isFormSent()) {
 
                // List already existing categories for editing
                while ($content = SQL_FETCHARRAY($result)) {
-                       // Prepare array for the row template
-                       // @TODO Rewritings: title->mail_title in template
-                       $content = array(
-                               'id'      => $content['id'],
-                               'time'    => $content['time'],
-                               'title'   => $content['mail_title'],
-                               'payment' => translateComma($content['payment']),
-                               'price'   => translateComma($content['price'])
-                       );
-
                        // Load row template and switch colors
-                       $OUT .= loadTemplate('admin_payments_list_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_payments_row', true, $content);
                } // END - switch
 
                // Free memory
index 7332b032cd316c8d15444f4f1b8cdfa6f4c82aa1..33635e8eefc61e91bccfdeef8d397c197d37d9ec 100644 (file)
@@ -57,17 +57,23 @@ if (isFormSent()) {
        switch (getRequestParameter('mode')) {
                case 'add':
                        // Check if banner is already added
-                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE url='%s' LIMIT 1",
-                       array(postRequestParameter('url')), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `url`='%s' LIMIT 1",
+                               array(postRequestParameter('url')), __FILE__, __LINE__);
+
+                       // Was the banner found?
                        if (SQL_HASZERONUMS($result)) {
                                // Add banner
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refbanner` (url, alternate, visible)
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refbanner` (`url`, `alternate`, `visible`)
 VALUES ('%s','%s','%s')",
-                               array(postRequestParameter('url'), postRequestParameter('alternate'), postRequestParameter('visible')), __FILE__, __LINE__);
-                       } else {
-                               // Free memory
-                               SQL_FREERESULT($result);
-                       }
+                                       array(
+                                               postRequestParameter('url'),
+                                               postRequestParameter('alternate'),
+                                               postRequestParameter('visible')
+                                       ), __FILE__, __LINE__);
+                       } // END - if
+
+                       // Free memory
+                       SQL_FREERESULT($result);
                        break;
 
                case 'edit': // Update banner
@@ -76,7 +82,7 @@ VALUES ('%s','%s','%s')",
                                $id = bigintval($id);
 
                                // Update entry
-                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET url='%s', alternate='%s', `visible`='%s' WHERE `id`=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `url`='%s', `alternate`='%s', `visible`='%s' WHERE `id`=%s LIMIT 1",
                                        array(
                                                postRequestParameter('url', $id),
                                                postRequestParameter('alternate', $id),
@@ -103,18 +109,13 @@ VALUES ('%s','%s','%s')",
        $OUT = '';
        foreach (postRequestParameter('sel') as $id => $sel) {
                // Load data
-               $result = SQL_QUERY_ESC("SELECT url, alternate, visible FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `id`=%s LIMIT 1",
-               array(bigintval($id)), __FILE__, __LINE__);
-               list($url, $alt, $vis) = SQL_FETCHROW($result);
+               $result = SQL_QUERY_ESC("SELECT `url`, `alternate`, `visible` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($result);
                SQL_FREERESULT($result);
 
                // Preapre data for the row
-               $content = array(
-                       'id'  => $id,
-                       'url' => $url,
-                       'alt' => $alt,
-                       'vis' => addSelectionBox('yn', $vis   , 'visible'),
-               );
+               $content['visible'] => addSelectionBox('yn', $content['visible'], 'visible');
 
                // Load row template and switch color
                $OUT .= loadTemplate('admin_refbanner_edit_row', true, $content);
@@ -132,24 +133,13 @@ VALUES ('%s','%s','%s')",
        } // END - if
 
        // Referal levels
-       $result = SQL_QUERY("SELECT id, url, alternate, visible, counter, clicks FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY url", __FILE__, __LINE__);
+       $result = SQL_QUERY('SELECT `id`, `url`, `alternate`, `visible`, `counter`, `clicks` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `url` ASC', __FILE__, __LINE__);
 
        // Entries found?
        if (SQL_NUMROWS($result) > 0) {
                // Make referal banner editable and deletable
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
-                       // Preapre data for the row
-                       // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template
-                       $content = array(
-                               'id'  => $content['id'],
-                               'url' => $content['url'],
-                               'alt' => $content['alternate'],
-                               'vis' => translateYesNo($content['visible']),
-                               'cnt' => $content['counter'],
-                               'clx' => $content['clicks']
-                       );
-
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_refbanner_row', true, $content);
                } // END - while
@@ -159,7 +149,7 @@ VALUES ('%s','%s','%s')",
 
                // Load main template
                loadTemplate('admin_refbanner', false, $OUT);
-       }
+       } // END - if
 
        // Form for adding new referal levels
        loadTemplate('admin_add_banner');
index cb65b59a0a650fe3493ddbc6dcd87f5fc7f532a6..dadf87c61088f8c6a3b49e4c5ed247d1f3e76747 100644 (file)
@@ -102,9 +102,8 @@ foreach ($validLanguages as $lang) {
 
                                // Prepare content
                                $content = array(
+                                       'inc'          => $INC,
                                        'source'       => $langFile,
-                                       'target'       => basename($INC),
-                                       'diff_count'   => translateComma(getLanguageComparisonDifference($INC)),
                                        'diff_content' => $diffContent,
                                );
 
@@ -114,8 +113,8 @@ foreach ($validLanguages as $lang) {
                } else {
                        // Not readable, prepare content
                        $content = array(
-                               'file'    => basename($INC),
-                               'lang'    => $lang,
+                               'inc'  => $INC,
+                               'lang' => $lang,
                        );
 
                        // Load template
@@ -127,9 +126,9 @@ foreach ($validLanguages as $lang) {
 // Preapre content
 $content = array(
        'rows'       => $OUT,
-       'file_count' => translateComma(count($langFiles)),
-       'total_diff' => translateComma($GLOBALS['lang_diff_count']['total']),
-       'total_msgs' => translateComma($GLOBALS['msg_count'][getCurrentLanguage()]),
+       'file_count' => count($langFiles),
+       'total_diff' => $GLOBALS['lang_diff_count']['total'],
+       'total_msgs' => $GLOBALS['msg_count'][getCurrentLanguage()],
 );
 
 // Load main template
index 804b4191fe19b88f46da179eb3601be0563ddd19..36b4b8a9adc9a8d0dc154b52e4fd61a17b7c5b45 100644 (file)
@@ -185,7 +185,7 @@ if (isExtensionActive('beg')) {
        // Clicks on beg links
        $data = array(
                'lang'  => '{--MEDIA_BEG_CLICKS--}',
-               'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, " AND `beg_clicks` > 0")
+               'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, ' AND `beg_clicks` > 0')
        );
        $OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data);
 }
@@ -197,24 +197,24 @@ if (isExtensionActive('doubler')) {
        // Add first line (count)
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_COUNT--}',
-               'value' => countSumTotalData('Y','doubler','id','completed', true, " AND `points` > 0"),
+               'value' => countSumTotalData('Y','doubler','id','completed', true, ' AND `points` > 0'),
        );
 
        // Add points
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_CPOINTS--}',
-               'value' => translateComma(countSumTotalData('Y','doubler','id','completed', false, " AND `points` > 0"))
+               'value' => countSumTotalData('Y','doubler','id','completed', false, ' AND `points` > 0')
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_WAITING--}',
-               'value' => translateComma(countSumTotalData('N','doubler','id','completed', true, " AND `points` > 0"))
+               'value' => countSumTotalData('N','doubler','id','completed', true, ' AND `points` > 0')
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
        $data = array(
                'lang'  => '{--MEDIA_DOUBLER_WPOINTS--}',
-               'value' => translateComma(countSumTotalData('N','doubler','id','completed', false, " AND `points` > 0"))
+               'value' => countSumTotalData('N','doubler','id','completed', false, ' AND `points` > 0')
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 }
@@ -277,7 +277,7 @@ ON t.userid=d.userid",
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_IN_POINTS--}',
-               'value' => translateComma($points_in)
+               'value' => $points_in
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
        $data = array(
@@ -287,7 +287,7 @@ ON t.userid=d.userid",
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
        $data = array(
                'lang'  => '{--MEDIA_TRANSFER_OUT_POINTS--}',
-               'value' => translateComma($points_out)
+               'value' => $points_out
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 } // END - if
index 400537f49510769214e37fd06c7d30458e422c9c..510dc049db5133f7cd5c7b3eb687bf4b1f32f4f1 100644 (file)
@@ -67,22 +67,8 @@ if (SQL_NUMROWS($result) > 0) {
        // Load all orders
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
-               // Is the ZIP code set? If not, set dashes
-               if (empty($content['zip'])) $content['zip'] =  '---';
-
                // Prepare content for output
-               // @TODO More usage of EL at this array
-               $content = array(
-                       'id'          => $content['id'],
-                       'cat'         => getCategory($content['cat_id']),
-                       'pay'         => getPaymentTitlePrice($content['payment_id']),
-                       'subject'     => $content['subject'],
-                       'url'         => generateDerefererUrl($content['url']),
-                       'timestamp'   => generateDateTime($content['timestamp'], 2),
-                       'target_send' => $content['target_send'],
-                       'type'        => translatePoolType($content['data_type']),
-                       'zip'         => $content['zip']
-               );
+               $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                // Load template
                $OUT .= loadTemplate('member_pool_row', true, $content);
index ac4d85671b1790e9729f2be0b4252f16a9b66f1e..1733c35b7ee11aba60a59a3f32e8259b806f6cae 100644 (file)
@@ -1155,7 +1155,7 @@ function displayParsingTime () {
        // @TODO This can be easily moved out after the merge from EL branch to this is complete
        $content = array(
                'run_time' => $runTime,
-               'sql_time' => translateComma(getConfig('sql_time') * 1000),
+               'sql_time' => (getConfig('sql_time') * 1000),
        );
 
        // Load the template
index b7447325826d6cec8971dd3ab737fb681676cd61..1c4762dab2a2906ee91ebfb2d81a48fb135be41d 100644 (file)
@@ -182,7 +182,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                                                'userid'  => $url_userid,
                                                                'type'    => $type,
                                                                'data'    => $urlId,
-                                                               'url'     => generateDerefererUrl($URL)
+                                                               'url'     => $URL
                                                        );
 
                                                        // Load template
index 9c3a2396006fb0ebff7fe1a940e68a24307c3708..ab961164ccfd1d0de07c1e692769acfc65ec132f 100644 (file)
@@ -8,7 +8,7 @@ Gebuchte URL: $content[url]
 Neue URL: $content[url]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index f2bd4695d9ad6c177ad37a85e9acba0f47199239..cfb93af6d78b9944abf767e4bba0315418209697 100644 (file)
@@ -7,7 +7,7 @@ Hier sind alle Daten dazu:
 URL: $content[url]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index 0f191cd9d77bbeabd22b29bfc2bf56463682b557..fbb685cf9616cee57c4dcad50af0510cd65bcd8a 100644 (file)
@@ -7,7 +7,7 @@ Hier sind alle Daten dazu:
 URL: $content[url]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index e6a4fed3504dfb1bcfe97b277423cc9b9276e0d1..f507f117cbc6062d71f1aeea809a705069d9c04a 100644 (file)
@@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id]
 URL angemeldet: $content[url_registered]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
index 4257d3d0b0b7a4b1153dc190602afffccddf5e54..8024ef525203ff067023ece3d1d958397c01eb34 100644 (file)
@@ -7,7 +7,7 @@ Hier sind alle Daten von der URL:
 Gebuchte URL: $content[url]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index 0bfba32a458692c6e1747275d13c7c6fe7ae9302..6120511e4df821e6f757c5ea7b10c9054751dae0 100644 (file)
@@ -9,7 +9,7 @@ Gebuchte URL: $content[url]
 Email: {%user,email=$userid%}
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index d2f0a747a8cac114e3d27b2525f7a2ffbbf67f14..45acebda85ad03d9115170bc94425575bf2f6aa9 100644 (file)
@@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id]
 URL angemeldet: $content[url_registered]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Zuletzt gesperrt: $content[url_last_locked]
 ------------------------------------------
index d598612b7bce5a2f31d437c2c80aefb81b6d9108..c29bf28e9f76e1cf134711f5ba217bd04207f837 100644 (file)
@@ -9,7 +9,7 @@ Gebuchte URL: $content[url]
 Email: {%user,email=$userid%}
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index 4d2051f37f8cf6c96c77670750b6d5ff8157576d..9f7561a420bd238c47153e828e247b0a19ee9926 100644 (file)
@@ -9,7 +9,7 @@ Gebuchte URL: $content[url]
 Email: {%user,email=$userid%}
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index bb62b7f30ec57574e163fb984d2253e290e65410..d917c5917184478a200f8454019b38301bbeeec3 100644 (file)
@@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id]
 URL angemeldet: $content[url_registered]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
index 928301903809cbe830e332be413d19295898a5db..f47a481c453184ee90dd1dbe3dcd4f69c9b6075a 100644 (file)
@@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id]
 URL angemeldet: $content[url_registered]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
index d6298bb23eb27d9a62f17b39705544c3d111d27b..f5148e9805d209d23d4539cb35b1f91e13a30506 100644 (file)
@@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id]
 URL angemeldet: $content[url_registered]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
index 41c71e8dbeedcce48f36bf4631396d613d745f45..eb5cc1dd5288b7f99208b761c2255d57a902ae59 100644 (file)
@@ -9,7 +9,7 @@ Gebuchte URL: $content[url]
 Email: {%user,email=$userid%}
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index d9d31011d6b66d3fa6d92aea7e0d6a805f7400f5..70819514d3108f954bbfea878421c74b634a96df 100644 (file)
@@ -7,7 +7,7 @@ Hier sind alle Daten von der URL:
 Gebuchte URL: $content[url]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index 8ab181872c623144f67710b31ebf8deef4d8aa7c..f4ab7b52db9d083b4a0be3da24e2fd96d1d0716a 100644 (file)
@@ -17,7 +17,7 @@ ID in der Surfbar: $content[url_id]
 URL angemeldet: $content[url_registered]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%}
 ------------------------------------------
index 6110c92bdb19de5210886a2b812a1e8ebacd6e39..ef9794c4bd2ccabcae586d4e45560f390ebcc128 100644 (file)
@@ -7,7 +7,7 @@ Hier sind alle Daten aus der Mail:
 Gebuchte URL: $content[url]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}
 ------------------------------------------
index 40f99408fda8426f347f77e8f122705a9afa54e6..fcad34d6be99be7a8348c0d78d82e2ace56b82b6 100644 (file)
@@ -7,7 +7,7 @@ Hier sind alle Daten dazu:
 URL: $content[url]
 ------------------------------------------
 Framekiller-Test:
-$content[frametester]
+{%pipe,generateFrametesterUrl=$content[url]%}
 ------------------------------------------
 Mitglieder-Id: $content[url_userid]
 ------------------------------------------
index 4897d49ee06ab281f9eb2f5a7eb62b0391e0a341..e4d72ce4dbfb52adcde3293f49e42d481673c690 100644 (file)
@@ -4,12 +4,12 @@
                <input type="hidden" name="sel[$content[id]]" value="1" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[title]
+               $content[type]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[rate]
+               {%pipe,translateComma=$content[rate]%}
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[min_points]
+               {%pipe,translateComma=$content[min_points]%}
        </td>
 </tr>
index e4a29cb7ae2aa79a09ece24fa9a91cccab39abc9..8bdafaa2bcc298a92369997bf794e0078f447cbb 100644 (file)
@@ -4,15 +4,15 @@
                <input type="hidden" name="sel[$content[id]]" value="1" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" name="title[$content[id]]" class="admin_normal" value="$content[title]" size="20" maxlength="255" />
+               <input type="text" name="type[$content[id]]" class="admin_normal" value="$content[type]" size="20" maxlength="255" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" name="rate[$content[id]]" class="admin_normal" value="$content[rate]" size="5" maxlength="10" />
+               <input type="text" name="rate[$content[id]]" class="admin_normal" value="{%pipe,translateComma=$content[rate]%}" size="5" maxlength="10" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" name="min_points[$content[id]]" class="admin_normal" value="$content[min_points]" size="5" maxlength="10" />
+               <input type="text" name="min_points[$content[id]]" class="admin_normal" value="{%pipe,translateComma=$content[min_points]%}" size="5" maxlength="10" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
-               $content[allow]
+               $content[allow_url]
        </td>
 </tr>
index 1bac739f423e4136e1eade4ea57fd4a44534f49e..1266e3d55e40582cce1a2de3695fbd72b5b2c190 100644 (file)
@@ -3,15 +3,15 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" class="admin_normal" value="1" />
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[from_account]
+               $content[from_account]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[type]
+               $content[type]
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[rate]
+               {%pipe,translateComma=$content[rate]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom">
-               &nbsp;$content[min_points]
+               {%pipe,translateComma=$content[min_points]%}
        </td>
 </tr>
index 9881110db9d6f116eb174cc701da2635fca646f1..c3785a6fd55dca9a2cd48deb7d1ae0bded58a061 100644 (file)
@@ -1,17 +1,17 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               <input type="checkbox" title="{--ID_SELECT--} $content[id]" class="admoin_normal" name="sel[$content[id]]" value="$content[act_val]" />
+               <input type="checkbox" title="{--ID_SELECT--} $content[ext_id]" class="admoin_normal" name="sel[$content[ext_id]]" value="$content[ext_active]" />
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;&nbsp;$content[name]
+               $content[ext_name]
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               $content[css]
+               $content[ext_css]
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
-               $content[active]
+               {%pipe,translateYesNo=$content[ext_active]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom" align="center">
-               &nbsp;&nbsp;v$content[ver]
+               v$content[ext_version]
        </td>
 </tr>
index 404e2061be9b7afe9c5d554be3b28ac57b9dd7e6..ad3ea264cd7ca31f2087b68d37da4c404cfe22fc 100644 (file)
@@ -2,5 +2,5 @@
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[link]</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[subject]</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[timestamp]</td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">$content[cat]</td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">{%pipe,getCategory=$content[cat_id]%}</td>
 </tr>
diff --git a/templates/de/html/admin/admin_list_payments_row.tpl b/templates/de/html/admin/admin_list_payments_row.tpl
new file mode 100644 (file)
index 0000000..9c93769
--- /dev/null
@@ -0,0 +1,17 @@
+<tr>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">
+               <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
+       </td>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">
+               $content[time] {--_SECONDS--}
+       </td>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">
+               {%pipe,translateComma=$content[payment]%}
+       </td>
+       <td align="center" class="bottom right {%template,ColorSwitch%}">
+               {%pipe,translateComma=$content[price]%}
+       </td>
+       <td align="center" class="bottom {%template,ColorSwitch%}">
+               $content[mail_title]
+       </td>
+</tr>
index 9ef5bbf588103f6ea3e17d0e27fb0ea606ea96ec..56edab981aac8599ad2674f07cefe1e65d930bae 100644 (file)
@@ -3,15 +3,15 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[id]" name="id[$content[id]]" class="admin_normal" value="1" />
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[name]
+               {%pipe,encodeEntities=$content[pay_name]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[rate]
+               {%pipe,translateComma=$content[pay_rate]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[min]
+               {%pipe,translateComma=$content[pay_min_count]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom">
-               &nbsp;$content[curr]
+               {%pipe,encodeEntities=$content[pay_currency]%}
        </td>
 </tr>
index 109145a0a19cb6f960ae6190a5d7197bdb5658e3..34f58226f15e5580b308a55f12a4ec49151858b5 100644 (file)
@@ -4,15 +4,15 @@
     <input type="hidden" name="id[$content[id]]" class="admin_normal" value="1" />
   </td>
   <td class="{%template,ColorSwitch%} bottom right">
-    &nbsp;<input type="text" name="name[$content[id]]" class="admin_normal" size="16" maxlength="255" value="$content[name]" />
+    &nbsp;<input type="text" name="name[$content[id]]" class="admin_normal" size="16" maxlength="255" value="$content[pay_name]" />
   </td>
   <td class="{%template,ColorSwitch%} bottom right">
-    &nbsp;<input type="text" name="rate[$content[id]]" class="admin_normal" size="19" maxlength="255" value="$content[rate]" />
+    &nbsp;<input type="text" name="rate[$content[id]]" class="admin_normal" size="19" maxlength="255" value="$content[pay_rate]" />
   </td>
   <td class="{%template,ColorSwitch%} bottom right">
-    &nbsp;<input type="text" name="min[$content[id]]" class="admin_normal" size="3" maxlength="20" value="$content[min]" />
+    &nbsp;<input type="text" name="min[$content[id]]" class="admin_normal" size="3" maxlength="20" value="$content[pay_min_count]" />
   </td>
   <td class="{%template,ColorSwitch%} bottom">
-    &nbsp;<input type="text" name="curr[$content[id]]" class="admin_normal" size="5" maxlength="255" value="$content[curr]" />
+    &nbsp;<input type="text" name="curr[$content[id]]" class="admin_normal" size="5" maxlength="255" value="$content[pay_currency]" />
   </td>
-</tr>
\ No newline at end of file
+</tr>
index 2cbe8ad1eed436097babe3d88e348696ceb547c3..56edab981aac8599ad2674f07cefe1e65d930bae 100644 (file)
@@ -3,15 +3,15 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[id]" name="id[$content[id]]" class="admin_normal" value="1" />
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[name]
+               {%pipe,encodeEntities=$content[pay_name]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[rate]
+               {%pipe,translateComma=$content[pay_rate]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom right">
-               &nbsp;$content[min]
+               {%pipe,translateComma=$content[pay_min_count]%}
        </td>
        <td class="{%template,ColorSwitch%} bottom">
-               &nbsp;$content[currency]
+               {%pipe,encodeEntities=$content[pay_currency]%}
        </td>
 </tr>
index 731d151424d420bae58216abf3a8d4a10728efad..2588a4c109a53d409649e25b9cc98eca890f4e14 100644 (file)
@@ -11,7 +11,7 @@
     <a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>
   </td>
   <td align="center" class="{%template,ColorSwitch%} bottom" width="160">
-    [<strong><a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points%}" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">$content[points]</a></strong>]
+    [<strong><a href="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points%}" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">{%pipe,translateComma=$content[points]%}</a></strong>]
   </td>
 </tr>
 <tr>
index 0e4dd50d342eddd487244258924dca6bb63826d9..f67c421e93bce39df68816c8aa232e0bf568635b 100644 (file)
        <tr>
                <td colspan="5" class="admin_footer" style="padding-top: 15px; padding-bottom: 15px;">
                        {--OPTIMIZE_DB_TOTAL_TABLES--}: <strong>$content[total_tabs]</strong><br />
-                       {--OPTIMIZE_DB_TOTAL_SIZE--}: <strong>$content[total_size] {--KBYTES--}</strong><br />
+                       {--OPTIMIZE_DB_TOTAL_SIZE--}: <strong>{%pipe,translateComma=$content[total_size]%} {--KBYTES--}</strong><br />
                        {--OPTIMIZE_DB_TOTAL_OPTIMIZE--}: <strong>$content[total_rows]</strong><br />
-                       {--OPTIMIZE_DB_TOTAL_OPTI--}: <strong>$content[total_optimized] {--KBYTES--}</strong><br />
+                       {--OPTIMIZE_DB_TOTAL_OPTI--}: <strong>{%pipe,translateComma=$content[total_optimized]%} {--KBYTES--}</strong><br />
                        {--OPTIMIZE_DB_TOTAL_GAIN_TABLES--}: <strong>$content[now_optimized]</strong><br />
-                       {--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: <strong>$content[now_saved] {--KBYTES--}</strong>
+                       {--OPTIMIZE_DB_TOTAL_GAIN_SIZE--}: <strong>{%pipe,translateComma=$content[total_gain]%} {--KBYTES--}</strong>
                </td>
        </tr>
 </table>
index 45fb79dc642c4d0cfdfaa4cef9d4a5ed1f6283b9..4f71237617318de64450222480d8c05ff0caefeb 100644 (file)
@@ -2,6 +2,6 @@
        <td class="{%template,ColorSwitch%} bottom right">$content[b1]$content[tpl]$content[b2]</td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[b1]$content[rep]$content[b2]</td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[b1]$content[opt]$content[b2]</td>
-       <td class="{%template,ColorSwitch%} bottom right">$content[b1]$content[sum]$content[b2]</td>
-       <td class="{%template,ColorSwitch%} bottom">$content[b1]$content[sav]$content[b2]</td>
+       <td class="{%template,ColorSwitch%} bottom right">$content[b1]{%pipe,translateComma=$content[sum]%}$content[b2]</td>
+       <td class="{%template,ColorSwitch%} bottom">$content[b1]{%pipe,translateComma=$content[sav]%}$content[b2]</td>
 </tr>
index 84d163389d728b993a5a717f580dc89ab5a25b10..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
@@ -1,17 +1 @@
-<tr>
-       <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
-       </td>
-       <td align="center" class="bottom right {%template,ColorSwitch%}">
-               $content[time] {--_SECONDS--}
-       </td>
-       <td align="center" class="bottom right {%template,ColorSwitch%}">
-               {%pipe,translateComma=$content[pay]%}
-       </td>
-       <td align="center" class="bottom right {%template,ColorSwitch%}">
-               $content[price]
-       </td>
-       <td align="center" class="bottom {%template,ColorSwitch%}">
-               $content[title]
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index c0efe41e0a4aa1a0b6f140cd62772250cba7c985..970d53bd4165843d634fedf251f7f852b0563bdf 100644 (file)
@@ -5,7 +5,7 @@
 </tr>
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom">
-               $content[percents]% <span class="tiny">({--ID_SELECT--} $content[id])</span>
+               {%pipe,translateComma=$content[percents]%}% <span class="tiny">({--ID_SELECT--} $content[id])</span>
                <input type="hidden" name="id[$content[id]]" value="1" />
        </td>
 </tr>
index 0a304caacf5f22c4e7b4ac1aa0e6078768ef81fc..54d76f2c3cdee765760031994d2a09108e59b439 100644 (file)
@@ -12,6 +12,6 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom" align="right">{--REF_PERCENT--}:&nbsp;</td>
        <td class="{%template,ColorSwitch%} bottom" align="left">
-               <input type="text" name="perc[$content[id]]" class="admin_normal" value="$content[percents]" size="3" maxlength="5" />&#37;
+               <input type="text" name="perc[$content[id]]" class="admin_normal" value="{%pipe,translateComma=$content[percents]%}" size="3" maxlength="5" />&#37;
        </td>
 </tr>
index 14b7106ec41aaff63ad2795d7064697bad092288..284c3020bf69aad2f1e63e482c40f8ab111fe779 100644 (file)
@@ -8,10 +8,10 @@
 <tr>
        <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_EDIT_ALTERNATE--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" name="alternate[$content[id]]" class="admin_normal" value="$content[alt]" size="30" maxlength="255" />
+               <input type="text" name="alternate[$content[id]]" class="admin_normal" value="$content[alternate]" size="30" maxlength="255" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%} bottom" align="right">{--ADMIN_SELECT_BANNER_ACTIVE--}:</td>
-       <td class="{%template,ColorSwitch%} bottom">$content[vis]</td>
+       <td class="{%template,ColorSwitch%} bottom">$content[visible]</td>
 </tr>
index 1364e053d59e811205005422e1463a5a1f0f1846..6985e4c66bf6228c2fc6fc47300af0c8a966afbe 100644 (file)
@@ -6,15 +6,15 @@
                <img src="$content[url]" alt="$content[alt]" border="0" title="$content[alt]" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[alt]
+               $content[alternate]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[cnt]
+               {%pipe,translateComma=$content[cnt]%}
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[clx]
+               {%pipe,translateComma=$content[clicks]%}
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom" colspan="2">
-               $content[vis]
+               {%pipe,translateYesNo=$content[visible]%}
        </td>
 </tr>
index 19cbc104ce4af2f9fd06b02448280db6005147b2..be556ed16e7ac9da9b78907347f144fd4519d0da 100644 (file)
@@ -7,9 +7,9 @@
                $content[rows]
        </div>
        <div class="admin_footer">
-               Es wurden <span class="data">$content[file_count]</span> Sprachdateien
-               analysiert. Dabei wurden <span class="data">$content[total_msgs]</span>
-               Sprachelemente untersucht und <span class="data">$content[total_diff]</span>
+               Es wurden <span class="data">{%pipe,translateComma=$content[file_count]%}</span> Sprachdateien
+               analysiert. Dabei wurden <span class="data">{%pipe,translateComma=$content[total_msgs]%}</span>
+               Sprachelemente untersucht und <span class="data">{%pipe,translateComma=$content[total_diff]%}</span>
                Unterschiede an allen gefundenen Dateien entdeckt.
        </div>
 </div>
index 128a5cbe43b6e206f322c8979b659da81de0da20..bf8b413c3183b080168b670c9a2acb01b8de455c 100644 (file)
@@ -1,6 +1,8 @@
 <div class="{%template,ColorSwitch%} bottom2">
        <div>
-               Das Sprachpaket <span class="data">$content[file]</span> (Sprache:
-               <span class="data">$content[lang]</span>) wurde nicht gefunden.
+               Das Sprachpaket
+               <span class="data">{%pipe,basename=$content[inc]%}</span>
+               (Sprache: <span class="data">$content[lang]</span>)
+               wurde nicht gefunden.
        </div>
 </div>
index 5295a164c05f39f0b163e27563acc64161787ec6..9f65a812fd932fe2714d0f2d25935cdcf54962ca 100644 (file)
@@ -1,6 +1,6 @@
 <div class="{%template,ColorSwitch%} bottom2">
        <div>
-               Das Sprachpaket <span class="data">$content[target]</span> hat <span class="data">$content[diff_count]</span> Unterschiede zu <span class="data">$content[source]</span>:
+               Das Sprachpaket <span class="data">{%pipe,basename=$content[inc]%}</span> hat <span class="data">{%pipe,getLanguageComparisonDifference,translateComma=$content[inc]%}</span> Unterschiede zu <span class="data">$content[source]</span>:
        </div>
        <div>
                <strong>Nicht gefundene Sprachelemente:</strong>
index 99315fae34adcf49a389331fb2fc0d0b909f3fae..d2a119bfbfae949f8c10f7d47be5788e3dd2cae4 100644 (file)
@@ -1,6 +1,6 @@
 <frameset rows="120,*" frameborder="no" framespacing="0" border="0">
        <frame name="mailid_top" src="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]%}" />
-       <frame name="mailid_url" src="$content[url]" />
+       <frame name="mailid_url" src="{%pipe,generateDerefererUrl=$content[url]%}" />
 </frameset>
 <noframes>
        Ihr Browser unterst&uuml;tzt keine frames!
index 8d78b9ccab314bc7236598e44fb7aaeb3b807cac..d221fe99971739b76024309f231d02d699a29825 100644 (file)
@@ -1,4 +1,4 @@
 <tr>
        <td class="bottom media_left" align="right">$content[lang]:</td>
-       <td class="bottom media_right">$content[value]</td>
+       <td class="bottom media_right">{%pipe,translateComma=$content[value]%}</td>
 </tr>
index 8d78b9ccab314bc7236598e44fb7aaeb3b807cac..d221fe99971739b76024309f231d02d699a29825 100644 (file)
@@ -1,4 +1,4 @@
 <tr>
        <td class="bottom media_left" align="right">$content[lang]:</td>
-       <td class="bottom media_right">$content[value]</td>
+       <td class="bottom media_right">{%pipe,translateComma=$content[value]%}</td>
 </tr>
index 785ddb08add31fcdf1e5b033b09ed673c2045b65..053c2ee469864d06f02e1c3e3862323abef1d23f 100644 (file)
 <tr>
        <td align="center" class="switch_mem$content[sw] top right">
                {--EMAIL_PAYMENT--}:<br />
-               <strong>{%pipe,translateComma=$content[pay]%}</strong>
+               <strong>{%pipe,translateComma=$content[payment_id]%}</strong>
        </td>
        <td align="center" class="switch_mem$content[sw] top right">
                {--EMAIL_CATEGORY--}:<br />
-               <strong>$content[cat]</strong>
+               <strong>{%pipe,getCategory=$content[cat_id]%}</strong>
        </td>
        <td align="center" class="switch_mem$content[sw] top">
                {--EMAIL_URL--}:<br />
-               <strong><a href="$content[url]" target="_blank">{--MEMBER_TEST_URL--}</a></strong>
+               <strong><a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank">{--MEMBER_TEST_URL--}</a></strong>
        </td>
 </tr>
 <tr>
        </td>
        <td align="center" class="switch_mem$content[sw] top right">
                {--EMAIL_TYPE--}:<br />
-               <strong>$content[type]</strong>
+               <strong>{%pipe,translatePoolType=$content[data_type]%}</strong>
        </td>
        <td align="center" class="switch_mem$content[sw] top">
                {--EMAIL_ZIP--}:<br />
-               <strong>$content[zip]</strong>
+               <strong>{%pipe,fixEmptyContentToDashes=$content[zip]%}</strong>
        </td>
 </tr>
index cfa2d464daad64a0cadd009d1f4b233d735d7f8b..5e888f641417dcd28d6c298b0e82c071f6e4c718 100644 (file)
@@ -10,7 +10,7 @@
        </span></li>
        <li class="show_timings_column" style="margin-left: 2px"><span class="show_timings_column">
                {--SHOW_TIMINGS_SQL_TIME--}
-               <span class="show_timings_data">$content[sql_time] ms</span>
+               <span class="show_timings_data">{%pipe,translateComma=$content[sql_time]%} ms</span>
        </span></li>
        <li class="show_timings_column" style="margin-right: 2px"><span class="show_timings_column">
                {--SHOW_TIMINGS_NUM_TEMPLATES--}