Changeset 458

Show
Ignore:
Timestamp:
07/18/06 02:15:06 (2 years ago)
Author:
sven
Message:

simplify user human name escaping, fiddling with post/comment escaping

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • devel/profile/profile.class.php

    r454 r458  
    6969         
    7070            $name_cache[$this->id]->created = time(); 
    71             $name_cache[$this->id]->data = get_field('users','name','ident',$this->id); 
     71            $name_cache[$this->id]->data = htmlspecialchars(get_field('users','name','ident',$this->id), ENT_COMPAT, 'utf-8'); 
    7272         
    7373        } 
  • devel/units/communities/communities_edit.php

    r454 r458  
    2525            } 
    2626            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    27             $friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8'); 
     27            $friends_name = run("profile:display:name",$info->ident); 
    2828            $info->icon = run("icons:get",$info->ident); 
    2929            $friends_menu = run("users:infobox:menu",array($info->ident)); 
  • devel/units/communities/communities_members.php

    r454 r458  
    2525            } 
    2626            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    27             $friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8'); 
     27            $friends_name = run("profile:display:name", $info->ident); 
    2828            $info->icon = run("icons:get",$info->ident); 
    2929            // $friends_menu = run("users:infobox:menu",array($info->ident)); 
  • devel/units/communities/communities_membership_requests.php

    r454 r458  
    2828                    $pending_user->name = run("profile:display:name",$pending_user->ident); 
    2929                     
    30                     $col1 = "<p><b>" . stripslashes($pending_user->name) . "</b></p>" . $description; 
     30                    $col1 = "<p><b>" . $pending_user->name . "</b></p>" . $description; 
    3131                    $col1 .= "<p>"; 
    3232                    $col1 .= "<a href=\"" . url . $pending_user->username . "/\">" . gettext("Profile") . "</a> | "; 
  • devel/units/communities/communities_moderator_of.php

    r454 r458  
    2424            //} 
    2525            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    26             $friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8'); 
     26            $friends_name = run("profile:display:name", $info->ident); 
    2727            $info->icon = run("icons:get",$info->ident); 
    2828            // $friends_menu = run("users:infobox:menu",array($info->ident)); 
  • devel/units/communities/communities_owned.php

    r454 r458  
    99            foreach($result as $row) { 
    1010                    $row->name = run("profile:display:name",$row->ident); 
    11                     $body .= "<li><a href=\"" . url . $row->username . "/\">" . stripslashes($row->name) . "</a></li>"; 
     11                    $body .= "<li><a href=\"" . url . $row->username . "/\">" . $row->name . "</a></li>"; 
    1212            } 
    1313            $body .= "</ul>"; 
  • devel/units/communities/community_memberships.php

    r454 r458  
    1212            foreach($result as $row) { 
    1313                $row->name = run("profile:display:name",$row->ident); 
    14                 $body .= "<li><a href=\"" . url . $row->username . "/\">" . stripslashes($row->name) . "</a></li>"; 
     14                $body .= "<li><a href=\"" . url . $row->username . "/\">" . $row->name . "</a></li>"; 
    1515            } 
    1616            $body .= "</ul>"; 
  • devel/units/files/function_search.php

    r454 r458  
    9494            } 
    9595            $run_result .= "<p><small>[ <a href=\"".url.$username . "/files/rss/" . $parameter[1] . "\">" 
    96                 .sprintf(gettext("RSS feed for files owned by %s"), stripslashes($name)) . " in category '".$parameter[1]."'</a> ]</small></p>\n"; 
     96                .sprintf(gettext("RSS feed for files owned by %s"), $name) . " in category '".$parameter[1]."'</a> ]</small></p>\n"; 
    9797        } 
    9898    } 
     
    115115            $friends_userid = $info->ident; 
    116116            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    117             $friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8'); 
     117            $friends_name = run("profile:display:name",$info->ident); 
    118118            $info->icon = run("icons:get",$info->ident); 
    119119            $friends_menu = run("users:infobox:menu",array($info->ident)); 
  • devel/units/friends/friends_edit.php

    r454 r458  
    2424            } 
    2525            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    26             $friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8'); 
     26            $friends_name = run("profile:display:name", $info->ident); 
    2727            $info->icon = run("icons:get",$info->ident); 
    2828            $friends_menu = run("users:infobox:menu",array($info->ident)); 
  • devel/units/friends/friends_of_edit.php

    r454 r458  
    2525            } 
    2626            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    27             $friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8'); 
     27            $friends_name = run("profile:display:name", $info->ident); 
    2828            $info->icon = run("icons:get",$info->ident); 
    2929            $friends_menu = run("users:infobox:menu",array($info->ident)); 
  • devel/units/friends/user_friendship_requests.php

    r339 r458  
    2929                    $pending_user->name = run("profile:display:name", $pending_user->ident); 
    3030                     
    31                     $col1 = "<p><b>" . stripslashes($pending_user->name) . "</b></p>" . $description; 
     31                    $col1 = "<p><b>" . $pending_user->name . "</b></p>" . $description; 
    3232                    $col1 .= "<p>"; 
    3333                    $col1 .= "<a href=\"" . url . $pending_user->username . "/\">" . gettext("Profile") . "</a> | "; 
  • devel/units/profile/function_display_name.php

    r287 r458  
    2222 
    2323        $name_cache[$user_id]->created = time(); 
    24         $name_cache[$user_id]->data = get_field('users','name','ident',$user_id); 
     24        $name_cache[$user_id]->data = htmlspecialchars(get_field('users','name','ident',$user_id), ENT_COMPAT, 'utf-8'); 
    2525         
    2626    } 
  • devel/units/profile/function_search.php

    r454 r458  
    4040                $i = 1; 
    4141                $w = 100; 
    42                 if (sizeof($parameter[1]) > 4) { 
     42                if (sizeof($result) > 4) { 
    4343                    $w = 50; 
    4444                } 
     
    4646                    $friends_username = $info->username; 
    4747                    // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    48                     $friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8'); 
     48                    $friends_name = run("profile:display:name",$info->ident); 
    4949                    $info->icon = run("icons:get",$info->ident); 
    5050                    $friends_menu = run("users:infobox:menu",array($info->ident)); 
  • devel/units/users/user_info.php

    r447 r458  
    4747             
    4848            // $username = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    49             $username = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8'); 
     49            $username = run("profile:display:name",$info->ident); 
    5050            $usermenu = ''; 
    5151            // not used - sven 
  • devel/units/weblogs/function_search.php

    r454 r458  
    5454            } 
    5555            $run_result .= "</ul>"; 
    56             $run_result .= "<p><small>[ <a href=\"".url.$username . "/weblog/rss/" . $parameter[1] . "\">$rssForBlog " . stripslashes($name) . " $inCategory '".$parameter[1]."'</a> ]</small></p>\n"; 
     56            $run_result .= "<p><small>[ <a href=\"".url.$username . "/weblog/rss/" . $parameter[1] . "\">$rssForBlog " . $name . " $inCategory '".$parameter[1]."'</a> ]</small></p>\n"; 
    5757        } 
    5858                    } else { 
     
    8181            $friends_userid = $info->ident; 
    8282            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    83             $friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8'); 
     83            $friends_name = run("profile:display:name",$info->ident); 
    8484            $info->icon = run("icons:get",$info->ident); 
    8585            $friends_menu = run("users:infobox:menu",array($info->ident)); 
  • devel/units/weblogs/weblogs_posts_view.php

    r453 r458  
    1515        $stuff = get_record('users','ident',$post->owner); 
    1616         
    17         $author->fullname = stripslashes($stuff->name); 
     17        $author->fullname = htmlspecialchars($stuff->name, ENT_COMPAT, 'utf-8'); 
    1818         
    1919        if ($stuff->icon == -1 || $post->owner == -1) { 
     
    3232        $stuff2 = get_record('users','ident',$post->weblog); 
    3333         
    34         $community->fullname = stripslashes($stuff2->name); 
     34        $community->fullname = htmlspecialchars($stuff2->name, ENT_COMPAT, 'utf-8'); 
    3535         
    3636        if (empty($stuff2->icon) || $stuff2->icon == -1) { 
     
    4646    $date = gmdate("H:i",$post->posted); 
    4747     
    48         $username = run("users:id_to_name",$post->owner); 
     48    $username = run("users:id_to_name",$post->owner); 
    4949     
    5050     
     
    7171     
    7272    $title = get_access_description($post->access); 
    73     $title .= stripslashes($post->title); 
     73    $title .= htmlspecialchars($post->title, ENT_COMPAT, 'utf-8'); 
    7474     
    7575    if ($post->owner != $post->weblog) { 
     
    8383    } 
    8484     
    85     $body = run("weblogs:text:process",stripslashes($post->body)); 
     85    $body = run("weblogs:text:process", $post->body); 
    8686    $More = gettext("More"); 
    8787    $Keywords = gettext("Keywords:"); 
     
    147147END; 
    148148                    } 
    149                     $comment->postedname = stripslashes($comment->postedname); 
     149                    $comment->postedname = htmlspecialchars($comment->postedname, ENT_COMPAT, 'utf-8'); 
    150150                     
    151151                    // turn commentor name into a link if they're a registered user 
     
    158158                                                          'context' => 'weblogcomment', 
    159159                                                          'postedname' => $comment->postedname, 
    160                                                           'body' => run("weblogs:text:process",stripslashes($comment->body)) . $commentmenu, 
     160                                                          'body' => run("weblogs:text:process", $comment->body) . $commentmenu, 
    161161                                                          'posted' => strftime("%A, %e %B %Y, %R %Z",$comment->posted) 
    162162                                                          )