Edited Aggregator module to allow choice of default post status

dabaki · Nov 13, 2011 · 7986e80 · 7986e80
1 parent c7378fb
commit 7986e80
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 30 deletions.
diff --git a/modules/aggregator/aggregator.php b/modules/aggregator/aggregator.php
@@ -79,7 +79,7 @@ public function main_index($main) {
 
                         Post::add($data, $clean, null, $feed["feather"], $feed["author"],
                                   false,
-                                  "public",
+                                  $feed['status'],
                                   datetime($created),
                                   datetime($updated));
 
@@ -253,6 +253,7 @@ public function admin_new_aggregate($admin) {
                                "last_updated" => 0,
                                "feather" => $_POST['feather'],
                                "author" => $_POST['author'],
+                               "status" => $_POST['status'],
                                "data" => YAML::load($_POST['data']));
 
             $config->aggregates[$_POST['name']] = $aggregate;
@@ -282,6 +283,7 @@ public function admin_edit_aggregate($admin) {
                                                                   "url" => $aggregate["url"],
                                                                   "feather" => $aggregate["feather"],
                                                                   "author" => $aggregate["author"],
+                                                                  "status" => $aggregate['status'],
                                                                   "data" => preg_replace("/---\n/",
                                                                                          "",
                                                                                          YAML::dump($aggregate["data"])))));
@@ -293,6 +295,7 @@ public function admin_edit_aggregate($admin) {
                                "last_updated" => 0,
                                "feather" => $_POST['feather'],
                                "author" => $_POST['author'],
+                               "status" => $_POST['status'],
                                "data" => YAML::load($_POST['data']));
 
             unset($config->aggregates[$_GET['id']]);

diff --git a/modules/aggregator/locale/en_US.pot b/modules/aggregator/locale/en_US.pot
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: modules/aggregator/aggregator.php:369
+#: modules/aggregator/aggregator.php:372
 msgid "You can use XPath to navigate the feed and find the correct attribute."
 msgstr ""
 
 #: modules/aggregator/aggregator.php:12
 msgid "Delete Aggregate"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:342
+#: modules/aggregator/aggregator.php:345
 msgid "Aggregate deleted."
 msgstr ""
 
@@ -55,11 +55,11 @@ msgstr ""
 msgid "To call a function and use its return value for the post's value, use <code>call:</code>. Separate arguments with <code> || </code>."
 msgstr ""
 
-#: modules/aggregator/aggregator.php:375
+#: modules/aggregator/aggregator.php:378
 msgid "Functions"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:365
+#: modules/aggregator/aggregator.php:368
 msgid "Use <a href=\"http://yaml.org/\">YAML</a> to specify what post attribute holds what value of the feed entry."
 msgstr ""
 
@@ -72,7 +72,7 @@ msgstr ""
 msgid "Source URL"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:304
+#: modules/aggregator/aggregator.php:307
 msgid "Aggregate updated."
 msgstr ""
 
@@ -82,11 +82,11 @@ msgstr ""
 msgid "Feather"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:383
+#: modules/aggregator/aggregator.php:386
 msgid "From the Photo feather:"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:373
+#: modules/aggregator/aggregator.php:376
 msgid "To get the attribute of an element, use XPath to find it and the <code>.attr[]</code> syntax to grab an attribute."
 msgstr ""
 
@@ -95,11 +95,11 @@ msgstr ""
 msgid "Check Feeds Every %s Minutes"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:380
+#: modules/aggregator/aggregator.php:386
 msgid "To get the URL of an image in the content"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:262
+#: modules/aggregator/aggregator.php:263
 msgid "Aggregate created."
 msgstr ""
 
@@ -113,63 +113,63 @@ msgstr ""
 msgid "Edit Aggregate"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:382
+#: modules/aggregator/aggregator.php:385
 msgid "Example"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:363
+#: modules/aggregator/aggregator.php:365
 msgid "Post Values"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:270
-#: modules/aggregator/aggregator.php:312
-#: modules/aggregator/aggregator.php:335
+#: modules/aggregator/aggregator.php:271
+#: modules/aggregator/aggregator.php:315
+#: modules/aggregator/aggregator.php:338
 msgid "You do not have sufficient privileges to delete this aggregate."
 msgstr ""
 
-#: modules/aggregator/aggregator.php:267
-#: modules/aggregator/aggregator.php:309
-#: modules/aggregator/aggregator.php:326
+#: modules/aggregator/aggregator.php:268
+#: modules/aggregator/aggregator.php:312
+#: modules/aggregator/aggregator.php:329
 msgid "An ID is required to delete an aggregate."
 msgstr ""
 
-#: modules/aggregator/pages/admin/new_aggregate.twig:35
-#: modules/aggregator/pages/admin/edit_aggregate.twig:36
+#: modules/aggregator/pages/admin/new_aggregate.twig:52
+#: modules/aggregator/pages/admin/edit_aggregate.twig:53
 msgid "Post Attributes"
 msgstr ""
 
 #: modules/aggregator/pages/admin/new_aggregate.twig:3
-#: modules/aggregator/pages/admin/new_aggregate.twig:46
-#: modules/aggregator/pages/admin/manage_aggregates.twig:55
+#: modules/aggregator/pages/admin/new_aggregate.twig:63
+#: modules/aggregator/pages/admin/manage_aggregates.twig:57
 #: modules/aggregator/aggregator.php:10
 msgid "Add Aggregate"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:367
+#: modules/aggregator/aggregator.php:370
 msgid "XPath"
 msgstr ""
 
-#: modules/aggregator/pages/admin/manage_aggregates.twig:20
+#: modules/aggregator/pages/admin/manage_aggregates.twig:21
 msgid "source"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:340
+#: modules/aggregator/aggregator.php:343
 msgid "Aggregate and its posts deleted."
 msgstr ""
 
 #: modules/aggregator/pages/admin/aggregation_settings.twig:10
 msgid "disable"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:379
+#: modules/aggregator/aggregator.php:382
 msgid "To upload an image from the content"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:378
+#: modules/aggregator/aggregator.php:381
 msgid "The Aggregator module provides a couple helper functions:"
 msgstr ""
 
-#: modules/aggregator/aggregator.php:371
+#: modules/aggregator/aggregator.php:374
 msgid "Attributes"
 msgstr ""
 
@@ -181,13 +181,48 @@ msgstr ""
 msgid "Pulls content RSS2/Atom feeds into your Chyrp installation as posts."
 msgstr ""
 
-#: modules/aggregator/pages/admin/manage_aggregates.twig:12
+#: modules/aggregator/pages/admin/manage_aggregates.twig:13
 msgid "Last Update"
 msgstr ""
 
+#: modules/aggregator/pages/admin/new_aggregate.twig:43
+#: modules/aggregator/pages/admin/manage_aggregates.twig:12
+#: modules/aggregator/pages/admin/edit_aggregate.twig:44
+msgid "Author"
+msgstr ""
+
 #: modules/aggregator/pages/admin/new_aggregate.twig:26
 #: modules/aggregator/pages/admin/manage_aggregates.twig:11
 #: modules/aggregator/pages/admin/edit_aggregate.twig:27
-msgid "Author"
+msgid "Default Status"
+msgstr ""
+
+#: modules/aggregator/pages/admin/new_aggregate.twig:28
+#: modules/aggregator/pages/admin/edit_aggregate.twig:29
+msgid "Draft"
+msgstr ""
+
+#: modules/aggregator/pages/admin/new_aggregate.twig:29
+#: modules/aggregator/pages/admin/edit_aggregate.twig:30
+msgid "Public"
+msgstr ""
+
+#: modules/aggregator/pages/admin/new_aggregate.twig:30
+#: modules/aggregator/pages/admin/edit_aggregate.twig:31
+msgid "Private"
+msgstr ""
+
+#: modules/aggregator/pages/admin/new_aggregate.twig:31
+#: modules/aggregator/pages/admin/edit_aggregate.twig:32
+msgid "Scheduled"
 msgstr ""
 
+#: modules/aggregator/pages/admin/new_aggregate.twig:32
+#: modules/aggregator/pages/admin/edit_aggregate.twig:33
+msgid "Registered Only"
+msgstr ""
+
+#: modules/aggregator/pages/admin/new_aggregate.twig:33
+#: modules/aggregator/pages/admin/edit_aggregate.twig:34
+msgid "Group"
+msgstr ""
diff --git a/modules/aggregator/pages/admin/edit_aggregate.twig b/modules/aggregator/pages/admin/edit_aggregate.twig
@@ -23,6 +23,23 @@
                         {% endfor %}
                         </select>
                     </p>
+                    <p>
+                        <label for="status">${ "Default Status" | translate("aggregator") }</label>
+                        <select name="status" id="status">
+                            <option value="draft"{% if aggregate.status == "draft" %} selected="selected"{% endif %}>${ "Draft" | translate("aggregator") }</option>
+                            <option value="public"{% if aggregate.status == "public" %} selected="selected"{% endif %}>${ "Public" | translate("aggregator") }</option>
+                            <option value="private"{% if aggregate.status == "private" %} selected="selected"{% endif %}>${ "Private" | translate("aggregator") }</option>
+                            <option value="scheduled"{% if aggregate.status == "scheduled" %} selected="selected"{% endif %}>${ "Scheduled" | translate("aggregator") }</option>
+                            <option value="registered_only"{% if aggregate.status == "registered_only" %} selected="selected"{% endif %}>${ "Registered Only" | translate("aggregator") }</option>
+                            {% if groups %}
+                            <optgroup label="${ "Group" | translate("aggregator") }">
+                                {% for group in groups %}
+                                <option value="{$group.id}"${ aggregate.status | option_selected("{"~ group.id ~"}") }>${ group.name | escape }</option>
+                                {% endfor %}
+                            </optgroup>
+                            {% endif %}
+                        </select>
+                    </p>
                     <p>
                         <label for="author">${ "Author" | translate("aggregator") }</label>
                         <select name="author" id="author">

diff --git a/modules/aggregator/pages/admin/manage_aggregates.twig b/modules/aggregator/pages/admin/manage_aggregates.twig
@@ -8,6 +8,7 @@
                     <tr class="head">
                         <th>${ "Name" | translate("aggregator") }</th>
                         <th>${ "Feather" | translate("aggregator") }</th>
+                        <th>${ "Default Status" | translate("aggregator") }</th>
                         <th>${ "Author" | translate("aggregator") }</th>
                         <th>${ "Last Update" | translate("aggregator") }</th>
                         ${ trigger.call("manage_aggregates_column_header") }
@@ -19,6 +20,7 @@
                     <tr class="aggregate {% if loop.last %} last{% endif %}">
                         <td class="main">$aggregate.name <span class="sub">(<a href="$aggregate.url">${ "source" | translate("aggregator") }</a>)</a></td>
                         <td>${ aggregate.feather | capitalize }</td>
+                        <td>${ aggregate.status | capitalize }</td>
                         <td>${ aggregate.user.full_name | fallback(aggregate.user.login) }</td>
                         <td>{% if aggregate.last_updated %}${ aggregate.last_updated | strftime }{% else %}<span class="sub">${ "never" | translate }</span>{% endif %}</td>
                         ${ trigger.call("manage_aggregates_column", aggregate) }

diff --git a/modules/aggregator/pages/admin/new_aggregate.twig b/modules/aggregator/pages/admin/new_aggregate.twig
@@ -22,6 +22,23 @@
                         {% endfor %}
                         </select>
                     </p>
+                    <p>
+                        <label for="status">${ "Default Status" | translate("aggregator") }</label>
+                        <select name="status" id="status">
+                            <option value="draft">${ "Draft" | translate("aggregator") }</option>
+                            <option value="public" selected="selected">${ "Public" | translate("aggregator") }</option>
+                            <option value="private">${ "Private" | translate("aggregator") }</option>
+                            <option value="scheduled">${ "Scheduled" | translate("aggregator") }</option>
+                            <option value="registered_only">${ "Registered Only" | translate("aggregator") }</option>
+                            {% if groups %}
+                            <optgroup label="${ "Group" | translate("aggregator") }">
+                                {% for group in groups %}
+                                <option value="{$group.id}">${ group.name | escape }</option>
+                                {% endfor %}
+                            </optgroup>
+                            {% endif %}
+                        </select>
+                    </p>
                     <p>
                         <label for="author">${ "Author" | translate("aggregator") }</label>
                         <select name="author" id="author">