Ref link fixed, nickname fixed, several rewrites, TODOs.txt updated:

[mailer.git] / inc / modules / member / what-beg.php

diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php
index bf048dcac099f0ce4f530969feba1555fcc0792b..ede146da64455ac5aa4e213fa50dc533a1ca29ea 100644 (file)
--- a/inc/modules/member/what-beg.php
+++ b/inc/modules/member/what-beg.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bettel-Link                                      *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,52 +38,52 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
-       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
-$uid = $GLOBALS['userid'];
-if (EXT_IS_ACTIVE("nickname"))
-{
+$uid = getUserId();
+if (EXT_IS_ACTIVE('nickname')) {
        // Load nickname
-       $data = "nickname";
-}
- else
-{
+       $data = 'nickname';
+} else {
        // Load userid
-       $data = "userid";
+       $data = 'userid';
 }
 
 // Run SQL command
-$result = SQL_QUERY_ESC("SELECT ".$data.", beg_clicks
-FROM `"._MYSQL_PREFIX."_user_data`
-WHERE userid=%s
+$result = SQL_QUERY_ESC("SELECT ".$data.", `beg_clicks`
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `userid`=%s
 LIMIT 1", array($uid), __FILE__, __LINE__);
+
 list($uid, $clicks) = SQL_FETCHROW($result);
+
+// Free result
 SQL_FREERESULT($result);
 
 // Set User-ID when no nickname was found
 $nickname = true;
-if (empty($uid)) { $uid = $GLOBALS['userid']; $nickname = false; }
+if (empty($uid)) { $uid = getUserId(); $nickname = false; }
 
 // Prepare constants
 define('__BEG_UID'        , $uid);
 define('__BEG_CLICKS'     , $clicks);
-define('__BEG_POINTS'     , TRANSLATE_COMMA(getConfig('beg_points')));
-define('__BEG_POINTS_MAX' , TRANSLATE_COMMA(getConfig('beg_points_max')));
-define('__BEG_TIMEOUT'    , CREATE_FANCY_TIME(getConfig('beg_timeout')));
-define('__BEG_UID_TIMEOUT', CREATE_FANCY_TIME(getConfig('beg_uid_timeout')));
+define('__BEG_POINTS'     , translateComma(getConfig('beg_points')));
+define('__BEG_POINTS_MAX' , translateComma(getConfig('beg_points_max')));
+define('__BEG_TIMEOUT'    , createFancyTime(getConfig('beg_timeout')));
+define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_uid_timeout')));
 
 // Load template
-LOAD_TEMPLATE("member_".substr(basename(__FILE__), 5, -4));
+LOAD_TEMPLATE('member_' . substr(basename(__FILE__), 5, -4));
 
 //
 ?>