Changeset 1440

Timestamp:

03/07/08 02:00:16 (16 months ago)

Author:

freakerz

Message:

Merging r1439.

There are no changes yet in this branch as we made the merge into trunk early on.

This branch will be used to work Atom and APP validation/separation.

/me pokes michaeltwofish

Location:

branches/111307-atom

Files:

• doc/manual/index.html (modified) (1 diff)
• index.php (modified) (3 diffs)
• scripts/support.js (deleted)
• system/admin/admin.js (modified) (5 diffs)
• system/admin/css/admin.css (modified) (5 diffs)
• system/admin/dashboard.php (modified) (1 diff)
• system/admin/groups.php (modified) (3 diffs)
• system/admin/header.php (modified) (1 diff)
• system/admin/images/bar-back-drop.png (modified) (previous)
• system/admin/login.php (modified) (4 diffs)
• system/admin/logs.php (modified) (1 diff)
• system/admin/media.js (modified) (3 diffs)
• system/admin/moderate.php (modified) (1 diff)
• system/admin/plugins.php (modified) (4 diffs)
• system/admin/publish.php (modified) (1 diff)
• system/admin/publish_settings.php (modified) (2 diffs)
• system/admin/themes.php (modified) (2 diffs)
• system/admin/user.php (modified) (1 diff)
• system/classes/acl.php (modified) (3 diffs)
• system/classes/adminhandler.php (modified) (24 diffs)
• system/classes/atomhandler.php (modified) (7 diffs)
• system/classes/comments.php (modified) (22 diffs)
• system/classes/controller.php (modified) (1 diff)
• system/classes/cronjob.php (modified) (9 diffs)
• system/classes/crontab.php (modified) (2 diffs)
• system/classes/databaseconnection.php (modified) (4 diffs)
• system/classes/db.php (modified) (24 diffs)
• system/classes/error.php (modified) (13 diffs)
• system/classes/eventlog.php (modified) (12 diffs)
• system/classes/feedbackhandler.php (modified) (3 diffs)
• system/classes/format.php (modified) (14 diffs)
• system/classes/formui.php (modified) (9 diffs)
• system/classes/installhandler.php (modified) (13 diffs)
• system/classes/logentry.php (modified) (14 diffs)
• system/classes/pluggable.php (modified) (2 diffs)
• system/classes/plugin.php (modified) (2 diffs)
• system/classes/plugins.php (modified) (3 diffs)
• system/classes/post.php (modified) (38 diffs)
• system/classes/posts.php (modified) (17 diffs)
• system/classes/rewriterules.php (modified) (1 diff)
• system/classes/session.php (modified) (4 diffs)
• system/classes/site.php (modified) (4 diffs)
• system/classes/stack.php (modified) (1 diff)
• system/classes/tags.php (modified) (1 diff)
• system/classes/theme.php (modified) (20 diffs)
• system/classes/url.php (modified) (11 diffs)
• system/classes/user.php (modified) (10 diffs)
• system/classes/usergroup.php (modified) (1 diff)
• system/classes/usergroups.php (copied) (copied from trunk/htdocs/system/classes/usergroups.php)
• system/classes/userhandler.php (modified) (4 diffs)
• system/classes/userthemehandler.php (modified) (3 diffs)
• system/classes/utils.php (modified) (2 diffs)
• system/classes/version.php (modified) (5 diffs, 1 prop)
• system/classes/xmlrpcclient.php (modified) (1 diff)
• system/installer/db_setup.php (modified) (13 diffs)
• system/installer/requirements.php (modified) (4 diffs)
• system/installer/script.js (modified) (5 diffs)
• system/installer/style.css (modified) (7 diffs)
• system/plugins/flickrsilo/flickrsilo.plugin.php (modified) (4 diffs)
• system/plugins/pingback/pingback.plugin.php (modified) (13 diffs)
• system/plugins/simplefilesilo/simplefilesilo.plugin.php (modified) (5 diffs)
• system/plugins/themehelper/themehelper.plugin.php (modified) (6 diffs)
• system/plugins/undelete/undelete.plugin.php (modified) (3 diffs)
• system/plugins/viddlersilo/viddlersilo.plugin.php (modified) (4 diffs)
• system/plugins/wpimport/wpimport.plugin.php (modified) (2 diffs)
• system/schema/mysql/connection.php (modified) (4 diffs)
• system/schema/mysql/schema.sql (modified) (1 diff)
• system/schema/sqlite/connection.php (modified) (5 diffs)
• system/schema/sqlite/schema.sql (modified) (1 diff)
• system/themes/k2/entry.multiple.php (modified) (1 diff)
• system/themes/k2/entry.single.php (modified) (1 diff)
• system/themes/k2/footer.php (modified) (1 diff)
• system/themes/k2/header.php (modified) (2 diffs)
• system/themes/k2/home.php (modified) (1 diff)
• system/themes/k2/login.php (modified) (1 diff)
• system/themes/k2/page.single.php (modified) (1 diff)
• system/themes/k2/search.php (modified) (1 diff)
• system/themes/k2/style.css (modified) (1 diff)
• system/themes/k2/tag.php (modified) (1 diff)
• system/themes/k2/theme.php (modified) (1 diff)

branches/111307-atom/doc/manual/index.html

@@ -734 +734 @@
         {
                 if ( $plugin_id == $this->plugin_id() ) {
-                        $actions[] = _('Configure');
+                        $actions[] = _t('Configure');
                 }
                 return $actions;
         }</pre>
-The _() function translates the string into the language used by the site.  For English-language blogs, the output would be "Configure", while for Spanish-language blogs, for example, the output might be "Configurar".
+The _t() function translates the string into the language used by the site.  For English-language blogs, the output would be "Configure", while for Spanish-language blogs, for example, the output might be "Configurar".
+The _e() function echoes a translated string for display.
 <pre>public function action_plugin_ui( $plugin_id, $action )
         {
                 if ( $plugin_id == $this->plugin_id() ) {
                         switch ( $action ) {
-                                case _('Configure') :
+                                case _t('Configure') :
                                         $ui = new FormUI( strtolower( get_class( $this ) ) );
-                                        $customvalue= $ui->add( 'text', 'customvalue', _('Your custom value:') );
+                                        $customvalue= $ui->add( 'text', 'customvalue', _t('Your custom value:') );
                                         $ui->on_success( array( $this, 'updated_config' ) );
                                         $ui->out();

branches/111307-atom/index.php

@@ -23 +23 @@
  * The path to the root of this Habari installation.
  */
-define( 'HABARI_PATH', dirname( __FILE__ ) );
+if( ! defined( 'HABARI_PATH' ) ) {
+    define( 'HABARI_PATH', dirname( __FILE__ ) );
+}
 
 // We start up output buffering in order to take advantage of output compression,
@@ -153 +155 @@
 }
 
+// If we're doing unit testing, stop here
+if( defined( 'UNIT_TEST' ) ) {
+    return;
+}
+
 // Send the Content-Type HTTP header.
 // @todo Find a better place to put this.
@@ -188 +195 @@
 // Flush (send) the output buffer.
 ob_flush();
+
 ?>

branches/111307-atom/system/admin/admin.js

@@ -3 +3 @@
         $(this).hover(
             function() { $(this).addClass(c);  },
-            function() { $(this).removeClass(c); }
+            function() { $(this).removeClass(c); $('.menu-list').hide();}
         );
     });
 };
+
+$.fn.resizeable = function(){
+
+    this.each(function() {
+        var textarea = $(this);
+        var offset = null;
+        var grip = $('<div class="grip"></div>').mousedown(function(ev){
+            offset = textarea.height() - (ev.clientY + document.documentElement.scrollTop)
+            $(document).mousemove(doDrag).mouseup(endDrag);
+        }).mouseup(endDrag);
+        var resizer = $('<div class="resizer"></div>').css('margin-bottom',$(this).css('margin-bottom'));
+        $(this).css('margin-bottom', '0px').wrap(resizer).parent().append(grip);
+
+        function doDrag(ev){
+            textarea.height(Math.max(offset + ev.clientY + document.documentElement.scrollTop, 60) + 'px');
+            return false;
+        }
+
+        function endDrag(ev){
+            $(document).unbind('mousemove', doDrag).unbind('mouseup', endDrag);
+            textarea.css('opacity', 1.0);
+        }
+
+    });
+}
+
 
 String.prototype.trim = function() { return this.replace(/^\s+|\s+$/g, ''); }
@@ -19 +45 @@
     });
 
-    $("#menu .menu-item").hover(
+    $("#oldmenu .menu-item").hover(
         function(){ $("ul", this).fadeIn("fast"); },
         function() { }
@@ -25 +51 @@
 
     if (document.all) {
-        $("#menu .menu-item").hoverClass("sfHover");
+        $("#oldmenu .menu-item").hoverClass("iehover");
     }
 
@@ -66 +92 @@
     });
 
-    /* Resizable Textareas */
-    $('textarea.resizable').each(function() {
-        var textarea = $(this);
-        var offset = null;
-        var grip = $('<div class="grip"></div>').mousedown(function(ev){
-            offset = textarea.height() - (ev.clientY + document.documentElement.scrollTop)
-            $(document).mousemove(doDrag).mouseup(endDrag);
-        }).mouseup(endDrag);
-        var resizer = $('<div class="resizer"></div>').css('margin-bottom',$(this).css('margin-bottom'));
-        $(this).css('margin-bottom', '0px').wrap(resizer).parent().append(grip);
-
-        function doDrag(ev){
-            textarea.height(Math.max(offset + ev.clientY + document.documentElement.scrollTop, 60) + 'px');
-            return false;
-        }
-
-        function endDrag(ev){
-            $(document).unbind('mousemove', doDrag).unbind('mouseup', endDrag);
-            textarea.css('opacity', 1.0);
-        }
-
-    });
+    /* Make Textareas Resizable */
+    $('.resizable').resizeable();
 
     /* Tabs, using jQuery UI Tabs */
@@ -164 +170 @@
 habari.editor = {
     insertSelection: function(value) {
+        if($('#content').filter('.islabeled').size() > 0) {
+            $('#content').filter('.islabeled')
+                .removeClass('islabeled')
+                .val(value);
+        }
+        else {
+            var contentel = $('#content')[0];
+            if('selectionStart' in contentel) {
+                var content = $('#content').val();
+                $('#content').val(content.substr(0, contentel.selectionStart) + value + contentel.value.substr(contentel.selectionEnd, content.length));
+            }
+            else if(document.selection) {
+                contentel.focus();
+                document.selection.createRange().text = value;
+            }
+            else {
+                $('#content').filter('.islabeled')
+                    .removeClass('islabeled')
+                    .val(value);
+            }
+        }
+    },
+    getContents: function() {
+        return $('#content').val();
+    },
+    setContents: function(contents) {
         $('#content').filter('.islabeled')
             .val('')
             .removeClass('islabeled');
-        $("#content").val($("#content").val() + value);
+        $('#content').val(contents)
+    },
+    getSelection: function(contents) {
+        if($('#content').filter('.islabeled').size() > 0) {
+            return '';
+        }
+        else {
+            var contentel = $('#content')[0];
+            if('selectionStart' in contentel) {
+                return $('#content').val().substr(contentel.selectionStart, contentel.selectionEnd - contentel.selectionStart);
+            }
+            else if(document.selection) {
+                contentel.focus();
+                var range = document.selection.createRange();
+                if (range == null) {
+                    return '';
+                }
+                return range.text;
+            }
+            else {
+                return $("#content").val();
+            }
+        }
     }
 };

branches/111307-atom/system/admin/css/admin.css

@@ -96 +96 @@
     width: 105px;
     padding: 0 0 0 15px;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAGlJREFUeNpinD59+mcGBgYeBtzgCxOQ6GPAD/pgit7hUPAOpugjHtNA4h+ZoJyJQPwCTcELqDgDTNEXIO5AU9QBFYcrAoHpQPwUyn4K5TOgK/oFxE1A/AhK/4JJsKBZsQCqaB+yIECAAQB0mBnahYs+3AAAAABJRU5ErkJggg==) 100px center no-repeat; /* png is dropdown arrow */
+    /* background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAGlJREFUeNpinD59+mcGBgYeBtzgCxOQ6GPAD/pgit7hUPAOpugjHtNA4h+ZoJyJQPwCTcELqDgDTNEXIO5AU9QBFYcrAoHpQPwUyn4K5TOgK/oFxE1A/AhK/4JJsKBZsQCqaB+yIECAAQB0mBnahYs+3AAAAABJRU5ErkJggg==) 100px center no-repeat; /* png is dropdown arrow */
+    background: url(../images/bar-back-drop.png) 100px center no-repeat;
     }
 
@@ -110 +111 @@
     }
 
-#oldmenu li.menu-item:hover ul {
+#oldmenu li.menu-item:hover ul, #oldmenu li.menu-item.iehover ul {
     top: 22px;
     }
@@ -123 +124 @@
     }
 
-#oldmenu li.menu-item:hover .menu-list a:hover {
+#oldmenu li.menu-item:hover .menu-list a:hover, #oldmenu li.menu-item.iehover .menu-list a:hover {
     color: white;
     background: #333;
     }
-
-
-
-/* The NEW HOTNESS Menu */
-
-#menu {
-    position: fixed;
-    top: 0;
-    height: 32px;
-    padding: 0 0px;
-    width: 100%;
-    font-size: 1.2em;
-    background: #242424 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAICAIAAAC3eAIWAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABhJREFUeNpikpOTY2JgYABjRkZGdAwQYAAMYgB6RRurTwAAAABJRU5ErkJggg==) repeat-x top; /* Top dropshadow */
-    }
-
-#menu li {
-    display: inline;
-    }
-
-#menu li#site-name {
-    float: right;
-    margin-right: 10px;
-    }
-
-#menu li#site-name a {
-    padding: 0 20px 0 20px;
-    border: none;
-    }
-
-#menu > li > a {
-    font-family: 'HelveticaNeue-Light', 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
-    }
-
-#menu li a {
-    color: white;
-    line-height: 32px;
-    text-decoration:none;
-    display: block;
-    }
-
-#menu li.menu-item:hover a, #menu li#site-name a:hover {
-    background-color: #424242;
-    }
-
-#menu > .menu-item {
-    float: left;
-    }
-
-#menu #contentmenu {
-    border-left: 1px solid #131313;
-    margin-left: 10px;
-    }
-
-#menu #adminmenu {
-    border-left: 1px solid #131313;
-    border-right: 1px solid #131313;
-    }
-
-#menu > .menu-item > a {
-    width: 105px;
-    padding: 0 0 0 15px;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAGlJREFUeNpinD59+mcGBgYeBtzgCxOQ6GPAD/pgit7hUPAOpugjHtNA4h+ZoJyJQPwCTcELqDgDTNEXIO5AU9QBFYcrAoHpQPwUyn4K5TOgK/oFxE1A/AhK/4JJsKBZsQCqaB+yIECAAQB0mBnahYs+3AAAAABJRU5ErkJggg==) 100px center no-repeat; /* png is dropdown arrow */
-    }
-
-#menu li.menu-item > ul {
-    position: absolute;
-    top: -10000px;
-    min-width: 120px;
-    max-width: 250px;
-    margin: 10px 0 0 -1px;
-    }
-
-.menu-list {
-    background: #e1e1e1;
-    border: 1px solid #b0b0b0;
-    border-top: none;
-    padding: 5px 0;
-    }
-
-#menu li.menu-item:hover ul {
-    top: 22px;
-    }
-
-#menu li.menu-item .menu-list a {
-    width: auto;
-    font-size: .8em;
-    line-height: 1.6em;
-    color: #333;
-    padding: 3px 15px;
-    background: none;
-    }
-
-#menu .submenuitems {
-    margin: 0;
-    }
-
-#menu .submenuitems a {
-    font-size: .75em !important;
-    padding-left: 25px !important;
-    color: #777 !important;
-    }
-
-#menu .menu-list li {
-    display: block;
-    }
-
-#menu #createpagelink {
-    padding-bottom: 5px;
-    border-bottom: 1px solid #bbb;
-    }
-
-#menu #managecontentlink {
-    padding-top: 5px;
-    }
-
-#menu li.menu-item:hover .menu-list a:hover {
-    color: white !important;
-    background: #333;
-    }
-
-
 
 /* Page Splitter Tabs */
@@ -464 +344 @@
 /* BluePrint Overrides */
 
-#plugin_options {
-    background: #3A3A3A;
+#plugin_options, #theme_options {
+    background: #333333 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAVCAYAAACHUoQEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAEBJREFUeNpiYGBgSGICEowg4i+I+AMnfoGI33ACzP0FxAxmIMIARGiBCBUQIQciJEGECIjgAxFcIIINRDADBBgAlsIJb8O3yoQAAAAASUVORK5CYII=) top repeat-x; /* Drop shadow */
     border-top: 1px solid #C0C0C0;
     border-bottom: 1px solid #C0C0C0;
@@ -473 +353 @@
 }
 
-#plugin_options h2 {
+#plugin_options h2, #theme_options h2 {
     color: white;
 }

branches/111307-atom/system/admin/dashboard.php

@@ -207 +207 @@
   </div>
   <hr>
-  <div class="column prepend-7 span-16 first">
+  <div class="column prepend-8 span-15 first">
     <h3>Drafts (<a href="<?php URL::out( 'admin', 'page=content' ); ?>#drafts" title="View Your Drafts">more</a> &raquo;)</h3>
     <?php

branches/111307-atom/system/admin/groups.php

@@ -15 +15 @@
 <ul>
 <?php
-foreach ( $groups as $id => $name )
-{
-        echo '<li>';
-        echo '<form method="post" action=""><input type="hidden" name="group" value="' . $id . '"><input type="submit" name="delete_group" value="Delete"> ';
+foreach ( $groups as $group ) {
+    echo '<li>';
+    echo '<form method="post" action=""><input type="hidden" name="group" value="' . $group->name . '"><input type="submit" name="delete_group" value="Delete"> ';
     echo '<input type="submit" name="edit_group" value="Edit"> ';
-    echo $name . '</form>';
-        echo '</li>';
+    echo $group->name . '</form>';
+    echo '</li>';
 }
 ?>
@@ -29 +28 @@
 <p>Members</p>
 <?php
-if ( isset( $group ) ) {
+if ( isset( $group_edit ) ) {
     if ( isset( $users) && ( ! empty( $users ) ) ) {
+        echo '<p>Editing members of ' . $group_edit->name . '</p>';
         echo '<form method="post" action="">';
-        echo '<input type="hidden" name="group" value="' . $group . '">';
-        echo Utils::html_select( 'add_user', $users );
-        echo ' <input type="submit" value="Add"></form>';
-    }
-    if ( ! empty($group_members) ) {
-            echo '<ul>';
-            foreach ( $group_members as $member ) {
-                    $user= User::get_by_id($member);
-                    echo '<li><form method="post" action=""><input type="hidden" name="remove_user" value="' . $user->id . '">';
-            echo '<input type="hidden" name="user_group" value="' . $group . '"><input type="submit" value="Remove"></form> ' . $user->username . '</li>';
-            }
-            echo '</ul>';
+        echo '<input type="hidden" name="group" value="' . $group_edit->name . '">';
+        foreach ( $users as $user ) {
+            echo '<input type="checkbox" name="user_id[]" value="' . $user->id . '"';
+            if ( in_array( $user->id, $group_edit->members ) ) {
+                echo ' checked';
+            }
+            echo '"> ' . $user->username . '<br>';
+        }
+        echo '<input type="submit" name="users" value="Submit"></form>';
     } else {
         echo '<p>No members.</p>';
@@ -52 +49 @@
 <div class="column span-8 last">
 <p>Permissions</p>
+<?php
+if ( isset( $group_edit ) ) {
+    if ( isset( $permissions) && ( ! empty( $permissions ) ) ) {
+        echo '<p>Editing Permissions of ' . $group_edit->name . '</p>';
+        echo '<form method="post" action="">';
+        echo '<input type="hidden" name="group" value="' . $group_edit->name . '">';
+        echo '<table><tr><th>Granted</th><th>Permission</th><th>Denied</th></tr>';
+        foreach( $permissions as $perm ) {
+            echo '<tr>';
+            if(  isset( $permissions_granted[ $perm->id ] ) ) {
+                // indicate that this permission is granted
+            } elseif ( isset( $permissions_denied[ $perm->id ] ) ) {
+                // indicate that this permission is denied
+            }
+            echo "<td><input type='checkbox' name='grant[]' value='{$perm->id}'";
+            if ( in_array( $perm->id, $permissions_granted ) ) {
+                echo ' checked';
+            }
+            echo "></td><td> {$perm->description} </td><td>";
+            echo "<input type='checkbox' name='deny[]' value='{$perm->id}'";
+            if ( in_array( $perm->id, $permissions_denied ) ) {
+                echo ' checked';
+            }
+            echo '></td></tr>';
+        }
+        echo '<tr><td colspan="3"><input type="submit" name="permissions" value="' . _t('Submit') . '"></td>';
+        echo '</table></form>';
+    } else {
+        echo '<p>No permissions.</p>';
+    }
+}
+?>
 </div>
 </div>

branches/111307-atom/system/admin/header.php

@@ -3 +3 @@
 <head>
     <title>Habari Administration</title>
-
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <link rel="stylesheet" href="<?php Site::out_url('habari'); ?>/3rdparty/blueprint/screen.css" type="text/css" media="screen, projection">
     <link rel="stylesheet" href="<?php Site::out_url('habari'); ?>/3rdparty/blueprint/print.css" type="text/css" media="print">

branches/111307-atom/system/admin/login.php

@@ -25 +25 @@
         }
 
-        #databasesetup {
+        #loginform {
             margin:0 auto;
         }
@@ -37 +37 @@
             margin-bottom: 50px;
         }
+        .notice, .error {
+            margin-left:auto;
+            margin-right:auto;
+            width:552px;
+        }
 
         </style>
 </head>
 <body>
-<ul id="menu">
+<ul id="oldmenu">
     <li id="site-name">
         <a href="<?php Site::out_url('habari'); ?>" title="<?php Options::out('title'); ?>"><?php Options::out('title'); ?></a>
     </li>
-
 </ul>
 
+<div style="min-height:45px;">
+<?php
+if ( Session::has_errors( 'expired_session' ) ) {
+    echo '<div class="error">' . Session::get_error( 'expired_session', false ) . '</div>';
+}
+if ( Session::has_errors( 'expired_form_submission' ) ) {
+    echo '<div class="notice">' . Session::get_error( 'expired_form_submission', false ) . '</div>';
+}
+?>
+</div>
+
 <div id="wrapper">
-<div id="masthead">
-    <h1>Habari</h1>
-</div>
 <form method="post" action="<?php URL::out( 'user', array( 'page' => 'login' ) ); ?>">
-<div class="installstep ready done" id="databasesetup">
-    <h2>Login to <?php Options::out( 'title' ); ?></h2>
+<div class="installstep ready done" id="loginform">
+    <h2>Login to Habari</h2>
     <div class="options">
         <div class="inputfield">
@@ -65 +77 @@
                 <input type="password" size="25" name="habari_password" id="habari_password">
             </p>
-            <p>
-                <input class="submit" type="submit" value="GO!">
+            <p class="center">
+                <input class="submit" type="submit" value="Let's go!">
             </p>
         </div>
@@ -74 +86 @@
 </form>
 
-<div id="footer">
+<div>
     <p class="left"><a href="<?php Site::out_url( 'habari' ); ?>/manual/index.html" onclick="popUp(this.href); return false;" title="Read the user manual">Manual</a> -
         <a href="http://wiki.habariproject.org/" title="Read the Habari wiki">Wiki</a> -
         <a href="http://groups.google.com/group/habari-users" title="Ask the community">Mailing List</a>
     </p>
-
-
 </div>
 

branches/111307-atom/system/admin/logs.php

@@ -61 +61 @@
              <input type="submit" name="do_delete" value="<?php _e('Delete'); ?>">
         </table>
+        </form>
     </div>
 </div>

branches/111307-atom/system/admin/media.js

@@ -35 +35 @@
                     output = '<table><tr>';
                     var first = ' first';
+                    habari.media.assets = result.files;
                     for(var file in result.files) {
                         stats = '';
-                        output += '<td><div class="media' + first + '"><div class="mediatitle">' + result.files[file].title + '</div><img src="' + result.files[file].thumbnail_url + '"><div class="mediastats"> ' + stats + '</div><div class="foroutput"><img src="' + result.files[file].url + '"></div></div></td>';
+                        output += '<td><div class="media' + first + '"><span class="foroutput">' + file + '</span>';
+
+                        if(result.files[file].filetype && habari.media.preview[result.files[file].filetype]) {
+                            output += habari.media.preview[result.files[file].filetype](file, result.files[file]);
+                        }
+                        else {
+                            output += habari.media.preview.image(file, result.files[file]);
+                        }
+
+                        output += '</div></td>';
                         first = '';
                     }
@@ -43 +53 @@
                     $('.mediaphotos', container).html(output);
                     $('.media').dblclick(function(){
-                        habari.editor.insertSelection($('.foroutput', this).html());
+                        habari.media.insertAsset(this);
                     });
                     $('.media_controls ul li:first', container).nextAll().remove();
@@ -87 +97 @@
         container = $('.mediasplitter:visible');
         $('.pathstore', container).addClass('toload');
+    },
+
+    preview: {
+        image: function(fileindex, fileobj) {
+            var stats = '';
+            return '<div class="mediatitle">' + fileobj.title + '</div><img src="' + fileobj.thumbnail_url + '"><div class="mediastats"> ' + stats + '</div>';
+        }
+    },
+
+    output: {
+        image: function(fileindex, fileobj) {
+            habari.editor.insertSelection('<img src="' + fileobj.url + '">');
+        }
+    },
+
+    submitPanel: function(form) {
+        var query = $(form).serialize();
+    },
+
+    insertAsset: function(asset) {
+        var id = $('.foroutput', asset).html();
+        if(this.assets[id].filetype && habari.media.output[this.assets[id].filetype]) {
+            habari.media.output[this.assets[id].filetype](id, this.assets[id]);
+        }
+        else {
+            habari.media.output.image(id, this.assets[id]);
+        }
     }
 

branches/111307-atom/system/admin/moderate.php

@@ -32 +32 @@
                 <label>URL <input type="checkbox" name="search_fields[]" class="search_field" value="url"<?php echo in_array('url', $search_fields) ? ' checked' : ''; ?>></label>
                 <?php echo Utils::html_select('search_status', $statuses, $search_status, array( 'class'=>'longselect')); ?>
-                <?php echo Utils::html_select('search_type', $types, $type, array( 'class'=>'longselect')); ?>
+                <?php echo Utils::html_select('search_type', $types, $search_type, array( 'class'=>'longselect')); ?>
             </p>
             </form>

branches/111307-atom/system/admin/plugins.php

@@ -3 +3 @@
 <hr>
   <?php if(Session::has_messages()) {Session::messages_out();} ?>
-    <div class="column prepend-1 span-22 append-1" id="welcome">
-        <h2>Currently Available Plugins</h2>
-        <p>Activate, deactivate and remove plugins through this interface.</p>
+    <div class="column prepend-2 span-20 append-2" id="welcome">
+        <h2 class="center">Currently Available Plugins</h2>
+        <p class="center">Activate, deactivate and configure plugins through this interface.</p>
     </div>
-    <div class="column prepend-1 span-22 append-1">
+    <div class="column prepend-2 span-20 append-2">
+        <h3>Active Plugins</h3>
         <table cellspacing="0" width="100%">
             <thead>
@@ -20 +21 @@
             <tbody>
             <?php
-            foreach($plugins as $plugin) {
+            foreach($active_plugins as $plugin) {
+
                 if($plugin['debug']) {
                 ?>
@@ -68 +70 @@
                     </tbody></table></div></div>
                     <div id="plugin_options"><div class="container"><div class="column prepend-1 span-22 append-1">
-                        <h2><?php echo $plugins[$configure]['info']->name; ?> : <?php echo $action; ?></h2>
+                        <h2><?php echo $active_plugins[$configure]['info']->name; ?> : <?php echo $action; ?></h2>
                         <?php
                             Plugins::act( 'plugin_ui', $configure, $action );
                         ?>
+                        <a class="link_as_button" href="<?php URL::out( 'admin', 'page=plugins' ); ?>"><?php echo 'close' ?></a>
                     </div></div></div>
                     <div class="wrapper">
                     <div class="container">
-                    <div class="column prepend-1 span-22 append-1">
+                    <div class="column prepend-2 span-20 append-2">
                     <table cellspacing="0" width="100%"><tbody>
                     <?php } ?>
@@ -82 +85 @@
             </tbody>
         </table>
+        <h3>Inactive Plugins</h3>
+        <table cellspacing="0" width="100%">
+            <thead>
+                <tr>
+                    <th align="left">Plugin Name</th>
+                    <th align="left">Author Name</th>
+                    <th align="left">Version</th>
+                    <th align="left">Description</th>
+                    <th>Action</th>
+                </tr>
+            </thead>
+            <tbody>
+            <?php
+            foreach($inactive_plugins as $plugin) {
+                
+                if($plugin['debug']) {
+                ?>  
+                    <tr>
+                        <td colspan="3" class="error"><p>The plugin file '<?php echo $plugin['file']; ?>' had syntax errors and could not load.</p>
+                        <div style="display:none;" id="error_<?php echo $plugin['plugin_id']; ?>"><?php echo $plugin['error']; ?></div>
+                        </td>
+                        <td><button onclick="$('#error_<?php echo $plugin['plugin_id']; ?>').show();">Show Error</button></td>
+                    </tr>
+                <?php
+                }   
+                else {
+                ?>  
+                    <tr id="plugin_<?php echo $plugin['plugin_id']; ?>">
+                        <td><?php echo '<a href="' . $plugin['info']->url . '">' . $plugin['info']->name . '</a>'; ?>
+                        </td>
+                        <td><?php echo empty( $plugin['info']->authorurl ) ? $plugin['info']->author : '<a href="' . $plugin['info']->authorurl . '">' . $plugin['info']->author . '</a>'; ?></td>         
+                        <td><?php echo $plugin['info']->version; ?></td>
+                        <td><?php echo $plugin['info']->description; ?></td>
+                        <td>
+                        <form method='POST' action='<?php URL::out( 'admin', 'page=plugin_toggle' ); ?>'>
+                        <p><input type='hidden' name='plugin' value='<?php echo $plugin['file']; ?>'>
+                        <input type='hidden' name='action' value='Activate'>
+                        <button name='submit' type='submit'><?php echo $plugin['verb']; ?></button>
+                        </p>
+                        </form>
+                        </td>
+                    </tr>
+                    <?php if ( isset( $this->engine_vars['configure'] ) && ( $configure == $plugin['plugin_id'] ) ) { ?>
+                    </tbody></table></div></div>
+                    <div class="wrapper">
+                    <div class="container">
+                    <div class="column prepend-1 span-22 append-1">
+                    <table cellspacing="0" width="100%"><tbody>
+                    <?php } ?>
+                <?php } ?>
+            <?php } ?>
+            </tbody>
+        </table>
+
+
     </div>
 </div>

branches/111307-atom/system/admin/publish.php

@@ -92 +92 @@
         <?php endforeach; ?>
     </div>
-
+    <div style="display:none;" id="hiddenfields">
+    <input type="hidden" name="content_type" value="<?php echo $content_type; ?>">
+    <?php if ( $post->slug != '' ) { ?>
+    <input type="hidden" name="slug" id="slug" value="<?php echo $post->slug; ?>">
+    <?php } ?>
+    </div>
 
     <div id="formbuttons" class="container">

branches/111307-atom/system/admin/publish_settings.php

@@ -1 @@
-                <input type="hidden" name="content_type" value="<?php echo $content_type; ?>">
                 <div class="container">
                     <p class="column span-5"><?php _e('Content State'); ?></p>
@@ -13 +12 @@
                 <div class="container"><p class="column span-5"><?php _e('Content Address'); ?></p>     <p class="column span-14 last"><input type="text" name="newslug" id="newslug" class="styledformelement" value="<?php echo $post->slug; ?>"></p></div>
 
-                <?php if ( $post->slug != '' ) { ?>
-                <p><input type="hidden" name="slug" id="slug" value="<?php echo $post->slug; ?>"></p>
-                <?php } ?>

branches/111307-atom/system/admin/themes.php

@@ -4 +4 @@
     <?php if(Session::has_messages()) {Session::messages_out();} ?>
     <div class="column prepend-1 span-22 append-1">
-        <h2>Currently Available Themes</h2>
-        <p>Activate, deactivate and remove themes through this interface.</p>
+        <h2 class="center">Currently Available Themes</h2>
+        <p class="center">Activate, deactivate, configure and remove themes through this interface.</p>
     </div>
+        <?php
+        if ( isset( $this->engine_vars['configure'] ) ): ?>
+            </div>
+                <div id="theme_options"><div class="container"><div class="column prepend-1 span-22 append-1">
+                    <h2><?php echo $active_theme_name ?> : Configure</h2>
+                    <?php Plugins::act( 'theme_ui', $active_theme ); ?>
+                    <a class="link_as_button" href="<?php URL::out( 'admin', 'page=themes' ); ?>"><?php echo 'close' ?></a>
+                </div></div></div>
+            <div class="container">
+        <?php endif; ?>
     <div class="column prepend-1 span-22 append-1">
         <?php foreach( $all_themes as $theme ) : ?>
@@ -14 +24 @@
                  by <a href="<?php echo $theme['info']->url; ?>"><?php echo $theme['info']->author; ?></a>
 
-                <?php if ( $theme['dir'] != $active_theme ) { ?>
+                <?php if ( $theme['dir'] != $active_theme_dir ) { ?>
                 <form method='post' action='<?php URL::out('admin', 'page=activate_theme'); ?>'>
                 <input type='hidden' name='theme_name' value='<?php echo $theme['info']->name; ?>'>
                 <input type='hidden' name='theme_dir' value='<?php echo $theme['dir']; ?>'>
                 <input type='submit' name='submit' value='activate'>
-                </form> 
+                </form>
                 <?php } else {
-                    echo "<br><strong>Currently Active Theme</strong><br><br>";
+                        echo "<br><strong>Currently Active Theme</strong><br><br>";
+                        if ( $configurable ) {
+                        ?>
+                            <a class="link_as_button" href="<?php URL::out( 'admin', 'page=themes&configure=' . $theme['dir'] ); ?>">Configure</a>
+                        <?php
+                        }
                   }
                  ?>
-                
+
             </div>
         <?php endforeach; ?>

branches/111307-atom/system/admin/user.php

@@ -40 +40 @@
         <p><label>Username:</label></p>
         <p><input type="text" name="username" value="<?php echo $user->username; ?>"></p>
+                <p><label>Display Name:</label></p>
+                <p><input type="text" name="displayname" value="<?php echo $user->info->displayname; ?>"></p>
         <p><label>Email address:</label></p>
         <p><input type="text" name="email" value="<?php echo $user->email; ?>"></p>

branches/111307-atom/system/classes/acl.php

@@ -1 +1 @@
 <?php
 
-/** 
+/**
  * Access Control List class
- *  
+ *
  * The default Habari ACL class implements groups, and group permissions
  * Users are assigned to one or more groups.
@@ -11 +11 @@
  * that permission denies the user that permission, even if another group
  * grants that permission.
- *     
+ *
  * @package Habari
  **/
- 
+
 class ACL {
-    /**
-     * An array of users assigned to a specific group id.
-     * Both the group and the user are id integers, not string values.
-     * The user arrays have both the key and the value set to the user_id.       
-     * For example:
-     * <code>
-     * self::$groups= array(
-     *  1 => array(1 => 1),
-     *  2 => array(1 => 1, 2 => 2),
-     * );
-     * </code>
-     **/     
-    private static $groups= array();
-
-    /**
-     * An array of group IDs with group names.
-     * For example:
-     * <code>
-     * self::$group_names= array(
-     *  1 => 'administrators',
-     *  2 => 'guests',
-     * );
-     * </code>   
-     **/         
-    private static $group_names= array();
-
-    /**
-     * An array of permssions assigned to a group.
-     * The group and permission are both id integers, not string values.
-     * The key of each permission array is the permission id.  
-     * The value of the permission id is boolean on whether to grant or deny that permission.
-     * For example:
-     * <code>
-     * self::$group_permissions= array(
-     *  1 => array( 1 => true, 2 => true),
-     *  2 => array( 2 => false),
-     * );
-     * </code>
-     **/                                            
-    private static $group_permissions= array();
-
-    /**
-     * An array in which specific user permissions are cached as they are built from the other structures.
-     **/            
-    private static $user_permissions= array();
-    
-    /**
-     * An array of permissions, with the permission id as the key and the string value as the value.
-     **/        
-    private static $permissions= array();
-    
     /**
      * How to handle a permission request for a permission that is not in the permission list.
@@ -72 +21 @@
      * It's true at the moment because that allows access to all features for upgrading users.
      * @todo Decide if this is a setting we need or want to change, or perhaps it should be an option.
-     **/                    
+     **/
     const ACCESS_NONEXISTANT_PERMISSION = true;
 
     /**
-     * Load all group and permission data from the DB
-     * __static() class members are called by __autoload()   
-    **/
-    public static function __static()
-    {
-        $results= DB::get_results( 'SELECT * FROM ' . DB::table('groups') );
-        foreach ($results as $group) {
-            self::$group_names[$group->id]= $group->name;
-        }
-        $results= DB::get_results( 'SELECT * FROM ' . DB::table('permissions'));
-        foreach ( $results as $permission ) {
-            self::$permissions[$permission->id] = $permission->name;
-        }
-        $results= DB::get_results( 'SELECT * FROM ' . DB::table('users_groups') );
-        foreach ( $results as $group ) {
-            self::$groups[$group->group_id][$group->user_id]= $group->user_id;
-        }
-        $results= DB::get_results( 'SELECT * FROM ' . DB::table('groups_permissions'));
-        foreach ( $results as $permission ) {
-            self::$group_permissions[$permission->group_id][$permission->permission_id]= !$permission->denied;
-        }
+     * Create a new permission, and save it to the Permissions table
+     * @param string The name of the permission
+     * @param string The description of the permission
+     * @return mixed the ID of the newly created permission, or boolean FALSE
+    **/
+    public static function create_permission( $name, $description )
+    {
+        $name= self::normalize_permission( $name );
+        // first, make sure this isn't a duplicate
+        if ( ACL::permission_exists( $name ) ) {
+            return false;
+        }
+        $allow= true;
+        // Plugins have the opportunity to prevent adding this permission
+        $allow= Plugins::filter('permission_create_allow', $allow, $name, $description );
+        if ( ! $allow ) {
+            return false;
+        }
+        Plugins::act('permission_create_before', $name, $description);
+        $result= DB::query('INSERT INTO {permissions} (name, description) VALUES (?, ?)', array( $name, $description) );
+        if ( ! $result ) {
+            // if it didn't work, don't bother trying to log it
+            return false;
+        }
+        EventLog::log('New permission created: ' . $name, 'info', 'default', 'habari');
+        Plugins::act('permission_create_after', $name, $description );
+        return $result;
+    }
+
+    /**
+     * Remove a permission, and any assignments of it
+     * @param mixed a permission ID or name
+     * @return bool whether the permission was deleted or not
+    **/
+    public static function destroy_permission( $permission )
+    {
+        // make sure the permission exists, first
+        if ( ! ACL::permission_exists( $permission ) ) {
+            return false;
+        }
+
+        // Use ids internall for permissions
+        $permission= ACL::permission_id( $permission );
+
+        $allow= true;
+        // plugins have the opportunity to prevent deletion
+        $allow= Plugins::filter('permission_destroy_allow', $allow, $permission);
+        if ( ! $allow ) {
+            return false;
+        }
+        Plugins::act('permission_destroy_before', $permission );
+        // capture the permission name
+        $name= DB::get_value( 'SELECT name FROM {permissions} WHERE id=?', array( $permission ) );
+        // remove all references to this permissions
+        $result= DB::query( 'DELETE FROM {groups_permissions} WHERE permission_id=?', array( $permission ) );
+        // remove this permission
+        $result= DB::query( 'DELETE FROM {permissions} WHERE permissions_id=?', array( $permission ) );
+        if ( ! $result ) {
+            // if it didn't work, don't bother trying to log it
+            return false;
+        }
+        EventLog::log('Permission deleted: ' . $name, 'info', 'default', 'habari');
+        Plugins::act('permission_destroy_after', $permission );
+        return $result;
+    }
+
+    /**
+     * Get an array of QueryRecord objects containing all permissions
+     * @param string the order in which to sort the returning array
+     * @return array an array of QueryRecord objects containing all permissions
+    **/
+    public static function all_permissions( $order= 'id' )
+    {
+        $order= strtolower( $order );
+        if ( ( 'id' != $order ) && ( 'name' != $order ) && ( 'description' != $order ) ) {
+            $order= 'id';
+        }
+        $permissions= DB::get_results( 'SELECT id, name, description FROM {permissions} ORDER BY ' . $order );
+        return $permissions ? $permissions : array();
+    }
+
+    /**
+     * Get a permission's name by its ID
+     * @param int a permission ID
+     * @return string the name of the permission, or boolean FALSE
+    **/
+    public static function permission_name( $id )
+    {
+        if ( ! is_int( $id ) ) {
+            return false;
+        } else {
+            return DB::get_value( 'SELECT name FROM {permissions} WHERE id=?', array( $id ) );
+        }
+    }
+
+    /**
+     * Get a permission's ID by its name
+     * @param string the name of the permission
+     * @return int the permission's ID
+    **/
+    public static function permission_id( $name )
+    {
+        if( is_integer($name) ) {
+            return $name;
+        }
+        $name= self::normalize_permission( $name );
+        return DB::get_value( 'SELECT id FROM {permissions} WHERE name=?', array( $name ) );
+    }
+
+    /**
+     * Fetch a permission description from the DB
+     * @param mixed a permission name or ID
+     * @return string the description of the permission
+    **/
+    public static function permission_description( $permission )
+    {
+        if ( is_int( $permission) ) {
+            $query= 'id';
+        } else {
+            $query= 'name';
+            $permission= self::normalize_permission( $permission );
+        }
+        return DB::get_value( "SELECT description FROM {permissions} WHERE $query=?", array( $permission ) );
+    }
+
+    /**
+     * Determine whether a permission exists
+     * @param mixed a permission name or ID
+     * @return bool whether the permission exists or not
+    **/
+    public static function permission_exists( $permission )
+    {
+        if ( is_int( $permission ) ) {
+            $query= 'id';
+        }
+        else {
+            $query= 'name';
+            $permission= self::normalize_permission( $permission );
+        }
+        return ( DB::get_value( "SELECT COUNT(id) FROM {permissions} WHERE $query=?", array( $permission ) ) > 0 );
     }
 
     /**
      * Determine whether the specified user is a member of the specified group
-     * @param int A user  ID
-     * @param int A group ID
+     * @param mixed A user  ID or name
+     * @param mixed A group ID or name
      * @return bool True if the user is in the group, otherwise false
     **/
     public static function user_in_group( $user_id, $group_id )
     {
-        return isset(self::$groups[self::group_id( $group_id )][$user_id]);
-    }
-
-    /**
-     * Return an array of the groups to which this user belongs
-     * @param int A user ID
-     * @return array An array of group IDs
-    **/
-    public static function user_group_list( $user_id )
-    {
-        $user_id= intval($user_id);
-        return array_keys( array_filter( self::$groups, create_function('$a', 'return isset($a[' . $user_id . ']);') ) );
+        if ( ! is_int( $user_id ) ) {
+            $user= User::get( $user_id );
+            $user_id= $user->id;
+        }
+        if ( ! is_int( $group_id ) ) {
+            $group_id= UserGroup::id( $group_id );
+        }
+        $group= DB::get_value( 'SELECT id FROM {users_groups} WHERE user_id=? AND group_id=?', array( $user_id, $group_id ) );
+        if ( $group ) {
+            return true;
+        }
+        return false;
     }
 
     /**
      * Determine whether a group can perform a specific action
-     * @param int A group ID
-     * @param string An action
+     * @param mixed $group A group ID or name
+     * @param mixed $permission An action ID or name
      * @return bool Whether the group can perform the action
     **/
-    public static function group_can( $group_id, $action )
-    {
-        return isset(self::$group_permissions[self::group_id( $group_id )][$action]) && self::$group_permissions[self::group_id( $group_id )][$action];
-    }
-    
-    /**
-     * Return the id of a group, provided the name
-     * @param string $group_id The name of the group
-     * @return int The group id
-     **/
-    public static function group_id( $group_id )
-    {
-        if(!is_numeric($group_id)) {
-            $group_id = array_search($group_id, self::$group_names);
-        }
-        return $group_id;
-    }               
+    public static function group_can( $group, $permission )
+    {
+        // Use only numeric ids internally
+        $group= UserGroup::id( $group );
+        $permission= ACL::permission_id( $permission );
+        $result= DB::get_value( 'SELECT denied FROM {groups_permissions} WHERE permission_id=? AND group_id=?', array( $permission, $group ) );
+        if ( 0 === intval($result) ) {
+            // the permission has been granted to this group
+            return true;
+        }
+        // either the permission hasn't been granted, or it's been
+        // explicitly denied.
+        return false;
+    }
 
     /**
      * Determine whether a user can perform a specific action
-     * @param int A user ID
-     * @param string An action
+     * @param mixed $user A user object, user ID or a username
+     * @param mixed $permission A permission ID or name
      * @return bool Whether the user can perform the action
     **/
-    public static function user_can( $user_id, $action )
-    {
-        if(($permission_id = array_search($action, self::$permissions)) === false) {
-            return ACL::ACCESS_NONEXISTANT_PERMISSION;
-        }
-        if(!isset(self::$user_permissions[$user_id])) {
-            self::$user_permissions[$user_id] = array();
-            foreach( self::user_group_list( $user_id ) as $group_id )   {
-                foreach( self::$group_permissions[$group_id] as $action => $grant ) {
-                    if(isset(self::$user_permissions[$user_id][$permission_id])) {
-                        self::$user_permissions[$user_id][$permission_id]= self::$user_permissions[$user_id][$permission_id] && $grant;
-                    }
-                    else {
-                        self::$user_permissions[$user_id][$permission_id]= $grant;
-                    }
-                }
+    public static function user_can( $user, $permission )
+    {
+        // Use only numeric ids internally
+        $permission= ACL::permission_id( $permission );
+        // if we were given a user ID, use that to fetch the group membership from the DB
+        if ( is_int( $user) ) {
+            $user_id= $user;
+        } else {
+            // otherwise, make sure we have a User object, and get
+            // the groups from that
+            if ( ! $user instanceof User ) {
+                $user= User::get( $user );
             }
-        }
-        return isset(self::$user_permissions[$user_id][$permission_id]) && self::$user_permissions[$user_id][$permission_id];
+            $user_id= $user->id;
+        }
+
+        // we select the "denied" value from all the permissions
+        // assigned to all the groups to which this user is a member.
+        // array_unique() should consolidate this down to, at most,
+        // two values: 0 and 1.
+        $permissions= DB::get_column('SELECT gp.denied from {groups_permissions} gp, {users_groups} g where gp.group_id = g.group_id and g.user_id=? and permission_id=?', array( $user_id, $permission ) );
+
+        // if any group is explicitly denied access to this permission,
+        // this user is denied access to that permission
+        if ( in_array( 1, $permissions ) ) {
+            return false;
+        }
+        // if the permission is not explicitly denied, make sure it's
+        // explicitly granted.  If it is, the user can do this.
+        if ( in_array( 0, $permissions, true ) ) {
+            return true;
+        }
+        // if the permission is neither denied nor granted, they're not
+        // allowed to do it.
+        return self::ACCESS_NONEXISTANT_PERMISSION;
+        return false;
+    }
+
+    /**
+     * Convert a permission name into a valid format
+     *
+     * @param string $name The name of a permission
+     * @return string The permission with spaces converted to underscores and all lowercase
+     */
+    public static function normalize_permission( $name )
+    {
+        return strtolower( preg_replace( '/\s+/', '_', trim($name) ) );
     }
 }

branches/111307-atom/system/classes/adminhandler.php

@@ -18 +18 @@
         $user= User::identify();
         if ( !$user ) {
+            Session::error( _t('Your session expired.'), 'expired_session' );
             Session::add_to_set( 'login', $_SERVER['REQUEST_URI'], 'original' );
+            if ( !empty( $_POST ) ) {
+                Session::add_to_set( 'last_form_data', $_POST, 'post' );
+                Session::error( _t('We saved the last form you posted. Log back in to continue its submission.'), 'expired_form_submission' );
+            }
+            if ( !empty( $_GET ) ) {
+                Session::add_to_set( 'last_form_data', $_GET, 'get' );
+                Session::error( _t('We saved the last form you posted. Log back in to continue its submission.'), 'expired_form_submission' );
+            }
             Utils::redirect( URL::get( 'user', array( 'page' => 'login' ) ) );
             exit;
@@ -25 +34 @@
             die( _t( 'Permission denied.' ) );
         }
+        $last_form_data= Session::get_set( 'last_form_data' ); // This was saved in the "if ( !$user )" above, UserHandler transferred it properly.
+        /* At this point, Controller has not created handler_vars, so we have to modify $_POST/$_GET. */
+        if ( isset( $last_form_data['post'] ) ) {
+            $_POST= array_merge( $_POST, $last_form_data['post'] );
+            $_SERVER['REQUEST_METHOD']= 'POST'; // This will trigger the proper act_admin switches.
+            Session::remove_error( 'expired_form_submission' );
+        }
+        if ( isset( $last_form_data['get'] ) ) {
+            $_GET= array_merge( $_GET, $last_form_data['get'] );
+            Session::remove_error( 'expired_form_submission' );
+            // No need to change REQUEST_METHOD since GET is the default.
+        }
         $user->remember();
     }
@@ -34 +55 @@
     {
         $page= ( isset( $this->handler_vars['page'] ) && !empty( $this->handler_vars['page'] ) ) ? $this->handler_vars['page'] : 'dashboard';
-        $this->theme= Themes::create( 'admin', 'RawPHPEngine', Site::get_dir( 'admin_theme', TRUE ) );
+        $theme_dir = Plugins::filter( 'admin_theme_dir', Site::get_dir( 'admin_theme', TRUE ) );
+        $this->theme= Themes::create( 'admin', 'RawPHPEngine', $theme_dir );
         $this->set_admin_template_vars( $this->theme );
+        $this->theme->admin_page = $page;
         switch( $_SERVER['REQUEST_METHOD'] ) {
             case 'POST':
+                // Let plugins try to handle the page
+                Plugins::act('admin_theme_post_' . $page, $this, $this->theme);
                 // Handle POSTs to the admin pages
                 $fn= 'post_' . $page;
@@ -50 +75 @@
                 break;
             default:
+                // Let plugins try to handle the page
+                Plugins::act('admin_theme_get_' . $page, $this, $this->theme);
                 // Handle GETs of the admin pages
                 $fn= 'get_' . $page;
@@ -57 +84 @@
                 }
                 // If a get_ function doesn't exist, just load the template and display it
-                $files= Utils::glob( Site::get_dir( 'admin_theme', TRUE ) . '*.php' );
-                $filekeys= array_map( create_function( '$a', 'return basename( $a, \'.php\' );' ), $files );
-                $map= array_combine( $filekeys, $files );
-                if ( isset( $map[$page] ) ) {
+                if ( $this->theme->template_exists( $page ) ) {
                     $this->display( $page );
                 }
@@ -120 +144 @@
 
     /**
+     * Handles get requests for the dashboard
+     */
+    public function get_dashboard()
+    {
+        // Not sure how best to determine this yet, maybe set an option on install, maybe do this:
+        $firstpostdate = strtotime(DB::get_value('SELECT min(pubdate) FROM {posts} WHERE status = ?', array(Post::status('published'))));
+        $firstpostdate = time() - $firstpostdate;
+        $this->theme->active_time = array(
+            'years' => floor($firstpostdate / 31536000),
+            'months' => floor(($firstpostdate % 31536000) / 2678400),
+            'days' => round(($firstpostdate % 2678400) / 86400),
+        );
+
+        $this->theme->stats = array(
+            'author_count' => DB::get_value('SELECT count(*) FROM {posts} GROUP BY user_id;'),
+            'page_count' => DB::get_value('SELECT count(pubdate) FROM {posts} WHERE content_type = ? and status = ?', array(Post::type('page'), Post::status('published'))),
+            'entry_count' => DB::get_value('SELECT count(pubdate) FROM {posts} WHERE content_type = ? and status = ?', array(Post::type('entry'), Post::status('published'))),
+            'comment_count' => DB::get_value('SELECT min(pubdate) FROM {posts} WHERE content_type = ?', array(Post::type('page'))),
+            'tag_count' => DB::get_value('SELECT count(*) FROM {tags}'),
+            'page_draft_count' => DB::get_value('SELECT min(pubdate) FROM {posts} WHERE content_type = ? and status = ?', array(Post::type('page'), Post::status('draft'))),
+            'entry_draft_count' => DB::get_value('SELECT min(pubdate) FROM {posts} WHERE content_type = ? and status = ?', array(Post::type('entry'), Post::status('draft'))),
+            'unapproved_comment_count' => Comments::count_total( Comment::STATUS_UNAPPROVED ),
+        );
+
+        $this->theme->recent_posts = Posts::get( array( 'status' => 'published', 'limit' => 8 ) );
+        $this->theme->recent_comments = Comments::get( array( 'status' => 'approved', 'limit' => 5 ) );
+
+        $this->display( 'dashboard' );
+    }
+
+    /**
      * Handles post requests from the publish page.
      */
@@ -128 +183 @@
             $post= Post::get( array( 'slug' => $slug, 'status' => Post::status( 'any' ) ) );
             $post->title= $title;
-            $post->slug= $newslug;
+            if ( ( $newslug != '' ) && ( $newslug != $slug ) ) {
+                $post->slug= $newslug;
+            }
             $post->tags= $tags;
             $post->content= $content;
@@ -248 +305 @@
         $user= $currentuser;
         extract( $this->handler_vars );
-        $fields= array( 'user_id' => 'id', 'delete' => NULL, 'username' => 'username', 'email' => 'email', 'imageurl' => 'imageurl', 'pass1' => NULL );
+        $fields= array( 'user_id' => 'id', 'delete' => NULL, 'username' => 'username', 'displayname' => 'displayname', 'email' => 'email', 'imageurl' => 'imageurl', 'pass1' => NULL );
         $fields= Plugins::filter( 'adminhandler_post_user_fields', $fields );
 
@@ -264 +321 @@
                         if ( isset( $user_id ) && ( $currentuser->id != intval( $user_id ) ) ) {
                             $username= $user->username;
-                            $posts= Posts::get( array( 'user_id' => $user_id ) );
+                            $posts= Posts::get( array( 'user_id' => $user_id, 'nolimit' => 1 ) );
                             if ( isset( $reassign ) && ( 1 === intval( $reassign ) ) ) {
                                 // we're going to re-assign all of this user's posts
                                 $newauthor= isset( $author ) ? intval( $author ) : 1;
-                                foreach ( $posts as $post ) {
-                                    $post->user_id= $newauthor;
-                                    $post->update();
-                                }
-                            } else {
+                                Posts::reassign( $newauthor, $posts );
+                            }
+                            else {
                                 // delete posts
                                 foreach ( $posts as $post ) {
@@ -392 +447 @@
     }
 
+    /**
+     * A POST handler for the admin themes page that simply passes those options through.
+     */
+    public function post_themes()
+    {
+        return $this->get_themes();
+    }
+
+    /**
+     * Handles GET requests for the theme listing
+     */
     function get_themes()
     {
-        $this->theme->active_theme= Options::get( 'theme_dir' );
-        $this->theme->all_themes= Themes::get_all_data();
+
+        $all_themes= Themes::get_all_data();
+        $this->theme->all_themes= $all_themes;
+
+        $active_theme_dir= Options::get( 'theme_dir' );
+        $this->theme->active_theme_dir= $active_theme_dir;
+        $this->theme->active_theme= $all_themes[$active_theme_dir];
+
+        // instantiate the active theme to see if it's configurable
+        $active_theme= Themes::create();
+        $this->theme->active_theme_name= $all_themes[$active_theme_dir]['info']->name;
+        $this->theme->configurable= Plugins::filter( 'theme_config', false, $active_theme);
 
         $this->theme->display( 'themes' );
@@ -470 +546 @@
             // Delete all comments that have the spam status.
             Comments::delete_by_status( Comment::STATUS_SPAM );
+            // let's optimize the table
+            $result= DB::query('OPTIMIZE TABLE {comments}');
             Session::notice( _t( 'Deleted all spam comments' ) );
             Utils::redirect();
@@ -514 +592 @@
                         // This comment was marked as spam
                         $comment= Comment::get( $comment->id );
-                        $modstatus['Marked %d comments as spam'] += $comment->status != Comment::STATUS_SPAM;
+                        $modstatus['Marked %d comments as spam']+= $comment->status != Comment::STATUS_SPAM;
                         $comment->status= Comment::STATUS_SPAM;
                         $comment->update();
@@ -521 +599 @@
                         // This comment was marked for approval
                         $comment= Comment::get( $comment->id );
-                        $modstatus['Approved %d comments'] += $comment->status != Comment::STATUS_APPROVED;
+                        $modstatus['Approved %d comments']+= $comment->status != Comment::STATUS_APPROVED;
+                        $modstatus['Approved comments on these posts: %s'] = (isset($modstatus['Approved comments on these posts: %s'])? $modstatus['Approved comments on these posts: %s'] . ' &middot; ' : '') . '<a href="' . $comment->post->permalink . '">' . $comment->post->title . '</a> ';
                         $comment->status= Comment::STATUS_APPROVED;
                         $comment->update();
@@ -528 +607 @@
                         // This comment was marked for unapproval
                         $comment= Comment::get( $comment->id );
-                        $modstatus['Unapproved %d comments'] += $comment->status != Comment::STATUS_UNAPPROVED;
+                        $modstatus['Unapproved %d comments']+= $comment->status != Comment::STATUS_UNAPPROVED;
                         $comment->status= Comment::STATUS_UNAPPROVED;
                         $comment->update();
@@ -612 +691 @@
         $this->theme->default_radio= $default_radio;
 
+        if($search_type != 'All') {
+            $arguments['type']= intval( $search_type );
+        }
+
         if ( '' != $search ) {
             $arguments['criteria']= $search;
             $arguments['criteria_fields']= $search_fields;
-            if ( $search_status == 'All' ) {
-                unset( $arguments['status'] );
-            }
-            if ( $search_type == 'All' ) {
-                unset( $arguments['type'] );
-            }
+        }
+        if ( $search_status == 'All' ) {
+            unset( $arguments['status'] );
+        }
+        if ( $search_type == 'All' ) {
+            unset( $arguments['type'] );
         }
         $this->theme->comments= Comments::get( $arguments );
@@ -655 +738 @@
         $active_plugins= Plugins::get_active();
 
-        $plugins= array();
+        $sort_active_plugins= array();
+        $sort_inactive_plugins= array();
+
         foreach ( $all_plugins as $file ) {
             $plugin= array();
@@ -676 +761 @@
                     // in order to get its info()
                     include_once( $file );
-                    $pluginobj= Plugins::load( $file );
+                    $pluginobj= Plugins::load( $file, false );
                     $plugin['active']= false;
                     $plugin['verb']= _t( 'Activate' );
@@ -686 +771 @@
                 $plugin['debug']= true;
                 $plugin['error']= $error;
-            }
-            $plugins[$plugin_id]= $plugin;
-        }
-
-        $this->theme->plugins= $plugins;
+                $plugin['active']= false;
+            }
+            if ($plugin['active']) {
+                $sort_active_plugins[$plugin_id]= $plugin;
+            } else {
+                $sort_inactive_plugins[$plugin_id]= $plugin;
+            }
+        }
+
+        //$this->theme->plugins= array_merge($sort_active_plugins, $sort_inactive_plugins);
+        $this->theme->active_plugins= $sort_active_plugins;
+        $this->theme->inactive_plugins= $sort_inactive_plugins;
 
         $this->display( 'plugins' );
@@ -767 +859 @@
 
         // Set up Authors select box
-        $authors_temp= DB::get_results( 'SELECT username, user_id FROM ' . DB::table( 'users' ) . ' JOIN ' . DB::table( 'posts' ) . ' ON ' . DB::table( 'users' ) . '.id=' . DB::table( 'posts' ) . '.user_id GROUP BY user_id ORDER BY username ASC' );
+        $authors_temp= DB::get_results( 'SELECT username, user_id FROM {users} JOIN {posts} ON {users}.id={posts}.user_id GROUP BY user_id ORDER BY username ASC' );
         array_unshift( $authors_temp, new QueryRecord( array( 'username' => 'All', 'user_id' => 0 ) ) );
         $authors= array();
@@ -831 +923 @@
     {
         $locals= array(
-            'do_update' => false,
+            'do_delete' => false,
             'log_ids' => null,
             'nonce' => '',
@@ -852 +944 @@
             $this->theme->{$varname}= $$varname;
         }
+        if ( $do_delete && isset( $log_ids ) ) {
+            $okay= true;
+            if ( empty( $nonce ) || empty( $timestamp ) ||  empty( $PasswordDigest ) ) {
+                $okay= false;
+            }
+            // Ensure the request was submitted less than five minutes ago
+            if ( ( time() - strtotime( $timestamp ) ) > 300 ) {
+                $okay= false;
+            }
+            $wsse= Utils::WSSE( $nonce, $timestamp );
+            if ( $PasswordDigest != $wsse['digest'] ) {
+                $okay= false;
+            }
+            if ( $okay ) {
+                foreach ( $log_ids as $id ) {
+                    $ids[]= array( 'id' => $id );
+                }
+                $to_delete= EventLog::get( array( 'where' => $ids, 'nolimit' => 1 ) );
+                $logstatus= array( 'Deleted %d logs' => 0 );
+                foreach ( $to_delete as $log ) {
+                    $log->delete();
+                    $logstatus['Deleted %d logs']+= 1;
+                }
+                foreach ( $logstatus as $key => $value ) {
+                    if ( $value ) {
+                        Session::notice( sprintf( _t( $key ), $value ) );
+                    }
+                }
+            }
+            Utils::redirect();
+            die();
+        }
         $this->theme->severities= LogEntry::list_severities();
         $any= array( '0' => 'Any' );
@@ -956 +1080 @@
     public function post_groups()
     {
-        $this->theme->groups= UserGroup::all_groups();
+        $this->theme->groups= UserGroups::get_all();
         if ( isset( $this->handler_vars['add_group'] ) ) {
-            if ( UserGroup::add_group( $this->handler_vars['add_group'] ) ) {
-                Session::notice( sprintf(_t( 'Added group %s'), $this->handler_vars['add_group'] ) );
-                $this->theme->groups= UserGroup::all_groups();
+            $name= $this->handler_vars['add_group'];
+            if ( UserGroup::exists($name) ) {
+                Session::notice( sprintf(_t( 'The group %s already exists'), $name ) );
+            }
+            else {
+                $groupdata= array(
+                    'name' => $name
+                );
+                $group= UserGroup::create($groupdata);
+                Session::notice( sprintf(_t( 'Added group %s'), $name ) );
+                // reload the groups
+                $this->theme->groups= UserGroups::get_all();
             }
         }
 
         if ( isset( $this->handler_vars['delete_group'] ) ) {
-            // capture the group name before we delete it
-            $group_name=  $this->theme->groups[$this->handler_vars['group']];
-            if ( UserGroup::remove_group( intval($this->handler_vars['group'] ) ) ) {
-                Session::notice( sprintf( _t('Removed group %s'), $group_name ) );
+            $name= $this->handler_vars['group'];
+            if ( !UserGroup::exists($name) ) {
+                Session::notice( sprintf(_t( 'The group %s does not exist'), $name ) );
+            }
+            else {
+                $group= UserGroup::get($name);
+                $group->delete();
+                Session::notice( sprintf( _t( 'Removed group %s' ), $name ) );
                 // reload the groups
-                $this->theme->groups= UserGroup::all_groups();
-            }
-        }
-
-        if ( isset( $this->handler_vars['add_user'] ) ) {
-            UserGroup::add_user( $this->handler_vars['group'], $this->handler_vars['add_user'] );
-            $this->theme->groups= UserGroup::all_groups();
-        }
-
-        if ( isset( $this->handler_vars['remove_user'] ) ) {
-            UserGroup::remove_user( $this->handler_vars['user_group'], $this->handler_vars['remove_user'] );
-            $this->theme->groups= UserGroup::all_groups();
+                $this->theme->groups= UserGroups::get_all();
+            }
         }
 
         if ( isset( $this->handler_vars['edit_group'] ) ) {
-            $this->theme->group= $this->handler_vars['group'];
-            $this->theme->group_members= UserGroup::members( $this->theme->group );
-            $all_users= Users::get_all();
-            $users= array();
-            foreach ($all_users as $user) {
-                if ( ! in_array( $user->id,  $this->theme->group_members ) ) {
-                    $users[$user->id]= $user->username;
-                }
-            }
-            $this->theme->users= $users;
-        }
+            $name= $this->handler_vars['group'];
+            if ( !UserGroup::exists($name) ) {
+                Session::notice( sprintf(_t( 'The group %s does not exist'), $name ) );
+            }
+            else {
+                $group= UserGroup::get($name);
+                $this->theme->group_edit= $group;
+                $this->theme->members= $group->members;
+                $this->theme->users= Users::get_all();
+                $this->theme->permissions= ACL::all_permissions( 'description' );
+                $this->theme->permissions_granted= $group->granted;
+                $this->theme->permissions_denied= $group->denied;
+            }
+        }
+
+        if ( isset( $this->handler_vars['users'] ) ) {
+            $name= $this->handler_vars['group'];
+            if ( ! UserGroup::exists($name) ) {
+                Session::notice( sprintf(_t( 'The group %s does not exist'), $name ) );
+            }
+            else {
+                $group= UserGroup::get($name);
+                $add_users= array();
+                $remove_users= array();
+                $form_users= array();
+                if ( isset( $this->handler_vars['user_id'] ) ) {
+                    $form_users= $this->handler_vars['user_id'];
+                }
+                foreach ( Users::get_all() as $user ) {
+                    if ( in_array( $user->id, $form_users ) ) {
+                        $add_users[]= (int) $user->id;
+                    } else {
+                        $remove_users[]= (int) $user->id;
+                    }
+                }
+                if ( ! empty( $add_users ) ) {
+                    $group->add( $add_users );
+                }
+                if ( ! empty( $remove_users ) ) {
+                    $group->remove( $remove_users );
+                }
+                $group->update();
+                Session::notice( sprintf(_t( 'Modified membership of group %s'), $name ) );
+                // reload the groups
+                $this->theme->groups= UserGroups::get_all();
+            }
+        }
+
+        if ( isset( $this->handler_vars['permissions'] ) ) {
+            $group_name= $this->handler_vars['group'];
+            if ( !UserGroup::exists( $group_name ) ) {
+                Session::notice( sprintf(_t( 'The group %s does not exist'), $name ) );
+            }
+            else {
+                $grant= array();
+                $deny= array();
+                $revoke= array();
+                if ( isset( $this->handler_vars['grant'] ) ) {
+                    $form_grant= $this->handler_vars['grant'];
+                }
+                else {
+                    $form_grant= array();
+                }
+                if ( isset( $this->handler_vars['deny'] ) ) {
+                    $form_deny= $this->handler_vars['deny'];
+                }
+                else {
+                    $form_deny= array();
+                }
+                $group= UserGroup::get( $group_name );
+                foreach( ACL::all_permissions() as $permission ) {
+                    if ( in_array( $permission->id, $form_grant ) ) {
+                        $grant[]= (int) $permission->id;
+                    }
+                    elseif ( in_array( $permission->id, $form_deny ) ) {
+                        $deny[]= (int) $permission->id;
+                    }
+                    else {
+                        $revoke[]= (int) $permission->id;
+                    }
+                }
+                if ( ! empty( $grant ) ){
+                    $group->grant( $grant );
+                }
+                if ( ! empty( $deny ) ) {
+                    $group->deny( $deny );
+                }
+                if ( ! empty( $revoke ) ) {
+                    $group->revoke( $revoke );
+                }
+                $group->update();
+                Session::notice( sprintf(_t( 'Granted the permission to group %s'), $group_name ) );
+                // reload the groups
+                $this->theme->groups= UserGroups::get_all();
+            }
+        }
+
         $this->display( 'groups' );
     }
@@ -1078 +1291 @@
     public function ajax_media( $handler_vars )
     {
-        $path = $handler_vars['path'];
-        $rpath = $path;
-        $silo = Media::get_silo($rpath, true);  // get_silo sets $rpath by reference to the path inside the silo
-        $assets = Media::dir($path);
-        $output = array(
+        $path= $handler_vars['path'];
+        $rpath= $path;
+        $silo= Media::get_silo( $rpath, true );  // get_silo sets $rpath by reference to the path inside the silo
+        $assets= Media::dir( $path );
+        $output= array(
             'ok' => 1,
             'dirs' => array(),
@@ -1088 +1301 @@
             'path' => $path,
         );
-        foreach($assets as $asset) {
-            if($asset->is_dir) {
-                $output['dirs'][$asset->basename] = $asset->get_props();
+        foreach ( $assets as $asset ) {
+            if ( $asset->is_dir ) {
+                $output['dirs'][$asset->basename]= $asset->get_props();
             }
             else {
-                $output['files'][$asset->basename] = $asset->get_props();
-            }
-        }
-        $controls = array();
-        $controls = Plugins::filter('media_controls', $controls, $silo, $rpath, '');
-        $output['controls'] = '<li>' . implode('</li><li>', $controls) . '</li>';
-
-        echo json_encode($output);
+                $output['files'][$asset->basename]= $asset->get_props();
+            }
+        }
+        $controls= array();
+        $controls= Plugins::filter( 'media_controls', $controls, $silo, $rpath, '' );
+        $output['controls']= '<li>' . implode( '</li><li>', $controls ) . '</li>';
+
+        echo json_encode( $output );
     }
 
     public function ajax_media_panel( $handler_vars )
     {
-        $path = $handler_vars['path'];
-        $panelname = $handler_vars['panel'];
-        $rpath = $path;
-        $silo = Media::get_silo($rpath, true);  // get_silo sets $rpath by reference to the path inside the silo
-
-        $panel = '';
-        $panel = Plugins::filter('media_panels', $panel, $silo, $rpath, $panelname);
-        $controls = array();
-        $controls = Plugins::filter('media_controls', $controls, $silo, $rpath, $panelname);
-        $controls = '<li>' . implode('</li><li>', $controls) . '</li>';
-        $output = array(
+        $path= $handler_vars['path'];
+        $panelname= $handler_vars['panel'];
+        $rpath= $path;
+        $silo= Media::get_silo( $rpath, true );  // get_silo sets $rpath by reference to the path inside the silo
+
+        $panel= '';
+        $panel= Plugins::filter( 'media_panels', $panel, $silo, $rpath, $panelname );
+        $controls= array();
+        $controls= Plugins::filter( 'media_controls', $controls, $silo, $rpath, $panelname );
+        $controls= '<li>' . implode( '</li><li>', $controls ) . '</li>';
+        $output= array(
             'controls' => $controls,
             'panel' => $panel,
         );
 
-        header('content-type:text/javascript');
-        echo json_encode($output);
+        header( 'content-type:text/javascript' );
+        echo json_encode( $output );
     }
 

branches/111307-atom/system/classes/atomhandler.php

@@ -1 +1 @@
 <?php
 /**
-    * Habari AtomHandler class
-    * Produces Atom feeds and accepts Atom Publishing Protocol input    
-    * 
-    * @package Habari
-    * @todo Apply system error handling     
-    */
-    
+ * Habari AtomHandler class
+ * Produces Atom feeds and accepts Atom Publishing Protocol input
+ *
+ * @package Habari
+ * @todo Apply system error handling
+ */
+
 class AtomHandler extends ActionHandler
 {
-    
+
     public $user= NULL; // Cache the username
 
@@ -19 +19 @@
     public function __construct()
     {
-        Plugins::act('init_atom');
+        Plugins::act( 'init_atom' );
         /**
         * The following Format::apply calls should be moved into a plugin that is
@@ -33 +33 @@
         */
         if ( !$this->is_auth() ) {
-            Format::apply('autop', 'post_content_atom');
-        }
-    }
-    
-    /**
-        * Check if a user is authenticated for Atom editing
-        * 
-        * @todo This entire funciton should be put into the User class somehow.
-        * @todo X-WSSE
-        * @param bool $force Force authorization? If so, basic HTTP_AUTH is displayed if not authed
-        * @return User The logged-in user
-        */
+            Format::apply( 'autop', 'post_content_atom' );
+        }
+    }
+
+    /**
+     * Check if a user is authenticated for Atom editing
+     *
+     * @todo This entire function should be put into the User class somehow.
+     * @todo X-WSSE
+     * @param bool $force Force authorization? If so, basic HTTP_AUTH is displayed if not authed
+     * @return User The logged-in user
+     */
     function is_auth( $force= FALSE )
     {
-        try {
-            if ( ( $this->user == NULL ) || ( $force != FALSE ) ) {         
-                // If running PHP as CGI, extract/decode the credentials from $_GET['HTTP_AUTHORIZATION']
-                // During installation, we add a special rule to pass the credentials via a GET request.
-                if ( isset( $_GET['HTTP_AUTHORIZATION'] ) ) {
-                    list( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] )= explode( ':', base64_decode( substr( $_GET['HTTP_AUTHORIZATION'], 6 ) ) );
-                }
-                
-                if ( isset( $_SERVER['PHP_AUTH_USER'] ) ) {
-                    User::authenticate( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] );
-                }
-                
-                if ( ( $force != FALSE ) && ( !$this->user = User::identify() ) ) {
-                    header( 'HTTP/1.1 401 Unauthorized' );
-                    header( 'Status: 401 Unauthorized' );
-                    header( 'WWW-Authenticate: Basic realm="Habari"' );
-                    die();
-                }
-            }
-            
-            return $this->user;
-        }
-        catch (Exception $e) {
-        print 'Caught exception: ' .  $e->getMessage() . "\n";
-        }
-    }
-    
-    /**
-        * Handle incoming requests for Atom entry collections
-        */
+        if ( ( $this->user == NULL ) || ( $force != FALSE ) ) {
+            if ( isset( $_SERVER['PHP_AUTH_USER'] ) ) {
+                User::authenticate( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] );
+            }
+
+            if ( ( $force != FALSE ) && ( !$this->user= User::identify() ) ) {
+                header( 'HTTP/1.1 401 Unauthorized' );
+                header( 'Status: 401 Unauthorized' );
+                header( 'WWW-Authenticate: Basic realm="Habari"' );
+                die();
+            }
+        }
+
+        return $this->user;
+    }
+
+    /**
+     * Handle incoming requests for Atom entry collections
+     */
     public function act_collection()
     {
@@ -90 +79 @@
 
     /**
-        * function act_entry
-        * 'index' should be 'slug'
-        */
+     * function act_entry
+     * 'index' should be 'slug'
+     */
     public function act_entry()
     {
@@ -107 +96 @@
         }
     }
-        
-    /**
-        * Handle incoming requests for RSD
-        * 
-        * @todo Move the internal list of supported feeds into options to allow dynamic editing of capabilities                 
-        */
+
+    /**
+     * Handle incoming requests for RSD
+     *
+     * @todo Move the internal list of supported feeds into options to allow dynamic editing of capabilities
+     */
     public function act_rsd()
     {
-        try {
-            /**
-                * List of APIs supported by the RSD
-                * Refer to namespace for required elements/attributes.
-                */
-            $apis_list= array(
-                'Atom' => array(
-                    'preferred' => 'true',
-                    'apiLink' => URL::get( 'collection', 'index=1' ), // This should be the XML-RPC url
-                    'blogID' => '',
-                ),
-            );
-            
-            $apis_list= Plugins::filter('rsd_api_list', $apis_list);
-                    
+        /**
+         * List of APIs supported by the RSD
+         * Refer to namespace for required elements/attributes.
+         */
+        $apis_list= array(
+            'Atom' => array(
+                'preferred' => 'true',
+                'apiLink' => URL::get( 'atom_feed', 'index=1' ), // This should be the XML-RPC url
+                'blogID' => '',
+            ),
+        );
+
+        $apis_list= Plugins::filter( 'rsd_api_list', $apis_list );
+
+        if ( Cache::has( 'atom:rsd:apis' ) ) {
+            $cache_apis= Cache::get( 'atom:rsd:apis' );
+            if ( ( $cache_apis === $apis_list ) && Cache::has( 'atom:rsd:xml' ) ) {
+                $cache_xml= Cache::get( 'atom:rsd:xml' );
+                $cache_xml= simplexml_load_string( $cache_xml );
+            }
+        }
+        else {
+            Cache::set( 'atom:rsd:apis', $apis_list );
+        }
+
+        if ( $cache_xml instanceOf SimpleXMLElement ) {
+            $xml= $cache_xml;
+        }
+        else {
             $xml= new SimpleXMLElement( '<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd"></rsd>' );
-            
+
             $rsd_service= $xml->addChild( 'service' );
             $service_engineName= $rsd_service->addChild( 'engineName', 'Habari' );
             $service_engineLink= $rsd_service->addChild( 'engineLink', 'http://www.habariproject.org/' );
-            $service_homePageLink= $rsd_service->addChild( 'homePageLink', Site::get_url('habari') );
+            $service_homePageLink= $rsd_service->addChild( 'homePageLink', Site::get_url( 'habari' ) );
             $service_apis= $rsd_service->addChild( 'apis' );
-            
+
             if ( !isset( $apis_list ) || ( count( $apis_list ) < 1 ) ) {
                 return false;
             }
-            
+
             foreach ( $apis_list as $apiName => $atts ) {
                 if ( !isset( $atts['preferred'], $atts['apiLink'], $atts['blogID'] ) ) {
                     continue;
                 }
-                
+
                 $apis_api= $service_apis->addChild( 'api' );
                 $apis_api->addAttribute( 'name', $apiName );
@@ -152 +155 @@
                 $apis_api->addAttribute( 'apiLink', $atts['apiLink'] );
                 $apis_api->addAttribute( 'blogID', $atts['blogID'] );
-                            
+
                 if ( !isset( $atts['settings'] ) || ( count( $atts['settings'] ) < 1 ) ) {
                     continue;
                 }
-                            
+
                 $api_settings= $apis_api->addChild( 'settings' );
-    
+
                 foreach ( $atts['settings'] as $settingName => $settingValue ) {
                     switch ( $settingName ) {
@@ -171 +174 @@
                             }
                             break;
-                    }                       
+                    }
                 }
-            } 
-            
-            $xml= Plugins::filter( 'rsd', $xml, $this->handler_vars );
-            $xml= $xml->asXML();
-            
-            ob_clean();
-            header( 'Content-Type: application/rsd+xml' );
-            print $xml;
-        }
-        catch (Exception $e) {
-        print 'Caught exception: ' .  $e->getMessage() . "\n";
-        }
-    }
-    
-    /**
-        * Handle incoming requests for the introspection document
-        */
+            }
+
+            Cache::set( 'atom:rsd:xml', $xml->asXML() );
+        }
+
+        $xml= Plugins::filter( 'rsd', $xml, $this->handler_vars );
+        $xml= $xml->asXML();
+
+        ob_clean();
+        header( 'Content-Type: application/rsd+xml' );
+        print $xml;
+    }
+
+    /**
+     * Handle incoming requests for the introspection document
+     */
     public function act_introspection()
     {
-        try {
+        if ( Cache::has( 'atom:introspection:xml' ) ) {
+            $cache_xml= Cache::get( 'atom:introspection:xml' );
+            $cache_xml= simplexml_load_string( $cache_xml );
+        }
+
+        if ( $cache_xml instanceOf SimpleXMLElement ) {
+            $xml= $cache_xml;
+        }
+        else {
             $xml= new SimpleXMLElement( '<service xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom"></service>' );
-            
+
             $service_workspace= $xml->addChild( 'workspace' );
-            
-            $workspace_title= $service_workspace->addChild( 'atom:title', Options::get( 'title' ), 'http://www.w3.org/2005/Atom' );
-            
+
+            $workspace_title= $service_workspace->addChild( 'atom:title', htmlspecialchars( Options::get( 'title' ) ), 'http://www.w3.org/2005/Atom' );
+
             $workspace_collection= $service_workspace->addChild( 'collection' );
-            $workspace_collection->addAttribute( 'href', URL::get( 'collection', 'index=1' ) );
-            
+            $workspace_collection->addAttribute( 'href', URL::get( 'atom_feed', 'index=1' ) );
+
             $collection_title= $workspace_collection->addChild( 'atom:title', 'Blog Entries', 'http://www.w3.org/2005/Atom' );
             $collection_accept= $workspace_collection->addChild( 'accept', 'application/atom+xml;type=entry' );
-            
-            $xml= Plugins::filter( 'atom_introspection', $xml, $this->handler_vars );
+
+            Cache::set( 'atom:introspection:xml', $xml->asXML() );
+        }
+
+        $xml= Plugins::filter( 'atom_introspection', $xml, $this->handler_vars );
+        $xml= $xml->asXML();
+
+        ob_clean();
+        header( 'Content-Type: application/atomsvc+xml' );
+        print $xml;
+    }
+
+    /**
+     * Handle incoming requests for the Atom entry collection for a specific tag
+     */
+    public function act_tag_collection()
+    {
+        $this->get_collection();
+    }
+
+    /**
+     * Handle incoming requests for the Atom entry collection for all comments
+     */
+    function act_comments( $params= array() )
+    {
+        $this->get_comments( $params );
+    }
+
+    /**
+     * Handle incoming requests for the Atom entry collection for comments on an entry
+     */
+    function act_entry_comments()
+    {
+        if ( isset( $this->handler_vars['slug'] ) ) {
+            $this->act_comments( array( 'slug' => $this->handler_vars['slug'] ) );
+        }
+        else {
+            $this->act_comments( array( 'id' => $this->handler_vars['id'] ) );
+        }
+    }
+
+    /**
+     * Output an Atom collection of comments based on the supplied parameters.
+     *
+     * @param array $params An array of parameters passed to Comments::get() to retrieve comments
+     */
+    function get_comments( $params= array() )
+    {
+        $params['status']= Post::status( 'published' );
+
+        $xml= new SimpleXMLElement( '<feed xmlns="http://www.w3.org/2005/Atom"></feed>' );
+
+        $feed_title= $xml->addChild( 'title', htmlspecialchars( Options::get( 'title' ) ) );
+
+        if ( $tagline= Options::get( 'tagline' ) ) {
+            $feed_subtitle= $xml->addChild( 'subtitle', htmlspecialchars( $tagline ) );
+        }
+
+        $feed_updated= $xml->addChild( 'updated', date( 'c', time() ) );
+
+        $feed_link= $xml->addChild( 'link' );
+        $feed_link->addAttribute( 'rel', 'alternate' );
+        $feed_link->addAttribute( 'href', URL::get( 'atom_feed_comments' ) );
+
+        $feed_link= $xml->addChild( 'link' );
+        $feed_link->addAttribute( 'rel', 'self' );
+
+        if ( isset( $params['slug'] ) ) {
+            $feed_link->addAttribute( 'href', URL::get( 'atom_feed_entry_comments', 'slug=' . $params['slug'] ) );
+        }
+        else {
+            $feed_link->addAttribute( 'href', URL::get( 'atom_feed_comments' ) );
+        }
+
+        $feed_generator= $xml->addChild( 'generator', 'Habari' );
+        $feed_generator->addAttribute( 'uri', 'http://www.habariproject.org/' );
+        $feed_generator->addAttribute( 'version', Version::get_habariversion() );
+
+        $feed_id= $xml->addChild( 'id', 'tag:' . Site::get_url( 'hostname' ) . ',' . date( "Y-m-d" ) . ':' . ( ( isset( $params['slug'] ) ) ? $params['slug'] : 'atom_comments' ) . '/' . Options::get( 'GUID' ) );
+
+        foreach ( Posts::get( $params ) as $post ) {
+
+            foreach ( $post->comments->approved as $comment ) {
+                $user= User::get_by_id( $post->user_id );
+                $title= ( $this->is_auth() ) ? htmlspecialchars( $post->title ) : htmlspecialchars( $post->title_atom );
+                $content= ( $this->is_auth() ) ? htmlspecialchars( $comment->content ) : htmlspecialchars( $comment->content_atom );
+
+                $feed_entry= $xml->addChild( 'entry' );
+                $entry_title= $feed_entry->addChild( 'title', 'Comment on ' . $title . ' by ' . $comment->name );
+
+                $entry_link= $feed_entry->addChild( 'link' );
+                $entry_link->addAttribute( 'rel', 'alternate' );
+                $entry_link->addAttribute( 'href', $post->permalink . '#comment-' . $comment->id );
+
+                $entry_author= $feed_entry->addChild( 'author' );
+                $author_name= $entry_author->addChild( 'name', $comment->name );
+
+                $entry_id= $feed_entry->addChild( 'id', $post->guid . '/' . $comment->id );
+
+                $entry_updated= $feed_entry->addChild( 'updated', date( 'c', strtotime( $comment->date ) ) );
+
+                $entry_content= $feed_entry->addChild( 'content', $content );
+                $entry_content->addAttribute( 'type', 'html' );
+            }
+        }
+
+        $xml= Plugins::filter( 'atom_get_comments', $xml, $params, $this->handler_vars );
+        $xml= $xml->asXML();
+
+        ob_clean();
+        header( 'Content-Type: application/atom+xml' );
+        print $xml;
+    }
+
+    /**
+     * Output the Atom entry for a specific slug
+     *
+     * @param string $slug The slug to get the entry for
+     */
+    public function get_entry( $slug )
+    {
+        $params['slug']= $slug;
+        $params['status']= Post::status( 'published' );
+
+        if ( $post= Post::get( $params ) ) {
+            $user= User::get_by_id( $post->user_id );
+            $title= ( $this->is_auth() ) ? htmlspecialchars( $post->title ) : htmlspecialchars( $post->title_atom );
+            $content= ( $this->is_auth() ) ? htmlspecialchars( $post->content ) : htmlspecialchars( $post->content_atom );
+
+            $xml= new SimpleXMLElement( '<entry xmlns="http://www.w3.org/2005/Atom"></entry>' );
+            $entry_title= $xml->addChild( 'title', $title );
+
+            $entry_author= $xml->addChild( 'author' );
+            $author_name= $entry_author->addChild( 'name', $user->username );
+
+            $entry_link= $xml->addChild( 'link' );
+            $entry_link->addAttribute( 'rel', 'alternate' );
+            $entry_link->addAttribute( 'href', $post->permalink );
+
+            $entry_link= $xml->addChild( 'link' );
+            $entry_link->addAttribute( 'rel', 'edit' );
+            $entry_link->addAttribute( 'href', URL::get( 'atom_entry', "slug={$post->slug}" ) );
+
+            $entry_id= $xml->addChild( 'id', $post->guid );
+            $entry_updated= $xml->addChild( 'updated', date( 'c', strtotime( $post->updated ) ) );
+            $entry_published= $xml->addChild( 'published', date( 'c', strtotime( $post->pubdate ) ) );
+
+            $entry_content= $xml->addChild( 'content', $content );
+            $entry_content->addAttribute( 'type', 'html' );
+
+            $xml= Plugins::filter( 'atom_get_entry', $xml, $slug, $this->handler_vars );
             $xml= $xml->asXML();
-            
-            ob_clean();
-            header( 'Content-Type: application/atomsvc+xml' );
-            print $xml;
-        }
-        catch (Exception $e) {
-        print 'Caught exception: ' .  $e->getMessage() . "\n";
-        }
-    }
-    
-    /**
-        * Handle incoming requests for the Atom entry collection for a specific tag
-        */  
-    public function act_tag_collection()
-    {
-        $this->get_collection();
-    }
-    
-    /**
-        * Handle incoming requests for the Atom entry collection for all comments
-        */
-    function act_comments( $params= array() )
-    {
-        $this->get_comments( $params );
-    }
-    
-    /**
-        * Handle incoming requests for the Atom entry collection for comments on an entry
-        */
-    function act_entry_comments()
-    {
-        $this->act_comments( array( 'slug' => $this->handler_vars['slug'] ) );
-    }
-    
-    /**
-        * Output an Atom collection of comments based on the supplied parameters.
-        * 
-        * @param array $params An array of parameters passed to Comments::get() to retrieve comments                
-        */
-    function get_comments( $params= array() )
-    {
-        try {
-            $params['status'] = Post::status('published');
-
-            $xml= new SimpleXMLElement( '<feed xmlns="http://www.w3.org/2005/Atom"></feed>' );
-            
-            $feed_title= $xml->addChild( 'title', Options::get( 'title' ) );
-            
-            if ( $tagline= Options::get( 'tagline' ) )
-            {
-                $feed_subtitle= $xml->addChild( 'subtitle', $tagline );
-            }
-            
-            $feed_updated= $xml->addChild( 'updated', date( 'c', time() ) );
-            
-            $feed_link= $xml->addChild( 'link' );
-            $feed_link->addAttribute( 'rel', 'alternate' );
-            $feed_link->addAttribute( 'href', URL::get( 'comments' ) );
-            
-            $feed_link= $xml->addChild( 'link' );
-            $feed_link->addAttribute( 'rel', 'self' );
-            
-            if ( isset( $params['slug'] ) ) {
-                $feed_link->addAttribute( 'href', URL::get( 'entry_comments', 'slug=' . $params['slug'] ) );
-            }
-            else {
-                $feed_link->addAttribute( 'href', URL::get( 'comments' ) );
-            }
-                
-            $feed_generator= $xml->addChild( 'generator', 'Habari' );
-            $feed_generator->addAttribute( 'uri', 'http://www.habariproject.org/' );
-            $feed_generator->addAttribute( 'version', Options::get( 'version' ) );
-            
-            $feed_id= $xml->addChild( 'id', 'tag:' . Site::get_url('hostname') . ',' . date("Y-m-d") . ':' . ( ( isset( $params['slug'] ) ) ? $params['slug'] : 'atom_comments' ) . '/' . Options::get( 'GUID' ) );
-
-            foreach ( Posts::get( $params ) as $post ) {
-                
-                foreach ( $post->comments->approved as $comment ) {
-                    $user= User::get_by_id( $post->user_id );
-                    $title= ( $this->is_auth() ) ? htmlspecialchars( $post->title ) : htmlspecialchars( $post->title_atom );
-                    $content= ( $this->is_auth() ) ? htmlspecialchars( $comment->content ) : htmlspecialchars( $comment->content_atom );
-                
-                    $feed_entry= $xml->addChild( 'entry' );
-                    $entry_title= $feed_entry->addChild( 'title', 'Comment on ' . $title . ' by ' . $comment->name );
-                    
-                    $entry_link= $feed_entry->addChild( 'link' );
-                    $entry_link->addAttribute( 'rel', 'alternate' );
-                    $entry_link->addAttribute( 'href', $post->permalink . '#comment-' . $comment->id );
-                        
-                    $entry_author= $feed_entry->addChild( 'author' );
-                    $author_name= $entry_author->addChild( 'name', $comment->name );
-                    
-                    $entry_id= $feed_entry->addChild( 'id', $post->guid . '/' . $comment->id );
-                    
-                    $entry_updated= $feed_entry->addChild( 'updated', date( 'c', strtotime( $comment->date ) ) );
-                    
-                    $entry_content= $feed_entry->addChild( 'content', $content );
-                    $entry_content->addAttribute( 'type', 'html' );
-                }
-            }
-            
-            $xml= Plugins::filter( 'atom_get_comments', $xml, $params, $this->handler_vars );
-            $xml= $xml->asXML();
-    
+
             ob_clean();
             header( 'Content-Type: application/atom+xml' );
             print $xml;
         }
-        catch (Exception $e) {
-        print 'Caught exception: ' .  $e->getMessage() . "\n";
-        }
-    }
-            
-    /**
-        * Output the Atom entry for a specific slug
-        * 
-        * @param string $slug The slug to get the entry for                 
-        */
-    public function get_entry( $slug )
-    {
-        try
-        {
-            $params['slug']= $slug;
-            $params['status'] = Post::status('published');
-            
-            if ( $post = Post::get($params) ) {
-                $user= User::get_by_id( $post->user_id );
-                $title= ( $this->is_auth() ) ? htmlspecialchars( $post->title ) : htmlspecialchars( $post->title_atom );
-                $content= ( $this->is_auth() ) ? htmlspecialchars( $post->content ) : htmlspecialchars( $post->content_atom );
-                
-                $xml= new SimpleXMLElement( '<entry xmlns="http://www.w3.org/2005/Atom"></entry>' );
-                $entry_title= $xml->addChild( 'title', $title );
-                
-                $entry_author= $xml->addChild( 'author' );
-                $author_name= $entry_author->addChild( 'name', $user->username );
-                
-                $entry_link= $xml->addChild( 'link' );
-                $entry_link->addAttribute( 'rel', 'alternate' );
-                $entry_link->addAttribute( 'href', $post->permalink );
-                
-                $entry_link= $xml->addChild( 'link' );
-                $entry_link->addAttribute( 'rel', 'edit' );
-                $entry_link->addAttribute( 'href', URL::get( 'entry', "slug={$post->slug}" ) );
-                
-                $entry_id= $xml->addChild( 'id', $post->guid );
-                $entry_updated= $xml->addChild( 'updated', date( 'c', strtotime( $post->updated ) ) );
-                $entry_published= $xml->addChild( 'published', date( 'c', strtotime( $post->pubdate ) ) );
-                
-                foreach ( $post->tags as $tag ) {
-                    $entry_category= $xml->addChild( 'category' );
-                    $entry_category->addAttribute( 'term', $tag );
-                }
-                
-                $entry_content= $xml->addChild( 'content', $content );
-                $entry_content->addAttribute( 'type', 'html' );
-                
-                $xml= Plugins::filter( 'atom_get_entry', $xml, $slug, $this->handler_vars );
-                $xml= $xml->asXML();
-    
-                ob_clean();
-                header( 'Content-Type: application/atom+xml' );
-                print $xml;
-            }
-        }
-        catch (Exception $e) {
-        print 'Caught exception: ' .  $e->getMessage() . "\n";
-        }
-    }
-    
-    /**
-        * Updates (editing) a post entry that is sent via APP.
-        * 
-        * @param string $slug The slug of the entry to save             
-        */
+    }
+
+    /**
+     * Updates (editing) a post entry that is sent via APP.
+     *
+     * @param string $slug The slug of the entry to save
+     */
     public function put_entry( $slug )
     {
-        try {
-            $params= array();
-    
-            $user= $this->is_auth( TRUE );
-            $bxml= file_get_contents( 'php://input' );
-            
-            $params['slug']= $slug;
-            $params['status'] = Post::status('published');
-            if ( $post = Post::get($params) ) {
-                $xml = new SimpleXMLElement( $bxml );
-                
-                preg_match( '/<content type=[\'|"]\w*[\'|"]>(.*)<\/content>/is', $xml->content->asXML(), $content );
-                $xml->content= $content[1];
-                $xml= Plugins::filter( 'atom_put_entry', $xml, $slug, $this->handler_vars );
-            
-                if ( (string) $xml->title != '' ) {
-                    $post->title= $xml->title;
-                }
-                
-                if ( (string) $xml->id != '' ) {
-                    $post->guid= $xml->id;
-                }
-                
-                if ( (string) $xml->content != '' ) {
-                    $post->content= (string) $xml->content;
-                }
-                
-                if ( (string) $xml->pubdate != '' ) {
-                    $post->pubdate= (string) $xml->pubdate;
-                }
-                
-                if ( isset( $_SERVER['HTTP_SLUG'] ) ) {
-                    $post->slug= $_SERVER['HTTP_SLUG'];
-                }
-            
-                $post->status= Post::status('published');
-                $post->user_id= $user->id;
-                $post->update();
-            }
-        }
-        catch (Exception $e) {
-            print 'Caught exception: ' .  $e->getMessage() . "\n";
-        }
-    }
-    
-    /**
-        * Delete a post based on the HTTP DELETE request via Atom
-        * 
-        * @param string $slug The post slug to delete               
-        */
-    public function delete_entry( $slug )
-    {
-        try {
-            $params = array();
-            
-            $this->is_auth();
-            
-            $params['slug']= $slug;
-            $params['status'] = Post::status('published');
-            if ( $post= Post::get($params) ) {
-                $post->delete();
-            }
-        }
-        catch (Exception $e) {
-            print 'Caught exception: ' .  $e->getMessage() . "\n";
-        }
-    }
-    
-    /**
-        *   Output a post collection based on the provided parameters.
-        *   
-        * @param array $params An array of parameters as passed to Posts::get() to retrieve posts.              
-        */
-    public function get_collection( $params = array() )
-    {   
-        try {
-            // Assign alternate links based on the matched rule.
-            $alternate_rules= array(