Changeset 557

Show
Ignore:
Timestamp:
09/15/06 15:00:25 (2 years ago)
Author:
sven
Message:

replace get_field('users',*,'ident',*) with user_info(*,*)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/lib/elgglib.php

    r556 r557  
    41014101    } else if (in_array($userid, $nonadmins)) { 
    41024102        return false; 
    4103     } else if (record_exists('user_flags','flag','admin','user_id',$userid,'value','1')) { 
     4103    } else if (user_flag_get('admin', $userid)) { 
    41044104        $admins[] = $userid; 
    41054105        return true; 

  • devel/lib/templates.php

    r556 r557  
    677677            } else { 
    678678                // if (!isset($_SESSION['template_id_cache'][$page_owner])) { 
    679                 if (!$template_id = get_field('users','template_id','ident',$page_owner)) { 
     679                if (!$template_id = user_info('template_id',$page_owner)) { 
    680680                    $template_id = -1; 
    681681                } 
    …… 
    802802    if (!isset($parameter)) { 
    803803    // Get template details 
    804         if (!$template_id = get_field('users','template_id','ident',$USER->ident)) { 
     804        if (!$template_id = user_info('template_id',$USER->ident)) { 
    805805            $template_id = -1; 
    806806        } 
    …… 
    996996    global $USER; 
    997997 
    998     $user_template = get_field('users','template_id','ident',$USER->ident); 
     998    $user_template = user_info('template_id',$USER->ident); 
    999999        $sitename = sitename; 
    10001000        $title = gettext("Select / Create / Edit Themes"); // gettext variable 

  • devel/profile/profile.class.php

    r523 r557  
    6969         
    7070            $name_cache[$this->id]->created = time(); 
    71             $name_cache[$this->id]->data = htmlspecialchars(get_field('users','name','ident',$this->id), ENT_COMPAT, 'utf-8'); 
     71            $name_cache[$this->id]->data = htmlspecialchars(user_info('name',$this->id), ENT_COMPAT, 'utf-8'); 
    7272         
    7373        } 

  • devel/units/communities/user_info_menu_text.php

    r339 r557  
    1414                                    array($USER->ident,$user_id)); 
    1515        if ($result == 0) { 
    16             $moderation = get_field('users','moderation','ident',$user_id); 
     16            $moderation = user_info('moderation',$user_id); 
    1717            switch($moderation) { 
    1818            case "no":        $run_result = "<a href=\"".url."_communities/index.php?friends_name=".$_SESSION['username']."&amp;action=friend&amp;friend_id=$user_id\" onclick=\"return confirm('". gettext("Are you sure you want to join this community?") ."')\">" . gettext("Click here to join this community."). "</a>"; 

  • devel/units/files/files_actions.php

    r532 r557  
    5252            require_once($CFG->dirroot.'lib/uploadlib.php'); 
    5353            $total_quota = get_field_sql('SELECT sum(size) FROM '.$CFG->prefix.'files WHERE owner = ?',array($page_owner)); 
    54             $max_quota = get_field('users','file_quota','ident',$page_owner); 
     54            $max_quota = user_info('file_quota',$page_owner); 
    5555            $maxbytes = $max_quota - $total_quota; 
    5656            $um = new upload_manager('new_file',false,true,false,$maxbytes,true); 

  • devel/units/files/folder_edit.php

    r447 r557  
    174174$usedquota = get_field_sql('SELECT sum(size) FROM '.$CFG->prefix.'files WHERE owner = ?',array($page_owner)); 
    175175 
    176 // $totalquota = get_field('users','file_quota','ident',$USER->ident); 
    177 $totalquota = get_field('users','file_quota','ident',$page_owner); 
     176// $totalquota = user_info('file_quota',$USER->ident); 
     177$totalquota = user_info('file_quota',$page_owner); 
    178178if ($page_owner == $_SESSION['userid']) { 
    179179    $body .= sprintf(gettext("You have used %s Mb of a total %s Mb."),round(($usedquota / 1000000),4),round(($totalquota / 1000000),4)); 

  • devel/units/friends/user_info_menu_text.php

    r339 r557  
    1313                                   JOIN '.$CFG->prefix.'users u ON u.ident = f.friend 
    1414                                   WHERE f.owner = ? AND f.friend = ?',array($USER->ident,$user_id))) { 
    15             $moderation = get_field('users','moderation','ident',$user_id); 
     15            $moderation = user_info('moderation',$user_id); 
    1616            switch ($moderation) { 
    1717            case 'no': 

  • devel/units/icons/function_add_icons.php

    r269 r557  
    66$numicons = count_records('icons','owner',$page_owner); 
    77if ($page_owner != $USER->ident) { 
    8     $iconquota = get_field('users','icon_quota','ident',$page_owner); 
     8    $iconquota = user_info('icon_quota',$page_owner); 
    99} else { 
    1010    $iconquota = $USER->icon_quota; 

  • devel/units/icons/function_get_icon.php

    r287 r557  
    1111     
    1212            $icon_cache[$user_id]->created = time(); 
    13             $icon_cache[$user_id]->data = get_field('users','icon','ident',$user_id); 
     13            $icon_cache[$user_id]->data = user_info('icon',$user_id); 
    1414             
    1515        } 

  • devel/units/magpie/function_actions.php

    r337 r557  
    66if (logged_on && run("permissions:check", "profile")) { 
    77    if ($page_owner != $_SESSION['userid']) { 
    8         $page_username = get_field('users','username','ident',$page_owner); 
     8        $page_username = user_info('username',$page_owner); 
    99    } else { 
    1010        $page_username = $_SESSION['username']; 

  • devel/units/profile/function_display_name.php

    r458 r557  
    2222 
    2323        $name_cache[$user_id]->created = time(); 
    24         $name_cache[$user_id]->data = htmlspecialchars(get_field('users','name','ident',$user_id), ENT_COMPAT, 'utf-8'); 
     24        $name_cache[$user_id]->data = htmlspecialchars(user_info('name',$user_id), ENT_COMPAT, 'utf-8'); 
    2525         
    2626    } 

  • devel/units/rpc/lib/class_weblog.php

    r269 r557  
    4848            elseif (is_string($user_id)) 
    4949            { 
    50                 $this->user_id = get_field('users','ident','username',$user_id); 
     50                $this->user_id = user_info_username('ident',$user_id); 
    5151            } 
    5252 
    …… 
    5757            elseif (is_string($blog_id)) 
    5858            { 
    59                 $this->ident = get_field('users','ident','username',$blog_id); 
     59                $this->ident = user_info_username('ident',$blog_id); 
    6060            } 
    6161 
    …… 
    8080 
    8181                // Get the owner 
    82                 $this->owner = get_field('users','owner','ident',$this->ident); 
     82                $this->owner = user_info('owner',$this->ident); 
    8383 
    8484                // Inject an SQL restriction if the user is not owner 

  • devel/units/templates/template_draw.php

    r454 r557  
    2121            } else { 
    2222                // if (!isset($_SESSION['template_id_cache'][$page_owner])) { 
    23                     if (!$template_id = get_field('users','template_id','ident',$page_owner)) { 
     23                    if (!$template_id = user_info('template_id',$page_owner)) { 
    2424                        $template_id = -1; 
    2525                    } 

  • devel/units/templates/template_draw2.php

    r454 r557  
    2424            } else { 
    2525                // if (!isset($_SESSION['template_id_cache'][$page_owner])) { 
    26                     if (!$template_id = get_field('users','template_id','ident',$page_owner)) { 
     26                    if (!$template_id = user_info('template_id',$page_owner)) { 
    2727                        $template_id = -1; 
    2828                    } 

  • devel/units/templates/templates_edit.php

    r269 r557  
    66    if (!isset($parameter)) { 
    77    // Get template details 
    8         if (!$template_id = get_field('users','template_id','ident',$USER->ident)) { 
     8        if (!$template_id = user_info('template_id',$USER->ident)) { 
    99            $template_id = -1; 
    1010        } 

  • devel/units/templates/templates_view.php

    r515 r557  
    11<?php 
    22global $USER; 
    3         $user_template = get_field('users','template_id','ident',$USER->ident); 
     3        $user_template = user_info('template_id', $USER->ident); 
    44        $sitename = sitename; 
    55        $title = gettext("Select / Create / Edit Themes"); // gettext variable