[svn r14753] Améliorer l'outil Travaux : affichage des répertoires (FS#2395)

skala
Julio Montoya 17 years ago
parent 41912d4513
commit 40802af8eb
  1. 2
      main/install/index.php
  2. 10
      main/install/install_functions.inc.php
  3. 28
      main/install/install_upgrade.lib.php
  4. 3
      main/install/migrate-db-1.8.4-1.8.5-pre.sql
  5. 86
      main/install/update-db-1.8.4-1.8.5.inc.php
  6. 370
      main/work/work.lib.php
  7. 1105
      main/work/work.php

@ -99,7 +99,7 @@ $update_from_version_6=array('1.6','1.6.1','1.6.2','1.6.3','1.6.4','1.6.5');
//upgrading from any subversion of 1.8 avoids the additional step of upgrading from 1.6
$update_from_version_8=array('1.8','1.8.2','1.8.3','1.8.4');
$my_old_version = '';
$tmp_version = get_config_param('dokeos_verion');
$tmp_version = get_config_param('dokeos_version');
if(!empty($_POST['old_version']))
{
$my_old_version = $_POST['old_version'];

@ -240,10 +240,12 @@ function get_config_param($param,$updatePath='')
$configFile[$enreg[0]]=$enreg[1];
if($enreg[0] == $param)
{
$val=$enreg[1];
}
$a=explode("'",$enreg[0]);
$key_tmp=$a[1];
if($key_tmp== $param)
{
$val=$enreg[1];
}
}
}
}

@ -3,7 +3,7 @@
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2005 Dokeos S.A.
Copyright (c) 2004-2008 Dokeos S.P.R.L
Copyright (c) Roan Embrechts, Vrije Universiteit Brussel
Copyright (c) Bart Mollet, Hogeschool Gent
@ -17,7 +17,7 @@
See the GNU General Public License for more details.
Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
@ -492,4 +492,28 @@ function get_sql_file_contents($file,$section,$print_errors=true)
//now we have our section's SQL statements group ready, return
return $section_contents;
}
function directory_to_array($directory)
{
$array_items = array();
if ($handle = opendir($directory))
{
while (false !== ($file = readdir($handle)))
{
if ($file != "." && $file != "..")
{
if (is_dir($directory. "/" . $file))
{
$array_items = array_merge($array_items, directoryToArray($directory. "/" . $file));
$file = $directory . "/" . $file;
$array_items[] = preg_replace("/\/\//si", "/", $file);
}
}
}
closedir($handle);
}
return $array_items;
}
?>

@ -108,4 +108,5 @@ INSERT INTO course_setting(variable,value,category) VALUES ('course_theme','','t
INSERT INTO course_setting(variable,value,category) VALUES ('allow_learning_path_theme','1','theme');
ALTER TABLE forum_post ADD INDEX idx_forum_post_thread_id (thread_id);
ALTER TABLE forum_post ADD INDEX idx_forum_post_visible (visible);
ALTER TABLE forum_thread ADD INDEX idx_forum_thread_forum_id (forum_id);
ALTER TABLE forum_thread ADD INDEX idx_forum_thread_forum_id (forum_id);
ALTER TABLE student_publication ADD COLUMN filetype SET('file','folder') NOT NULL DEFAULT 'file' AFTER sent_date;

@ -1,4 +1,4 @@
<?php // $Id: update-db-1.8.4-1.8.5.inc.php 14543 2008-03-09 17:32:54Z yannoo $
<?php // $Id: update-db-1.8.4-1.8.5.inc.php 14753 2008-04-03 22:20:25Z juliomontoya $
/* See license terms in /dokeos_license.txt */
/**
==============================================================================
@ -14,6 +14,7 @@
==============================================================================
*/
//load helper functions
require_once("install_upgrade.lib.php");
@ -229,21 +230,30 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
$prefix = '';
if ($singleDbForm)
{
$prefix = $_configuration['table_prefix'];
$prefix = get_config_param ('table_prefix');
}
//get the courses databases queries list (c_q_list)
$c_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','course');
if(count($c_q_list)>0)
{
//get the courses list
if(strlen($dbNameForm)>40){
if(strlen($dbNameForm)>40)
{
error_log('Database name '.$dbNameForm.' is too long, skipping',0);
}elseif(!in_array($dbNameForm,$dblist)){
error_log('Database '.$dbNameForm.' was not found, skipping',0);
}else{
}
elseif(!in_array($dbNameForm,$dblist))
{
error_log('Database '.$dbNameForm.' was not found, skipping',0);
}
else
{
mysql_select_db($dbNameForm);
$res = mysql_query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL");
if($res===false){die('Error while querying the courses list in update_db.inc.php');}
if(mysql_num_rows($res)>0)
{
$i=0;
@ -261,36 +271,41 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
* without a database name
*/
if (!$singleDbForm) //otherwise just use the main one
{
{
mysql_select_db($row_course['db_name']);
}
foreach($c_q_list as $query)
{
if ($singleDbForm) //otherwise just use the main one
{
$query = preg_replace('/^(UPDATE|ALTER TABLE|CREATE TABLE|DROP TABLE|INSERT INTO|DELETE FROM)\s+(\w*)(.*)$/',"$1 $prefix{$row_course['db_name']}_$2$3",$query);
$query = preg_replace('/^(UPDATE|ALTER TABLE|CREATE TABLE|DROP TABLE|INSERT INTO|DELETE FROM)\s+(\w*)(.*)$/',"$1 $prefix{$row_course['db_name']}_$2$3",$query);
}
if($only_test)
{
error_log("mysql_query(".$row_course['db_name'].",$query)",0);
}else{
$res = mysql_query($query);
}
else
{
$res = mysql_query($query);
if($log)
{
error_log("In ".$row_course['db_name'].", executed: $query",0);
}
}
}
$mytable = $row_course['db_name'].".lp_item";
if($singleDbForm)
{
$mytable = "$prefix{$row_course['db_name']}_lp_item";
}
$mysql = "SELECT * FROM $mytable WHERE min_score != 0 AND prerequisite != ''";
$myres = mysql_query($query);
if($myres!==false && mysql_num_rows($myres)>0)
{
while($myrow = mysql_fetch_array($myres))
@ -309,7 +324,52 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
}
}
}
$sql = "UPDATE $mydb.lp_item SET ";
// Work Tool Folder Update
// we search into DB all the folders in the work tool
if($singleDbForm)
{
$my_course_table = "$prefix{$row_course['db_name']}_student_publication";
}
else
{
$my_course_table = $row_course['db_name'].".student_publication";
}
$sys_course_path = $_configuration['root_sys'].$_configuration['course_folder'];
$course_dir=$sys_course_path.$row_course['directory'].'/work';
$dir_to_array =directory_to_array($course_dir,true);
$only_dir=array();
$sql_select= "SELECT filetype FROM " . $my_course_table . " WHERE filetype = 'folder'";
$result = mysql_query($sql_select);
$num_row=mysql_num_rows($result);
// check if there are already folder registered
if ($num_row == 0)
{
for($i=0;$i<count($dir_to_array);$i++)
{
$only_dir[]=substr($dir_to_array[$i],strlen($course_dir), strlen($dir_to_array[$i]));
}
for($i=0;$i<count($only_dir);$i++)
{
$sql_insert_all= "INSERT INTO " . $my_course_table . " SET url = '" . $only_dir[$i] . "', " .
"title = '',
description = '',
author = '',
active = '0',
accepted = '1',
filetype = 'folder',
post_group_id = '0',
sent_date = '0000-00-00 00:00:00' ";
mysql_query($sql_insert_all);
}
}
}
}
}

@ -3,7 +3,7 @@
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2008 Dokeos S.A.
Copyright (c) 2004-2008 Dokeos SPRL
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
@ -267,72 +267,138 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
{
$sql_get_publications_list = "SELECT * " .
"FROM ".$work_table." " .
"WHERE url LIKE '$sub_course_dir%' " .
"AND url NOT LIKE '$sub_course_dir%/%' " .
"WHERE url LIKE BINARY '$sub_course_dir%' " .
"AND url NOT LIKE BINARY '$sub_course_dir%/%' " .
"ORDER BY id";
$sql_get_publications_num = "SELECT count(*) " .
"FROM ".$work_table." " .
"WHERE url LIKE BINARY '$sub_course_dir%' " .
"AND url NOT LIKE BINARY '$sub_course_dir%/%' " .
"ORDER BY id";
}
else
{
if (!empty($_SESSION['toolgroup']))
{
$group_query = " WHERE post_group_id = '".$_SESSION['toolgroup']."' "; // set to select only messages posted by the user's group
$subdirs_query = "AND url NOT LIKE '$sub_course_dir%/%' AND url LIKE '$sub_course_dir%'";
$subdirs_query = "AND url NOT LIKE BINARY '$sub_course_dir%/%' AND url LIKE BINARY '$sub_course_dir%'";
}
else
{
$group_query = '';
$subdirs_query = "WHERE url NOT LIKE '$sub_course_dir%/%' AND url LIKE '$sub_course_dir%'";
}
$sql_get_publications_list = "SELECT * FROM $work_table $group_query $subdirs_query ORDER BY id";
$sql_get_publications_num = "SELECT count(url) " .
"FROM ".$work_table." " .
"WHERE url LIKE BINARY '$sub_course_dir%' " .
"AND url NOT LIKE BINARY '$sub_course_dir%/%' " .
"ORDER BY id";
}
$sql_result = api_sql_query($sql_get_publications_list,__FILE__,__LINE__);
$sql_result_num = api_sql_query($sql_get_publications_num,__FILE__,__LINE__);
$row=Database::fetch_array($sql_result_num);
$count_files=$row[0];
$table_header[] = array(get_lang('Type'),true,'style="width:40px"');
$table_header[] = array(get_lang('Title'),true);
//$table_header[] = array(get_lang('Description'),true);
$table_header[] = array(get_lang('Authors'),true);
$table_header[] = array(get_lang('Title'),true);
if ($count_files!=0)
{
$table_header[] = array(get_lang('Authors'),true);
}
$table_header[] = array(get_lang('Date'),true);
//if( $is_allowed_to_edit)
//{
if( $is_allowed_to_edit)
{
$table_header[] = array(get_lang('Modify'),true);
//}
}
$table_header[] = array('RealDate',false);
// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
$column_show[]=1;
$column_show[]=1;
$column_show[]=1;
$column_show[]=1;
$column_show[]=1;
$column_show[]=0;
$column_show[]=1; // type
$column_show[]=1; // title
if ($count_files!=0)
{
$column_show[]=1; // authors
}
$column_show[]=1; //date
if( $is_allowed_to_edit)
{
$column_show[]=1; //modify
}
$column_show[]=0; //real date in correct format
// Here we change the way how the colums are going to be sort
// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
$column_order[]=1;
$column_order[]=2;
$column_order[]=3;
$column_order[]=6;
$column_order[]=5;
$column_order[]=1; //type
$column_order[]=2; // title
if ($count_files!=0)
{
$column_order[]=3; //authors
}
$column_order[]=6; // date
if( $is_allowed_to_edit)
{
$column_order[]=5;
}
$column_order[]=6;
$table_data = array();
$dirs_list = get_subdirs_list($work_dir);
$my_sub_dir = str_replace('work/','',$sub_course_dir);
// List of all folders
foreach($dirs_list as $dir)
{
if ($my_sub_dir=='')
{
$mydir_temp = '/'.$dir;
}
else
{
$mydir_temp = '/'.$my_sub_dir.$dir;
}
// select the directory's date
/*$sql_select_directory= "SELECT sent_date FROM ".$work_table." WHERE " .
"url LIKE BINARY '".$mydir_temp."' AND filetype = 'folder'";
*/
$sql_select_directory= "SELECT prop.lastedit_date, author FROM ".$iprop_table." prop INNER JOIN ".$work_table." work ON (prop.ref=work.id) WHERE " .
"work.url LIKE BINARY '".$mydir_temp."' AND work.filetype = 'folder' AND prop.tool='work' ";
$result=api_sql_query($sql_select_directory,__FILE__,__LINE__);
$row=Database::fetch_array($result);
$direc_date= $row['lastedit_date']; //directory's date
$author= $row['author']; //directory's author
$mydir = $my_sub_dir.$dir;
if ($is_allowed_to_edit)
{
$clean_edit_dir=Security :: remove_XSS(Database::escape_string($_GET['edit_dir']));
$clean_edit_dir=Security :: remove_XSS(Database::escape_string($_GET['edit_dir']));
// form edit directory
if(isset($clean_edit_dir) && $clean_edit_dir==$mydir)
{
$form_folder = new FormValidator('edit_dir', 'post', api_get_self().'?curdirpath='.$my_sub_dir.'&edit_dir='.$mydir);
@ -346,36 +412,68 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
if($form_folder -> validate())
{
$values = $form_folder -> exportValues();
$values = $values['my_group'];
$values = $values['my_group'];
update_dir_name($mydir,$values['dir_name']);
$mydir = $my_sub_dir.$values['dir_name'];
$dir = $values['dir_name'];
$display_edit_form=false;
}
$display_edit_form=false;
}
}
}
$action = '';
//display info depending on the permissions
$row = array();
$class = '';
$url = implode("/", array_map("rawurlencode", explode("/", $work->url)));
$row[] = '<img src="../img/folder_document.gif" alt="dir" border="0" hspace="5" align="middle" />'; //image
$class = '';
$row[] = '<img src="../img/folder_document.gif" border="0" hspace="5" align="middle" alt="'.get_lang('Folder').'" />'; //image
$a_count_directory=count_dir($work_dir.'/'.$dir,false);
$cant_files=$a_count_directory[0];
$cant_dir=$a_count_directory[1];
$text_file=get_lang('FilesUpload');
$text_dir=get_lang('Directories');
if ($cant_files==1)
{
$text_file=strtolower(get_lang('FileUpload'));
}
if ($cant_dir==1)
{
$text_dir=get_lang('directory');
}
if ($cant_dir!=0)
{
$dirtext=' ('.$cant_dir.' '.$text_dir.')';
}
else
{
$dirtext='';
}
if($display_edit_form)
{
$row[] = $form_folder->toHtml(); // form to edit the directory's name
$row[] = '<span class="invisible" style="display:none">'.$dir.'</span>'.$form_folder->toHtml(); // form to edit the directory's name
}
else
{
$row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$mydir.'"'.$class.'>'.$dir.'</a>'; // title of directory
$row[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$mydir.'"'.$class.'>'.$dir.'</a><br>'.$cant_files.' '.$text_file.$dirtext;
}
$row[] = ''; //authors
$row[] = ''; //date
if ($count_files!=0)
{
$row[] = "";
}
if ($direc_date!='' && $direc_date!='0000-00-00 00:00:00')
{
$row[]= date_to_str_ago($direc_date).'<br><span class="dropbox_date">'.$direc_date.'</span>';
}
else
{
$row[]='';
}
if( $is_allowed_to_edit)
{
@ -387,8 +485,7 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
else
{
$row[] = "";
}
}
$table_data[] = $row;
}
@ -455,15 +552,12 @@ function display_student_publications_list($work_dir,$sub_course_dir,$currentCou
$table_data[] = $row;
}
}
//if( count($table_data) > 0)
//{
$sorting_options=array();
$sorting_options['column']=1;
$paging_options=array();
Display::display_sortable_config_table($table_header,$table_data,$sorting_options, $paging_options,NULL,$column_show,$column_order);
//}
}
/**
* Returns a list of subdirectories found in the given directory.
@ -657,17 +751,26 @@ function create_unexisting_work_directory($base_work_dir,$desired_dir_name)
* @param string The directory name as the bit after "work/", without trailing slash
* @return integer -1 on error
*/
function del_dir($base_work_dir,$dir){
function del_dir($base_work_dir,$dir)
{
if(empty($dir) or $dir=='/'){return -1;}//not authorized
//escape hacks
/*
$dir = str_replace('../','',$dir);
$dir = str_replace('..','',$dir);
$dir = str_replace('./','',$dir);
$dir = str_replace('.','',$dir);
if(!is_dir($base_work_dir.$dir)) {return -1;}
*/
$check = Security::check_abs_path($base_work_dir.$dir,$base_work_dir);
if (!$check || !is_dir($base_work_dir.$dir)) return -1;
$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$sql = "DELETE FROM $table WHERE url LIKE 'work/".$dir."/%'";
$sql = "DELETE FROM $table WHERE url LIKE BINARY 'work/".$dir."/%'";
$res = api_sql_query($sql,__FILE__,__LINE__);
//delete from DB the directories
$sql = "DELETE FROM $table WHERE filetype = 'folder' AND url LIKE BINARY '/".$dir."%'";
$res = api_sql_query($sql,__FILE__,__LINE__);
require_once(api_get_path(LIBRARY_PATH).'/fileManage.lib.php');
my_delete($base_work_dir.$dir);
}
@ -693,7 +796,8 @@ function get_work_path($id){
* @param string Destination directory where the work has been moved (must end with a '/')
* @return -1 on error, sql query result on success
*/
function update_work_url($id,$new_path){
function update_work_url($id,$new_path)
{
if(empty($id)) return -1;
$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$sql = "SELECT * FROM $table WHERE id=$id";
@ -723,22 +827,174 @@ function update_dir_name($path, $new_name)
include_once(api_get_path(LIBRARY_PATH) . "/fileUpload.lib.php");
$path_to_dir = dirname($path);
if($path_to_dir=='.')
if($path_to_dir=='.')
{
$path_to_dir = '';
}
else
{
$path_to_dir .= '/';
}
my_rename($base_work_dir.'/'.$path,$new_name);
my_rename($base_work_dir.'/'.$path,$new_name);
$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$sql = 'SELECT id, url FROM '.$table.' WHERE url LIKE "work/'.$path.'/%"';
$rs = api_sql_query($sql, __FILE__, __LINE__);
//update all the files in the other directories according with the next query
$sql = 'SELECT id, url FROM '.$table.' WHERE url LIKE BINARY "work/'.$path.'/%"'; // like binary (Case Sensitive)
$rs = api_sql_query($sql, __FILE__, __LINE__);
$work_len=strlen('work/'.$path);
while($work = Database :: fetch_array($rs))
{
$work_name = basename($work['url']);
//echo $work_name;
$sql = 'UPDATE '.$table.' SET url="work/'.$path_to_dir.$new_name.'/'.$work_name.'" WHERE id= '.$work['id'];
{
$new_dir=$work['url'];
$name_with_directory=substr($new_dir,$work_len,strlen($new_dir));
$sql = 'UPDATE '.$table.' SET url="work/'.$path_to_dir.$new_name.$name_with_directory.'" WHERE id= '.$work['id'];
api_sql_query($sql, __FILE__, __LINE__);
}
//update all the directory's children according with the next query
$sql = 'SELECT id, url FROM '.$table.' WHERE url LIKE BINARY "/'.$path.'%"';
$rs = api_sql_query($sql, __FILE__, __LINE__);
$work_len=strlen('/'.$path);
while($work = Database :: fetch_array($rs))
{
$new_dir=$work['url'];
$name_with_directory=substr($new_dir,$work_len,strlen($new_dir));
$sql = 'UPDATE '.$table.' SET url="/'.$path_to_dir.$new_name.$name_with_directory.'" WHERE id= '.$work['id'];
api_sql_query($sql, __FILE__, __LINE__);
}
}
/**
* Return an array with all the folder's ids that are in the given path
* @param string Path of the directory
* @return array The list of ids of all the directories in the path
* @author Julio Montoya Dokeos
* @version April 2008
*/
function get_parent_directories($my_cur_dir_path)
{
$list_parents = explode('/', $my_cur_dir_path);
$dir_acum = '';
global $work_table;
$list_id=array();
for ($i = 0; $i < count($list_parents) - 1; $i++)
{
$where_sentence = "url LIKE BINARY '" . $dir_acum . "/" . $list_parents[$i]."'";
$dir_acum .= '/' . $list_parents[$i];
$sql = "SELECT id FROM ". $work_table . " WHERE ". $where_sentence;
$result = api_sql_query($sql, __FILE__, __LINE__);
$row= Database::fetch_array($result);
$list_id[]=$row['id'];
}
return $list_id;
}
/**
* Transform an all directory structure (only directories) in an array
* @param string path of the directory
* @return array the directory structure into an array
* @author Julio Montoya Dokeos
* @version April 2008
*/
function directory_to_array($directory)
{
$array_items = array();
if ($handle = opendir($directory))
{
while (false !== ($file = readdir($handle)))
{
if ($file != "." && $file != "..")
{
if (is_dir($directory. "/" . $file))
{
$array_items = array_merge($array_items, directory_to_array($directory. "/" . $file));
$file = $directory . "/" . $file;
$array_items[] = preg_replace("/\/\//si", "/", $file);
}
}
}
closedir($handle);
}
return $array_items;
}
/**
* Insert into the DB of the course all the directories
* @param string path of the /work directory of the course
* @return -1 on error, sql query result on success
* @author Julio Montoya Dokeos
* @version April 2008
*/
function insert_all_directory_in_course_table($base_work_dir)
{
$dir_to_array =directory_to_array($base_work_dir,true);
$only_dir=array();
for($i=0;$i<count($dir_to_array);$i++)
{
$only_dir[]=substr($dir_to_array[$i],strlen($base_work_dir), strlen($dir_to_array[$i]));
}
echo "<pre>";
print_r($only_dir);
echo "<pre>";
for($i=0;$i<count($only_dir);$i++)
{
global $work_table;
$sql_insert_all= "INSERT INTO " . $work_table . " SET url = '" . $only_dir[$i] . "', " .
"title = '',
description = '',
author = '',
active = '0',
accepted = '1',
filetype = 'folder',
post_group_id = '0',
sent_date = '0000-00-00 00:00:00' ";
//api_sql_query($sql_insert_all, __FILE__, __LINE__);
}
}
/**
* This function displays the number of files contained in a directory
*
* @param string the path of the directory
* @param boolean true if we want the total quantity of files include in others child directorys , false only files in the directory
* @return array the first element is an integer with the number of files in the folder, the second element is the number of directories
* @author Julio Montoya Dokeos
* @version April 2008
*/
function count_dir($path_dir, $recurse)
{
$count = 0;
$count_dir= 0;
$d = dir($path_dir);
while ($entry = $d->Read())
{
if (!(($entry == "..") || ($entry == ".")))
{
if (Is_Dir($path_dir.'/'.$entry))
{
$count_dir++;
if ($recurse)
{
$count += count_dir($path_dir . '/' . $entry, $recurse);
}
}
else
{
$count++;
}
}
}
$return_array=array();
$return_array[]=$count;
$return_array[]=$count_dir;
return $return_array;
}
?>

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save