Changeset 111

Timestamp:

06/06/07 00:46:42 (1 year ago)

Author:

wikiplugin

Message:

Updated folio to v.6 -- many bug fixes and some additional configuration options.

Files:

• folio/folio/config.php (modified) (3 diffs)
• folio/folio/control/commentbox.php (modified) (2 diffs)
• folio/folio/control/commentbox_postdata.php (modified) (1 diff)
• folio/folio/control/crossbrowsercom (deleted)
• folio/folio/control/feeds.php (modified) (5 diffs)
• folio/folio/control/page_edit_post.php (modified) (2 diffs)
• folio/folio/control/tree.php (modified) (7 diffs)
• folio/folio/control/tree_getdata.php (modified) (3 diffs)
• folio/folio/html/feeds.php (modified) (3 diffs)
• folio/folio/html/setupdb.php (modified) (1 diff)
• folio/folio/html/view.php (modified) (5 diffs)
• folio/folio/lib.php (modified) (21 diffs)
• folio/folio/page_edit_menu.php (modified) (1 diff)
• folio/folio/page_info_menu.php (modified) (1 diff)
• folio/folio/readme.txt (modified) (6 diffs)
• folio/folio/todo.txt (modified) (2 diffs)
• folio/folio/users_info_menu.php (modified) (4 diffs)
• folio/readme.txt (modified) (6 diffs)

folio/folio/config.php

@@ -1 +1 @@
-<?php
+// Folio Setup Options
-
-// Folio Setup & Options
-global $CFG;
+$FOLIO_CFG->version = 0.6;
+$FOLIO_CFG->ajaxprefix = 'folio_control_tree_';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-// Default permission level for a new page.  Can be PUBLIC, MODERATED, or PRIVATE
-$FOLIO_CFG->page_defaultpermission = 'MODERATED';
+
+///////////////////////////////////////////////////////////////////////////////////////
+//  LOGGING OPTIONS
+///////////////////////////////////////////////////////////////////////////////////////
-
-// One way of improving Apache logs is to add the user's username to each entry.
@@ -29 +25 @@
-    apache_note('username',$_SESSION['username']); 
-
-// Add a menu link for the Chatbox add-in
-//      Allowable options are 'Y' and 'N'
-$FOLIO_CFG->chatbox_installed = 'N';
-
-// Disable the following menu links. 
-// If you do not want to disable certain options, leave the array empty.  Do not comment out
-//      the variable.
-// Some common options are 'dashboard', 'feeds' <- subscriptions, 'folio' <- wiki page link, 'folio_feeds' <- activity
-$FOLIO_CFG->disabled_menuitems = array(); 
-
-// Folio has the option to keep track a historical record of user logons. 
-// If you want to track this data, then set this option to "Y".  If you put it 
-//      as 'N', then old logons will be deleted.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// Folio has the option to keep show a custom log-on page.  It will show
-//      recent activity counts & global data.If you want to show this instead
-//      of the default php value, then set this option to "Y".
-Y
+N
-
-// Folio has the option to keep show a custom log-on page.  The following variable
@@ -57 +87 @@
-<p align='center'><br/><a href='{wwwroot}activity/inbox/{username}/html/all/all/1'><img src='{wwwroot}mod/folio/image/inbox.png'   border=0/></a></p>";
-
+
-?>

folio/folio/control/commentbox.php

@@ -19 +19 @@
-        $item_title = folio_page_encodetitle( $item_title );
-        $item_owner_username = folio_page_encodetitle( $item_owner_username );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* This is now passed as $item_owner_ident
-            if (logged_on) {
@@ -57 +70 @@
-function {$ajaxprefix}makeRequest(){
-    var postData = "item_ident={$item_ident}&item_type={$item_type}" +
-public
+{$access}
-        escape( document.{$ajaxprefix}form.{$ajaxprefix}comment.value );
-        var request = YAHOO.util.Connect.asyncRequest('POST', "{$url}", {$ajaxprefix}callback, postData);

folio/folio/control/commentbox_postdata.php

@@ -68 +68 @@
-                'Comment by ' . $comment->creator_username . ' on ' . $comment->item_title, 
-                $comment->body, 
-
+, $comment->access
-                
-    // Return wrapped up.

folio/folio/control/feeds.php

@@ -134 +134 @@
-    $date = gmdate("D M d",intval($result->created));
-    $type = str_replace( '_', ' ', $result->type );
+    $iconid = user_info("icon", $result->user_ident);
-
-    $html .= <<< END
@@ -139 +140 @@
-            <td width="70" valign="top">
-                <a href="{$CFG->wwwroot}{$result->user_username}">
-result->user_ident
+iconid
-                </a>
-            </td>
@@ -163 +164 @@
-
-        if ( $page < $pages ) {
-Back
+Older
-        }
-
@@ -169 +170 @@
-        
-        if ( $page > 1 ) {
-Forward
+Newer
-        }
-        
@@ -231 +232 @@
-
-    // src="{$url}{$result->user_username}/icons/{$icon}/h/67/w/67" 
-$result->user_ident
+user_info("icon",$result->user_ident)
-
-    /*

folio/folio/control/page_edit_post.php

@@ -69 +69 @@
-    $security = optional_param('folio_control_page_edit_security_custom', 'PUBLIC');
-    if ( $security == 'PRIVATE' ) {
-
+
+
-            $security = 'community' . $page->user_ident;
-        } else {
@@ -80 +81 @@
-    $tags = trim($tags);
-    insert_tags_from_string ($tags, 'page', $page->page_ident, $security, $page->user_ident);
-
+
+
+
+
+
+
-        // Create RSS record
-        rss_additem( $page->user_ident, $username,

folio/folio/control/tree.php

@@ -21 +21 @@
-*               Get current node's other child nodes, passing the previously created (down) node 
-                        as an argument so that it won't be built 2x.
-
+  Don't create a node for the root, as that's already in the menu by default.
-*
-* NOTE: Calling functions SHOULD NOT SET $previouspage_ident.  
@@ -71 +71 @@
-                if ( $page->children == 1 ) {
-                        $result = folio_control_tree_getNodeChildren( $ajaxprefix, $page_ident, $previouspage_ident, $url, $result, $profile_id);
-                        $result .= "\n{$ajaxprefix}Node{$page_ident}.expand();\n";
-                }
-                
@@ -87 +86 @@
-                        // Add code to automatically expand.
-                        $result = str_replace("%{$page_ident}root%", "root", $result);       
-                        $result .= "\n{$ajaxprefix}Node{$page_ident}.expand();\n";
-
-                } else {
@@ -175 +173 @@
-
-/**
-
+ from an arbitrary node
-*
-* @param $page_ident Required, the root node being shown.
-* @param $page_title Required, the name of the root node being shown.
-* @param $username The name of the user/community to whom this page belongs.
+* @param $page_id The id of the page to expand
-*/
-
+, $page_id =-1
-        //      Note: Do not change the name of the root node to anything but root without also changing it in the helper functions in this file.
-    global $CFG;
-    global $metatags;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $address = $CFG->wwwroot . 'mod/folio/';
-
@@ -197 +238 @@
-    
-    // Build javascript to load parent information.
-s( $ajaxprefix, $page_ident
+AtRoot( $ajaxprefix, $userid, $username
-    
-    // BUILD JAVASCRIPT
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        <script type="text/javascript" src="{$address}control/yui/build/yahoo/yahoo.js" ></script>
@@ -218 +329 @@
-       // Add Nodes
-       $buildNodes
-
+
-       {$ajaxprefix}tree.draw();
+       {$ajaxprefix}expand( $page_id );
+}
+
+// Recursively expand this node & all parents.
+function {$ajaxprefix}expand( nodeID ) {
+        var node = YAHOO.widget.TreeView.getTree( '{$ajaxprefix}treeDiv1').getNodeByProperty( 'id', nodeID );
+        node.expand();
+        if ( !node.isRoot() ) {
+            {$ajaxprefix}expand( node.parent.data.id );
+        }
-}
-
@@ -317 +438 @@
-    </STYLE>
-    <div id='splitpanesidebar2'>
-b>Pages</b
+!-- <b>Pages</b> --
-      <div id="{$ajaxprefix}treeDiv1"></div>
-<img src="{$address}control/tree_blankimage.jpg" onload="javascript:{$ajaxprefix}treeInit()"  />
-    </div>
-END;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-

folio/folio/control/tree_getdata.php

@@ -44 +44 @@
-                        "WHERE w.parentpage_ident = $page_ident AND w.newest = 1 AND w.parentpage_ident <> w.page_ident AND " . 
-                        folio_page_security_where( 'p', 'w', 'read', $profile_id ) .
-DE
+A
-                );      
-        
@@ -93 +93 @@
-function folio_tree_formattitle( $title ) {
-    // max len
-
+
+
-    $temp = '';
-  
-$title
+trim($title)
-    $parts = explode(' ', $title);
-    $title = '';
-
-    foreach ( $parts as $part ) {
-
+
+
+
+
-            // Can join
-            $temp = $temp . '~' . $part;
@@ -110 +114 @@
-        }
-    }
-    
-    // Move last temp to title
-
+    
-    return $title;
-}

folio/folio/html/feeds.php

@@ -329 +329 @@
-
-                $body = folio_feeds_controlbox( $arguments, $page ) . 
-username
+arguments['username']
-
-                // Transfer into template & write.
@@ -455 +455 @@
-* Replace the variable referenced by Change to set to Value.  Makes it easier for array
-*   processing.
+* Note that if we are being told to remove the only value in the array that we will automatically
+*   select the wildcard.
-*
-* @param $changes array - An array of arrays= ('name', 'value') to arg array.
@@ -465 +467 @@
-        if ( is_array($arguments[$change['name']]) ) {
-            if ( in_array( $change['value'], $arguments[$change['name']])  ) { 
+                // Remove
-                $arguments[$change['name']] = folio_delete_element( $arguments[$change['name']], $change['value'] );
+                // Test to make sure that there is at least one option.
+                if ( count($arguments[$change['name']]) == 0 ) {
+                    array_push( $arguments[$change['name']], 'all' );
+                }
-            } else {
-                array_push($arguments[$change['name']], $change['value']);

folio/folio/html/setupdb.php

@@ -33 +33 @@
-
-// See if a user other than news is trying to run this.
-
-
-
-
+//
+//
+//
+//
-
-// Start upgrading.

folio/folio/html/view.php

@@ -17 +17 @@
-    require_once("../control/pagelist.php");
-    require_once("../control/page_view_tags.php");
+    require_once("../control/commentbox.php");
-    
-    run("profile:init");
@@ -22 +23 @@
-    run("folio:init");
-    
+    global $CFG;
+    global $PAGE;
+    global $FOLIO_CFG;
+
-    // Retrieve passed variables (page name & user name, as well as created).
-    //     These variables will be used by the menu system to build links.  See lib.php for more details.
@@ -95 +100 @@
-                folio_page_view($page_ident,$page_title, -1, $page, $username);
-
+            // Add the edit option
+            $PAGE->menu_sub[] = array( 'name' => 'folio:edit',
+                'html' => a_hrefg( "{$CFG->wwwroot}$username/page/" .
+                folio_page_encodetitle($page_title) . "/edit",
+                "Edit Page"));  
+
-        } else {
-            // Viewing an existing page.
@@ -109 +120 @@
-                folio_page_view_tags($page_ident) .
-                folio_control_childpagelist( $username, $page, $page_owner ) .
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    } else {
@@ -131 +174 @@
-                )
-                );
+
+    // Add JS to exand the tree control.
+//    $body .= "\n<img src='{$CFG->wwwroot}mod/folio/control/tree_blankimage.jpg' onload=\"javascript:{$FOLIO_CFG->ajaxprefix}expand( '$page_ident' );\"\>\n";
-    
-    echo templates_page_draw(array(

folio/folio/lib.php

@@ -11 +11 @@
-**/
-function folio_version() {
-
+
+
-}
-
@@ -26 +27 @@
-
-    listen_for_event("weblog_post","publish","folio_rss_weblog_post");
+    listen_for_event("weblog_post","update","folio_rss_weblog_post");
-    listen_for_event("weblog_comment","publish","folio_rss_weblog_comment");
-    listen_for_event("file","publish","folio_rss_file");
-
+
+
-    // Test to see if there has been a log-on event
-    $l = optional_param('username');
-    $p = optional_param('password');
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -135 +140 @@
-    if (isloggedin() & defined('context') ) {
-        if ( substr(context, 0, 5) == "folio" & $username == $currentusername) {
-
-
+
-            $PAGE->menu[] = array( 'name' => 'folio', 
-                'html' => '<li><a href="'.$CFG->wwwroot . $currentusername . '/page/" class="selected">Your Pages</a></li>');
-
-
+
-            // Show main menu unselected
-            $PAGE->menu[] = array( 'name' => 'folio', 
-                'html' => '<li><a href="'.$CFG->wwwroot . $currentusername . '/page/">Your Pages</a></li>');
-        
-        }
-    } elseif ( isloggedin() ) {
@@ -150 +152 @@
-        // Show link to folio.
-        $PAGE->menu[] = array( 'name' => 'folio', 
-
-
+
-    }
-
@@ -168 +169 @@
-    } elseif ( isloggedin() ) {
-        // Some pages don't have context defined.
-folio
+activity
-        array_splice( $PAGE->menu, 0, 0, array( array( 'name' => 'folio_feeds', 
-            'html' => '<li><a href="'.$CFG->wwwroot . 'activity/inbox/' . $currentusername . '/html/all/all/1">Your Activity</a></li>')));
-    }
-
-    if ( defined('context') ) {
-        if (substr(context, 0, 10) == 'folio_page') {
-            // Looking at a page.
-            // Look to see if we should include 'Recent Changes' as a menu option. 
-            if ($FOLIO_CFG->wiki_menu_recentchanges == 'Y') {
-                $PAGE->menu_sub[] = array( 'name' => 'folio:recentchanges',
-                    'html' => a_hrefg( "{$CFG->wwwroot}activity/user/$username/summary/page+page_comment/all/1",
-                    "Recent Changes"));  
-            }
-            $PAGE->menu_sub[] = array( 'name' => 'folio:edit',
-                'html' => a_hrefg( "{$CFG->wwwroot}$username/page/" .
-                folio_page_encodetitle($page_title) . "/edit",
-                "Edit Page"));  
-            $PAGE->menu_sub[] = array( 'name' => 'folio:history',
-                'html' => a_hrefg( "{$CFG->wwwroot}$username/page/" .
-                folio_page_encodetitle($page_title) . "/history",
-                "History"));  
-            $PAGE->menu_sub[] = array( 'name' => 'folio:delete',
-                'html' => a_hrefg( "{$CFG->wwwroot}$username/page/" .
-                folio_page_encodetitle($page_title) . "/delete",
-                "Delete"));  
-                
-            // Setup Metatags for RSS Discovery
-            $metatags .= "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".url."$username/subscribe/rss/page+page_comment/\" />\n";
-        }
-        
-    } 
-
-    // -------------------------------------------------------------
@@ -207 +181 @@
-    //    version used in this mod.     
-    
-
-
-
-
-
-
-
-
-
-
+
+
-
-    // Insert 
@@ -418 +384 @@
-*
-* @param string $input
+* @param array $valid Valid characterrs, defaults to standard -_() and spaces.
-* @return string Clean input
-**/
- 
+, $valid = array('(',')',' ','-','_',' ' )
-
-    $input = trim( $input );
-    
-    // Test for an easy clean / validation.
-
+
+
-        // Validated.  Return
-        return $input;
@@ -436 +404 @@
-            $v = substr( $input, $i, 1 );
-            
-$v == '-' | $v == '_' | $v == '(' | $v ==')' | $v == ' '
+in_array( $v, $valid ) 
-                $retval .= $v;
-            }
@@ -444 +412 @@
-    }
-}
+
+/**
+* Remove all of the valid_values in input  & return the value
+**/
+function folio_clean_replace( $input, $remove_values ) {
+        foreach ( $remove_values as $value) {
+                $input = str_replace( $value, '', $input );
+        }
+        return $input;
+}
+
+
-/**
-* Same as folio_clean, except suitable for array_walk
@@ -621 +601 @@
-*    Encoded urls should not be stored in the database.
-*
-
+
+
+
+
+
-*   just a quick fix.
-*
-* @todo Implement some simple checks on the [[ ]] linking.  Stuff like ]]] before [[..., title too long.
-* @param string $username The username of the owner of the page.
-* @param string $body The body that we're translating.
@@ -635 +618 @@
-    while ( $i === true ) {
-        $i = stripos( $body, '[[' );
-
-
+
+
+
+
-        // Test find.
-        if (!( $i === false | $end === false )) {
-            // Translate title.
-
+
+
+
+
+
+
+
+
+
+
-            $body = substr( $body, 0, $i ) .
-usernam
+namespac
-                folio_page_encodetitle($link) . 
-$link
+{$nametag}{$link}
-                substr( $body, $end+2 );
-            
@@ -792 +786 @@
-                "or to create an online portfolio.\n\nYou can create links to new pages by simply " .
-                "enclosing the page title using double bracket characters ([ and ]).  Here's an example " .
-
+  
-        $page->page_ident = $page_ident;
-        $page->security_ident = $page_ident;
@@ -857 +851 @@
-/**
-* Publish something to an RSS feed
+*
-* 
-* @param int owner_ident (int for the object owner)
@@ -897 +892 @@
-}
-
+
+/**
+* Deletes all RSS feed entries with the given key and type.
+*       Called to prevent duplicate entries for rapidly edited documents.
+*       If calling with the user_ident and timespan, need to use both.
+* 
+* @param string Type (url-able string, etc: weblog, file, wikipage)
+* @param int Type_Ident 
+* @param int User_Ident  (can be used to limit the deletion of the item to only the current user)
+* @param int timespan (how far back to delete)
+**/
+function rss_deleteitem( $type, $type_ident, $user_ident = -1, $timespan = -1 ) {
+    global $db, $CFG;
+        
+        if ( $user_ident == -1 AND $timespan == -1 ) {
+                delete_records('folio_rss', 'type_ident', $type_ident, 'type', $type);
+        } else {
+                $stmt = $db->Prepare("DELETE FROM {$CFG->prefix}folio_rss where type = '{$type}' AND " .
+                                                         "type_ident = {$type_ident} AND user_ident = {$user_ident} AND created > " .
+                                                         (time() - $timespan ));
+                $returnvalue = $db->Execute($stmt);
+        }
+}
+
+
-/**
-* Retrieve records from an rss feed.
@@ -1026 +1046 @@
-
-    //generate rss
+        rss_deleteitem( $type, $type_ident );
-    rss_additem( $owner_id, $owner_username, $user_id, $user_name, $user_username, $type, $type_ident, $tags, $title, $body, $link, $access);
-
@@ -1047 +1068 @@
-    $owner_id = $post->weblog;
-    $owner_username = user_info("username", $owner_id);
+        $access = $post->access;
-
-    // Get user info from db.
@@ -1069 +1091 @@
-        $user_id, $user_name, $user_username, 
-        'weblog_comment', $object->ident, '',
-
-
-
-