Changeset 1463

Timestamp:

12/16/07 22:36:17 (10 months ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Merge r1456, r1457, r1458, r1459, r1460, r1461, r1462 into 0.9 branch

Files:

• releases/0.9/data (modified) (1 prop)
• releases/0.9/htaccess-dist (modified) (1 diff)
• releases/0.9/includes.php (modified) (2 diffs)
• releases/0.9/lib/setup.php (modified) (4 diffs)
• releases/0.9/mod/community/languages/es_CO (deleted)
• releases/0.9/mod/export (copied) (copied from devel/mod/export)
• releases/0.9/mod/export/blog.php (copied) (copied from devel/mod/export/blog.php) (1 diff)
• releases/0.9/mod/export/blogashtml.php (copied) (copied from devel/mod/export/blogashtml.php)
• releases/0.9/mod/export/lib.php (copied) (copied from devel/mod/export/lib.php) (5 diffs)
• releases/0.9/mod/friend/lib.php (modified) (1 diff)
• releases/0.9/mod/friend/lib/friends_of_edit.php (modified) (1 diff)
• releases/0.9/mod/pages/lib.php (modified) (1 diff)
• releases/0.9/mod/pages/lib/pages.inc.php (modified) (3 diffs)
• releases/0.9/mod/template/templates/Default_Template/css (modified) (2 diffs)

releases/0.9/htaccess-dist

@@ -79 +79 @@
-#RewriteBase /
-
+# Pages
+###########
-RewriteRule ^content\/?(.*)?$ mod/pages/index.php?owner=-1&page=$1 [QSA,L]
-RewriteRule ^([A-Za-z0-9]+)\/pages\/?(.*)?$ mod/pages/index.php?profile_name=$1&page=$2  [QSA,L]

releases/0.9/includes.php

@@ -104 +104 @@
-    ****************************************************************************/
-
+    // Language / internationalisation
+    //@todo All the libraries has a strong dependence with this 'plugin'
+        require_once($CFG->dirroot . "mod/gettext/lib.php");
+
-    // Load setup.php which will initialize database connections and such like.
-        require_once($CFG->dirroot.'lib/setup.php');
@@ -109 +113 @@
-    // Plug-in engine (must be loaded first)
-        require($CFG->dirroot . "lib/engine.php");
-
-    // Language / internationalisation
-                //@todo All the libraries has a strong dependence with this 'plugin'
-        require_once($CFG->dirroot . "mod/gettext/lib.php");
-
-    // XML parsing

releases/0.9/lib/setup.php

@@ -518 +518 @@
-    $date = date('Y-m-d H:i:s');
-    $fatal = "$errmsg (# $errno)";
-"Error in line $errline of file $errfile"
+sprintf(__gettext("Error in line %d of file %s"),$errline,$errfile)
-    $script = "Script: {$_SERVER['PHP_SELF']}";
-
@@ -525 +525 @@
-        case E_NOTICE:
-            if ($CFG->debug == 2047) {
-"$date\nNotice: $fatal\n$file\n$script\n"
+sprintf(__gettext("%s\nNotice: %s \n %s\n%s\n"),$date,$fatal,$file,$script)
-                error_log($msg);
-            }
@@ -536 +536 @@
-            if ($CFG->debug >= 7) {
-                $msg = "$date\nWarning: $fatal\n$file\n$script\n";
+                $msg = sprintf(__gettext("%s\nWarning: %s\n%s\%s\n"),$date,$fatal,$file,$script);
-                error_log($msg);
-            }
@@ -550 +551 @@
-
-            if ($CFG->debug > 0) {
-Disable debug mode if you do not want to display errors on screen browser
+".__gettext("Disable debug mode if you do not want to display errors on screen browser")."
-                echo $msg;
-            } else {
-Our apologies, the system can't complete your request
+".__gettext("Our apologies, the system can't complete your request")."
-                echo "<p><em>{$CFG->sitename} team</em><br/>";
-                echo "<a href=\"{$CFG->wwwroot}\">{$CFG->wwwroot}</a></p>";

releases/0.9/mod/export/blog.php

@@ -10 +10 @@
-        if (isloggedin()) {
-        
+                header('Content-Disposition: attachment');
-                header("Content-type: text/xml");
-
+blog_
-        
-        }

releases/0.9/mod/export/lib.php

@@ -10 +10 @@
-            if (defined('context') && context == 'weblog') {
-                if ($page_owner == $_SESSION['userid']) {
+                        $PAGE->menu_sub[]= array (
+                        'name' => 'blog:export:html',
+                        'html' => "<a href=\"{$CFG->wwwroot}mod/export/blogashtml.php/export.html\">". __gettext("Download blog as HTML") ."</a>"
+                    );
-                    $PAGE->menu_sub[]= array (
-
-\">". __gettext("Export
+:rss
+/export.rss\">". __gettext("Download
-                    );
-                }
@@ -21 +25 @@
-        }
-        
-
+
+
+
+
+
+
+
-                
-                global $CFG;
@@ -31 +41 @@
-                
-                $name = user_info("name", $blog_id);
+                $username = user_info("username", $blog_id);
+
-                $rssweblog = __gettext("Weblog items");
-                $rssdescription = sprintf(__gettext("The weblog for %s, hosted on %s."),$name,$CFG->sitename);
@@ -39 +51 @@
-        <title><![CDATA[$name : $rssweblog]]></title>
-        <description><![CDATA[$rssdescription]]></description>
-
+{$username}/weblog/
-END;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                $output .= <<< END
@@ -51 +90 @@
-                return $output;
-        }
+        
+        /**
+         * Exports a blog as HTML
+         *
+         * @param int $blog_id The blog to export
+         * @return string The HTML file
+         */
+        function export_blog_as_html($blog_id = -1) {
+            
+            global $CFG;
+            
+            if ($blog_id < 0) {
+                $blog_id = $_SESSION['id'];
+            }
+            $blog_id = (int) $blog_id;
+            
+            $name = user_info("name", $blog_id);
+            $username = user_info("username", $blog_id);
+
+            $rssweblog = __gettext("Weblog items");
+            $rssdescription = sprintf(__gettext("The weblog for %s, hosted on %s."),$name,$CFG->sitename);
+
+            $output .= <<< END
+            <html>
+                <head>
+                    <title>{$name}: {$rssweblog}</title>
+                </head>
+                <body>
+                    <h1>{$name}: {$rssweblog}</h1>
+                    <p><i>{$rssdescription}</i></p>
+                    <p>
+                        <a href="{$CFG->wwwroot}{$username}/weblog/">{$CFG->wwwroot}{$username}/weblog/</a>
+                    </p>
+END;
+
+                $where = run("users:access_level_sql_where",$_SESSION['userid']);
+                if ($posts = get_records_select('weblog_posts','('.$where.') AND weblog = '.$blog_id,null,'posted DESC','*')) {
+                    foreach($posts as $entry) {
+                        $title = (stripslashes($entry->title));
+                        $link = url . $username . "/weblog/" . $entry->ident . ".html";
+                        $body = (run("weblogs:text:process",stripslashes($entry->body)));
+                        $pubdate = gmdate("D, d M Y H:i:s T", $entry->posted);
+                        $keywordtags = "";
+                        if ($keywords = get_records_select('tags','tagtype = ? AND ref = ?',array('weblog',$entry->ident))) {
+                            foreach($keywords as $keyword) {
+                                if (!empty($keywordtags))
+                                    $keywordtags .= ", ";
+                                $keywordtags .= stripslashes($keyword->tag);
+                            }
+                        }
+                        if (!empty($keywordtags)) {
+                                $keywordtags = "<p>Keywords: {$keywordtags}</p>";
+                        }
+                        $output .= <<< END
+                    <div class="weblog-post">
+                            <h2>{$title}</h2>
+                            <p>{$pubdate}</p>
+                            <p><i><a href="{$link}">{$link}</a></i></p>
+                            {$body}
+                            {$keywordtags}
+                            <p>&nbsp;</p>
+                    </div>
+END;
+                    }
+                }
+
+                //$output .= run("weblogs:rss:getitems", array($blog_id, 10000,null,"complete"));
+
+                $output .= <<< END
+
+                </body>
+            </html>
+    
+END;
+            return $output;
+        }
-
-?>

releases/0.9/mod/friend/lib.php

@@ -68 +68 @@
-
-        // 'Friends' aspect to user profiles
-menu
+delete
-            $function['users:infobox:menu:text'][] = $CFG->dirroot . "mod/friend/lib/user_info_menu_text.php";
-

releases/0.9/mod/friend/lib/friends_of_edit.php

@@ -28 +28 @@
-            $info->icon = run("icons:get",$info->ident);
-            $friends_menu = run("users:infobox:menu",array($info->ident,"friendsof"));
+            $friends_menu = run("users:infobox:delete",array($info->ident,"friendsof"));
-            $friends_icon = user_icon_html($info->ident,FRIENDS_ICON_SIZE);
-            $friends .= templates_draw(array(

releases/0.9/mod/pages/lib.php

@@ -214 +214 @@
-                $page_name = get_field('pages', 'uri', 'ident', $id, 'owner', $owner);
-                if (empty($page_name)) {
-s
+
-                    return null;
-                }

releases/0.9/mod/pages/lib/pages.inc.php

@@ -43 +43 @@
-            if (empty($messages)) {
-                if ($page->name == 'New page' || $page->title == 'New page') {
-ould 
+an
-                } 
-                
@@ -99 +99 @@
-                    // last chance to verify integrity
-                    if (!pages_exists((int)$page->ident, $owner)) {
-s
+
-                        $rs = true;
-                    } else {
@@ -620 +620 @@
-    $page = new StdClass;
-    $page->title = __gettext('Page Not Found');
- exists
+t exist
-
-    return $page;

releases/0.9/mod/template/templates/Default_Template/css

@@ -627 +627 @@
-   margin:3px;
-   background:#fff;
-
+px
-}
-
@@ -638 +638 @@
-#commentwall_form_-1 textarea {
-   width:98%;
-
+:
-}
-