Permalink
Browse files

ELIS 1.9.3.1 release

  • Loading branch information...
1 parent b47156b commit 9621c9763f85f36a8f75ea541d2d25c87d6fb339 @jfilip jfilip committed May 23, 2012
@@ -1,10 +0,0 @@
-diff --git a/elis/core/version.php b/elis/core/version.php
-index 478ccf4..1fe108a 100644
---- a/elis/core/version.php
-+++ b/elis/core/version.php
-@@ -1,4 +1,4 @@
- <?php
-
- $plugin->version = 2011030404;
--$plugin->release = '1.9.3 (Build: 20120229)';
-+$plugin->release = '1.9.3 (Build: 20120210)';
@@ -1,5 +1,5 @@
diff --git a/files/index.php b/files/index.php
-index 6438418..2749cde 100644
+index 4df3097..82c890e 100644
--- a/files/index.php
+++ b/files/index.php
@@ -10,10 +10,12 @@
@@ -240,13 +240,13 @@ index 6438418..2749cde 100644
+ }
+ }
+ } else {
- $shortfile = basename($file);
- $oldfile = $basedir.'/'.$file;
- $newfile = $basedir.$wdir."/".$shortfile;
+ $shortfile = basename($file);
+ $oldfile = $basedir.'/'.$file;
+ $newfile = $basedir.$wdir."/".$shortfile;
@@ -313,6 +422,7 @@
+ }
}
}
- }
+ }
clearfilelist();
displaydir($wdir);
@@ -445,7 +445,7 @@ index 6438418..2749cde 100644
+
if ($wdir.$dir === '/moddata') {
print_cell();
- } else {
+ } else {
- print_cell("right", "<a href=\"index.php?id=$id&amp;wdir=$wdir&amp;file=$filesafe&amp;action=rename&amp;choose=$choose\">$strrename</a>", 'commands');
+ print_cell("right", "<a href=\"index.php?id=$id&amp;oid=$oid&amp;wdir=$wdir&amp;file=$filesafe&amp;action=rename&amp;choose=$choose\">$strrename</a>", 'commands');
}
@@ -1,5 +1,5 @@
diff --git a/lib/editor/htmlarea/coursefiles.php b/lib/editor/htmlarea/coursefiles.php
-index 19a4058..c120b28 100644
+index f488598..78a230b 100644
--- a/lib/editor/htmlarea/coursefiles.php
+++ b/lib/editor/htmlarea/coursefiles.php
@@ -134,7 +134,8 @@
@@ -22,7 +22,7 @@ index 5822ef3..6868723 100644
+ $canedit = false;
+
+ if (empty($alf)) {
- require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $id));
+ require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $id));
+ }
+
+ // Make sure the plug-in is enabled and setup correctly.
@@ -143,8 +143,8 @@ index 5822ef3..6868723 100644
+?>
<tr>
<td width="55%" valign="top"><?php
- print_string("filebrowser","editor");
- echo "<br />";
+ print_string("filebrowser","editor");
+ echo "<br />";
- echo "<iframe id=\"ibrowser\" name=\"ibrowser\" src=\"{$CFG->wwwroot}/lib/editor/htmlarea/coursefiles.php?usecheckboxes=1&id=$id\" style=\"width: 100%; height: 200px;\"></iframe>";
+
+/// Remote Learner Edit -- BEGIN
@@ -232,7 +232,7 @@ index 1bb913a..d09ad36 100644
+ <div class="space"></div>
+ <form action="" method="get" id="first">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
+ <tr>
- <td style="width: 7em; text-align: right"><?php print_string("imageurl","editor");?>:</td>
- <td><input type="text" name="url" id="f_url" style="width:75%"
- title="Enter the image URL here" />
@@ -243,16 +243,16 @@ index 1bb913a..d09ad36 100644
+ <td width="60%"><input name="f_url" type="text" id="f_url" style="width: 100%;" /></td>
+ <td width="23%" align="center">
+ <button name="btnOK" type="button" id="btnOK" onclick="return onOK();"><?php print_string("ok","editor") ?></button></td>
- </tr>
- <tr>
+ </tr>
+ <tr>
- <td style="width: 7em; text-align: right"><?php print_string("alternatetext","editor");?>:</td>
- <td><input type="text" name="alt" id="f_alt" style="width:100%"
- title="For browsers that don't support images" /></td>
+ <td align="right"><?php print_string("alternatetext","editor");?>:</td>
+ <td><input name="f_alt" type="text" id="f_alt" style="width: 100%;" /></td>
+ <td align="center">
+ <button name="btnCancel" type="button" id="btnCancel" onclick="return onCancel();"><?php print_string("cancel","editor") ?></button></td>
- </tr>
+ </tr>
- </tbody>
-</table>
-
@@ -276,13 +276,13 @@ index 1bb913a..d09ad36 100644
+ <td width="40%" align="right"><?php print_string("alignment","editor");?>:</td>
+ <td width="60%">
+ <select size="1" name="f_align" id="f_align"
- title="Positioning of this image">
- <option value="" ><?php print_string("notset","editor") ?></option>
- <option value="left" ><?php print_string("left","editor") ?></option>
+ title="Positioning of this image">
+ <option value="" ><?php print_string("notset","editor") ?></option>
+ <option value="left" ><?php print_string("left","editor") ?></option>
@@ -198,42 +313,211 @@ form { padding: 0px; margin: 0px; }
- <option value="bottom" ><?php print_string("bottom","editor") ?></option>
- <option value="middle" ><?php print_string("middle","editor") ?></option>
- <option value="top" ><?php print_string("top","editor") ?></option>
+ <option value="bottom" ><?php print_string("bottom","editor") ?></option>
+ <option value="middle" ><?php print_string("middle","editor") ?></option>
+ <option value="top" ><?php print_string("top","editor") ?></option>
-</select>
+ </select></td>
+ </tr>
@@ -369,7 +369,7 @@ index 1bb913a..d09ad36 100644
-<div class="space"></div>
+ }
+/// Remote Learner Edit -- END
-
+
-<div class="fr"><?php print_string("horizontal","editor");?>:</div>
-<input type="text" name="horiz" id="f_horiz" size="5"
-title="Horizontal padding" />
@@ -8,7 +8,7 @@ index fd9b451..79aa802 100644
require("../../../../config.php");
+ require_once $CFG->dirroot . '/file/repository/repository.class.php';
- $id = optional_param('id', SITEID, PARAM_INT);
+ $id = optional_param('id', SITEID, PARAM_INT);
+ $oid = optional_param('oid', '', PARAM_INT);
+ $dd = optional_param('dd', 0, PARAM_INT);
+
@@ -13,7 +13,7 @@ index 204302e..0c5e4fc 100644
+ $search = '/uuid=([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/';
+
+ if (!preg_match($search, $imageurl, $matches)) {
- require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $id));
+ require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $id));
+ } else {
+ // Initialize the repository plug-in and verify permissions through the Alfresco API.
+ $uuid = $matches[1];
@@ -4,7 +4,7 @@ index f1d2626..7113148 100644
+++ b/mod/resource/lib.php
@@ -361,8 +361,38 @@ function resource_get_coursemodule_info($coursemodule) {
- require_once($CFG->libdir.'/filelib.php');
+ require_once($CFG->libdir.'/filelib.php');
+ // Determine if Alfresco is even enabled on the site right now.
+ $hasalfresco = isset($CFG->repository_plugins_enabled) &&
View
@@ -6,10 +6,10 @@
// This is compared against the values stored in the database to determine
// whether upgrades should be performed (see lib/db/*.php)
- $version = 2007101591.10; // YYYYMMDD = date of the 1.9 branch (don't change)
+ $version = 2007101591.16; // YYYYMMDD = date of the 1.9 branch (don't change)
// X = release number 1.9.[0,1,2,3,4,5...]
// Y.YY = micro-increments between releases
- $release = '1.9.16 (Build: 20120109)'; // Human-friendly version name
+ $release = '1.9.18 (Build: 20120514)'; // Human-friendly version name
?>

0 comments on commit 9621c97

Please sign in to comment.