Minor cleanups and changing the links for downloading/viewing attachments

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8123 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/doc/plugin.txt b/doc/plugin.txt
index 2560b3088e0aa4b3f92e302d6961c1b447712b5f..b677a02186f3c9f71bdc938d414c06f07f9f8054 100644 (file)
--- a/doc/plugin.txt
+++ b/doc/plugin.txt
@@ -471,7 +471,10 @@ This is a breakdown of the data passed in the array to the hook that is called:
 To set up links for actions, you assign them like this:
 
   $Args[1]['<plugin_name>']['href'] = 'URL to link to';
-  $Args[1]['<plugin_name>']['text'] = 'What to display';
+  $Args[1]['<plugin_name>']['text'] = _("What to display");
+
+Note: _("What to display") is explained in the section about
+internationalization.
 
 It's also possible to specify a hook as "attachment type0/*",
 for example "attachment text/*". This hook will be executed whenever there's
@@ -495,7 +498,7 @@ display a custom link:
       $Args[1]['demo']['href'] = SM_PATH . 'plugins/demo/zip_handler.php?'
          . 'passed_id=' . $Args[3] . '&mailbox=' . $Args[4]
          . '&passed_ent_id=' . $Args[5];
-      $Args[1]['demo']['text'] = 'show zip contents';
+      $Args[1]['demo']['text'] = _("Show zip contents");
    }
 
 The file plugins/demo/zip_handler.php can now do whatever it needs with the

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 65bfba0d8615ebdb85da8a77a62bf3d8a56695ca..678a0f38713d28bdc8de687c3b2a30ee6ca8d545 100644 (file)
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -13,7 +13,7 @@
  */
 
 /**
- * Needs documentation
+ * FIXME Needs phpDocumentator style documentation
  */
 require_once(SM_PATH . 'functions/global.php');
 
@@ -56,7 +56,6 @@ if (isset($attachment_common_types)) {
 }
 
 /* Register text-type attachments */
-//register_attachment_common('message/rfc822', 'link_text');
 register_attachment_common('message/rfc822', 'link_message');
 register_attachment_common('text/plain',     'link_text');
 register_attachment_common('text/richtext',  'link_text');
@@ -87,30 +86,26 @@ function register_attachment_common($type, $func) {
 }
 
 
-function attachment_common_link_text(&$Args)
-{
-    /* If there is a text attachment, we would like to create a 'view' button
+function attachment_common_link_text(&$Args) {
+    /* If there is a text attachment, we would like to create a "View" button
        that links to the text attachment viewer.
 
        $Args[1] = the array of actions
 
-       Use our plugin name for adding an action
-       $Args[1]['attachment_common'] = array for href and text
+       Use the name of this file for adding an action
+       $Args[1]['attachment_common'] = Array for href and text
 
        $Args[1]['attachment_common']['text'] = What is displayed
-       $Args[1]['attachment_common']['href'] = Where it links to
-
-       This sets the 'href' of this plugin for a new link. */
+       $Args[1]['attachment_common']['href'] = Where it links to */
     sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
 
     $Args[1]['attachment_common']['href'] = SM_PATH . 'src/view_text.php?'. $QUERY_STRING;
     $Args[1]['attachment_common']['href'] =
           set_url_var($Args[1]['attachment_common']['href'],
-         'ent_id',$Args[5]);
+          'ent_id',$Args[5]);
 
-    /* The link that we created needs a name.  "view" will be displayed for
-       all text attachments handled by this plugin. */
-    $Args[1]['attachment_common']['text'] = _("view");
+    /* The link that we created needs a name. */
+    $Args[1]['attachment_common']['text'] = _("View");
 
     /* Each attachment has a filename on the left, which is a link.
        Where that link points to can be changed.  Just in case the link above
@@ -123,21 +118,18 @@ function attachment_common_link_text(&$Args)
     $Args[6] = $Args[1]['attachment_common']['href'];
 }
 
-function attachment_common_link_message(&$Args)
-{
+function attachment_common_link_message(&$Args) {
     $Args[1]['attachment_common']['href'] = SM_PATH . 'src/read_body.php?startMessage=' .
         $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
         '&passed_ent_id=' . $Args[5] . '&override_type0=message&override_type1=rfc822';
-    /* The link that we created needs a name.  "view" will be displayed for
-       all text attachments handled by this plugin. */
-    $Args[1]['attachment_common']['text'] = _("view");
+
+    $Args[1]['attachment_common']['text'] = _("View");
 
     $Args[6] = $Args[1]['attachment_common']['href'];
 }
 
 
-function attachment_common_link_html(&$Args)
-{
+function attachment_common_link_html(&$Args) {
     sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
 
     $Args[1]['attachment_common']['href'] = SM_PATH . 'src/view_text.php?'. $QUERY_STRING.
@@ -145,15 +137,14 @@ function attachment_common_link_html(&$Args)
        '&override_type0=text&override_type1=html';
     $Args[1]['attachment_common']['href'] =
           set_url_var($Args[1]['attachment_common']['href'],
-         'ent_id',$Args[5]);
+          'ent_id',$Args[5]);
 
-    $Args[1]['attachment_common']['text'] = _("view");
+    $Args[1]['attachment_common']['text'] = _("View");
 
     $Args[6] = $Args[1]['attachment_common']['href'];
 }
 
-function attachment_common_link_image(&$Args)
-{
+function attachment_common_link_image(&$Args) {
     global $attachment_common_show_images, $attachment_common_show_images_list;
 
     sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
@@ -167,23 +158,21 @@ function attachment_common_link_image(&$Args)
     $Args[1]['attachment_common']['href'] = SM_PATH . 'src/image.php?'. $QUERY_STRING;
     $Args[1]['attachment_common']['href'] =
           set_url_var($Args[1]['attachment_common']['href'],
-         'ent_id',$Args[5]);
+          'ent_id',$Args[5]);
 
-    $Args[1]['attachment_common']['text'] = _("view");
+    $Args[1]['attachment_common']['text'] = _("View");
 
     $Args[6] = $Args[1]['attachment_common']['href'];
-
 }
 
 
-function attachment_common_link_vcard(&$Args)
-{
+function attachment_common_link_vcard(&$Args) {
     sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
 
     $Args[1]['attachment_common']['href'] = SM_PATH . 'src/vcard.php?'. $QUERY_STRING;
     $Args[1]['attachment_common']['href'] =
           set_url_var($Args[1]['attachment_common']['href'],
-         'ent_id',$Args[5]);
+          'ent_id',$Args[5]);
 
     $Args[1]['attachment_common']['text'] = _("Business Card");
 
@@ -191,8 +180,7 @@ function attachment_common_link_vcard(&$Args)
 }
 
 
-function attachment_common_octet_stream(&$Args)
-{
+function attachment_common_octet_stream(&$Args) {
     global $FileExtensionToMimeType;
 
     do_hook('attachment_common-load_mime_types');

diff --git a/functions/mime.php b/functions/mime.php
index 5183242bd49f3f271f808b011d6b7a3940a7376d..961e7d990394dc03e47112a66c02f6ac0082d6b2 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -438,7 +438,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
         $type0 = strtolower($header->type0);
         $type1 = strtolower($header->type1);
         $name = '';
-        $links['download link']['text'] = _("download");
+        $links['download link']['text'] = _("Download");
         $links['download link']['href'] = SM_PATH .
                 "src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&ent_id=$ent";
         $ImageURL = '';
@@ -506,6 +506,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
         if ($where && $what) {
            $defaultlink .= '&where='. urlencode($where).'&what='.urlencode($what);
         }
+
         /* This executes the attachment hook with a specific MIME-type.
          * If that doesn't have results, it tries if there's a rule
          * for a more generic type.

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index f9a5a9fa695fb149e8e5c8ec7811a5b457e1b7f6..c0790e9ec75b50e45f9a2d3e6c8547fab9c66530 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-09-28 08:40+0200\n"
+"POT-Creation-Date: 2004-10-03 03:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1058,7 +1058,7 @@ msgstr ""
 msgid "Click here to change the sorting of the address list"
 msgstr ""
 
-msgid "view"
+msgid "View"
 msgstr ""
 
 msgid "Business Card"
@@ -1442,7 +1442,7 @@ msgstr ""
 msgid "View Unsafe Images"
 msgstr ""
 
-msgid "download"
+msgid "Download"
 msgstr ""
 
 msgid "sec_remove_eng.png"
@@ -2851,7 +2851,8 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
-msgid " not found."
+#, c-format
+msgid "%s is not found."
 msgstr ""
 
 msgid "Today's Fortune"