Index: mod/data/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/data/lib.php,v
retrieving revision 1.113.2.3
diff -c -r1.113.2.3 lib.php
*** mod/data/lib.php	13 Mar 2007 01:20:19 -0000	1.113.2.3
--- mod/data/lib.php	3 Apr 2007 02:59:40 -0000
***************
*** 1401,1417 ****
      global $CFG, $USER;
  
      $presets = array();
  
      if ($dirs = get_list_of_plugins('mod/data/preset')) {
          foreach ($dirs as $dir) {
              $fulldir = $CFG->dirroot.'/mod/data/preset/'.$dir;
! 
!             if (is_directory_a_preset($fulldir)) {
!                 $preset = new object;
!                 $preset->path = $fulldir;
!                 $preset->userid = 0;
!                 $preset->shortname = $dir;
!                 $preset->name = data_preset_name($dir, $fulldir);
                  if (file_exists($fulldir.'/screenshot.jpg')) {
                      $preset->screenshot = $CFG->wwwroot.'/mod/data/preset/'.$dir.'/screenshot.jpg';
                  } else if (file_exists($fulldir.'/screenshot.png')) {
--- 1401,1415 ----
      global $CFG, $USER;
  
      $presets = array();
+     $preset = new Data_Preset();
  
      if ($dirs = get_list_of_plugins('mod/data/preset')) {
          foreach ($dirs as $dir) {
              $fulldir = $CFG->dirroot.'/mod/data/preset/'.$dir;
!             
!             if ($preset->has_all_required_files($fulldir)) {
!                 $preset = new Data_Preset($dir, null, $fulldir, 0 );
!                 $preset->name = $preset->best_name();
                  if (file_exists($fulldir.'/screenshot.jpg')) {
                      $preset->screenshot = $CFG->wwwroot.'/mod/data/preset/'.$dir.'/screenshot.jpg';
                  } else if (file_exists($fulldir.'/screenshot.png')) {
***************
*** 1434,1445 ****
                      foreach ($dirs as $dir) {
                          $fulldir = $CFG->dataroot.'/data/preset/'.$userid.'/'.$dir;
  
!                         if (is_directory_a_preset($fulldir)) {
!                             $preset = new object;
!                             $preset->path = $fulldir;
!                             $preset->userid = $userid;
!                             $preset->shortname = $dir;
!                             $preset->name = data_preset_name($dir, $fulldir);
                              if (file_exists($fulldir.'/screenshot.jpg')) {
                                  $preset->screenshot = $CFG->wwwroot.'/mod/data/preset/'.$dir.'/screenshot.jpg';
                              } else if (file_exists($fulldir.'/screenshot.png')) {
--- 1432,1440 ----
                      foreach ($dirs as $dir) {
                          $fulldir = $CFG->dataroot.'/data/preset/'.$userid.'/'.$dir;
  
!                         if ($preset->has_all_required_files($fulldir)) {
!                             $preset = new Data_Preset($dir, null, $fulldir, $userid );
!                             $preset->name = $preset->best_name();
                              if (file_exists($fulldir.'/screenshot.jpg')) {
                                  $preset->screenshot = $CFG->wwwroot.'/mod/data/preset/'.$dir.'/screenshot.jpg';
                              } else if (file_exists($fulldir.'/screenshot.png')) {