templates/de/html/member/member_list_beg_row.tpl svneol=native#text/plain
templates/de/html/member/member_list_coupon.tpl svneol=native#text/plain
templates/de/html/member/member_list_coupon_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_reflinks.tpl svneol=native#text/plain
+templates/de/html/member/member_list_reflinks_row.tpl svneol=native#text/plain
templates/de/html/member/member_list_surfbar.tpl svneol=native#text/plain
templates/de/html/member/member_list_surfbar_form.tpl svneol=native#text/plain
templates/de/html/member/member_list_surfbar_row.tpl svneol=native#text/plain
./inc/functions.php:2214: // @TODO Rename column data_type to e.g. mail_status
./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
./inc/install-functions.php:57: // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1063: // @TODO Rewrite these two constants
-./inc/language/de.php:1079: // @TODO Rewrite these three constants
+./inc/language/de.php:1066: // @TODO Rewrite these two constants
+./inc/language/de.php:1082: // @TODO Rewrite these three constants
./inc/language/de.php:758:// @TODO Are these constants longer used?
./inc/language-functions.php:255: // @TODO These are all valid languages, again hard-coded
./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function.
./inc/libs/theme_functions.php:93: // @TODO Can't this be rewritten to an API function?
./inc/libs/user_functions.php:159: // @TODO These two constants are no longer used, maybe we reactivate this code?
./inc/libs/user_functions.php:250:// @TODO Double-check configuration entry here
-./inc/libs/user_functions.php:345: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-./inc/libs/user_functions.php:374: // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+./inc/libs/user_functions.php:344: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+./inc/libs/user_functions.php:373: // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
./inc/libs/yoomedia_functions.php:114: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
./inc/load_config.php:75: // @TODO Rewrite them to avoid this else block
./inc/loader/load-extension.php:13: * @TODO Rewrite this whole file *
./templates/de/html/admin/admin_list_country_edit_row.tpl:1:<!-- @DEPRECATED //-->
./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
./templates/de/html/admin/admin_send_reset_link.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_reflinks_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/member/member_reflinks_table.tpl:1:<!-- @DEPRECATED //-->
./templates/de/html/member/member_surfbar_book_dynamic.tpl:1:<!-- @DEPRECATED //-->
./templates/de/html/member/member_surfbar_book_static.tpl:1:<!-- @DEPRECATED //-->
./templates/de/html/member/member_surfbar_list_form.tpl:1:<!-- @DEPRECATED //-->
addCode('WRONG_ID' , 0x002);
addCode('ACCOUNT_LOCKED' , 0x003);
addCode('ACCOUNT_UNCONFIRMED', 0x004);
-addCode('UNKNOWN_STATUS' , 0x005);
-addCode('NO_MAIL_TYPE' , 0x006);
-addCode('CNTR_FAILED' , 0x007);
-addCode('LOGOUT_DONE' , 0x008);
-addCode('LOGOUT_FAILED' , 0x009);
-addCode('URL_TIME_LOCK' , 0x00a);
-addCode('URL_FOUND' , 0x00b);
-addCode('OVERLENGTH' , 0x00c);
-addCode('SUBJECT_URL' , 0x00d);
-addCode('BLIST_URL' , 0x00e);
-addCode('NO_RECS_LEFT' , 0x00f);
-addCode('INVALID_TAGS' , 0x010);
-addCode('MORE_POINTS' , 0x011);
-addCode('COOKIES_DISABLED' , 0x012);
-addCode('DATA_INVALID' , 0x013);
-addCode('POSSIBLE_INVALID' , 0x014);
-addCode('USER_404' , 0x015);
-addCode('STATS_404' , 0x016);
-addCode('ALREADY_CONFIRMED' , 0x017);
-addCode('ERROR_MAILID' , 0x018);
-addCode('EXTENSION_PROBLEM' , 0x019);
-addCode('MORE_RECEIVERS1' , 0x01a);
-addCode('MORE_RECEIVERS2' , 0x01b);
-addCode('MORE_RECEIVERS3' , 0x01c);
-addCode('INVALID_URL' , 0x01d);
-addCode('MENU_NOT_VALID' , 0x01e);
-addCode('LOGIN_FAILED' , 0x01f);
-addCode('BEG_SAME_AS_OWN' , 0x020);
-addCode('UNHANDLED_STATUS' , 0x021);
-addCode('MODULE_MEMBER_ONLY' , 0x022);
-addCode('UNKNOWN_ERROR' , 0x023);
-addCode('PROFILE_UPDATED' , 0x024);
+addCode('ACCOUNT_UNKNOWN' , 0x005);
+addCode('UNKNOWN_STATUS' , 0x006);
+addCode('NO_MAIL_TYPE' , 0x007);
+addCode('CNTR_FAILED' , 0x008);
+addCode('LOGOUT_DONE' , 0x009);
+addCode('LOGOUT_FAILED' , 0x00a);
+addCode('URL_TIME_LOCK' , 0x00b);
+addCode('URL_FOUND' , 0x00c);
+addCode('OVERLENGTH' , 0x00d);
+addCode('SUBJECT_URL' , 0x00e);
+addCode('BLIST_URL' , 0x00f);
+addCode('NO_RECS_LEFT' , 0x010);
+addCode('INVALID_TAGS' , 0x011);
+addCode('MORE_POINTS' , 0x012);
+addCode('COOKIES_DISABLED' , 0x013);
+addCode('DATA_INVALID' , 0x014);
+addCode('POSSIBLE_INVALID' , 0x015);
+addCode('USER_404' , 0x016);
+addCode('STATS_404' , 0x017);
+addCode('ALREADY_CONFIRMED' , 0x018);
+addCode('ERROR_MAILID' , 0x019);
+addCode('EXTENSION_PROBLEM' , 0x01a);
+addCode('MORE_RECEIVERS1' , 0x01b);
+addCode('MORE_RECEIVERS2' , 0x01c);
+addCode('MORE_RECEIVERS3' , 0x01d);
+addCode('INVALID_URL' , 0x01e);
+addCode('MENU_NOT_VALID' , 0x01f);
+addCode('LOGIN_FAILED' , 0x020);
+addCode('BEG_SAME_AS_OWN' , 0x021);
+addCode('UNHANDLED_STATUS' , 0x022);
+addCode('MODULE_MEMBER_ONLY' , 0x023);
+addCode('UNKNOWN_ERROR' , 0x024);
+addCode('PROFILE_UPDATED' , 0x025);
// Full version
setConfigEntry('FULL_VERSION', '0.2.1-FINAL');
} // END - if
// Default error code if unknown account status
- $errorCode = getCode('ACCOUNT_STATUS_UNKNOWN');
+ $errorCode = getCode('ACCOUNT_UNKNOWN');
// Generate constant name
- $codeName = sprintf("ACCOUNT_STATUS_%s", strtoupper($status));
+ $codeName = sprintf("ACCOUNT_%s", strtoupper($status));
// Is the constant there?
if (isCodeSet($codeName)) {
'WE_HAVE' => "Wir haben",
'MEMBER_TEST_URL' => "Zur beworbenen Seite",
'ADMIN_ENTER_REDIRECT_URL' => "URL eingeben, wenn abgelehnt werden soll",
- 'MEMBER_NO_REFBANNER_FOUND' => "Es sind noch keine Werbebanner eingerichtet worden. Bitte verwenden Sie solange Ihren Referal-Link.",
+ 'MEMBER_REFERAL_BANNER_404' => "Es sind noch keine Werbebanner eingerichtet worden. Bitte verwenden Sie solange Ihren Referal-Link.",
'ADMIN_ID_404' => "ID <span class=\"data\">%s</span> nicht gefunden.",
'ADMIN_ASSIGNED_ADMIN' => "Zugewiesener Admin",
'ADMIN_MEMBER_USERID' => "ID des Mitgliedes",
'ADMIN_EDIT_EMAIL_FAILED' => "Änderungen an der Mail nicht gespeichert, bitte kontaktieren Sie den Support.",
'ADMIN_EMAIL_CHANGES_SAVED' => "Die Maildaten wurden aktualisiert.",
'ADMIN_EMAIL_CHANGES_NOT_SAVED' => "Keine Änderungen an der Mail vorgenommen. Maildaten wurden NICHT geändert.",
+ 'MEMBER_REFLINK_CENTER_TITLE' => "Alle Informationen zu Ihrem Werbelink",
+ 'MEMBER_RANDOM_REFID_CONFIRMED' => "Anzahl Mails von <span class=\"data\">{%config,translateComma=user_min_confirmed%}</span> bestätigt, damit Ihr Account per Zufall selektiert wird",
+ 'MEMBER_YOUR_REFID_IS' => "Sie wurden geworben von",
'MEMBER_MAIL_BONUS_CONFIRMED_ON' => "Sie haben diese Bonusmail <span class=\"data\">%s</span> bestätigt.",
'MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN' => "Es konnte nicht festgestellt werden, wann Sie die Bonus-Mail <span class=\"data\">%s</span> bestätigt hatten.",
// @TODO Double-check configuration entry here
function determineRandomReferalId () {
// Default is zero refid
- $refid = null;
+ $refid = NULL;
// Is the extension version fine?
if (isExtensionInstalledAndNewer('user', '0.3.4')) {
list($refid) = SQL_FETCHROW($result);
// Reset all users, this makes this random referal id more challenging
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=0",
- array($refid), __FUNCTION__, __LINE__);
+ SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=0', __FUNCTION__, __LINE__);
} // END - if
// Free result
// Use dynamic call
$functionName = "getFetchedUserData('userid', \$userid, '" . $data['callback'] . "')";
} elseif (!empty($data['matches'][4][$data['key']])) {
- // User data found
+ // Do we have a number or a dollar sign in front of it?
+ if (preg_replace('/[^0123456789]/', '', $data['matches'][4][$data['key']]) != $data['matches'][4][$data['key']]) {
+ // Possible database column, so get it again
+ $data['matches'][4][$data['key']] = "getFetchedUserData('userid', getMemberId(), '" . $data['matches'][4][$data['key']] . "')";
+ } // END - if
+
+ // Fix all together
$functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
}
} elseif ((!empty($data['callback'])) && (isUserDataValid())) {
// Surround the original function call with it
$functionName = $data['extra_func'] . '(' . $functionName . ')';
} // END - if
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'functionName=' . $functionName);
// Generate replacer
$replacer = '{DQUOTE} . ' . $functionName . ' . {DQUOTE}';
$whereStatement = " WHERE `visible`='Y'";
if (isAdmin()) $whereStatement = '';
-$result = SQL_QUERY("SELECT `id`, `url`, `alternate`, `counter`, `clicks` FROM `{?_MYSQL_PREFIX?}_refbanner`", __FILE__, __LINE__);
+
+$result = SQL_QUERY('SELECT `id`, `url`, `alternate`, `counter`, `clicks` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC', __FILE__, __LINE__);
if (!SQL_HASZERONUMS($result)) {
// List available ref banners
$test = str_replace(getUrl(), getPath(), $row['url']); $size = '0';
if ($test == $row['url']) {
// Download banner (I hope you keep the banner on same server???)
- $fp = sendGetRequest($row['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
$row['userid'] = getMemberId();
// Add row
- $OUT .= loadTemplate('member_reflinks_row', true, $row);
+ $OUT .= loadTemplate('member_list_reflinks_row', true, $row);
} // END - while
// Load final template
- $content['refbanner_content'] = loadTemplate('member_reflinks_table', true, $OUT);
+ $content['refbanner_content'] = loadTemplate('member_list_reflinks', true, $OUT);
} else {
// No refbanner found
- $content['refbanner_content'] = displayMessage('{--MEMBER_NO_REFBANNER_FOUND--}', true);
+ $content['refbanner_content'] = displayMessage('{--MEMBER_REFERAL_BANNER_404--}', true);
}
// Free result
* refid = inc/modules/guest/what-confirm.php need this
* locked = Shall I pay it to normal (false) or locked (true) points ammount?
*/
-function addPointsThroughReferalSystem ($subject, $userid, $points, $refid = '0') {
+function addPointsThroughReferalSystem ($subject, $userid, $points, $refid = NULL) {
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'subject=' . $subject . ',userid=' . $userid . ',points=' . $points . ',refid=' . $refid . ' - ENTERED!');
// By default nothing has been added
$added = false;
--- /dev/null
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" align="center" class="table dashed">
+$content
+<tr>
+ <td align="center" class="table_footer">
+ {--MEMBER_REFERAL_LINKS_FOOTER--}
+ </td>
+</tr>
+</table>
+</div>
--- /dev/null
+<tr>
+ <td align="center" class="member_refbanner {%template,ColorSwitch%}">
+ <div>
+ <img src="$content[url]" alt="$content[alternate]" title="$content[alternate]" border="0" />
+ </div>
+ <div class="tiny">{--REFBANNER_TOTALS--}:
+ <strong>{%pipe,translateComma=$content[counter]%}</strong> {--REFERAL_VIEWS--} /
+ <strong>{%pipe,translateComma=$content[clicks]%}</strong> {--REFERAL_CLICKS--}
+ </div>
+ </td>
+</tr>
+<tr>
+ <td align="center" class="member_refbanner {%template,ColorSwitch%}">
+ <div class="pre"><a href="{?URL?}/click.php?user=$content[userid]&banner=$content[id]"
+ target="_blank"><img src="{?URL?}/view.php?user=$content[userid]&banner=$content[id]"
+ alt="$content[alternate]" title="$content[alternate]" border="0" /></a></div>
+ </td>
+</tr>
-<div>
- {--MEMBER_YOUR_PERSONAL_REFERAL_LINK--}:
-</div>
-<div style="padding-bottom:5px">
- <strong><a href="{?URL?}/ref.php?refid=$content[userid]" target="_blank">{?URL?}/ref.php?refid=$content[userid]</a></strong>
+<div class="table dashed">
+<div class="table_header bottom">
+ <strong>{--MEMBER_REFLINK_CENTER_TITLE--}</strong>
</div>
+<ul class="listing">
+<li class="listing">
+ {--MEMBER_YOUR_PERSONAL_REFERAL_LINK--}:<br />
+ <strong><a href="{?URL?}/ref.php?refid=$content[userid]"
+ target="_blank">{?URL?}/ref.php?refid=$content[userid]</a></strong>
+</li>
$content[nickname_content]
-<div style="padding-top:5px">
- {--MEMBER_YOUR_REFCLICKS--}: <strong>{%user,ref_clicks,translateComma%}</strong> {--CLICKS--}
+<li class="listing">
+ {--MEMBER_YOUR_REFCLICKS--}:<br />
+ <strong>{%user,ref_clicks,translateComma%}</strong> {--CLICKS--}
+</li>
+<li class="listing">
+ {--MEMBER_RANDOM_REFID_CONFIRMED--}:<br />
+ <strong>{%user,rand_confirmed,translateComma%}</strong>
+</li>
+<li class="listing">
+ {--MEMBER_YOUR_REFID_IS--}:<br />
+ <strong>{%user,refid,makeNullToZero%}</strong> (<strong>{%user,nickname,fixEmptyContentToDashes=refid%}</strong>)
+</li>
+</div>
</div>
-<div>
+
+<div class="para">
$content[refbanner_content]
</div>
-<div>
+<div class="para">
{--MEMBER_NICKNAME_YOUR_REFERAL_LINK--}:
</div>
-<div>
+<div class="para">
<strong><a href="{?URL?}/ref.php?refid=$content" target="_blank">{?URL?}/ref.php?refid=$content</a></strong>
</div>
-<tr>
- <td align="center" class="member_refbanner {%template,ColorSwitch%}">
- <div>
- <img src="$content[url]" alt="$content[alternate]" title="$content[alternate]" border="0" />
- </div>
- <div class="tiny">{--REFBANNER_TOTALS--}:
- <strong>$content[counter]</strong> {--REFERAL_VIEWS--} /
- <strong>$content[clicks]</strong> {--REFERAL_CLICKS--}
- </div>
- </td>
-</tr>
-<tr>
- <td align="center" class="member_refbanner {%template,ColorSwitch%}">
- <div class="pre"><a href="{?URL?}/click.php?user=$content[userid]&banner=$content[id]"
- target="_blank"><img src="{?URL?}/view.php?user=$content[userid]&banner=$content[id]"
- alt="$content[alternate]" title="$content[alternate]" border="0" /></a></div>
- </td>
-</tr>
+<!-- @DEPRECATED //-->
-<div align="center">
-<table border="0" cellspacing="0" cellpadding="0" align="center" class="table dashed">
-$content
-<tr>
- <td align="center" class="table_footer">
- {--MEMBER_REFERAL_LINKS_FOOTER--}
- </td>
-</tr>
-</table>
-</div>
+<!-- @DEPRECATED //-->
.rank_3 {
font-weight: bold;
}
+
+ul.listing {
+ text-align: left;
+ margin-top: 5px;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding-left: 5px;
+ list-style-type: none;
+}
+
+li.listing {
+ padding-bottom: 5px;
+}
.rank_3 {
font-weight: bold;
}
+
+ul.listing {
+ text-align: left;
+ margin-top: 5px;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding-left: 5px;
+ list-style-type: none;
+}
+
+li.listing {
+ padding-bottom: 5px;
+}
.rank_3 {
font-weight: bold;
}
+
+ul.listing {
+ text-align: left;
+ margin-top: 5px;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding-left: 5px;
+ list-style-type: none;
+}
+
+li.listing {
+ padding-bottom: 5px;
+}
.rank_3 {
font-weight : bold;
}
+
+ul.listing {
+ text-align: left;
+ margin-top: 5px;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding-left: 5px;
+ list-style-type: none;
+}
+
+li.listing {
+ padding-bottom: 5px;
+}
.rank_3 {
font-weight : bold;
}
+
+ul.listing {
+ text-align: left;
+ margin-top: 5px;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding-left: 5px;
+ list-style-type: none;
+}
+
+li.listing {
+ padding-bottom: 5px;
+}
margin-left : 10px;
margin-right : 10px;
}
+
+ul.listing {
+ text-align: left;
+ margin-top: 5px;
+ margin-left: 5px;
+ margin-right: 5px;
+ padding-left: 5px;
+ list-style-type: none;
+}
+
+li.listing {
+ padding-bottom: 5px;
+}