[svn r10225] ppt2lp service improve : configuration + some other details

main/admin/configure_extensions.php

@@ -61,7 +61,7 @@ if(isset($_POST['activeExtension'])){
 			// select all the courses and insert the tool inside
 			$sql = 'SELECT db_name FROM '.Database::get_main_table(TABLE_MAIN_COURSE);
 			
-			$rs = api_sql_query($sql);
+			$rs = api_sql_query($sql, __FILE__, __LINE__);
 			while($row = mysql_fetch_array($rs)){
 				
 				$sql = 'INSERT INTO '.$row['db_name'].'.'.TABLE_TOOL_LIST.' SET 
@@ -74,7 +74,7 @@ if(isset($_POST['activeExtension'])){
 						target="_self",
 						category="authoring"';
 				
-				api_sql_query($sql);
+				api_sql_query($sql, __FILE__, __LINE__);
 
 			}
 			
@@ -85,9 +85,31 @@ if(isset($_POST['activeExtension'])){
 					selected_value="true"
 					WHERE variable="service_ppt2lp"
 					AND subkey="active"';
+					
+			$rs = api_sql_query($sql, __FILE__, __LINE__);
+			
 			if(mysql_affected_rows()>0){
 				$message = get_lang('ServiceActivated');
 			}
+			
+			$sql = 'UPDATE '.$tbl_settings_current.' SET
+					selected_value="'.addslashes($_POST['ppt2lp_host']).'"
+					WHERE variable="service_ppt2lp"
+					AND subkey="host"';
+			api_sql_query($sql, __FILE__, __LINE__);
+			
+			$sql = 'UPDATE '.$tbl_settings_current.' SET
+					selected_value="'.addslashes($_POST['ppt2lp_ftp_password']).'"
+					WHERE variable="service_ppt2lp"
+					AND subkey="ftp_password"';
+			api_sql_query($sql, __FILE__, __LINE__);
+			
+			$sql = 'UPDATE '.$tbl_settings_current.' SET
+					selected_value="'.addslashes($_POST['ppt2lp_user']).'"
+					WHERE variable="service_ppt2lp"
+					AND subkey="user"';
+			api_sql_query($sql, __FILE__, __LINE__);
+				
 			break;		
 	}
 	
@@ -230,7 +252,7 @@ Display::display_header($nameTool);
 			<table width="100%">
 				<tr>
 					<td width="50%">
-						<img src="<?php echo api_get_path(WEB_IMG_PATH).'screenshot_ppt2lp.jpg' ?>" />
+						<img width="90%" src="<?php echo api_get_path(WEB_IMG_PATH).'screenshot_ppt2lp.jpg' ?>" />
 					</td>
 					<td align="center" width="50%">
 						<form method="POST" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -240,8 +262,26 @@ Display::display_header($nameTool);
 						}
 						else {
 								echo '
+									<table>
+										<tr>
+											<td align="left">'.get_lang('Host').' : </td>
+											<td><input type="text" size="25" name="ppt2lp_host" /></td>
+										</tr>
+										<tr>
+											<td align="left">'.get_lang('UserOnHost').' : </td>
+											<td><input type="text" size="25" name="ppt2lp_user" /></td>
+										</tr>
+										<tr>
+											<td align="left">'.get_lang('FtpPassword').' : </td>
+											<td><input type="text" size="25" name="ppt2lp_ftp_password" /></td>
+										</tr>
+										<tr>
+											<td colspan="2">
 												<input type="hidden" name="extension_code" value="ppt2lp" />
-									<input type="submit" name="activeExtension" value="'.get_lang('ActiveExtension').'" />';
+												<input type="submit" name="activeExtension" value="'.get_lang('ActiveExtension').'" />
+											</td>
+										</tr>
+									</table>';
 						}
 						?>
 						</form>

main/inc/lib/ppt2png/launch_ppt2png.sh

@@ -1 +1 @@
-$1 -cp .:ridl.jar:js.jar:juh.jar:jurt.jar:jut.jar:java_uno.jar:java_uno_accessbridge.jar:edtftpj-1.5.2.jar:unoil.jar DocumentConverter $2 $3 $4 $5 $6
+$1 -cp .:ridl.jar:js.jar:juh.jar:jurt.jar:jut.jar:java_uno.jar:java_uno_accessbridge.jar:edtftpj-1.5.2.jar:unoil.jar DocumentConverter $2 $3 $4 $5 $6 $7

main/install/dokeos_main.sql

@@ -492,10 +492,12 @@ INSERT INTO `settings_current` VALUES
 (73, 'header', NULL, NULL, 'Plugins', 'messages', '', NULL, NULL, NULL),
 (74,'profile','phone','checkbox','User','true','ProfileChangesTitle','ProfileChangesComment',NULL,'phone'),
 (75, 'Ajax_course_tracking_refresh', NULL, 'textfield','Course','0', 'Ajax_course_tracking_refresh','Ajax_course_tracking_refresh_comment', NULL, NULL),
-(76, 'service_visio', 'active', 'radio',NULL,false, 'visio_actived','', NULL, NULL),
+(76, 'service_visio', 'active', 'radio',NULL,'false', 'visio_actived','', NULL, NULL),
 (77, 'service_visio', 'url', 'textfield',NULL,'', 'visio_url','', NULL, NULL),
-(78, 'service_ppt2lp', 'active', 'radio',NULL,false, 'ppt2lp_actived','', NULL, NULL);
+(78, 'service_ppt2lp', 'active', 'radio',NULL,'false', 'ppt2lp_actived','', NULL, NULL),
-
+(79, 'service_ppt2lp', 'host', NULL, NULL, NULL, 'Host', NULL, NULL, NULL),
+(80, 'service_ppt2lp', 'user', NULL, NULL, NULL, 'UserOnHost', NULL, NULL, NULL),
+(81, 'service_ppt2lp', 'ftp_password', NULL, NULL, NULL, 'FtpPassword', NULL, NULL, NULL);
 
 
 UNLOCK TABLES;

main/newscorm/lp_list.php

@@ -119,8 +119,11 @@ if(api_is_allowed_to_edit())
       UPLOAD SECTION - displays file upload box
      --------------------------------------*/
 		'<a href="../upload/index.php?curdirpath=/&tool='.TOOL_LEARNPATH.'"><img src="../img/file_zip.gif" border="0" alt="scormbuilder" align="absmiddle">&nbsp;'.get_lang("UploadScorm").'</a>'.
-       '</td>' . 
+       '</td>';
-       '<td>'.str_repeat('&nbsp',10).'<a href="../upload/upload_ppt.php?curdirpath=/&tool='.TOOL_LEARNPATH.'"><img src="../img/powerpoint.gif" border="0" alt="scormbuilder" align="absmiddle">&nbsp;'.get_lang("PowerPointConvert").'</a></td>'.
+       if(api_get_setting('service_ppt2lp','active')==true){
+       		echo  '<td>'.str_repeat('&nbsp',10).'<a href="../upload/upload_ppt.php?curdirpath=/&tool='.TOOL_LEARNPATH.'"><img src="../img/powerpoint.gif" border="0" alt="scormbuilder" align="absmiddle">&nbsp;'.get_lang("PowerPointConvert").'</a></td>';
+       }
+       echo 
     "</tr>
   </table>";
   

main/newscorm/lp_upload.php

@@ -79,8 +79,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST'
 		case 'ppt':
 			require_once('presentation.class.php');
 			$o_ppt = new presentation();
-			$o_ppt -> convert_presentation($_FILES['user_file']);
+			$ppt2lp_success = $o_ppt -> convert_presentation($_FILES['user_file']);				
-				
 			break;
 		case '':
 		default:

main/newscorm/presentation.class.php

@@ -58,7 +58,7 @@ class presentation extends learnpath {
 		 * - ftppassword if required
 		 * The program fills $files with the list of slides created
 		 */
-		$cmd = 'cd '.api_get_path(LIBRARY_PATH).'ppt2png && ./launch_ppt2png.sh java localhost 2002 "'.$file.'" "'.$base_work_dir.$created_dir.'"';
+		$cmd = 'cd '.api_get_path(LIBRARY_PATH).'ppt2png && ./launch_ppt2png.sh java '.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');
 		
 		chmod ($base_work_dir.$created_dir,0777);
 		
@@ -67,6 +67,7 @@ class presentation extends learnpath {
 		chmod ($base_work_dir.$created_dir,0744);
 		if($return != 0) { //if the java application returns an error code
 			DocumentManager::delete_document($_course, $dir_name, $base_work_dir);	 
+			return false;   	
 	    }
 	    
 	    else {
@@ -90,11 +91,12 @@ class presentation extends learnpath {
 					
 					$slide_name = 'slide'.str_repeat('0',2-strlen($i)).$i;
 					
-					$previous = learnpath::add_item(0, $previous, 'document', $document_id, $slide_name, 0);
+					$previous = learnpath::add_item(0, $previous, 'document', $document_id, $slide_name, '');
 					
 				}
 			}
 	    }
+	    return true;   	
 	    
     }
 		

main/upload/upload_ppt.php

@@ -14,6 +14,25 @@ $langFile = "document"; //the document file is loaded because most of the upload
 // global settings initialisation
 // also provides access to main api (inc/lib/main_api.lib.php)
 include("../inc/global.inc.php");
+require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
+require_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
+require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
+
+
+if(isset($_POST['convert'])){
+	$cwdir = getcwd();
+	require('../newscorm/lp_upload.php');
+	if(isset($o_ppt)){
+		header('Location: ../newscorm/lp_controller.php?'.api_get_cidreq().'&action=build&lp_id='.$o_ppt->lp_id);
+	}
+	else {
+		$errorMessage = get_lang('Ppt2lpError');
+	}
+}
+
+event_access_tool(TOOL_UPLOAD);
+
+
 
 $interbreadcrumb[]= array ("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang(TOOL_LEARNPATH));
 $nameTools = get_lang("FileUpload");
@@ -39,8 +58,17 @@ Display::display_normal_message($message);
 
 echo '<br><br>';
 
-echo '<form method="POST" action="">';
+if(!empty($errorMessage)){
-echo '<img src="../img/powerpoint_big.gif" align="absbottom">&nbsp;&nbsp;<input type="file" name="user_file"><br><br><input type="submit" name="submit" value="'.get_lang('ConvertToLP').'">&nbsp;&nbsp;<img src="../img/scormbuilder.gif" align="absmiddle">';
+	Display::display_error_message($errorMessage);
+}
+
+echo '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+echo '<img src="../img/powerpoint_big.gif" align="absbottom">
+		&nbsp;&nbsp;<input type="file" name="user_file">
+		<br><br>
+		<input type="submit" name="convert" value="'.get_lang('ConvertToLP').'">
+		&nbsp;&nbsp;
+		<img src="../img/scormbuilder.gif" align="absmiddle">';
 echo '</form>';