4479 bug: rename folder error on ims_import line 1359.

added svn keyword: id

diff --git a/docs/mods/_core/imscc/classes/DiscussionTools.class.php b/docs/mods/_core/imscc/classes/DiscussionTools.class.php
index d4a4a4f..688cc16 100644 (file)
--- a/docs/mods/_core/imscc/classes/DiscussionTools.class.php
+++ b/docs/mods/_core/imscc/classes/DiscussionTools.class.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: DiscussionTools.class.php 8897 2009-11-10 21:59:08Z hwong $
+// $Id$
 
 /**
  * A class for DiscussionTools

diff --git a/docs/mods/_core/imscc/classes/DiscussionToolsImport.class.php b/docs/mods/_core/imscc/classes/DiscussionToolsImport.class.php
index 95964d2..311cdd7 100644 (file)
--- a/docs/mods/_core/imscc/classes/DiscussionToolsImport.class.php
+++ b/docs/mods/_core/imscc/classes/DiscussionToolsImport.class.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: DiscussionToolsImport.class.php 8894 2009-11-09 20:03:12Z hwong $
+// $Id$
 
 include(AT_INCLUDE_PATH.'../mods/_standard/forums/lib/forums.inc.php');
 /**

diff --git a/docs/mods/_core/imscc/classes/DiscussionToolsParser.class.php b/docs/mods/_core/imscc/classes/DiscussionToolsParser.class.php
index 059dffd..d0a927c 100644 (file)
--- a/docs/mods/_core/imscc/classes/DiscussionToolsParser.class.php
+++ b/docs/mods/_core/imscc/classes/DiscussionToolsParser.class.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: DiscussionToolsParser.class.php 8894 2009-11-09 20:03:12Z hwong $
+// $Id$
 include('DiscussionTools.class.php');
 
 /**

diff --git a/docs/mods/_core/imscc/classes/Weblinks.class.php b/docs/mods/_core/imscc/classes/Weblinks.class.php
index f4e6008..7819e4e 100644 (file)
--- a/docs/mods/_core/imscc/classes/Weblinks.class.php
+++ b/docs/mods/_core/imscc/classes/Weblinks.class.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: Weblinks.class.php 8119 2008-10-29 13:53:06Z hwong $
+// $Id$
 
 /**
  * A class for Weblinks object

diff --git a/docs/mods/_core/imscc/classes/WeblinksExport.class.php b/docs/mods/_core/imscc/classes/WeblinksExport.class.php
index 650596a..663606a 100644 (file)
--- a/docs/mods/_core/imscc/classes/WeblinksExport.class.php
+++ b/docs/mods/_core/imscc/classes/WeblinksExport.class.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: WeblinksExport.class.php 8119 2008-10-29 13:53:06Z hwong $
+// $Id$
 
 /**
  * A very simple class to generates a singular webcontent weblink xml file.

diff --git a/docs/mods/_core/imscc/classes/WeblinksParser.class.php b/docs/mods/_core/imscc/classes/WeblinksParser.class.php
index 0a1bb3f..08785bd 100644 (file)
--- a/docs/mods/_core/imscc/classes/WeblinksParser.class.php
+++ b/docs/mods/_core/imscc/classes/WeblinksParser.class.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: WeblinksParser.class.php 8782 2009-09-04 17:33:07Z hwong $
+// $Id$
 
 /**
 * WeblinksParser

diff --git a/docs/mods/_core/imscc/ims_export.php b/docs/mods/_core/imscc/ims_export.php
index 42ded07..dec8910 100644 (file)
--- a/docs/mods/_core/imscc/ims_export.php
+++ b/docs/mods/_core/imscc/ims_export.php
@@ -9,7 +9,7 @@
 /* modify it under the terms of the GNU General Public License          */
 /* as published by the Free Software Foundation.                        */
 /************************************************************************/
-// $Id: ims_export.php 8211 2008-11-11 22:55:40Z hwong $
+// $Id$
 define('AT_INCLUDE_PATH', '../../../include/');
 
 /* content id of an optional chapter */

diff --git a/docs/mods/_core/imscc/ims_import.php b/docs/mods/_core/imscc/ims_import.php
index 2871a8c..f778d75 100644 (file)
--- a/docs/mods/_core/imscc/ims_import.php
+++ b/docs/mods/_core/imscc/ims_import.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: ims_import.php 8210 2008-11-11 22:29:13Z hwong $
+// $Id$
 define('AT_INCLUDE_PATH', '../../include/');
 //use tools/ims/ims_import.php
 require(AT_INCLUDE_PATH.'../mods/_core/imscp/ims_import.php');

diff --git a/docs/mods/_core/imscc/include/ims_template.inc.php b/docs/mods/_core/imscc/include/ims_template.inc.php
index 6584fed..e8c361c 100644 (file)
--- a/docs/mods/_core/imscc/include/ims_template.inc.php
+++ b/docs/mods/_core/imscc/include/ims_template.inc.php
@@ -9,7 +9,7 @@
 /* modify it under the terms of the GNU General Public License          */
 /* as published by the Free Software Foundation.                        */
 /************************************************************************/
-// $Id: ims_template.inc.php 8180 2008-11-07 17:17:25Z hwong $
+// $Id$
 
 if (!defined('AT_INCLUDE_PATH')) { exit; }
 

diff --git a/docs/mods/_core/imscp/export.php b/docs/mods/_core/imscp/export.php
index 3a03885..5820dc7 100644 (file)
--- a/docs/mods/_core/imscp/export.php
+++ b/docs/mods/_core/imscp/export.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */\r
 /* as published by the Free Software Foundation.                               */\r
 /****************************************************************/\r
-// $Id: export.php 7208 2008-01-09 16:07:24Z greg $\r
+// $Id$\r
 \r
 define('AT_INCLUDE_PATH', '../../../include/');\r
 require(AT_INCLUDE_PATH.'vitals.inc.php');\r

diff --git a/docs/mods/_core/imscp/ims_export.php b/docs/mods/_core/imscp/ims_export.php
index 177080d..6644987 100644 (file)
--- a/docs/mods/_core/imscp/ims_export.php
+++ b/docs/mods/_core/imscp/ims_export.php
@@ -9,7 +9,7 @@
 /* modify it under the terms of the GNU General Public License          */
 /* as published by the Free Software Foundation.                        */
 /************************************************************************/
-// $Id: ims_export.php 8935 2009-11-17 17:36:09Z hwong $
+// $Id$
 define('AT_INCLUDE_PATH', '../../../include/');
 
 /* content id of an optional chapter */

diff --git a/docs/mods/_core/imscp/ims_import.php b/docs/mods/_core/imscp/ims_import.php
index 3db08da..6456f49 100644 (file)
--- a/docs/mods/_core/imscp/ims_import.php
+++ b/docs/mods/_core/imscp/ims_import.php
@@ -9,7 +9,7 @@
 /* modify it under the terms of the GNU General Public License          */
 /* as published by the Free Software Foundation.                        */
 /************************************************************************/
-// $Id: ims_import.php 9081 2010-01-13 20:26:03Z cindy $
+// $Id$
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');
 
@@ -1356,10 +1356,9 @@ if (is_dir(AT_CONTENT_DIR . 'import/'.$_SESSION['course_id'].'/resources')) {
 if(is_array($all_package_base_path)){
        $all_package_base_path = implode('/', $all_package_base_path);
 }
-if(strpos($all_package_base_path, 'http://')===false){
+if(strpos($all_package_base_path, 'http:/')===false){
     if (@rename($import_path.$all_package_base_path, AT_CONTENT_DIR .$_SESSION['course_id'].'/'.$package_base_name) === false) {
         if (!$msg->containsErrors()) {
-            exit;
             $msg->addError('IMPORT_FAILED');
         }
     }

diff --git a/docs/mods/_core/imscp/include/ims_template.inc.php b/docs/mods/_core/imscp/include/ims_template.inc.php
index df7accd..35e25ce 100644 (file)
--- a/docs/mods/_core/imscp/include/ims_template.inc.php
+++ b/docs/mods/_core/imscp/include/ims_template.inc.php
@@ -9,7 +9,7 @@
 /* modify it under the terms of the GNU General Public License          */
 /* as published by the Free Software Foundation.                        */
 /************************************************************************/
-// $Id: ims_template.inc.php 8935 2009-11-17 17:36:09Z hwong $
+// $Id$
 
 if (!defined('AT_INCLUDE_PATH')) { exit; }
 

diff --git a/docs/mods/_core/imscp/index.php b/docs/mods/_core/imscp/index.php
index a7ca4d4..e15f53a 100644 (file)
--- a/docs/mods/_core/imscp/index.php
+++ b/docs/mods/_core/imscp/index.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: index.php 8901 2009-11-11 19:10:19Z cindy $
+// $Id$
 
 define('AT_INCLUDE_PATH', '../../../include/');
 require(AT_INCLUDE_PATH.'vitals.inc.php');

diff --git a/docs/mods/_core/imscp/ns.inc.php b/docs/mods/_core/imscp/ns.inc.php
index 2cc42c6..5e96447 100644 (file)
--- a/docs/mods/_core/imscp/ns.inc.php
+++ b/docs/mods/_core/imscp/ns.inc.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: ims_import.php 8766 2009-08-07 01:39:05Z hwong $
+// $Id$
 
 /**
  * Version 1.0 -IMS Common Cartridge Final Namespaces to Schema Locations

diff --git a/docs/mods/_core/imscp/oauth/OAuthUtility.class.php b/docs/mods/_core/imscp/oauth/OAuthUtility.class.php
index e78b91e..3d3a755 100644 (file)
--- a/docs/mods/_core/imscp/oauth/OAuthUtility.class.php
+++ b/docs/mods/_core/imscp/oauth/OAuthUtility.class.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */
 /* as published by the Free Software Foundation.                               */
 /****************************************************************/
-// $Id: OAuthUtility.class.php 8901 2009-11-11 19:10:19Z cindy $
+// $Id$
 
 /**
 * OAuth Utility functions 

diff --git a/docs/mods/_core/imscp/oauth/oauth_authenticate.php b/docs/mods/_core/imscp/oauth/oauth_authenticate.php
index c77747e..436dacb 100644 (file)
--- a/docs/mods/_core/imscp/oauth/oauth_authenticate.php
+++ b/docs/mods/_core/imscp/oauth/oauth_authenticate.php
@@ -10,7 +10,7 @@
 /* modify it under the terms of the GNU General Public License  */\r
 /* as published by the Free Software Foundation.                               */\r
 /****************************************************************/\r
-// $Id: index.php 8901 2009-11-11 19:10:19Z cindy $\r
+// $Id$\r
 \r
 /**\r
  * This script is called by mods/_core/imscp/ims_export.php\r