"MDL-14129, fix print_error"

diff --git a/lang/en_utf8/notes.php b/lang/en_utf8/notes.php
index 4c990d8b4e2ac744424e86bd379128b7e3a07c7c..2419f20a9c04759a77d27fabc184146fef4aca1b 100755 (executable)
--- a/lang/en_utf8/notes.php
+++ b/lang/en_utf8/notes.php
@@ -1,26 +1,29 @@
 <?PHP // $Id$
       // note.php 
+$string['addnewnote'] = 'Add a new note';    
+$string['addnewnoteselect'] = 'Select users to write notes about';
+$string['bynameondate'] = 'by $a->name - $a->date';
+$string['cannotdeletepost'] = 'Error occured while deleting post';
+$string['course'] = 'course';
+$string['content'] = 'Content';
+$string['created'] = 'created';
+$string['coursenotes'] = 'Course notes';
+$string['deletenotes'] = 'Delete all notes';
+$string['deleteconfirm'] = 'Delete this note?';
+$string['editnote'] = 'Edit note';
+$string['invalidid'] = 'Invalid note ID specified';
+$string['groupaddnewnote'] = 'Add a common note';
 $string['note'] = 'Note';
 $string['notes'] = 'Notes';
-$string['sitenotes'] = 'Site notes';
-$string['coursenotes'] = 'Course notes';
-$string['personalnotes'] = 'Personal notes';
-$string['created'] = 'created';
 $string['nonotes'] = 'There are no notes of this type yet';
+$string['nopermissiontodelete'] = 'You may not delete this note';
 $string['notesnotvisible'] = 'You are not allowed to view the notes.';
-$string['addnewnote'] = 'Add a new note';    
-$string['addnewnoteselect'] = 'Select users to write notes about';
-$string['groupaddnewnote'] = 'Add a common note';
-$string['deleteconfirm'] = 'Delete this note?';
-$string['content'] = 'Content';
 $string['nocontent'] = 'Note content can not be empty';
 $string['nouser'] = 'You must select a user';
-$string['unknown'] = 'unknown';
-$string['bynameondate'] = 'by $a->name - $a->date';
+$string['personalnotes'] = 'Personal notes';
 $string['publishstate'] = 'Status';
 $string['personal'] = 'personal';
-$string['course'] = 'course';
+$string['unknown'] = 'unknown';
 $string['site'] = 'site';
-$string['editnote'] = 'Edit note';
-$string['deletenotes'] = 'Delete all notes';
+$string['sitenotes'] = 'Site notes';
 ?>

diff --git a/notes/add.php b/notes/add.php
index 973ffa5ea7a02511f946854ea5dd0d3bf3cccbb5..5e94d4689e336aca07e2ae4d65c0161867467180 100644 (file)
--- a/notes/add.php
+++ b/notes/add.php
@@ -9,7 +9,7 @@
 
 /// locate course information
     if (!($course = $DB->get_record('course', array('id'=>$courseid)))) {
-        print_error('Incorrect course id found');
+        print_error('invalidcourseid');
     }
 
 /// require login to access notes
@@ -24,7 +24,7 @@
 
 /// locate user information
     if (!($user = $DB->get_record('user', array('id'=>$userid)))) {
-        print_error('Incorrect user id found');
+        print_error('invaliduserid');
     }
 
 /// build-up form

diff --git a/notes/delete.php b/notes/delete.php
index dcd0780cdb41325b7808af07cceba5e11cce4c3e..94269c0cdef0289b8e4f7d034a8af9686b05044e 100644 (file)
--- a/notes/delete.php
+++ b/notes/delete.php
@@ -8,17 +8,17 @@ $noteid       = required_param('note', PARAM_INT);
 
 // locate note information
 if (!$note = note_load($noteid)) {
-    print_error('Incorrect note id specified');
+    print_error('invalidid');
 }
 
 // locate course information
 if (!$course = $DB->get_record('course', array('id'=>$note->courseid))) {
-    print_error('Incorrect course id found');
+    print_error('invalidcourseid');
 }
 
 // locate user information
     if (!$user = $DB->get_record('user', array('id'=>$note->userid))) {
-        print_error('Incorrect user id found');
+        print_error('invaliduserid');
     }
 
 // require login to access notes
@@ -29,7 +29,7 @@ $context = get_context_instance(CONTEXT_COURSE, $course->id);
 
 // check capability
 if (!has_capability('moodle/notes:manage', $context)) {
-    print_error('You may not delete this note');
+    print_error('nopermissiontodelete', 'notes');
 }
 
 if (data_submitted() && confirm_sesskey()) {
@@ -38,7 +38,7 @@ if (data_submitted() && confirm_sesskey()) {
     if (note_delete($noteid)) {
         add_to_log($note->courseid, 'notes', 'delete', 'index.php?course='.$note->courseid.'&user='.$note->userid . '#note-' . $note->id , 'delete note');
     } else {
-        print_error('Error occured while deleting post', '', $returnurl);
+        print_error('cannotdeletepost', 'notes', $returnurl);
     }
     redirect($returnurl);
 } else {

diff --git a/notes/edit.php b/notes/edit.php
index 7ebe328e15712e9f215997de30bd4732f477c1d2..dbc8ac3fd8d9eb1523d53e893baad4173cf915ea 100644 (file)
--- a/notes/edit.php
+++ b/notes/edit.php
@@ -8,17 +8,17 @@
 
 /// locate note information
     if (!$note = note_load($noteid)) {
-        print_error('Incorrect note id specified');
+        print_error('invalidid', 'notes');
     }
 
 /// locate course information
     if (!$course = $DB->get_record('course', array('id'=>$note->courseid))) {
-        print_error('Incorrect course id found');
+        print_error('invalidcourseid');
     }
 
 /// locate user information
     if (!$user = $DB->get_record('user', array('id'=>$note->userid))) {
-        print_error('Incorrect user id found');
+        print_error('invaliduserid');
     }
 
 /// require login to access notes

diff --git a/notes/index.php b/notes/index.php
index bc93c4c507fdf147f0f18a918f2c077e7b77258f..5f93610cbff15e5379b4b1dd7ff9e2da3e169196 100644 (file)
--- a/notes/index.php
+++ b/notes/index.php
@@ -27,13 +27,13 @@
 
 /// locate course information
     if (!$course = $DB->get_record('course', array('id'=>$courseid))) {
-        print_error('Incorrect course id specified');
+        print_error('invalidcourseid');
     }
 
 /// locate user information
     if ($userid) {
         if (!$user = $DB->get_record('user', array('id'=>$userid))) {
-            print_error('Incorrect user id specified');
+            print_error('invaliduserid');
         }
         $filtertype = 'user';
         $filterselect = $user->id;