Changeset 652 for team

Timestamp:

09/21/07 00:00:33 (14 months ago)

Author:

www-data

Message:

automerge commit

Location:

team/michiel/import_blogs

Files:

• . (modified) (1 prop)
• common/mvblog_admin.php (modified) (5 diffs)
• common/mvblog_common.php (modified) (8 diffs)

team/michiel/import_blogs/common/mvblog_admin.php

@@ -1064 +1064 @@
                         "public" => 1
                 );
+                /* we selected a month only */
                 if ((array_key_exists("month", $options) && $options["month"] > 0) && (array_key_exists("year", $options) && $options["year"] > 0)) {
-                        $timestamp_start = mktime(0,0,0,$options["month"],1,$options["year"]);
-                        $timestamp_stop  = mktime(0,0,0,$options["month"]+1,1,$options["year"]);
-                        $q1 = sprintf("WHERE %s BETWEEN %d AND %d", $this->db_quote("date"), $timestamp_start, $timestamp_stop);
-                } else {
-                        $options["month"] = 0;
-                        $options["year"]  = 0;
-                        $q1 = "";
-                }
-                if (array_key_exists("category_id", $options) && $options["category_id"])
-                        $q1 = sprintf("WHERE aside = 0 AND (categories_ids like '%%,%1\$d' OR categories_ids like '%1\$d,%%' OR categories_ids like '%%,%1\$d,%%' or categories_ids = '%1\$d')", $options["category_id"]);
+                        $postoptions["archive"] = 1;
+                        $postoptions["timestamp_start"] = mktime(0,0,0,$options["month"],1,$options["year"]);
+                        $postoptions["timestamp_stop"]  = mktime(0,0,0,$options["month"]+1,1,$options["year"]);
+                }
 
-                $res_count =& $this->db->query("SELECT COUNT(*) FROM articles $q1");
-                $counter_r = $res_count->fetchRow();
-                $counter = $counter_r[0];
-                $this->db->setLimit($options["limit"], $options["top"]);
-                $res =& $this->db->query("SELECT * FROM articles $q1 ORDER BY ".$this->db_quote("date")." DESC");
-                if (PEAR::isError($res)) {
-                        die($res->getDebugInfo());
-                }
+                if (array_key_exists("category_id", $options) && $options["category_id"]) {
+                        $postoptions["archive"] = 2;
+                        $postoptions["category_id"] = $options["category_id"];
+                }
+                $postoptions["start"] = $options["top"]-1;
+                $postoptions["top"]   = $options["top"];
+                $postoptions["limit"] = $options["limit"];
+                /* max time is 10 years in the future */
+                $postoptions["max_time"] = mktime(0, 0, 0, date("m"), date("d"), date("Y")+10);
+
+                $posts = $this->_get_posts($postoptions);
+                $counter = $posts["total_count"];
+
                 ?>
                 <h1 class="log_post_new"><a href="./index.php?action=edit_post&amp;id=0"><?php echo gettext("create new"); ?></a></h1><br />
@@ -1093 +1093 @@
                                 <?php
                                 for ($i=1;$i<=12;$i++) {
-                                        if ($options["month"] == $i) { $selected = " SELECTED"; } else { $selected = ""; }
+                                        if (array_key_exists("month", $options) && $options["month"] == $i) { $selected = " SELECTED"; } else { $selected = ""; }
                                         echo "<option value=\"".$i."\"".$selected.">".date("M", mktime(0,0,0,$i,1,0))."</option>\n";
                                 }
@@ -1107 +1107 @@
                                 $row1 = $res1->fetchRow();
                                 for ($i=date("Y", $row1[0]);$i<=date("Y");$i++) {
-                                        if ($options["year"] == $i) { $selected1 = " SELECTED"; } else { $selected1 = ""; }
+                                        if (array_key_exists("year", $options) && $options["year"] == $i) { $selected1 = " SELECTED"; } else { $selected1 = ""; }
                                         echo "<option value=\"".$i."\"".$selected1.">".$i."</option>\n";
                                 }
@@ -1131 +1131 @@
                 </form>
                 <?php
-                while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
+                foreach ($posts["posts"] as $row) {
                         if (!trim($row["title"])) {
                                 $row["title"] = "[".gettext("no title")."]";
@@ -1168 +1168 @@
                         <?php
                 }
+                if (!array_key_exists("month", $options))
+                        $options["month"] = 0;
+                if (!array_key_exists("year", $options))
+                        $options["year"] = 0;
+
                 if ($options["top"]) {
                         echo "<a class=\"link_prev\" href=\"index.php?action=show_posts&amp;options[month]=".(int)$options["month"]."&amp;options[year]=".(int)$options["year"]."&amp;options[top]=".($options["top"]-$options["limit"])."\">".gettext("previous")."</a> ";

team/michiel/import_blogs/common/mvblog_common.php

@@ -585 +585 @@
                 else
                         $dossier = 0;
+
+                if (array_key_exists("active", $options))
+                        $active = $options["active"];
+                else
+                        $active = 1;
+
+                if (array_key_exists("public", $options))
+                        $public = $options["public"];
+                else
+                        $public = 1;
+
+                if (array_key_exists("adminmode", $options) && $options["adminmode"])
+                        $adminmode = 1;
+                else
+                        $adminmode = 0;
 
                 switch ($archive) {
@@ -609 +624 @@
                                         $options["timestamp_end"]   = $time_end;
                                 }
-                                $q = sprintf("AND public=1 AND aside = 0 AND date BETWEEN %d AND %d", $options["timestamp_start"], $options["timestamp_end"]);
+                                if ($adminmode)
+                                        $q = sprintf("AND date BETWEEN %d AND %d", $options["timestamp_start"], $options["timestamp_end"]);
+                                else
+                                        $q = sprintf("AND public=%d AND aside = 0 AND date BETWEEN %d AND %d", $public, $options["timestamp_start"], $options["timestamp_end"]);
                                 $title = "<p><h1 class=\"log_archive_h1\">".gettext("Archive of")." ".$archtitle."</h1></p>";
                                 $url_prev = "?action=archive&amp;m=".date("mY", $options["timestamp_start"])."&amp;top=".($options["top"]-$options["limit"]);
@@ -617 +635 @@
                                 if (!array_key_exists("category_id", $options))
                                         $options["category_id"] = (int)$_REQUEST["c"];
-                                $q = sprintf("AND public=1 AND aside = 0 AND date <= %d AND (categories_ids like '%%,%2\$d' OR categories_ids like '%2\$d,%%' OR categories_ids like '%%,%2\$d,%%' or categories_ids = '%2\$d')", $options["max_time"], $options["category_id"]);
+                                if ($adminmode)
+                                        $q = sprintf("AND aside = 0 AND date <= %d AND (categories_ids like '%%,%2\$d' OR categories_ids like '%2\$d,%%' OR categories_ids like '%%,%2\$d,%%' or categories_ids = '%2\$d')", $options["max_time"], $options["category_id"]);
+                                else
+                                        $q = sprintf("AND public=%d AND aside = 0 AND date <= %d AND (categories_ids like '%%,%3\$d' OR categories_ids like '%3\$d,%%' OR categories_ids like '%%,%3\$d,%%' or categories_ids = '%3\$d')", $public, $options["max_time"], $options["category_id"]);
                                 $title = "<p><h1 class=\"log_archive_h1\">".gettext("Archive of category")." <i>".$this->categories[$options["category_id"]]["name"]."</i></h1></p>";
                                 $desc  = "<br /><br /><div class=\"log_dossier_description\">".$this->categories[$options["category_id"]]["desc"]."</div><br />";
@@ -624 +645 @@
                                 break;
                         case 3 :
-                                $q = sprintf("AND public=1 AND date <= %d AND aside=1", $options["max_time"]);
+                                if ($adminmode)
+                                        $q = sprintf("AND date <= %d AND aside=1", $options["max_time"]);
+                                else
+                                        $q = sprintf("AND public=%d AND date <= %d AND aside=1", $public, $options["max_time"]);
                                 $title = "<p><h1 class=\"log_archive_h1\">".gettext("Archive of")." <i>\"asides\"</i></h1></p>";
                                 $url_prev = "?action=archive_cat&amp;c=aside&amp;top=".($options["top"]-$options["limit"]);
@@ -637 +661 @@
                                         $options["timestamp_start"] = $time_start;
                                 }
-                                $q = sprintf("AND public = 1 AND date <= %d", $options["timestamp_start"]);
+                                if ($adminmode)
+                                        $q = sprintf("AND date <= %d", $options["timestamp_start"]);
+                                else
+                                        $q = sprintf("AND public = %d AND date <= %d", $public, $options["timestamp_start"]);
                                 $title = "<p><h1 class=\"log_archive_h1\">".gettext("Archive of articles posted before")."&nbsp;".date("F Y", $options["timestamp_start"])."</h1></p>";
                                 $url_prev = "?action=archive_old&amp;fromts=".$options["timestamp_start"]."&amp;top=".($options["top"]-$options["limit"]);
@@ -652 +679 @@
                                         $url_prev = "index.php?action=viewdossier&id=$dossier&top=".($options["top"]-$options["limit"]);
                                         $url_next = "index.php?action=viewdossier&id=$dossier&top=".($options["top"]+$options["limit"]);
-                                        $q = sprintf("AND date <= %d AND public=1 AND dossier_id = %d", $options["max_time"], $dossier);
+                                        if ($adminmode)
+                                                $q = sprintf("AND date <= %d AND dossier_id = %d", $options["max_time"], $dossier);
+                                        else
+                                                $q = sprintf("AND date <= %d AND public=%d AND dossier_id = %d", $options["max_time"], $public, $dossier);
                                 } else {
-                                        $q = sprintf("AND date <= %d AND public=1", $options["max_time"]);
+                                        if ($adminmode)
+                                                $q = sprintf("AND date <= %d", $options["max_time"]);
+                                        else
+                                                $q = sprintf("AND date <= %d AND public=%d", $options["max_time"], $public);
                                         $title = "";
                                         $url_prev = "index.php?top=".($options["top"]-$options["limit"]);
@@ -678 +711 @@
 
                 if ($options["limit"]) {
-                        $res_count =& $this->db->query("SELECT COUNT(*) FROM articles WHERE active=1 $q");
+                        $q_count = sprintf("SELECT COUNT(*) FROM articles WHERE active = 1 %s", $q);
+                        $res_count =& $this->db->query($q_count);
                         if (PEAR::isError($res_count))
                                 die($res_count->getUserInfo());
@@ -685 +719 @@
                         $posts["total_count"] = $row[0];
                         $this->db->setLimit($options["limit"], $options["start"]);
-                        $res =& $this->db->query("SELECT * FROM articles WHERE active=1 $q ORDER BY date DESC");
-                } else
-                        $res =& $this->db->query("SELECT * FROM articles WHERE active=1 $q");
+                        $sql = sprintf("SELECT * FROM articles WHERE active = 1 %s ORDER BY date DESC", $q);
+                        $res =& $this->db->query($sql);
+                } else {
+                        $sql = sprintf("SELECT * FROM articles WHERE active = 1 %s", $q);
+                        $res =& $this->db->query($sql);
+                }
 
                 if (PEAR::isError($res))