]> git.mxchange.org Git - mailer.git/commitdiff
Fixes for compilation, more EL code:
authorRoland Häder <roland@mxchange.org>
Thu, 14 Jul 2011 12:17:57 +0000 (12:17 +0000)
committerRoland Häder <roland@mxchange.org>
Thu, 14 Jul 2011 12:17:57 +0000 (12:17 +0000)
- More usage of EL code
- Compilation will now compile {OPEN_TEMPLATE} and its brothers out
- Compilation loop count will be added in HTML code and if debug-mode is enabled
- TODOs.txt updated

20 files changed:
DOCS/TODOs.txt
inc/extensions/ext-bonus.php
inc/extensions/ext-user.php
inc/functions.php
inc/language/de.php
inc/language/order_de.php
inc/libs/user_functions.php
inc/modules/admin/what-list_cats.php
inc/modules/admin/what-list_links.php
inc/modules/member/what-order.php
inc/template-functions.php
templates/de/html/admin/admin_list_beg_rows.tpl
templates/de/html/admin/admin_list_links.tpl
templates/de/html/admin/admin_list_rallye_usr_row.tpl
templates/de/html/admin/admin_list_rallyes_row2.tpl
templates/de/html/admin/admin_list_refs.tpl
templates/de/html/admin/admin_list_refs2.tpl
templates/de/html/admin/admin_list_user_cats.tpl
templates/de/html/admin/admin_list_user_cats_404.tpl
templates/de/html/admin/admin_send_bonus_select.tpl

index 72475d7ffdb61d2ffadb6743c1ee9f679fc811e9..89adf4e7d662fdb8068cac674eaa9d6eb53fbb93 100644 (file)
@@ -54,9 +54,9 @@
 ./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: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/de.php:1062:    // @TODO Rewrite these two constants
+./inc/language/de.php:1078:    // @TODO Rewrite these three constants
+./inc/language/de.php:754:// @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/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *
 ./inc/modules/admin/what-list_autopurge.php:47:// @TODO Rewrite those lines to filter
 ./inc/modules/admin/what-list_bonus.php:133:           // @TODO Can't this be moved into our expression language?
 ./inc/modules/admin/what-list_cats.php:54:             // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-./inc/modules/admin/what-list_cats.php:69:                             // @TODO Rewrite this to countSum.....() function
+./inc/modules/admin/what-list_cats.php:68:                             // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_links.php:55:            // @TODO Try to rewrite this to a filter
 ./inc/modules/admin/what-list_links.php:85:                            // @TODO Find a way to rewrite this. See some lines above for different queries
 ./inc/modules/admin/what-list_links.php:93:                                    // @TODO Rewrite this to includes/filter
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/purge/purge-inact.php:55:        // @TODO Rewrite these if() blocks to a filter
 ./inc/revision-functions.php:169:// @TODO This function does also set and get in 'cache_array'
-./inc/template-functions.php:1072:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1083:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1176:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1209:             // @TODO Add a little more infos here
-./inc/template-functions.php:1523:// @TODO Lame description for this function
-./inc/template-functions.php:1545:                     // @TODO Move this in a filter
+./inc/template-functions.php:1081:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1092:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1182:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1215:             // @TODO Add a little more infos here
+./inc/template-functions.php:1529:// @TODO Lame description for this function
+./inc/template-functions.php:1551:                     // @TODO Move this in a filter
 ./inc/template-functions.php:189:       * @TODO On some pages this is buggy
-./inc/template-functions.php:269:              // @TODO Remove this sanity-check if all is fine
-./inc/template-functions.php:432:      // @TODO $DATA is deprecated and should be avoided and replaced with $content
-./inc/template-functions.php:598:// @TODO $simple/$constants are deprecated
-./inc/template-functions.php:624:      // @TODO Do only use $content and deprecate $DATA in templates
+./inc/template-functions.php:275:              // @TODO Remove this sanity-check if all is fine
+./inc/template-functions.php:438:      // @TODO $DATA is deprecated and should be avoided and replaced with $content
+./inc/template-functions.php:604:// @TODO $simple/$constants are deprecated
+./inc/template-functions.php:630:      // @TODO Do only use $content and deprecate $DATA in templates
 ./inc/wrapper-functions.php:130:// @TODO Implement $compress
 ./inc/wrapper-functions.php:137:// @TODO Implement $decompress
 ./inc/wrapper-functions.php:514:// @TODO Do some more sanity check here
index b8b987bb2e6b67b0e40812081f8c4b0b2c31674a..e215afd7b0af7074b1498310710c62abf34a26ec 100644 (file)
@@ -73,7 +73,6 @@ PRIMARY KEY (`id`),
 INDEX (`cat_id`)",
                        'Bonus mails');
 
-               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_links` CHANGE `link_type` `link_type` ENUM('NORMAL','BONUS') NOT NULL DEFAULT 'NORMAL'");
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_links` ADD `bonus_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_links` ADD INDEX (`bonus_id`)");
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_bonus` ADD `html_msg` ENUM('Y','N') NOT NULL DEFAULT 'N'");
index 17ea3ebebad79102207d3c8de0d0b3b2650a5391..c6c7368f36ebebdc281ad2d78257078f15343306 100644 (file)
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.4.4');
+setThisExtensionVersion('0.4.5');
 
 // Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4'));
+setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
@@ -118,7 +118,7 @@ INDEX (`userid`)",
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `stats_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-`link_type` ENUM('NORMAL') NOT NULL DEFAULT 'NORMAL',
+`link_type` VARCHAR(255) NOT NULL DEFAULT 'NORMAL',
 PRIMARY KEY (`id`),
 INDEX (`userid`),
 INDEX (`stats_id`)",
@@ -469,11 +469,19 @@ INDEX (`level`),
 INDEX (`refid`)",
                                        'User referals');
 
+                               // Load ext-refback's special include to regenerate the referal table
+                               addIncludeToPool('extension', 'inc/fix_refsystem.php');
+
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Neues Tabellenlayout und verschoben von ext-refback.");
+                               break;
 
-                               // Load ext-refback's special include to regenerate the referal table
-                               addIncludeToPool('extension', 'inc/fix_refsystem.php');
+                       case '0.4.5': // SQL queries for v0.4.5
+                               // SQL commands to run
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_links` CHANGE `link_type` `link_type` VARCHAR(255) NOT NULL DEFAULT 'NORMAL'");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Die Spalte <strong>link_type</strong> ist nun kein ENUM mehr, um weitere Mailtypen zu erlauben.");
                                break;
                } // END - switch
                break;
index c9713ce1d5fd66a45fa239b2bac3a85076347b1b..fdf4b97ecf6c66de6c01f12e98c2176e4acf7c71 100644 (file)
@@ -2457,6 +2457,30 @@ function convertStringToBoolean ($str) {
        return (($str == 'true') ? true : false);
 }
 
+/**
+ * "Makes" a variable in given string parseable, this function will throw an
+ * error if the first character is not a dollar sign.
+ *
+ * @param      $varString      String which contains a variable
+ * @return     $return         String with added single quotes for better parsing
+ */
+function makeParseableVariable ($varString) {
+       // The first character must be a dollar sign
+       if (substr($varString, 0, 1) != '$') {
+               // Please report this
+               debug_report_bug(__FUNCTION__, __LINE__, 'varString=' . $varString . ' - No dollar sign detected, will not parse it.');
+       } // END - if
+
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][$varString])) {
+               // Snap them in, if [,] are there
+               $GLOBALS[__FUNCTION__][$varString] = str_replace('[', "['", str_replace(']', "']", $varString));
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__][$varString];
+}
+
 //-----------------------------------------------------------------------------
 // Automatically re-created functions, all taken from user comments on www.php.net
 //-----------------------------------------------------------------------------
index afae8939637df84593d5002134fd1435cbcdbb1c..f1bd5228b967953c8aaae62064d9e66e7a89af31 100644 (file)
@@ -340,8 +340,6 @@ addMessages(array(
        'REFERAL_VIEWS' => "Views",
        'REFERAL_IS_ACTIVE' => "Aktiv?",
        'POINTS_USED' => "Verbrauchte {?POINTS?}",
-       'MEMBER_NO_POINTS' => "Sie haben keine {?POINTS?} mehr zum Versenden &uuml;brig.",
-       'MEMBER_NO_PAYMENTS' => "Der Admin dieses {?mt_word3?} hat noch keine Mailarten definiert.",
        'MEMBER_POINTS_LEFT' => "{?POINTS?}-Guthaben zum Mailversand &uuml;brig",
        'SELECT_MAIL_TYPE' => "Mailart ausw&auml;hlen",
        'PLEASE_SELECT' => "Bitte ausw&auml;hlen",
@@ -563,16 +561,14 @@ addMessages(array(
        'KBYTES' => "KBytes",
        'DEFAULT_SUBJECT_LINE' => "Klick-Mail von {?MAIN_TITLE?}",
        'MEBER_UPDATE_PWD_WRONG' => "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen.",
-       'ADMIN_MEMBER_NO_CATEGORIES_1' => "Das Mitglied <u>",
-       'ADMIN_MEMBER_NO_CATEGORIES_2' => "</u> hat keine Kategorien ausgew&auml;hlt.",
+       'ADMIN_MEMBER_NO_CATEGORIES' => "Das Mitglied <span class=\"data\">{%%pipe,generateUserProfileLink=%s%%}</span> hat keine Kategorien ausgew&auml;hlt.",
        'USER_ID' => "Mitglied",
        'UNCONFIRMED_LINKS' => "Unbest&auml;tigte Mails",
-       'ADMIN_MEMBER_LINKS' => "Das Mitglied <span class=\"data\">%s</span> hat alle seine Mails best&auml;tigt.",
-       'MEMBER_TOTAL_LINKS' => "Es m&uuml;ssen noch <span class=\"data\">%s</span> Mails von diesem Mitglied best&auml;tigt werden.",
+       'ADMIN_NO_UNCONFIRMED_MAILS_LEFT' => "Das Mitglied <span class=\"data\">%s</span> hat alle seine Mails best&auml;tigt.",
+       'ADMIN_TOTAL_LINKS_LEFT' => "Es m&uuml;ssen noch <span class=\"data\">%s</span> Mails von diesem Mitglied best&auml;tigt werden.",
        'ADMIN_DELETE_UNCONFIRMED_LINKS' => "Alle unbest&auml;tigten Mails l&ouml;schen",
        'ADMIN_LINKS_DELETED' => "Links f&uuml;r unbest&auml;tigte Mails wurden gel&ouml;scht.",
        'ADMIN_DELETE_LINK_SUBJECT' => "Ihr unbest&auml;tigen Mails wurden gel&ouml;scht.",
-       'MEMBER_LINKS_LEFT' => "Sie haben <span class=\"data\">%s</span> unbest&auml;tigte Mails. Bitte best&auml;tigen Sie diese zuerst. Wenn Sie weniger als <span class=\"data\">{?unconfirmed?}</span> Mails im Account haben, k&ouml;nnen Sie auch wieder buchen.",
        'TODAY' => "Heute",
        'MEMBER_PROFILE_LOCKED' => "Sie k&ouml;nnen Ihren Account erst am <span class=\"data\">%s</span> wieder &auml;ndern.",
        'MEMBER_HAS_ZERO_MMAILS' => "Sie haben Ihren Empfang auf <strong>Urlaub</strong> stehen! Bitte stellen Sie unter &quot;Profildaten &auml;ndern&quot; den Empfang h&ouml;her ein.",
@@ -874,7 +870,7 @@ addMessages(array(
        'ADMIN_ENTER_REFERAL_BANNER_URL' => "Banner-URL",
        'ADMIN_ENTER_ALTERNATE_REFERAL_BANNER_TEXT' => "Alternativen Text",
        'ADMIN_SELECT_REFERAL_BANNER_ACTIVE' => "Ist der Werbebanner aktiv?",
-       'ADMIN_LIST_REFERALS' => "Referal-&Uuml;bersicht des Mitgliedes <span class=\"data\">%s</span> in allen Ebenen:",
+       'ADMIN_LIST_REFERALS' => "Referal-&Uuml;bersicht des Mitgliedes <span class=\"data\">{%%pipe,generateUserProfileLink=%s%%}</span> in allen Ebenen:",
        'ADMIN_LIST_REFERALS_LEVEL' => "Referals in Ebene <span class=\"data\">%s</span>:",
        'ADMIN_LIST_REFERALS_NOTE' => "<strong>&Auml;nderung:</strong> Klicken Sie die Mitglieder-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.",
        'ADMIN_NORMAL_MAIL_ALREADY_DELETED' => "Mitglieder-Mail bereits gel&ouml;scht.",
index f6f8db3cccf555f064ebeb0b43f52478465a6f0f..97728d971e69595b5b625cad1c8ab6c3a8fe42d6 100644 (file)
@@ -64,6 +64,9 @@ addMessages(array(
        'MEMBER_ORDER_ALLOWED_EXHAUSTED' => "Sie k&ouml;nnen keine weiteren Mails mehr versenden, oder stellen Sie bitte den Empfang h&ouml;her ein.",
        'MEMBER_ENTER_INVALID_URL' => "Ung&uuml;tige URL eingegeben.",
        'MEMBER_NO_MAIL_TYPE_SELECTED' => "Bitte w&auml;hlen Sie eine Mailart aus.",
+       'MEMBER_ORDER_NO_POINTS' => "Sie haben keine {?POINTS?} mehr zum Versenden &uuml;brig.",
+       'MEMBER_ORDER_NO_PAYMENTS' => "Der Admin dieses {?mt_word3?} hat noch keine Mailarten definiert.",
+       'MEMBER_ORDER_LINKS_LEFT' => "Sie haben <span class=\"data\">%s</span> unbest&auml;tigte Mails. Bitte best&auml;tigen Sie diese zuerst. Wenn Sie weniger als <span class=\"data\">{?unconfirmed?}</span> Mails im Account haben, k&ouml;nnen Sie auch wieder buchen.",
 
        'ADMIN_ORDER_SELECT_COLUMN_USERID' => "Mitgliedsnummer",
        'ADMIN_ORDER_SELECT_COLUMN_ZIP' => "Postleitzahl",
index bd678e42788081c48588fe394fe2a083af5c7ef7..b7d06247d812cdb9e6b8ac03fc856538934c2753 100644 (file)
@@ -741,9 +741,9 @@ function doExpressionUser ($data) {
        // User-related data, so is there a userid?
        if (!empty($data['matches'][4][$data['key']])) {
                // Do we have a userid or $userid?
-               if ($data['matches'][4][$data['key']] == '$userid') {
+               if (substr($data['matches'][4][$data['key']], 0, 1) == '$') {
                        // Use dynamic call
-                       $functionName = "getFetchedUserData('userid', \$userid, '" . $data['callback'] . "')";
+                       $functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
                } elseif (!empty($data['matches'][4][$data['key']])) {
                        // 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']]) {
index 8ea0db4b69bbc1008fc8a5f52e56e11aebb31890..73282a156468fcd838905735dc1185a511d636de 100644 (file)
@@ -52,8 +52,7 @@ if (isGetRequestParameterSet('userid')) {
 
                // Prepare constants
                // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-               $content['userid']       = bigintval(getRequestParameter('userid'));
-               $content['email']        = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
+               $content['email']  = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                // Ok, list categories of this user
                $result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
index c337642ab1d8b4734e2e784864ecdc5413725767..d5388fb56013153ad8de66ec214e3f375f98727e 100644 (file)
@@ -145,8 +145,6 @@ if (isGetRequestParameterSet('userid')) {
                                } // END - while
 
                                // Remember list in constant for the template
-                               $content['surname'] = getUserData('surname');
-                               $content['family']  = getUserData('family');
                                $content['email']   = '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . getUserData('email') . '</a>';
                                $content['rows']    = $OUT;
                                $content['nums']    = SQL_NUMROWS($result);
@@ -160,7 +158,7 @@ if (isGetRequestParameterSet('userid')) {
                        }
                } else {
                        // No mails left to confirm
-                       displayMessage('{%message,ADMIN_MEMBER_LINKS=' . bigintval(getRequestParameter('userid')) . '%}');
+                       displayMessage('{%message,ADMIN_NO_UNCONFIRMED_MAILS_LEFT=' . bigintval(getRequestParameter('userid')) . '%}');
                }
        } else {
                // User not found
index 95a1e0d9e59c853102ca0146b4654a64373428d5..de7899c8f22587618be64879395ce65ce731a4d5 100644 (file)
@@ -723,11 +723,11 @@ LIMIT 1",
                                }
                        } else {
                                // No mail types defined
-                               displayMessage('<span class="notice">{--MEMBER_NO_PAYMENTS--}</span>');
+                               displayMessage('<span class="notice">{--MEMBER_ORDER_NO_PAYMENTS--}</span>');
                        }
                } else {
                        // No points left
-                       displayMessage('<span class="notice">{--MEMBER_NO_POINTS--}</span>');
+                       displayMessage('<span class="notice">{--MEMBER_ORDER_NO_POINTS--}</span>');
                }
        } else {
                // No cateogries are defined yet
@@ -735,7 +735,7 @@ LIMIT 1",
        }
 } else {
        // Please confirm some mails first
-       displayMessage('<span class="notice">{%message,MEMBER_LINKS_LEFT=' . $links . '%}</span>', $links);
+       displayMessage('<span class="notice">{%message,MEMBER_ORDER_LINKS_LEFT=' . $links . '%}</span>', $links);
 }
 
 if (!empty($url)) {
index 29e3e092db01218a48b7830291dd3de344f83786..25e899ee11d3d8ec3ad2063ed8183d6ebb1bf3a4 100644 (file)
@@ -217,9 +217,6 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
        // Init counter
        $count = 0;
 
-       // Compile the raw code
-       $code = compileRawCode($code);
-
        // Compile all out
        while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($count < 7)) {
                // Init common variables
@@ -243,10 +240,19 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
                // Use it again
                $code = $newContent;
 
+               // Compile the final code
+               $code = compileRawCode($code);
+
                // Count round
                $count++;
        } // END - while
 
+       // Add debugging data in HTML code, if mode is enabled
+       if ((isDebugModeEnabled()) && ($insertComments === true)) {
+               // Add loop count
+               $code .= '<!-- Total compilation loop=' . $count . ' //-->';
+       } // END - if
+
        // Return the compiled code
        return $code;
 }
@@ -659,12 +665,15 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
                                $newMatch = str_replace('[', "['", str_replace(']', "']", $match));
                                $code = str_replace($match, '".' . $newMatch . '."', $code);
                                $matchesFound[$key . '_' . $matches[4][$key]] = 1;
-                               $matchesFound[$match] = 1;
+                               $matchesFound[$match] = true;
                        } elseif (!isset($matchesFound[$match])) {
                                // Not yet replaced!
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'match=' . $match);
                                $code = str_replace($match, '".' . $match . '."', $code);
                                $matchesFound[$match] = 1;
+                       } else {
+                               // Everthing else should be a least logged
+                               logDebugMessage(__FUNCTION__, __LINE__, 'match=' . $match . ',key=' . $key);
                        }
                } // END - foreach
        } // END - if
@@ -1119,9 +1128,6 @@ function generateEmailLink ($email, $table = 'admins') {
                $EMAIL = generateSponsorEmailLink($email);
        }
 
-       // Shall I close the link when there is no admin?
-       if ((!isAdmin()) && ($EMAIL == $email)) $EMAIL = '#'; // Closed!
-
        // Return email link
        return $EMAIL;
 }
index 261ae7759b57baf243bf621b8cdfef0a46233565..a6b1c0411dc0ed13f72beec2e3fd03e580d2a827 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[win1]$content[cnt]$content[win2]</td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[win1]<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>$content[win2]</td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">$content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2]</td>
        <td class="{%template,ColorSwitch%} bottom right">$content[win1]<a href="$content[email]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</a>$content[win2]</td>
        <td class="{%template,ColorSwitch%} bottom right">{%pipe,translateComma=$content[beg_points]%} {?POINTS?}</td>
        <td class="{%template,ColorSwitch%} bottom">$content[last_online]</td>
index a58b56b7c6747407f273bfedd96fc383e1269b14..31dfe3d04a1b56430c99a0fdf63f669fe2eaa88b 100644 (file)
@@ -2,13 +2,16 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header bottom" height="40">
-                       <strong><a href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[surname] $content[family]</a></strong> ($content[email]):
+                       {%user,gender,translateGender=$content[userid]%}
+                       {%user,surname=$content[userid]%}
+                       {%user,family=$content[userid]%}
+                       {%pipe,generateUserProfileLink=$content[userid]%}:
                </td>
        </tr>
        $content[rows]
        <tr>
                <td colspan="4" height="40" class="table_footer" align="center">
-                       {%message,MEMBER_TOTAL_LINKS=$content[nums]%}<br />
+                       {%message,ADMIN_TOTAL_LINKS_LEFT=$content[nums]%}<br />
                        <a href="{%url=modules.php?module=admin&amp;what=list_links&amp;userid=$content[userid]&amp;del=all%}" onclick="return confirm('{--ADMIN_REALLY_DELETE_ALL_MAILS--}')">{--ADMIN_DELETE_UNCONFIRMED_LINKS--}</a>
                </td>
        </tr>
index 1aa2935b39c7412678de0c8c4a2ce14d0423c70a..71951c5a821111d24aeb90227986302d2c4b74dd 100644 (file)
@@ -1,7 +1,6 @@
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-       $content[bold_l]<a
-               href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>$content[bold_r]
+               $content[bold_l]{%pipe,generateUserProfileLink=$content[userid]%}$content[bold_r]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                $content[bold_l]$content[refs]$content[bold_r]
index d7ba771963b46a4b2ca2221ad15ce6023ff8291a..555c1fb9c073a37c20f209fb7d49b3c57d1b7e8a 100644 (file)
@@ -1,7 +1,6 @@
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-       $content[bold_l]<a
-               href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>$content[bold_r]
+               $content[bold_l]{%pipe,generateUserProfileLink=$content[userid]%}$content[bold_r]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                $content[bold_l]$content[old]$content[bold_r]
index fa2ed988d391ae7744cb780774ac10f559b2b1fe..8cd32d5aa18a450897b200220c2779921dfada1d 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="6" class="table_header">
-               <strong>{%message,ADMIN_LIST_REFERALS={%pipe,generateUserProfileLink=$content[userid]%}%}</strong>
+               <strong>{%message,ADMIN_LIST_REFERALS=$content[userid]%}</strong>
        </td>
 </tr>
 <tr>
index db883bb9ab0c1721f10c59fbac35b8071e3d1e74..064c22b5b77b147e1749740134f6e7eeb9bc03f3 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom">
-               <strong>{%message,ADMIN_LIST_REFERALS={%pipe,generateUserProfileLink=$content[userid]%}%}</strong>
+               <strong>{%message,ADMIN_LIST_REFERALS=$content[userid]%}</strong>
        </td>
 </tr>
 $content[rows]
index 52e6650b0bf816e46e0532fa71091c413fc1d6dd..67335c0f1fbf3599e89eabdcf3a25d22eb944837 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header bottom" height="50">
-                       {--USER_ID--}: <strong><a href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a></strong>
+                       {--USER_ID--}: <strong>{%pipe,generateUserProfileLink=$content[userid]%}</strong>
                        ($content[email])
                </td>
        </tr>
@@ -10,7 +10,7 @@
        <tr>
                <td colspan="3" class="table_footer">
                        <div>
-                               <u>{--ADMIN_MEMBER_FUNCTIONS--}:</u>
+                               <strong>{--ADMIN_MEMBER_FUNCTIONS--}:</strong>
                        </div>
                        <div>
                                {%pipe,generateMemberAdminActionLinks=$content[userid]%}
index 66c6b97b69f10b7be52c9c3797c826cc3da67624..b4db354ebc2c41068b8f23ffb897056244d67d7b 100644 (file)
@@ -1,11 +1,11 @@
 <div align="center">
 <div class="table dashed">
        <div class="table_header bottom">
-               <strong>{--ADMIN_MEMBER_NO_CATEGORIES_1--}<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;userid=$content[userid]%}">$content[userid]</a>{--ADMIN_MEMBER_NO_CATEGORIES_2--}</strong>
+               <strong>{%message,ADMIN_MEMBER_NO_CATEGORIES=$content[userid]%}</strong>
        </div>
        <div class="table_header">
                <div>
-                       <u>{--ADMIN_MEMBER_FUNCTIONS--}:</u>
+                       <strong>{--ADMIN_MEMBER_FUNCTIONS--}:</strong>
                </div>
                <div>
                        {%pipe,generateMemberAdminActionLinks=$content[userid]%}
index a54a8ff8ab58fd0186a03d74db337073b00ca0cb..07adc6e80e3df5f107c4c9db8e34b721a26ec87e 100644 (file)
@@ -1,18 +1,27 @@
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td align="center" class="table_header bottom"><strong>{--ADMIN_SEND_BONUS_MAILS--}</strong></td>
-       </tr>
-       <tr>
-               <td style="padding-left: 7px; padding-top: 5px; padding-bottom: 5px" class="bottom">
-                       <strong><big>&middot;</big></strong>&nbsp;<a href="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mode=normal%}">{--ADMIN_SEND_BONUS_NORMAL--}</a>
-                       <div class="notice">{--ADMIN_SEND_BONUS_NORMAL_NOTES--}</div>
-               </td>
-       </tr>
-       <tr>
-               <td style="padding-left: 7px; padding-top: 5px; padding-bottom: 5px">
-                       <strong><big>&middot;</big></strong>&nbsp;<a href="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mode=html%}">{--ADMIN_SEND_BONUS_HTML--}</a><br />
-                       <br />
-                       <div class="notice">{--ADMIN_SEND_BONUS_HTML_NOTES--}</div>
-               </td>
-       </tr>
-</table>
+<div align="center">
+<div class="table dashed">
+       <div class="table_header bottom">
+               <strong>{--ADMIN_SEND_BONUS_MAILS--}</strong>
+       </div>
+       <div align="left">
+               <ul class="listing">
+                       <li class="listing">
+                               <div class="para">
+                                       <a href="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mode=normal%}">{--ADMIN_SEND_BONUS_NORMAL--}</a>
+                               </div>
+                               <div class="para">
+                                       {--ADMIN_SEND_BONUS_NORMAL_NOTES--}
+                               </div>
+                       </li>
+                       <li class="listing">
+                               <div class="para">
+                                       <a href="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mode=html%}">{--ADMIN_SEND_BONUS_HTML--}</a>
+                               </div>
+                               <div class="para">
+                                       {--ADMIN_SEND_BONUS_HTML_NOTES--}
+                               </div>
+                       </li>
+               </ul>
+       </div>
+</div>
+</div>