New strings and help pages for file upload restrictions

diff --git a/lang/en/assignment.php b/lang/en/assignment.php
index 235c14b04db2dc82556ba0394e07fe26b42366d7..a9fe57ad591a836ef0b03bb7f5ea063ef1ab28ba 100644 (file)
--- a/lang/en/assignment.php
+++ b/lang/en/assignment.php
@@ -15,6 +15,7 @@ assignment submission for '<i>\$a->assignment</i>'<br /><br />
 You can see it appended to your <a href=\\\"\$a->url\\\">assignment submission</a>.";
 $string['assignmentname'] = "Assignment name";
 $string['assignmenttype'] = "Assignment type";
+$string['configmaxbytes'] = "Default maximum assignment size for all assignments on the site (subject to course limits and other local settings)";
 $string['description'] = "Description";
 $string['duedate'] = "Due date";
 $string['early'] = "\$a early";

diff --git a/lang/en/forum.php b/lang/en/forum.php
index 8822d8781ff38d756c1e39c6bbbaf0754e075209..6ec6937fccfbcb0409a2a2c594b897052aeb1b70 100644 (file)
--- a/lang/en/forum.php
+++ b/lang/en/forum.php
@@ -17,6 +17,7 @@ $string['bynameondate'] = "by \$a->name - \$a->date";
 $string['configdisplaymode'] = "The default display mode for discussions if one isn't set.";
 $string['configlongpost'] = "Any post over this length (not including HTML) is considered long.";
 $string['configmanydiscussions'] = "Maximum number of discussions shown in a forum per page";
+$string['configmaxbytes'] = "Default maximum size for all forum attachments on the site (subject to course limits and other local settings)";
 $string['configshortpost'] = "Any post under this length (not including HTML) is considered short.";
 $string['couldnotadd'] = "Could not add your post due to an unknown error";
 $string['couldnotdeleteratings'] = "Sorry, that cannot be deleted as people have already rated it";
@@ -54,6 +55,7 @@ $string['introsocial'] = "An open forum for chatting about anything you want to"
 $string['introteacher'] = "A forum for teacher-only notes and discussion";
 $string['lastpost'] = "Last post";
 $string['learningforums'] = "Learning forums";
+$string['maxattachmentsize'] = "Maximum attachment size";
 $string['maxtimehaspassed'] = "Sorry, but the maximum time for editing this post (\$a) has passed!";
 $string['message'] = "Message";
 $string['modeflatoldestfirst'] = "Display replies flat, with oldest first";

diff --git a/lang/en/help/courseuploadsize.html b/lang/en/help/courseuploadsize.html
new file mode 100644 (file)
index 0000000..ae4ab3b
--- /dev/null
+++ b/lang/en/help/courseuploadsize.html
@@ -0,0 +1,8 @@
+<P ALIGN=CENTER><B>Course upload size</B></P>
+
+<P>This setting defines the largest size of file that can be 
+   uploaded by students in this course, limited by the site
+   wide setting created by the administrator.
+
+<P>It is possible to further restrict this size through 
+   settings within each activity module.

diff --git a/lang/en/help/forum/index.html b/lang/en/help/forum/index.html
index a23214f095bce3c30fa33a0fcdc3d31ba420003e..133eec3abdd6e6db52cbecbd25333265e6f71553 100644 (file)
--- a/lang/en/help/forum/index.html
+++ b/lang/en/help/forum/index.html
@@ -3,6 +3,7 @@
   <li><a href="help.php?module=forum&file=allowdiscussions.html">Allow discussions</a>\r
   <li><a href="help.php?module=forum&file=attachment.html">Attachment</a>\r
   <li><a href="help.php?module=forum&file=forumtype.html">Forum type</a>\r
+  <li><a href="help.php?module=forum&file=maxattachmentsize.html">Max attachment size</a>\r
   <li><a href="help.php?module=forum&file=ratings.html">Ratings</a>\r
   <li><a href="help.php?module=forum&file=subscription.html">Subscription</a>\r
 </ul>\r

diff --git a/lang/en/help/forum/maxattachmentsize.html b/lang/en/help/forum/maxattachmentsize.html
new file mode 100644 (file)
index 0000000..9cbc10a
--- /dev/null
+++ b/lang/en/help/forum/maxattachmentsize.html
@@ -0,0 +1,8 @@
+<P ALIGN=CENTER><B>Maximum attachment size</B></P>
+
+<P>Attachments can be limited to a certain size file, 
+   chosen by the person who set up the forum.
+
+<P>Sometimes it is possible to upload a file larger than 
+   this size, but the file will not be saved on the 
+   server and you might see an error.

diff --git a/lang/en/help/index.html b/lang/en/help/index.html
index a32ff5b4eb2bfa96c049356f70133b663fd622db..47100d9616023cdf8ab68f80de916a266bbaddb4 100755 (executable)
--- a/lang/en/help/index.html
+++ b/lang/en/help/index.html
@@ -22,6 +22,7 @@
   <li><a href="help.php?file=coursenumsections.html">Course number of weeks/topics</a> 
   <li><a href="help.php?file=courseshortname.html">Course short name</a> 
   <li><a href="help.php?file=coursestartdate.html">Course start date</a> 
+  <li><a href="help.php?file=courseuploadsize.html">Course upload size</a> 
   <li><a href="help.php?file=enrolmentkey.html">Enrollment keys</a> 
   <li><a href="help.php?file=coursegrades.html">Grades</a> 
   <li><a href="help.php?file=guestaccess.html">Guest access</a> 

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 833b71bee7a98fc00b33658fd9adf3af260b5273..f7142d624cb9d8e99be11f6316fb7f9d1442adab 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -124,6 +124,7 @@ $string['configlocale'] = "Choose a sitewide locale - this will affect the forma
 $string['configlongtimenosee'] = "If students haven't logged in for a very long time, then they are automatically unsubscribed from courses.  This parameter specifies that time limit.";
 $string['configloglifetime'] = "This specifies the length of time you want to keep logs about user activity.  Logs that are older than this age are automatically deleted.  It is best to keep logs as long as possible, in case you need them, but if you have a very busy server and are experiencing performance problems, then you may want to lower the log lifetime.";
 $string['configframename'] = "If you are embedding Moodle within a web frame, then put the name of this frame here.  Otherwise this value should remain as '_top'";
+$string['configmaxbytes'] = "This specifies a maximum size that uploaded files can be throughout the whole site.  This setting is limited by the PHP setting upload_max_filesize and the Apache setting LimitRequestBody.  In turn, maxbytes limits the range of sizes that can be chosen at course level or module level.";
 $string['configmaxeditingtime'] = "This specifies the amount of time people have to re-edit forum postings, journal feedback etc.  Usually 30 minutes is a good value.";
 $string['configproxyhost'] = "If this <B>server</B> needs to use a proxy computer (eg a firewall) to access the Internet, then provide the proxy hostname and port here.  Otherwise leave it blank.";
 $string['configsecureforms'] = "Moodle can use an additional level of security when accepting data from web forms. If this is enabled, then the browser's HTTP_REFERER variable is checked against the current form address.  In a very few cases this can cause problems if the user is using a firewall (eg Zonealarm) configured to strip HTTP_REFERER from their web traffic.  Symptoms are getting 'stuck' on a form. If your users are having problems with the login page (for example) you might want to disable this setting, although it might leave your site more open to brute-force password attacks.  If in doubt, leave this set to 'Yes'.";
@@ -161,6 +162,7 @@ $string['courserestore'] = "Course restore";
 $string['coursegrades'] = "Course grades";
 $string['courses'] = "Courses";
 $string['courseupdates'] = "Course updates";
+$string['courseuploadlimit'] = "Course upload limit";
 $string['create'] = "Create";
 $string['createaccount'] = "Create my new account";
 $string['createfolder'] = "Create a folder in \$a";
@@ -459,6 +461,7 @@ $string['markthistopic'] = "Highlight this topic as the current topic";
 $string['maximumchars'] = "Maximum of \$a characters";
 $string['maximumgrade'] = "Maximum grade";
 $string['maximumshort'] = "Max";
+$string['maximumupload'] = "Maximum upload size";
 $string['maxsize'] = "Max size: \$a";
 $string['min'] = "min";
 $string['mins'] = "mins";
@@ -696,6 +699,10 @@ $string['sitelogs'] = "Site logs";
 $string['sitenews'] = "Site news";
 $string['sitesettings'] = "Site settings";
 $string['size'] = "Size";
+$string['sizeb'] = "bytes";
+$string['sizegb'] = "Gb";
+$string['sizekb'] = "Kb";
+$string['sizemb'] = "Mb";
 $string['socialheadline'] = "Social forum - latest topics";
 $string['someallowguest'] = "Some courses may allow guest access";
 $string['someerrorswerefound'] = "Some information was missing or incorrect. Look below for details.";