Navigation

← Previous Changeset
Next Changeset →

Changeset 287

Timestamp:

04/15/06 10:25:05 (3 years ago)

Author:

ben

Message:

Update to standardise where name and icon details come from. These should be converted to functions rather than run() instructions later.

Files:

devel/profile/index.php (modified) (1 diff)
devel/units/communities/communities_edit.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/communities_owned.php (modified) (1 diff)
devel/units/communities/community_memberships.php (modified) (1 diff)
devel/units/files/function_search.php (modified) (5 diffs)
devel/units/friends/friends_edit.php (modified) (1 diff)
devel/units/friends/friends_of_edit.php (modified) (1 diff)
devel/units/friends/user_friendship_requests.php (modified) (3 diffs)
devel/units/icons/function_get_icon.php (added)
devel/units/icons/main.php (modified) (1 diff)
devel/units/profile/function_display_name.php (modified) (1 diff)
devel/units/profile/function_init.php (modified) (1 diff)
devel/units/profile/function_search.php (modified) (1 diff)
devel/units/profile/profile_user_info.php (modified) (1 diff)
devel/units/users/user_info.php (modified) (1 diff)
devel/units/weblogs/function_search.php (modified) (3 diffs)
devel/units/weblogs/weblogs_posts_view.php (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

devel/profile/index.php

r269	r287
21	21	$profile = new ElggProfile($profile_id);
22	22
23		$title = $profile->display_name();
	23	// $title = $profile->display_name();
	24	$title = run("profile:display:name");
24	25
25	26	$body = run("content:profile:view");

devel/units/communities/communities_edit.php

r269	r287
27	27	}
28	28	$friends_username = stripslashes($info->username);
29		$friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	29	// $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	30	$friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8');
	31	$info->icon = run("icons:get",$info->ident);
30	32	$friends_menu = run("users:infobox:menu",array($info->ident));
31	33	$body .= <<< END

devel/units/communities/communities_members.php

r269	r287
27	27	}
28	28	$friends_username = stripslashes($info->username);
29		$friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	29	// $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	30	$friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8');
	31	$info->icon = run("icons:get",$info->ident);
30	32	// $friends_menu = run("users:infobox:menu",array($info->ident));
31	33	$body .= <<< END

devel/units/communities/communities_membership_requests.php

r269	r287
24	24
25	25	$request_id = $pending_user->request_id;
	26
	27	$pending_user->name = run("profile:display:name",$pending_user->ident");
26	28
27	29	$col1 = "<p><b>" . stripslashes($pending_user->name) . "</b></p>" . $description;

devel/units/communities/communities_moderator_of.php

r269	r287
24	24	}
25	25	$friends_username = stripslashes($info->username);
26		$friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	26	// $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	27	$friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8');
	28	$info->icon = run("icons:get",$info->ident);
27	29	// $friends_menu = run("users:infobox:menu",array($info->ident));
28	30	$body .= <<< END

devel/units/communities/communities_owned.php

r269	r287
8	8	$body = "<ul>";
9	9	foreach($result as $row) {
	10	$row->name = run("profile:display:name",$row->ident);
10	11	$body .= "<li><a href=\"" . url . stripslashes($row->username) . "/\">" . stripslashes($row->name) . "</a></li>";
11	12	}

devel/units/communities/community_memberships.php

r269	r287
11	11	$body = "<ul>";
12	12	foreach($result as $row) {
	13	$row->name = run("profile:display:name",$row->ident);
13	14	$body .= "<li><a href=\"" . url . stripslashes($row->username) . "/\">" . stripslashes($row->name) . "</a></li>";
14	15	}

devel/units/files/function_search.php

r269	r287
21	21	}
22	22	$searchline = " ff.ident IN (" . implode(", ", $searchlist) . ") ";
23		$folders = get_records_sql('SELECT ff.name,u.name AS userfullname,u.username,ff.ident
	23	$folders = get_records_sql('SELECT ff.name,u.name AS userfullname,u.ident as userid,u.username,ff.ident
24	24	FROM '.$CFG->prefix.'file_folders ff
25	25	LEFT JOIN '.$CFG->prefix.'users u ON u.ident = ff.owner
…	…
31	31	$f = $folders[$keys[0]];
32	32	if (!empty($f)) {
33		$name = stripslashes($f->userfullname);
	33	// $name = stripslashes($f->userfullname);
	34	$name = run("profile:display:name",$f->userid);
34	35	}
35	36	}
36	37
37		$run_result .= "<h2>" . sprintf(gettext("Folders owned by '%s' in category '%s'"),~~stripslashes($name)~~,$parameter[1])."</h2>\n";
	38	$run_result .= "<h2>" . sprintf(gettext("Folders owned by '%s' in category '%s'"),$name,$parameter[1])."</h2>\n";
38	39	foreach($folders as $folder) {
39	40	$run_result .= templates_draw(array(
…	…
57	58	}
58	59	$searchline = " f.ident IN (" . implode(", ", $searchlist) . ") ";
59		$files = get_records_sql('SELECT f.*,u.username,u.name AS userfullname
	60	$files = get_records_sql('SELECT f.*,u.username,u.name AS userfullname,u.ident as userid
60	61	FROM '.$CFG->prefix.'files f
61	62	LEFT JOIN '.$CFG->prefix.'users u ON u.ident = f.owner
…	…
68	69	$f = $files[$keys[0]];
69	70	if (!empty($f)) {
70		$name = stripslashes($f->userfullname);
	71	// $name = stripslashes($f->userfullname);
	72	$name = run("profile:display:name",$f->userid);
71	73	$username = stripslashes($f->username);
72	74	}
…	…
110	112	foreach($users as $key => $info) {
111	113	$friends_userid = $info->ident;
112		$friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	114	// $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	115	$friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8');
	116	$info->icon = run("icons:get",$info->ident);
113	117	$friends_menu = run("users:infobox:menu",array($info->ident));
114	118	$link_keyword = urlencode($parameter[1]);

devel/units/friends/friends_edit.php

r269	r287
26	26	}
27	27	$friends_username = stripslashes($info->username);
28		$friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	28	// $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	29	$friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8');
	30	$info->icon = run("icons:get",$info->ident);
29	31	$friends_menu = run("users:infobox:menu",array($info->ident));
30	32	$body .= <<< END

devel/units/friends/friends_of_edit.php

r269	r287
27	27	}
28	28	$friends_username = stripslashes($info->username);
29		$friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	29	// $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	30	$friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8');
	31	$info->icon = run("icons:get",$info->ident);
30	32	$friends_menu = run("users:infobox:menu",array($info->ident));
31	33	$body .= <<< END

devel/units/friends/user_friendship_requests.php

r269	r287
11	11	$title = run("profile:display:name") . " :: ". gettext("Friendship requests") ."";
12	12
13		if ($pending_requests = get_records_sql('SELECT fr.ident AS request_id,u.*~~, i.filename~~
	13	if ($pending_requests = get_records_sql('SELECT fr.ident AS request_id,u.*
14	14	FROM '.$CFG->prefix.'friends_requests fr LEFT JOIN '.$CFG->prefix.'users u ON u.ident = fr.owner
15		~~LEFT JOIN '.$CFG->prefix.'icons i ON i.ident = u.icon~~
16	15	WHERE fr.friend = ? ORDER BY u.name ASC',array($page_owner))) {
17	16	$body .= "<p>" . gettext("The following users would like to add you as a friend. They need your approval to do this (to change this setting, visit the 'account settings' page).") . "</p>";
…	…
28	27	$request_id = $pending_user->request_id;
29	28
	29	$pending_user->name = run("profile:display:name", $pending_user->ident);
	30
30	31	$col1 = "<p><b>" . stripslashes($pending_user->name) . "</b></p>" . $description;
31	32	$col1 .= "<p>";
…	…
35	36	$ident = $pending_user->ident;
36	37
	38	$pending_user->icon = run("icons:get",$pending_user->ident);
	39
37	40	$body .= templates_draw(array(
38	41	'context' => 'adminTable',

devel/units/icons/main.php

r269	r287
11	11	$function["icons:edit"][] = path . "units/icons/function_edit_icons.php";
12	12	$function["icons:add"][] = path . "units/icons/function_add_icons.php";
	13
	14	// Icon retrieval
	15	$function["icons:get"][] = path . "units/icons/function_get_icon.php";
13	16
14	17	// Permissions check

devel/units/profile/function_display_name.php

r269	r287
1	1	<?php
2	2
	3	// TODO: This should almost certainly be a function rather than a run() command
	4
	5	if (!defined('profileinit')) {
	6	run("profile:init");
	7	}
	8
3	9	global $profile_id;
	10
4	11	$profile_id = (int) $profile_id;
5	12
6	13	global $name_cache;
7	14
8		if (!isset($name_cache[$profile_id]) \|\| (time() - $name_cache[$profile_id]->created > 60)) {
	15	if (empty($parameter)) {
	16	$user_id = $profile_id;
	17	} else {
	18	$user_id = (int) $parameter;
	19	}
	20
	21	if (!isset($name_cache[$user_id]) \|\| (time() - $name_cache[$user_id]->created > 60)) {
9	22
10		$name_cache[$~~profile~~_id]->created = time();
11		$name_cache[$~~profile_id]->data = get_field('users','name','ident',$profile~~_id);
	23	$name_cache[$user_id]->created = time();
	24	$name_cache[$user_id]->data = get_field('users','name','ident',$user_id);
12	25
13	26	}
14		$run_result = $name_cache[$~~profile~~_id]->data;
	27	$run_result = $name_cache[$user_id]->data;
15	28
16	29	?>

devel/units/profile/function_init.php

r269 r287

22 22
23 23 $page_owner = $profile_id;
24
25 define('profileinit',true);
24 26
25 27 ?>

devel/units/profile/function_search.php

r269	r287
45	45	foreach($result as $key => $info) {
46	46	$friends_username = stripslashes($info->username);
47		$friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	47	// $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	48	$friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8');
	49	$info->icon = run("icons:get",$info->ident);
48	50	$friends_menu = run("users:infobox:menu",array($info->ident));
49	51	$body .= <<< END

devel/units/profile/profile_user_info.php

r269	r287
17	17	$ul_username = run("users:id_to_name", $page_owner);
18	18
	19	$info->icon = run("icons:get", $page_owner);
	20
19	21	$icon = '<img src="'.url. $ul_username.'/icons/'.$info->icon.'/h/67/w/67" border="0" />'; // height is the important one here.
20		$name = stripslashes($info->name);
	22	// $name = stripslashes($info->name);
	23	$name = run("profile:display:name");
21	24	$url = url . stripslashes($info->username) . "/";
22	25

devel/units/users/user_info.php

r269	r287
47	47	}
48	48
49		$username = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	49	// $username = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	50	$username = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8');
50	51	$usermenu = '';
51	52	if ($info->ident == $profile_id \|\| (logged_on && (!isset($profile_id) && $info->ident == $_SESSION['userid']))) {

devel/units/weblogs/function_search.php

r269	r287
26	26	}
27	27	$searchline = " wp.ident in (" . $searchline . ")";
28		if (!$posts = get_records_sql('SELECT wp.ident,u.name,u.username,wp.title,wp.ident,wp.weblog,wp.owner,wp.posted
	28	if (!$posts = get_records_sql('SELECT wp.ident,u.name,u.username,u.ident as uesrid,wp.title,wp.ident,wp.weblog,wp.owner,wp.posted
29	29	FROM '.$CFG->prefix.'weblog_posts wp JOIN '.$CFG->prefix.'users u ON u.ident = wp.owner
30	30	WHERE ('.$searchline.') ORDER BY posted DESC')) {
…	…
38	38	$p = $posts[$keys[0]];
39	39	if (!empty($p)) {
40		$name = stripslashes($p->name);
	40	// $name = stripslashes($p->name);
	41	$name = run("profile:display:name",$p->userid);
41	42	$username = stripslashes($p->username);
42	43	}
…	…
79	80	foreach($users as $key => $info) {
80	81	$friends_userid = $info->ident;
81		$friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	82	// $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8');
	83	$friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8');
	84	$info->icon = run("icons:get",$info->ident);
82	85	$friends_menu = run("users:infobox:menu",array($info->ident));
83	86	$link_keyword = urlencode($parameter[1]);

devel/units/weblogs/weblogs_posts_view.php

r283	r287
10	10	$url = url;
11	11
12		if (!isset($post_authors[$post->owner])) {
	12	//if (!isset($post_authors[$post->owner])) {
13	13
14	14	$author = "";
…	…
27	27	$post_authors[$post->owner] = $author;
28	28
29		}
30		if (!isset($post->authors[$post->weblog])) {
	29	//}
	30	//if (!isset($post->authors[$post->weblog])) {
31	31	$community = "";
32	32
…	…
43	43
44	44	$post_authors[$post->weblog] = $community;
45		}
	45	//}
46	46
47	47	$date = gmdate("H:i",$post->posted);
…	…
51	51
52	52	// Allow plugins to set special icons
53		$specialicon = run("weblogs:posts:geticon",$post~~->ident~~);
	53	$specialicon = run("weblogs:posts:geticon",$post);
54	54
55	55	// If there is no special icon for this post, set to the default
…	…
64	64
65	65	// Allow plugins to set the name on the post
66		$specialname = run("weblogs:posts:getname",$post~~->ident~~);
67		if (~~$specialname == NULL~~) {
	66	$specialname = run("weblogs:posts:getname",$post);
	67	if (empty($specialname)) {
68	68	$fullname = $post_authors[$post->owner]->fullname;
69	69	} else {