diff --git a/main/coursecopy/classes/Announcement.class.php b/main/coursecopy/classes/Announcement.class.php index 60d54c39f6..94ddfbe223 100644 --- a/main/coursecopy/classes/Announcement.class.php +++ b/main/coursecopy/classes/Announcement.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * An announcement * @author Bart Mollet diff --git a/main/coursecopy/classes/Course.class.php b/main/coursecopy/classes/Course.class.php index daaa0c3c3a..490fb5518e 100644 --- a/main/coursecopy/classes/Course.class.php +++ b/main/coursecopy/classes/Course.class.php @@ -22,9 +22,11 @@ Mail: info@dokeos.com ============================================================================== */ -require_once ('LinkCategory.class.php'); -require_once ('Announcement.class.php'); -require_once ('Event.class.php'); + +require_once 'LinkCategory.class.php'; +require_once 'Announcement.class.php'; +require_once 'Event.class.php'; + /** * A course-object to use in Export/Import/Backup/Copy * @author Bart Mollet diff --git a/main/coursecopy/classes/CourseArchiver.class.php b/main/coursecopy/classes/CourseArchiver.class.php index a4bda3f8c9..9cd035afe0 100644 --- a/main/coursecopy/classes/CourseArchiver.class.php +++ b/main/coursecopy/classes/CourseArchiver.class.php @@ -23,10 +23,11 @@ Mail: info@dokeos.com ============================================================================== */ -require_once ('Course.class.php'); -require_once ('mkdirr.php'); -require_once ('rmdirr.php'); -require_once (api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php'); + +require_once 'Course.class.php'; +require_once api_get_path(LIBRARY_PATH).'rmdirr.lib.php'; +require_once api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php'; + /** * Some functions to write a course-object to a zip-file and to read a course- * object from such a zip-file. @@ -99,12 +100,12 @@ class CourseArchiver foreach ($course->resources[RESOURCE_DOCUMENT] as $id => $document) { if ($document->file_type == DOCUMENT) { $doc_dir = $backup_dir.$document->path; - mkdirr(dirname($doc_dir), 0755); + @mkdir(dirname($doc_dir), 0755, true); if (file_exists($course->path.$document->path)) { copy($course->path.$document->path, $doc_dir); } } else { - mkdirr($backup_dir.$document->path, 0755); + @mkdir($backup_dir.$document->path, 0755, true); } } } @@ -116,7 +117,7 @@ class CourseArchiver { $doc_dir=dirname($backup_dir.$document->path); - mkdirr($doc_dir,0755); + @mkdir($doc_dir, 0755, true); copyDirTo($course->path.$document->path, $doc_dir, false); } @@ -185,7 +186,7 @@ class CourseArchiver // Create a temp directory $tmp_dir_name = 'CourseArchiver_'.uniqid(''); $unzip_dir = api_get_path(SYS_ARCHIVE_PATH).''.$tmp_dir_name; - mkdirr($unzip_dir,0755); + @mkdir($unzip_dir, 0755, true); @copy(api_get_path(SYS_ARCHIVE_PATH).''.$filename,$unzip_dir.'/backup.zip'); // unzip the archive $zip = new PclZip($unzip_dir.'/backup.zip'); diff --git a/main/coursecopy/classes/CourseBuilder.class.php b/main/coursecopy/classes/CourseBuilder.class.php index d7b931bf87..531c29d4a7 100644 --- a/main/coursecopy/classes/CourseBuilder.class.php +++ b/main/coursecopy/classes/CourseBuilder.class.php @@ -1,23 +1,25 @@ diff --git a/main/coursecopy/classes/CourseDescription.class.php b/main/coursecopy/classes/CourseDescription.class.php index aba9b6abef..1bec31a172 100644 --- a/main/coursecopy/classes/CourseDescription.class.php +++ b/main/coursecopy/classes/CourseDescription.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A course description * @author Bart Mollet diff --git a/main/coursecopy/classes/CourseRecycler.class.php b/main/coursecopy/classes/CourseRecycler.class.php index 3f6396de8c..6939459f29 100644 --- a/main/coursecopy/classes/CourseRecycler.class.php +++ b/main/coursecopy/classes/CourseRecycler.class.php @@ -23,8 +23,10 @@ Mail: info@dokeos.com ============================================================================== */ -require_once ('Course.class.php'); -require_once ('rmdirr.php'); + +require_once 'Course.class.php'; +require_once api_get_path(LIBRARY_PATH).'rmdirr.lib.php'; + /** * Class to delete items from a Dokeos-course * @author Bart Mollet diff --git a/main/coursecopy/classes/CourseRestorer.class.php b/main/coursecopy/classes/CourseRestorer.class.php index 22ff70e644..290de0984c 100644 --- a/main/coursecopy/classes/CourseRestorer.class.php +++ b/main/coursecopy/classes/CourseRestorer.class.php @@ -22,23 +22,23 @@ Mail: info@dokeos.com ============================================================================== */ -require_once ('Course.class.php'); -require_once ('Event.class.php'); -require_once ('Link.class.php'); -require_once ('ToolIntro.class.php'); -require_once ('LinkCategory.class.php'); -require_once ('ForumCategory.class.php'); -require_once ('Forum.class.php'); -require_once ('ForumTopic.class.php'); -require_once ('ForumPost.class.php'); -require_once ('CourseDescription.class.php'); -require_once ('Learnpath.class.php'); -require_once ('Survey.class.php'); -require_once ('SurveyQuestion.class.php'); -require_once ('mkdirr.php'); -require_once ('rmdirr.php'); -require_once ('Glossary.class.php'); -include_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php'); + +require_once 'Course.class.php'; +require_once 'Event.class.php'; +require_once 'Link.class.php'; +require_once 'ToolIntro.class.php'; +require_once 'LinkCategory.class.php'; +require_once 'ForumCategory.class.php'; +require_once 'Forum.class.php'; +require_once 'ForumTopic.class.php'; +require_once 'ForumPost.class.php'; +require_once 'CourseDescription.class.php'; +require_once 'Learnpath.class.php'; +require_once 'Survey.class.php'; +require_once 'SurveyQuestion.class.php'; +require_once 'Glossary.class.php'; +require_once api_get_path(LIBRARY_PATH).'rmdirr.lib.php'; +require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; define('FILE_SKIP', 1); define('FILE_RENAME', 2); @@ -328,7 +328,7 @@ class CourseRestorer $perm = api_get_setting('permissions_for_new_directories'); $perm = octdec(!empty($perm)?$perm:'0770'); - mkdirr(dirname($path.$document->path),$perm); + @mkdir(dirname($path.$document->path), $perm, true); if (file_exists($path.$document->path)) { diff --git a/main/coursecopy/classes/CourseSelectForm.class.php b/main/coursecopy/classes/CourseSelectForm.class.php index 9296d18d9e..651de2a12c 100644 --- a/main/coursecopy/classes/CourseSelectForm.class.php +++ b/main/coursecopy/classes/CourseSelectForm.class.php @@ -23,7 +23,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once ('Course.class.php'); + +require_once 'Course.class.php'; + /** * Class to show a form to select resources * @author Bart Mollet diff --git a/main/coursecopy/classes/Document.class.php b/main/coursecopy/classes/Document.class.php index ec1abfb179..9f8ff2a5c3 100644 --- a/main/coursecopy/classes/Document.class.php +++ b/main/coursecopy/classes/Document.class.php @@ -22,9 +22,12 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + define('DOCUMENT','file'); define('FOLDER','folder'); + /** * An document * @author Bart Mollet diff --git a/main/coursecopy/classes/DummyCourseCreator.class.php b/main/coursecopy/classes/DummyCourseCreator.class.php index 1e775aeb9b..c46bfbae57 100644 --- a/main/coursecopy/classes/DummyCourseCreator.class.php +++ b/main/coursecopy/classes/DummyCourseCreator.class.php @@ -23,20 +23,21 @@ Mail: info@dokeos.com ============================================================================== */ -require_once ('Course.class.php'); -require_once ('Document.class.php'); -require_once ('Event.class.php'); -require_once ('Link.class.php'); -require_once ('LinkCategory.class.php'); -require_once ('ForumCategory.class.php'); -require_once ('Forum.class.php'); -require_once ('ForumTopic.class.php'); -require_once ('ForumPost.class.php'); -require_once ('CourseDescription.class.php'); -require_once ('Learnpath.class.php'); -require_once ('CourseRestorer.class.php'); -require_once ('mkdirr.php'); -require_once ('rmdirr.php'); + +require_once 'Course.class.php'; +require_once 'Document.class.php'; +require_once 'Event.class.php'; +require_once 'Link.class.php'; +require_once 'LinkCategory.class.php'; +require_once 'ForumCategory.class.php'; +require_once 'Forum.class.php'; +require_once 'ForumTopic.class.php'; +require_once 'ForumPost.class.php'; +require_once 'CourseDescription.class.php'; +require_once 'Learnpath.class.php'; +require_once 'CourseRestorer.class.php'; +require_once api_get_path(LIBRARY_PATH).'rmdirr.lib.php'; + class DummyCourseCreator { /** @@ -65,7 +66,7 @@ class DummyCourseCreator $course = Database::get_course_info($course_code); $this->course = new Course(); $tmp_path = api_get_path(SYS_COURSE_PATH).$course['directory'].'/document/tmp_'.uniqid(''); - mkdirr($tmp_path); + @mkdir($tmp_path, 0755, true); $this->course->backup_path = $tmp_path; $this->create_dummy_links(); $this->create_dummy_events(); @@ -108,7 +109,7 @@ class DummyCourseCreator $dir_to_make = $course_doc_path.$path; if (!is_dir($dir_to_make)) { - mkdirr(str_replace('/',DIRECTORY_SEPARATOR,$dir_to_make)); + @mkdir($dir_to_make, 0755, true); } $file = $course_doc_path.$path.$filename; $fp = fopen($file, 'w'); @@ -215,17 +216,19 @@ class DummyCourseCreator $last_forum_post = array (); $last_topic_post = array (); // create categorys + $order = 1; for ($i = 1; $i <= $number_of_categories; $i ++) { - $forumcat = new ForumCategory($i, $this->get_dummy_content('title')); + $forumcat = new ForumCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'), $order, 0, 0); $this->course->add_resource($forumcat); + $order++; } // create posts for ($post_id = 1; $post_id <= $number_of_posts; $post_id ++) { $topic_id = rand(1, $number_of_topics); $last_topic_post[$topic_id] = $post_id; - $post = new ForumPost($post_id, $this->get_dummy_content('title'), $this->get_dummy_content('text'), 0, '127.0.0.1', 'Dokeos', 'Administrator', 0, 0, $topic_id); + $post = new ForumPost($post_id, $this->get_dummy_content('title'), $this->get_dummy_content('text'), date('Y-m-d H:i:s'), 1, 'Dokeos Administrator', 0, 0, $topic_id, 0, 1); $this->course->add_resource($post); } // create topics diff --git a/main/coursecopy/classes/Event.class.php b/main/coursecopy/classes/Event.class.php index b296e38469..cdede64f45 100644 --- a/main/coursecopy/classes/Event.class.php +++ b/main/coursecopy/classes/Event.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * An event * @author Bart Mollet diff --git a/main/coursecopy/classes/Forum.class.php b/main/coursecopy/classes/Forum.class.php index 8a4f2de57b..8ab9a2e421 100644 --- a/main/coursecopy/classes/Forum.class.php +++ b/main/coursecopy/classes/Forum.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A forum * @author Bart Mollet diff --git a/main/coursecopy/classes/ForumCategory.class.php b/main/coursecopy/classes/ForumCategory.class.php index f73b53460e..417363095b 100644 --- a/main/coursecopy/classes/ForumCategory.class.php +++ b/main/coursecopy/classes/ForumCategory.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A forum-category * @author Bart Mollet diff --git a/main/coursecopy/classes/ForumPost.class.php b/main/coursecopy/classes/ForumPost.class.php index e183b47b99..8069274744 100644 --- a/main/coursecopy/classes/ForumPost.class.php +++ b/main/coursecopy/classes/ForumPost.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A forum-post * @author Bart Mollet diff --git a/main/coursecopy/classes/ForumTopic.class.php b/main/coursecopy/classes/ForumTopic.class.php index 1cfbbcd424..9574bb366a 100644 --- a/main/coursecopy/classes/ForumTopic.class.php +++ b/main/coursecopy/classes/ForumTopic.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A forum-topic/thread * @author Bart Mollet diff --git a/main/coursecopy/classes/Glossary.class.php b/main/coursecopy/classes/Glossary.class.php index c75dad5550..d501e3732a 100644 --- a/main/coursecopy/classes/Glossary.class.php +++ b/main/coursecopy/classes/Glossary.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * Add resource glossary * @author Isaac flores diff --git a/main/coursecopy/classes/Link.class.php b/main/coursecopy/classes/Link.class.php index 1d9ae1e645..909c5a12c3 100644 --- a/main/coursecopy/classes/Link.class.php +++ b/main/coursecopy/classes/Link.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A WWW-link from the Links-module in a Dokeos-course. * @author Bart Mollet diff --git a/main/coursecopy/classes/LinkCategory.class.php b/main/coursecopy/classes/LinkCategory.class.php index 0c21dc3632..80b6ffa2fa 100644 --- a/main/coursecopy/classes/LinkCategory.class.php +++ b/main/coursecopy/classes/LinkCategory.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A LinkCategory * @author Bart Mollet diff --git a/main/coursecopy/classes/Quiz.class.php b/main/coursecopy/classes/Quiz.class.php index e485008a95..ff258d0cea 100644 --- a/main/coursecopy/classes/Quiz.class.php +++ b/main/coursecopy/classes/Quiz.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * An Quiz * @author Bart Mollet diff --git a/main/coursecopy/classes/QuizQuestion.class.php b/main/coursecopy/classes/QuizQuestion.class.php index e60200e433..09a2ae7ff4 100644 --- a/main/coursecopy/classes/QuizQuestion.class.php +++ b/main/coursecopy/classes/QuizQuestion.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * An QuizQuestion * @author Bart Mollet diff --git a/main/coursecopy/classes/ScormDocument.class.php b/main/coursecopy/classes/ScormDocument.class.php index 15ed2fc107..ad890f1523 100644 --- a/main/coursecopy/classes/ScormDocument.class.php +++ b/main/coursecopy/classes/ScormDocument.class.php @@ -22,7 +22,8 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; /** * ScormDocument class diff --git a/main/coursecopy/classes/Survey.class.php b/main/coursecopy/classes/Survey.class.php index 0fa67a3b59..12861737fd 100755 --- a/main/coursecopy/classes/Survey.class.php +++ b/main/coursecopy/classes/Survey.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A survey * @author Yannick Warnier diff --git a/main/coursecopy/classes/SurveyInvitation.class.php b/main/coursecopy/classes/SurveyInvitation.class.php index 055803fff1..66b8966b71 100755 --- a/main/coursecopy/classes/SurveyInvitation.class.php +++ b/main/coursecopy/classes/SurveyInvitation.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * An SurveyInvitation * @author Yannick Warnier diff --git a/main/coursecopy/classes/SurveyQuestion.class.php b/main/coursecopy/classes/SurveyQuestion.class.php index 9f97a80273..af982efbf2 100755 --- a/main/coursecopy/classes/SurveyQuestion.class.php +++ b/main/coursecopy/classes/SurveyQuestion.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * An QuizQuestion * @author Yannick Warnier diff --git a/main/coursecopy/classes/ToolIntro.class.php b/main/coursecopy/classes/ToolIntro.class.php index 4b80c569f7..021134b624 100644 --- a/main/coursecopy/classes/ToolIntro.class.php +++ b/main/coursecopy/classes/ToolIntro.class.php @@ -22,7 +22,9 @@ Mail: info@dokeos.com ============================================================================== */ -require_once('Resource.class.php'); + +require_once 'Resource.class.php'; + /** * A WWW-link from the Links-module in a Dokeos-course. * @author Bart Mollet diff --git a/main/coursecopy/classes/mkdirr.php b/main/coursecopy/classes/mkdirr.php deleted file mode 100644 index 5c055b0f7a..0000000000 --- a/main/coursecopy/classes/mkdirr.php +++ /dev/null @@ -1,39 +0,0 @@ - - * @version 1.0.0 - * @param string $pathname The directory structure to create - * @return bool Returns TRUE on success, FALSE on failure - */ - -function mkdirr($pathname, $mode = null) { - // Let us avoid that differency about directory separators in Windows paths. - $pathname = str_replace("\\", "/", $pathname); - - // Check if directory already exists - if (is_dir($pathname) || empty($pathname)) { - return true; - } - - // Ensure a file does not already exist with the same name - if (is_file($pathname)) { - trigger_error('mkdirr() File exists', E_USER_WARNING); - return false; - } - - // Crawl up the directory tree - $next_pathname = substr($pathname, 0, strrpos($pathname, '/')); - if (mkdirr($next_pathname, $mode)) { - if (!file_exists($pathname)) { - $res = @mkdir($pathname, $mode); - if($res == false) { - error_log(__FILE__.' line '.__LINE__.': '.(ini_get('track_errors')!=false?$php_errormsg:'error not recorded because track_errors is off in your php.ini'),0); - } - return $res; - } - } - - return false; -} diff --git a/main/coursecopy/classes/rmdirr.php b/main/coursecopy/classes/rmdirr.php deleted file mode 100644 index a86c9c7eb9..0000000000 --- a/main/coursecopy/classes/rmdirr.php +++ /dev/null @@ -1,52 +0,0 @@ - - * @version 1.0.2 - * @param string $dirname Directory to delete - * @return bool Returns TRUE on success, FALSE on failure - */ -function rmdirr($dirname) { - // A sanity check - if (!file_exists($dirname)) { - return false; - } - - // Simple delete for a file - if (is_file($dirname)) { - $res = @unlink($dirname); - if ($res === false) { - error_log(__FILE__.' line '.__LINE__.': '.(ini_get('track_errors')!=false?$php_errormsg:'error not recorded because track_errors is off in your php.ini'),0); - } - return $res; - } - - // Loop through the folder - $dir = dir($dirname); - // A sanity check - $is_object_dir = is_object($dir); - - if ($is_object_dir) { - while (false !== $entry = $dir->read()) { - // Skip pointers - if ($entry == '.' || $entry == '..') { - continue; - } - // Recurse - rmdirr("$dirname/$entry"); - } - } - - // Clean up - if ($is_object_dir) { - $dir->close(); - } - - $res = @rmdir($dirname); - if ($res === false) { - error_log(__FILE__.' line '.__LINE__.': '.(ini_get('track_errors')!=false?$php_errormsg:'error not recorded because track_errors is off in your php.ini'),0); - } - - return $res; -}