Changeset 1530 for branches/multiuser/admin/channels.php

Timestamp:

08/11/06 02:20:30 (2 years ago)

Author:

mdodoo

Message:

Merges trunk changes ([1522],[1523],[1525],[1526],[1527],[1528], and [1529]).

Files:

• branches/multiuser/admin/channels.php (modified) (4 diffs)

branches/multiuser/admin/channels.php

@@ -45 +45 @@
 
     echo "<label for=\"add_channel_to_folder\">". LBL_ADMIN_IN_FOLDER . "</label>\n";
-    folder_combo('add_channel_to_folder');
+    echo rss_toolkit_folders_combo('add_channel_to_folder');
     echo "<label for=\"channel_tags\">" . LBL_TAG_FOLDERS . ":</label>\n";
     echo "<input type=\"text\" name=\"channel_tags\" id=\"channel_tags\" />\n";
@@ -139 +139 @@
                     $dead = true;
                 } else {
-                    $dead = (time() - strtotime($daterefreshed) > getConfig('rss.config.deadthreshhold')*60 ? true : false);
+                    $dead = (time() - strtotime($daterefreshed) > getConfig('rss.config.deadthreshhold')*60*60 ? true : false);
                 }
 
@@ -187 +187 @@
     ."<legend>Selected...</legend>\n"
     ."<p>\n"
-    ."<label for=\"me_folder\">".LBL_ADMIN_CHANNEL_FOLDER."</label>\n";
-    folder_combo('me_folder',null);
+    ."<label for=\"me_folder\">".LBL_ADMIN_CHANNEL_FOLDER."</label>\n"
+    .rss_toolkit_folders_combo('me_folder',null);
 
     echo
@@ -785 +785 @@
 
     // Folder
-    ."<p><label for=\"c_parent\">". LBL_ADMIN_CHANNEL_FOLDER ."</label>\n";
-
-    folder_combo('c_parent',$parent);
-    echo "</p>\n";
+    ."<p><label for=\"c_parent\">". LBL_ADMIN_CHANNEL_FOLDER ."</label>\n"
+
+    .rss_toolkit_folders_combo('c_parent',$parent)
+    ."</p>\n";
 
     // Tags