Changeset 692 for team

Timestamp:

11/01/07 21:00:44 (14 months ago)

Author:

www-data

Message:

automerge commit

Location:

team/michiel/import_blogs

Files:

• . (modified) (1 prop)
• plugins/altarchive.php (modified) (4 diffs)
• plugins/altarchive_onemonth.php (modified) (2 diffs)

team/michiel/import_blogs/plugins/altarchive.php

@@ -64 +64 @@
                 else
                         $url = "index.php?action=archive&m=";
-                /* this should be a setting for this plugin */
                 /* years to show */
-                $years  = 3;
+                if (array_key_exists("altarchive_showyears", $this->_settings))
+                        $years = $this->_settings["altarchive_showyears"];
+                else
+                        $years  = 3;
                 $output = "";
                 for ($i=date("Y"); $i>date("Y")-$years; $i--) {
@@ -120 +122 @@
         /* show_settings {{{ */
         public function show_settings() {
-                $output  = "<form name=\"acronym\" method=\"post\" action=\"index.php\">";
+                $output  = "<form name=\"altarchive_settings\" method=\"post\" action=\"index.php\">";
                 $output .= "<input type=\"hidden\" name=\"action\" value=\"save_plugin_setting\" />";
                 $output .= "<input type=\"hidden\" name=\"plugin\" value=\"altarchive\" />";
@@ -135 +137 @@
                 $output .= ">".gettext("no")."</option>";
                 $output .= "</select></td>\n";
+                $output .= "</tr><tr>";
+                $output .= "<td>".gettext("years to show")."</td>";
+                $output .= "<td><select name=\"altarchive_showyears\">";
+                for ($i=1;$i<10;$i++) {
+                        $output .= "<option value=\"$i\"";
+                        if (array_key_exists("altarchive_showyears", $this->_settings) && $this->_settings["altarchive_showyears"] == $i)
+                                $output .= " selected=\"selected\"";
+                        $output .= ">$i</option>";
+                }
+                $output .= "</select></td>";
                 $output .= "</tr><tr>";
                 $output .= "<td colspan=\"2\"><input type=\"submit\" value=\"".gettext("Save")."\" /></td>";
@@ -158 +170 @@
                 $res = $this->_mvblog->db->exec($sql);
                 $this->_settings["altarchive_showdefaultcss"] = sprintf("%d", $requestdata["altarchive_showdefaultcss"]);
+                /* first look if the setting is already there */
+                $sql = "SELECT COUNT(*) FROM settings WHERE settingname = 'altarchive_showyears'";
+                $res = $this->_mvblog->db->query($sql);
+                $row = $res->fetchRow();
+                if ($row[0]) {
+                        /* yes, so update */
+                        $sql = sprintf("UPDATE settings SET settingvalue='%d' WHERE settingname='altarchive_showyears'", $requestdata["altarchive_showyears"]);
+                } else {
+                        /* no, so insert */
+                        $sql = sprintf("INSERT INTO settings (settingname, settingvalue) VALUES ('altarchive_showyears', '%d')", $requestdata["altarchive_showyears"]);
+                }
+                $res = $this->_mvblog->db->exec($sql);
+                $this->_settings["altarchive_showyears"] = sprintf("%d", $requestdata["altarchive_showyears"]);
                 $this->show_settings();
         }

team/michiel/import_blogs/plugins/altarchive_onemonth.php

@@ -58 +58 @@
         /* genaltarchive_onemonth {{{ */
         public function genaltarchive_onemonth($defaultmenu) {
+                /* find out what the oldest post date is */
+                $q = "SELECT date FROM articles WHERE active = 1 AND public = 1 ORDER BY date LIMIT 1";
+                $res = $this->_mvblog->db->query($q);
+                $row = $res->fetchRow(MDB2_FETCHMODE_ASSOC);
+                $oldest = $row["date"];
+
                 $output   = "";
                 $url_next = "";
@@ -124 +130 @@
                 }
                 $output .= "</tr><tr>\n";
-                $output .= "<td class=\"altarchive_onemonth_month_noitems\" colspan=\"3\"><a href=\"$url_prev\"><< ".strftime("%b", mktime(0, 0, 0, $_month-1, 1, $_year))."</a></td>\n";
+                if ($oldest < mktime(0, 0, 0, $_month, 1, $_year))
+                        $output .= "<td class=\"altarchive_onemonth_month_noitems\" colspan=\"3\"><a href=\"$url_prev\"><< ".strftime("%b", mktime(0, 0, 0, $_month-1, 1, $_year))."</a></td>\n";
+                else
+                        $output .= "<td class=\"altarchive_onemonth_month_noitems\" colspan=\"3\">&nbsp;</td>\n";
                 $output .= "<td class=\"altarchive_onemonth_month_noitems\">&nbsp;</td>\n";
                 if (date("m") == $_month)