Changeset 1560

Timestamp:

09/09/06 14:07:06 (2 years ago)

Author:

mbonetti

Message:

Adapted for new l10 method

Location:

trunk/gregarius

Files:

• admin/channels.php (modified) (4 diffs)
• admin/config.php (modified) (3 diffs)
• admin/folders.php (modified) (2 diffs)
• admin/opml.php (modified) (1 diff)
• admin/plugins.php (modified) (2 diffs)
• admin/themes.php (modified) (2 diffs)
• feed.php (modified) (9 diffs)
• index.php (modified) (2 diffs)
• plugins/markallread.php (modified) (8 diffs)

trunk/gregarius/admin/channels.php

@@ -48 +48 @@
     echo "<label for=\"channel_tags\">" . LBL_TAG_FOLDERS . ":</label>\n";
     echo "<input type=\"text\" name=\"channel_tags\" id=\"channel_tags\" />\n";
-    echo "<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"LBL_ADMIN_ADD\" />\n";
+    echo "<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_ADD\" />\n";
     echo "<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_ADD ."\" /></p>\n";
     echo "<p style=\"font-size:small\">".LBL_ADMIN_ADD_CHANNEL_EXPL."</p>";
@@ -250 +250 @@
 
     case LBL_ADMIN_ADD:
-    case 'LBL_ADMIN_ADD':
+    case 'ACT_ADMIN_ADD':
     case 'Add':
 
@@ -366 +366 @@
                         echo "<p><input type=\"hidden\" name=\"add_channel_to_folder\" value=\"$fid\" />\n"
                         ."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\" />\n"
-                        ."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"LBL_ADMIN_ADD\" />\n"
+                        ."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"ACT_ADMIN_ADD\" />\n"
                         ."<input type=\"submit\" class=\"indent\" name=\"action\" value=\"". LBL_ADMIN_ADD ."\" />\n"
                         ."</p>\n</form>\n\n";
@@ -441 +441 @@
 
     case LBL_ADMIN_IMPORT:
-    case 'LBL_ADMIN_IMPORT':
+    case 'ACT_ADMIN_IMPORT':
 
 

trunk/gregarius/admin/config.php

@@ -230 +230 @@
         echo (isset($preview)?"<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_PREVIEW_CHANGES ."\""
       .($onclickaction?" onclick=\"$onclickaction\"":"") ." />\n":"");
-        echo "<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"LBL_ADMIN_SUBMIT_CHANGES\" />";
+        echo "<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"ACT_ADMIN_SUBMIT_CHANGES\" />";
 
         echo "<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_SUBMIT_CHANGES ."\""
@@ -239 +239 @@
         echo "<form style=\"display:inline\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
         ."<p style=\"display:inline\">\n<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"". CST_ADMIN_DOMAIN_CONFIG ."\"/>\n"
-        ."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"LBL_ADMIN_SUBMIT_CANCEL\" />"
+        ."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"ACT_ADMIN_SUBMIT_CANCEL\" />"
         ."<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_CANCEL ."\"/></p></form>\n"
         ."\n\n</div>\n";
@@ -247 +247 @@
 
     case LBL_ADMIN_PREVIEW_CHANGES:
-    case 'LBL_ADMIN_PREVIEW_CHANGES':
+    case 'ACT_ADMIN_PREVIEW_CHANGES':
         rss_error('fixme: preview not yet implemented', RSS_ERROR_ERROR,true);
         break;
 
     case LBL_ADMIN_SUBMIT_CHANGES:
-    case 'LBL_ADMIN_SUBMIT_CHANGES':
+    case 'ACT_ADMIN_SUBMIT_CHANGES':
 
         $key = sanitize($_POST['key'],RSS_SANITIZER_NO_SPACES|RSS_SANITIZER_SIMPLE_SQL);

trunk/gregarius/admin/folders.php

@@ -38 +38 @@
     echo "<label for=\"new_folder\">".LBL_ADMIN_FOLDERS_ADD."</label>\n"
     ."<input type=\"text\" id=\"new_folder\" name=\"new_folder\" value=\"\" />"
-    ."<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"LBL_ADMIN_ADD\"/>\n"
+    ."<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_ADD\"/>\n"
     ."<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_ADD ."\"/>\n"
     ."</p></form>\n\n";
@@ -211 +211 @@
 
     case LBL_ADMIN_ADD:
-    case 'LBL_ADMIN_ADD':
+    case 'ACT_ADMIN_ADD':
         $label=sanitize($_REQUEST['new_folder'],RSS_SANITIZER_URL);
         $new_label = rss_real_escape_string($new_label);

trunk/gregarius/admin/opml.php

@@ -78 +78 @@
 
 
-    echo "<p style=\"text-align:center\"><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"LBL_ADMIN_IMPORT\" />\n";
+    echo "<p style=\"text-align:center\"><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_IMPORT\" />\n";
     echo "<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_OPML_IMPORT ."\" /></p>\n";
 

trunk/gregarius/admin/plugins.php

@@ -167 +167 @@
     }
     echo "</table>\n";
-    echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"LBL_ADMIN_SUBMIT_CHANGES\"/>\n";
+    echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_SUBMIT_CHANGES\"/>\n";
     echo "<input type=\"submit\" name=\"admin_plugin_submit_changes\" value=\"".LBL_ADMIN_SUBMIT_CHANGES."\" />\n";
     echo "<input type=\"submit\" name=\"admin_plugin_check_for_updates\" value=\"".LBL_ADMIN_CHECK_FOR_UPDATES."\" /></p></form>\n";
@@ -208 +208 @@
             echo "<p><input type=\"hidden\" name=\"plugin_name\" value=\"".$plugin_filename."\"/>\n";
             echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION
-            ."\" value=\"LBL_ADMIN_SUBMIT_CHANGES\"/>\n";
+            ."\" value=\"ACT_ADMIN_SUBMIT_CHANGES\"/>\n";
             echo "<input type=\"submit\" name=\"admin_plugin_options_submit_changes\" value=\""
             .LBL_ADMIN_SUBMIT_CHANGES."\" />\n";

trunk/gregarius/admin/themes.php

@@ -162 +162 @@
             echo "<p><input type=\"hidden\" name=\"theme\" value=\"".$theme."\"/>\n";
             echo "<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION
-                   ."\" value=\"LBL_ADMIN_SUBMIT_CHANGES\"/>\n";
+                   ."\" value=\"ACT_ADMIN_SUBMIT_CHANGES\"/>\n";
             if( isset( $_REQUEST['mediaparam'] ) ) //pass it along
             {
@@ -284 +284 @@
             switch ($action) {
             case LBL_ADMIN_SUBMIT_CHANGES:
-            case 'LBL_ADMIN_SUBMIT_CHANGES':
+            case 'ACT_ADMIN_SUBMIT_CHANGES':
                 if (!array_key_exists('key',$_REQUEST)) {
                     rss_error('Invalid config key specified.', RSS_ERROR_ERROR,true);

trunk/gregarius/feed.php

@@ -31 +31 @@
 rss_require('extlib/rss_fetch.inc');
 
-define ('LBL_NAV_PREV_PREFIX','← ');
-define ('LBL_NAV_SUCC_POSTFIX',' →');
+define ('ACT_NAV_PREV_PREFIX','← ');
+define ('ACT_NAV_SUCC_POSTFIX',' →');
 
 
@@ -303 +303 @@
     switch ($_REQUEST['metaaction']) {
 
-    case  'LBL_MARK_CHANNEL_READ':
+    case  'ACT_MARK_CHANNEL_READ':
 
         /** mark channel as read **/
@@ -416 +416 @@
 
         // folder
-    case 'LBL_MARK_FOLDER_READ':
+    case 'ACT_MARK_FOLDER_READ':
         $fid = sanitize($_REQUEST['folder'],RSS_SANITIZER_NUMERIC);
         $rs  = rss_query("select id from " .getTable('channels') . " where parent=$fid");
@@ -487 +487 @@
         break;
         // virtual folder - code extremely similar to LBL_MARK_FOLDER_READ
-    case 'LBL_MARK_VFOLDER_READ':
+    case 'ACT_MARK_VFOLDER_READ':
         $vfid = sanitize($_REQUEST['vfolder'],RSS_SANITIZER_NUMERIC);
         
@@ -869 +869 @@
                 $lbl = substr($lbl,0,37) . "...";
             }
-            $readMoreNav .= "<a href=\"".$prev['url']."\" class=\"fl\">".LBL_NAV_PREV_PREFIX ."$lbl</a>\n";
+            $readMoreNav .= "<a href=\"".$prev['url']."\" class=\"fl\">".ACT_NAV_PREV_PREFIX ."$lbl</a>\n";
         }
 
@@ -879 +879 @@
                 $lbl = substr($lbl,0,37) . "...";
             }
-            $readMoreNav .= "<a href=\"".$succ['url']."\" class=\"fr\">$lbl".LBL_NAV_SUCC_POSTFIX."</a>\n";
+            $readMoreNav .= "<a href=\"".$succ['url']."\" class=\"fr\">$lbl".ACT_NAV_SUCC_POSTFIX."</a>\n";
         }
 
@@ -1358 +1358 @@
     echo "\n\n<form action=\"". getPath() ."feed.php\" method=\"post\">\n"
     ."\t<p><input id=\"_markReadButton\" type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_CHANNEL_READ ."\"/>\n"
-    ."\t<input type=\"hidden\" name=\"metaaction\" value=\"LBL_MARK_CHANNEL_READ\"/>\n"
+    ."\t<input type=\"hidden\" name=\"metaaction\" value=\"ACT_MARK_CHANNEL_READ\"/>\n"
     ."\t<input type=\"hidden\" name=\"channel\" value=\"$cid\"/>\n"
     ."\t<input type=\"hidden\" name=\"markreadids\" value=\"".implode(",",$GLOBALS['rss']->getShownUnreadIds())."\" />\n"
@@ -1374 +1374 @@
     echo "\n\n<form action=\"". getPath() ."feed.php\" method=\"post\">\n"
     ."\t<p><input id=\"_markReadButton\" type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_FOLDER_READ ."\"/>\n"
-    ."\t<input type=\"hidden\" name=\"metaaction\" value=\"LBL_MARK_FOLDER_READ\"/>\n"
+    ."\t<input type=\"hidden\" name=\"metaaction\" value=\"ACT_MARK_FOLDER_READ\"/>\n"
     ."\t<input type=\"hidden\" name=\"folder\" value=\"$fid\"/>\n"
     ."\t<input type=\"hidden\" name=\"markreadids\" value=\"".implode(",",$GLOBALS['rss']->getShownUnreadIds())."\" />\n"
@@ -1391 +1391 @@
     echo "\n\n<form action=\"". getPath() ."feed.php\" method=\"post\">\n"
     ."\t<p><input id=\"_markReadButton\" type=\"submit\" name=\"action\" accesskey=\"m\" value=\"". LBL_MARK_FOLDER_READ ."\"/>\n"
-    ."\t<input type=\"hidden\" name=\"metaaction\" value=\"LBL_MARK_VFOLDER_READ\"/>\n"
+    ."\t<input type=\"hidden\" name=\"metaaction\" value=\"ACT_MARK_VFOLDER_READ\"/>\n"
     ."\t<input type=\"hidden\" name=\"vfolder\" value=\"$vfid\"/>\n"
     ."\t<input type=\"hidden\" name=\"markreadids\" value=\"".implode(",",$GLOBALS['rss']->getShownUnreadIds())."\" />\n"

trunk/gregarius/index.php

@@ -44 +44 @@
 if (array_key_exists('metaaction', $_POST)
     && $_POST['metaaction'] != ""
-    && trim($_POST['metaaction']) == trim('LBL_MARK_READ') 
+    && trim($_POST['metaaction']) == trim('ACT_MARK_READ') 
     && !hidePrivate()) {
     
@@ -225 +225 @@
    echo "<form action=\"". getPath() ."\" method=\"post\">\n"
       ."<p><input accesskey=\"m\" type=\"submit\" name=\"action\" value=\"". LBL_MARK_READ ." \"/></p>\n"
-      ."<p><input type=\"hidden\" name=\"metaaction\" value=\"LBL_MARK_READ\"/>\n"
+      ."<p><input type=\"hidden\" name=\"metaaction\" value=\"ACT_MARK_READ\"/>\n"
       ."<input type=\"hidden\" name=\"markreadids\" value=\"".implode(",",$GLOBALS['rss']->getShownUnreadIds())."\" />\n"
       ."</p></form>\n";

trunk/gregarius/plugins/markallread.php

@@ -29 +29 @@
 /// Author: Keith D. Zimmerman
 /// Description: Display "Mark All Read" buttons and links in many places
-/// Version: 0.4
+/// Version: 0.5
 /// Configuration: __markallread_config
 
@@ -39 +39 @@
  * 0.3  support for i18n
  * 0.4  Fixed a couple validation issues
+ * 0.5  Adapted for new l10n method
  */
 
@@ -61 +62 @@
     $options = rss_plugins_get_option( MARKALLREAD_CONFIG_OPTIONS );
     if( $options & MARKALLREAD_OPTION_LINK_CATEGORY )
-        return "<a title='".LBL_MARK_CATEGORY_READ_ALL."' href='". getPath() ."feed.php?metaaction=LBL_MARK_VFOLDER_READ&vfolder=" . rss_feeds_folder_id() . "' onclick='javascript: return _markallread(this,\"category\",\"" . rss_feeds_folder_name() . "\");'>" . $existingText . '</a>';
+        return "<a title='".LBL_MARK_CATEGORY_READ_ALL."' href='". getPath() ."feed.php?metaaction=ACT_MARK_VFOLDER_READ&vfolder=" . rss_feeds_folder_id() . "' onclick='javascript: return _markallread(this,\"category\",\"" . rss_feeds_folder_name() . "\");'>" . $existingText . '</a>';
     else
         return $existingText;
@@ -72 +73 @@
     $options = rss_plugins_get_option( MARKALLREAD_CONFIG_OPTIONS );
     if( $options & MARKALLREAD_OPTION_LINK_FOLDER )
-        return "<a title='".LBL_MARK_FOLDER_READ_ALL."' href='". getPath() ."feed.php?metaaction=LBL_MARK_FOLDER_READ&amp;folder=" . rss_feeds_folder_id() . "' onclick='javascript: return _markallread(this,\"folder\",\"" . rss_feeds_folder_name() . "\");'>" . $existingText . '</a>';
+        return "<a title='".LBL_MARK_FOLDER_READ_ALL."' href='". getPath() ."feed.php?metaaction=ACT_MARK_FOLDER_READ&amp;folder=" . rss_feeds_folder_id() . "' onclick='javascript: return _markallread(this,\"folder\",\"" . rss_feeds_folder_name() . "\");'>" . $existingText . '</a>';
     else
         return $existingText;
@@ -83 +84 @@
     $options = rss_plugins_get_option( MARKALLREAD_CONFIG_OPTIONS );
     if( $options & MARKALLREAD_OPTION_LINK_FEED )
-        return "<a title='".LBL_MARK_CHANNEL_READ_ALL."' href='". getPath() ."feed.php?metaaction=LBL_MARK_CHANNEL_READ&amp;channel=" . $GLOBALS['rss']->currentFeedsFeed-> id . "' onclick='javascript: return _markallread(this,\"feed\",\"" . rss_feeds_feed_title() . "\");'>" . $existingText . '</a>';
+        return "<a title='".LBL_MARK_CHANNEL_READ_ALL."' href='". getPath() ."feed.php?metaaction=ACT_MARK_CHANNEL_READ&amp;channel=" . $GLOBALS['rss']->currentFeedsFeed-> id . "' onclick='javascript: return _markallread(this,\"feed\",\"" . rss_feeds_feed_title() . "\");'>" . $existingText . '</a>';
     else
         return $existingText;
@@ -93 +94 @@
 
     if(defined('MARK_READ_FEED_FORM')) {
-            $metaaction = "LBL_MARK_CHANNEL_READ";
+            $metaaction = "ACT_MARK_CHANNEL_READ";
             $id = 'name="channel" value="' . MARK_READ_FEED_FORM . '"';
             $text = LBL_MARK_CHANNEL_READ_ALL;
@@ -99 +100 @@
                 $safety = ' onclick=\'javascript: return _confirmmarkallread("feed", "");\'';
     } elseif(defined('MARK_READ_FOLDER_FORM')) {
-            $metaaction = "LBL_MARK_FOLDER_READ";
+            $metaaction = "ACT_MARK_FOLDER_READ";
             $id = 'name="folder" value="' . MARK_READ_FOLDER_FORM . '"';
             $text = LBL_MARK_FOLDER_READ_ALL;
@@ -105 +106 @@
                 $safety = ' onclick=\'javascript: return _confirmmarkallread("folder", "");\'';
     } elseif(defined('MARK_READ_VFOLDER_FORM')){
-            $metaaction = "LBL_MARK_VFOLDER_READ";
+            $metaaction = "ACT_MARK_VFOLDER_READ";
             $id = 'name="vfolder" value="' . MARK_READ_VFOLDER_FORM . '"';
             $text = LBL_MARK_CATEGORY_READ_ALL;