From 4cafc144a74e697b8e54ca11f67b71b4ff27c2ee Mon Sep 17 00:00:00 2001
From: Yannick Warnier <yannick.warnier@beeznest.com>
Date: Sat, 28 Jun 2008 04:56:23 +0200
Subject: [PATCH] [svn r15646] Removed notice-level errors

---
 main/newscorm/lp_upload.php                     | 6 +++++-
 main/newscorm/lp_view_item.php                  | 3 +--
 main/newscorm/openoffice_document.class.php     | 4 ++--
 main/newscorm/openoffice_presentation.class.php | 4 ++--
 main/upload/upload_ppt.php                      | 2 ++
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/main/newscorm/lp_upload.php b/main/newscorm/lp_upload.php
index 86e7b021d3..3cb3183feb 100644
--- a/main/newscorm/lp_upload.php
+++ b/main/newscorm/lp_upload.php
@@ -12,7 +12,11 @@ $use_anonymous = true;
 require_once('back_compat.inc.php');
 $course_dir  = api_get_course_path().'/scorm';
 $course_sys_dir = api_get_path(SYS_COURSE_PATH).$course_dir;
-$current_dir = replace_dangerous_char(trim($_POST['current_dir']),'strict');
+if ( empty($_POST['current_dir']) ) {
+	$current_dir = '';
+} else {
+    $current_dir = replace_dangerous_char(trim($_POST['current_dir']),'strict');
+}
 $uncompress  = 1;
 
 //error_log('New LP - lp_upload.php',0);
diff --git a/main/newscorm/lp_view_item.php b/main/newscorm/lp_view_item.php
index 7625fde1fd..012e393c7c 100644
--- a/main/newscorm/lp_view_item.php
+++ b/main/newscorm/lp_view_item.php
@@ -80,9 +80,8 @@ $tbl_lp = Database::get_course_table('lp');
 $tbl_lp_item = Database::get_course_table('lp_item');
 $tbl_lp_view = Database::get_course_table('lp_view');
 
-$isStudentView  = (int) $_REQUEST['isStudentView'];
+$isStudentView  = (empty($_REQUEST['isStudentView'])?0:(int) $_REQUEST['isStudentView']);
 $learnpath_id   = (int) $_REQUEST['lp_id'];
-$submit			= $_POST['submit_button'];
 /*
 $chapter_id     = $_GET['chapter_id'];
 $title          = $_POST['title'];
diff --git a/main/newscorm/openoffice_document.class.php b/main/newscorm/openoffice_document.class.php
index 7d9afcd8d7..26d92877b2 100644
--- a/main/newscorm/openoffice_document.class.php
+++ b/main/newscorm/openoffice_document.class.php
@@ -63,11 +63,11 @@ abstract class OpenofficeDocument extends learnpath {
 		
 		
 		$classpath = '-cp .:jodconverter-2.2.1.jar:jodconverter-cli-2.2.1.jar';
-		if(strpos($_ENV['OS'],'Windows') !== false)
+		if(isset($_ENV['OS']) && strpos($_ENV['OS'],'Windows') !== false)
 		{
 			$classpath = str_replace(':',';',$classpath);
 		}
-		if(strpos($_ENV['OS'],'Windows') !== false)
+		if(isset($_ENV['OS']) && strpos($_ENV['OS'],'Windows') !== false)
 		{
 			$cmd = 'cd '.str_replace('/','\\',api_get_path(SYS_PATH).'main/inc/lib/ppt2png ').$classpath.' DokeosConverter';
 		}
diff --git a/main/newscorm/openoffice_presentation.class.php b/main/newscorm/openoffice_presentation.class.php
index 1e172f665b..ea74364ab8 100644
--- a/main/newscorm/openoffice_presentation.class.php
+++ b/main/newscorm/openoffice_presentation.class.php
@@ -60,7 +60,7 @@ class OpenofficePresentation extends OpenofficeDocument {
 			$i++;	
 			// add the png to documents
 			$document_id = add_document($_course,$this->created_dir.'/'.urlencode($file_name),'file',filesize($this->base_work_dir.$this->created_dir.'/'.$file_name),$slide_name);
-			api_item_property_update($_course,TOOL_DOCUMENT,$document_id,'DocumentAdded',$_SESSION['_uid'],0,0);
+			api_item_property_update($_course,TOOL_DOCUMENT,$document_id,'DocumentAdded',api_get_user_id(),0,0);
 			
 			
 			// create an html file
@@ -79,7 +79,7 @@ class OpenofficePresentation extends OpenofficeDocument {
 			if ($document_id){	
 							
 				//put the document in item_property update
-				api_item_property_update($_course,TOOL_DOCUMENT,$document_id,'DocumentAdded',$_SESSION['_uid'],0,0);
+				api_item_property_update($_course,TOOL_DOCUMENT,$document_id,'DocumentAdded',api_get_user_id(),0,0);
 				
 				$previous = learnpath::add_item(0, $previous, 'document', $document_id, $slide_name, '');
 				if($this->first_item == 0){
diff --git a/main/upload/upload_ppt.php b/main/upload/upload_ppt.php
index 40fdd03255..f70014ec75 100644
--- a/main/upload/upload_ppt.php
+++ b/main/upload/upload_ppt.php
@@ -120,6 +120,8 @@ $s_style_error="border-width: 1px;
 
 //Display::display_normal_message($message);
 
+$alt_text = '';
+$attribute_list = '';
 echo '<div style="'.$s_style.'"><div style="float:left; margin-right:10px;"><img src="'.api_get_path(WEB_IMG_PATH)."message_normal.gif".'" alt="'.$alt_text.'" '.$attribute_list.'  /></div><div style="margin-left: 43px">'.$message.'</div></div>';
 
 if(!empty($errorMessage)){