Huge script change, see http://forum.mxchange.org/topic-458.html for details:

[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 ede146da64455ac5aa4e213fa50dc533a1ca29ea..f28f4964f64366cc693e602a874d52de2865db4c 100644 (file)
--- a/inc/modules/member/what-beg.php
+++ b/inc/modules/member/what-beg.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *

  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *


@@ -38,20 +38,23 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
 
 // Some security stuff...
 if (!defined('__SECURITY')) {

-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!IS_MEMBER()) {
-       redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
-       return;
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();

 }
 
 // Add description as navigation point
 }
 
 // Add description as navigation point

-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('beg')) && (!isAdmin())) {
+       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('beg'));
+       return;
+} // END - if
+
+// Get userid
+$userid = getUserId();

 
 

-$uid = getUserId();
-if (EXT_IS_ACTIVE('nickname')) {
+if (isExtensionActive('nickname')) {

        // Load nickname
        $data = 'nickname';
 } else {
        // Load nickname
        $data = 'nickname';
 } else {


@@ -60,30 +63,33 @@ if (EXT_IS_ACTIVE('nickname')) {
 }
 
 // Run SQL command
 }
 
 // Run SQL command

-$result = SQL_QUERY_ESC("SELECT ".$data.", `beg_clicks`
-FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE `userid`=%s
-LIMIT 1", array($uid), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT
+       `".$data."`, `beg_clicks`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+       `userid`=%s
+LIMIT 1", array($userid), __FILE__, __LINE__);

 
 

-list($uid, $clicks) = SQL_FETCHROW($result);
+list($userid, $clicks) = SQL_FETCHROW($result);

 
 // Free result
 SQL_FREERESULT($result);
 
 // Set User-ID when no nickname was found
 $nickname = true;
 
 // Free result
 SQL_FREERESULT($result);
 
 // Set User-ID when no nickname was found
 $nickname = true;

-if (empty($uid)) { $uid = getUserId(); $nickname = false; }
+if (empty($userid)) { $userid = getUserId(); $nickname = false; }

 
 // Prepare constants
 
 // Prepare constants

-define('__BEG_UID'        , $uid);
-define('__BEG_CLICKS'     , $clicks);
-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')));
+$content['userid'] = $userid;
+$content['clicks'] = $clicks;
+$content['points'] = translateComma(getConfig('beg_points'));
+$content['points_max'] = translateComma(getConfig('beg_points_max'));
+$content['timeout'] = createFancyTime(getConfig('beg_timeout'));
+// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));

 
 // Load template
 
 // Load template

-LOAD_TEMPLATE('member_' . substr(basename(__FILE__), 5, -4));
+loadTemplate('member_' . substr(basename(__FILE__), 5, -4), false, $content);

 
 

-//
+// [EOF]

 ?>
 ?>