Changeset 339
- Timestamp:
- 05/13/06 12:25:40 (3 years ago)
- Files:
-
- devel/.htaccess (modified) (1 diff)
- devel/_invite/forgotten_password.php (modified) (1 diff)
- devel/lib/elgglib.php (modified) (1 diff)
- devel/lib/templates.php (modified) (3 diffs)
- devel/mod/community/lib.php (modified) (1 diff)
- devel/mod/profile/lib.php (modified) (1 diff)
- devel/profile/profile.class.php (modified) (1 diff)
- devel/units/admin/admin_users.php (modified) (1 diff)
- devel/units/communities/communities_membership_requests.php (modified) (1 diff)
- devel/units/communities/user_info_menu_text.php (modified) (2 diffs)
- devel/units/files/folder_view.php (modified) (2 diffs)
- devel/units/friends/user_friendship_requests.php (modified) (1 diff)
- devel/units/friends/user_info_menu_text.php (modified) (2 diffs)
- devel/units/magpie/function_subscriptions.php (modified) (1 diff)
- devel/units/magpie/function_subscriptions_popular.php (modified) (2 diffs)
- devel/units/magpie/function_view_post.php (modified) (1 diff)
- devel/units/profile/profile_user_info.php (modified) (1 diff)
- devel/units/templates/default_template.php (modified) (1 diff)
- devel/units/templates/templates_view.php (modified) (1 diff)
- devel/units/weblogs/default_template.php (modified) (1 diff)
- devel/units/weblogs/weblogs_posts_view.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
devel/.htaccess
r334 r339 1 1 RewriteEngine on 2 RewriteBase /elgg/ 2 3 Options +FollowSymLinks 3 4 devel/_invite/forgotten_password.php
r306 r339 23 23 24 24 echo templates_page_draw( array( 25 $title, $body, '  '25 $title, $body, ' ' 26 26 ) 27 27 ); devel/lib/elgglib.php
r335 r339 1911 1911 $htmlid = 'auto-cb'.sprintf('%04d', ++$idcounter); 1912 1912 $output = '<span class="checkbox '.$name."\">"; 1913 $output .= '<input name="'.$name.'" id="'.$htmlid.'" type="checkbox" value="'.$value.'" alt="'.$alt.'"'.$strchecked.' '.((!empty($script)) ? ' on Click="'.$script.'" ' : '').' />';1913 $output .= '<input name="'.$name.'" id="'.$htmlid.'" type="checkbox" value="'.$value.'" alt="'.$alt.'"'.$strchecked.' '.((!empty($script)) ? ' onclick="'.$script.'" ' : '').' />'; 1914 1914 if(!empty($label)) { 1915 1915 $output .= ' <label for="'.$htmlid.'">'.$label.'</label>'; devel/lib/templates.php
r311 r339 1900 1900 1901 1901 $column2 .= " | <a href=\"".url."_templates/edit.php?id=".$template->ident."\" >". gettext("Edit") ."</a>"; 1902 $column2 .= " | <a href=\"".url."_templates/?action=deletetemplate&delete_template_id=".$template->ident."\" on Click=\"return confirm('" . gettext("Are you sure you want to permanently remove this template?") . "')\">" . gettext("Delete") . "</a>";1902 $column2 .= " | <a href=\"".url."_templates/?action=deletetemplate&delete_template_id=".$template->ident."\" onclick=\"return confirm('" . gettext("Are you sure you want to permanently remove this template?") . "')\">" . gettext("Delete") . "</a>"; 1903 1903 $panel .=templates_draw(array( 1904 1904 'context' => 'databox', … … 1980 1980 case "submenu": 1981 1981 return templates_draw(array( 1982 'submenuitems' => menu_join('  | ', $PAGE->menu_sub),1982 'submenuitems' => menu_join(' | ', $PAGE->menu_sub), 1983 1983 'context' => 'submenu' 1984 1984 )); … … 1988 1988 if (logged_on) { 1989 1989 return templates_draw(array( 1990 'topmenuitems' => menu_join('  | ', $PAGE->menu_top),1990 'topmenuitems' => menu_join(' | ', $PAGE->menu_top), 1991 1991 'context' => 'topmenu' 1992 1992 )); devel/mod/community/lib.php
r279 r339 36 36 if (run("permissions:check", "profile")) { 37 37 $PAGE->menu_sub[] = array( 'name' => 'community:pic', 38 'html' => a_hrefg("{$CFG->wwwroot}_icons/?context=profile& profile_id=$page_owner" ,38 'html' => a_hrefg("{$CFG->wwwroot}_icons/?context=profile&profile_id=$page_owner" , 39 39 "Community site picture")); 40 40 41 41 $PAGE->menu_sub[] = array( 'name' => 'community:edit', 42 'html' => a_hrefg("{$CFG->wwwroot}_userdetails/?context=profile& profile_id=$page_owner" ,42 'html' => a_hrefg("{$CFG->wwwroot}_userdetails/?context=profile&profile_id=$page_owner" , 43 43 "Edit community details")); 44 44 devel/mod/profile/lib.php
r329 r339 28 28 if (run("users:type:get", $pgowner) == "person") { 29 29 $PAGE->menu_sub[] = array( 'name' => 'profile:picedit', 30 'html' => '<a href="'.$CFG->wwwroot.'_icons/?context=profile& profile_id='.$pgowner.'">'30 'html' => '<a href="'.$CFG->wwwroot.'_icons/?context=profile&profile_id='.$pgowner.'">' 31 31 . gettext("Change site picture") . '</a>'); 32 32 } devel/profile/profile.class.php
r331 r339 906 906 } 907 907 908 $icon = "<img src=\"".url.$info->username.'icons/'.$info->icon.'/w/67" />';908 $icon = "<img alt=\"\" src=\"".url.$info->username.'icons/'.$info->icon.'/w/67" />'; 909 909 $name = stripslashes($info->name); 910 910 $url = url . stripslashes($info->username) . "/"; devel/units/admin/admin_users.php
r269 r339 52 52 'context' => 'adminTable', 53 53 'name' => " ", 54 'column1' => $prev . "  " . $next,54 'column1' => $prev . " " . $next, 55 55 'column2' => " " 56 56 ) devel/units/communities/communities_membership_requests.php
r301 r339 31 31 $col1 .= "<a href=\"" . url . $pending_user->username . "/\">" . gettext("Profile") . "</a> | "; 32 32 $col1 .= "<a href=\"" . url . $pending_user->username . "/weblog/\">" . gettext("Blog") . "</a></p>"; 33 $col2 = "<p><a href=\"" .url. "_communities/requests.php?action=community:approve:request& request_id=$request_id&owner=$page_owner\">Approve</a> | <a href=\"" .url. "_communities/requests.php?action=community:decline:request&request_id=$request_id&owner=$page_owner\">Decline</a></p>";33 $col2 = "<p><a href=\"" .url. "_communities/requests.php?action=community:approve:request&request_id=$request_id&owner=$page_owner\">Approve</a> | <a href=\"" .url. "_communities/requests.php?action=community:decline:request&request_id=$request_id&owner=$page_owner\">Decline</a></p>"; 34 34 $ident = $pending_user->ident; 35 35 devel/units/communities/user_info_menu_text.php
r269 r339 16 16 $moderation = get_field('users','moderation','ident',$user_id); 17 17 switch($moderation) { 18 case "no": $run_result = "<a href=\"".url."_communities/index.php?friends_name=".$_SESSION['username']."&action=friend&friend_id=$user_id\" on Click=\"return confirm('". gettext("Are you sure you want to join this community?") ."')\">" . gettext("Click here to join this community."). "</a>";18 case "no": $run_result = "<a href=\"".url."_communities/index.php?friends_name=".$_SESSION['username']."&action=friend&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>"; 19 19 break; 20 case "yes": $run_result = "<a href=\"".url."_communities/index.php?friends_name=".$_SESSION['username']."&action=friend&friend_id=$user_id\" on Click=\"return confirm('". gettext("Are you sure you want to apply to join this community?") ."')\">" . gettext("Click here to apply to join this community."). "</a>";20 case "yes": $run_result = "<a href=\"".url."_communities/index.php?friends_name=".$_SESSION['username']."&action=friend&friend_id=$user_id\" onclick=\"return confirm('". gettext("Are you sure you want to apply to join this community?") ."')\">" . gettext("Click here to apply to join this community."). "</a>"; 21 21 break; 22 22 case "priv": $run_result = ""; … … 24 24 } 25 25 } else { 26 $run_result = "<a href=\"".url."_communities/index.php?friends_name=".$_SESSION['username']."&action=unfriend&friend_id=$user_id\" on Click=\"return confirm('". gettext("Are you sure you want to leave this community?") ."')\">" . gettext("Click here to leave this community."). "</a>";26 $run_result = "<a href=\"".url."_communities/index.php?friends_name=".$_SESSION['username']."&action=unfriend&friend_id=$user_id\" onclick=\"return confirm('". gettext("Are you sure you want to leave this community?") ."')\">" . gettext("Click here to leave this community."). "</a>"; 27 27 } 28 28 } devel/units/files/folder_view.php
r269 r339 76 76 $delete = gettext("Delete"); // gettext variable 77 77 $foldermenu = <<< END 78 [<a href="{$url}_files/action_redirection.php?action=delete_folder&delete_folder_id={$folder_details->ident}" on Click="return confirm('$areyouSure')">$delete</a>]78 [<a href="{$url}_files/action_redirection.php?action=delete_folder&delete_folder_id={$folder_details->ident}" onclick="return confirm('$areyouSure')">$delete</a>] 79 79 END; 80 80 } else { … … 139 139 $filemenu .= <<< END 140 140 [<a href="{$url}_files/edit_file.php?edit_file_id={$file->ident}&owner=$page_owner">$edit</a>] 141 [<a href="{$url}_files/action_redirection.php?action=delete_file&delete_file_id={$file->ident}" on Click="return confirm('$areyouSure')">$delete</a>]141 [<a href="{$url}_files/action_redirection.php?action=delete_file&delete_file_id={$file->ident}" onclick="return confirm('$areyouSure')">$delete</a>] 142 142 END; 143 143 } else { devel/units/friends/user_friendship_requests.php
r287 r339 33 33 $col1 .= "<a href=\"" . url . $pending_user->username . "/\">" . gettext("Profile") . "</a> | "; 34 34 $col1 .= "<a href=\"" . url . $pending_user->username . "/weblog/\">" . gettext("Blog") . "</a></p>"; 35 $col2 = "<p><a href=\"" .url. "_friends/requests.php?action=friends:approve:request& request_id=$request_id\">Approve</a> | <a href=\"" .url. "_friends/requests.php?action=friends:decline:request&request_id=$request_id\">Decline</a></p>";35 $col2 = "<p><a href=\"" .url. "_friends/requests.php?action=friends:approve:request&request_id=$request_id\">Approve</a> | <a href=\"" .url. "_friends/requests.php?action=friends:decline:request&request_id=$request_id\">Decline</a></p>"; 36 36 $ident = $pending_user->ident; 37 37 devel/units/friends/user_info_menu_text.php
r269 r339 17 17 case 'no': 18 18 case 'yes': 19 $run_result = "<a href=\"".url."_friends/index.php?friends_name=".$_SESSION['username']."&action=friend&friend_id=$user_id\" on Click=\"return confirm('". gettext("Are you sure you want to add this user as a friend?") ."')\">" . gettext("Click here to add this user as a friend."). "</a>";19 $run_result = "<a href=\"".url."_friends/index.php?friends_name=".$_SESSION['username']."&action=friend&friend_id=$user_id\" onclick=\"return confirm('". gettext("Are you sure you want to add this user as a friend?") ."')\">" . gettext("Click here to add this user as a friend."). "</a>"; 20 20 break; 21 21 case 'priv': … … 24 24 } 25 25 } else { 26 $run_result = "<a href=\"".url."_friends/index.php?friends_name=".$_SESSION['username']."&action=unfriend&friend_id=$user_id\" on Click=\"return confirm('". gettext("Are you sure you want to remove this user from your friends list?") ."')\">" . gettext("Click here to remove this user from your friends list."). "</a>";26 $run_result = "<a href=\"".url."_friends/index.php?friends_name=".$_SESSION['username']."&action=unfriend&friend_id=$user_id\" onclick=\"return confirm('". gettext("Are you sure you want to remove this user from your friends list?") ."')\">" . gettext("Click here to remove this user from your friends list."). "</a>"; 27 27 } 28 28 } devel/units/magpie/function_subscriptions.php
r269 r339 43 43 if (run("permissions:check", "profile")) { 44 44 $column2 .= " | <a href=\"".url."_rss/subscriptions.php?action=unsubscribe&feed=".$feed->ident 45 ."\" on Click=\"return confirm('".gettext("Are you sure you want to unsubscribe from this feed?")."')\">" . gettext("Unsubscribe") . "</a>";45 ."\" onclick=\"return confirm('".gettext("Are you sure you want to unsubscribe from this feed?")."')\">" . gettext("Unsubscribe") . "</a>"; 46 46 } 47 47 devel/units/magpie/function_subscriptions_popular.php
r269 r339 6 6 $body .= "<p>". gettext("This is a list of the feeds with the most subscribers.") . "</p>"; 7 7 8 if ($feed_subscriptions = get_records_sql('SELECT f.ident,f.name,f.last_updated, COUNT(fs.user_id) AS numsubs8 if ($feed_subscriptions = get_records_sql('SELECT f.ident,f.name,f.last_updated,f.siteurl, COUNT(fs.user_id) AS numsubs 9 9 FROM '.$CFG->prefix.'feed_subscriptions fs JOIN '.$CFG->prefix.'feeds f ON f.ident = fs.feed_id 10 GROUP BY f.ident,f.name,f.last_updated ORDER BY numsubs ASC LIMIT 25')) {10 GROUP BY f.ident,f.name,f.last_updated,f.siteurl ORDER BY numsubs ASC LIMIT 25')) { 11 11 $body .= templates_draw( array( 12 12 'context' => 'adminTable', … … 24 24 $subtest = run("rss:subscribed", $feed->ident); 25 25 if ($subtest) { 26 $column2 .= "<a href=\"".url."_rss/subscriptions.php?action=unsubscribe&feed=".$feed->ident."\" on Click=\"return confirm('".gettext("Are you sure you want to unsubscribe from this feed?")."')\">" . gettext("Unsubscribe") . "</a>";26 $column2 .= "<a href=\"".url."_rss/subscriptions.php?action=unsubscribe&feed=".$feed->ident."\" onclick=\"return confirm('".gettext("Are you sure you want to unsubscribe from this feed?")."')\">" . gettext("Unsubscribe") . "</a>"; 27 27 } else { 28 $column2 .= "<a href=\"".url."_rss/subscriptions.php?action=subscribe&feed=".$feed->ident."\" on Click=\"return confirm('".gettext("Are you sure you want to subscribe to this feed?")."')\">" . gettext("Subscribe") . "</a>";28 $column2 .= "<a href=\"".url."_rss/subscriptions.php?action=subscribe&feed=".$feed->ident."\" onclick=\"return confirm('".gettext("Are you sure you want to subscribe to this feed?")."')\">" . gettext("Subscribe") . "</a>"; 29 29 } 30 30 devel/units/magpie/function_view_post.php
r269 r339 40 40 if (logged_on) { 41 41 if (run("rss:subscribed",$post->feed)) { 42 $controls .= "<a href=\"".url."_rss/subscriptions.php?action=unsubscribe&feed=".$post->feed."\" on Click=\"return confirm('".gettext("Are you sure you want to unsubscribe from this feed?")."')\">[" . gettext("Unsubscribe") . "]</a>";42 $controls .= "<a href=\"".url."_rss/subscriptions.php?action=unsubscribe&feed=".$post->feed."\" onclick=\"return confirm('".gettext("Are you sure you want to unsubscribe from this feed?")."')\">[" . gettext("Unsubscribe") . "]</a>"; 43 43 } else { 44 $controls .= "<a href=\"".url."_rss/subscriptions.php?action=subscribe&feed=".$post->feed."\" on Click=\"return confirm('".gettext("Are you sure you want to subscribe to this feed?")."')\">[" . gettext("Subscribe") . "]</a>";44 $controls .= "<a href=\"".url."_rss/subscriptions.php?action=subscribe&feed=".$post->feed."\" onclick=\"return confirm('".gettext("Are you sure you want to subscribe to this feed?")."')\">[" . gettext("Subscribe") . "]</a>"; 45 45 } 46 46 } devel/units/profile/profile_user_info.php
r287 r339 19 19 $info->icon = run("icons:get", $page_owner); 20 20 21 $icon = '<img src="'.url. $ul_username.'/icons/'.$info->icon.'/h/67/w/67" border="0" />'; // height is the important one here.21 $icon = '<img alt="" src="'.url. $ul_username.'/icons/'.$info->icon.'/h/67/w/67" border="0" />'; // height is the important one here. 22 22 // $name = stripslashes($info->name); 23 23 $name = run("profile:display:name"); devel/units/templates/default_template.php
r323 r339 1286 1286 'id' => 'flagContent', 1287 1287 'name' => gettext("flagContent"), 1288 'description' => gettext("This hold the flag content function throughout Elgg"),1288 'description' => gettext("This holds the flag content function throughout Elgg"), 1289 1289 'glossary' => array( 1290 1290 '{{name}}' => gettext("Column One"), devel/units/templates/templates_view.php
r269 r339 73 73 74 74 $column2 .= " | <a href=\"".url."_templates/edit.php?id=".$template->ident."\" >". gettext("Edit") ."</a>"; 75 $column2 .= " | <a href=\"".url."_templates/?action=deletetemplate&delete_template_id=".$template->ident."\" on Click=\"return confirm('" . gettext("Are you sure you want to permanently remove this template?") . "')\">" . gettext("Delete") . "</a>";75 $column2 .= " | <a href=\"".url."_templates/?action=deletetemplate&delete_template_id=".$template->ident."\" onclick=\"return confirm('" . gettext("Are you sure you want to permanently remove this template?") . "')\">" . gettext("Delete") . "</a>"; 76 76 $panel .= templates_draw(array( 77 77 'context' => 'adminTable', devel/units/weblogs/default_template.php
r284 r339 28 28 <div class="entry"><!-- Open class entry --> 29 29 <div class="user"><!-- Open class user --> 30 <a href="{{url}}{{username}}/weblog/"><img src="{{url}}{{username}}/icons/{{usericon}}"/></a><br /><a href="{{url}}{{username}}/weblog/">{{fullname}}</a>30 <a href="{{url}}{{username}}/weblog/"><img alt="" src="{{url}}{{username}}/icons/{{usericon}}"/></a><br /><a href="{{url}}{{username}}/weblog/">{{fullname}}</a> 31 31 </div><!-- Close class user --> 32 32 <div class="weblog_title"><h3>{{title}}</h3></div> devel/units/weblogs/weblogs_posts_view.php
r287 r339 120 120 <p> 121 121 [<a href="{$url}_weblog/edit.php?action=edit&weblog_post_id={$post->ident}&owner={$post->owner}">$Edit</a>] 122 [<a href="{$url}_weblog/action_redirection.php?action=delete_weblog_post&delete_post_id={$post->ident}" on Click="return confirm('$returnConfirm')">$Delete</a>]122 [<a href="{$url}_weblog/action_redirection.php?action=delete_weblog_post&delete_post_id={$post->ident}" onclick="return confirm('$returnConfirm')">$Delete</a>] 123 123 </p> 124 124 </div> … … 154 154 155 155 <p> 156 [<a href="{$url}_weblog/action_redirection.php?action=weblog_comment_delete&weblog_comment_delete={$comment->ident}" on Click="return confirm('$returnConfirm')">$Delete</a>]156 [<a href="{$url}_weblog/action_redirection.php?action=weblog_comment_delete&weblog_comment_delete={$comment->ident}" onclick="return confirm('$returnConfirm')">$Delete</a>] 157 157 </p> 158 158 END;
