Changeset 573

Timestamp:

09/18/06 15:29:07 (2 years ago)

Author:

sven

Message:

run("users:name_to_id") -> user_info_username()
run("users:id_to_name") -> user_info()
run("users:type:get") -> user_type()
make user_type() use user_info()

Files:

• devel/_files/download.php (modified) (1 diff)
• devel/_rpc/rsd.php (modified) (1 diff)
• devel/_weblog/rss2.php (modified) (1 diff)
• devel/lib/templates.php (modified) (1 diff)
• devel/lib/userlib.php (modified) (2 diffs)
• devel/mod/blog/lib.php (modified) (1 diff)
• devel/mod/community/lib.php (modified) (1 diff)
• devel/mod/file/lib.php (modified) (1 diff)
• devel/mod/friend/lib.php (modified) (1 diff)
• devel/mod/newsclient/lib.php (modified) (1 diff)
• devel/mod/profile/lib.php (modified) (1 diff)
• devel/profile/edit.php (modified) (2 diffs)
• devel/profile/index.php (modified) (1 diff)
• devel/profile/profile.class.php (modified) (1 diff)
• devel/units/communities/communities_actions.php (modified) (4 diffs)
• devel/units/communities/communities_membership_requests.php (modified) (1 diff)
• devel/units/communities/communities_owned.php (modified) (1 diff)
• devel/units/communities/community_memberships.php (modified) (2 diffs)
• devel/units/communities/community_wiki.php (modified) (1 diff)
• devel/units/communities/community_wiki2.php (modified) (1 diff)
• devel/units/communities/profile_edit_link.php (modified) (1 diff)
• devel/units/communities/user_info_menu_text.php (modified) (1 diff)
• devel/units/communities/userdetails_edit.php (modified) (1 diff)
• devel/units/files/files_actions.php (modified) (4 diffs)
• devel/units/files/files_init.php (modified) (2 diffs)
• devel/units/files/files_links_make.php (modified) (4 diffs)
• devel/units/files/files_user_info_menu.php (modified) (1 diff)
• devel/units/files/folder_view.php (modified) (1 diff)
• devel/units/files/function_rss_getitems.php (modified) (1 diff)
• devel/units/files/function_rss_publish.php (modified) (1 diff)
• devel/units/friends/friends_actions.php (modified) (2 diffs)
• devel/units/friends/friends_init.php (modified) (2 diffs)
• devel/units/friends/profile_friends.php (modified) (1 diff)
• devel/units/friends/user_friendship_requests.php (modified) (1 diff)
• devel/units/friends/user_info_menu_text.php (modified) (1 diff)
• devel/units/icons/function_actions.php (modified) (2 diffs)
• devel/units/icons/function_edit_icons.php (modified) (1 diff)
• devel/units/magpie/menu_sub.php (modified) (1 diff)
• devel/units/profile/function_init.php (modified) (1 diff)
• devel/units/profile/function_rss_publish.php (modified) (1 diff)
• devel/units/profile/profile_user_info.php (modified) (1 diff)
• devel/units/rpc/lib/class_weblog.php (modified) (1 diff)
• devel/units/rpc/rpc_init.php (modified) (1 diff)
• devel/units/users/userdetails_actions.php (modified) (1 diff)
• devel/units/users/userdetails_edit.php (modified) (1 diff)
• devel/units/weblogs/function_rss_getitems.php (modified) (1 diff)
• devel/units/weblogs/function_rss_publish.php (modified) (1 diff)
• devel/units/weblogs/function_search.php (modified) (1 diff)
• devel/units/weblogs/function_search_rss.php (modified) (1 diff)
• devel/units/weblogs/weblogs_actions.php (modified) (3 diffs)
• devel/units/weblogs/weblogs_init.php (modified) (2 diffs)
• devel/units/weblogs/weblogs_posts_add.php (modified) (1 diff)
• devel/units/weblogs/weblogs_posts_edit.php (modified) (1 diff)
• devel/units/weblogs/weblogs_posts_view.php (modified) (3 diffs)
• devel/units/weblogs/weblogs_user_info_menu.php (modified) (1 diff)

devel/_files/download.php

@@ -19 +19 @@
-        // ... and the owner of the file in the URL line hasn't been spoofed ...
-        $files_name = optional_param('files_name');
-run("users:name_to_id",
-run("users:name_to_id",
+user_info_username('ident', 
+user_info_username('ident', 
-            
-            // ... and the current user is allowed to access it ...

devel/_rpc/rsd.php

@@ -12 +12 @@
-    $blog_id =  optional_param('user_id',0,PARAM_INT);
-    if (!empty($blog_id)) {
-run("users:id_to_name"
+user_info('username'
-        $service_url = url . "_rpc/RPC2.php";
-        $user_homepage = url . $username . "/weblog/";

devel/_weblog/rss2.php

@@ -22 +22 @@
-    
-    if ($page_owner != -1) {
-run("users:id_to_name"
+user_info('username'
-    } else {
-        $username = "news";

devel/lib/templates.php

@@ -1143 +1143 @@
-//                 return "";
-//             } else {
-run("users:id_to_name"
+user_info('username'
-//             }
-//             break;

devel/lib/userlib.php

@@ -37 +37 @@
-        // Returns field from a given ID
-
+        $user_id = (int) $user_id;
+        
-        if (!empty($user_id)) {
-            $user_id = (int) $user_id;
-            if (!isset($id_to_name_table[$user_id][$fieldname])) {
-                $id_to_name_table[$user_id][$fieldname] = get_field('users',$fieldname,'ident',$user_id);
@@ -74 +75 @@
-    function user_type($user_id) {
-        
-
-
-
-
-
-
-
-
+
+
-    }
-    

devel/mod/blog/lib.php

@@ -23 +23 @@
-    }
-
-run("users:id_to_name",
+user_info('username', 
-    
-    // submenu

devel/mod/community/lib.php

@@ -9 +9 @@
-    $page_owner = $profile_id;
-    
-run("users:type:get", 
+user_type(
-
-    if ($usertype == "community") {

devel/mod/file/lib.php

@@ -21 +21 @@
-    if (defined("context") && context == "files") {
-        
-run("users:id_to_name",
+user_info('username', 
-        
-        if ($page_owner == $_SESSION['userid'] && $page_owner != -1) {

devel/mod/friend/lib.php

@@ -22 +22 @@
-    if (defined("context") && context == "network") {
-        
-run("users:type:get", 
+user_type(
-        
-run("users:id_to_name",
+user_info('username', 
-            
-            $PAGE->menu_sub[] = array( 'name' => 'friend',

devel/mod/newsclient/lib.php

@@ -18 +18 @@
-        }
-
-run("users:id_to_name",
+user_info('username', 
-    }
-

devel/mod/profile/lib.php

@@ -22 +22 @@
-        if (profile_permissions_check("profile") && defined("context") && context == "profile") {
-
-run("users:type:get", 
+user_type(
-                $PAGE->menu_sub[] = array( 'name' => 'profile:edit', 
-                                           'html' => '<a href="'.$CFG->wwwroot.'profile/edit.php?profile_id='.$pgowner.'">'

devel/profile/edit.php

@@ -10 +10 @@
-$profile_name = optional_param('profile_name', '', PARAM_ALPHANUM);
-if (!empty($profile_name)) {
-run("users:name_to_id"
+user_info_username('ident'
-}
-if (empty($profile_id)) {
@@ -21 +21 @@
-    }
-
-run("users:id_to_name"
+user_info('username'
-}
-

devel/profile/index.php

@@ -10 +10 @@
-$profile_name = optional_param('profile_name', '', PARAM_ALPHANUM);
-if (!empty($profile_name)) {
-run("users:name_to_id"
+user_info_username('ident'
-}
-if (empty($profile_id)) {

devel/profile/profile.class.php

@@ -88 +88 @@
-        if (run("permissions:check", "profile")) {
-    
-run("users:id_to_name",
+user_info('username', 
-        
-

devel/units/communities/communities_actions.php

@@ -84 +84 @@
-     case "unfriend":
-         if (!empty($friend_id) && logged_on) {
-run("users:type:get", 
-run("users:id_to_name",
+user_type(
+user_info('username', 
-                 $messages[] = sprintf(gettext("You left %s."), $name);
-             }
@@ -92 +92 @@
-         
-    case "weblogs:post:add":
-run("users:type:get",
+user_type(
-            $messages[] = gettext("Your post has been added to the community weblog.");
-        }
@@ -100 +100 @@
-    case "community:approve:request":
-         $request_id = optional_param('request_id',0,PARAM_INT);
-run("users:type:get", 
+user_type(
-             if ($request = get_record_sql('SELECT u.name,fr.owner,fr.friend FROM '.$CFG->prefix.'friends_requests fr LEFT JOIN '.$CFG->prefix.'users u ON u.ident = fr.owner
-                                            WHERE fr.ident = ?',array($request_id))) {
@@ -126 +126 @@
-     case "community:decline:request":
-         $request_id = optional_param('request_id',0,PARAM_INT);
-run("users:type:get", 
+user_type(
-             if ($request = get_record_sql('SELECT u.name,fr.owner,fr.friend FROM '.$CFG->prefix.'friends_requests fr LEFT JOIN '.$CFG->prefix.'users u ON u.ident = fr.owner
-                                            WHERE fr.ident = ?',array($request_id))) {

devel/units/communities/communities_membership_requests.php

@@ -7 +7 @@
-        
-        global $page_owner;
-run("users:type:get", 
+user_type(
-            $title = run("profile:display:name") . " :: ". gettext("Membership requests") ."";
-

devel/units/communities/communities_owned.php

@@ -4 +4 @@
-
-if ($page_owner != -1) {
-run("users:type:get", 
+user_type(
-        if ($result = get_records_select('users',"owner = ? AND user_type = ?",array($page_owner,'community'))) {
-            $body = "<ul>";

devel/units/communities/community_memberships.php

@@ -4 +4 @@
-
-if ($page_owner != -1) {
-run("users:type:get", 
+user_type(
-        if ($result = get_records_sql('SELECT DISTINCT u.ident,u.username,u.name FROM '.$CFG->prefix.'friends f
-                                       JOIN '.$CFG->prefix.'users u ON u.ident = f.friend
@@ -26 +26 @@
-            $run_result .= "";
-        }
-run("users:type:get", 
+user_type(
-        $friends = array();
-        if ($result = get_records_sql('SELECT DISTINCT u.ident,1 FROM '.$CFG->prefix.'friends f

devel/units/communities/community_wiki.php

@@ -4 +4 @@
-
-    if ($page_owner != -1) {
-run("users:type:get", 
-run ("users:id_to_name"
+user_type(
+user_info('username'
-            $run_result .= "<div class=\"box_community_wiki\">";
-            $run_result .= templates_draw(                array(

devel/units/communities/community_wiki2.php

@@ -4 +4 @@
-    
-    if ($page_owner != -1) {
-run("users:type:get", 
+user_type(
-            
-            $run_result .= "<div class=\"box_community_wiki\">";

devel/units/communities/profile_edit_link.php

@@ -4 +4 @@
-    global $CFG;
-
-run("users:type:get",
+user_type(
-
-        if (run("permissions:check", "uploadicons")) {

devel/units/communities/user_info_menu_text.php

@@ -8 +8 @@
-    $user_id = (int) $parameter[0];
-    
-run("users:type:get", 
+user_type(
-        $result = count_records_sql('SELECT COUNT(u.ident) FROM '.$CFG->prefix.'friends f
-                                     LEFT JOIN '.$CFG->prefix.'users u ON u.ident = f.friend

devel/units/communities/userdetails_edit.php

@@ -3 +3 @@
-    global $page_owner;
-    
-run("users:type:get",
+user_type(
-        
-        $info = get_record('users','ident',$page_owner);

devel/units/files/files_actions.php

@@ -48 +48 @@
-                break;
-            }
-run("users:id_to_name"
+user_info('username'
-            $upload_folder = $textlib->substr($ul_username,0,1);
-            require_once($CFG->dirroot.'lib/uploadlib.php');
@@ -108 +108 @@
-            $file_info = get_record('files','ident',$f->ident);
-            if (!empty($file_info) && run("permissions:check", array("files:edit",$file_info->files_owner))) {
-run("users:id_to_name"
+user_info('username'
-                update_record('files',$f);
-                delete_records('tags','tagtype','file','ref',$f->ident);
@@ -154 +154 @@
-            $folder = get_record('file_folders','ident',$id);
-            if (!empty($folder) && (run("permissions:check", array("files:edit",$folder->files_owner)) || run("permissions:check", array("files:edit",$folder->owner)))) {
-run("users:id_to_name"
+user_info('username'
-                set_field('file_folders','parent',$folder->parent,'parent',$id);
-                set_field('files','folder',$folder->parent,'folder',$id);
@@ -176 +176 @@
-            $file = get_record('files','ident',$id);
-            if (!empty($file) && (run("permissions:check", array("files:edit",$file->files_owner)) || run("permissions:check", array("files:edit",$file->owner)))) {
-run("users:id_to_name"
+user_info('username'
-                @unlink(stripslashes($CFG->dataroot.$file->location)); //TODO maybe some error reporting here!?! Penny
-                delete_records('files','ident',$id);

devel/units/files/files_init.php

@@ -5 +5 @@
-$files_name = optional_param('files_name');
-if (!empty($files_name)) {
-run("users:name_to_id",
+user_info_username('ident', 
-} else {
-    $owner = optional_param('owner',optional_param('userid',0,PARAM_INT),PARAM_INT);
@@ -11 +11 @@
-
-global $owner_username;        
-run("users:id_to_name",
+user_info('username', 
-
-global $page_owner;

devel/units/files/files_links_make.php

@@ -12 +12 @@
-                $mimeinfo = mimeinfo('type',$file->location);
-                if ($mimeinfo == "audio/mpeg" || $mimeinfo == "audio/mp3") {
-run("users:id_to_name",
+user_info('username', 
-                    $filetitle = urlencode(stripslashes($file->title));
-                    $run_result .= "<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\"
@@ -29 +29 @@
-                } else {
-                    $run_result .= "<a href=\"";
-run("users:id_to_name",
+user_info('username', 
-                    $run_result .= "\" >";
-                    $run_result .= stripslashes($file->title);
@@ -38 +38 @@
-                if ($width > 400 || $height > 400) {
-                    $run_result .= "<a href=\"";
-run("users:id_to_name",
+user_info('username', 
-                    $run_result .= "\" >";
-                    $run_result .= stripslashes($file->title);
@@ -44 +44 @@
-                } else {
-                    $run_result .= "<img src=\"";
-run("users:id_to_name",
+user_info('username', 
-                    $run_result .= "\" $attr alt=\"".htmlspecialchars(stripslashes($file->title), ENT_COMPAT, 'utf-8')."\" />";
-                }

devel/units/files/files_user_info_menu.php

@@ -20 +20 @@
-    }
-    
-run("users:id_to_name",
+user_info('username', 
-    $fileStorage = gettext("File Storage"); // gettext variable
-    $body = <<< END

devel/units/files/folder_view.php

@@ -18 +18 @@
-    
-global $page_owner;
-run("users:id_to_name",
+user_info('username', 
-
-// If we're not in the parent folder, provide a link to return to the parent

devel/units/files/function_rss_getitems.php

@@ -18 +18 @@
-        $userid = (int) $parameter[0];
-        if ($userid > 0) {
-run("users:id_to_name"
+user_info('username'
-        }
-        if ($username) {

devel/units/files/function_rss_publish.php

@@ -18 +18 @@
-        $userid = (int) $parameter[0];
-        if ($userid > 0) {
-run("users:id_to_name"
+user_info('username'
-        }
-        if ($username) {

devel/units/friends/friends_actions.php

@@ -74 +74 @@
-     case "friends:approve:request":
-         $request_id = optional_param('request_id',0,PARAM_INT);
-run("users:type:get", 
+user_type(
-             if ($request = get_record_sql('SELECT u.name, fr.owner, fr.friend FROM '.$CFG->prefix.'friends_requests fr
-                                    LEFT JOIN '.$CFG->prefix.'users u ON u.ident = fr.owner 
@@ -105 +105 @@
-     case "friends:decline:request":
-         $request_id = optional_param('request_id',0,PARAM_INT);
-run("users:type:get", 
+user_type(
-             if ($request = get_record_sql('SELECT u.name, fr.owner, fr.friend FROM '.$CFG->prefix.'friends_requests fr
-                                    LEFT JOIN '.$CFG->prefix.'users u ON u.ident = fr.owner 

devel/units/friends/friends_init.php

@@ -7 +7 @@
-$friends_name = optional_param('friends_name');
-if (!empty($friends_name)) {
-run("users:name_to_id",
+user_info_username('ident', 
-} else {
-    $owner = optional_param('owner',$page_owner,PARAM_INT);
@@ -24 +24 @@
-global $page_userid;
-
-run("users:id_to_name"
+user_info('username'
-
-global $metatags;

devel/units/friends/profile_friends.php

@@ -3 +3 @@
-global $page_owner;
-
-run("users:type:get", 
+user_type(
-    $friends = array();
-    if ($result = get_records_sql('SELECT DISTINCT u.ident,1 FROM '.$CFG->prefix.'friends f

devel/units/friends/user_friendship_requests.php

@@ -7 +7 @@
-        global $page_owner;
-        
-run("users:type:get", 
+user_type(
-
-            $title = run("profile:display:name") . " :: ". gettext("Friendship requests") ."";

devel/units/friends/user_info_menu_text.php

@@ -8 +8 @@
-    $user_id = (int) $parameter[0];
-    
-run("users:type:get", 
+user_type(
-        
-        if (!count_records_sql('SELECT COUNT(u.ident) FROM '.$CFG->prefix.'friends f

devel/units/icons/function_actions.php

@@ -42 +42 @@
-            if ($result = get_record('icons','ident',$delete_icon,'owner',$page_owner)) {
-                delete_records('icons','ident',$delete_icon);
-run("users:id_to_name"
+user_info('username'
-                $upload_folder = $textlib->substr($ul_username,0,1);
-                $filepath = $CFG->dataroot . "icons/" . $upload_folder . "/" . $ul_username . "/".$file->filename; 
@@ -77 +77 @@
-        $um = new upload_manager('iconfile',false,true,false,0,true);
-        $messages[] = gettext("Attempting to upload icon file ...");
-run("users:id_to_name"
+user_info('username'
-        $upload_folder = $textlib->substr($ul_username,0,1);
-        $dir = $CFG->dataroot . "icons/" . $upload_folder . "/" . $ul_username . "/"; 

devel/units/icons/function_edit_icons.php

@@ -5 +5 @@
-    
-global $page_owner;
-run("users:id_to_name"
+user_info('username'
-
-// Get all icons associated with a user

devel/units/magpie/menu_sub.php

@@ -3 +3 @@
-    global $page_owner;
-
-run("users:id_to_name",
+user_info('username', 
-    
-    if (context=="resources") {

devel/units/profile/function_init.php

@@ -8 +8 @@
-        
-        if (isset($_REQUEST['profile_name'])) {
-run("users:name_to_id"
+user_info_username('ident'
-        } else if (isset($_REQUEST['profile_id'])) {
-            $profile_id = (int) $_REQUEST['profile_id'];

devel/units/profile/function_rss_publish.php

@@ -18 +18 @@
-        $userid = (int) $parameter[0];
-        if ($userid > 0) {
-run("users:id_to_name"
+user_info('username'
-        }
-        if ($username) {

devel/units/profile/profile_user_info.php

@@ -15 +15 @@
-}
-
-run("users:id_to_name"
+user_info('username'
-
-$info->icon = run("icons:get", $page_owner);

devel/units/rpc/lib/class_weblog.php

@@ -61 +61 @@
-
-            // Are we dealing with a person or a community?
-run("users:type:get", 
+user_type(
-            {
-                if ($result = get_record('users','ident',$this->user_id)) {

devel/units/rpc/rpc_init.php

@@ -25 +25 @@
-
-    if (isset($_GET['weblog_name'])) {
-run('users:name_to_id
+user_info_username('ident
-        $add_meta = true;
-    } else if (isset($_GET['profile_name'])) {
-run('users:name_to_id
+user_info_username('ident
-        $add_meta = true;
-    }

devel/units/users/userdetails_actions.php

@@ -22 +22 @@
-            }
-            
-run("users:type:get",
+user_type(
-            $email = trim(optional_param('email'));
-            if ($usertype == 'person' && !empty($email)) {

devel/units/users/userdetails_edit.php

@@ -3 +3 @@
-    global $page_owner;
-    
-run("users:type:get",
+user_type(
-    
-        $info = get_record('users','ident',$page_owner);

devel/units/weblogs/function_rss_getitems.php

@@ -16 +16 @@
-        $userid = (int) $parameter[0];
-        //if ($userid > 0) {
-run("users:id_to_name"
+user_info('username'
-        //}
-        // if ($username) {

devel/units/weblogs/function_rss_publish.php

@@ -18 +18 @@
-        $userid = (int) $parameter[0];
-        if ($userid > 0) {
-run("users:id_to_name"
+user_info('username'
-        }
-        if ($username) {

devel/units/weblogs/function_search.php

@@ -55 +55 @@
-            foreach($posts as $post) {
-                $run_result .= "<li>";
-run("users:id_to_name",
+user_info('username', 
-                $run_result .= "<a href=\"".url . $weblogusername . "/weblog/" . $post->ident . ".html\">" . gmstrftime("%B %d, %Y",$post->posted) . " - " . stripslashes($post->title) . "</a>\n";
-                if ($post->owner != $post->weblog) {

devel/units/weblogs/function_search_rss.php

@@ -22 +22 @@
-                $run_result .= " :: " . (stripslashes($post->title));
-            }
-run("users:id_to_name",
+user_info('username', 
-            $run_result .= "]]></title>\n";
-            $run_result .= "\t\t<link>" . url . $weblogusername . "/weblog/" . $post->ident . ".html</link>\n";

devel/units/weblogs/weblogs_actions.php

@@ -22 +22 @@
-            $rssresult = run("weblogs:rss:publish", array($page_owner, false));
-            $rssresult = run("profile:rss:publish", array($page_owner, false));
-run("users:type:get",
+user_type(
-                $messages[] = gettext("Your post has been added to your weblog.");
-            }
@@ -101 +101 @@
-            }
-            global $redirect_url;
-run("users:id_to_name",
+user_info('username', 
-            define('redirect_url',$redirect_url);
-        }
@@ -162 +162 @@
-                $messages[] = gettext("Your comment was deleted.");
-            }
-run("users:id_to_name",
+user_info('username', 
-            define('redirect_url',$redirect_url);
-        }