X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fgrade_functions.php;h=b2fe83e395ddc8afd3f8060c7cc2a3728f6f3478;hp=ed7bb7f30f60b360f59fbc15cdebdff30056e2ef;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hpb=f61f2c11ec3d2a68a6663d1dda4f5d1f2ca3383b

diff --git a/inc/libs/grade_functions.php b/inc/libs/grade_functions.php
index ed7bb7f30f..b2fe83e395 100644
--- a/inc/libs/grade_functions.php
+++ b/inc/libs/grade_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,6 +40,43 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
+// Generates a option "list" for all created grade ids
+function generateGradeDataIdOptions ($defaultId = NULL) {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$defaultId])) {
+		// Look for all
+		$grades = getArrayFromTable('grade_data', array('grade_id', 'grade_name'), 'grade_id');
+
+		// Init entries arrays
+		$gradeKeys = array();
+		$gradeValues = array();
+
+		// Load all entries
+		foreach ($grades as $grade) {
+			// Add it to arrays
+			array_push($gradeKeys  , $grade['grade_id']);
+			array_push($gradeValues, $grade['grade_name']);
+		} // END - foreach
+
+		// Generate option "list"
+		$GLOBALS[__FUNCTION__][$defaultId] = generateOptions(
+			'/ARRAY/',
+			$gradeKeys,
+			$gradeValues,
+			$defaultId,
+			'',
+			'',
+			array(),
+			'',
+			TRUE,
+			FALSE
+		);
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$defaultId];
+}
+
 // Generates a option "list" for all created "parent" grade ids
 function generateGradeDataParentIdOptions ($defaultId = NULL) {
 	// Do we have cache?
@@ -50,32 +87,22 @@ function generateGradeDataParentIdOptions ($defaultId = NULL) {
 		// Is default set?
 		if (!is_null($defaultId)) {
 			// Then exlude it
-			$whereStatement = sprintf('WHERE `grade_id`=%s', bigintval($defaultId));
+			$whereStatement = sprintf('WHERE `grade_id` != %s', bigintval($defaultId));
 		} // END - if
 
 		// Look for all
-		$result = SQL_QUERY('SELECT
-	`grade_id`,
-	`grade_name`
-FROM
-	`{?_MYSQL_PREFIX?}_grade_data`
-' . $whereStatement . '
-ORDER BY
-	`grade_id` ASC', __FUNCTION__, __LINE__);
+		$grades = getArrayFromTable('grade_data', array('grade_id', 'grade_name'), 'grade_id', 'ASC', $whereStatement);
 
 		// Init entries arrays
 		$gradeKeys = array();
 		$gradeValues = array();
 
 		// Are there entries?
-		if (!SQL_HASZERONUMS($result)) {
-			// Load all entries
-			while ($grade = SQL_FETCHARRAY($result)) {
-				// Add it to arrays
-				array_push($gradeKeys  , $grade['grade_id']);
-				array_push($gradeValues, $grade['grade_name']);
-			} // END - while
-		} // END - if
+		foreach ($grades as $grade) {
+			// Add it to arrays
+			array_push($gradeKeys  , $grade['grade_id']);
+			array_push($gradeValues, $grade['grade_name']);
+		} // END - foreach
 
 		// Generate option "list"
 		$GLOBALS[__FUNCTION__][$defaultId] = generateOptions(
@@ -84,15 +111,22 @@ ORDER BY
 			$gradeValues,
 			$defaultId
 		);
-
-		// Free result
-		SQL_FREERESULT($result);
 	} // END - if
 
 	// Return cache
 	return $GLOBALS[__FUNCTION__][$defaultId];
 }
 
+// Generates a selection box for grades
+function generateAdminGradeDataSelectionBox ($gradeId, $defaultId = NULL) {
+	// May only be called as admin
+	assert(isAdmin());
+	assert(isValidId($gradeId));
+
+	// Load template
+	return generateSelectionBoxFromArray(getArrayFromTable('grade_data', array('grade_id', 'grade_name'), 'grade_id'), 'grade_parent_id', $defaultId, '', '', '', $defaultId, '', TRUE, TRUE);
+}
+
 // ----------------------------------------------------------------------------
 //                             XML call-back functions
 // ----------------------------------------------------------------------------