X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=38a180263d479516d47596ad8aa042dd61ee3e2e;hp=4de2f33ea3afdf8c5d8026e020f6a8312c20bee4;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=6c18a7bf8866b5ebdcb219891efaad99989a2cd5

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 4de2f33ea3..38a180263d 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -196,7 +196,7 @@ LIMIT 1",
 			$what
 		), __FUNCTION__, __LINE__);
 
-	// Do we have an entry?
+	// Is there an entry?
 	if (SQL_NUMROWS($result_action) == 1) {
 		// Is valid but does the inlcude file exists?
 		$inc = sprintf("inc/modules/admin/action-%s.php", $action);
@@ -227,7 +227,7 @@ LIMIT 1",
  * combination (only one is allowed to be null!).
  */
 function isAdminAllowedAccessMenu ($action, $what = NULL) {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$action][$what])) {
 		// ACL is always 'allow' when no ext-admins is installed
 		// @TODO This can be rewritten into a filter
@@ -261,7 +261,7 @@ ORDER BY
 	`sort` ASC,
 	`id` DESC", __FUNCTION__, __LINE__);
 
-	// Do we have entries?
+	// Are there entries?
 	if (!SQL_HASZERONUMS($result_main)) {
 		$OUT .= '<ul class="admin_menu_main">';
 
@@ -350,12 +350,12 @@ ORDER BY
 	// Start li-tag for sub menu content
 	$OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
 
-	// Do we have entries?
+	// Are there entries?
 	if (ifAdminMenuHasEntries($mainContent['main_action'])) {
 		// Sub menu has been called
 		$SUB = true;
 
-		// Do we have entries?
+		// Are there entries?
 		if (!SQL_HASZERONUMS($result_what)) {
 			// Start HTML code
 			$OUT .= '<ul class="admin_menu_sub">';
@@ -756,7 +756,7 @@ function adminGetMenuMode () {
 		$result = SQL_QUERY_ESC("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array($adminId), __FUNCTION__, __LINE__);
 
-		// Do we have an entry?
+		// Is there an entry?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load data
 			list($adminMode) = SQL_FETCHROW($result);
@@ -917,7 +917,7 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
 					continue;
 				} // END - if
 
-				// Do we have a userid?
+				// Is there a userid?
 				//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
 				if ($key == $userIdColumn[0]) {
 					// Add it again as raw id
@@ -937,7 +937,7 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
 					$GLOBALS['admin_list_builder_id_value'] = bigintval($value);
 				} // END - if
 
-				// Do we have a call-back function and extra-value pair?
+				// Is there a call-back function and extra-value pair?
 				if ((isset($filterFunctions[$idx])) && (isset($extraValues[$idx]))) {
 					// Handle the call in external function
 					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
@@ -1323,78 +1323,11 @@ function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFun
 
 // Adds a given entry to the database
 function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
-	//* DEBUG: */ die('columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,POST=<pre>'.print_r($_POST,true).'</pre>');
-	// Verify that tableName and columns are not empty
-	if ((!is_array($tableName)) || (count($tableName) != 1)) {
-		// No tableName specified
-		reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
-	} elseif (count($columns) == 0) {
-		// No columns specified
-		reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.');
-	}
-
-	// Init columns and value elements
-	$sqlColumns = array();
-	$sqlValues  = array();
-
-	// Do we have "time columns"?
-	if (count($timeColumns) > 0) {
-		// Then "walk" through all entries
-		foreach ($timeColumns as $column) {
-			// Convert all (possible) selections
-			convertSelectionsToEpocheTimeInPostData($column . '_ye');
-		} // END - foreach
-	} // END - if
-
-	// Add columns and values
-	foreach ($columns as $key => $columnName) {
-		//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName=' . $columnName);
-		// Is columnIndex set?
-		if (!is_null($columnIndex)) {
-			// Check conditions
-			//* DEBUG: */ die('columnIndex=<pre>'.print_r($columnIndex,true).'</pre>'.debug_get_printable_backtrace());
-			assert((is_array($columnName)) && (isset($columnName[$columnIndex])));
-
-			// Then use that index "blindly"
-			$columnName = $columnName[$columnIndex];
-		} // END - if
-
-		// Debug message
-		/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])) . '<br />');
-
-		// Copy entry securely to the final arrays
-		$sqlColumns[$key] = SQL_ESCAPE($columnName);
-		$sqlValues[$key]  = SQL_ESCAPE(postRequestElement($columnName));
-
-		// Send data through the filter function if found
-		if ((isset($filterFunctions[$key])) && (isset($extraValues[$key . '_list']))) {
-			// Filter function set!
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
-			$sqlValues[$key] = call_user_func_array($filterFunctions[$key], merge_array(array($columnName), $extraValues[$key . '_list']));
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
-		} elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key]))) {
-			// Run through an extra filter
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!');
-			$sqlValues[$key] = handleExtraValues($filterFunctions[$key], $sqlValues[$key], '');
-			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!');
-		}
-
-		// Is the value not a number?
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key]);
-		if (($sqlValues[$key] != 'NULL') && (is_string($sqlValues[$key]))) {
-			// Add quotes around it
-			$sqlValues[$key] = chr(39) . $sqlValues[$key] . chr(39);
-		} // END - if
-	} // END - foreach
-
-	// Build the SQL query
-	$SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`,`', $sqlColumns) . "`) VALUES (" . implode(',', $sqlValues) . ')';
-
-	// Run the SQL query
-	SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+	// Call inner function
+	doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
 
 	// Entry has been added?
-	if (!SQL_HASZEROAFFECTED()) {
+	if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) {
 		// Display success message
 		displayMessage('{--ADMIN_ENTRY_ADDED--}');
 	} else {
@@ -1403,140 +1336,6 @@ function adminAddEntries ($tableName, $columns = array(), $filterFunctions = arr
 	}
 }
 
-// List all given rows (callback function from XML)
-function adminListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array()) {
-	// Verify that tableName and columns are not empty
-	if ((!is_array($tableName)) || (count($tableName) != 1)) {
-		// No tableName specified
-		reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate);
-	} elseif (count($columns) == 0) {
-		// No columns specified
-		reportBug(__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 ';
-
-	// Get the sql part back from given array
-	$SQL .= getSqlPartFromXmlArray($columns);
-
-	// Remove last commata and add FROM statement
-	$SQL .= ' FROM `{?_MYSQL_PREFIX?}_' . $tableName[0] . '`';
-
-	// Do we have entries from whereColumns to add?
-	if (count($whereColumns) > 0) {
-		// Then add these as well
-		if (count($whereColumns) == 1) {
-			// One entry found
-			$SQL .= ' WHERE ';
-
-			// Table/alias included?
-			if (!empty($whereColumns[0]['table'])) {
-				// Add it as well
-				$SQL .= $whereColumns[0]['table'] . '.';
-			} // END - if
-
-			// Add the rest
-			$SQL .= '`' . $whereColumns[0]['column'] . '`' . $whereColumns[0]['condition'] . chr(39) . $whereColumns[0]['look_for'] . chr(39);
-		} elseif ((count($whereColumns > 1)) && (count($conditions) > 0)) {
-			// More than one "WHERE" + condition found
-			foreach ($whereColumns as $idx => $columnArray) {
-				// Default is WHERE
-				$condition = 'WHERE';
-
-				// Is the condition element there?
-				if (isset($conditions[$columnArray['column']])) {
-					// Assume the condition
-					$condition = $conditions[$columnArray['column']];
-				} // END - if
-
-				// Add to SQL query
-				$SQL .= ' ' . $condition;
-
-				// Table/alias included?
-				if (!empty($whereColumns[$idx]['table'])) {
-					// Add it as well
-					$SQL .= $whereColumns[$idx]['table'] . '.';
-				} // END - if
-
-				// Add the rest
-				$SQL .= '`' . $whereColumns[$idx]['column'] . '`' . $whereColumns[$idx]['condition'] . chr(39) . convertDollarDataToGetElement($whereColumns[$idx]['look_for']) . chr(39);
-			} // END - foreach
-		} else {
-			// Did not set $conditions
-			reportBug(__FUNCTION__, __LINE__, 'Supplied more than &quot;whereColumns&quot; entries but no conditions! Please fix your XML template.');
-		}
-	} // 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, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters);
-}
-
-// Do the listing of entries
-function doAdminListEntries ($SQL, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array()) {
-	// 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 $columnName => $callbackName) {
-				// Fill the callback arguments
-				$args = array($content[$columnName]);
-
-				// Do we have more to add?
-				if (isset($extraParameters[$columnName])) {
-					// Add them as well
-					$args = merge_array($args, $extraParameters[$columnName]);
-				} // END - if
-
-				// Call the callback-function
-				//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',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[$columnName] = call_user_func_array($callbackName, $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[0] . '--}');
-	}
-
-	// Free result
-	SQL_FREERESULT($result);
-}
-
 // Checks proxy settins by fetching check-updates3.php from mxchange.org
 function adminTestProxySettings ($settingsArray) {
 	// Set temporary the new settings
@@ -1811,7 +1610,7 @@ function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
 	// Init output
 	$OUT = $unconfirmed;
 
-	// Do we have unconfirmed mails?
+	// Is there unconfirmed mails?
 	if ($unconfirmed > 0) {
 		// Add link to list_unconfirmed what-file
 		$OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;' . $type . '=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';