Changeset 630

Show
Ignore:
Timestamp:
10/10/06 10:02:26 (2 years ago)
Author:
ben
Message:

Better external user handling.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/includes.php

    r539 r630  
    5252 
    5353    // XMLRPC 
    54     //    @include($CFG->dirroot . "units/rpc/main.php"); 
     54        @include($CFG->dirroot . "units/rpc/main.php"); 
    5555 
    5656        if ($allmods = get_list_of_plugins('mod') ) { 

  • devel/mod/adash/lib.php

    r608 r630  
    1414            global $PAGE, $CFG, $page_owner; 
    1515             
    16             if (isloggedin() && user_info($_SESSION['userid'],"user_type") != "external") { 
     16            if (isloggedin() && user_info("user_type",$_SESSION['userid']) != "external") { 
    1717                if (defined("context") && context == "dashboard" && $page_owner == $_SESSION['userid']) { 
    1818                    $PAGE->menu[] = array( 'name' => 'dashboard', 

  • devel/mod/blog/lib.php

    r608 r630  
    1010 
    1111    // main menu 
    12     if (isloggedin() && user_info($_SESSION['userid'],"user_type") != "external") { 
     12    if (isloggedin() && user_info("user_type",$_SESSION['userid']) != "external") { 
    1313 
    1414        if (defined("context") && context == "weblog" && $page_owner == $_SESSION['userid']) { 

  • devel/mod/file/lib.php

    r608 r630  
    99    $page_owner = $profile_id; 
    1010 
    11     if (isloggedin() && user_info($_SESSION['userid'],"user_type") != "external") { 
     11    if (isloggedin() && user_info("user_type",$_SESSION['userid']) != "external") { 
    1212        if (defined("context") && context == "files" && $page_owner == $_SESSION['userid']) { 
    1313            $PAGE->menu[] = array( 'name' => 'files', 

  • devel/mod/friend/lib.php

    r608 r630  
    99    $page_owner = $profile_id; 
    1010 
    11     if (isloggedin() && user_info($_SESSION['userid'],"user_type") != "external") { 
     11    if (isloggedin()) { 
    1212        if (defined("context") && context == "network" && $page_owner == $_SESSION['userid']) { 
    1313             
    …… 
    2222    if (defined("context") && context == "network") { 
    2323         
    24         if (user_type($page_owner) == "person") { 
     24        if (user_type($page_owner) == "person" || user_type($page_owner) == "external") { 
    2525         
    2626            $friends_username = user_info('username', $page_owner); 

  • devel/mod/newsclient/lib.php

    r608 r630  
    99    $page_owner = $profile_id; 
    1010 
    11     if (isloggedin() && user_info($_SESSION['userid'],"user_type") != "external") { 
     11    if (isloggedin() && user_info("user_type",$_SESSION['userid']) != "external") { 
    1212        if (defined("context") && context == "resources" && $page_owner == $_SESSION['userid']) { 
    1313            $PAGE->menu[] = array( 'name' => 'feeds', 

  • devel/mod/profile/lib.php

    r608 r630  
    1111    $pgowner = $profile_id; 
    1212 
    13     if (isloggedin() && user_info($_SESSION['userid'],"user_type") != "external") { 
     13    if (isloggedin() && user_info("user_type",$_SESSION['userid']) != "external") { 
    1414        if (defined("context") && context == "profile" && $pgowner == $_SESSION['userid']) { 
    1515            $PAGE->menu[] = array( 'name' => 'profile',  

  • devel/mod/template/lib.php

    r608 r630  
    99    $page_owner = $profile_id; 
    1010 
    11     if (defined("context") && context == "account" && !$CFG->disable_templatechanging  && user_info($_SESSION['userid'],"user_type") != "external") { 
     11    if (defined("context") && context == "account" && !$CFG->disable_templatechanging  && user_info("user_type",$_SESSION['userid']) != "external") { 
    1212        if ($page_owner == $_SESSION['userid'] && $page_owner != -1) { 
    1313            $PAGE->menu_sub[] = array( 'name' => 'template:change', 

  • devel/units/communities/community_memberships.php

    r573 r630  
    44 
    55if ($page_owner != -1) { 
    6     if (user_type($page_owner) == "person") { 
     6    if (user_type($page_owner) == "person" || user_type($page_owner) == "external") { 
    77        if ($result = get_records_sql('SELECT DISTINCT u.ident,u.username,u.name FROM '.$CFG->prefix.'friends f 
    88                                       JOIN '.$CFG->prefix.'users u ON u.ident = f.friend 

  • devel/units/friends/profile_friends.php

    r628 r630  
    33global $page_owner; 
    44 
    5 if ($page_owner != -1 && user_type($page_owner) == "person") { 
     5if ($page_owner != -1 && (user_type($page_owner) == "person" || user_type($page_owner) == "external")) { 
    66    $friends = array(); 
    77    if ($result = get_records_sql('SELECT DISTINCT u.ident,1 FROM '.$CFG->prefix.'friends f 

  • devel/units/friends/user_info_menu_text.php

    r573 r630  
    88    $user_id = (int) $parameter[0]; 
    99     
    10     if (user_type($user_id) == "person") { 
     10    if (user_type($user_id) == "person" || user_type($user_id) == "external") { 
    1111         
    1212        if (!count_records_sql('SELECT COUNT(u.ident) FROM '.$CFG->prefix.'friends f 

  • devel/units/weblogs/permissions_check.php

    r269 r630  
    1717        if ($parameter == "weblog") { 
    1818             
    19             if ($page_owner == $_SESSION['userid'] && logged_on) { 
     19            if ($page_owner == $_SESSION['userid'] && logged_on && user_info("user_type",$page_owner) != "external") { 
    2020                $run_result = true; 
    2121            } 
    …… 
    3030            if ($parameter[0] == "weblog:edit") { 
    3131                 
    32                 if ($parameter[1] == $_SESSION['userid'] && logged_on) { 
     32                if ($parameter[1] == $_SESSION['userid'] && logged_on && user_info("user_type",$page_owner) != "external") { 
    3333                    $run_result = true; 
    3434                }