"MDL-14129, fix print_error"

diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index ac7e3b108b80ceda2a93f81c5449f209f8dbd53e..f419048109811f988702de24c3849a7ad2306cae 100644 (file)
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -14,26 +14,26 @@
 
     if ($id) {
         if (! $cm = get_coursemodule_from_id('wiki', $id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
 
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
 
         if (! $wiki = $DB->get_record("wiki", array("id"=>$cm->instance))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
 
     } else {
         if (! $wiki = $DB->get_record("wiki", array("id"=>$a))) {
-            print_error("Course module is incorrect");
+            print_error('coursemisconf');
         }
         if (! $course = $DB->get_record("course", array("id"=>$wiki->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance("wiki", $wiki->id, $course->id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
     }
 
@@ -58,18 +58,18 @@
 
     /// Is an Action given ?
     if(!$action) {
-      print_error("noadministrationaction","wiki");
+      print_error('noadministrationaction','wiki');
     }
 
     /// Correct Action ?
     if(!in_array($action, array("setpageflags", "removepages", "strippages", "checklinks", "revertpages"))) {
-      print_error("Unknown action '$action'","wiki");
+      print_error('unknowaction');
     }
 
 
     /// May the User administrate it ?
     if (($wiki_entry = wiki_get_entry($wiki, $course, $userid, $groupid)) === false || wiki_can_edit_entry($wiki_entry, $wiki, $USER, $course) === false) {
-      print_error("notadministratewiki","wiki");
+      print_error('notadministratewiki', 'wiki');
     }
 
     $canedit = wiki_can_edit_entry($wiki_entry, $wiki, $USER, $course);
@@ -77,7 +77,7 @@
     if(in_array($action,array("removepages","strippages","revertpages"))) {
       if(!($wiki->wtype=="student" || ($wiki->wtype=="group" and $canedit) || wiki_is_teacher($wiki))) {
         add_to_log($course->id, "wiki", "hack", "", $wiki->name.": Tried to trick admin.php with action=$action.");
-        print_error("Hack attack detected !");
+        print_error('hackdetected');
       }
     }
 
@@ -214,7 +214,7 @@
                 }
               }
             break;
-        default: print_error("No such Wiki-Admin action: $action");
+        default: print_error('unknowaction');
           break;
       }
     }
@@ -228,7 +228,7 @@
            if(!$ret) {
              redirect($redirect, get_string("pagesremoved","wiki"), 1);
            } else {
-             print_error($ret);
+             print_error('invalidaction');
            }
            exit;
         case "strippages":
@@ -240,7 +240,7 @@
            if(!$ret) {
              redirect($redirect, get_string("pagesstripped","wiki"), 1);
            } else {
-             print_error($ret);
+             print_error('invalidaction');
            }
            exit;
         case "checklinks":
@@ -254,7 +254,7 @@
         case "setpageflags":
            # No confirmation needed
            break;
-        default: print_error("No such action '$action' with confirmation");
+        default: print_error('unknowaction');
       }
     }
 

diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index bafde4ab8fdc9837aec2667626dbcf24a89b300f..393757fe5e1c328196084bfb1abee2384ab49097 100644 (file)
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -299,9 +299,9 @@
            // Binary Handling starts here
            #### MOODLE CHANGE TO BE COMPATIBLE WITH PHP 4.1
            #if(headers_sent($file,$line)) {
-           #  print_error("Headers already sent: $file:$line");
+           #  print_error('headersent');
            if(headers_sent()) {
-             print_error("Headers already sent.");
+             print_error('headersent');
            }
            $pf($GLOBALS);
         }
@@ -3607,4 +3607,4 @@ function ewiki_database_mysql($action, &$args, $sw1, $sw2) {
    return($r);
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php b/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php
index f2ef2b5c9212244f5dcf2571c1711c14a16dafb2..2ff51bf25a002b28c7261ac6664d3543c180db54 100644 (file)
--- a/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php
+++ b/mod/wiki/ewiki/plugins/moodle/moodle_binary_store.php
@@ -42,12 +42,12 @@ function moodle_binary_get_path($id, $meta, $course, $wiki, $userid, $groupid) {
     global $CFG;
     $entry=wiki_get_entry($wiki, $course, $userid, $groupid);
     if(!$entry) {
-      print_error("Cannot get entry."); 
+      print_error('cannotgetentry', 'wiki'); 
     }
     
     $dir=make_upload_directory("$course->id/$CFG->moddata/wiki/$wiki->id/$entry->id/".$meta["section"]);
     if(substr($id, 0, strlen(EWIKI_IDF_INTERNAL))!=EWIKI_IDF_INTERNAL) {
-      print_error("Binary entry does not start with ".EWIKI_IDF_INTERNAL.substr($id, 0, strlen(EWIKI_IDF_INTERNAL)));
+      print_error('cannotstartwith', 'wiki', '', EWIKI_IDF_INTERNAL.substr($id, 0, strlen(EWIKI_IDF_INTERNAL)));
     }
     $id = substr($id,strlen(EWIKI_IDF_INTERNAL));
     $id = clean_filename($id);
@@ -61,14 +61,14 @@ function moodle_binary_store_file(&$filename, &$id, &$meta, $ext=".bin") {
     # READ-Only
     global $_FILES, $CFG, $course, $wiki, $groupid, $userid, $ewiki_title, $cm;
     if(!$wiki->ewikiacceptbinary) {
-      print_error("This wiki does not accept binaries");
+      print_error('cannotacceptbin', 'wiki');
       return 0;
     }
     
     
     $entry=wiki_get_entry($wiki, $course, $userid, $groupid);
     if(!$entry->id) {
-      print_error("Cannot get entry.");
+      print_error('cannotgetentry', 'wiki');
     }
     
     require_once($CFG->dirroot.'/lib/uploadlib.php');
@@ -81,7 +81,7 @@ function moodle_binary_store_file(&$filename, &$id, &$meta, $ext=".bin") {
         }
         return true;
     }
-    print_error($um->print_upload_log(true));
+    print_error('uploaderror', 'wiki', '', $um->print_upload_log(true));
     return false;
    
 }
@@ -94,7 +94,7 @@ function moodle_binary_store_get_file($id, &$meta) {
 
     #-- check for file
     if(!$wiki->ewikiacceptbinary) {
-      print_error("This wiki does not accept binaries");
+      print_error('cannotacceptbin', 'wiki');
       return 0;
     }
     

diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
index f31ee0c44f760e3b4b27d1a4c928d4191fe0ef5a..7bc467f88fd9d646350c9aa6fd7ade425e4fc7cc 100644 (file)
--- a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
+++ b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php
@@ -243,7 +243,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
         $exportdir=$CFG->dataroot."/".$course->id."/".$exportdestinations;
       } else {
         add_to_log($course->id, "wiki", "hack", "", format_string($wiki->name,true).": Tried to export a wiki as non-teacher into $exportdestinations.");
-        print_error("You are not a teacher !");
+        print_error('younotteacher');
       }
     } else {
         $exportbasedir=tempnam("/tmp","WIKIEXPORT");
@@ -253,7 +253,7 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
         $exportdir=$exportbasedir."/".$wname;
         @mkdir($exportdir);
         if(!is_dir($exportdir)) {
-            print_error("Cannot create temporary directory $exportdir !");
+            print_error("cannotcreatetempdir");
         }
     }
     
@@ -350,12 +350,12 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
       #-- add file
       // Let's make sure the file exists and is writable first.
       if (!$handle = fopen($exportdir."/".$fn, 'w')) {
-        print_error("Cannot open file ($exportdir/$fn)");
+        print_error('cannotopenfile', '', '', $exportdir/$fn);
       }
       
       // Write $content to our opened file.
       if (fwrite($handle, $content) === FALSE) {
-        print_error("Cannot write to file ($exportdir/$fn)");
+        print_error('cannotwritefile', '', '', $exportdir/$fn);
       }
 
       fclose($handle);
@@ -391,12 +391,12 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
         // Let's make sure the file exists and is writable first.
         $indexname="index".$html_ext;
         if (!$handle = fopen($exportdir."/".$indexname, 'w')) {
-          print_error("Cannot open file ($exportdir/$indexname)");
+          print_error('cannnotopenfile', '', '', $exportdir/$indexname);
         }
         
         // Write $somecontent to our opened file.
         if (fwrite($handle, $str_formatted) === FALSE) {
-          print_error("Cannot write to file ($exportdir/$indexname)");
+          print_error('cannnotwritefile', '', '', $exportdir/$indexname);
         }
   
         fclose($handle);
@@ -422,10 +422,10 @@ function ewiki_page_wiki_dump_send($exportbinaries=0, $exportformats=0, $withvir
       Header("X-Content-Type: application/zip");
       Header("Content-Location: $archivename");      
       if(!@readfile("$exportbasedir/$archivename")) {
-        print_error("Cannot read $exportbasedir/$archivename");
+        print_error("cannotreadfile", '', '', $exportbasedir/$archivename);
       }
       if(!deldir($exportbasedir)) {
-        print_error("Cannot delete $exportbasedir");
+        print_error('cannotdeletedir', '', '', $exportbasedir);
       }
       #exit();
       return false;

diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index eb7e80a4e32ca1613f53bd57ab1b598ace679e4a..becd3449796b1347d91b5c642a8e899a0d34ae9a 100644 (file)
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -9,7 +9,7 @@
     $id = required_param('id', PARAM_INT);   // course
 
     if (!$course = $DB->get_record('course', array('id'=>$id))) {
-        print_error("Course ID is incorrect");
+        print_error('invalidcourseid');
     }
 
     require_course_login($course);

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index e13fb83b4bdf24c1468180d79ad31b2fe315509f..51a219dc3a72ab1fd3a4bf0444e910d9837341f2 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -29,7 +29,7 @@ function wiki_context($wiki) {
         $wiki = $wiki->id;
     }
     if (! $cm = get_coursemodule_from_instance('wiki', $wiki)) {
-        print_error('Course Module ID was incorrect');
+        print_error('invalidcoursemodule');
     }
 
     return get_context_instance(CONTEXT_MODULE, $cm->id);
@@ -412,7 +412,7 @@ function wiki_get_default_entry(&$wiki, &$course, $userid=0, $groupid=0) {
             // Whatever groups are in the course, pick one
             $coursegroups = groups_get_all_groups($course->id);
             if(!$coursegroups || count($coursegroups)==0) {
-                print_error("Can't access wiki in group mode when no groups are configured for the course");
+                print_error('groupmodeerror', 'wiki');
             }
             $unkeyed=array_values($coursegroups); // Make sure first item is index 0
             $groupid=$unkeyed[0]->id;
@@ -424,7 +424,7 @@ function wiki_get_default_entry(&$wiki, &$course, $userid=0, $groupid=0) {
         if (wiki_can_add_entry($wiki, $USER, $course, $userid, $groupid)) {
             wiki_add_entry($wiki, $course, $userid, $groupid);
             if (($wiki_entry = wiki_get_entry($wiki, $course, $userid, $groupid)) === false) {
-                print_error("Could not add wiki entry.");
+                print_error('cannotaddentry', 'wiki');
             }
         }
     }
@@ -468,7 +468,7 @@ function wiki_get_entry(&$wiki, &$course, $userid=0, $groupid=0) {
                     // Whatever groups are in the course, pick one
                     $coursegroups = groups_get_all_groups($course->id);
                     if(!$coursegroups || count($coursegroups)==0) {
-                        print_error("Can't access wiki in group mode when no groups are configured for the course");
+                        print_error('groupmodeerror', 'wiki');
                     }
                     $unkeyed=array_values($coursegroups); // Make sure first item is index 0
                     $groupid=$unkeyed[0]->id;
@@ -480,7 +480,7 @@ function wiki_get_entry(&$wiki, &$course, $userid=0, $groupid=0) {
             if ($groupid and wiki_user_can_access_group_wiki($wiki, $groupid, $course)) {
                 $wentry = wiki_get_group_entry($wiki, $groupid);
             } else {
-                print_error("Cannot access any groups for this wiki");
+                print_error('cannotaccessgroup', 'wiki');
             }
         }
         /// If mode is 'nogroups', then groupid is zero.
@@ -1700,7 +1700,7 @@ function wiki_obtain_lock($wikiid,$pagename) {
         } else {
             // Not locked any more. Get rid of the old lock record.
             if(!$DB->delete_records('wiki_locks', array('pagename'=>$pagename,'wikiid'=>$wikiid))) {
-                print_error('Unable to delete lock record');
+                print_error('cannotdeletelockrecored', 'wiki');
             }
         }
     }
@@ -1715,7 +1715,7 @@ function wiki_obtain_lock($wikiid,$pagename) {
         $newlock->wikiid=$wikiid;
         $newlock->pagename=$pagename;
         if(!$lockid=$DB->insert_record('wiki_locks',$newlock)) {
-            print_error('Unable to insert lock record');
+            print_error('cannotinsertlockrecored', 'wiki');
         }
     }
 
@@ -1752,7 +1752,7 @@ function wiki_release_lock($wikiid,$pagename) {
         $lockid=$_SESSION[SESSION_WIKI_LOCKS][$key];
         unset($_SESSION[SESSION_WIKI_LOCKS][$key]);
         if (!$DB->delete_records('wiki_locks', array('id'=>$lockid))) {
-            print_error("Unable to delete lock record.");
+            print_error('cannotdeletelockrecored', 'wiki');
         }
     }
 }

diff --git a/mod/wiki/overridelock.php b/mod/wiki/overridelock.php
index 2fc1842005640437e5b7ece152ecc2dae8447aa7..c8d23face607ca29fab1e625e49470eafa16a1f4 100644 (file)
--- a/mod/wiki/overridelock.php
+++ b/mod/wiki/overridelock.php
@@ -16,37 +16,37 @@ $id=required_param('id',PARAM_INT);
 $page=required_param('page',PARAM_RAW);
 
 if (! $cm = get_coursemodule_from_id('wiki', $id)) {
-    print_error("Course Module ID was incorrect");
+    print_error('invalidcoursemodule');
 }
 if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-    print_error("Course is misconfigured");
+    print_error('coursemisconf');
 }
 if (! $wiki = $DB->get_record("wiki", array("id"=>$cm->instance))) {
-    print_error("Course module is incorrect");
+    print_error('invalidcoursemodule');
 }
 
 if(!confirm_sesskey()) {
-    print_error("Session key not set");
+    print_error('confirmsesskeybad');
 }
 if(!data_submitted()) {
-    print_error("Only POST requests accepted");
+    print_error('invalidformdata');
 }
 
 require_course_login($course, true, $cm);
 
 $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
 if(!has_capability('mod/wiki:overridelock', $modcontext)) {
-    print_error("You do not have the capability to override editing locks");
+    print_error('nopermissiontooverride', 'wiki');
 }
 
 $actions = explode('/', $page,2);
 if(count($actions)!=2) {
-    print_error("Unsupported page value");
+    print_error('invalidpageval', 'wiki');
 }
 $pagename=$actions[1];
 if(!$DB->delete_records('wiki_locks', array('pagename'=>$pagename, 'wikiid'=>$wiki->id))) {
-    print_error('Unable to delete lock record');
+    print_error('cannotdeletelockrecored', 'wiki');
 }
 
 redirect("view.php?id=$id&page=".urlencode($page));
-?>
\ No newline at end of file
+?>

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index be1062398b9c58c3c41b30f078b77481987ca0c6..38ea503b666d752728054d32b73c3ba07eaa5d04 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -38,26 +38,26 @@
     
     if ($id) {
         if (! $cm = get_coursemodule_from_id('wiki', $id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
 
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
 
         if (! $wiki = $DB->get_record("wiki", array("id"=>$cm->instance))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
 
     } else {
         if (! $wiki = $DB->get_record("wiki", array("id"=>$wid))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$wiki->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance("wiki", $wiki->id, $course->id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
     }
 
@@ -96,8 +96,7 @@
             // We must have the edit lock in order to be permitted to save    
             list($ok,$lock)=wiki_obtain_lock($wiki_entry->id,$pagename);
             if(!$ok) {
-                $strsavenolock=get_string('savenolock','wiki');
-                print_error($strsavenolock, '', $CFG->wwwroot.'/mod/wiki/view.php?id='.$cm->id.'&page=view/'.urlencode($pagename));
+                print_error('savenolock', 'wiki', $CFG->wwwroot.'/mod/wiki/view.php?id='.$cm->id.'&page=view/'.urlencode($pagename));
             }
         }