Changeset 1022

Timestamp:

03/12/07 12:10:28 (2 years ago)

Author:

ben

Message:

All icons are now displayed using the user_icon_html function; all user full names are displayed using the user_name function. This is to allow potential plugins to do things like hide names if required (eg in a school situation), and add bling to the icon.

Files:

• devel/_files/rss2.php (modified) (1 diff)
• devel/_weblog/rss091.php (modified) (1 diff)
• devel/_weblog/rss2.php (modified) (1 diff)
• devel/lib/elgglib.php (modified) (1 diff)
• devel/lib/templates.php (modified) (1 diff)
• devel/lib/userlib.php (modified) (1 diff)
• devel/mod/adash/index.php (modified) (1 diff)
• devel/mod/blog/lib.php (modified) (3 diffs)
• devel/mod/browser/index.php (modified) (1 diff)
• devel/profile/edit.php (modified) (1 diff)
• devel/profile/profile.class.php (modified) (4 diffs)
• devel/profile/rss2.php (modified) (1 diff)
• devel/search/personaltags.php (modified) (1 diff)
• devel/units/communities/communities_edit.php (modified) (1 diff)
• devel/units/communities/communities_edit_wrapper.php (modified) (1 diff)
• devel/units/communities/communities_members.php (modified) (1 diff)
• devel/units/communities/communities_membership_requests.php (modified) (1 diff)
• devel/units/communities/communities_moderator_of.php (modified) (1 diff)
• devel/units/communities/userdetails_edit.php (modified) (1 diff)
• devel/units/files/function_rss_publish.php (modified) (1 diff)
• devel/units/files/function_search.php (modified) (1 diff)
• devel/units/files/function_search_ecl.php (modified) (1 diff)
• devel/units/friends/friends_actions.php (modified) (2 diffs)
• devel/units/friends/friends_edit.php (modified) (1 diff)
• devel/units/friends/friends_of_edit.php (modified) (1 diff)
• devel/units/friends/generate_foaf.php (modified) (2 diffs)
• devel/units/friends/user_friendship_requests.php (modified) (1 diff)
• devel/units/profile/function_display_name.php (modified) (2 diffs)
• devel/units/profile/function_rss_publish.php (modified) (1 diff)
• devel/units/profile/function_search.php (modified) (1 diff)
• devel/units/profile/function_search_ecl.php (modified) (1 diff)
• devel/units/profile/function_search_rss.php (modified) (1 diff)
• devel/units/profile/profile_user_info.php (modified) (1 diff)
• devel/units/rpc/lib/class_user.php (modified) (2 diffs)
• devel/units/users/main.php (modified) (1 diff)
• devel/units/users/user_info.php (modified) (1 diff)
• devel/units/users/userdetails_edit.php (modified) (1 diff)
• devel/units/weblogs/default_template.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_ecl.php (modified) (1 diff)
• devel/units/weblogs/weblogs_posts_view.php (modified) (5 diffs)

devel/_files/rss2.php

@@ -26 +26 @@
-
-    if ($info = get_record('users','ident',$page_owner)) {
-$info->name
+user_name($info->ident)
-        $mainurl = $CFG->wwwroot . $info->username . "/files/";
-        $rssurl = $mainurl . "rss/" . urlencode($tag);

devel/_weblog/rss091.php

@@ -33 +33 @@
-END;
-            if ($info = get_record('users','ident',$page_owner)) {
-$info->name
+user_name($info->ident)
-                $username = htmlspecialchars($info->username, ENT_COMPAT, 'utf-8');
-                $sitename = sitename;

devel/_weblog/rss2.php

@@ -75 +75 @@
-                                    $rssweblog = $rssdescription;
-                                    break;
-$info->name
+user_name($info->ident)
-                                    $rssdescription = sprintf(__gettext("The weblog for %s, hosted on %s."),$name,$sitename);
-                                    break;

devel/lib/elgglib.php

@@ -4115 +4115 @@
-            $title = "[" . __gettext("Restricted") . "] ";
-            if (substr_count($accessvalue, "community") > 0) {
-run("profile:display:name", 
+user_name(
-                $title = '<span title="' . __gettext('Restricted to Community: ') . $name . '">' . $title . '</span>';
-            } else if (substr_count($accessvalue, "group") > 0) {

devel/lib/templates.php

@@ -1403 +1403 @@
-                
-                foreach($users as $user) {
+                    $icon_html = user_icon_html($user->ident,67);
-                    $result .= <<< END
-                    
-                      <td align="center">
-                         <div class="image_holder">
-<img src="{$CFG->wwwroot}_icon/user/{$user->iconid}/w/80/h/80" border="0" />
+{$icon_html}
-                         </div>
-                        <div class="userdetails">

devel/lib/userlib.php

@@ -87 +87 @@
-        
-    }
+    
+    /**
+     * Returns a user's name, with event hooks allowing for interception.
+     * Internally passes around a "user_name" "display" event, with an object
+     * containing the elements 'name' and 'owner'.
+     *
+     * @uses $CFG
+     * @param integer $user_id  The unique ID of the user we want to find the name for.
+     * @return string Returns the user's name, or a blank string if something went wrong (eg the user didn't exist).
+     */
+     function user_name($user_id) {
+         global $CFG;
+         $user_name = new stdClass;
+         $user_name->owner = $user_id;
+         if ($user_name->name = user_info("name",$user_id)) {
+             if ($user_name = plugin_hook("user_name","display",$user_name)) {
+                 return $user_name->name;
+             }
+         }
+         return "";
+     }
+    /**
+     * Returns the HTML to display a user's icon, with event hooks allowing for interception.
+     * Internally passes around a "user_icon" "display" event, with an object
+     * containing the elements 'html', 'icon' (being the icon ID), 'size', 'owner' and 'url'.
+     *
+     * @uses $CFG
+     * @param integer $user_id  The unique ID of the user we want to display the icon for.
+     * @param integer $size  The size of the icon we want to display (max: 100).
+     * @param boolean $urlonly  If true, returns the URL of the icon rather than the full HTML.
+     * @return string Returns the icon HTML, or the default icon if something went wrong (eg the user didn't exist).
+     */
+     function user_icon_html($user_id, $size = 100, $urlonly = false) {
+         global $CFG;
+         $extra = "";
+         $user_icon = new stdClass;
+         $user_icon->owner = $user_id;
+         $user_icon->size = $size;
+         if ($size < 100) {
+             $extra = "/h/$size/w/$size";
+         }
+         if ($user_icon->icon = user_info("icon",$user_id)) {
+             $user_icon->url = "{$CFG->wwwroot}_icon/user/{$user_icon->icon}{$extra}";
+             $user_icon->html = "<img src=\"{$user_icon->url}\" border=\"0\" />";
+             if ($user_icon = plugin_hook("user_icon","display",$user_icon)) {
+                 if ($urlonly) {
+                    return $user_icon->url;
+                 } else {
+                    return $user_icon->html;
+                }
+             }
+         }
+         if ($urlonly) {
+             return -1;
+         } else {
+             return "<img src=\"{$CFG->wwwroot}_icon/user/-1{$extra}\" border=\"0\" />";
+         }
+     }
-    
-// USER FLAGS //////////////////////////////////////////////////////////////////

devel/mod/adash/index.php

@@ -36 +36 @@
-    // Initialise page body and title
-        $body = "";
-run("profile:display:name",
+user_name(
-        
-        templates_page_setup();

devel/mod/blog/lib.php

@@ -133 +133 @@
-            $data = new stdClass;
-            $data->ident = $page_owner;
-run("profile:display:name", 
+user_name(
-            $connections[] = $data;
-            if ($page_owner != $_SESSION['userid']) {
-                $data = new stdClass;
-                $data->ident = $_SESSION['userid'];
-run("profile:display:name", 
+user_name(
-                $connections[] = $data;
-            }
@@ -195 +195 @@
-                        $body .= "<p class=\"frontpage-blog-date\">" . strftime("%B %d, %Y",$post->posted) . "</p>";
-                        $body .= "<p class=\"frontpage-blog-body\">" . run("weblogs:text:process", $post->body) . "</p>";
-info("name",
+name(
-                        $body .= "<a href=\"{$CFG->wwwroot}" . user_info("username",$post->weblog) . "/weblog/" . $post->ident . ".html\">" . __gettext("Read more") . "</a></p>";
-                        $body .= "</div>";
@@ -229 +229 @@
-                    $body .= "<h4>" . $post->title . "</h4>";
-                    $body .= "<p class=\"frontpage-blog-date\">" . strftime("%B %d, %Y",$post->posted) . "</p>";
-info("name",
+name(
-                    $body .= "<a href=\"{$CFG->wwwroot}" . user_info("username",$post->weblog) . "/weblog/" . $post->ident . ".html\">" . __gettext("Read more") . "</a></p>";
-                    $body .= "</div>";

devel/mod/browser/index.php

@@ -161 +161 @@
-                $description = get_field("profile_data", "value", "owner", $result->ident, "name", 'minibio');
-                
-"{$CFG->wwwroot}_icon/user/{$result->icon}"
+user_icon_html($result->ident)
-                
-                $name = htmlspecialchars($result->name);
-                
-<img src=\"{$icon}\" border=\"0\" alt=\"{$result->username}\" />
+{$icon_html}
-                if (!$displayicons) {
-                    // Uncomment this if we move to Javascript unhide

devel/profile/edit.php

@@ -43 +43 @@
-}
-
-run("profile:display:name", 
+user_name(
-templates_page_setup();
-

devel/profile/profile.class.php

@@ -382 +382 @@
-                    }
-                    $friends_username = $info->username;
-$info->name
+user_name($info->ident)
-                    $friends_menu = run("users:infobox:menu",array($info->ident));
+                    $friends_icon = user_icon_html($info->ident,$width);
-                    $body .= <<< END
-                        <td align="center">
-                        <p>
-                        <a href="{$CFG->wwwroot}{$friends_username}/">
-<img src="{$CFG->wwwroot}_icon/user/{$info->icon}/w/{$width}" alt="{$friends_name}" border="0" />
+{$friends_icon}
-                        <span class="userdetails">
-                        {$friends_name}
@@ -460 +461 @@
-                                          WHERE '.$searchline)) {
-                foreach($result as $key => $info) {
-rl . '_icon/user/'.$post->icon
+ser_icon_html($info->ident,100,true)
-                    $sub_result .= "\t\t\t<item>\n";
-$info->name
+user_info($info->ident)
-                    $sub_result .= "\t\t\t\t<link>" . url . htmlspecialchars($info->username, ENT_COMPAT, 'utf-8') . "</link>\n";
-                    $sub_result .= "\t\t\t\t<link>$icon</link>\n";
@@ -503 +504 @@
-                foreach($result as $key => $info) {
-                    $run_result .= "\t<item>\n";
-$info->name
+user_info($info->ident)
-                    $run_result .= "\t\t<link>" . url . htmlspecialchars($info->username, ENT_COMPAT, 'utf-8') . "</link>\n";
-                    $run_result .= "\t</item>\n";
@@ -919 +920 @@
-        }
-        
-'<img alt="" src="' . url . '_icon/user/' . $info->icon . '/w/67" />'
-$info->name
+user_icon_html($info->ident,67)
+user_name($info->ident)
-        $url = url . $info->username . "/";
-        

devel/profile/rss2.php

@@ -26 +26 @@
-    
-    if ($info = get_record('users','ident',$page_owner)) {
-$info->name
+user_name($info->ident)
-        $username = $info->username;
-        $mainurl = url . $username . "/";

devel/search/personaltags.php

@@ -24 +24 @@
-        templates_page_setup();
-        
-run("profile:display:name", 
+user_name(
-
-        $body = run("content:tags");

devel/units/communities/communities_edit.php

@@ -23 +23 @@
-        }
-        foreach($result as $key => $info) {
-run("profile:display:name",
+user_name(
-            $info->icon = run("icons:get",$info->ident);
-            $friends_menu = run("users:infobox:menu",array($info->ident));
+            $friends_icon = user_icon_html($info->ident,$w);
-            $body .= <<< END
-                <td>
-                    <p>
-                    <a href="{$CFG->wwwroot}{$info->username}/">
-<img src="{$CFG->wwwroot}_icon/user/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" />
+{$friends_icon}
-                    <span class="userdetails">
-                        <a href="{$CFG->wwwroot}{$info->username}/">{$friends_name}</a>

devel/units/communities/communities_edit_wrapper.php

@@ -3 +3 @@
-global $page_owner;
-
-run("profile:display:name"
+user_name($page_owner
-
-$body = run("content:communities:manage");

devel/units/communities/communities_members.php

@@ -23 +23 @@
-        }
-        foreach($result as $key => $info) {
-run("profile:display:name", 
+user_name(
-            $info->icon = run("icons:get",$info->ident);
-            // $friends_menu = run("users:infobox:menu",array($info->ident));
+            $friends_icon = user_icon_html($info->ident,$w);
-            $body .= <<< END
-                <td>
-                    <p>
-                    <a href="{$CFG->wwwroot}{$info->username}/">
-<img src="{$CFG->wwwroot}_icon/user/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" />
+{$friends_icon}
-                    <span class="userdetails">
-                        {$friends_name}

devel/units/communities/communities_membership_requests.php

@@ -37 +37 @@
-                    $body .= templates_draw(array(
-                                                    'context' => 'adminTable',
-'<img src="' . url . '_icon/user/' . $pending_user->icon . '" />'
+user_icon_html($pending_user->ident)
-                                                    'column1' => $col1,
-                                                    'column2' => $col2

devel/units/communities/communities_moderator_of.php

@@ -23 +23 @@
-            //    $w = 100;
-            //}
-
-
+
-            $info->icon = run("icons:get",$info->ident);
-            // $friends_menu = run("users:infobox:menu",array($info->ident));
+            $friends_icon = user_icon_html($info->ident,$w);
-            $body .= <<< END
-        <td>
-            <p>
-            <a href="{$CFG->wwwroot}{$info->username}/">
-<img src="{$CFG->wwwroot}_icon/user/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" />
+{$friends_icon}
-            <span class="userdetails">
-                <a href="{$CFG->wwwroot}{$info->username}/">{$friends_name}</a>

devel/units/communities/userdetails_edit.php

@@ -6 +6 @@
-        
-        $info = get_record('users','ident',$page_owner);
-$info->name
+user_name($info->ident)
-        $email = htmlspecialchars(stripslashes($info->email), ENT_COMPAT, 'utf-8');
-    

devel/units/files/function_rss_publish.php

@@ -36 +36 @@
-            
-            $info = get_record('users','ident',$userid);
-$info->name
+user_name($info->ident)
-            $username = $info->username;
-            $mainurl = $CFG->wwwroot . $username . "/files/";

devel/units/files/function_search.php

@@ -129 +129 @@
-        foreach($users as $key => $info) {
-            $friends_userid = $info->ident;
-
-
+
-            $info->icon = run("icons:get",$info->ident);
-            $friends_menu = run("users:infobox:menu",array($info->ident));
-            $link_keyword = urlencode($parameter[1]);
+            $friends_icon = user_icon_html($info->ident,$w);
-            $body .= <<< END
-        <td align="center">
-            <p>
-            <a href="{$CFG->wwwroot}search/index.php?file={$link_keyword}&amp;owner={$friends_userid}">
-<img src="{$CFG->wwwroot}_icon/user/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" />
+{$friends_icon}
-            <span class="userdetails">
-                {$friends_name}

devel/units/files/function_search_ecl.php

@@ -25 +25 @@
-END;
-            if ($info = get_record('users','ident',$page_owner)) {
-$info->name
+user_name($info->ident)
-                $username = htmlspecialchars($info->username, ENT_COMPAT, 'utf-8');
-                $mainurl = url . $username . "/files/";

devel/units/friends/friends_actions.php

@@ -81 +81 @@
-                         delete_records('friends_requests','ident',$request_id);
-                         $messages[] = sprintf(__gettext("You approved the friendship request. %s now lists you as a friend."),stripslashes($request->name));
-info("name",
+name(
-                         $title = sprintf(__gettext("%s friend request approved!"), $CFG->sitename);
-                         notify_user($request->owner,$title,$message_body);
@@ -106 +106 @@
-                     delete_records('friends_requests','ident',$request_id);
-                     $messages[] = sprintf(__gettext("You declined the friendship request. %s does not list you as a friend."),stripslashes($request->name));
-info("name",
+name(
-                     $title = sprintf(__gettext("%s friend request denied"), $CFG->sitename);
-                     notify_user($request->owner,$title,$message_body);

devel/units/friends/friends_edit.php

@@ -26 +26 @@
-            $info->icon = run("icons:get",$info->ident);
-            $friends_menu = run("users:infobox:menu",array($info->ident));
+            $friends_icon = user_icon_html($info->ident,$w);
-            $body .= <<< END
-        <td>
-            <p>
-            <a href="{$CFG->wwwroot}{$info->username}/">
-<img src="{$CFG->wwwroot}_icon/user/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" />
+{$friends_icon}
-            <span class="userdetails">
-                <a href="{$CFG->wwwroot}{$info->username}/">{$friends_name}</a>

devel/units/friends/friends_of_edit.php

@@ -37 +37 @@
-            $info->icon = run("icons:get",$info->ident);
-            $friends_menu = run("users:infobox:menu",array($info->ident));
+            $friends_icon = user_icon_html($info->ident,$w);
-            $body .= <<< END
-        <td>
-            <p>
-            <a href="{$CFG->wwwroot}{$info->username}/">
-<img src="{$CFG->wwwroot}_icon/user/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" />
+{$friends_icon}
-            <span class="userdetails">
-                <a href="{$CFG->wwwroot}{$info->username}/">{$friends_name}</a>

devel/units/friends/generate_foaf.php

@@ -12 +12 @@
-    
-    if ($user->icon != -1) {
-
+
+
-    } else {
-        $iconstring = "";
@@ -57 +58 @@
-        $foafurl = $personalurl . "foaf/";
-        if ($friend->icon != -1) {
-
+
+
-        } else {
-            $iconstring = "";

devel/units/friends/user_friendship_requests.php

@@ -40 +40 @@
-                    $body .= templates_draw(array(
-                                                        'context' => 'adminTable',
-"<img src=\"" . url . "_icon/user/{$pending_user->icon}\" />"
+user_icon_html($pending_user->ident)
-                                                        'column1' => $col1,
-                                                        'column2' => $col2

devel/units/profile/function_display_name.php

@@ -1 +1 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-
+
-    
-    if (empty($parameter)) {
+        global $profile_id;
+        $profile_id = (int) $profile_id;
-        $user_id = $profile_id;
-    } else {
@@ -19 +11 @@
-    }
-    
-
-
-
-
-
-
-
+
-    
-?>

devel/units/profile/function_rss_publish.php

@@ -36 +36 @@
-            
-            $info = get_record('users','ident',$userid);
-$info->name
+user_name($info->ident)
-            //$username = $info->username;
-            $mainurl = url . $username . "/";

devel/units/profile/function_search.php

@@ -54 +54 @@
-                foreach($result as $key => $info) {
-                    $friends_username = $info->username;
-                    // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
-                    $friends_name = run("profile:display:name",$info->ident);
-                    $info->icon = run("icons:get",$info->ident);
+                    $friends_icon = user_icon_html($info->ident,$w);
-                    $body .= <<< END
-        <td align="center">
-            <p>
-            <a href="{$CFG->wwwroot}{$friends_username}/">
-<img src="{$CFG->wwwroot}_icon/user/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" />
+{$friends_icon}
-            <span class="userdetails">
-                <a href="{$CFG->wwwroot}{$friends_username}/">{$friends_name}</a>

devel/units/profile/function_search_ecl.php

@@ -24 +24 @@
-                foreach($result as $key => $info) {
-                    
-rl . "_icon/user/".$info->icon
+ser_icon_html($info->ident,100,true)
-                    
-                    $sub_result .= "\t\t\t<item>\n";
-$info->name
+user_name($info->ident)
-                    $sub_result .= "\t\t\t\t<link>" . url . htmlspecialchars($info->username, ENT_COMPAT, 'utf-8') . "</link>\n";
-                    $sub_result .= "\t\t\t\t<link>$icon</link>\n";

devel/units/profile/function_search_rss.php

@@ -22 +22 @@
-                foreach($result as $key => $info) {
-                    $run_result .= "\t<item>\n";
-$info->name
+user_name($info->ident)
-                    $run_result .= "\t\t<link>" . url . htmlspecialchars($info->username, ENT_COMPAT, 'utf-8') . "</link>\n";
-                    $run_result .= "\t</item>\n";

devel/units/profile/profile_user_info.php

@@ -19 +19 @@
-$info->icon = run("icons:get", $page_owner);
-
-'<img alt="" src="'.url. '_icon/user/'.$info->icon.'/h/67/w/67" border="0" />'; // height is the important one here.
-$info->name
+user_icon_html($info->ident,67);
+user_name($info->ident)
-//$name = run("profile:display:name");
-$url = url . $info->username . "/";

devel/units/rpc/lib/class_user.php

@@ -49 +49 @@
-                $this->username        = $info->username;
-                $this->email           = $info->email;
-$info->name
+user_name($info->ident)
-                $this->alias           = $info->alias;
-                $this->code            = $info->code;
@@ -84 +84 @@
-                }
-
-rl . '_icon/user/' . $info->icon
+ser_icon_html($info->ident,100,true)
-            }
-        }

devel/units/users/main.php

@@ -44 +44 @@
-        
-    // Display a user's name, given a user ID
-run("profile:display:name", $ident) or user_info("name", $ident
+user_name($id
-        
-    // User details edit screen

devel/units/users/user_info.php

@@ -45 +45 @@
-            }
-            
-
-
+
-            $usermenu = '';
-

devel/units/users/userdetails_edit.php

@@ -6 +6 @@
-    
-    $info = get_record('users','ident',$page_owner);
-$info->name
+user_name($info->ident)
-    $email = htmlspecialchars(stripslashes($info->email), ENT_COMPAT, 'utf-8');
-    

devel/units/weblogs/default_template.php

@@ -27 +27 @@
-<div class="weblog-post"><!-- Holds all aspects of a blog post -->
-        <div class="user"><!-- Open class user -->
-<img alt="" src="{{url}}_icon/user/{{usericon}}"/>
+{{usericon}}
-        </div><!-- Close class user -->
-        <div class="weblog-title"><h3>{{title}}</h3></div>