X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=cf76c3b12c0d4daee8bd01f4ef451f511a4abb1b;hb=0ddf8f6c578aa2c1ff1db9fb8eb0b93a1e247b73;hp=f7e868bc117a138107c0ea46758314e7d7e3cf9a;hpb=0f8b6618aeb5d92a372be12066c611c60ff86917;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index f7e868bc11..cf76c3b12c 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -177,6 +175,9 @@ function doAdminAction () {
 	} else {
 		$content['welcome'] = loadTemplate('admin_welcome', true, $content);
 	}
+
+	// Load header, footer, render menu
+	$content['header'] = loadTemplate('admin_header' , true, $content);
 	$content['footer'] = loadTemplate('admin_footer' , true, $content);
 	$content['menu']   = addAdminMenu($action, $what, true);
 
@@ -289,7 +290,7 @@ ORDER BY
 						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
 					}
 				} else {
-					$OUT .= '<em style="cursor:help" class="admin_note" title="{%message,MENU_ACTION_404=' . $menu . '}">';
+					$OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_ACTION_404=' . $menu . '}">';
 				}
 
 				$OUT .= $title;
@@ -359,7 +360,7 @@ ORDER BY
 									$OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
 								}
 							} else {
-								$OUT .= '<em style="cursor:help" class="admin_note" title="{%message,MENU_WHAT_404=' . $what_sub . '%}">';
+								$OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $what_sub . '%}">';
 							}
 
 							$OUT .= $title_what;
@@ -423,14 +424,14 @@ function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $no
 
 	if ($return === false) {
 		// Remeber options in constant
-		$content['member_selection'] = $OUT;
+		$content['form_selection'] = $OUT;
 		$content['what']             = getWhat();
 
 		// Load template
-		loadTemplate('admin_member_selection_box', false, $content);
+		loadTemplate('admin_form_selection_box', false, $content);
 	} else {
 		// Return content in selection frame
-		return '<select class="admin_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
+		return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
 	}
 }
 
@@ -447,7 +448,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 		// Load menu as selection
 		$OUT = '<select name="' . $mode . '_menu';
 		if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
-		$OUT .= '" size="1" class="admin_select">
+		$OUT .= '" size="1" class="form_select">
 	<option value="">{--SELECT_NONE--}</option>';
 		// Load all entries
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -501,7 +502,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 				} // END - if
 
 				// Shall we add numbers or strings?
-				$test = (float)$val;
+				$test = (float) $val;
 				if ('' . $val . '' == '' . $test . '') {
 					// Add numbers
 					$tableData[] = sprintf("`%s`=%s", $id, $test);
@@ -589,7 +590,7 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 	$menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), '', false, false);
 
 	// Init the selection box
-	$OUT = '<select name="' . $name . '" class="admin_select" size="1"><option value="">{--IS_TOP_MENU--}</option>';
+	$OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
 
 	// Walk through all files
 	foreach ($menuArray as $file) {
@@ -747,17 +748,17 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 		}
 
 		// Send email out
-		sendEmail(postRequestParameter($userid, $id), '{--MEMBER_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}', $mail);
+		sendEmail(postRequestParameter($userid, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
 	} // END - if
 
 	// Generate subject
-	$subject = '{--ADMIN_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
+	$subject = strtoupper('{--ADMIN_' . $subject . '_' . $table . '_SUBJECT--}');
 
 	// Send admin notification out
 	if (!empty($subjectPart)) {
-		sendAdminNotification('{--ADMIN_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}', 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
 	} else {
-		sendAdminNotification('{--ADMIN_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}', 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
 	}
 }
 
@@ -940,7 +941,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
 					SQL_FREERESULT($result);
 
 					// Send "build mails" out
-					sendAdminBuildMails('del', $table, $content, $id);
+					sendAdminBuildMails('delete', $table, $content, $id);
 				} // END - if
 
 				// Add id number
@@ -960,7 +961,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
 			}
 		} else {
 			// List for deletion confirmation
-			adminListBuilder('del', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+			adminListBuilder('delete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
 		}
 	} // END - if
 }
@@ -1128,7 +1129,7 @@ function sendAdminPasswordResetLink ($email) {
 	unset($content['password']);
 
 	// Prepare email
-	$mailText = loadEmailTemplate('admin_reset_password', $content);
+	$mailText = loadEmailTemplate('form_reset_password', $content);
 
 	// Send it out
 	sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
@@ -1175,7 +1176,7 @@ function doResetAdminPassword ($login, $password) {
 		array($passHash, $login), __FUNCTION__, __LINE__);
 
 	// Run filters
-	runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
+	runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash));
 
 	// Return output
 	return '{--ADMIN_PASSWORD_RESET_DONE--}';
@@ -1256,7 +1257,7 @@ function adminCreateUserLink ($userid) {
 // Generate a "link" for the given admin id (admin_id)
 function generateAdminLink ($adminId) {
 	// No assigned admin is default
-	$adminLink = '<span class="admin_note">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>';
+	$adminLink = '<span class="notice">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>';
 
 	// Zero? = Not assigned
 	if (bigintval($adminId) > 0) {
@@ -1271,11 +1272,11 @@ function generateAdminLink ($adminId) {
 				$adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
 			} else {
 				// Extension not found
-				$adminLink = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'admins');
+				$adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
 			}
 		} else {
 			// Maybe deleted?
-			$adminLink = '<div class="admin_note">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
+			$adminLink = '<div class="notice">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
 		}
 	} // END - if
 
@@ -1359,7 +1360,7 @@ function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
 	// Do we have 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 . '%}">' . translateComma($unconfirmed) . '</a>';
+		$OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;' . $type . '=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
 	} // END - if
 
 	// Return it