Changeset 1501 for releases

Timestamp:

12/24/07 21:13:26 (1 year ago)

Author:

misja

Message:

Misja Hoebe <misja@curverider.co.uk> Merged r1500 in 0.9.0 tag

Files:

• releases/0.9.0/.htaccess (modified) (1 diff)
• releases/0.9.0/htaccess-dist (modified) (1 diff)
• releases/0.9.0/lib/filelib.php (modified) (1 diff)
• releases/0.9.0/mod/blog/lib/weblogs_actions.php (modified) (2 diffs)
• releases/0.9.0/mod/blog/lib/weblogs_posts_add.php (modified) (1 diff)
• releases/0.9.0/mod/blog/lib/weblogs_posts_edit.php (modified) (1 diff)
• releases/0.9.0/mod/blog/lib/weblogs_posts_view.php (modified) (1 diff)
• releases/0.9.0/mod/community/lib/permissions_check.php (modified) (1 diff)
• releases/0.9.0/mod/file/lib.php (modified) (1 diff)

releases/0.9.0/.htaccess

@@ -134 +134 @@
-RewriteRule ^([A-Za-z0-9]+)\/files\/([0-9]+)\/?$ mod/file/index.php?files_name=$1&folder=$2
-RewriteRule ^([A-Za-z0-9]+)\/files\/([0-9\-]+)\/([0-9]+)\/(.+)$ mod/file/download.php?files_name=$1&folder=$2&filename=$4&id=$3
+RewriteRule ^(([A-Za-z0-9])[A-Za-z0-9]+)\/files\/rss\/?$ mod/newsclient/static.php?username=$1&userref=$2&type=files
-RewriteRule ^([A-Za-z0-9]+)\/files\/rss\/(.+)\/?$ mod/file/rss2.php?files_name=$1&tag=$2
-RewriteRule ^_icon\/file/([-0-9]+)$ mod/file/icon.php?id=$1

releases/0.9.0/htaccess-dist

@@ -134 +134 @@
-RewriteRule ^([A-Za-z0-9]+)\/files\/([0-9]+)\/?$ mod/file/index.php?files_name=$1&folder=$2
-RewriteRule ^([A-Za-z0-9]+)\/files\/([0-9\-]+)\/([0-9]+)\/(.+)$ mod/file/download.php?files_name=$1&folder=$2&filename=$4&id=$3
+RewriteRule ^(([A-Za-z0-9])[A-Za-z0-9]+)\/files\/rss\/?$ mod/newsclient/static.php?username=$1&userref=$2&type=files
-RewriteRule ^([A-Za-z0-9]+)\/files\/rss\/(.+)\/?$ mod/file/rss2.php?files_name=$1&tag=$2
-RewriteRule ^_icon\/file/([-0-9]+)$ mod/file/icon.php?id=$1

releases/0.9.0/lib/filelib.php

@@ -4 +4 @@
-    
-    $mimeinfo = array (
+                'flv'  => array ('type'=>'video/x-flv', 'icon'=>'video.gif'),
-        'xxx'  => array ('type'=>'document/unknown', 'icon'=>'unknown.gif'),
-        '3gp'  => array ('type'=>'video/quicktime', 'icon'=>'video.gif'),

releases/0.9.0/mod/blog/lib/weblogs_actions.php

@@ -70 +70 @@
-            $exists = false;
-            if ($oldpost = get_record('weblog_posts','ident',$post->ident)) {
-                if (run("permissions:check", array("weblog:edit", $oldpost->owner
+             if (run("permissions:check", array("weblog:edit", $oldpost->owner,$oldpost->weblog
-                    $exists = true;
-                }
@@ -132 +132 @@
-        if (logged_on && !empty($id)) {
-            if ($post_info = get_record('weblog_posts','ident',$id)) {
-                if (run("permissions:check", array("weblog:edit", $post_info->owner)
+             if (run("permissions:check", array("weblog:edit", $post_info->owner),$post_info->weblog
-                    $post_info = plugin_hook("weblog_post","delete",$post_info);
-                    if (!empty($post_info)) {

releases/0.9.0/mod/blog/lib/weblogs_posts_add.php

@@ -19 +19 @@
-    $extensionContext = trim(optional_param('extension','weblog'));
-
-array("weblog:edit",$profile_id))) {
+"weblog")) { // just check if the logged on user can add posts
-      $messages[] = __gettext("Permission denied");
-      $messages[] = __gettext("You can modify only your own content!");

releases/0.9.0/mod/blog/lib/weblogs_posts_edit.php

@@ -13 +13 @@
-$extensionContext = trim(optional_param('extension','weblog'));
-
-
+,$post->weblog
-    $messages[] = __gettext("Permission denied");
-    $messages[] = __gettext("You can modify only your own content!");

releases/0.9.0/mod/blog/lib/weblogs_posts_view.php

@@ -121 +121 @@
-    }
-    // if ($post->owner == $_SESSION['userid'] && logged_on) {
-
+,$post->weblog
-        $Edit = __gettext("Edit");
-        $Delete = __gettext("Delete");

releases/0.9.0/mod/community/lib/permissions_check.php

@@ -37 +37 @@
-    } else {
-        switch($parameter[0]) {
+
-        case    "files:edit":
-        case    "weblog:edit":
+          // we need to know 2 things about file or post: its owner and the community it is
+          // posted to.
-            $owner = $parameter[1];
-
+
+
+
+
+
+
+
+
+
+
-                $run_result = true;
-            }
-
-
-
-
-
+
-            break;
-        case    "userdetails:change":

releases/0.9.0/mod/file/lib.php

@@ -26 +26 @@
-        
-        $files_username = user_info('username', $page_owner);
-
+
+
+
+
+
+
+
+
-        if ($page_owner == $_SESSION['userid'] && $page_owner != -1) {
-            $PAGE->menu_sub[] = array( 'name' => 'file:add',
-                                       'html' => a_href( "#addFile",
-                                                          __gettext("Add a file or a folder")));
-
-
-
-
-
-
-
-
+
-    }
-