X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=db9353b4efa08d18adf77b7624a476eb3f2d164c;hb=d6417790061e18fc1a9770ff93bb4e9d106b2f6e;hp=e34b0cf014f0a22421e43f54ca3c6bae1c479fdc;hpb=6a0c39a390c28999679d84a7ae5264363b0054dc;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index e34b0cf014..db9353b4ef 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -216,14 +216,14 @@ LIMIT 1",
 			loadInclude($inc);
 		} elseif ($GLOBALS['acl_allow'] === false) {
 			// Access denied
-			loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what));
+			loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
 		} else {
 			// Include file not found :-(
-			loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action));
+			loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_404=' . $action . '%}');
 		}
 	} else {
 		// Invalid action/what pair found
-		loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what));
+		loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
 	}
 
 	// Free memory
@@ -240,7 +240,7 @@ function isAdminAllowedAccessMenu ($action, $what = null) {
 	if (!isset($GLOBALS[__FUNCTION__][$action][$what])) {
 		// ACL is always 'allow' when no ext-admins is installed
 		// @TODO This can be rewritten into a filter
-		$GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (adminsCheckAdminAcl($action, $what)));
+		$GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (isAdminsAllowedByAcl($action, $what)));
 	} // END - if
 
 	// Return the cached value
@@ -296,7 +296,7 @@ ORDER BY
 						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
 					}
 				} else {
-					$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404=' . $menu . '%}">';
+					$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
 				}
 
 				$OUT .= $title;
@@ -359,7 +359,7 @@ ORDER BY
 									$OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
 								}
 							} else {
-								$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404=' . $what_sub . '%}">';
+								$OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
 							}
 
 							$OUT .= $title_what;
@@ -438,8 +438,8 @@ function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $no
 // @TODO Try to rewrite this to adminAddMenuSelectionBox()
 // @DEPRECATED
 function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
-	$what = "`what` != ''";
-	if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` !='login'";
+	$what = "`what` != '' AND `what` IS NOT NULL";
+	if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` != 'login'";
 
 	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
@@ -543,7 +543,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 			$whereStatement
 		);
 	} else {
-		// Add Line (does only work with auto_increment!
+		// Add Line (does only work with AUTO_INCREMENT!
 		$keys = array(); $values = array();
 		foreach ($tableData as $entry) {
 			// Split up
@@ -697,7 +697,7 @@ function adminGetMenuMode () {
 
 // Change activation status
 function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
-	$count = '0'; $newStatus = 'Y';
+	$count = '0';
 	if ((is_array($IDs)) && (count($IDs) > 0)) {
 		// "Walk" all through and count them
 		foreach ($IDs as $id => $selected) {
@@ -708,7 +708,12 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 			if (!empty($selected)) {
 				// Determine new status
 				$result = SQL_QUERY_ESC("SELECT %s FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1",
-				array($row, $table, $idRow, $id), __FUNCTION__, __LINE__);
+					array(
+						$row,
+						$table,
+						$idRow,
+						$id
+					), __FUNCTION__, __LINE__);
 
 				// Row found?
 				if (SQL_NUMROWS($result) == 1) {
@@ -716,11 +721,17 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 					list($currStatus) = SQL_FETCHROW($result);
 
 					// And switch it N<->Y
-					if ($currStatus == 'Y') $newStatus = 'N'; else $newStatus = 'Y';
+					$newStatus = convertBooleanToYesNo(!($currStatus == 'Y'));
 
 					// Change this status
 					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
-					array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__);
+						array(
+							$table,
+							$row,
+							$newStatus,
+							$idRow,
+							$id
+						), __FUNCTION__, __LINE__);
 
 					// Count up affected rows
 					$count += SQL_AFFECTEDROWS();
@@ -740,7 +751,7 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 }
 
 // Send mails for del/edit/lock build modes
-function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userid = 'userid') {
+function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userIdColumn = 'userid') {
 	// Default subject is the subject part
 	$subject = $subjectPart;
 
@@ -751,7 +762,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 	} // END - if
 
 	// Is the raw userid set?
-	if (postRequestParameter($userid, $id) > 0) {
+	if (postRequestParameter($userIdColumn, $id) > 0) {
 		// Load email template
 		if (!empty($subjectPart)) {
 			$mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
@@ -760,7 +771,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 		}
 
 		// Send email out
-		sendEmail(postRequestParameter($userid, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
+		sendEmail(postRequestParameter($userIdColumn, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
 	} // END - if
 
 	// Generate subject
@@ -768,9 +779,9 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 
 	// Send admin notification out
 	if (!empty($subjectPart)) {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userIdColumn, $id));
 	} else {
-		sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userIdColumn, $id));
 	}
 }
 
@@ -812,7 +823,11 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
 
 				// Handle the call in external function
 				//* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
-				$content[$key] = handleExtraValues($filterFunctions[$idx], $value, $extraValues[$idx]);
+				$content[$key] = handleExtraValues(
+					$filterFunctions[$idx],
+					$value,
+					$extraValues[$idx]
+				);
 			} // END - foreach
 
 			// Then list it
@@ -862,7 +877,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 				// Does the entry exist?
 				if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
 					// Add these entries for update
-					$sql .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
+					$sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
 
 					// Remember status
 					if ($statusColumn == 'unknown') {
@@ -887,10 +902,10 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 					// Are there brackets () at the end?
 					if (substr($entries[$id], -2, 2) == '()') {
 						// Direct SQL command found
-						$sql .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+						$sql .= sprintf(" `%s`=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
 					} else {
 						// Add regular entry
-						$sql .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+						$sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
 
 						// Add entry
 						$content[$key] = $entries[$id];
@@ -919,7 +934,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 			} // END - if
 
 			// Send "build mails" out
-			sendAdminBuildMails($mode, $table, $content, $id, $statusInfo[$content[$column]]);
+			sendAdminBuildMails($mode, $table, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
 		} // END - foreach
 	} // END - if
 }
@@ -953,7 +968,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
 					SQL_FREERESULT($result);
 
 					// Send "build mails" out
-					sendAdminBuildMails('delete', $table, $content, $id);
+					sendAdminBuildMails('delete', $table, $content, $id, '', $userIdColumn);
 				} // END - if
 
 				// Add id number
@@ -1049,7 +1064,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
 				SQL_FREERESULT($result);
 
 				// Send "build mails" out
-				sendAdminBuildMails('edit', $table, $content, $id);
+				sendAdminBuildMails('edit', $table, $content, $id, '', $userIdColumn);
 			} // END - foreach
 
 			// Was this fine?
@@ -1064,7 +1079,10 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
 			// List for editing
 			adminListBuilder('edit', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
 		}
-	} // END - if
+	} else {
+		// Maybe some invalid parameters
+		debug_report_bug(__FUNCTION__, __LINE__, 'IDs[]=' . gettype($IDs) . ',table=' . $table . ',columns[]=' . gettype($columns) . ',filterFunctions[]=' . gettype($filterFunctions) . ',extraValues[]=' . gettype($extraValues) . ',idColumn=' . $idColumn . ',userIdColumn=' . $userIdColumn . ' - INVALID!');
+	}
 }
 
 // Un-/lock rows by given id numbers
@@ -1097,6 +1115,120 @@ function adminUndeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFun
 	} // END - if
 }
 
+// List all given rows (callback function from XML)
+function adminListEntries ($tableTemplate, $rowTemplate, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters, $noEntryMessageId) {
+	// Verify that tableName and columns are not empty
+	if (count($tableName) != 1) {
+		// No tableName specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML. tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate);
+	} elseif (count($columns) == 0) {
+		// No columns specified
+		debug_report_bug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML. tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]);
+	}
+
+	// This is the minimum query, so at least columns and tableName must have entries
+	$SQL = 'SELECT ';
+	foreach ($columns as $columnArray) {
+		// Init SQL part
+		$sqlPart = '';
+		// Do we have a table/alias
+		if (!empty($columnArray['table'])) {
+			// Pre-add it
+			$sqlPart .= $columnArray['table'] . '.';
+		} // END - if
+
+		// Add column
+		$sqlPart .= '`' . $columnArray['column'] . '`';
+
+		// Is a function and alias set?
+		if ((!empty($columnArray['function'])) && (!empty($columnArray['alias']))) {
+			// Add both
+			$sqlPart = $columnArray['function'] . '(' . $sqlPart . ') AS `' . $columnArray['alias'] . '`';
+		} // END - if
+
+		// Add finished SQL part to the query
+		$SQL .= $sqlPart . ',';
+	} // END - foreach
+
+	// Remove last commata and add FROM statement
+	$SQL = substr($SQL, 0, -1) . ' FROM `{?_MYSQL_PREFIX?}_' . $tableName[0] . '`';
+
+	// Do we have entries from whereColumns to add?
+	if (count($whereColumns) > 0) {
+		// Then add these as well
+		// @TODO WHERE is not yet supported
+		debug_report_bug(__FUNCTION__, __LINE__, 'Unfinished area, please report your XML to the forums or bug tracker. tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]);
+	} // END - if
+
+	// Do we have entries from orderByColumns to add?
+	if (count($orderByColumns) > 0) {
+		// Add them as well
+		$SQL .= ' ORDER BY ';
+		foreach ($orderByColumns as $orderByColumn=>$array) {
+			// Get keys (table/alias) and values (sorting itself)
+			$table   = trim(implode('', array_keys($array)));
+			$sorting = trim(implode('', array_keys($array)));
+
+			// table/alias can be omitted
+			if (!empty($table)) {
+				// table/alias is given
+				$SQL .= $table . '.';
+			} // END - if
+
+			// Add order-by column
+			$SQL .= '`' . $orderByColumn . '` ' . $sorting . ',';
+		} // END - foreach
+
+		// Remove last column
+		$SQL = substr($SQL, 0, -1);
+	} // END - if
+
+	// Now handle all over to the inner function which will execute the listing
+	doAdminListEntries($SQL, $tableTemplate, $rowTemplate, $callbackColumns, $extraParameters, $noEntryMessageId);
+}
+
+// Do the listing of entries
+function doAdminListEntries($SQL, $tableTemplate, $rowTemplate, $callbackColumns, $extraParameters, $noEntryMessageId) {
+	// Run the SQL query
+	$result = SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+
+	// Do we have some URLs left?
+	if (!SQL_HASZERONUMS($result)) {
+		// List all URLs
+		$OUT = '';
+		while ($content = SQL_FETCHARRAY($result)) {
+			// "Translate" content
+			foreach ($callbackColumns as $column=>$callbackFunction) {
+				// Fill the callback arguments
+				$args = array($content[$column]);
+
+				// Do we have more to add?
+				if (isset($extraParameters[$column])) {
+					// Add them as well
+					merge_array($args, $extraParameters[$column]);
+				} // END - if
+
+				// Call the callback-function
+				//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackFunction . ',args=<pre>'.print_r($args, true).'</pre>');
+				// @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
+				$content[$column] = call_user_func_array($callbackFunction, $args);
+			} // END - foreach
+
+			// Load row template
+			$OUT .= loadTemplate(trim($rowTemplate[0]), true, $content);
+		} // END - while
+
+		// Load main template
+		loadTemplate(trim($tableTemplate[0]), false, $OUT);
+	} else {
+		// No URLs in surfbar
+		displayMessage('{--' .$noEntryMessageId . '--}');
+	}
+
+	// Free result
+	SQL_FREERESULT($result);
+}
+
 // Checks proxy settins by fetching check-updates3.php from www.mxchange.org
 function adminTestProxySettings ($settingsArray) {
 	// Set temporary the new settings
@@ -1284,11 +1416,11 @@ function generateAdminLink ($adminId) {
 				$adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
 			} else {
 				// Extension not found
-				$adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
+				$adminLink = '{%message,ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED=admins%}';
 			}
 		} else {
 			// Maybe deleted?
-			$adminLink = '<div class="notice">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
+			$adminLink = '<div class="notice">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
 		}
 	} // END - if
 
@@ -1489,7 +1621,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 
 			default: // Unexpected action
 				logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-				displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+				displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
 				break;
 		} // END - switch
 	} // END - foreach