X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-manager.php;h=b986d783baef83eb44ccdc717ba0f9a62040e1e0;hb=a3921e6e7dac39605faa4f9194ff428c331002dc;hp=2a3f33ac876c4e5cf0460eabe018f32ee98ad01a;hpb=aaf81b8f35512782d34f78c1a0dac8b42d745393;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 2a3f33ac87..b986d783ba 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1,7 +1,7 @@
" . getTitleFromMenu($accessLevel, $search, $type, $ADD) . "\n";
- // Menu found?
- if (SQL_NUMROWS($result) == 1) {
- // Load title
- list($ret) = SQL_FETCHROW($result);
+ // Can we close the you-are-here navigation?
+ //* DEBUG: */ print(__LINE__."*".$type.'/'.getWhat()."*
");
+ if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
+ //* DEBUG: */ print(__LINE__.'+'.$type."+
");
+ // Add closing div and br-tag
+ $OUT .= "
\n";
+ $GLOBALS['nav_depth'] = '0';
- // Shall we return it?
- if ($return === true) {
- // Return title
- return $ret;
- } elseif (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
- // Output HTML code
- $OUT = $prefix . "" . $ret . "\n";
-
- // Can we close the you-are-here navigation?
- //* DEBUG: */ print(__LINE__."*".$type.'/'.getWhat()."*
");
- if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
- //* DEBUG: */ print(__LINE__.'+'.$type."+
");
- // Add closing div and br-tag
- $OUT .= "
\n";
- $GLOBALS['nav_depth'] = '0';
-
- // Run the filter chain
- $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ""));
- $OUT .= $ret['content'];
- } // END - if
- }
- } // END - if
+ // Run the filter chain
+ $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
- // Free result
- SQL_FREERESULT($result);
+ // Add additional content
+ $OUT .= $ret['content'];
+ } // END - if
+ }
// Return or output HTML code?
- if ($output) {
- // Output HTML code here
- outputHtml($OUT);
- } else {
+ if ($return === true) {
// Return HTML code
return $OUT;
+ } else {
+ // Output HTML code here
+ outputHtml($OUT);
}
}
@@ -412,7 +388,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
function addMenu ($mode, $action, $what) {
// Init some variables
$main_cnt = '0';
- $AND = '';
+ $ADD = '';
// is the menu action valid?
if (!isMenuActionValid($mode, $action, $what, true)) {
@@ -421,11 +397,11 @@ function addMenu ($mode, $action, $what) {
// Non-admin shall not see all menus
if (!isAdmin()) {
- $AND = " AND `visible`='Y' AND `locked`='N'";
+ $ADD = " AND `visible`='Y' AND `locked`='N'";
} // END - if
// Load SQL data and add the menu to the output stream...
- $result_main = SQL_QUERY_ESC("SELECT `title`, `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort` ASC",
+ $result_main = SQL_QUERY_ESC("SELECT `title`, `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$ADD." ORDER BY `sort` ASC",
array($mode), __FUNCTION__, __LINE__);
//* DEBUG: */ print(__LINE__.'/'.$main_cnt.':'.getWhat()."*
");
@@ -442,7 +418,7 @@ function addMenu ($mode, $action, $what) {
$GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', true, $content);
// Sub menu
- $result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
+ $result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$ADD." ORDER BY `sort`",
array($mode, $content['action']), __FUNCTION__, __LINE__);
// Get number of rows
@@ -897,132 +873,26 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
return $ret;
}
-// Send out mails depending on the 'mod/modes' combination
-// @TODO Lame description for this function
-function sendModeMails ($mod, $modes) {
- // Load hash
- if (fetchUserData(getMemberId())) {
- // Extract salt from cookie
- $salt = substr(getSession('u_hash'), 0, -40);
-
- // Now let's compare passwords
- $hash = generatePassString(getUserData('password'));
-
- // Does the hash match or should we change it?
- if (($hash == getSession('u_hash')) || (postRequestElement('pass1') == postRequestElement('pass2'))) {
- // Load user's data 0 1 2 3 4 5 6 7
- $result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s AND password='%s' LIMIT 1",
- array(getMemberId(), getUserData('password')), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) == 1) {
- // Load the data
- $content = SQL_FETCHARRAY($result, 0, false);
-
- // Free result
- SQL_FREERESULT($result);
-
- // Translate gender
- $content['gender'] = translateGender($content['gender']);
-
- // Clear/init the content variable
- $content['message'] = '';
-
- switch ($mod) {
- case 'mydata':
- foreach ($modes as $mode) {
- switch ($mode) {
- case 'normal': break; // Do not add any special lines
- case 'email': // Email was changed!
- $content['message'] = getMessage('MEMBER_CHANGED_EMAIL').": ".postRequestElement('old_email')."\n";
- break;
-
- case 'pass': // Password was changed
- $content['message'] = getMessage('MEMBER_CHANGED_PASS')."\n";
- break;
-
- default:
- logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
- $content['message'] = getMessage('MEMBER_UNKNOWN_MODE') . ': ' . $mode . "\n\n";
- break;
- } // END - switch
- } // END - foreach
-
- if (isExtensionActive('country')) {
- // Replace code with description
- $content['country'] = generateCountryInfo(postRequestElement('country_code'));
- } // END - if
-
- // Merge content with data from POST
- $content = merge_array($content, postRequestArray());
-
- // Load template
- $message = loadEmailTemplate('member_mydata_notify', $content, getMemberId());
-
- if (getConfig('admin_notify') == 'Y') {
- // The admin needs to be notified about a profile change
- $message_admin = 'admin_mydata_notify';
- $sub_adm = getMessage('ADMIN_CHANGED_DATA');
- } else {
- // No mail to admin
- $message_admin = '';
- $sub_adm = '';
- }
-
- // Set subject lines
- $sub_mem = getMessage('MEMBER_CHANGED_DATA');
-
- // Output success message
- $content = "{--MYDATA_MAIL_SENT--}";
- break;
-
- default: // Unsupported module!
- logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
- $content = "{--UNKNOWN_MODULE--}";
- break;
- } // END - switch
- } else {
- // Could not load profile data
- $content = "{--MEMBER_CANNOT_LOAD_PROFILE--}";
- }
- } else {
- // Passwords mismatch
- $content = "{--MEMBER_PASSWORD_ERROR--}";
- }
- } else {
- // Could not load profile
- $content = "{--MEMBER_CANNOT_LOAD_PROFILE--}";
- }
-
- // Send email to user if required
- if ((!empty($sub_mem)) && (!empty($message))) {
- // Send member mail
- sendEmail($content['email'], $sub_mem, $message);
- } // END - if
-
- // Send only if no other error has occured
- if (empty($content)) {
- if ((!empty($sub_adm)) && (!empty($message_admin))) {
- // Send admin mail
- sendAdminNotification($sub_adm, $message_admin, $content, getMemberId());
- } elseif (getConfig('admin_notify') == 'Y') {
- // Cannot send mails to admin!
- $content = getMessage('CANNOT_SEND_ADMIN_MAILS');
- } else {
- // No mail to admin
- $content = "{--MYDATA_MAIL_SENT--}";
- }
- } // END - if
-
- // Load template
- loadTemplate('admin_settings_saved', false, $content);
-}
-
// Get action value from mode (admin/guest/member) and what-value
function getModeAction ($mode, $what) {
// Init status
$ret = '';
//* DEBUG: */ print(__LINE__.'='.$mode.'/'.$what.'/'.getAction()."=
");
- if ((empty($what)) && ($mode != 'admin')) {
+ if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
+ // sql_patches is missing so choose depending on mode
+ if (isWhatSet()) {
+ // Use setted what
+ $what = getWhat();
+ } elseif ($mode == 'admin') {
+ // Admin area
+ $what = 'overview';
+ } else {
+ // Everywhere else
+ $what = 'welcome';
+ }
+ } elseif ((empty($what)) && ($mode != 'admin')) {
+ // Use configured 'home'
$what = getConfig('index_home');
} // END - if
@@ -1062,7 +932,7 @@ function getModeAction ($mode, $what) {
// Free memory
SQL_FREERESULT($result);
- } elseif ((!isExtensionInstalled('sql_patches')) && ($mode != 'admin')) {
+ } elseif ((!isExtensionInstalled('sql_patches')) && (($mode != 'admin') && ($mode != 'unknown'))) {
// No sql_patches installed, but maybe we need to register an admin?
if (isAdminRegistered()) {
// Redirect to admin area
@@ -1644,22 +1514,32 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
$ret = '';
if ($table == '/ARRAY/') {
// Selection from array
- if (is_array($id) && is_array($name) && count($id) == count($name)) {
+ if ((is_array($id)) && (is_array($name)) && (count($id)) == (count($name))) {
// Both are arrays
foreach ($id as $idx => $value) {
$ret .= '';
} // END - while
-
- // Free memory
- SQL_FREERESULT($result);
} else {
// No data found
$ret = '';
}
+
+ // Free memory
+ SQL_FREERESULT($result);
}
// Return - hopefully - the requested data
@@ -1733,7 +1613,7 @@ WHERE
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s", array(bigintval($userid)), __FUNCTION__, __LINE__);
// Update mediadata as well
- if (getExtensionVersion('mediadata') >= '0.0.4') {
+ if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
// Update database
updateMediadataEntry(array('total_points'), 'sub', $points);
} // END - if
@@ -1768,7 +1648,7 @@ function generateMetaDescriptionCode ($mod, $what) {
// Exclude admin and member's area
if (($mod != 'admin') && ($mod != 'login')) {
// Construct dynamic description
- $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . addMenuDescription('guest', 'what-'.$what, true);
+ $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', $what);
// Output it directly
outputHtml('');
@@ -1869,7 +1749,10 @@ function generateCategoryOptionsList ($mode) {
);
// Get categories
- $result = SQL_QUERY("SELECT id, cat FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort`", __FUNCTION__, __LINE__);
+ $result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC",
+ __FUNCTION__, __LINE__);
+
+ // Do we have entries?
if (SQL_NUMROWS($result) > 0) {
// ... and begin loading stuff
while ($content = SQL_FETCHARRAY($result)) {
@@ -1890,7 +1773,9 @@ function generateCategoryOptionsList ($mode) {
FROM
`{?_MYSQL_PREFIX?}_user_data`
WHERE
- `userid`=%s AND `status`='CONFIRMED' AND `receive_mails` > 0".runFilterChain('exclude_users', $mode)."
+ `userid`=%s AND
+ `status`='CONFIRMED' AND
+ `receive_mails` > 0".runFilterChain('exclude_users', $mode)."
LIMIT 1",
array(bigintval($ucat)), __FUNCTION__, __LINE__);