[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpwebhosting preferences.php,1.7,1.8 index.php,
|
From: |
Jason Wies <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpwebhosting preferences.php,1.7,1.8 index.php,1.34,1.35 |
|
Date: |
Tue, 18 Jun 2002 02:33:47 -0400 |
Update of /cvsroot/phpgroupware/phpwebhosting
In directory subversions:/tmp/cvs-serv32121
Modified Files:
preferences.php index.php
Log Message:
i18n - Savannah Patches #352,#353,#358, thanks gisu
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpwebhosting/preferences.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** preferences.php 10 Feb 2002 04:17:19 -0000 1.7
--- preferences.php 18 Jun 2002 06:33:44 -0000 1.8
***************
*** 25,29 ****
To add an on/off preference, just add it here. Key is internal
name, value is displayed name
*/
! $other_checkboxes = array ("viewinnewwin" => "View documents in new
window", "viewonserver" => "View documents on server (if available)",
"viewtextplain" => "Unknown MIME-type defaults to text/plain when viewing",
"dotdot" => "Show ..", "dotfiles" => "Show .files", "show_help" => "Show help",
"show_command_line" => "Show command line (EXPERIMENTAL. DANGEROUS.)");
/*
--- 25,29 ----
To add an on/off preference, just add it here. Key is internal
name, value is displayed name
*/
! $other_checkboxes = array ("viewinnewwin" => lang("View documents in
new window"), "viewonserver" => lang("View documents on server (if
available)"), "viewtextplain" => lang("Unknown MIME-type defaults to text/plain
when viewing"), "dotdot" => lang("Show .."), "dotfiles" => lang("Show .files"),
"show_help" => lang("Show help"), "show_command_line" => lang("Show command
line (EXPERIMENTAL. DANGEROUS.)"));
/*
***************
*** 31,35 ****
displayed name, value values are choices in the dropdown
*/
! $other_dropdown = array ("show_upload_boxes" => array ("Default number
of upload fields to show", "5", "10", "20", "30"));
if ($submit)
--- 31,35 ----
displayed name, value values are choices in the dropdown
*/
! $other_dropdown = array ("show_upload_boxes" => array (lang("Default
number of upload fields to show"), "5", "10", "20", "30"));
if ($submit)
***************
*** 125,129 ****
$str = html_form_input ("checkbox", $internal, NULL, NULL,
NULL, $checked, NULL, 1);
! display_item (lang ($displayed), $str);
}
--- 125,129 ----
$str = html_form_input ("checkbox", $internal, NULL, NULL,
NULL, $checked, NULL, 1);
! display_item ($displayed, $str);
}
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpwebhosting/index.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** index.php 25 Feb 2002 05:41:22 -0000 1.34
--- index.php 18 Jun 2002 06:33:44 -0000 1.35
***************
*** 100,104 ****
if ($result = $GLOBALS['phpgw']->vfs->command_line (array
('command_line' => stripslashes ($command_line))))
{
! $messages = html_text_bold ('Command sucessfully run', 1);
if ($result != 1 && strlen ($result) > 0)
{
--- 100,104 ----
if ($result = $GLOBALS['phpgw']->vfs->command_line (array
('command_line' => stripslashes ($command_line))))
{
! $messages = html_text_bold (lang('Command sucessfully run'),1);
if ($result != 1 && strlen ($result) > 0)
{
***************
*** 108,112 ****
else
{
! $messages = $GLOBALS['phpgw']->common->error_list (array
('Error running command'));
}
}
--- 108,112 ----
else
{
! $messages = $GLOBALS['phpgw']->common->error_list (array
(lang('Error running command')));
}
}
***************
*** 222,228 ****
)
{
! echo $GLOBALS['phpgw']->common->error_list (array ('You do not have
access to '.$path));
html_break (2);
! html_link ($GLOBALS['appname'].'/index.php?path='.$GLOBALS['homedir'],
'Go to your home directory');
html_page_close ();
}
--- 222,228 ----
)
{
! echo $GLOBALS['phpgw']->common->error_list (array (lang('You do not
have access to x', $path)));
html_break (2);
! html_link ($GLOBALS['appname'].'/index.php?path='.$GLOBALS['homedir'],
lang('Go to your home directory'));
html_page_close ();
}
***************
*** 248,252 ****
{
$p = $phpgw->vfs->path_parts (array ('string' =>
$GLOBALS['homedir'], 'relatives' => array (RELATIVE_NONE)));
! echo $GLOBALS['phpgw']->common->error_list (array ('Could not
create directory ' . $GLOBALS['homedir'] . ' (' . $p->real_full_path . ')'));
}
--- 248,252 ----
{
$p = $phpgw->vfs->path_parts (array ('string' =>
$GLOBALS['homedir'], 'relatives' => array (RELATIVE_NONE)));
! echo $GLOBALS['phpgw']->common->error_list (array (lang('Could
not create directory x', $GLOBALS['homedir'] . ' (' . $p->real_full_path .
')')));
}
***************
*** 262,268 ****
if (!$GLOBALS['phpgw']->vfs->file_exists (array ('string' => $path,
'relatives' => array (RELATIVE_NONE))))
{
! echo $GLOBALS['phpgw']->common->error_list (array ('Directory
'.$path.' does not exist'));
html_break (2);
! html_link
($GLOBALS['appname'].'/index.php?path='.$GLOBALS['homedir'], 'Go to your home
directory');
html_break (2);
html_link_back ();
--- 262,268 ----
if (!$GLOBALS['phpgw']->vfs->file_exists (array ('string' => $path,
'relatives' => array (RELATIVE_NONE))))
{
! echo $GLOBALS['phpgw']->common->error_list (array
(lang('Directory x does not exist', $path)));
html_break (2);
! html_link
($GLOBALS['appname'].'/index.php?path='.$GLOBALS['homedir'], lang('Go to your
home directory'));
html_break (2);
html_link_back ();
***************
*** 465,478 ****
html_table_row_begin ();
html_table_col_begin ();
! html_text_bold ('Date');
html_table_col_end ();
html_table_col_begin ();
! html_text_bold ('Version');
html_table_col_end ();
html_table_col_begin ();
! html_text_bold ('Who');
html_table_col_end ();
html_table_col_begin ();
! html_text_bold ('Operation');
html_table_col_end ();
html_table_row_end ();
--- 465,478 ----
html_table_row_begin ();
html_table_col_begin ();
! html_text_bold (lang('Date'));
html_table_col_end ();
html_table_col_begin ();
! html_text_bold (lang('Version'));
html_table_col_end ();
html_table_col_begin ();
! html_text_bold (lang('Who'));
html_table_col_end ();
html_table_col_begin ();
! html_text_bold (lang('Operation'));
html_table_col_end ();
html_table_row_end ();
***************
*** 500,504 ****
else
{
! html_text_bold ('No version history for this file/directory');
}
--- 500,504 ----
else
{
! html_text_bold (lang('No version history for this
file/directory'));
}
***************
*** 509,513 ****
if ($badchar = bad_chars ($createfile, True, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array (html_encode
('Filenames cannot contain "'.$badchar.'"', 1)));
html_break (2);
html_link_back ();
--- 509,513 ----
if ($badchar = bad_chars ($createfile, True, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array (html_encode
(lang('File names cannot contain "x"',$badchar), 1)));
html_break (2);
html_link_back ();
***************
*** 521,525 ****
)
{
! echo $GLOBALS['phpgw']->common->error_list (array ('File
'.$createfile.' already exists. Please edit it or delete it first.'));
html_break (2);
html_link_back ();
--- 521,525 ----
)
{
! echo $GLOBALS['phpgw']->common->error_list (array (lang('File x
already exists. Please edit it or delete it first.', $createfile)));
html_break (2);
html_link_back ();
***************
*** 539,543 ****
else
{
! echo $GLOBALS['phpgw']->common->error_list (array ('File
'.$createfile.' could not be created.'));
}
}
--- 539,543 ----
else
{
! echo $GLOBALS['phpgw']->common->error_list (array (lang('File x
could not be created.', $createfile)));
}
}
***************
*** 573,577 ****
###
! html_page_begin ('Users :: '.$GLOBALS['userinfo']['username']);
html_page_body_begin (HTML_PAGE_BODY_COLOR);
--- 573,577 ----
###
! html_page_begin (lang('Users').' :: '.$GLOBALS['userinfo']['username']);
html_page_body_begin (HTML_PAGE_BODY_COLOR);
***************
*** 620,624 ****
if ($path != '/')
{
! html_link
($GLOBALS['appname'].'/index.php?path='.$lesspath, html_image
('images/folder-up.gif', 'Up', 'left', 0, NULL, 1));
html_help_link ('up');
}
--- 620,624 ----
if ($path != '/')
{
! html_link
($GLOBALS['appname'].'/index.php?path='.$lesspath, html_image
('images/folder-up.gif', lang('Up'), 'left', 0, NULL, 1));
html_help_link ('up');
}
***************
*** 631,644 ****
if ($path == $GLOBALS['homedir'])
{
! html_image ('images/folder-home.gif', 'Folder',
'center');
}
else
{
! html_image ('images/folder.gif', 'Folder',
'center');
}
}
else
{
! html_image ('images/folder-home.gif', 'Home');
}
--- 631,644 ----
if ($path == $GLOBALS['homedir'])
{
! html_image ('images/folder-home.gif',
lang('Folder'), 'center');
}
else
{
! html_image ('images/folder.gif',
lang('Folder'), 'center');
}
}
else
{
! html_image ('images/folder-home.gif', lang('Home'));
}
***************
*** 652,656 ****
if ($path != $GLOBALS['homedir'])
{
! html_link
($GLOBALS['appname'].'/index.php?path='.$GLOBALS['homedir'], html_image
('images/folder-home.gif', 'Home', 'right', 0, NULL, 1));
html_help_link ('home');
}
--- 652,656 ----
if ($path != $GLOBALS['homedir'])
{
! html_link
($GLOBALS['appname'].'/index.php?path='.$GLOBALS['homedir'], html_image
('images/folder-home.gif', lang('Home'), 'right', 0, NULL, 1));
html_help_link ('home');
}
***************
*** 669,673 ****
html_table_col_begin ();
! html_text ('Sort by:' . html_nbsp (1, 1), NULL, NULL, 1);
html_help_link ('sort_by');
html_table_col_end ();
--- 669,673 ----
html_table_col_begin ();
! html_text (lang('Sort by:') . html_nbsp (1, 1), NULL, NULL, 0);
html_help_link ('sort_by');
html_table_col_end ();
***************
*** 679,683 ****
{
html_table_col_begin ();
! html_link
($GLOBALS['appname'].'/index.php?path='.$path.'&sortby='.$internal,
html_text_bold ($displayed, 1, 1));
html_help_link (strtolower (ereg_replace (' ',
'_', $displayed)));
html_table_col_end ();
--- 679,683 ----
{
html_table_col_begin ();
! html_link
($GLOBALS['appname'].'/index.php?path='.$path.'&sortby='.$internal,
html_text_bold ($displayed, 1, 0));
html_help_link (strtolower (ereg_replace (' ',
'_', $displayed)));
html_table_col_end ();
***************
*** 697,701 ****
/* We can assume the next column is the name */
html_table_col_begin ();
! html_image ('images/folder.gif', 'Folder');
html_link
($GLOBALS['appname'].'/index.php?path='.$lesspath, '..');
html_table_col_end ();
--- 697,701 ----
/* We can assume the next column is the name */
html_table_col_begin ();
! html_image ('images/folder.gif', lang('Folder'));
html_link
($GLOBALS['appname'].'/index.php?path='.$lesspath, '..');
html_table_col_end ();
***************
*** 704,708 ****
{
html_table_col_begin ();
! html_text ('Directory');
html_table_col_end ();
}
--- 704,708 ----
{
html_table_col_begin ();
! html_text (lang('Directory'));
html_table_col_end ();
}
***************
*** 790,794 ****
if ($files['mime_type'] == 'Directory')
{
! html_image
('images/folder.gif', 'Folder');
}
html_form_input ('text', 'renamefiles['
. base64_encode ($files['name']) . ']', $files['name'], 255);
--- 790,794 ----
if ($files['mime_type'] == 'Directory')
{
! html_image
('images/folder.gif', lang('Folder'));
}
html_form_input ('text', 'renamefiles['
. base64_encode ($files['name']) . ']', $files['name'], 255);
***************
*** 798,802 ****
if ($files['mime_type'] == 'Directory')
{
! html_image
('images/folder.gif', 'Folder');
html_link
($GLOBALS['appname'].'/index.php?path='.$path.$dispsep.$files['name'],
$files['name']);
}
--- 798,802 ----
if ($files['mime_type'] == 'Directory')
{
! html_image
('images/folder.gif', lang('Folder'));
html_link
($GLOBALS['appname'].'/index.php?path='.$path.$dispsep.$files['name'],
$files['name']);
}
***************
*** 971,975 ****
{
html_table_col_begin ();
! html_image ('images/locked.gif',
'Locked');
html_table_col_end ();
}
--- 971,975 ----
{
html_table_col_begin ();
! html_image ('images/locked.gif',
lang('Locked'));
html_table_col_end ();
}
***************
*** 1000,1004 ****
if (!$rename && !$edit_comments)
{
! html_form_input ('submit', 'edit', 'Edit');
html_help_link ('edit');
html_nbsp (3);
--- 1000,1004 ----
if (!$rename && !$edit_comments)
{
! html_form_input ('submit', 'edit',
lang('Edit'));
html_help_link ('edit');
html_nbsp (3);
***************
*** 1007,1011 ****
if (!$edit_comments)
{
! html_form_input ('submit', 'rename', 'Rename');
html_help_link ('rename');
html_nbsp (3);
--- 1007,1011 ----
if (!$edit_comments)
{
! html_form_input ('submit', 'rename',
lang('Rename'));
html_help_link ('rename');
html_nbsp (3);
***************
*** 1014,1018 ****
if (!$rename && !$edit_comments)
{
! html_form_input ('submit', 'delete', 'Delete');
html_help_link ('delete');
html_nbsp (3);
--- 1014,1018 ----
if (!$rename && !$edit_comments)
{
! html_form_input ('submit', 'delete',
lang('Delete'));
html_help_link ('delete');
html_nbsp (3);
***************
*** 1021,1025 ****
if (!$rename)
{
! html_form_input ('submit', 'edit_comments',
'Edit comments');
html_help_link ('edit_comments');
}
--- 1021,1025 ----
if (!$rename)
{
! html_form_input ('submit', 'edit_comments',
lang('Edit comments'));
html_help_link ('edit_comments');
}
***************
*** 1038,1050 ****
html_break (1);
! html_form_input ('submit', 'go', 'Go to:');
html_help_link ('go_to');
if ($path != '/' && $path != $GLOBALS['fakebase'])
{
! html_form_input ('submit', 'copy', 'Copy to:');
html_help_link ('copy_to');
! html_form_input ('submit', 'move', 'Move to:');
html_help_link ('move_to');
}
--- 1038,1050 ----
html_break (1);
! html_form_input ('submit', 'go', lang('Go to:'));
html_help_link ('go_to');
if ($path != '/' && $path != $GLOBALS['fakebase'])
{
! html_form_input ('submit', 'copy', lang('Copy to:'));
html_help_link ('copy_to');
! html_form_input ('submit', 'move', lang('Move to:'));
html_help_link ('move_to');
}
***************
*** 1145,1159 ****
html_break (1);
! html_form_input ('submit', 'download', 'Download');
html_help_link ('download');
html_nbsp (3);
html_form_input ('text', 'createdir', NULL, 255, 15);
! html_form_input ('submit', 'newdir', 'Create Folder');
html_help_link ('create_folder');
}
html_break (1);
! html_form_input ('submit', 'update', 'Update');
html_help_link ('update');
--- 1145,1159 ----
html_break (1);
! html_form_input ('submit', 'download',
lang('Download'));
html_help_link ('download');
html_nbsp (3);
html_form_input ('text', 'createdir', NULL, 255, 15);
! html_form_input ('submit', 'newdir', lang('Create
Folder'));
html_help_link ('create_folder');
}
html_break (1);
! html_form_input ('submit', 'update', lang('Update'));
html_help_link ('update');
***************
*** 1162,1166 ****
html_nbsp (3);
html_form_input ('text', 'createfile', NULL, 255, 15);
! html_form_input ('submit', 'newfile', 'Create File');
html_help_link ('create_file');
}
--- 1162,1166 ----
html_nbsp (3);
html_form_input ('text', 'createfile', NULL, 255, 15);
! html_form_input ('submit', 'newfile', lang('Create
File'));
html_help_link ('create_file');
}
***************
*** 1173,1177 ****
html_break (1);
! html_form_input ('submit', 'execute', 'Execute');
html_help_link ('execute');
}
--- 1173,1177 ----
html_break (1);
! html_form_input ('submit', 'execute', lang('Execute'));
html_help_link ('execute');
}
***************
*** 1181,1189 ****
html_help_link ('file_stats');
html_break (1);
! html_text_bold ('Files: ');
html_text ($numoffiles);
html_nbsp (3);
! html_text_bold ('Used space: ');
html_text (borkb ($usedspace, NULL, 1));
html_nbsp (3);
--- 1181,1189 ----
html_help_link ('file_stats');
html_break (1);
! html_text_bold (lang('Files').': ');
html_text ($numoffiles);
html_nbsp (3);
! html_text_bold (lang('Used space').': ');
html_text (borkb ($usedspace, NULL, 1));
html_nbsp (3);
***************
*** 1191,1195 ****
if ($path == $GLOBALS['homedir'] || $path ==
$GLOBALS['fakebase'])
{
! html_text_bold ('Unused space: ');
html_text (borkb ($GLOBALS['userinfo']['hdspace'] -
$usedspace, NULL, 1));
--- 1191,1195 ----
if ($path == $GLOBALS['homedir'] || $path ==
$GLOBALS['fakebase'])
{
! html_text_bold (lang('Unused space').': ');
html_text (borkb ($GLOBALS['userinfo']['hdspace'] -
$usedspace, NULL, 1));
***************
*** 1203,1207 ****
html_break (2);
! html_text_bold ('Total Files: ');
html_text ($i);
}
--- 1203,1207 ----
html_break (2);
! html_text_bold (lang('Total Files').': ');
html_text ($i);
}
***************
*** 1218,1226 ****
html_table_row_begin ('center');
html_table_col_begin ();
! html_text_bold ('File');
html_help_link ('upload_file');
html_table_col_end ();
html_table_col_begin ();
! html_text_bold ('Comment');
html_help_link ('upload_comment');
html_table_col_end ();
--- 1218,1226 ----
html_table_row_begin ('center');
html_table_col_begin ();
! html_text_bold (lang('File'));
html_help_link ('upload_file');
html_table_col_end ();
html_table_col_begin ();
! html_text_bold (lang('Comment'));
html_help_link ('upload_comment');
html_table_col_end ();
***************
*** 1237,1244 ****
html_table_row_end ();
html_table_end ();
! html_form_input ('submit', 'upload_files', 'Upload
files');
html_help_link ('upload_files');
html_break (2);
! html_text ('Show' . html_nbsp (1, True));
html_link
($GLOBALS['appname'].'/index.php?show_upload_boxes=5', '5');
html_nbsp ();
--- 1237,1244 ----
html_table_row_end ();
html_table_end ();
! html_form_input ('submit', 'upload_files', lang('Upload
files'));
html_help_link ('upload_files');
html_break (2);
! html_text (lang('Show') . html_nbsp (1, True));
html_link
($GLOBALS['appname'].'/index.php?show_upload_boxes=5', '5');
html_nbsp ();
***************
*** 1249,1253 ****
html_link
($GLOBALS['appname'].'/index.php?show_upload_boxes=50', '50');
html_nbsp ();
! html_text ('upload fields');
html_nbsp ();
html_help_link ('show_upload_fields');
--- 1249,1253 ----
html_link
($GLOBALS['appname'].'/index.php?show_upload_boxes=50', '50');
html_nbsp ();
! html_text (lang('upload fields'));
html_nbsp ();
html_help_link ('show_upload_fields');
***************
*** 1282,1286 ****
html_break (1);
! html_text_bold ('Preview of '.$path.'/'.$edit_file);
html_break (2);
--- 1282,1286 ----
html_break (1);
! html_text_bold (lang('Preview of x', $path.'/'.$edit_file));
html_break (2);
***************
*** 1304,1308 ****
)
{
! html_text_bold ('Saved '.$path.'/'.$edit_file);
html_break (2);
html_link_back ();
--- 1304,1308 ----
)
{
! html_text_bold (lang('Saved x', $path.'/'.$edit_file));
html_break (2);
html_link_back ();
***************
*** 1310,1314 ****
else
{
! html_text_error ('Could not save
'.$path.'/'.$edit_file);
html_break (2);
html_link_back ();
--- 1310,1314 ----
else
{
! html_text_error (lang('Could not save x',
$path.'/'.$edit_file));
html_break (2);
html_link_back ();
***************
*** 1334,1343 ****
)
{
! html_text_bold ('Saved
'.$path.'/'.$fileman[$j]);
html_break (1);
}
else
{
! html_text_error ('Could not save
'.$path.'/'.$fileman[$j]);
html_break (1);
}
--- 1334,1343 ----
)
{
! html_text_bold (lang('Saved x',
$path.'/'.$fileman[$j]));
html_break (1);
}
else
{
! html_text_error (lang('Could not save x',
$path.'/'.$fileman[$j]));
html_break (1);
}
***************
*** 1399,1407 ****
html_table_col_end ();
html_table_col_begin ('center');
! html_form_input ('submit', 'edit_preview', 'Preview ' .
html_encode ($fileman[$j], 1));
html_break (1);
! html_form_input ('submit', 'edit_save', 'Save ' .
html_encode ($fileman[$j], 1));
// html_break (1);
! // html_form_input ('submit', 'edit_save_all', 'Save all');
html_table_col_end ();
html_table_row_end ();
--- 1399,1407 ----
html_table_col_end ();
html_table_col_begin ('center');
! html_form_input ('submit', 'edit_preview',
lang('Preview x', html_encode ($fileman[$j], 1)));
html_break (1);
! html_form_input ('submit', 'edit_save', lang('Save x',
html_encode ($fileman[$j], 1)));
// html_break (1);
! // html_form_input ('submit', 'edit_save_all', lang('Save
all'));
html_table_col_end ();
html_table_row_end ();
***************
*** 1423,1427 ****
if ($badchar = bad_chars ($upload_file_name[$i], True, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array
(html_encode ('Filenames cannot contain "'.$badchar.'"', 1)));
continue;
--- 1423,1427 ----
if ($badchar = bad_chars ($upload_file_name[$i], True, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array
(html_encode (lang('File names cannot contain "x"', $badchar), 1)));
continue;
***************
*** 1446,1450 ****
if ($fileinfo['mime_type'] == 'Directory')
{
! echo $GLOBALS['phpgw']->common->error_list
(array ('Cannot replace '.$fileinfo['name'].' because it is a directory'));
continue;
}
--- 1446,1450 ----
if ($fileinfo['mime_type'] == 'Directory')
{
! echo $GLOBALS['phpgw']->common->error_list
(array (lang('Cannot replace x because it is a directory', $fileinfo['name'])));
continue;
}
***************
*** 1477,1481 ****
);
! html_text_summary ('Replaced
'.$disppath.'/'.$upload_file_name[$i], $upload_file_size[$i]);
}
else
--- 1477,1481 ----
);
! html_text_summary (lang('Replaced x',
$disppath.'/'.$upload_file_name[$i]), $upload_file_size[$i]);
}
else
***************
*** 1498,1502 ****
);
! html_text_summary ('Created
'.$disppath.'/'.$upload_file_name[$i], $upload_file_size[$i]);
}
}
--- 1498,1502 ----
);
! html_text_summary (lang('Created x',
$disppath.'/'.$upload_file_name[$i]), $upload_file_size[$i]);
}
}
***************
*** 1519,1523 ****
);
! html_text_summary ('Created
'.$disppath.'/'.$upload_file_name[$i], $file_size[$i]);
}
}
--- 1519,1523 ----
);
! html_text_summary (lang('Created x',
$disppath.'/'.$upload_file_name[$i]), $file_size[$i]);
}
}
***************
*** 1537,1541 ****
if ($badchar = bad_chars ($comment_files[$file], False, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array
(html_text_italic ($file, 1) . html_encode (': Comments cannot contain
"'.$badchar.'"', 1)));
continue;
}
--- 1537,1541 ----
if ($badchar = bad_chars ($comment_files[$file], False, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array
(html_text_italic ($file, 1) . html_encode (': ' . lang('Comments cannot
contain "x"', $badchar), 1)));
continue;
}
***************
*** 1550,1554 ****
);
! html_text_summary ('Updated comment for '.$path.'/'.$file);
}
--- 1550,1554 ----
);
! html_text_summary (lang('Updated comment for x',
$path.'/'.$file));
}
***************
*** 1567,1571 ****
if ($badchar = bad_chars ($to, True, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array
(html_encode ('File names cannot contain "'.$badchar.'"', 1)));
continue;
}
--- 1567,1571 ----
if ($badchar = bad_chars ($to, True, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array
(html_encode (lang('File names cannot contain "x"', $badchar), 1)));
continue;
}
***************
*** 1573,1577 ****
if (ereg ("/", $to) || ereg ("\\\\", $to))
{
! echo $GLOBALS['phpgw']->common->error_list (array
("File names cannot contain \\ or /"));
}
elseif (!$GLOBALS['phpgw']->vfs->mv (array (
--- 1573,1577 ----
if (ereg ("/", $to) || ereg ("\\\\", $to))
{
! echo $GLOBALS['phpgw']->common->error_list (array
(lang("File names cannot contain \\ or /")));
}
elseif (!$GLOBALS['phpgw']->vfs->mv (array (
***************
*** 1581,1589 ****
)
{
! echo $GLOBALS['phpgw']->common->error_list (array
('Could not rename '.$disppath.'/'.$from.' to '.$disppath.'/'.$to));
}
else
{
! html_text_summary ('Renamed '.$disppath.'/'.$from.' to
'.$disppath.'/'.$to);
}
}
--- 1581,1589 ----
)
{
! echo $GLOBALS['phpgw']->common->error_list (array
(lang('Could not rename x to x', $disppath.'/'.$from, $disppath.'/'.$to)));
}
else
{
! html_text_summary (lang('Renamed x to x',
$disppath.'/'.$from, $disppath.'/'.$to));
}
}
***************
*** 1609,1617 ****
{
$moved++;
! html_text_summary ('Moved '.$disppath.'/'.$file.' to
'.$todir.'/'.$file);
}
else
{
! echo $GLOBALS['phpgw']->common->error_list (array
('Could not move '.$disppath.'/'.$file.' to '.$todir.'/'.$file));
}
}
--- 1609,1617 ----
{
$moved++;
! html_text_summary (lang('Moved x to x',
$disppath.'/'.$file, $todir.'/'.$file));
}
else
{
! echo $GLOBALS['phpgw']->common->error_list (array
(lang('Could not move x to x', $disppath.'/'.$file, $todir.'/'.$file)));
}
}
***************
*** 1620,1624 ****
{
html_break (2);
! html_link ($GLOBALS['appname'].'/index.php?path='.$todir, 'Go
to '.$todir);
}
--- 1620,1624 ----
{
html_break (2);
! html_link ($GLOBALS['appname'].'/index.php?path='.$todir,
lang('Go to x', $todir));
}
***************
*** 1643,1651 ****
{
$copied++;
! html_text_summary ('Copied '.$disppath.'/'.$file.' to
'.$todir.'/'.$file);
}
else
{
! echo $GLOBALS['phpgw']->common->error_list (array
('Could not copy '.$disppath.'/'.$file.' to '.$todir.'/'.$file));
}
}
--- 1643,1651 ----
{
$copied++;
! html_text_summary (lang('Copied x to x',
$disppath.'/'.$file, $todir.'/'.$file));
}
else
{
! echo $GLOBALS['phpgw']->common->error_list (array
(lang('Could not copy x to x', $disppath.'/'.$file, $todir.'/'.$file)));
}
}
***************
*** 1654,1658 ****
{
html_break (2);
! html_link ($GLOBALS['appname'].'/index.php?path='.$todir, 'Go
to '.$todir);
}
--- 1654,1658 ----
{
html_break (2);
! html_link ($GLOBALS['appname'].'/index.php?path='.$todir,
lang('Go to x', $todir));
}
***************
*** 1673,1681 ****
if ($GLOBALS['phpgw']->vfs->delete (array ('string' =>
$fileman[$i])))
{
! html_text_summary ('Deleted
'.$disppath.'/'.$fileman[$i], $fileinfo['size']);
}
else
{
! $GLOBALS['phpgw']->common->error_list (array
('Could not delete '.$disppath.'/'.$fileman[$i]));
}
}
--- 1673,1681 ----
if ($GLOBALS['phpgw']->vfs->delete (array ('string' =>
$fileman[$i])))
{
! html_text_summary (lang('Deleted x',
$disppath.'/'.$fileman[$i]), $fileinfo['size']);
}
else
{
! $GLOBALS['phpgw']->common->error_list (array
(lang('Could not delete x', $disppath.'/'.$fileman[$i])));
}
}
***************
*** 1690,1694 ****
if ($badchar = bad_chars ($createdir, True, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array (html_encode
('Directory names cannot contain "'.$badchar.'"', 1)));
html_break (2);
html_link_back ();
--- 1690,1694 ----
if ($badchar = bad_chars ($createdir, True, True))
{
! echo $GLOBALS['phpgw']->common->error_list (array (html_encode
(lang('Directory names cannot contain "x"', $badchar), 1)));
html_break (2);
html_link_back ();
***************
*** 1698,1702 ****
if ($createdir[strlen($createdir)-1] == ' ' || $createdir[0] == ' ')
{
! echo $GLOBALS['phpgw']->common->error_list (array ('Cannot
create directory because it begins or ends in a space'));
html_break (2);
html_link_back ();
--- 1698,1702 ----
if ($createdir[strlen($createdir)-1] == ' ' || $createdir[0] == ' ')
{
! echo $GLOBALS['phpgw']->common->error_list (array (lang('Cannot
create directory because it begins or ends in a space')));
html_break (2);
html_link_back ();
***************
*** 1718,1722 ****
if ($fileinfo['mime_type'] != 'Directory')
{
! echo $GLOBALS['phpgw']->common->error_list (array
($fileinfo['name'].' already exists as a file'));
html_break (2);
html_link_back ();
--- 1718,1722 ----
if ($fileinfo['mime_type'] != 'Directory')
{
! echo $GLOBALS['phpgw']->common->error_list (array
(lang('x already exists as a file', $fileinfo['name'])));
html_break (2);
html_link_back ();
***************
*** 1725,1729 ****
else
{
! echo $GLOBALS['phpgw']->common->error_list (array
('Directory '.$fileinfo['name'].' already exists'));
html_break (2);
html_link_back ();
--- 1725,1729 ----
else
{
! echo $GLOBALS['phpgw']->common->error_list (array
(lang('Directory x already exists', $fileinfo['name'])));
html_break (2);
html_link_back ();
***************
*** 1735,1745 ****
if ($GLOBALS['phpgw']->vfs->mkdir (array ('string' =>
$createdir)))
{
! html_text_summary ('Created directory
'.$disppath.'/'.$createdir);
html_break (2);
! html_link
($GLOBALS['appname'].'/index.php?path='.$disppath.'/'.$createdir, 'Go to
'.$disppath.'/'.$createdir);
}
else
{
! echo $GLOBALS['phpgw']->common->error_list (array
('Could not create '.$disppath.'/'.$createdir));
}
}
--- 1735,1745 ----
if ($GLOBALS['phpgw']->vfs->mkdir (array ('string' =>
$createdir)))
{
! html_text_summary (lang('Created directory x',
$disppath.'/'.$createdir));
html_break (2);
! html_link
($GLOBALS['appname'].'/index.php?path='.$disppath.'/'.$createdir, lang('Go to
x', $disppath.'/'.$createdir));
}
else
{
! echo $GLOBALS['phpgw']->common->error_list (array
(lang('Could not create x', $disppath.'/'.$createdir)));
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpwebhosting preferences.php,1.7,1.8 index.php,1.34,1.35,
Jason Wies <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpwebhosting/templates/default preference_colspan.tpl,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: phpwebhosting/setup phpgw_pt.lang,1.1,1.2 phpgw_en.lang,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: phpwebhosting/templates/default preference_colspan.tpl,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: phpwebhosting/setup phpgw_pt.lang,1.1,1.2 phpgw_en.lang,1.1,1.2
- Index(es):