Changeset 503

Show
Ignore:
Timestamp:
08/15/06 19:27:02 (2 years ago)
Author:
ben
Message:

Created a new library of user functions and made a start at populating it with functions. There is definitely much more to do on this (there's nothing for user creation and deletion, for example). Also, session / authentication management needs to go somewhere else.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/includes.php

    r501 r503  
    1818        require_once(dirname(__FILE__).'/sanitychecks.php'); 
    1919 
     20    /*************************************************************************** 
     21    *    HELPER LIBRARIES 
     22    ****************************************************************************/ 
     23         
    2024    // Load datalib 
    2125        require_once($CFG->dirroot.'lib/datalib.php'); 
    …… 
    2731        require_once($CFG->dirroot.'lib/setup.php'); 
    2832 
     33    /*************************************************************************** 
     34    *    CORE FUNCTIONALITY LIBRARIES 
     35    ****************************************************************************/ 
     36     
     37    // User functions 
     38        require_once($CFG->dirroot.'lib/userlib.php'); 
     39         
    2940    // Load required system files: do not edit this line. 
    3041        require_once(dirname(__FILE__)."/includes_system.php"); 

  • devel/units/admin/admin_main.php

    r269 r503  
    1010     
    1111    // Number of users of each type 
    12     if ($users = get_records_sql('SELECT user_type, count(ident) AS numusers  
    13                                   FROM '.$CFG->prefix.'users  
    14                                   GROUP BY user_type')) { 
     12    if ($users = count_users()) { 
    1513        foreach($users as $user) { 
    1614             

  • devel/units/users/flag_get.php

    r269 r503  
    1818$userid = (int)$parameter[1]; 
    1919 
    20 if ($result = get_record('user_flags','flag',$flagname,'user_id',$userid)) { 
    21     $run_result = stripslashes($result->value); 
    22 } else { 
    23     $run_result = false; 
    24 } 
     20$run_result = user_flag_get($flagname,$userid); 
    2521 
    2622?> 

  • devel/units/users/flag_set.php

    r454 r503  
    1111     
    1212*/ 
    13      
    14 $userid = (int) $parameter[1]; 
    1513 
    16 // Unset the flag first 
    17 run("users:flags:unset",array($parameter[0], $userid)); 
    18  
    19 // Then add data 
    20 $flag = new StdClass; 
    21 $flag->flag = $parameter[0]; 
    22 $flag->user_id = $userid; 
    23 $flag->value = $parameter[2]; 
    24 insert_record('user_flags',$flag); 
     14user_flag_set($parameter[0],$parameter[2],$parameter[1]); 
    2515         
    2616?> 

  • devel/units/users/flag_unset.php

    r454 r503  
    1515$userid = (int) $parameter[1]; 
    1616 
    17 // Then add data 
    18 delete_records('user_flags','flag',$flagname,'user_id',$userid); 
     17user_flag_unset($flagname,$userid); 
    1918 
    2019?> 

  • devel/units/users/function_display_name.php

    r269 r503  
    11<?php 
    22 
    3 $ident = (int) $parameter; 
     3    $ident = (int) $parameter; 
    44 
    5 $run_result = get_field('users','name','ident',$ident); 
     5    $run_result = user_info('name',$ident); 
    66 
    77?> 

  • devel/units/users/function_id_to_name.php

    r269 r503  
    11<?php 
    22 
    3     // Name table 
    4      
    5         global $id_to_name_table; 
     3    // Now just polls the user_info function 
     4    $run_result = user_info('username',$parameter); 
    65 
    7     // Returns user's username from a given ID 
    8      
    9         if (isset($parameter) && $parameter != "") { 
    10              
    11             $parameter = (int) $parameter; 
    12             if (!isset($id_to_name_table[$parameter])) { 
    13                 $id_to_name_table[$parameter] = get_field('users','username','ident',$parameter); 
    14             } 
    15             $run_result = $id_to_name_table[$parameter]; 
    16              
    17         } 
    18          
    196?> 

  • devel/units/users/function_name_to_id.php

    r454 r503  
    11<?php 
    22 
    3 // Name table 
    4  
    5 global $name_to_id_table; 
    6  
    7 // Returns user's ID from a given name 
    8  
    9 if (isset($parameter) && $parameter != "") { 
    10      
    11     if (!isset($name_to_id_table[$parameter])) { 
    12         $name_to_id_table[$parameter] = get_field('users','ident','username',$parameter); 
    13     } 
    14     $run_result = $name_to_id_table[$parameter]; 
    15      
    16 } 
     3    // Now just polls the user_info_username function 
     4    $run_result = user_info_username('ident',$parameter); 
    175         
    186?> 

  • devel/units/users/function_number_of_users.php

    r269 r503  
    44if ((!logged_on) && $page_owner == -1) { 
    55     
    6     $result = count_records('users','active','yes'); 
     6    $result = count_users('person'); 
    77    $result = "<p>" . sprintf(gettext("There are %d active users."),$result); 
    88    $body = $result; 
    99    $body .= "<br />"; 
    1010     
    11     $result = count_records_select('users',"active = ? and code != ? and last_action > ?",array('yes','',time() - 600)); 
     11    $result = count_users('person',time() - 600); 
    1212    $body .= sprintf(gettext("(%d logged on.)"), $result) . "</p>"; 
    1313    $run_result .= "<li>";        

  • devel/units/users/get_type.php

    r269 r503  
    33// Returns the user_type of a particular user as specified in $parameter 
    44 
    5 global $user_type; 
    6  
    7 if (!isset($user_type[$parameter])) { 
    8     $user_type[$parameter] = get_field('users','user_type','ident',$parameter); 
    9 } 
    10  
    11 $run_result = $user_type[$parameter]; 
     5    $run_result = user_type($parameter); 
    126         
    137?> 

  • devel/units/users/main.php

    r299 r503  
    55    *    Users plug-in 
    66    */ 
    7  
    8     // Load configuration 
    9         require_once(dirname(__FILE__)."/conf.php"); 
    10      
    11     // Library functions 
    12         require_once(dirname(__FILE__)."/library.php"); 
    137     
    148    // Actions to perform on initialisation 

  • devel/units/users/user_info.php

    r458 r503  
    3434        foreach($parameter[1] as $key => $ident) { 
    3535            $ident = (int) $ident; 
    36             // if (!isset($_SESSION['user_info_cache'][$ident])) { 
    3736            $info = get_record('users','ident',$ident); 
    3837            $_SESSION['user_info_cache'][$ident] = $info; 
    …… 
    4948            $username = run("profile:display:name",$info->ident); 
    5049            $usermenu = ''; 
    51             // not used - sven 
    52             // if ($info->ident == $profile_id || (logged_on && (!isset($profile_id) && $info->ident == $_SESSION['userid']))) { 
    53             //     $rsslink = '<br /><a href="' . $CFG->wwwroot . $info->username . '/rss/">RSS</a> | <a href="' . $CFG->wwwroot . $info->username . '/tags/">' . gettext("Tags") . '</a> | <a href="' . $CFG->wwwroot . $info->username . '/newsclient/">' . gettext("Resources") . "</a>"; 
    54             // } 
     50 
    5551            $body .= <<< END 
    5652        <li>