From: Roland Häder Date: Fri, 30 Oct 2009 02:47:41 +0000 (+0000) Subject: Member ref-link page swapped out to templates (#68) X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=4f2414a0134da82027fce8a6c98696a207c8c8cc Member ref-link page swapped out to templates (#68) --- diff --git a/.gitattributes b/.gitattributes index ed65ee1c84..2270489aa9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -151,6 +151,7 @@ inc/extensions/ext-primera.php -text inc/extensions/ext-profile.php -text inc/extensions/ext-rallye.php -text inc/extensions/ext-refback.php -text +inc/extensions/ext-refsell.php -text inc/extensions/ext-register.php -text inc/extensions/ext-removeip.php -text inc/extensions/ext-repair.php -text @@ -1284,6 +1285,7 @@ templates/de/html/ext/ext_primera.tpl -text templates/de/html/ext/ext_profile.tpl -text templates/de/html/ext/ext_rallye.tpl -text templates/de/html/ext/ext_refback.tpl -text +templates/de/html/ext/ext_refsell.tpl -text templates/de/html/ext/ext_register.tpl -text templates/de/html/ext/ext_removeip.tpl -text templates/de/html/ext/ext_repair.tpl -text @@ -1439,6 +1441,7 @@ templates/de/html/member/member_mail_normal_send.tpl -text templates/de/html/member/member_mail_normal_temp.tpl -text templates/de/html/member/member_menu_bottom.tpl -text templates/de/html/member/member_menu_row.tpl -text +templates/de/html/member/member_menu_start.tpl -text templates/de/html/member/member_menu_title.tpl -text templates/de/html/member/member_menu_whats.tpl -text templates/de/html/member/member_mydata_button.tpl -text @@ -1482,6 +1485,9 @@ templates/de/html/member/member_refback_list.tpl -text templates/de/html/member/member_refback_list_level.tpl -text templates/de/html/member/member_refback_list_row.tpl -text templates/de/html/member/member_refback_list_row_deleted.tpl -text +templates/de/html/member/member_reflink.tpl -text +templates/de/html/member/member_reflink_nickname.tpl -text +templates/de/html/member/member_reflink_no_nickname.tpl -text templates/de/html/member/member_reflinks_row.tpl -text templates/de/html/member/member_reflinks_table.tpl -text templates/de/html/member/member_stats_pool.tpl -text diff --git a/inc/extensions/ext-refsell.php b/inc/extensions/ext-refsell.php new file mode 100644 index 0000000000..208120ab33 --- /dev/null +++ b/inc/extensions/ext-refsell.php @@ -0,0 +1,93 @@ + diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 02adccd8aa..9b2827786f 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -253,7 +253,7 @@ LIMIT 1", $_userid = '---'; // List only users with at least one ref! - //* DEBUG: */ outputHtml("*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*
"); + //* DEBUG: */ print("*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*
"); if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $_userid = $content['userid']; } else { $cnt = ''; } // Save values to array @@ -786,14 +786,14 @@ function getReferalRallyeRefsCount ($userid, $old = 0) { $cnt = 0; foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $userid) { // Do we have a ref for this user? - //* DEBUG: */ outputHtml("id={$id},userid={$userid},userid={$userid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}
"); + //* DEBUG: */ print("id={$id},userid={$userid},userid={$userid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}
"); if (($userid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) { - //* DEBUG: */ outputHtml("userid matches!
"); + //* DEBUG: */ print("userid matches!
"); foreach ($GLOBALS['cache_array']['refdepths']['level'] as $level) { if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) { // Level does exist so abort here $cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id]; - //* DEBUG: */ outputHtml("*".$userid.'/'.$cnt."*
"); + //* DEBUG: */ print("*".$userid.'/'.$cnt."*
"); break; } elseif ($level > 1) { // Not interesting here... @@ -806,9 +806,9 @@ function getReferalRallyeRefsCount ($userid, $old = 0) { } // END - if } // END - foreach - //* DEBUG: */ outputHtml("
");
-		//* DEBUG: */ outputHtml(print_r($GLOBALS['cache_array']['refsystem'], true));
-		//* DEBUG: */ outputHtml("
"); + //* DEBUG: */ print("
");
+		//* DEBUG: */ print(print_r($GLOBALS['cache_array']['refsystem'], true));
+		//* DEBUG: */ print("
"); //* DEBUG: */ shutdown(); if ($cnt > 0) { @@ -816,7 +816,7 @@ function getReferalRallyeRefsCount ($userid, $old = 0) { incrementStatsEntry('cache_hits'); // Remove old refs - //* DEBUG: */ outputHtml('+'.$cnt.'/'.$old."+
"); + //* DEBUG: */ print('+'.$cnt.'/'.$old."+
"); $cnt -= $old; } // END - if } else { @@ -836,7 +836,7 @@ WHERE s.userid=%s AND s.level=1", array(bigintval($userid)), __FUNCTION__, __LIN } // Return count - //* DEBUG: */ outputHtml("*".$userid.'/'.$old.'/'.$cnt."*
"); + //* DEBUG: */ print("*".$userid.'/'.$old.'/'.$cnt."*
"); return $cnt; } diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php index 129564c14d..3d6fd91226 100644 --- a/inc/libs/refback_functions.php +++ b/inc/libs/refback_functions.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { // Payback refback for refid and reduce it for current user function addRefbackPoints ($userid, $ref, $points, $ref_points) { - //* DEBUG: */ outputHtml("----------------------- ".__FUNCTION__." - ENTRY ----------------------------------------------- ".__FUNCTION__." - EXIT ------------------------
"); return $return; } // "Getter" for refback percents function getRefbackPercents ($userid, $ref) { - //* DEBUG: */ outputHtml("----------------------- ".__FUNCTION__." - ENTRY ----------------------------------------------- ".__FUNCTION__." - EXIT ------------------------
"); return $percents; } // "Getter" for userid array which will return only one entry function getArrayFromRefbackLevel ($rid, $level) { - //* DEBUG: */ outputHtml("----------------------- ".__FUNCTION__." - ENTRY ----------------------------------------------- ".__FUNCTION__." - EXIT ------------------------
"); return $userIds; } // Update "refback table" function updateRefbackTable ($userid) { - //* DEBUG: */ outputHtml("----------------------- ".__FUNCTION__." - ENTRY ----------------------------------------------- ".__FUNCTION__." - EXIT ------------------------
"); } // "Getter" for array for user refs in given level function getArrayFromRefbackUserRefs ($userid, $level) { - //* DEBUG: */ outputHtml("----------------------- ".__FUNCTION__." - ENTRY ----------------------------------------------- ".__FUNCTION__." - EXIT ------------------------
"); return $refs; } // "Getter" for refback entry function getArrayFromUserRefbackData ($id) { - //* DEBUG: */ outputHtml("----------------------- ".__FUNCTION__." - ENTRY ----------------------------------------------- ".__FUNCTION__." - EXIT ------------------------
"); return $data; } // Update refback percents (but with some sanity-checks! function updateMemberRefbackPercents ($id, $percents) { - //* DEBUG: */ outputHtml("----------------------- ".__FUNCTION__." - ENTRY ----------------------------------------------- ".__FUNCTION__." - EXIT ------------------------
"); return $status; } // diff --git a/inc/load_config.php b/inc/load_config.php index e38c041606..6ecd46300d 100644 --- a/inc/load_config.php +++ b/inc/load_config.php @@ -88,7 +88,7 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl // Check if the user setups his MySQL stuff... if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isGetRequestElementSet('installing')) && (isInstalled())) { // No login entered and outside installation mode - outputHtml('{--LANG_WARNING--}: '); + outputHtml('{--LANG_WARNING--}:'); if (isInstalled()) { // You have changed my configuration file! app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}'); @@ -98,8 +98,8 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isGetRequestEl } } elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) { // No database password entered!!! - outputHtml('
{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}'); + loadTemplate('admin_settings_saved', false, '
{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}'); } -// +// [EOF] ?> diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php index ab27f4813b..d46a98c787 100644 --- a/inc/modules/admin/what-del_holiday.php +++ b/inc/modules/admin/what-del_holiday.php @@ -54,9 +54,13 @@ if ($SUM > 0) { $cnt = 0; foreach (postRequestElement('sel') as $id => $sel) { // Get the userid - $result = SQL_QUERY_ESC("SELECT userid, holiday_start, holiday_end -FROM `{?_MYSQL_PREFIX?}_user_holidays` -WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT + `userid`, `holiday_start`, `holiday_end` +FROM + `{?_MYSQL_PREFIX?}_user_holidays` +WHERE + `id`=%s +LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Load data and free memory list($userid, $start, $end) = SQL_FETCHROW($result); @@ -64,12 +68,19 @@ WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); // Update user's account SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` -SET `holiday_active`='N', holiday_activated=0 -WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FILE__, __LINE__); +SET + `holiday_active`='N', + `holiday_activated`=0 +WHERE + `userid`=%s +LIMIT 1", array(bigintval($userid)), __FILE__, __LINE__); // Remove holiday - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` -WHERE `id`=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); + SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM + `{?_MYSQL_PREFIX?}_user_holidays` +WHERE + `id`=%s +LIMIT 1", array(bigintval($id)), __FILE__, __LINE__); // Prepare loaded data for the $content = array( @@ -126,5 +137,5 @@ LIMIT 1", array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__); loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_NO_DIRECT_CALL')); } -// +// [EOF] ?> diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php index 1edcfd6c27..4da39063ae 100644 --- a/inc/modules/admin/what-email_details.php +++ b/inc/modules/admin/what-email_details.php @@ -190,7 +190,7 @@ if (SQL_NUMROWS($result_list) > 0) { if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) { // Check only if bonus extension is active if (SQL_NUMROWS($result_bonus) > 0) outputHtml('

'); - } + } // END - if } if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) { diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php index b90af17802..26417389b9 100644 --- a/inc/modules/guest/what-rallyes.php +++ b/inc/modules/guest/what-rallyes.php @@ -50,7 +50,7 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) { } // END - if // Open div tag -outputHtml("
"); +outputHtml('
'); // Check for possible running rallyes $ADMIN = " AND d.is_active='Y'"; diff --git a/inc/modules/login.php b/inc/modules/login.php index 4252eaf76c..d0918d5b12 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -63,8 +63,7 @@ loadTemplate('member_header'); handleCodeMessage(); // Begin menu block here -outputHtml(" - "); +loadTemplate('member_menu_start'); // Adding the main content module here if (!isActionSet()) { diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php index d8e75ca552..89d72e594f 100644 --- a/inc/modules/member/what-reflinks.php +++ b/inc/modules/member/what-reflinks.php @@ -49,31 +49,29 @@ addMenuDescription('member', __FILE__); // Load current referal clicks $result = SQL_QUERY_ESC("SELECT `ref_clicks` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__); + +// Load it $content = SQL_FETCHARRAY($result); + +// Free result SQL_FREERESULT($result); -outputHtml("
{--YOUR_PERSONAL_REFLINK--}:
-{?URL?}/ref.php?ref=".getUserId()."
-
"); +// Prepare some data +$content['userid'] = getUserId(); +// @TODO Move this into a filter if (isExtensionActive('nickname')) { // Add nickname link when nickname is entered $nick = getNickname(getUserId()); if (!empty($nick)) { // Display nickname link - outputHtml("{--NICKNAME_YOUR_REFLINK--}:
-{?URL?}/ref.php?ref=".$nick."
-
"); + $content['nickname_content'] = loadTemplate('member_reflink_nickname', true, $nick); } else { // Display link to nickname form - outputHtml("
{--NO_NICKNAME_SET--}
-{--PLEASE_CLICK_NICKNAME_FORM--}"); + $content['nickname_content'] = loadTemplate('member_reflink_no_nickname', true); } -} - -// Clicks on your reflink -outputHtml("{--YOUR_REFCLICKS--}: ".$content['ref_clicks']." {--CLICKS--}


"); +} // END - if $whereStatement = " WHERE `visible`='Y'"; if (isAdmin()) $whereStatement = ''; @@ -82,11 +80,11 @@ $result = SQL_QUERY("SELECT `id`, `url`, `alternate`, `counter`, `clicks` FROM ` if (SQL_NUMROWS($result) > 0) { // List available ref banners $OUT = ''; $SW = 2; - while ($content = SQL_FETCHARRAY($result)) { - $test = str_replace(getConfig('URL'), getConfig('PATH'), $content['url']); $size = 0; - if ($test == $content['url']) { + while ($row = SQL_FETCHARRAY($result)) { + $test = str_replace(getConfig('URL'), getConfig('PATH'), $row['url']); $size = 0; + if ($test == $row['url']) { // Download banner (I hope you keep the banner on same server???) - $fp = sendGetRequest($content['url']); $bannerContent = ''; + $fp = sendGetRequest($row['url']); $bannerContent = ''; if ((!empty($fp)) && (is_array($fp)) && (count($fp) > 0)) { // Loads only found banner, when there is a 404 error this foreach() command // will cause an "Invalid argument supplied for foreach()" error @@ -99,28 +97,31 @@ if (SQL_NUMROWS($result) > 0) { $size = filesize($test); } - if ($size > 0) $content['alternate'] .= ' (' .translateComma(round($size / 102.4) / 10) . ' {--KBYTES--})'; + if ($size > 0) $row['alternate'] .= ' (' .translateComma(round($size / 102.4) / 10) . ' {--KBYTES--})'; // Add some more data - $content['sw'] = $SW; - $content['userid'] = getUserId(); + $row['sw'] = $SW; + $row['userid'] = getUserId(); // Add row - $OUT .= loadTemplate('member_reflinks_row', true, $content); + $OUT .= loadTemplate('member_reflinks_row', true, $row); // Switchcolors $SW = 3 - $SW; } // END - while // Load final template - loadTemplate('member_reflinks_table', false, $OUT); + $content['refbanner_content'] = loadTemplate('member_reflinks_table', true, $OUT); } else { // No refbanner found! - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_REFBANNER_FOUND')); + $content['refbanner_content'] = loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_REFBANNER_FOUND')); } // Free result SQL_FREERESULT($result); +// Load main template +loadTemplate('member_reflink', false, $content); + // [EOF] ?> diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php index b926258d9c..630562a089 100644 --- a/inc/pool/pool-bonus.php +++ b/inc/pool/pool-bonus.php @@ -87,7 +87,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) { // We can now send mails to them... foreach ($RECEIVERS as $key => $userid) { // Load personal data - //* DEBUG: */ outputHtml("*L:".__LINE__.'/'.$userid."*
"); + //* DEBUG: */ print("*L:".__LINE__.'/'.$userid."*
"); $result_user = SQL_QUERY_ESC("SELECT `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FILE__, __LINE__); @@ -95,7 +95,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) { if (SQL_NUMROWS($result_user) == 1) { // The final receiver does exists so we can continue... list($surname, $family, $email) = SQL_FETCHROW($result_user); - //* DEBUG: */ outputHtml("OK!/L:".__LINE__."
"); + //* DEBUG: */ print("OK!/L:".__LINE__."
"); // Mark this user as "spammed" ;-) And place a line for him... if (removeReceiver($dummy, $key, $userid, $DATA['id'], $DATA['id'], true) == 'done') { @@ -138,7 +138,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) { // Do we have send maximum mails? if (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || (countSelection($dummy) == 0)) { // Yes, we have - //* DEBUG: */ outputHtml("*EXIT/L:".__LINE__."
"); + //* DEBUG: */ print("*EXIT/L:".__LINE__."
"); break; } // END - if } // END - if @@ -153,31 +153,31 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) { // Update entry (or add missing $P = $GLOBALS['pool_cnt']; if (!empty($cnt2) && empty($GLOBALS['pool_cnt'])) $P = $cnt2; - //* DEBUG: */ outputHtml("+MEDIA/L:".__LINE__.'/'.$P."+
"); + //* DEBUG: */ print("+MEDIA/L:".__LINE__.'/'.$P."+
"); updateMediadataEntry(array("total_send", "bonus_send"), 'add', $P); } // END - if // Close sending system - //* DEBUG: */ outputHtml("-L:".__LINE__.'/'.countSelection($dummy)."-
"); + //* DEBUG: */ print("-L:".__LINE__.'/'.countSelection($dummy)."-
"); if (countSelection($dummy) == 0) { // Queue reached! SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='SEND', `target_send`=0, `receivers`='' WHERE `id`=%s LIMIT 1", array(bigintval($DATA['id'])), __FILE__, __LINE__); - //* DEBUG: */ outputHtml("*L:".__LINE__."*
"); + //* DEBUG: */ print("*L:".__LINE__."*
"); // Update mediadata if version is 0.0.4 or higher if (getExtensionVersion('mediadata') >= '0.0.4') { // Update entry (or add missing) - //* DEBUG: */ outputHtml("*MEDIA/L:".__LINE__."*
"); + //* DEBUG: */ print("*MEDIA/L:".__LINE__."*
"); updateMediadataEntry(array("total_orders", "bonus_orders"), 'add', 1); } // END - if } elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) { // Update bonus pool SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='NEW', `target_send`=%s, `receivers`='%s' WHERE `id`=%s LIMIT 1", array(countSelection($dummy), implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__); - //* DEBUG: */ outputHtml("*L:".__LINE__."
");
-				//* DEBUG: */ outputHtml(print_r($dummy, true));
-				//* DEBUG: */ outputHtml("
\n!!!
"); + //* DEBUG: */ print("*L:".__LINE__."
");
+				//* DEBUG: */ print(print_r($dummy, true));
+				//* DEBUG: */ print("
\n!!!
"); break; } } diff --git a/templates/de/html/ext/ext_refsell.tpl b/templates/de/html/ext/ext_refsell.tpl new file mode 100644 index 0000000000..e6faa18133 --- /dev/null +++ b/templates/de/html/ext/ext_refsell.tpl @@ -0,0 +1,4 @@ +Bietet Ihnen die Möglichkeit an, in Ihrem {?MT_WORD?} Referals zu +verkaufen, die noch keinen Werber haben. Dabei werden Preise basierend auf +verschiedenste Daten des Mitgliedes und aller Mitglieder berechnet, um einen +guten und fairen Preis zu erziehlen. diff --git a/templates/de/html/member/member_menu_start.tpl b/templates/de/html/member/member_menu_start.tpl new file mode 100644 index 0000000000..6a588d2d7d --- /dev/null +++ b/templates/de/html/member/member_menu_start.tpl @@ -0,0 +1,2 @@ + + diff --git a/templates/de/html/member/member_reflink.tpl b/templates/de/html/member/member_reflink.tpl new file mode 100644 index 0000000000..2233ab3471 --- /dev/null +++ b/templates/de/html/member/member_reflink.tpl @@ -0,0 +1,13 @@ +
+ {--YOUR_PERSONAL_REFLINK--}: +
+
+ {?URL?}/ref.php?ref=$content[userid] +
+$content[nickname_content] +
+ {--YOUR_REFCLICKS--}: $content[ref_clicks] {--CLICKS--} +
+
+ $content[refbanner_content] +
diff --git a/templates/de/html/member/member_reflink_nickname.tpl b/templates/de/html/member/member_reflink_nickname.tpl new file mode 100644 index 0000000000..26a26e7e89 --- /dev/null +++ b/templates/de/html/member/member_reflink_nickname.tpl @@ -0,0 +1,6 @@ +
+ {--NICKNAME_YOUR_REFLINK--}: +
+
+ {?URL?}/ref.php?ref=$content +
diff --git a/templates/de/html/member/member_reflink_no_nickname.tpl b/templates/de/html/member/member_reflink_no_nickname.tpl new file mode 100644 index 0000000000..c4405cb298 --- /dev/null +++ b/templates/de/html/member/member_reflink_no_nickname.tpl @@ -0,0 +1,4 @@ +
+ {--NO_NICKNAME_SET--} + {--PLEASE_CLICK_NICKNAME_FORM--} +