CSS classes cleaned up, templates simplified:
[mailer.git] / inc / libs / register_functions.php
index 89539ff5461a68658e4522d65f5888a0b97d1303..7e08dcbdf89638d2f19cff87944b261681240589 100644 (file)
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 //
 function ifRequiredRegisterFieldsAreSet (&$array) {
@@ -84,26 +84,22 @@ function registerGenerateCategoryTable ($mode, $return=false) {
        if (isAdmin()) $AND = '';
 
        // Look for categories
-       $result = SQL_QUERY("SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ".$AND." ORDER BY `sort` ASC",
+       $result = SQL_QUERY('SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
                __FUNCTION__, __LINE__);
 
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // List alle visible modules (or all to the admin)
                $OUT .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare array for the template
-                       $content = array(
-                               'cat'   => $content['cat'],
-                               'def_y' => '',
-                               'def_n' => '',
-                               'id'    => $content['id'],
-                       );
+                       $content['default_yes'] = '';
+                       $content['default_no']  = '';
 
                        // Mark categories
                        if ((postRequestParameter('cat', $content['id']) == 'Y') || ((getConfig('register_default') == 'Y') && (!isPostRequestParameterSet('cat', $content['id'])))) {
-                               $content['def_y'] = ' checked="checked"';
+                               $content['default_yes'] = ' checked="checked"';
                        } else {
-                               $content['def_n'] = ' checked="checked"';
+                               $content['default_no']  = ' checked="checked"';
                        }
 
                        // Load template and switch color
@@ -130,16 +126,16 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 // Outputs a 'failed message'
 function registerOutputFailedMessage ($messageId, $extra='') {
        if (empty($messageId)) {
-               outputHtml('<div class="register_failed">' . $extra . '</div>');
+               outputHtml('<div class="guest_failed">' . $extra . '</div>');
        } else {
-               outputHtml('<div class="register_failed">{--' . $messageId . '--}' . $extra . '</div>');
+               outputHtml('<div class="guest_failed">{--' . $messageId . '--}' . $extra . '</div>');
        }
 }
 
 // Run a filter for must-fillout fields
 function FILTER_REGISTER_MUST_FILLOUT ($content) {
        // Get all fields for output
-       $result = SQL_QUERY("SELECT `field_name`, `field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC",
+       $result = SQL_QUERY('SELECT `field_name`, `field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC',
                __FUNCTION__, __LINE__);
 
        // Walk through all entries
@@ -149,7 +145,7 @@ function FILTER_REGISTER_MUST_FILLOUT ($content) {
                if ($row['field_required'] == 'Y') $value = '<span class="guest_failed">(*)</span>';
 
                // Add it
-               $content['must_fillout_'.strtolower($row['field_name']).''] = $value;
+               $content['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
        } // END - while
 
        // Free memory
@@ -266,22 +262,22 @@ function doRegistration () {
 
        // Get total ...
        // ... confirmed, ...
-       $confirmedUsers   = countSumTotalData('CONFIRMED'  , 'user_data', 'userid', 'status', true);
+       $confirmedUsers   = getTotalConfirmedUser();
        // ... unconfirmed ...
-       $unconfirmedUsers = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+       $unconfirmedUsers = getTotalUnconfirmedUser();
        // ... and locked users!
-       $lockedUsers      = countSumTotalData('LOCKED'     , 'user_data', 'userid', 'status', true);
+       $lockedUsers      = getTotalLockedUser();
 
        // Generate hash which will be inserted into confirmation mail
        $hash = generateHash(sha1(
-               $confirmedUsers . getConfig('ENCRYPT_SEPERATOR') .
-               $unconfirmedUsers . getConfig('ENCRYPT_SEPERATOR') .
-               $lockedUsers . getConfig('ENCRYPT_SEPERATOR') .
+               $confirmedUsers . getEncryptSeperator() .
+               $unconfirmedUsers . getEncryptSeperator() .
+               $lockedUsers . getEncryptSeperator() .
                postRequestParameter('month') . '-' .
                postRequestParameter('day') . '-' .
-               postRequestParameter('year') . getConfig('ENCRYPT_SEPERATOR') .
-               detectServerName() . getConfig('ENCRYPT_SEPERATOR') .
-               detectRemoteAddr() . getConfig('ENCRYPT_SEPERATOR') .
+               postRequestParameter('year') . getEncryptSeperator() .
+               detectServerName() . getEncryptSeperator() .
+               detectRemoteAddr() . getEncryptSeperator() .
                detectUserAgent() . '/' .
                getConfig('SITE_KEY') . '/' .
                getConfig('DATE_KEY') . '/' .
@@ -298,28 +294,22 @@ function doRegistration () {
        $GLOBALS['register_sql_data'] = '';
        if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
                // Okay, add design here
-               $GLOBALS['register_sql_columns'] = ', `curr_theme`';
-               $GLOBALS['register_sql_data'] = ", '" . getCurrentTheme() . "'";
+               $GLOBALS['register_sql_columns'] .= ', `curr_theme`';
+               $GLOBALS['register_sql_data']    .= ", '" . getCurrentTheme() . "'";
        } // END - if
 
        // Check if I shall disable sending mail to newly registered members out about active/begging rallye
        //
        // First comes first: begging rallye
-       if (isExtensionInstalledAndNewer('beg', '0.2.8')) {
-               // Okay, shall I disable now?
-               if (getConfig('beg_new_member_notify') != 'Y') {
-                       $GLOBALS['register_sql_columns'] .= ', `beg_rallye_notify`, `beg_rallye_enable_notify`';
-                       $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
-               } // END - if
+       if (!isBegNewMemberNotifyEnabled()) {
+               $GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
+               $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if
 
        // Second: active rallye
-       if (isExtensionInstalledAndNewer('bonus', '0.9.2')) {
-               // Okay, shall I disable now?
-               if (getConfig('bonus_new_member_notify') != 'Y') {
-                       $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_notify`, `bonus_rallye_enable_notify`';
-                       $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
-               } // END - if
+       if (!isBonusNewMemberNotifyEnabled()) {
+               $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
+               $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if
 
        // Write user data to table
@@ -329,12 +319,12 @@ function doRegistration () {
                $countryData = bigintval(postRequestParameter('country_code'));
        } // END - if
 
-       //////////////////////////////
-       // Create user's account... //
-       //////////////////////////////
-       //
-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$GLOBALS['register_sql_columns'].")
-VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$GLOBALS['register_sql_data'].")",
+       // Create user's account...
+       SQL_QUERY_ESC("INSERT INTO
+       `{?_MYSQL_PREFIX?}_user_data`
+(`gender`, `surname`, `family`, `street_nr`,%s, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `password`, `max_mails`, `receive_mails`, `refid`, `status`, `user_hash`, `REMOTE_ADDR`, `joined`, `last_update`".$GLOBALS['register_sql_columns'].")
+       VALUES
+('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$GLOBALS['register_sql_data'].")",
        array(
                $countryRow,
                substr(postRequestParameter('gender'), 0, 1),
@@ -376,26 +366,8 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        } // END - if
 
        // Write his welcome-points
-       // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
        // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`=0 LIMIT 1",
-               array($userid), __FUNCTION__, __LINE__);
-       if (SQL_HASZERONUMS($result)) {
-               // Add only when the line was not found (maybe some more secure?)
-               $locked = 'points';
-
-               // Pay him later. First he has to confirm some mails!
-               if (getConfig('ref_payout') > 0) $locked = 'locked_points';
-
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `%s`) VALUES (%s,0,'{?points_register?}')",
-                       array($locked, $userid), __FUNCTION__, __LINE__);
-
-               // Update mediadata as well
-               if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
-                       // Update database
-                       updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
-               } // END - if
-       } // END - if
+       addPointsDirectly('register_welcome', $userid, getPointsRegister());
 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
@@ -409,41 +381,41 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        } // END - if
 
        // ... rewrite a zero referal id to the main title
-       if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getConfig('MAIN_TITLE'));
+       if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getMainTitle());
 
        // Is ZIP code set?
        if (isPostRequestParameterSet('zip')) {
                // Prepare data array for the email template
                // Start with the gender...
                $content = array(
-                       'hash'    => $hash,
-                       'userid'  => $userid,
-                       'gender'  => translateGender(postRequestParameter('gender')),
-                       'surname' => SQL_ESCAPE(postRequestParameter('surname')),
-                       'family'  => SQL_ESCAPE(postRequestParameter('family')),
-                       'email'   => SQL_ESCAPE(postRequestParameter('email')),
-                       'street'  => SQL_ESCAPE(postRequestParameter('street_nr')),
-                       'city'    => SQL_ESCAPE(postRequestParameter('city')),
-                       'zip'     => bigintval(postRequestParameter('zip')),
-                       'country' => $countryData,
-                       'refid'   => SQL_ESCAPE(postRequestParameter('refid')),
-                       'pass'    => SQL_ESCAPE(postRequestParameter('pass1')),
+                       'hash'     => $hash,
+                       'userid'   => $userid,
+                       'gender'   => SQL_ESCAPE(postRequestParameter('gender')),
+                       'surname'  => SQL_ESCAPE(postRequestParameter('surname')),
+                       'family'   => SQL_ESCAPE(postRequestParameter('family')),
+                       'email'    => SQL_ESCAPE(postRequestParameter('email')),
+                       'street'   => SQL_ESCAPE(postRequestParameter('street_nr')),
+                       'city'     => SQL_ESCAPE(postRequestParameter('city')),
+                       'zip'      => bigintval(postRequestParameter('zip')),
+                       'country'  => $countryData,
+                       'refid'    => SQL_ESCAPE(postRequestParameter('refid')),
+                       'password' => SQL_ESCAPE(postRequestParameter('pass1')),
                );
        } else {
                // No ZIP code entered
                $content = array(
-                       'hash'    => $hash,
-                       'userid'  => $userid,
-                       'gender'  => translateGender(postRequestParameter('gender')),
-                       'surname' => SQL_ESCAPE(postRequestParameter('surname')),
-                       'family'  => SQL_ESCAPE(postRequestParameter('family')),
-                       'email'   => SQL_ESCAPE(postRequestParameter('email')),
-                       'street'  => SQL_ESCAPE(postRequestParameter('street_nr')),
-                       'city'    => SQL_ESCAPE(postRequestParameter('city')),
-                       'zip'     => '',
-                       'country' => $countryData,
-                       'refid'   => SQL_ESCAPE(postRequestParameter('refid')),
-                       'pass'    => SQL_ESCAPE(postRequestParameter('pass1')),
+                       'hash'     => $hash,
+                       'userid'   => $userid,
+                       'gender'   => SQL_ESCAPE(postRequestParameter('gender')),
+                       'surname'  => SQL_ESCAPE(postRequestParameter('surname')),
+                       'family'   => SQL_ESCAPE(postRequestParameter('family')),
+                       'email'    => SQL_ESCAPE(postRequestParameter('email')),
+                       'street'   => SQL_ESCAPE(postRequestParameter('street_nr')),
+                       'city'     => SQL_ESCAPE(postRequestParameter('city')),
+                       'zip'      => '',
+                       'country'  => $countryData,
+                       'refid'    => SQL_ESCAPE(postRequestParameter('refid')),
+                       'password' => SQL_ESCAPE(postRequestParameter('pass1')),
                );
        }