X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fnewmail%2Fnewmail_opt.php;h=eb798bfa144e8ccfabaf5f3b8269743f81519716;hb=e3812cb291b353059283c0f321a8f6151e50c976;hp=7fb1871cd1791f41c1a8ad4c071b8a1d0cda852d;hpb=70e628ef63d5e9147e1639258daffa94ee2ca315;p=squirrelmail.git
diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 7fb1871c..eb798bfa 100644
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -1,12 +1,12 @@
' . "\n";
@@ -83,7 +78,7 @@ echo html_tag( 'tr' ) .
html_tag( 'td', _("Count only messages that are RECENT").':', 'right', '', 'style="white-space: nowrap;"' ) .
html_tag( 'td', '', 'left' ) .
'' . "\n";
@@ -93,20 +88,34 @@ echo html_tag( 'tr' ) .
html_tag( 'td', _("Change title on supported browsers").':', 'right', '', 'style="white-space: nowrap;"' ) .
html_tag( 'td', '', 'left' ) .
' ('._("requires JavaScript to work").')' . "\n";
+echo 'name="media_changetitle" /> ('._("requires JavaScript to work").')' . "\n";
// Option: media_popup
echo html_tag( 'tr' ) .
html_tag( 'td', _("Show popup window on new mail").':', 'right', '', 'style="white-space: nowrap;"' ) .
html_tag( 'td', '', 'left' ) .
' ('._("requires JavaScript to work").')' . "\n";
+echo 'name="media_popup" /> ('._("requires JavaScript to work").')' . "\n";
+
+echo html_tag( 'tr' )
+ . html_tag('td',_("Width of popup window:"),'right','', 'style="white-space: nowrap;"')
+ . html_tag('td',''
+ . ' (' . _("If set to 0, reverts to default value") . ')','left')
+ . "\n";
+
+echo html_tag( 'tr' )
+ . html_tag('td',_("Height of popup window:"),'right','', 'style="white-space: nowrap;"')
+ . html_tag('td',''
+ . ' (' . _("If set to 0, reverts to default value") . ')','left')
+ . "\n";
if ($newmail_allowsound) {
// Option: media_enable
@@ -114,7 +123,7 @@ if ($newmail_allowsound) {
html_tag( 'td', _("Enable Media Playing").':', 'right', '', 'style="white-space: nowrap;"' ) .
html_tag( 'td', '', 'left' ) .
'' . "\n";
@@ -125,20 +134,20 @@ if ($newmail_allowsound) {
html_tag( 'td', '', 'left' ) .
''.
@@ -178,30 +190,29 @@ if ($newmail_allowsound) {
"'width=150,height=30,scrollbars=no');" .
'return false;' .
'" />';
- echo '
'.
- '' . _("Upload Media File:") .
- ' | '.
- ''.
- ' | '.
- '
';
-
- echo ''.
- '' . _("Uploaded Media File:") .
- ' | '.
- ($media_userfile_name!='' ? htmlspecialchars($media_userfile_name) : _("unavailable")).
- ' | '.
- '
';
-
- if ($media_userfile_name!='') {
- echo ''
- .''
- .sprintf(_("Media file %s will be removed, if you upload other media file."),basename($media_userfile_name))
- .' |
';
+ if ($newmail_uploadsounds) {
+ // upload form
+ echo html_tag('tr')
+ . html_tag('td',_("Upload Media File:"),'right','','style="white-space: nowrap;"')
+ . html_tag('td','')
+ . "\n";
+ // display currently uploaded file information
+ echo html_tag('tr')
+ . html_tag('td',_("Uploaded Media File:"),'right','','style="white-space: nowrap;"')
+ . html_tag('td',($newmail_userfile_name!='' ? htmlspecialchars($newmail_userfile_name) : _("unavailable")))
+ ."\n";
+
+ if ($newmail_userfile_name!='') {
+ echo ''
+ .''
+ .sprintf(_("Media file %s will be removed, if you upload other media file."),basename($newmail_userfile_name))
+ .' |
';
+ }
}
echo html_tag( 'tr', "\n" .
html_tag( 'td', _("Current File:"), 'right', '', 'style="white-space: nowrap;"' ) .
html_tag( 'td', '' .
+ htmlspecialchars($newmail_media) . '" name="media_default" />' .
htmlspecialchars($media_output) . '', 'left' )
) . "\n";
}