Several array indexes renamed, TODOs.txt updated
authorRoland Häder <roland@mxchange.org>
Thu, 29 Oct 2009 00:49:24 +0000 (00:49 +0000)
committerRoland Häder <roland@mxchange.org>
Thu, 29 Oct 2009 00:49:24 +0000 (00:49 +0000)
26 files changed:
DOCS/TODOs.txt
inc/modules/admin/overview-inc.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-config_points.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-edit_emails.php
inc/modules/admin/what-email_archiv.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-unlock_emails.php
inc/modules/member/what-stats.php
templates/de/html/admin/admin_add_reflevel.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_del_email_bonus.tpl
templates/de/html/admin/admin_del_email_normal.tpl
templates/de/html/admin/admin_del_email_notify.tpl
templates/de/html/admin/admin_edit_email.tpl
templates/de/html/admin/admin_edit_email_row.tpl
templates/de/html/admin/admin_email_archiv_row.tpl
templates/de/html/admin/admin_list_links_row.tpl
templates/de/html/admin/admin_overview_row.tpl
templates/de/html/admin/admin_payout_add_new.tpl
templates/de/html/admin/admin_unlock_emails_row.tpl
templates/de/html/member/member_pool_row.tpl
templates/de/html/member/member_stats_row.tpl

index 1d042b9..d06dea0 100644 (file)
@@ -3,7 +3,7 @@
 ./beg.php:191:                 // @TODO Opps, what is missing here???
 ./birthday_confirm.php:93:             // @TODO Try to rewrite the following unset()
 ./inc/cache/config-local.php:122:// @TODO Rewrite the following three constants, somehow...
-./inc/classes/cachesystem.class.php:473:       // @TODO Add support for more types which break in last else-block
+./inc/classes/cachesystem.class.php:461:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:157:        // @TODO Make this all better... :-/
 ./inc/config-functions.php:332:                // @TODO Find a way for updating configuration here
 ./inc/extensions/ext-html_mail.php:140:                // @TODO Move these arrays into config
 ./inc/extensions-functions.php:370:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:481:            // @TODO Extension is loaded, what next?
 ./inc/footer.php:47:   // @TODO Rewrite these all into filters
-./inc/functions.php:1339:      // @TODO Remove this if() block if all is working fine
+./inc/functions.php:1346:      // @TODO Remove this if() block if all is working fine
 ./inc/functions.php:222:       // @TODO Remove this sanity-check if all is fine
 ./inc/functions.php:225:       // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2336:// @TODO Try to move this to inc/libs/theme_functions.php
-./inc/functions.php:2375:      // @TODO The status should never be empty
-./inc/functions.php:2507:// @TODO Please describe this function
-./inc/functions.php:2525:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
-./inc/functions.php:2610:              // @TODO Add a little more infos here
-./inc/functions.php:2621:      // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
+./inc/functions.php:2343:// @TODO Try to move this to inc/libs/theme_functions.php
+./inc/functions.php:2382:      // @TODO The status should never be empty
+./inc/functions.php:2514:// @TODO Please describe this function
+./inc/functions.php:2532:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
+./inc/functions.php:2617:              // @TODO Add a little more infos here
+./inc/functions.php:2628:      // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
 ./inc/functions.php:264:                               // @TODO Find all templates which are using these direct variables and rewrite them.
 ./inc/functions.php:265:                               // @TODO After this step is done, this else-block is history
-./inc/functions.php:2703:                      // @TODO Rewrite this old lost code to a template
-./inc/functions.php:2822:                      // @TODO Are these convertions still required?
-./inc/functions.php:2840:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:2710:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2829:                      // @TODO Are these convertions still required?
+./inc/functions.php:2847:// @TODO Rewrite this function to use readFromFile() and writeToFile()
 ./inc/functions.php:581:               // @TODO Extension 'msg' does not exist
 ./inc/functions.php:658:// @TODO Rewrite this to an extension 'smtp'
 ./inc/install-functions.php:62:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
@@ -44,7 +44,7 @@
 ./inc/language/sponsor_de.php:118:// @TODO Rewrite these four constants to one and use sprintf()
 ./inc/libs/admins_functions.php:418:           // @TODO This can be, somehow, rewritten
 ./inc/libs/beg_functions.php:57:               // @TODO Try to rewrite the following unset()
-./inc/libs/bonus_functions.php:187:                    // @TODO Try to find a way for rewriting this constant
+./inc/libs/bonus_functions.php:206:                    // @TODO Try to find a way for rewriting this constant
 ./inc/libs/doubler_functions.php:45:// @TODO Lame description
 ./inc/libs/rallye_functions.php:699:   $EXPIRE = 3; // @TODO The hard-coded value...
 ./inc/libs/rallye_functions.php:763:           // @TODO Rewrite this to our API function
 ./inc/modules/admin/what-chk_regs.php:65:              // @TODO Rewritings: surname->surname,family->family,ip->REMOTE_ADDR,ref->refid,hash->user_hash in template
 ./inc/modules/admin/what-config_admins.php:148:        // @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-config_mods.php:137:          // @TODO Rewritings: mod->module in template
-./inc/modules/admin/what-config_payouts.php:215:               // @TODO Rewrite in template: mpoi->min_points,from->from_account
 ./inc/modules/admin/what-config_rallye_prices.php:202:                         // @TODO Rewritings: level->price_level, infos->info in template
 ./inc/modules/admin/what-config_rallye_prices.php:219:                 // @TODO Rewrite these two constants
 ./inc/modules/admin/what-config_rallye_prices.php:254:                 // @TODO Rewritings: admin_id->admin_id, alogin->login in template
 ./inc/modules/admin/what-config_register.php:67:       // @TODO Move this HTML code into a template
-./inc/modules/admin/what-edit_emails.php:99:                   // @TODO Rewritings: subj->subject in template
 ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country                                    *
 ./inc/modules/admin/what-email_archiv.php:91:  // @TODO Rewrite to SQL_FETCHARRAY()
 ./inc/modules/admin/what-email_stats.php:47:// @TODO Unused at the moment
 ./inc/modules/admin/what-payments.php:151:                     // @TODO Rewritings: title->mail_title, pay->payment in template
 ./inc/modules/admin/what-refbanner.php:145:                    // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template
 ./inc/modules/admin/what-unlock_emails.php:101:                                        // @TODO Rewrite these if-blocks to a filter
-./inc/modules/admin/what-unlock_emails.php:211:                        // @TODO Rewrite in template: subj->subject,ordered->timestamp,tsend->target_send
 ./inc/modules/admin/what-unlock_sponsor.php:191:               // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template
 ./inc/modules/admin/what-usage.php:87: // @TODO This code is double, see LOAD_TEMPLATE and loadEmailTemplate in functions.php
 ./inc/modules/admin/what-usage.php:98: // @TODO Disabled due to too much trouble
 ./inc/wrapper-functions.php:134:// @TODO Implement $decompress
 ./inc/wrapper-functions.php:396:// @TODO Do some more sanity check here
 ./mailid.php:135:                                      // @TODO Rewrite this to a filter
-./mailid.php:216:      // @TODO Rewrite this to a dynamic include or so
+./mailid.php:215:      // @TODO Rewrite this to a dynamic include or so
 ./mailid.php:94:               // @TODO Rewrite this to a filter
-./mailid_top.php:139:                                  // @TODO Rewrite this to a filter
-./mailid_top.php:187:                                                  // @TODO Rewrite this to a filter
-./mailid_top.php:194:                                                                  // @TODO Rewrite this to a filter
-./mailid_top.php:230:                                                                  // @TODO Rewrite these blocks to filter
-./mailid_top.php:265:                                                                          // @TODO Try to rewrite the following unset()
+./mailid_top.php:135:                                  // @TODO Rewrite this to a filter
+./mailid_top.php:182:                                                  // @TODO Rewrite this to a filter
+./mailid_top.php:189:                                                                  // @TODO Rewrite this to a filter
+./mailid_top.php:225:                                                                  // @TODO Rewrite these blocks to filter
+./mailid_top.php:260:                                                                          // @TODO Try to rewrite the following unset()
 ./mailid_top.php:92:           // @TODO Rewrite this to a filter
 ./view.php:72:         // @TODO No banner found, output some default banner
 ### ### DEPRECATION FOLLOWS: ### ###
index 957e836..eb26099 100644 (file)
@@ -261,7 +261,7 @@ LIMIT 1",
                                // Prepare array for the template
                                $content = array(
                                        'sw'        => $SW,
-                                       'subj'      => $subj,
+                                       'subject'   => $subj,
                                        'add'       => $add,
                                        'text'      => $text,
                                        'created'   => generateDateTime($created, '1'),
index 526b80d..b0c094b 100644 (file)
@@ -58,7 +58,7 @@ VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
                array(
                        postRequestElement('title'),
                        bigintval(postRequestElement('rate')),
-                       bigintval(postRequestElement('mpoi')),
+                       bigintval(postRequestElement('min_points')),
                        postRequestElement('yacc'),
                        postRequestElement('ypass'),
                        postRequestElement('yurl'),
@@ -106,7 +106,7 @@ WHERE `id`='".$id."' LIMIT 1",
                                array(
                                        postRequestElement('title', $id),
                                        convertCommaToDot(postRequestElement('rate', $id)),
-                                       convertCommaToDot(postRequestElement('mpoi' , $id)),
+                                       convertCommaToDot(postRequestElement('min_points' , $id)),
                                        postRequestElement('allow', $id),
                                ),__FILE__, __LINE__, false));
                        }
@@ -124,7 +124,7 @@ WHERE `id`='".$id."' LIMIT 1",
                        // 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, $mpoi, $allow) = SQL_FETCHROW($result);
+                       list($title, $rate, $min_points, $allow) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
 
                        // Prepare data for the row template
@@ -133,7 +133,7 @@ WHERE `id`='".$id."' LIMIT 1",
                                'id'    => $id,
                                'title' => $title,
                                'rate'  => translateComma($rate),
-                               'mpoi'  => translateComma($mpoi),
+                               'min_points'  => translateComma($min_points),
                                'allow' => addSelectionBox('yn', $allow, "allow[".$id."]"),
                        );
 
@@ -172,7 +172,7 @@ WHERE `id`='".$id."' LIMIT 1",
                        // 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, $mpoi) = SQL_FETCHROW($result);
+                       list($title, $rate, $min_points) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
 
                        // Prepare data for the row template
@@ -181,7 +181,7 @@ WHERE `id`='".$id."' LIMIT 1",
                                'id'    => $id,
                                'title' => $title,
                                'rate'  => translateComma($rate),
-                               'mpoi'  => translateComma($mpoi),
+                               'min_points'  => translateComma($min_points),
                        );
 
                        // Load row template and switch color
@@ -212,14 +212,13 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result_type)) {
                // Prepare data for the row template
-               // @TODO Rewrite in template: mpoi->min_points,from->from_account
                $content = array(
-                       'sw'    => $SW,
-                       'id'    => $content['id'],
-                       'from => $content['from_account'],
-                       'type'  => $content['type'],
-                       'rate'  => translateComma($content['rate']),
-                       'mpoi'  => translateComma($content['min_points']),
+                       'sw'           => $SW,
+                       '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
index 53cbc18..d45ef8d 100644 (file)
@@ -59,7 +59,7 @@ if (isGetRequestElementSet('sub')) {
 
                case 'ref':
                        if (isGetRequestElementSet('do')) {
-                               if (((!isPostRequestElementSet(('level'))) || (!isPostRequestElementSet(('perc')))) && (getRequestElement('do') == 'add')) {
+                               if (((!isPostRequestElementSet(('level'))) || (!isPostRequestElementSet(('percents')))) && (getRequestElement('do') == 'add')) {
                                        unsetPostRequestElement('ok');
                                }
                        }
@@ -81,7 +81,7 @@ if (isFormSent()) {
                        switch (getRequestElement('do'))
                        {
                                case 'add':
-                                       addSql("INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (level, percents) VALUES ('".postRequestElement('level')."','".postRequestElement('perc')."')");
+                                       addSql("INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES ('".postRequestElement('level')."','".postRequestElement('percents')."')");
                                        break;
 
                                case 'edit': // Change entries
@@ -90,11 +90,11 @@ if (isFormSent()) {
                                                $id = bigintval($id);
 
                                                // Revert german commata
-                                               setRequestPostElement('perc', array($id => convertCommaToDot(postRequestElement('perc', $id))));
+                                               setRequestPostElement('percents', array($id => convertCommaToDot(postRequestElement('percents', $id))));
 
                                                // Update entry
-                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET level='%s', percents='%s' WHERE `id`=%s LIMIT 1",
-                                               array(bigintval($value), postRequestElement('perc', $id), $id), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`='%s', `percents`='%s' WHERE `id`=%s LIMIT 1",
+                                               array(bigintval($value), postRequestElement('percents', $id), $id), __FILE__, __LINE__);
                                        }
                                        $message = getMessage('REF_DEPTHS_SAVED');
                                        break;
index b4ede2d..42bb935 100644 (file)
@@ -60,12 +60,12 @@ if (isGetRequestElementSet('mid')) {
                $price = getPaymentPoints($payId, 'price');
 
                // Prepare data for the template
-               $content['id']      = $id;
-               $content['sender']  = generateUserProfileLink($sender);
-               $content['subject'] = $subject;
-               $content['url']     = generateDerefererUrl($url);
-               $content['url_raw'] = $url;
-               $content['ordered'] = generateDateTime($timestamp, '0');
+               $content['id']        = $id;
+               $content['sender']    = generateUserProfileLink($sender);
+               $content['subject']   = $subject;
+               $content['url']       = generateDerefererUrl($url);
+               $content['url_raw']   = $url;
+               $content['timestamp'] = generateDateTime($timestamp, '0');
 
                // Load template
                loadTemplate('admin_del_email_normal', false, $content);
@@ -161,7 +161,7 @@ LIMIT 1",
 } elseif (isGetRequestElementSet('pid')) {
        // Remove stats entries
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
-       array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__);
 
        // Output message
        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED'));
@@ -190,11 +190,11 @@ LIMIT 1",
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
-               $content['id']      = $id;
-               $content['subject'] = $subject;
-               $content['url']     = generateDerefererUrl($url);
-               $content['ordered'] = generateDateTime($timestamp, '0');
-               $content['cnt']     = $cnt;
+               $content['id']        = $id;
+               $content['subject']   = $subject;
+               $content['url']       = generateDerefererUrl($url);
+               $content['timestamp'] = generateDateTime($timestamp, '0');
+               $content['cnt']       = $cnt;
 
                // Load template
                loadTemplate('admin_del_email_bonus', false, $content);
@@ -227,11 +227,11 @@ LIMIT 1",
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
-               $content['id']      = $id;
-               $content['subject'] = $subject;
-               $content['url']     = generateDerefererUrl($url);
-               $content['ordered'] = generateDateTime($timestamp, '0');
-               $content['cnt']     = $cnt;
+               $content['id']        = $id;
+               $content['subject']   = $subject;
+               $content['url']       = generateDerefererUrl($url);
+               $content['timestamp'] = generateDateTime($timestamp, '0');
+               $content['cnt']       = $cnt;
 
                // Load template
                loadTemplate('admin_del_email_notify', false, $content);
index c03be85..314bab2 100644 (file)
@@ -77,7 +77,7 @@ WHERE
        `id`=%s
 LIMIT 1",
                        array(
-                               postRequestElement('subj'),
+                               postRequestElement('subject'),
                                postRequestElement('text'),
                                postRequestElement('url'),
                                bigintval(postRequestElement('id')),
@@ -96,14 +96,13 @@ LIMIT 1",
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare data for the row template
-                       // @TODO Rewritings: subj->subject in template
                        $content = array(
-                               'sw'   => $SW,
-                               'id'   => $content['id'],
-                               'subj' => $content['subject'],
+                               'sw'      => $SW,
+                               'id'      => $content['id'],
+                               'subject' => $content['subject'],
                                'userid'  => generateUserProfileLink($content['sender']),
-                               'pay'  => getPaymentTitlePrice($content['payment_id']),
-                               'cat'  => getCategory($content['cat_id']),
+                               'pay'     => getPaymentTitlePrice($content['payment_id']),
+                               'cat'     => getCategory($content['cat_id']),
                        );
 
                        // Load row template and switch colors
index 6474a7a..8456d5e 100644 (file)
@@ -107,15 +107,15 @@ if (SQL_NUMROWS($result) > 0) {
                $row = array(
                        'sw'          => $SW,
                        'u_link'      => generateUserProfileLink($pool[1]),
-                       'subj'        => $pool[2],
+                       'subject'     => $pool[2],
                        'text'        => $pool[3],
                        'pay'         => getPaymentTitlePrice($pool[5]),
                        'cat'         => getCategory($pool[10]),
                        'sent'        => $sent,
-                       'ruserids'       => str_replace(';', ", ", $pool[4]),
+                       'ruserids'    => str_replace(';', ", ", $pool[4]),
                        'unconfirmed' => $unconfirmed,
                        'type'        => translatePoolType($pool[6]),
-                       'tsend'       => $pool[9],
+                       'target_send' => $pool[9],
                        'frametester' => generateFrametesterUrl($pool[8]),
                        'url'         => $pool[8],
                        'stamp'       => generateDateTime($pool[7], '0'),
index 6e9ad7d..ed6be56 100644 (file)
@@ -131,11 +131,11 @@ if (isGetRequestElementSet('userid')) {
 
                                                // Prepare data for the row template
                                                $content = array(
-                                                       'sw'    => $SW,
-                                                       'link'  => $LINK,
-                                                       'subj => $subject,
-                                                       'stamp' => generateDateTime($timestamp, '0'),
-                                                       'cat'   => getCategory($cat),
+                                                       'sw'      => $SW,
+                                                       'link'    => $LINK,
+                                                       'subject' => $subject,
+                                                       'stamp'   => generateDateTime($timestamp, '0'),
+                                                       'cat'     => getCategory($cat),
                                                );
 
                                                // Load row template
index 658d487..fc99d0e 100644 (file)
@@ -208,21 +208,20 @@ LIMIT 1",
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Prepare data for the template
-                       // @TODO Rewrite in template: subj->subject,ordered->timestamp,tsend->target_send
                        $content = array(
-                               'sw'        => $SW,
-                               'id'        => $content['id'],
-                               'sender'    => $content['sender'],
-                               'u_link'    => generateUserProfileLink($content['sender']),
-                               'subj     => $content['subject'],
-                               'tester'    => generateFrametesterUrl($content['url']),
-                               'url'       => $content['url'],
-                               'cat_title' => str_replace("\"", '&quot;', getCategory($content['category'])),
-                               'cat_link'  => $content['category'],
-                               'pay_title' => str_replace("\"", '&quot;', getPaymentTitlePrice($content['payment'], true)),
-                               'pay_link'  => $content['payment'],
-                               'ordered'   => generateDateTime($content['timestamp'], '2'),
-                               'tsend'     => $content['target_send'],
+                               'sw'          => $SW,
+                               'id'          => $content['id'],
+                               'sender'      => $content['sender'],
+                               'u_link'      => generateUserProfileLink($content['sender']),
+                               'subject'     => $content['subject'],
+                               'tester'      => generateFrametesterUrl($content['url']),
+                               'url'         => $content['url'],
+                               'cat_title'   => str_replace("\"", '&quot;', getCategory($content['category'])),
+                               'cat_link'    => $content['category'],
+                               'pay_title'   => str_replace("\"", '&quot;', getPaymentTitlePrice($content['payment'], true)),
+                               'pay_link'    => $content['payment'],
+                               'timestamp'   => generateDateTime($content['timestamp'], '2'),
+                               'target_send' => $content['target_send'],
                        );
 
                        // Load row template and switch colors
index 14178a2..03242c0 100644 (file)
@@ -67,16 +67,16 @@ if (SQL_NUMROWS($result) > 0) {
                // Prepare content for output
                // @TODO Rewrite in template subj->subject,stamp->timestamp,recs->target_send
                $content = array(
-                       'sw'    => $SW,
-                       'id'    => $data['id'],
-                       'cat'   => getCategory($data['cat_id']),
-                       'pay'   => getPaymentTitlePrice($data['payment_id']),
-                       'subj => $data['subject'],
-                       'url'   => generateDerefererUrl($data['url']),
-                       'stamp' => generateDateTime($data['timestamp'], '2'),
-                       'recs'  => $data['target_send'],
-                       'type'  => translatePoolType($data['data_type']),
-                       'zip'   => $data['zip']
+                       'sw'      => $SW,
+                       'id'      => $data['id'],
+                       'cat'     => getCategory($data['cat_id']),
+                       'pay'     => getPaymentTitlePrice($data['payment_id']),
+                       'subject' => $data['subject'],
+                       'url'     => generateDerefererUrl($data['url']),
+                       'stamp'   => generateDateTime($data['timestamp'], '2'),
+                       'recs'    => $data['target_send'],
+                       'type'    => translatePoolType($data['data_type']),
+                       'zip'     => $data['zip']
                );
 
                // Load template
@@ -114,15 +114,16 @@ if (SQL_NUMROWS($result) > 0) {
                // Prepare data for the template
                // @TODO Rewrite in template: stamp->timestamp_ordered,recs->max_rec,clix->clicks,perc->percents
                $content = array(
-                       'sw'    => $SW,
-                       'cat'   => getCategory($content['cat_id']),
-                       'pay'   => getPaymentTitlePrice($content['payment_id']),
-                       'url'   => generateDerefererUrl($content['url']),
-                       'stamp' => generateDateTime($content['timestamp_ordered'], '2'),
-                       'recs'  => $content['max_rec'],
-                       'sent'  => generateDateTime($content['timestamp_send'], '2'),
-                       'clix'  => $content['clicks'],
-                       'perc'  => ($content['clicks'] / $content['max_rec'] * 100)."%",
+                       'sw'       => $SW,
+                       'cat'      => getCategory($content['cat_id']),
+                       'pay'      => getPaymentTitlePrice($content['payment_id']),
+                       'url'      => generateDerefererUrl($content['url']),
+                       'stamp'    => generateDateTime($content['timestamp_ordered'], '2'),
+                       'recs'     => $content['max_rec'],
+                       'sent'     => generateDateTime($content['timestamp_send'], '2'),
+                       'clix'     => $content['clicks'],
+                       'subject'  => $content['subject'],
+                       'percents' => translateComma($content['clicks'] / $content['max_rec'] * 100)."%",
                );
 
                // Load row template and switch colors
index fbb4b5f..35276ca 100644 (file)
@@ -2,7 +2,8 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom2" width="10" height="30">&nbsp;</td>
-               <td class="admin_title bottom2" colspan="3" align="center"><strong>{--ADD_NEW_REFDEPTH--}</strong>
+               <td class="admin_title bottom2" colspan="3" align="center">
+                       <strong>{--ADD_NEW_REFDEPTH--}</strong>
                </td>
                <td class="admin_title bottom2" width="10">&nbsp;</td>
        </tr>
@@ -13,8 +14,9 @@
                <td class="seperator" width="10">&nbsp;</td>
                <td align="right" width="200">{--ENTER_REF_LVL--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
-               <td><input type="text" name="level" class="admin_normal" size="3"
-                       maxlength="3"></td>
+               <td>
+                       <input type="text" name="level" class="admin_normal" size="3" maxlength="3" />
+               </td>
                <td class="seperator" width="10">&nbsp;</td>
        </tr>
        <tr>
@@ -24,8 +26,9 @@
                <td class="seperator" width="10">&nbsp;</td>
                <td align="right" width="200">{--ENTER_REF_PERCENTS--}:</td>
                <td class="seperator" width="10">&nbsp;</td>
-               <td><input type="text" name="perc" class="admin_normal" size="3"
-                       maxlength="3">%</td>
+               <td>
+                       <input type="text" name="percents" class="admin_normal" size="3" maxlength="3" />%
+               </td>
                <td class="seperator" width="10">&nbsp;</td>
        </tr>
        <tr>
        </tr>
        <tr>
                <td class="admin_footer seperator" width="10">&nbsp;</td>
-               <td class="admin_footer" colspan="3" align="center"><input
-                       type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-               <input type="submit" name="ok" class="admin_submit"
-                       value="{--ADD_DEPTH--}" /></td>
+               <td class="admin_footer" colspan="3" align="center">
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="ok" class="admin_submit" value="{--ADD_DEPTH--}" />
+               </td>
                <td class="admin_footer seperator" width="10">&nbsp;</td>
        </tr>
 </table>
-</form>
\ No newline at end of file
+</form>
index 8e7be54..5e34a3f 100644 (file)
@@ -10,6 +10,6 @@
                $content[rate]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom2 right2">
-               $content[mpoi]
+               $content[min_points]
        </td>
 </tr>
index 4fe3d9c..6eb5d78 100644 (file)
@@ -10,7 +10,7 @@
                <input type="text" name="rate[$content[id]]" class="admin_normal" value="$content[rate]" size="5" maxlength="10" />
        </td>
        <td align="center" class="switch_sw$content[sw] bottom2 right2">
-               <input type="text" name="mpoi[$content[id]]" class="admin_normal" value="$content[mpoi]" size="5" maxlength="10" />
+               <input type="text" name="min_points[$content[id]]" class="admin_normal" value="$content[min_points]" size="5" maxlength="10" />
        </td>
        <td align="center" class="switch_sw$content[sw] bottom2">
                $content[allow]
index 1b66f08..29623bc 100644 (file)
@@ -3,7 +3,7 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" class="admin_normal" value="1" />
        </td>
        <td class="switch_sw$content[sw] bottom2 right2">
-               &nbsp;$content[from]
+               &nbsp;$content[from_account]
        </td>
        <td class="switch_sw$content[sw] bottom2 right2">
                &nbsp;$content[type]
@@ -12,6 +12,6 @@
                &nbsp;$content[rate]
        </td>
        <td class="switch_sw$content[sw] bottom2">
-               &nbsp;$content[mpoi]
+               &nbsp;$content[min_points]
        </td>
 </tr>
index 2d0dec0..1c14268 100644 (file)
@@ -17,7 +17,7 @@
                <td class="right2 admin_misc" align="center">
                        <a href="$content[url]" target="_blank">{--ADMIN_TEST_URL--}</a>
                </td>
-               <td class="right2 admin_misc" align="center">$content[ordered]</td>
+               <td class="right2 admin_misc" align="center">$content[timestamp]</td>
                <td class="admin_misc" align="center">$content[cnt]</td>
        </tr>
 </table>
index 15fc878..6f231b3 100644 (file)
@@ -18,6 +18,6 @@
                <td class="top2 right2 admin_misc" align="center">$content[subject]</td>
                <td class="top2 right2 admin_misc" align="center"><a
                        href="$content[url]" target="_blank">{--ADMIN_TEST_URL--}</a></td>
-               <td class="top2 right2 admin_misc" align="center">$content[ordered]</td>
+               <td class="top2 right2 admin_misc" align="center">$content[timestamp]</td>
        </tr>
 </table>
index 1e01861..f1f7ac7 100644 (file)
@@ -16,7 +16,7 @@
                <td class="right2 admin_misc" align="center">$content[subject]</td>
                <td class="right2 admin_misc" align="center"><a
                        href="$content[url]" target="_blank">{--ADMIN_TEST_URL--}</a></td>
-               <td class="right2 admin_misc" align="center">$content[ordered]</td>
+               <td class="right2 admin_misc" align="center">$content[timestamp]</td>
                <td class="admin_misc" align="center">$content[cnt]</td>
        </tr>
 </table>
index fcb4225..da4364a 100644 (file)
@@ -9,7 +9,8 @@
        </tr>
        <tr>
                <td width="10" class="top2 seperator" height="35">&nbsp;</td>
-               <td align="right" class="top2"><strong>{--EDIT_URL--}:</strong>
+               <td align="right" class="top2">
+                       <strong>{--EDIT_URL--}:</strong>
                </td>
                <td width="5" class="top2 seperator">&nbsp;</td>
                <td class="top2">
        </tr>
        <tr>
                <td width="10" class="top2 seperator" height="35">&nbsp;</td>
-               <td align="right" class="top2"><strong>{--EMAIL_EDIT_SUBJ--}:</strong>
+               <td align="right" class="top2">
+                       <strong>{--EMAIL_EDIT_SUBJ--}:</strong>
                </td>
                <td width="5" class="top2" seperator>&nbsp;</td>
                <td class="top2">
-                       <input type="text" name="subj" class="admin_normal" size="30" maxlength="255" value="$content[subject]" />
+                       <input type="text" name="subject" class="admin_normal" size="30" maxlength="255" value="$content[subject]" />
                </td>
                <td width="10" class="top2" seperator>&nbsp;</td>
        </tr>
        <tr>
                <td width="10" height="125" class="top2" seperator>&nbsp;</td>
-               <td align="right" class="top2"><strong>{--EMAIL_EDIT_TEXT--}:</strong>
+               <td align="right" class="top2">
+                       <strong>{--EMAIL_EDIT_TEXT--}:</strong>
                </td>
                <td width="5" class="top2 seperator">&nbsp;</td>
                <td class="top2">
index f958cd0..27cad9a 100644 (file)
@@ -5,7 +5,7 @@
        </td>
        <td class="switch_sw$content[sw] top2" width="5">&nbsp;</td>
        <td class="switch_sw$content[sw] top2">
-               $content[subj]
+               $content[subject]
                ({--EMAIL_SENDER--}: $content[userid]; $content[pay]; $content[cat])
        </td>
        <td class="switch_sw$content[sw] top2" width="10">&nbsp;</td>
index 1dd1e5d..43bb71e 100644 (file)
@@ -5,7 +5,7 @@
        </td>
        <td class="switch_sw$content[sw] top2 bottom right" width="23%" align="center">
                {--EMAIL_SUBJECT--}:<br />
-               <strong class="admin_misc">$content[subj]</strong>
+               <strong class="admin_misc">$content[subject]</strong>
        </td>
        <td class="switch_sw$content[sw] top2 bottom" width="54%" align="center">
                {--EMAIL_TEXT--}:<br />
@@ -49,7 +49,7 @@
 <tr>
        <td align="center" class="switch_sw$content[sw] top bottom right">
                {--EMAIL_TSEND--}:<br />
-               <strong class="admin_misc">$content[tsend]</strong>
+               <strong class="admin_misc">$content[target_send]</strong>
        </td>
        <td align="center" class="switch_sw$content[sw] top bottom right">
                {--EMAIL_URL--}:<br />
index ffebdf7..cf010b7 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td align="center" class="switch_sw$content[sw] bottom2 right2">$content[link]</td>
-       <td align="center" class="switch_sw$content[sw] bottom2 right2">$content[subj]</td>
+       <td align="center" class="switch_sw$content[sw] bottom2 right2">$content[subject]</td>
        <td align="center" class="switch_sw$content[sw] bottom2 right2">$content[stamp]</td>
        <td align="center" class="switch_sw$content[sw] bottom2">$content[cat]</td>
 </tr>
index 5916d9b..16af152 100644 (file)
@@ -1,7 +1,7 @@
 <tr>
        <td width="79%" class="switch_sw$content[sw] bottom2 left2">
        <ul style="margin-left: 0px">
-               <li style="white-space: normal">{--ADMIN_TASK_SUBJECT--}: <strong>$content[subj]</strong></li>
+               <li style="white-space: normal">{--ADMIN_TASK_SUBJECT--}: <strong>$content[subject]</strong></li>
                $content[add]
                <li style="white-space: normal">{--ADMIN_TASK_TEXT--}: $content[text]</li>
                <li style="white-space: normal">
index 0643fe4..2fa4e14 100644 (file)
        <tr>
                <td align="right">{--ADMIN_PAYOUT_RATE--}</td>
                <td class="seperator">&nbsp;</td>
-               <td><input type="text" name="rate" class="admin_normal" size="5"
-                       maxlength="10"><span class="admin_note">&nbsp;&nbsp;({--ADMIN_PAYOUT_VALUE_NOTE--})</span></td>
+               <td>
+                       <input type="text" name="rate" class="admin_normal" size="5" maxlength="10" />
+                       <span class="admin_note">({--ADMIN_PAYOUT_VALUE_NOTE--})</span>
+               </td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
        <tr>
                <td align="right">{--ADMIN_PAYOUT_MIN_POINTS--}:</td>
                <td class="seperator">&nbsp;</td>
-               <td><input type="text" name="mpoi" class="admin_normal" size="5"
-                       maxlength="10"><span class="admin_note">&nbsp;&nbsp;({--ADMIN_PAYOUT_VALUE_NOTE--})</span></td>
+               <td>
+                       <input type="text" name="min_points" class="admin_normal" size="5" maxlength="10" />
+                       <span class="admin_note">({--ADMIN_PAYOUT_VALUE_NOTE--})</span>
+               </td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
@@ -56,8 +60,9 @@
        <tr>
                <td align="right">{--ADMIN_PAYOUT_YOUR_ACCOUNT--}:</td>
                <td class="seperator">&nbsp;</td>
-               <td><input type="text" name="yacc" class="admin_normal" size="5"
-                       maxlength="255"></td>
+               <td>
+                       <input type="text" name="yacc" class="admin_normal" size="5" maxlength="255" />
+               </td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
@@ -65,8 +70,9 @@
        <tr>
                <td align="right">{--ADMIN_PAYOUT_YOUR_PASSWORD--}:</td>
                <td class="seperator">&nbsp;</td>
-               <td><input type="password" name="ypass" class="admin_normal"
-                       size="5" maxlength="255"></td>
+               <td>
+                       <input type="password" name="ypass" class="admin_normal" size="5" maxlength="255" />
+               </td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
@@ -74,8 +80,9 @@
        <tr>
                <td width="250" align="right">{--ADMIN_PAYOUT_YOUR_URL--}:</td>
                <td class="seperator">&nbsp;</td>
-               <td width="140"><input type="text" name="yurl"
-                       class="admin_normal" size="30" maxlength="255"></td>
+               <td width="140">
+                       <input type="text" name="yurl" class="admin_normal" size="30" maxlength="255" />
+               </td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
@@ -83,8 +90,9 @@
        <tr>
                <td align="right">{--ADMIN_PAYOUT_YOUR_RET_DONE--}:</td>
                <td class="seperator">&nbsp;</td>
-               <td><input type="text" name="yrdone" class="admin_normal"
-                       size="5" maxlength="255"></td>
+               <td>
+                       <input type="text" name="yrdone" class="admin_normal" size="5" maxlength="255" />
+               </td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
        <tr>
                <td align="right">{--ADMIN_PAYOUT_YOUR_RET_FAILED--}:</td>
                <td class="seperator">&nbsp;</td>
-               <td><input type="text" name="yrfailed" class="admin_normal"
-                       size="5" maxlength="255"></td>
+               <td>
+                       <input type="text" name="yrfailed" class="admin_normal" size="5" maxlength="255" />
+               </td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="seperator">&nbsp;</td>
        <tr>
                <td align="right">{--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}:</td>
                <td class="seperator">&nbsp;</td>
-               <td><select name="ytrans" size="1" class="admin_select">
-                       <option value="md5">MD5</option>
-                       <option value="base64">Base64</option>
-                       <option value="xxx" selected="selected">None</option>
-               </select></td>
+               <td>
+                       <select name="ytrans" size="1" class="admin_select">
+                               <option value="md5">MD5</option>
+                               <option value="base64">Base64</option>
+                               <option value="xxx" selected="selected">None</option>
+                       </select>
+               </td>
        </tr>
        <tr>
                <td colspan="3" height="3" class="bottom2 seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="3" class="admin_footer"><input
-                       type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;<input
-                       type="submit" name="add" class="admin_submit"
-                       value="{--ADMIN_PAYOUT_ADD_NEW--}" /></td>
+               <td colspan="3" class="admin_footer">
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="add" class="admin_submit" value="{--ADMIN_PAYOUT_ADD_NEW--}" />
+               </td>
        </tr>
 </table>
 </form>
index 1f37345..5df5605 100644 (file)
@@ -8,7 +8,7 @@
                $content[u_link]
        </td>
        <td class="switch_sw$content[sw] top2 right2 admin_misc">
-               $content[subj]
+               $content[subject]
        </td>
        <td class="switch_sw$content[sw] top2 right2" align="center">
                <a href="$content[tester]" target="_blank">{--ADMIN_TEST_URL--}</a>
@@ -20,9 +20,9 @@
                <span class="admin_note" title="$content[pay_title]">$content[pay_link]</span>
        </td>
        <td class="switch_sw$content[sw] top2 right2 admin_misc" align="center">
-               $content[ordered]
+               $content[timestamp]
        </td>
        <td class="switch_sw$content[sw] top2 admin_misc" align="center">
-               $content[tsend]
+               $content[target_send]
        </td>
 </tr>
index 299945e..5d9a0ed 100644 (file)
@@ -5,7 +5,7 @@
        </td>
        <td class="switch_mem$content[sw] top2 right2" width="40%" align="center">
                {--EMAIL_SUBJECT--}:<br />
-               <strong>$content[subj]</strong>
+               <strong>$content[subject]</strong>
        </td>
        <td class="switch_mem$content[sw] top2" width="30%" align="center">
                {--EMAIL_TIMESTAMP--}:<br />
index debd83c..f7f5554 100644 (file)
@@ -1,7 +1,7 @@
 <tr>
        <td class="switch_mem$content[sw] top2 right" width="46%" colspan="2" align="center">
                {--EMAIL_SUBJECT--}:<br />
-               <strong>$content[subj]</strong>
+               <strong>$content[subject]</strong>
        </td>
        <td class="switch_mem$content[sw] top2" width="54%" align="center">
                {--EMAIL_TIMESTAMP--}:<br />
@@ -39,6 +39,6 @@
        </td>
        <td align="center" class="switch_mem$content[sw] top">
                {--EMAIL_PERCENT--}:<br />
-               <strong>$content[perc]</strong>
+               <strong>$content[percents]</strong>
        </td>
 </tr>