Changeset 115

Timestamp:

06/25/07 23:20:32 (1 year ago)

Author:

wikiplugin

Message:

Updated to v.62, more bug fixes

Files:

• folio/folio/config.php (modified) (2 diffs)
• folio/folio/control/page_edit.php (modified) (3 diffs)
• folio/folio/control/page_edit_post.php (modified) (2 diffs)
• folio/folio/html/edit.php (modified) (1 diff)
• folio/folio/html/feeds.php (modified) (5 diffs)
• folio/folio/html/history.php (modified) (1 diff)
• folio/folio/html/setupdb.php (modified) (7 diffs)
• folio/folio/html/view.php (modified) (2 diffs)
• folio/folio/html/view_old.php (modified) (1 diff)
• folio/folio/lib.php (modified) (14 diffs)
• folio/folio/readme.txt (modified) (2 diffs)

folio/folio/config.php

@@ -3 +3 @@
-
-global $CFG;
-1
+2
-$FOLIO_CFG->ajaxprefix = 'folio_control_tree_';
-
@@ -12 +12 @@
-// Default permission level for a new page.  Can be PUBLIC, MODERATED, or PRIVATE
-$FOLIO_CFG->page_defaultpermission = 'MODERATED';
+
+// Keep old pages in the rss feed. AKA, if bob makes a change, and then tim, do you only want to see
+//      tim's?  If you want both, set to false, else true.
+//      Please note that this doesn't change the page history records, those are always kept.  it's just about
+//      exposing the record changes thru the feed system.
+$FOLIO_CFG->page_deleteoldpagesfromrss = false;
+
-
-///////////////////////////////////////////////////////////////////////////////////////

folio/folio/control/page_edit.php

@@ -32 +32 @@
-        global $metatags;
-    
+        
-    if (!$page && !isloggedin() ) {
-                // We don't allow non-logged in users to create new pages
@@ -87 +88 @@
-                <SCRIPT type="text/javascript" src="$url/mod/folio/control/yav1_2_3/js_compact/yav.js"></SCRIPT>
-                <SCRIPT type="text/javascript" src="$url/mod/folio/control/yav1_2_3/js_compact/yav-config.js"></SCRIPT>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-<SCRIPT>
-    var rules=new Array();
@@ -120 +94 @@
-</SCRIPT>
-END;
+
+
-
-    // Restore the trailing slash in $url

folio/folio/control/page_edit_post.php

@@ -83 +83 @@
-    insert_tags_from_string ($tags, 'page', $page->page_ident, $security, $page->user_ident);
-
-RSS
+history
-        if ( $page->creator_ident <> -1 ) {
-                rss_deleteitem( 'page', $page->page_ident, $page->creator_ident, 3600 );
+                rss_deleteitem( 'page', $page->page_ident, $page->creator_ident, 3600 );
+        }
+        
+        // If configured, remove all old history entries from the RSS feed.
+        if ( $FOLIO_CFG->page_deleteoldpagesfromrss ) {
+
+                // Delete
+                rss_deleteitem( 'page', $page->page_ident );
+
-        }
-        
@@ -98 +107 @@
-        );
-
+                
+        // If the page security is private, then set all past RSS entries to private as well.
+        if ( optional_param('folio_control_page_edit_security_custom', 'PUBLIC') == 'PRIVATE' ) {
+
+                $stmt = $db->Prepare( "UPDATE {$CFG->prefix}folio_rss SET access = '{$security}'
+                                WHERE type_ident = {$insert_id} AND type='page' AND access <> 'PRIVATE'");
+                $returnvalue = $db->Execute($stmt);  
+        }
+        
+        
-    // Update any comments to match the same permission level.
-    $stmt = $db->Prepare("UPDATE {$CFG->prefix}folio_comment SET access = '{$security}' " .

folio/folio/html/edit.php

@@ -18 +18 @@
-    require_once("../../../includes.php");
-    require_once("../control/page_edit.php");
+        require_once("../../../units/tinymce/tinymce_js.php");
-        
-    //run("profile:init");
-    //run("friends:init");
-    //run("folio:init");
+        global $metatags;
+        
+        $metatags = str_replace( '    elements : "','    elements : "page_body,',$metatags);
-        
-        $title = " Folio :: Edit Page";

folio/folio/html/feeds.php

@@ -241 +241 @@
-        if ( count( $friendlist ) > 0 ) {
-            $where = ' owner_ident in (' . implode( ',', $friendlist) . ') and owner_ident <> ' .
+                     implode( ',', $arguments['user_ident']) . ' and user_ident <> ' .
-                     implode( ',', $arguments['user_ident']) . ' ';
-        } else {
@@ -333 +334 @@
-                // Transfer into template & write.
-                templates_page_setup();
-
+
+
+
+
+
+
-                $body = templates_draw(array(
-                        'context' => 'contentholder',
@@ -339 +345 @@
-                            array(  array( 'name'=>'format','value'=> 'rss'),
-                                    array( 'name'=>'format','value'=> $arguments['format'][0])) ) . 
-rss
-arguments['username']
+feed
+users 
-                        'body' => $body ));
-
@@ -355 +361 @@
-                templates_page_setup();
-
+                                $users = array();
+                                foreach ( $arguments['username'] as $name ) {
+                                        $u = get_record_select('users',"username = '$name'");
+                                        $users[] = $u->name;
+                                }
+                                
-                $body = templates_draw(array(
-                        'context' => 'contentholder',
@@ -360 +372 @@
-                            array(  array( 'name'=>'format','value'=> 'rss'),
-                                    array( 'name'=>'format','value'=> $arguments['format'][0])) ) . 
-rss
-arguments['username']
+feed
+users 
-                        'body' => $body ));
-

folio/folio/html/history.php

@@ -85 +85 @@
-
-        // Build nice titles
-rss
+feed
-        $plain_title = $page->title;
-

folio/folio/html/setupdb.php

@@ -12 +12 @@
-
-// The current version of the folio db scheme.
-8
+9
-
-// Setup variables.
@@ -20 +20 @@
-require_once '../config.php';
-require_once '../lib.php';
-  
+
-// See if we're using postgreesss or an old version of mysql.  Cancel, as this only works with MySQL.
-if ($CFG->dbtype == 'postgres7') {
@@ -65 +65 @@
-                        case 7:
-                           gotoVersion8();
+                           // no break, need to continue updating.      
+                        case 8:
+                           gotoVersion9();
-                           // no break, need to continue updating.      
-   }
@@ -101 +104 @@
-
-/** 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        execute_sql( "DELETE FROM {$db}.{$prefix}folio_rss where type IN ( 'weblog', 'weblog_comment', 'file')");
-
@@ -127 +160 @@
-    if ( $records) {
-        foreach ( $records as $record) {
-
+_post
-        }
-    }
@@ -137 +170 @@
-    if ( $records) {
-        foreach ( $records as $record) {
-
+_post
-        }
-    }
+        $version = new StdClass;
+        $version->version = 9;
+        insert_record("folio_version",$version);        
+}
+
+/** 
+* Update to version 8, re-do the auto-import blog entries, blog comments, & files into the global RSS table.
+**/
+function gotoVersion8() {
+        global $CFG;    
+        $prefix = $CFG->prefix;
+        $db = $CFG->dbname;
+
+// depreciated
-
-        $version = new StdClass;
@@ -154 +201 @@
-        $db = $CFG->dbname;
-
+// depreciated
-
-        $version = new StdClass;

folio/folio/html/view.php

@@ -95 +95 @@
-            // Build nice titles
-            $plain_title = 'Create ' . $page_title;
-
+:
-            // Run the command to actually retrieve the content.  
-            $body = 
@@ -112 +112 @@
-            $html_title = "<a href='{$url}activity/user/{$username}/rss/page+page_comment/all/1:" .
-                    folio_createhash( $_SESSION['userid'] ) . 
-rss
+feed
-            $plain_title = $page->title;
-            

folio/folio/html/view_old.php

@@ -65 +65 @@
-
-        // Build nice titles
-rss
+feed
-        $plain_title = $page->title;
-

folio/folio/lib.php

@@ -26 +26 @@
-    global $_SESSION;
-
+    listen_for_event("weblog_post","delete","folio_rss_weblog_delete");
-    listen_for_event("weblog_post","publish","folio_rss_weblog_post");
-    listen_for_event("weblog_post","update","folio_rss_weblog_post");
-
-
-
+
+
+
+
+
-        
-    // Test to see if there has been a log-on event
@@ -122 +125 @@
-    global $page_title;
-    global $username; // this is who we're looking at, not the logged in user.
+                        // Depreciated in v.7?  Start referring to profile_id
+        
-  
-    // This will change the log-on page to a custom session variable
@@ -133 +138 @@
-
-    $currentusername = $_SESSION['username'];
+        $currentuserident = $_SESSION['userid'];
+        //var_dump( $_SESSION );
-    
-    // -----------------------------------------------
@@ -139 +146 @@
-    // Add Wiki Link
-    if (isloggedin() & defined('context') ) {
-username == $currentusername
+page_owner == $currentuserident
-                // Show selected
-            $PAGE->menu[] = array( 'name' => 'folio', 
@@ -157 +164 @@
-    // Add Activity Link (as first option)
-    if (isloggedin() & defined('context') ) {
-username == $currentusername
+page_owner == $currentuserident
-            // Show selected
-            array_splice( $PAGE->menu, 0,0, array( array( 'name' => 'folio_feeds', 
-inbox/' . $currentusername . '/html/all/all/1
+fac/' . $currentusername . '/summary/all/all/1" class="selected
-        } else {
-            // Show main menu unselected
-            array_splice( $PAGE->menu, 0,0, array( array( 'name' => 'folio_feeds', 
-inbox/' . $currentusername . '/html/all/all/1"
+fac/' . $currentusername . '/summary/all/all/1" 
-        
-        }
@@ -872 +879 @@
-* @param string access (the permission level for the rss item, def=public).
-**/
-
-
+
+
+
+
+
+
-    $rss = new StdClass;
-    $rss->owner_ident = intval($owner_ident);
@@ -885 +896 @@
-    $rss->body = $body;
-    $rss->link = $link;
-time()
+$created
-    $rss->access = $access;
-    
@@ -1018 +1029 @@
-
-/**
-
+.  Also called for weblog edits.
-**/
-function folio_rss_weblog_post($object_type, $event, $object) {
@@ -1038 +1049 @@
-    $type =  'weblog';
-
-
+
+
-    $tags = explode(',', trim(optional_param('new_weblog_keywords')));
-
@@ -1044 +1056 @@
-
-    $link = $CFG->wwwroot . $owner_username . '/weblog/' . $type_ident . '.html';
-
+
+
-    //generate rss
-        rss_deleteitem( $type, $type_ident );
-
+, $created
-
-    // Update RSS in comments to match the same permission level.
@@ -1059 +1072 @@
-}
-
+
+/**
+* Deletes the post from the RSS table.
+**/
+function folio_rss_weblog_delete($object_type, $event, $object) {
+    global $db, $CFG;
+  
+        $stmt = $db->Prepare( "DELETE FROM {$CFG->prefix}folio_rss 
+                        WHERE type_ident = {$object->ident} AND type='weblog'");
+        $returnvalue = $db->Execute($stmt); 
+
+    // return results
+    return $object;
+}
+
+
+/**
+* Deletes the post from the RSS table.
+**/
+function folio_rss_weblog_comment_delete($object_type, $event, $object) {
+    global $db, $CFG;
+        $stmt = $db->Prepare( "DELETE FROM {$CFG->prefix}folio_rss 
+                        WHERE type_ident = {$object->ident} AND type='weblog_comment'");
+        $returnvalue = $db->Execute($stmt); 
+
+    // return results
+    return $object;
+}
+
-/**
-* Post the new weblog comment to the RSS table
-**/
-
+_post
-    global $CFG;
-
@@ -1092 +1134 @@
-    $title = 'Comment on "' . $post->title . '"';
-    $link = url . $owner_username. "/weblog/" . $post->ident . ".html";
-
+
+
-    //generate rss
-    rss_additem( $owner_id, $owner_username, 
-        $user_id, $user_name, $user_username, 
-        'weblog_comment', $object->ident, '',
-
+, $created
-}
-
@@ -1103 +1146 @@
-* Record a file upload or edit
-**/
-
+_post
-    global $CFG;
-    
@@ -1149 +1192 @@
-    $link = url . $owner_username . '/files/' . $object->folder . '/' . $type_ident . '/filename' ;
-    $access = $object->access;
+        $created = $object->time_uploaded;
-
-    //generate rss
-        rss_deleteitem( $type, $type_ident );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

folio/folio/readme.txt

@@ -1 +1 @@
-----------------------------------------------------------------------------------
-                                Elgg Folio Add-in
-6
+25
-----------------------------------------------------------------------------------
-
@@ -93 +93 @@
-
-Occurred:
-
+
+
-        2007.06.06 v0.6 Fixed a number of bugs.  Added options via config.php for 
-                        different display options.