Changeset 1500 for releases/0.9

Show
Ignore:
Timestamp:
12/24/07 21:10:45 (9 months ago)
Author:
misja
Message:

Misja Hoebe <misja@curverider.co.uk> Merged r1495, r1496, r1497, r1498, r1499 into 0.9 branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/0.9/htaccess-dist

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

  • releases/0.9/lib/filelib.php

    r806 r1500  
    44     
    55    $mimeinfo = array ( 
     6                'flv'  => array ('type'=>'video/x-flv', 'icon'=>'video.gif'), 
    67        'xxx'  => array ('type'=>'document/unknown', 'icon'=>'unknown.gif'), 
    78        '3gp'  => array ('type'=>'video/quicktime', 'icon'=>'video.gif'), 

  • releases/0.9/mod/blog/lib/weblogs_actions.php

    r1401 r1500  
    7070            $exists = false; 
    7171            if ($oldpost = get_record('weblog_posts','ident',$post->ident)) { 
    72                 if (run("permissions:check", array("weblog:edit", $oldpost->owner))) { 
     72             if (run("permissions:check", array("weblog:edit", $oldpost->owner,$oldpost->weblog))) { 
    7373                    $exists = true; 
    7474                } 
    …… 
    132132        if (logged_on && !empty($id)) { 
    133133            if ($post_info = get_record('weblog_posts','ident',$id)) { 
    134                 if (run("permissions:check", array("weblog:edit", $post_info->owner))) { 
     134             if (run("permissions:check", array("weblog:edit", $post_info->owner),$post_info->weblog)) { 
    135135                    $post_info = plugin_hook("weblog_post","delete",$post_info); 
    136136                    if (!empty($post_info)) { 

  • releases/0.9/mod/blog/lib/weblogs_posts_add.php

    r1401 r1500  
    1919    $extensionContext = trim(optional_param('extension','weblog')); 
    2020 
    21     if (!run("permissions:check", array("weblog:edit",$profile_id))) { 
     21    if (!run("permissions:check", "weblog")) { // just check if the logged on user can add posts 
    2222      $messages[] = __gettext("Permission denied"); 
    2323      $messages[] = __gettext("You can modify only your own content!"); 

  • releases/0.9/mod/blog/lib/weblogs_posts_edit.php

    r1401 r1500  
    1313$extensionContext = trim(optional_param('extension','weblog')); 
    1414 
    15 if (!($aver=run("permissions:check", array("weblog:edit",$post->owner)))) { 
     15if (!($aver=run("permissions:check", array("weblog:edit",$post->owner,$post->weblog)))) { 
    1616    $messages[] = __gettext("Permission denied"); 
    1717    $messages[] = __gettext("You can modify only your own content!"); 

  • releases/0.9/mod/blog/lib/weblogs_posts_view.php

    r1395 r1500  
    121121    } 
    122122    // if ($post->owner == $_SESSION['userid'] && logged_on) { 
    123     if (run("permissions:check",array("weblog:edit",$post->owner))) { 
     123    if (run("permissions:check",array("weblog:edit",$post->owner,$post->weblog))) { 
    124124        $Edit = __gettext("Edit"); 
    125125        $Delete = __gettext("Delete"); 

  • releases/0.9/mod/community/lib/permissions_check.php

    r1248 r1500  
    3737    } else { 
    3838        switch($parameter[0]) { 
     39 
    3940        case    "files:edit": 
    4041        case    "weblog:edit": 
     42          // we need to know 2 things about file or post: its owner and the community it is 
     43          // posted to. 
    4144            $owner = $parameter[1]; 
    42             if (record_exists('users','ident',$owner,'owner',$USER->ident,'user_type','community')) { 
     45            if(isset($parameter[2])){ 
     46              $weblog=$parameter[2]; 
     47            } else { 
     48              $weblog=0; 
     49            } 
     50            // Here we only check wether the logged on user is the moderator of the community  
     51            // where the posts was made or file was uploaded ($weblog). 
     52            // Permission to edit their own content is granted in mod/blog/lib/permission_check.php and 
     53            // mod/file/lib/permission_check.php. 
     54            if (record_exists('users','ident',$weblog,'owner',$USER->ident,'user_type','community')) { 
    4355                $run_result = true; 
    4456            } 
    45             if (empty($run_result)) { 
    46                 if(run('community:membership',array($page_owner,$USER->ident))){ 
    47                     $run_result = true; 
    48                 } 
    49             } 
     57             
    5058            break; 
    5159        case    "userdetails:change": 

  • releases/0.9/mod/file/lib.php

    r1392 r1500  
    2626         
    2727        $files_username = user_info('username', $page_owner); 
    28          
     28                 
     29        if ($page_owner != -1) { 
     30            if ($page_owner == $_SESSION['userid'] && $page_owner != -1) { 
     31                $PAGE->menu_sub[] = array( 'name' => 'file:rss',  
     32                        'html' => '<a href="' . $CFG->wwwroot . $_SESSION['username'] . '/files/rss/"><img src="' . $CFG->wwwroot . 'mod/template/icons/rss.png" border="0" alt="rss" /></a>'); 
     33            } 
     34        } 
     35 
    2936        if ($page_owner == $_SESSION['userid'] && $page_owner != -1) { 
    3037            $PAGE->menu_sub[] = array( 'name' => 'file:add', 
    3138                                       'html' => a_href( "#addFile", 
    3239                                                          __gettext("Add a file or a folder"))); 
    33         } 
    34         if ($page_owner != -1) { 
    35             if ($page_owner == $_SESSION['userid'] && $page_owner != -1) { 
    36                 $PAGE->menu_sub[] = array( 'name' => 'file:rss', 
    37                                            'html' => a_href( $CFG->wwwroot.$_SESSION['username']."/files/rss/",  
    38                                                               __gettext("RSS feed for files")));   
    39             } 
    40         } 
     40        } 
    4141    } 
    4242