[evolvis-commits] r11950: To-Do task [#1422] Docman - Remove ftp upload option and the inline doc editing
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 18:29:59 CET 2011
Author: mirabilos
Date: 2011-02-24 18:29:59 +0100 (Thu, 24 Feb 2011)
New Revision: 11950
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/admin/index.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/new.php
Log:
To-Do task [#1422] Docman - Remove ftp upload option and the inline doc editing
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/admin/index.php 2011-02-24 17:29:58 UTC (rev 11949)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/admin/index.php 2011-02-24 17:29:59 UTC (rev 11950)
@@ -16,7 +16,12 @@
Complete OO rewrite by Tim Perdue 1/2003
*/
+/*
+ Ftp upload option is commented-out
+
+*/
+
require_once('pre.php');
require_once('www/docman/include/doc_utils.php');
require_once('www/docman/include/DocumentGroupHTML.class');
@@ -59,7 +64,7 @@
$language_id = getIntFromRequest('language_id');
$data = getStringFromRequest('data');
$file_url = getStringFromRequest('file_url');
- $ftp_filename = getStringFromRequest('ftp_filename');
+ //$ftp_filename = getStringFromRequest('ftp_filename');
$uploaded_data = getUploadedFile('uploaded_data');
$stateid = getIntFromRequest('stateid');
$filetype = getStringFromRequest('filetype');
@@ -88,10 +93,12 @@
$data = '';
$filename=$file_url;
$filetype='URL';
+ /*
} elseif ($sys_use_ftpuploads && $ftp_filename!=100) { //100==None
$filename=$upload_dir.'/'.$ftp_filename;
$data = addslashes(fread(fopen($filename, 'r'), filesize($filename)));
$filetype=$uploaded_data_type;
+ */
} else {
$filename=addslashes($d->getFileName());
$filetype=addslashes($d->getFileType());
@@ -209,8 +216,9 @@
echo '<tr>
<td>
';
- echo '<input type="hidden" name="editor" value="editor">';
+ //echo '<input type="hidden" name="editor" value="editor">';
echo $Language->getText('docman_admin_editdocs','edit');
+ /*
$params['name'] = 'data';
$params['width'] = "800";
$params['height'] = "500";
@@ -221,13 +229,16 @@
plugin_hook("text_editor",$params);
}
if (!$GLOBALS['editor_was_set_up']) {
+ */
//if we don´t have any plugin for text editor, display a simple textarea edit box
echo '<textarea name="data" rows="15" cols="100" wrap="soft">'. $d->getFileData() .'</textarea><br />';
echo '<input type="hidden" name="filetype" value="text/plain">';
+ /*
} else {
echo '<input type="hidden" name="filetype" value="text/html">'; // the fckeditor creates html docs. this is for filetype
}
unset($GLOBALS['editor_was_set_up']);
+ */
echo '</td>
</tr>';
}
@@ -289,13 +300,13 @@
<?php } else { ?>
<strong><?php echo $Language->getText('docman_admin_editdocs','upload') ?></strong><br />
<input type="file" name="uploaded_data" size="30" /><br/><br />
- <?php if ($sys_use_ftpuploads) { ?>
- <strong><?php echo $Language->getText('docman_admin_editdocs','upload_ftp',array($sys_ftp_upload_host)) ?></strong><br />
+ <?php //if ($sys_use_ftpuploads) { ?>
+ <!--<strong><?php //echo $Language->getText('docman_admin_editdocs','upload_ftp',array($sys_ftp_upload_host)) ?></strong>--><br />
<?php
- $ftp_files_arr=array_merge($arr,ls($upload_dir,true));
- echo html_build_select_box_from_arrays($ftp_files_arr,$ftp_files_arr,'ftp_filename','');
- echo '<br /><br />';
- }
+ //$ftp_files_arr=array_merge($arr,ls($upload_dir,true));
+ //echo html_build_select_box_from_arrays($ftp_files_arr,$ftp_files_arr,'ftp_filename','');
+ //echo '<br /><br />';
+ //}
}
?>
</td>
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/new.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/new.php 2011-02-24 17:29:58 UTC (rev 11949)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/new.php 2011-02-24 17:29:59 UTC (rev 11950)
@@ -44,7 +44,7 @@
$title = getStringFromRequest('title');
$description = getStringFromRequest('description');
$file_url = getStringFromRequest('file_url');
- $ftp_filename = getStringFromRequest('ftp_filename');
+ //$ftp_filename = getStringFromRequest('ftp_filename');
$uploaded_data = getUploadedFile('uploaded_data');
$language_id = getIntFromRequest('language_id');
$type = getStringFromRequest('type');
@@ -55,7 +55,8 @@
exit_error($Language->getText('general','error'),$Language->getText('docman_new','no_valid_group'));
}
- if (!$title || !$description || (!$uploaded_data && !$file_url && !$ftp_filename && (!$editor && !$name ) )) {
+ //if (!$title || !$description || (!$uploaded_data && !$file_url && !$ftp_filename && (!$editor && !$name ) )) {
+ if (!$title || !$description || (!$uploaded_data && !$file_url && (!$editor && !$name ) )) {
exit_missing_param();
}
@@ -94,10 +95,12 @@
$uploaded_data_type=$uploaded_data['type'];
break;
}
+ /*
case 'ftpupload' : {
$uploaded_data_name=$upload_dir.'/'.$ftp_filename;
$data = addslashes(fread(fopen($uploaded_data_name, 'r'), filesize($uploaded_data_name)));
}
+ */
}
if (!$d->create($uploaded_data_name,$uploaded_data_type,$data,$doc_group,$title,$language_id,$description)) {
@@ -113,7 +116,7 @@
} else {
- if (getStringFromRequest('Option')) {
+ //if (getStringFromRequest('Option')) {
//option was selected, proceed to show each one
$option_selected = getStringFromRequest('option_selected');
docman_header($Language->getText('docman_new','title'),$Language->getText('docman_new','section'));
@@ -133,6 +136,15 @@
<input type="text" name="description" size="50" maxlength="255" />
</td>
</tr>';
+ echo '
+ <tr>
+ <td>
+ <strong>'. $Language->getText('docman_new','upload_file') .' :</strong>'. utils_requiredField() .'<br />
+ <input type="file" name="uploaded_data" size="30" /><br /><br />
+ <input type="hidden" name="type" value="httpupload">
+ </td>
+ </tr>';
+ /*
switch ($option_selected) {
case 'httpupload' : {
echo '
@@ -191,6 +203,8 @@
break;
}
}
+ */
+
echo '
<tr>
<td>
@@ -219,6 +233,7 @@
<input type="submit" name="submit" value="'. $Language->getText('docman_new','submit').' " />
</form>';
docman_footer(array());
+ /*
} else {
docman_header($Language->getText('docman_new','title'),$Language->getText('docman_new','section'));
?>
@@ -226,7 +241,7 @@
<?php
echo '<form name="select_opt" action="'. getStringFromServer('PHP_SELF').'?group_id='.$group_id.'" method="post">';
$vals['httpupload'] = $Language->getText('docman','httpupload');
- $vals['ftpupload'] = $Language->getText('docman','ftpupload');
+ //$vals['ftpupload'] = $Language->getText('docman','ftpupload');
$vals['pasteurl'] = $Language->getText('docman','pasteurl');
$vals['editor'] = $Language->getText('docman','editor');
echo $Language->getText('docman','select');
@@ -234,7 +249,8 @@
echo ' <input type="submit" value="'. $Language->getText('docman_new','selectsubmit') .'" name="Option">';
echo '</form>';
docman_footer(array());
- }
+ }
+ */
}
?>
More information about the evolvis-commits
mailing list