X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=9be835047a6c6122fd088736e3a399a6f5a658c3;hp=e1ed9ac4ea24b8b7f0b521a8dc84e74adb107acb;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=e0ebc4d305c2647a9cbce54602439987d7b103f4;ds=sidebyside diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index e1ed9ac4ea..9be835047a 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -98,13 +98,16 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { // This is a 'what file'! $type = 'what'; $search = substr($file, 5); - $ADD = " AND `visible`='Y' AND `locked`='N'"; // Get access level from it $modCheck = getModuleFromFileName($file, $accessLevel); // Do we have admin? Then display all - if (isAdmin()) $ADD = ''; + $ADD = " AND `visible`='Y' AND `locked`='N'"; + if (isAdmin()) { + // Display all! + $ADD = ''; + } // END - if $dummy = substr($search, 0, -4); $ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy)); @@ -260,7 +263,7 @@ ORDER BY $OUT .= ''; } else { // Not found - open - $OUT .= ''; + $OUT .= ''; } // Menu title @@ -428,6 +431,12 @@ function isMember () { // Fetch user data for given user id function fetchUserData ($value, $column = 'userid') { + // Extension ext-user must be there at any case + if (!isExtensionActive('user')) { + // Absent ext-user is really not good + return false; + } // END - if + // If we should look for userid secure&set it here if (substr($column, -2, 2) == 'id') { // Secure userid @@ -444,8 +453,8 @@ function fetchUserData ($value, $column = 'userid') { // Use cache, so it is fine return true; } - } elseif ((isUserDataValid()) || (!isExtensionActive('user'))) { - // Using cache or absend ext-user is fine here + } elseif (isUserDataValid()) { + // Using cache is fine return true; } @@ -1028,7 +1037,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify if (!isset($GLOBALS['ref_level'])) { // Initialialize referal system //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referal system initialized!'); - $GLOBALS['ref_level'] = '0'; + $GLOBALS['ref_level'] = NULL; } else { // Increase referal level $GLOBALS['ref_level']++; @@ -1071,7 +1080,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify $pointsColumn, $ref_points, bigintval($userid), - bigintval($GLOBALS['ref_level']) + makeZeroToNull($GLOBALS['ref_level']) ), __FUNCTION__, __LINE__); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pointsColumn='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - UPDATE! ('.SQL_AFFECTEDROWS().')'); @@ -1082,7 +1091,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify array( $pointsColumn, bigintval($userid), - bigintval($GLOBALS['ref_level']), + makeZeroToNull($GLOBALS['ref_level']), $ref_points ), __FUNCTION__, __LINE__); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'data='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - INSERTED! ('.SQL_AFFECTEDROWS().')'); @@ -1124,7 +1133,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify ); // Load email template - $message = loadEmailTemplate('confirm-referal', $content, bigintval($userid)); + $message = loadEmailTemplate('guest_user_confirmed_referal', $content, bigintval($userid)); // Send email sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message); @@ -1136,7 +1145,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify ); // Load message - $message = loadEmailTemplate('add-points', $content, $userid); + $message = loadEmailTemplate('member_add_points', $content, $userid); // And sent it away sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message); @@ -1387,7 +1396,7 @@ function getAdminEmail ($adminId) { // Get default ACL of admin id function getAdminDefaultAcl ($adminId) { // By default an invalid ACL value is returned - $data['default_acl'] = '***'; + $data['default_acl'] = 'NO-ACL'; // Is sql_patches there and was it found in cache? if (!isExtensionActive('sql_patches')) { @@ -1403,6 +1412,8 @@ function getAdminDefaultAcl ($adminId) { // Load from database $result_admin_id = SQL_QUERY_ESC("SELECT `default_acl` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", array(bigintval($adminId)), __FUNCTION__, __LINE__); + + // Do we have an entry? if (SQL_NUMROWS($result_admin_id) == 1) { // Fetch data $data = SQL_FETCHARRAY($result_admin_id); @@ -1590,7 +1601,7 @@ LIMIT 1", $data['text'] = $reason; // Now a mail to the user and that's all... - $message = loadEmailTemplate('del-user', $data, $userid); + $message = loadEmailTemplate('member_user_deleted', $data, $userid); sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message); // Ok, delete the account! @@ -1730,7 +1741,7 @@ function generateCategoryOptionsList ($mode) { } // Add bonus mail to queue -function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode='normal', $receiver=0) { +function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $categoryId, $mode='normal', $receiver=0) { // Is admin or bonus extension there? if (!isAdmin()) { // Abort here @@ -1751,27 +1762,21 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, // HTML extension active? if (isExtensionActive('html_mail')) { - // No HTML by default - $HTML = 'N'; - - // HTML mode? - if ($mode == 'html') { - // Yes, please - $HTML = 'Y'; - } // END - if + // Determine if we have HTML mode active + $HTML = convertBooleanToYesNo($mode == 'html'); // Add HTML mail SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` (`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `html_msg`) -VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')", +VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')", array( $subject, $text, $receiverList, $points, - $seconds, + bigintval($seconds), $url, - $cat, + bigintval($categoryId), $target, bigintval($receiver), $HTML @@ -1780,15 +1785,15 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s // Add regular mail SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` (`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`) -VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')", +VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s)", array( $subject, $text, $receiverList, $points, - $seconds, + bigintval($seconds), $url, - $cat, + bigintval($categoryId), $target, bigintval($receiver), ), __FUNCTION__, __LINE__); @@ -1796,7 +1801,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')", } // Generate a receiver list for given category and maximum receivers -function generateReceiverList ($cat, $receiver, $mode = '') { +function generateReceiverList ($categoryId, $receiver, $mode = '') { // Init variables $CAT_TABS = ''; $CAT_WHERE = ''; @@ -1804,8 +1809,8 @@ function generateReceiverList ($cat, $receiver, $mode = '') { $result = false; // Secure data - $cat = bigintval($cat); - $receiver = bigintval($receiver); + $categoryId = bigintval($categoryId); + $receiver = bigintval($receiver); // Is the receiver zero and mode set? if (($receiver == '0') && (!empty($mode))) { @@ -1814,10 +1819,10 @@ function generateReceiverList ($cat, $receiver, $mode = '') { } // END - if // Category given? - if ($cat > 0) { + if ($categoryId > 0) { // Select category $CAT_TABS = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`"; - $CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $cat); + $CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $categoryId); } // END - if // Exclude users in holiday? @@ -1828,13 +1833,13 @@ function generateReceiverList ($cat, $receiver, $mode = '') { if ((isExtensionActive('html_mail')) && ($mode == 'html')) { // Only include HTML receivers - $result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s", + $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s", array( $receiver ), __FUNCTION__, __LINE__); } else { // Include all - $result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s", + $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s", array( $receiver ), __FUNCTION__, __LINE__); @@ -1973,7 +1978,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) { array(implode(',', $userids), count($userids)), __FUNCTION__, __LINE__); } else { // Nothing deleted - displayMessage(getMaskedMessage('ADMIN_MAIL_NOTHING_DELETED', $id)); + displayMessage('{%message,ADMIN_MAIL_NOTHING_DELETED=' . $id . '%}'); } } // END - if @@ -2009,5 +2014,83 @@ function updateLastActivity($userid) { ), __FUNCTION__, __LINE__); } +// Get points data for given extension's name +function getPointsDataArrayFromExtensionName ($ext_name) { + // If we have cache, shortcut it here + if (isset($GLOBALS['cache_array']['points_data'][$ext_name])) { + // Return it + return $GLOBALS['cache_array']['points_data'][$ext_name]; + } // END - if + + // Now checkout the entry in database table + $result = SQL_QUERY_ESC("SELECT `id`, `ext_name`, `column_name`, `locked_mode`, `payment_method` FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `ext_name`='%s' LIMIT 1", + array($ext_name), __FUNCTION__, __LINE__); + + // Do we have an entry? + if (SQL_NUMROWS($result) == 1) { + // Then load it + $pointsData = SQL_FETCHARRAY($result); + + // Add all remaining entries + foreach ($pointsData as $key=>$value) { + $GLOBALS['cache_array']['points_data'][$ext_name][$key] = $value; + } // END - foreach + } else { + /* + * Having no entry is not bad but it means that all points will go to + * the general account which the user can let payout. + */ + logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - No entry found, switching to general points account.'); + } + + // Free result + SQL_FREERESULT($result); + + // Return it + return $GLOBALS['cache_array']['points_data'][$ext_name]; +} + +// Determines the right points column name for given extension and 'locked' +function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) { + // Extension sql_patches must be up-to-date + if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) { + // Please update ext-sql_patches + debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked)); + } // END - if + + // Get the points_data entry + $pointsData = getPointsDataArrayFromExtensionName($ext_name); + + // Regular points by default + $columnName = $pointsData['column_name']; + + // Are the points locked? + if (($isLocked === true) && ($pointsData['locked_mode'] == 'LOCKED')) { + // Locked points, so prefix it + $columnName = 'locked_' . $pointsData['column_name']; + } // END - if + + // Return the result + return $columnName; +} + +// Determines the payment method for given extension and 'locked' +function getPaymentMethodFromExtensionName ($ext_name) { + // Extension sql_patches must be up-to-date + if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) { + // Please update ext-sql_patches + debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked)); + } // END - if + + // Get the points_data entry + $pointsData = getPointsDataArrayFromExtensionName($ext_name); + + // Regular points by default + $paymentMethod = $pointsData['payment_method']; + + // Return the result + return $paymentMethod; +} + // [EOF] ?>