[svn r14044] we can now configure the port for oogie/woogie (FS#1483)

main/admin/configure_extensions.php

@@ -160,6 +160,12 @@ if(isset($_POST['activeExtension'])){
 					AND subkey="host"';
 			api_sql_query($sql, __FILE__, __LINE__);
 			
+			$sql = 'UPDATE '.$tbl_settings_current.' SET
+					selected_value="'.addslashes($_POST['port']).'"
+					WHERE variable="service_ppt2lp"
+					AND subkey="port"';
+			api_sql_query($sql, __FILE__, __LINE__);
+			
 			$sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['ftp_password']).'"
 					WHERE variable="service_ppt2lp"
@@ -356,6 +362,8 @@ Display::display_header($nameTool);
 						$form = new FormValidator('ppt2lp');						
 						$form -> addElement('text', 'host', get_lang('Host'));
 						$form -> addElement('html','<br /><br />');
+						$form -> addElement('text', 'port', get_lang('Port'));
+						$form -> addElement('html','<br /><br />');
 						$form -> addElement('text', 'user', get_lang('UserOnHost'));
 						$form -> addElement('html','<br /><br />');
 						$form -> addElement('text', 'ftp_password', get_lang('FtpPassword'));
@@ -391,6 +399,8 @@ Display::display_header($nameTool);
 							$form -> addElement('submit', 'activeExtension', get_lang('ReconfigureExtension'));
 						}
 						else {
+							$defaults['host'] = 'localhost';
+							$defaults['port'] = '2002';
 							$defaults['size'] = '720x540';
 							$form -> addElement('submit', 'activeExtension', get_lang('ActivateExtension'));
 						}

main/install/dokeos_main.sql

@@ -486,9 +486,10 @@ INSERT INTO settings_current VALUES
 (77, 'service_visio', 'visioclassroom_url', 'textfield',NULL,'', 'visio_url','', NULL, NULL),
 (78, 'service_ppt2lp', 'active', 'radio',NULL,'false', 'ppt2lp_actived','', NULL, NULL),
 (79, 'service_ppt2lp', 'host', 'textfield', NULL, NULL, 'Host', NULL, NULL, NULL),
-(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),
+(80, 'service_ppt2lp', 'port', 'textfield', NULL, 2002, 'Port', NULL, NULL, NULL),
+(81, 'service_ppt2lp', 'user', 'textfield', NULL, NULL, 'UserOnHost', NULL, NULL, NULL),
+(82, 'service_ppt2lp', 'ftp_password', 'textfield', NULL, NULL, 'FtpPassword', NULL, NULL, NULL),
+(83, 'service_ppt2lp', 'path_to_lzx', 'textfield', NULL, NULL, '', NULL, NULL, NULL),
 (84, 'service_ppt2lp', 'size', 'radio', NULL, '720x540', '', NULL, NULL, NULL),
 (85, 'wcag_anysurfer_public_pages', NULL, 'radio','Platform','false','PublicPagesComplyToWAITitle','PublicPagesComplyToWAIComment', NULL, NULL),
 (86, 'stylesheets', NULL, 'textfield','stylesheets','default_with_tabs','',NULL, NULL, NULL),

main/install/migrate-db-1.8.4-1.8.5-pre.sql

@@ -46,6 +46,7 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('gradebook_score_display_custom', 'my_display_custom', 'checkbox', 'Gradebook', 'false', 'GradebookScoreDisplayCustom', 'GradebookScoreDisplayCustomComment', NULL, 'TabsGradebookEnableCustom');
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('gradebook_score_display_colorsplit', NULL, 'textfield', 'Gradebook', '50', 'GradebookScoreDisplayColorSplit', 'GradebookScoreDisplayColorSplitComment', NULL, NULL);
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('gradebook_score_display_upperlimit', 'my_display_upperlimit', 'checkbox', 'Gradebook', 'false', 'GradebookScoreDisplayUpperLimit', 'GradebookScoreDisplayUpperLimitComment', NULL, 'TabsGradebookEnableUpperLimit');
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext) VALUES ('service_ppt2lp', 'port', 'checkbox', NULL, '2002', 'Port', NULL, NULL, NULL);
 
 -- xxSTATSxx
 ALTER TABLE track_e_downloads ADD INDEX (down_user_id);

main/newscorm/openoffice_document.class.php

@@ -71,7 +71,7 @@ abstract class OpenofficeDocument extends learnpath {
 		{
 			$cmd = 'cd '.api_get_path(SYS_PATH).'main/inc/lib/ppt2png && java '.$classpath.' DokeosConverter';
 		}
-		$cmd .=  ' -p 2002';		
+		$cmd .=  ' -p '.api_get_setting('service_ppt2lp','port');		
 		
 		// call to the function implemented by child
 		$cmd .= $this -> add_command_parameters();