Merge

main/css/base.css

@@ -4058,6 +4058,81 @@ footer {
     box-shadow:none;
 }
 
+.btn.new_folder{
+    border:none;
+    border-radius: 0;
+    background-color: transparent;
+    width:32px;
+    height:32px;
+    margin:0;
+    padding:0;
+    display:inline-block;
+    background-image:  url('../img/icons/32/new_folder.png');
+    background-repeat: no-repeat;
+    background-position:center center; 
+    box-shadow:none;
+}
+
+.btn.new_link{
+    border:none;
+    border-radius: 0;
+    background-color: transparent;
+    width:32px;
+    height:32px;
+    margin:0;
+    padding:0;
+    display:inline-block;
+    background-image:  url('../img/icons/32/new_link.png');
+    background-repeat: no-repeat;
+    background-position:center center; 
+    box-shadow:none;
+}
+
+.btn.export_csv{
+    border:none;
+    border-radius: 0;
+    background-color: transparent;
+    width:32px;
+    height:32px;
+    margin:0;
+    padding:0;
+    display:inline-block;
+    background-image:  url('../img/icons/32/export_csv.png');
+    background-repeat: no-repeat;
+    background-position:center center; 
+    box-shadow:none;
+}
+
+.btn.expand{
+    border:none;
+    border-radius: 0;
+    background-color: transparent;
+    width:32px;
+    height:32px;
+    margin:0;
+    padding:0;
+    display:inline-block;
+    background-image:  url('../img/div_hide.gif');
+    background-repeat: no-repeat;
+    background-position:center center; 
+    box-shadow:none;
+}
+
+.btn.collapse{
+    border:none;
+    border-radius: 0;
+    background-color: transparent;
+    width:32px;
+    height:32px;
+    margin:0;
+    padding:0;
+    display:inline-block;
+    background-image:  url('../img/div_show.gif');
+    background-repeat: no-repeat;
+    background-position:center center; 
+    box-shadow:none;
+}
+
 .announce.btn.new{
     border:none;
     border-radius: 0;

main/inc/lib/autoload.class.php

@@ -594,6 +594,7 @@ class Autoload
         $result['ForumTopic'] = '/main/coursecopy/classes/ForumTopic.class.php';
         $result['FreeAnswer'] = '/main/exercice/freeanswer.class.php';
         $result['GDWrapper'] = '/main/inc/lib/image.lib.php';
+        $result['GlobalMultipleAnswer'] = '/main/exercice/global_multiple_answer.class.php';
         $result['Glossary'] = '/main/coursecopy/classes/Glossary.class.php';
         $result['GlossaryManager'] = '/main/inc/lib/glossary.lib.php';
         $result['GradeBookResult'] = '/main/gradebook/gradebook_result.class.php';
@@ -691,9 +692,9 @@ class Autoload
         $result['Link\Controller'] = '/main/link/controller.class.php';
         $result['Link\Link'] = '/main/link/link.class.php';
         $result['Link\LinkCategory'] = '/main/link/link_category.class.php';
-        $result['Link\LinkCategoryRepository'] = '/main/link/repo.class.php';
+        $result['Link\LinkCategoryRepository'] = '/main/link/link_category_repository.class.php';
         $result['Link\LinkForm'] = '/main/link/link_form.class.php';
-        $result['Link\LinkRepository'] = '/main/link/repo.class.php';
+        $result['Link\LinkRepository'] = '/main/link/link_repository.class.php';
         $result['Link\Request'] = '/main/link/request.class.php';
         $result['Log'] = '/main/inc/lib/log.class.php';
         $result['Login'] = '/main/inc/lib/login.lib.php';
@@ -727,7 +728,6 @@ class Autoload
         $result['MultipleAnswerCombination'] = '/main/exercice/multiple_answer_combination.class.php';
         $result['MultipleAnswerCombinationTrueFalse'] = '/main/exercice/multiple_answer_combination_true_false.class.php';
         $result['MultipleAnswerTrueFalse'] = '/main/exercice/multiple_answer_true_false.class.php';
-        $result['GlobalMultipleAnswer'] = '/main/exercice/global_multiple_answer.class.php';
         $result['MyHorBar'] = '/main/inc/lib/pchart/MyHorBar.class.php';
         $result['MySpace'] = '/main/mySpace/myspace.lib.php';
         $result['Nanogong'] = '/main/inc/lib/nanogong.lib.php';
@@ -943,6 +943,7 @@ class Autoload
         $result['vtimezone'] = '/main/inc/lib/icalcreator/iCalcreator.class.php';
         $result['vtodo'] = '/main/inc/lib/icalcreator/iCalcreator.class.php';
         $result['xhtdoc'] = '/main/inc/lib/xht.lib.php';
+
         return $result;
     }
 

main/inc/lib/system/io/csv_writer.class.php

@@ -19,7 +19,7 @@ class CsvWriter
     /**
      *
      * @param string|object $stream
-     * @return FileWriter
+     * @return CsvWriter
      */
     static function create($stream, $delimiter = ';', $enclosure = '"')
     {
@@ -61,16 +61,19 @@ class CsvWriter
 
     function write($items)
     {
+        $items = is_array($items) ? $items : func_get_args();
         $this->put($items);
     }
 
     function writeln($items)
     {
+        $items = is_array($items) ? $items : func_get_args();
         $this->put($items);
     }
 
     function put($items)
     {
+        $items = is_array($items) ? $items : func_get_args();
         $enclosure = $this->enclosure;
         $fields = array();
         foreach ($items as $item) {

main/inc/lib/system/io/temp.class.php

@@ -22,6 +22,21 @@
  */
 class Temp
 {
+    
+    protected static $files = array();
+    
+    /**
+     * Returns the list of temporary files opened by the script.
+     * This is mostly due to pin temporary files and prevent garbage collection.
+     * This ensure files are not unlinked while still using it to send data in 
+     * an upload.
+     * 
+     * @return array
+     */
+    public static function files()
+    {
+        return self::$files;
+    }
 
     /**
      * Recursively delete files and/or folders.
@@ -35,16 +50,19 @@ class Temp
             return false;
         }
 
-        if (is_file($path)) {
+        if (is_readable($path)) {
             unlink($path);
             return true;
         }
-        $files = scandir($path);
+
-        $files = array_diff($files, array('.', '..'));
+        if (is_dir($path)) {
-        foreach ($files as $file) {
+            $files = scandir($path);
-            self::delete($file);
+            $files = array_diff($files, array('.', '..'));
+            foreach ($files as $file) {
+                self::delete($file);
+            }
+            rmdir($path);
         }
-        rmdir($path);
     }
 
     private static $temp_root = '';
@@ -123,6 +141,7 @@ class Temp
 
     function __construct($path = '')
     {
+        self::$files[] = $this;
         $this->path = $path;
     }