Changeset 1530 for branches/multiuser/admin

Timestamp:

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

Author:

mdodoo

Message:

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

Location:

branches/multiuser/admin

Files:

• channels.php (modified) (4 diffs)
• folders.php (modified) (1 diff)
• index.php (modified) (1 diff)
• items.php (modified) (4 diffs)
• opml.php (modified) (1 diff)
• themes.php (modified) (5 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

branches/multiuser/admin/folders.php

@@ -128 +128 @@
 
 }
-
-function folder_combo($name, $selected = -1) {
-    echo "\n<select name=\"$name\" id=\"$name\">\n";
-    if (getConfig('rss.config.absoluteordering')) {
-        $sql = " order by position asc";
-    } else {
-        $sql = " order by name asc";
-    }
-    $res = rss_query("select id, name from " .getTable("folders") . $sql);
-    while (list($id, $name) = rss_fetch_row($res)) {
-        echo "\t<option value=\"$id\""
-        .($selected > -1 && $selected == $id ? " selected=\"selected\"":"")
-        .">" .  (($name == "")?LBL_HOME_FOLDER:$name)  ."</option>\n";
-    }
-    echo "</select>\n";
-}
-
-
 
 function folder_admin() {

branches/multiuser/admin/index.php

@@ -43 +43 @@
 require_once('themes.php');
 require_once('tags.php');
+require_once('../cls/wrappers/toolkit.php');
 
 define ('CST_ADMIN_DOMAIN','domain');

branches/multiuser/admin/items.php

@@ -25 +25 @@
 #
 ###############################################################################
+
+rss_require('cls/wrappers/toolkit.php');
 
 /**
@@ -45 +47 @@
     . "<option>" . LBL_ADMIN_PRUNE_YEARS . "</option>\n"
     . "</select></p>\n"
+    . "<p>\n"
+        . rss_toolkit_channels_combo("prune_channel") . "\n"
+    . "</p>\n"
     . "<p><label for=\"prune_include_sticky\">".LBL_ADMIN_PRUNE_INCLUDE_STICKY."</label>\n"
     . "<input type=\"checkbox\" id=\"prune_include_sticky\" name=\"prune_include_sticky\" value=\"1\"/></p>\n"
@@ -91 +96 @@
                 break;
             }
-            $sql = " from ".getTable('item') ." i, " .getTable('channels') . " c "
+            $sql = " from ".getTable('item') ." i INNER JOIN " .getTable('channels') . " c ON c.id=i.cid "
                    ." where 1=1 ";
+
+            if (array_key_exists('prune_channel', $_REQUEST)) {
+                if(ALL_CHANNELS_ID != $_REQUEST['prune_channel']) {
+                    $sql .= " and c.id = " . $_REQUEST['prune_channel'] . "";
+                }
+            }
 
             if ($prune_older > 0) {
@@ -135 +146 @@
                 }
             }
-
 
             if (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST)) {

branches/multiuser/admin/opml.php

@@ -68 +68 @@
 
     ."<p style=\"padding-left:1em;\"><input type=\"radio\" id=\"opml_import_option_folder\" name=\"opml_import_option\" value=\"".CST_ADMIN_OPML_IMPORT_FOLDER."\" />\n"
-    ."<label for=\"opml_import_option_folder\" >".LBL_ADMIN_OPML_IMPORT_FOLDER."</label>";
-    folder_combo('opml_import_to_folder',null);
-    echo "</p>\n"
+    ."<label for=\"opml_import_option_folder\" >".LBL_ADMIN_OPML_IMPORT_FOLDER."</label>"
+    .rss_toolkit_folders_combo('opml_import_to_folder',null)
+    ."</p>\n"
 
     ."<p style=\"padding-left:1em;\"><input type=\"radio\" id=\"opml_import_option_wipe\" name=\"opml_import_option\" value=\"".CST_ADMIN_OPML_IMPORT_WIPE."\" />\n"
     ."<label for=\"opml_import_option_wipe\" >".LBL_ADMIN_OPML_IMPORT_WIPE."</label></p>\n"
-
 
     ."";

branches/multiuser/admin/themes.php

@@ -45 +45 @@
         $active_theme= getConfig('rss.output.theme');
     }
+
+        echo "<form style=\"float:right\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
+          . "<p><input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_THEMES."\" />\n"
+        ."<input type=\"submit\" name=\"admin_themes_check_for_updates\" value=\"".LBL_ADMIN_CHECK_FOR_UPDATES."\" /></p>\n"
+        . "</form>\n";
+        if (isset($_POST['admin_themes_check_for_updates'])) {
+            theme_getThemesUpdate(&$themes);
+        }
     
     echo "<h2 class=\"trigger\">".LBL_ADMIN_THEMES."</h2>\n"
@@ -61 +69 @@
         }
         $active = ($entry ==  $active_theme);
+        $updateAvailable = isset($theme['updateVersion']);
         if ($screenshot) {
             $screenshotURL = "<img src=\"". getPath() . RSS_THEME_DIR . "/$fsname/$screenshot\"  />";
@@ -68 +77 @@
         $h4="$name"; 
         $h5="By&nbsp;$author | Version:&nbsp;$version";
+        if ($updateAvailable) {
+            $h5 .= ' | <a class="update" href="'.$theme['updateUrl'].'">Update to version ' .$theme['updateVersion'] .'</a>';
+        }
+        
         if ($htmltheme) {
             $seturl = "index.php?view=themes&amp;theme=$entry";
@@ -73 +86 @@
             $seturl = "";
         }
-        echo "<div class=\"themeframe".($active?" active":"")."\"><span>";
+        echo "<div class=\"themeframe".($active?" active":""). ($updateAvailable?" hilite":"")."\"><span>";
         if (!$active && $htmltheme) {
             echo "<a href=\"$seturl\" class=\"bookmarklet\">".LBL_ADMIN_USE_THIS_THEME."</a>";
@@ -399 +412 @@
 }
 
+function theme_getThemesUpdate(&$themes) {
+      $themesxml = array();
+    global $themesxml;
+    $xml = getUrl('http://themes.gregarius.net/api.php');
+    $xml = str_replace("\r", '', $xml);
+    $xml = str_replace("\n", '', $xml);
+
+    $xp = xml_parser_create() or rss_error("couldn't create parser");
+
+    xml_set_element_handler($xp, 'themes_xml_startElement', 'themes_xml_endElement')
+    or rss_error("couldnt set XML handlers");
+
+    xml_parse($xp, $xml, true) or rss_error("failed parsing xml");
+    xml_parser_free($xp) or rss_error("failed freeing the parser");
+    if (is_array($themesxml)) {
+        foreach($themesxml as $theme => $data) {
+            list($tversion,$turl) = $data;
+            if (isset($themes[$theme]) && $themes[$theme]['version'] < $tversion) {
+                $themes[$theme]['updateVersion'] = $tversion;
+                $themes[$theme]['updateUrl'] = $turl;
+            }
+        }
+    }
+}
+
+function themes_xml_startElement($xp, $element, $attr) {
+    global $themesxml;
+
+    if ($element == 'THEME' &&
+            array_key_exists('PID',$attr) &&
+            array_key_exists('URL',$attr) &&
+            array_key_exists('VERSION',$attr)) {
+
+        $themesxml[$attr['PID']] = array($attr['VERSION'],$attr['URL']);
+    }
+}
+
+function themes_xml_endElement($xp, $element) {
+    ///global $pluginsxml;
+    return;
+}
+
 ?>