Added update_year.sh (still not fully flexible) and updated all years with it.

[mailer.git] / inc / libs / grade_functions.php

diff --git a/inc/libs/grade_functions.php b/inc/libs/grade_functions.php
index 42c781db2a6825ff12750706831d148d9a4b416c..814d441622bd17a3bca567e6a668ad1f77cd067b 100644 (file)
--- 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 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 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 = sqlQuery('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 (!ifSqlHasZeroNums($result)) {
-                       // Load all entries
-                       while ($grade = sqlFetchArray($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
-               sqlFreeResult($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
 // ----------------------------------------------------------------------------