From 6d683a349c1487ec86ef3ca08341f70d0b62d33d Mon Sep 17 00:00:00 2001
From: Eric Marguin <e.marguin@elixir-interactive.com>
Date: Wed, 21 Feb 2007 17:30:38 +0100
Subject: [PATCH] [svn r11182] improvments in oogie : - we are now able to
 configure the size of the slides in the admin - the slide is now integrated
 in an html file so that we are able to add later mp3, text, flash...

---
 main/admin/configure_extensions.php          |  14 +++++++++
 main/inc/lib/ppt2png/DocumentConverter.class | Bin 10123 -> 10230 bytes
 main/inc/lib/ppt2png/DocumentConverter.java  |  17 +++++++----
 main/install/dokeos_main.sql                 |   3 +-
 main/newscorm/presentation.class.php         |  29 +++++++++++++------
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/main/admin/configure_extensions.php b/main/admin/configure_extensions.php
index 4087e12649..30247db465 100644
--- a/main/admin/configure_extensions.php
+++ b/main/admin/configure_extensions.php
@@ -153,6 +153,12 @@ if(isset($_POST['activeExtension'])){
 					WHERE variable="service_ppt2lp"
 					AND subkey="path_to_lzx"';
 			api_sql_query($sql, __FILE__, __LINE__);
+			
+			$sql = 'UPDATE '.$tbl_settings_current.' SET
+					selected_value="'.addslashes($_POST['size']).'"
+					WHERE variable="service_ppt2lp"
+					AND subkey="size"';
+			api_sql_query($sql, __FILE__, __LINE__);
 				
 			break;		
 	}
@@ -325,6 +331,14 @@ Display::display_header($nameTool);
 						$form -> addElement('text', 'ftp_password', get_lang('FtpPassword'));
 						$form -> addElement('html','<br /><br />');
 						$form -> addElement('text', 'path_to_lzx', get_lang('PathToLzx'));
+						$form -> addElement('html','<br /><br />');
+						$options = array(
+									'540x405'=>'540x405',
+									'640x480'=>'640x480',
+									'800x600'=>'800x600',
+									'1000x750'=>'1000x750'
+									);
+						$form -> addElement('select', 'size', get_lang('SlideSize'), $options);
 						$form -> addElement('hidden', 'extension_code', 'ppt2lp');
 						
 						$defaults = array();
diff --git a/main/inc/lib/ppt2png/DocumentConverter.class b/main/inc/lib/ppt2png/DocumentConverter.class
index b546242542bbd07ac386fcca3b6dbad33e487bc0..e4d41a4a0f02e2cc450c3b6cf4387d7cca3de02a 100644
GIT binary patch
delta 5247
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
E0bcJnmjD0&

delta 5092
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
YMsjXPiGyXiS?|!hmbt&1lJwsH0|UqpSpWb4

diff --git a/main/inc/lib/ppt2png/DocumentConverter.java b/main/inc/lib/ppt2png/DocumentConverter.java
index 9b6b494c7b..33b6949620 100755
--- a/main/inc/lib/ppt2png/DocumentConverter.java
+++ b/main/inc/lib/ppt2png/DocumentConverter.java
@@ -49,20 +49,25 @@ public class DocumentConverter {
 	public static void main(String args[]) {
 		
 		String cnx, ftpuser, host, port, url, ftpPasswd, destinationFolder, remoteFolderFullPath, remoteFolder;
+		int width, height;
 		
-		try {
+		try {			
 			host = args[0];
 			port = args[1];
 			url = args[2];
 			destinationFolder = args[3];
-			if(args.length == 6){
-				ftpuser = args[4];
-				ftpPasswd = args[5];
+			width = Integer.parseInt(args[4]);
+			height = Integer.parseInt(args[5]);
+			if(args.length == 8){
+				ftpuser = args[6];
+				ftpPasswd = args[7];
 			}
 			else{
 				ftpuser = "";
 				ftpPasswd = "";
 			}
+			
+			
 			if(host.equals("localhost")){
 				String prefix = "file://";
 				if(url.charAt(0)!='/')
@@ -185,9 +190,9 @@ public class DocumentConverter {
 					}
 					
 					filterDatas[0].Name = "PixelWidth";
-					filterDatas[0].Value = new Integer(540);
+					filterDatas[0].Value = new Integer(width);
 					filterDatas[1].Name = "PixelHeight";
-					filterDatas[1].Value = new Integer(405);
+					filterDatas[1].Value = new Integer(height);
 					filterDatas[2].Name = "LogicalWidth";
 					filterDatas[2].Value = new Integer(2000);
 					filterDatas[3].Name = "LogicalHeight";
diff --git a/main/install/dokeos_main.sql b/main/install/dokeos_main.sql
index cfcde9b795..be98529862 100644
--- a/main/install/dokeos_main.sql
+++ b/main/install/dokeos_main.sql
@@ -491,7 +491,8 @@ INSERT INTO `settings_current` VALUES
 (80, 'service_ppt2lp', 'user', 'textfield', NULL, NULL, 'UserOnHost', NULL, NULL, NULL),
 (81, 'service_ppt2lp', 'ftp_password', 'textfield', NULL, NULL, 'FtpPassword', NULL, NULL, NULL),
 (82, 'service_ppt2lp', 'path_to_lzx', 'textfield', NULL, NULL, '', NULL, NULL, NULL),
-(83, 'wcag_anysurfer_public_pages', NULL, 'radio','Platform','false','PublicPagesComplyToWAITitle','PublicPagesComplyToWAIComment', NULL, NULL);
+(84, 'service_ppt2lp', 'size', 'radio', '540x405', NULL, '', NULL, NULL, NULL),
+(85, 'wcag_anysurfer_public_pages', NULL, 'radio','Platform','false','PublicPagesComplyToWAITitle','PublicPagesComplyToWAIComment', NULL, NULL);
 
 
 UNLOCK TABLES;
diff --git a/main/newscorm/presentation.class.php b/main/newscorm/presentation.class.php
index 8417e3291c..53962d52ce 100644
--- a/main/newscorm/presentation.class.php
+++ b/main/newscorm/presentation.class.php
@@ -78,15 +78,15 @@ class presentation extends learnpath {
 		{
 			$classpath = str_replace(':',';',$classpath);
 		}
-		
+		list($slide_width, $slide_height) = explode('x',api_get_setting('service_ppt2lp','size'));
 		
 		if(strpos($_ENV['OS'],'Windows') !== false)
-		{			
-			$cmd = 'cd '.str_replace('/','\\',api_get_path(SYS_PATH)).'main/inc/lib/ppt2png && java '.$classpath.' DocumentConverter '.api_get_setting('service_ppt2lp','host').' 2002'.' "'.$file.'" "'.$base_work_dir.$created_dir.'"'.' '.api_get_setting('service_ppt2lp','user').' '.api_get_setting('service_ppt2lp','ftp_password');
+		{
+			$cmd = 'cd '.str_replace('/','\\',api_get_path(SYS_PATH)).'main/inc/lib/ppt2png && java '.$classpath.' DocumentConverter '.api_get_setting('service_ppt2lp','host').' 2002'.' "'.$file.'" "'.$base_work_dir.$created_dir.'"'.' '.$slide_width.' '.$slide_height.' '.api_get_setting('service_ppt2lp','user').' '.api_get_setting('service_ppt2lp','ftp_password');
 		}
 		else
 		{
-			$cmd = 'cd '.api_get_path(SYS_PATH).'main/inc/lib/ppt2png && java '.$classpath.' DocumentConverter '.api_get_setting('service_ppt2lp','host').' 2002'.' "'.$file.'" "'.$base_work_dir.$created_dir.'"'.' '.api_get_setting('service_ppt2lp','user').' '.api_get_setting('service_ppt2lp','ftp_password');
+			$cmd = 'cd '.api_get_path(SYS_PATH).'main/inc/lib/ppt2png && java '.$classpath.' DocumentConverter '.api_get_setting('service_ppt2lp','host').' 2002'.' "'.$file.'" "'.$base_work_dir.$created_dir.'"'.' '.$slide_width.' '.$slide_height.' '.api_get_setting('service_ppt2lp','user').' '.api_get_setting('service_ppt2lp','ftp_password');
 		}
 		chmod ($base_work_dir.$created_dir,0777);
 		
@@ -108,16 +108,27 @@ class presentation extends learnpath {
 			$first_item = 0;
 			foreach($files as $file){
 				$i++;
-				$document_id = add_document($_course,$created_dir.'/'.$file,'file',filesize($base_work_dir.$created_dir.'/'.$file),$file);
-				if ($document_id){
+				
+				// create an html file
+				$html_file = $file.'.html';
+				$fp = fopen($base_work_dir.$created_dir.'/'.$html_file, 'w+');
+				
+				fwrite($fp,
+						'<html>
+						<head></head>
+						<body>
+							<img src="'.api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$created_dir.'/'.$file.'" />
+						</body>
+						</html>');
+				fclose($fp);
+				$document_id = add_document($_course,$created_dir.'/'.$html_file,'file',filesize($base_work_dir.$created_dir.'/'.$html_file),$html_file);
+				if ($document_id){	
+								
 					//put the document in item_property update
 					api_item_property_update($_course,TOOL_DOCUMENT,$document_id,'DocumentAdded',$_SESSION['_uid'],$to_group_id,$to_user_id);
 					
 					$infos = pathinfo($file);
-					//$slide_name = substr($infos['basename'],0,strpos($infos['basename'],'.'));
-					
 					$slide_name = 'slide'.str_repeat('0',2-strlen($i)).$i;
-					
 					$previous = learnpath::add_item(0, $previous, 'document', $document_id, $slide_name, '');
 					if($first_item == 0){
 						$first_item = $previous;