Index: index.php
===================================================================
--- index.php	(.../vender/moodle_16_stable/files)	（修订版 846）
+++ index.php	(.../trunk/files)	（修订版 846）
@@ -21,6 +21,8 @@
     $save    = optional_param('save', 0, PARAM_BOOL);
     $text    = optional_param('text', '', PARAM_RAW);
     $confirm = optional_param('confirm', 0, PARAM_BOOL);
+    $charset = optional_param('charset', '', PARAM_CLEAN);
+    $submit  = optional_param('submit', '', PARAM_RAW);
 
     if ($choose) {
         if (count(explode('.', $choose)) != 2) {
@@ -437,6 +439,7 @@
             break;
 
         case "zip":
+            $nativecharset = get_string('nativecharset', 'langconfig');
             if (($name != '') and confirm_sesskey()) {
                 html_header($course, $wdir);
                 $name = clean_filename($name);
@@ -446,7 +449,7 @@
                    $files[] = "$basedir/$file";
                 }
 
-                if (!zip_files($files,"$basedir$wdir/$name")) {
+                if (!zip_files($files,"$basedir$wdir/$name",$charset)) {
                     error(get_string("zipfileserror","error"));
                 }
 
@@ -469,9 +472,26 @@
                     echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
                     echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                     echo " <input type=\"hidden\" name=\"action\" value=\"zip\" />";
-                    echo " <input type=\"text\" name=\"name\" size=\"35\" value=\"new.zip\" />";
                     echo " <input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
+                    echo "<table align=\"center\"><tr>";
+                    echo "<td align=\"right\">".get_string("whattocallzip")."</td>";
+                    echo "<td><input type=\"text\" name=\"name\" size=\"35\" value=\"new.zip\" /></td>";
+                    echo "</tr>";
+                    if ($nativecharset) {
+                        echo "<tr>";
+                        echo "<td align=\"right\">".get_string("usecharset")."</td>";
+                        echo "<td> <select name=\"charset\">";
+                        echo " <option>UTF-8</option>";
+                        echo " <option>$nativecharset</option>";
+                        echo " </select></td>";
+                        echo "</tr>";
+                    } else {
+                        echo "<input type=\"hidden\" name=\"charset\" value=\"UTF-8\" />";
+                    }
+                    echo "<tr><td colspan=\"2\" align=\"center\">";
                     echo " <input type=\"submit\" value=\"".get_string("createziparchive")."\" />";
+                    echo " <input type=\"submit\" value=\"".get_string("cancel")."\" onclick=\"this.form.action.value='cancel';\" />";
+                    echo "</td></tr></table>";
                     echo "</form>";
                     echo "</td><td>";
                     echo "<form action=\"index.php\" method=\"get\">";
@@ -491,32 +511,34 @@
             break;
 
         case "unzip":
-            html_header($course, $wdir);
-            if (($file != '') and confirm_sesskey()) {
-                $strok = get_string("ok");
-                $strunpacking = get_string("unpacking", "", $file);
+            if ($charset && $submit) {
+                html_header($course, $wdir);
+                if ($file != '' and confirm_sesskey()) {
+                    $strok = get_string("ok");
+                    $strunpacking = get_string("unpacking", "", $file);
 
-                echo "<p align=\"center\">$strunpacking:</p>";
+                    echo "<p align=\"center\">$strunpacking:</p>";
 
-                $file = basename($file);
+                    $file = basename($file);
 
-                if (!unzip_file("$basedir$wdir/$file")) {
-                    error(get_string("unzipfileserror","error"));
+                    if (!unzip_file("$basedir$wdir/$file", '', true, $charset)) {
+                        error(get_string("unzipfileserror","error"));
+                    }
+
+                    echo "<center><form action=\"index.php\" method=\"get\">";
+                    echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
+                    echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                    echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
+                    echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
+                    echo " <input type=\"submit\" value=\"$strok\" />";
+                    echo "</form>";
+                    echo "</center>";
+                } else {
+                    displaydir($wdir);
                 }
-
-                echo "<center><form action=\"index.php\" method=\"get\">";
-                echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
-                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
-                echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
-                echo " <input type=\"submit\" value=\"$strok\" />";
-                echo "</form>";
-                echo "</center>";
-            } else {
-                displaydir($wdir);
+                html_footer();
+                break;
             }
-            html_footer();
-            break;
 
         case "listzip":
             html_header($course, $wdir);
@@ -525,9 +547,21 @@
                 $strsize = get_string("size");
                 $strmodified = get_string("modified");
                 $strok = get_string("ok");
+                $strunzip = get_string("unzip");
+                $strcancel = get_string("cancel");
                 $strlistfiles = get_string("listfiles", "", $file);
+                $struseothercharset = get_string("useothercharset");
+                $nativecharset = get_string('nativecharset', 'langconfig');
 
                 echo "<p align=\"center\">$strlistfiles:</p>";
+                if ($nativecharset != '') {
+                    echo "<p align=\"center\">$struseothercharset:";
+                    echo "<select name=\"filecharset\" onchange=\"window.location=window.location+'&charset='+this.value;\"";
+                    echo "<option>UTF-8</option>";
+                    echo "<option".($charset == $nativecharset ? " selected>" : ">").$nativecharset."</option>";
+                    echo "</select>";
+                    echo "</p>";
+                }
                 $file = basename($file);
 
                 include_once("$CFG->libdir/pclzip/pclzip.lib.php");
@@ -538,9 +572,18 @@
                 } else {
                     echo "<table cellpadding=\"4\" cellspacing=\"2\" border=\"0\" width=\"640\" class=\"files\">";
                     echo "<tr class=\"file\"><th align=\"left\" class=\"header name\">$strname</th><th align=\"right\" class=\"header size\">$strsize</th><th align=\"right\" class=\"header date\">$strmodified</th></tr>";
+                    $has_invalid_filename = False;
                     foreach ($list as $item) {
                         echo "<tr>";
-                        print_cell("left", s($item['filename']), 'name');
+                        $item_filename = $item['filename'];
+                        if ($charset && $charset != 'UTF-8') {
+                            $item_filename = iconv($charset, 'UTF-8', $item['filename']);
+                        }
+                        if (!utf8_validate($item_filename)) {
+                            $item_filename .= get_string('invalidfilename');
+                            $has_invalid_filename = True;
+                        }
+                        print_cell("left", s($item_filename), 'name');
                         if (! $item['folder']) {
                             print_cell("right", display_size($item['size']), 'size');
                         } else {
@@ -556,8 +599,17 @@
                 echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
                 echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
                 echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
-                echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
-                echo " <input type=\"submit\" value=\"$strok\" />";
+                if ($action != 'unzip') {
+                    echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
+                    echo " <input type=\"submit\" value=\"$strok\" />";
+                } else {
+                    echo " <input type=\"hidden\" name=\"file\" value=\"$file\" />";
+                    echo " <input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />";
+                    echo " <input type=\"hidden\" name=\"charset\" value=\"$charset\" />";
+                    echo " <input type=\"hidden\" name=\"action\" value=\"unzip\" />";
+                    echo " <input type=\"submit\" name=\"submit\" value=\"$strunzip\" ".($has_invalid_filename ? "disabled" : "")."/>";
+                    echo " <input type=\"submit\" value=\"$strcancel\" onclick=\"this.form.action.value='cancel';\"/>";
+                }
                 echo "</form>";
                 echo "</center>";
             } else {

 属性改变于：.
___________________________________________________________________
名字：svn:ignore
   - CVS