http://www.atutor.ca/atutor/mantis/view.php?id=2776

http://www.atutor.ca/atutor/mantis/view.php?id=2763

diff --git a/docs/editor/add_news.php b/docs/editor/add_news.php
index 3f1518f..5a05af5 100644 (file)
--- a/docs/editor/add_news.php
+++ b/docs/editor/add_news.php
@@ -35,10 +35,20 @@ if ((!$_POST['setvisual'] && $_POST['settext']) || !$_GET['setvisual']){
 
 if (isset($_POST['add_news'])&& isset($_POST['submit'])) {
        $_POST['formatting'] = intval($_POST['formatting']);
+       $_POST['title'] = trim($_POST['title']);
+       $_POST['body_text'] = trim($_POST['body_text']);
        
-       if (($_POST['title'] == '') && ($_POST['body_text'] == '') && !isset($_POST['setvisual'])) {
-               $msg->addError('ANN_BOTH_EMPTY');
+       $missing_fields = array();
+
+       if (!$_POST['body_text']) {
+               $missing_fields[] = _AT('body');
+       }
+
+       if ($missing_fields) {
+               $missing_fields = implode(', ', $missing_fields);
+               $msg->addError(array('EMPTY_FIELDS', $missing_fields));
        }
+
        if (!$msg->containsErrors() && (!isset($_POST['setvisual']) || isset($_POST['submit']))) {
 
                $_POST['formatting']  = $addslashes($_POST['formatting']);
@@ -76,7 +86,7 @@ $msg->printErrors();
 
        <div class="input-form">
                <div class="row">
-                       <div class="required" title="<?php echo _AT('required_field'); ?>">*</div><label for="title"><?php echo _AT('title'); ?></label><br />
+                       <label for="title"><?php echo _AT('title'); ?></label><br />
                        <input type="text" name="title" size="40" id="title" value="<?php echo $_POST['title']; ?>" />
                </div>
 

diff --git a/docs/editor/delete_news.php b/docs/editor/delete_news.php
index b35f2ba..61537dc 100644 (file)
--- a/docs/editor/delete_news.php
+++ b/docs/editor/delete_news.php
@@ -49,7 +49,7 @@ require(AT_INCLUDE_PATH.'header.inc.php');
 
        $result = mysql_query($sql,$db);
        if (mysql_num_rows($result) == 0) {
-               $msg->printErrors('ANN_NOT_FOUND');
+               $msg->printErrors('ITEM_NOT_FOUND');
        } else {
                $row = mysql_fetch_assoc($result);
 

diff --git a/docs/editor/edit_news.php b/docs/editor/edit_news.php
index 0b9a26f..7b494ac 100644 (file)
--- a/docs/editor/edit_news.php
+++ b/docs/editor/edit_news.php
@@ -75,7 +75,7 @@ if (isset($_GET['aid'])) {
 }
 
 if ($aid == 0) {
-       $msg->printErrors('ANN_ID_ZERO');
+       $msg->printErrors('ITEM_NOT_FOUND');
        require (AT_INCLUDE_PATH.'footer.inc.php');
        exit;
 }
@@ -83,7 +83,7 @@ if ($aid == 0) {
 $sql = "SELECT * FROM ".TABLE_PREFIX."news WHERE news_id=$aid AND course_id=$_SESSION[course_id]";
 $result = mysql_query($sql,$db);
 if (!($row = mysql_fetch_array($result))) {
-       $msg->printErrors('ANN_NOT_FOUND');
+       $msg->printErrors('ITEM_NOT_FOUND');
        require (AT_INCLUDE_PATH.'footer.inc.php');
        exit;
 }

diff --git a/docs/faq/add_question.php b/docs/faq/add_question.php
index 7e91cea..c2de2b4 100644 (file)
--- a/docs/faq/add_question.php
+++ b/docs/faq/add_question.php
@@ -21,14 +21,25 @@ if (isset($_POST['cancel'])) {
        header('Location: index_instructor.php');
        exit;
 } else if (isset($_POST['submit'])) {
-       if (trim($_POST['question']) == '') {
-               $msg->addError('QUESTION_EMPTY');
+       $_POST['question'] = trim($_POST['question']);
+       $_POST['answer'] = trim($_POST['answer']);
+
+       $missing_fields = array();
+       
+       if (!$_POST['question']) {
+               $missing_fields[] = _AT('question');
+       }
+
+       if (!$_POST['answer']) {
+               $missing_fields[] = _AT('answer');
        }
 
-       if (trim($_POST['answer']) == '') {
-               $msg->addError('ANSWER_EMPTY');
+       if ($missing_fields) {
+               $missing_fields = implode(', ', $missing_fields);
+               $msg->addError(array('EMPTY_FIELDS', $missing_fields));
        }
 
+
        if (!$msg->containsErrors()) {
                $_POST['question'] = $addslashes($_POST['question']);
                $_POST['answer']   = $addslashes($_POST['answer']);

diff --git a/docs/faq/edit_question.php b/docs/faq/edit_question.php
index 828d2da..310a9fa 100644 (file)
--- a/docs/faq/edit_question.php
+++ b/docs/faq/edit_question.php
@@ -30,12 +30,22 @@ if (isset($_GET['id'])) {
 }
 
 if (isset($_POST['submit'])) {
-       if (trim($_POST['question']) == '') {
-               $msg->addError('QUESTION_EMPTY');
+       $_POST['question'] = trim($_POST['question']);
+       $_POST['answer'] = trim($_POST['answer']);
+
+       $missing_fields = array();
+       
+       if (!$_POST['question']) {
+               $missing_fields[] = _AT('question');
+       }
+
+       if (!$_POST['answer']) {
+               $missing_fields[] = _AT('answer');
        }
 
-       if (trim($_POST['answer']) == '') {
-               $msg->addError('ANSWER_EMPTY');
+       if ($missing_fields) {
+               $missing_fields = implode(', ', $missing_fields);
+               $msg->addError(array('EMPTY_FIELDS', $missing_fields));
        }
 
        if (!$msg->containsErrors()) {

diff --git a/docs/include/vitals.inc.php b/docs/include/vitals.inc.php
index 13a7c41..efa011c 100644 (file)
--- a/docs/include/vitals.inc.php
+++ b/docs/include/vitals.inc.php
@@ -13,7 +13,7 @@
 // $Id$
 if (!defined('AT_INCLUDE_PATH')) { exit; }
 
-define('AT_DEVEL', 1);
+define('AT_DEVEL', 0);
 define('AT_DEVEL_TRANSLATE', 0);
 
 // Emulate register_globals off. src: http://php.net/manual/en/faq.misc.php#faq.misc.registerglobals

diff --git a/docs/tools/tests/index.php b/docs/tools/tests/index.php
index 45327e3..1be609c 100644 (file)
--- a/docs/tools/tests/index.php
+++ b/docs/tools/tests/index.php
@@ -42,7 +42,7 @@ if (isset($_GET['edit'], $_GET['id'])) {
                || isset($_GET['statistics']) 
                || isset($_GET['delete'])) {
 
-       $msg->addError('NO_TEST_SELECTED');
+       $msg->addError('NO_ITEM_SELECTED');
 }
 
 require(AT_INCLUDE_PATH.'header.inc.php');