Changeset 454

Show
Ignore:
Timestamp:
07/16/06 23:10:36 (2 years ago)
Author:
sven
Message:

removed some addslashes. replaced some with adodb qstr().
removed some stripslashes. a lot more still want to go, depending on how much we care about showing users even more inappropriate backslashes than currently.
fixed a few more php notices.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/_files/rss2.php

    r453 r454  
    2727    if ($info = get_record('users','ident',$page_owner)) { 
    2828        $name = stripslashes($info->name); 
    29         $username = stripslashes($info->username); 
    30         $mainurl = $CFG->wwwroot . $username . "/files/"; 
     29        $mainurl = $CFG->wwwroot . $info->username . "/files/"; 
    3130        $rssurl = $mainurl . "rss/" . urlencode($tag); 
    3231        $rssdescription = sprintf(gettext("Files for %s, hosted on %s."),$name,$sitename); 

  • devel/_weblog/rss091.php

    r296 r454  
    3434            if ($info = get_record('users','ident',$page_owner)) { 
    3535                $name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    36                 $username = htmlspecialchars(stripslashes($info->username), ENT_COMPAT, 'utf-8'); 
     36                $username = htmlspecialchars($info->username, ENT_COMPAT, 'utf-8'); 
    3737                $sitename = sitename; 
    3838                $mainurl = htmlspecialchars(url . $username . "/weblog/", ENT_COMPAT, 'utf-8'); 
    …… 
    7070                header('Expires: ' . gmdate("D, d M Y H:i:s", (time()+3600)) . " GMT"); 
    7171                 
    72                 $if_modified_since = preg_replace('/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE']); 
    73                 $if_none_match = preg_replace('/[^0-9a-f]/', '', $_SERVER['HTTP_IF_NONE_MATCH']); 
     72                $if_modified_since = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) ? preg_replace('/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE']) : false; 
     73                $if_none_match = (isset($_SERVER['HTTP_IF_NONE_MATCH'])) ? preg_replace('/[^0-9a-f]/', '', $_SERVER['HTTP_IF_NONE_MATCH']) : false; 
    7474                 
    7575                if (!$trackmaxtime) { 
    …… 
    8080                $etag = md5($output); 
    8181                 
    82                 if ($if_modified_since == $lm) { 
     82                if ($if_modified_since && $if_modified_since == $lm) { 
    8383                    header("{$_SERVER['SERVER_PROTOCOL']} 304 Not Modified"); 
    8484                    exit; 
    8585                } 
    86                 if ($if_none_match == $etag) { 
     86                if ($if_none_match && $if_none_match == $etag) { 
    8787                    header("{$_SERVER['SERVER_PROTOCOL']} 304 Not Modified"); 
    8888                    exit; 

  • devel/_weblog/rss2.php

    r453 r454  
    5757             
    5858            if ($page_owner == -1 || $info = get_record('users','ident',$page_owner)) { 
    59                 $username = (stripslashes($info->username)); 
    6059                if ($page_owner == -1) { 
    6160                    $info = (object) ""; 
    …… 
    6463                    $xslurl = ""; 
    6564                } else { 
    66                     $mainurl = ($CFG->wwwroot . $username . "/weblog/"); 
     65                    $mainurl = $CFG->wwwroot . $info->username . "/weblog/"; 
    6766                    $rssurl = $mainurl . "rss/" . $tagurl; 
    6867                    $xslurl = $mainurl . "rss/" . $tagurl . "rssstyles.xsl"; 

  • devel/lib/displaylib.php

    r420 r454  
    248248    */ 
    249249     
     250    global $db; 
    250251    global $page_owner; 
    251252 
    …… 
    311312            $where = run("users:access_level_sql_where",$_SESSION['userid']); 
    312313            $keywords = ""; 
    313             if ($tags = get_records_select('tags',"($where) and tagtype = '".addslashes($parameter[2])."' and ref = ".$parameter[4],null,'tag ASC')) { 
     314            if ($tags = get_records_select('tags',"($where) AND tagtype = " . $db->qstr($parameter[2]) . " AND ref = ".$parameter[4],null,'tag ASC')) { 
    314315                $first = true; 
    315316                foreach($tags as $tag) { 

  • devel/lib/elgglib.php

    r453 r454  
    21342134    if (!empty($CFG->cachetext) and $CFG->currenttextiscacheable) { 
    21352135        $newrecord->md5key = $md5key; 
    2136         $newrecord->formattedtext = addslashes($text); 
     2136        $newrecord->formattedtext = $text; 
    21372137        $newrecord->timemodified = time(); 
    21382138        @insert_record('cache_text', $newrecord); 
    …… 
    36253625    /// This function provides backward compatibility 
    36263626    $_SESSION['userid'] = (int) $user->ident; 
    3627     $_SESSION['username'] = stripslashes($user->username); 
     3627    $_SESSION['username'] = $user->username; 
    36283628    $_SESSION['name'] = stripslashes($user->name); 
    36293629    $_SESSION['email'] = stripslashes($user->email); 

  • devel/lib/setup.php

    r420 r454  
    164164// rather than addslashed. 
    165165if (ini_get_bool('magic_quotes_gpc') ) { 
     166     
     167    //do keys as well, cos array_map ignores them 
     168    function stripslashes_arraykeys($array) { 
     169        if (is_array($array)) { 
     170            $array2 = array(); 
     171            foreach ($array as $key => $data) { 
     172                if ($key != stripslashes($key)) { 
     173                    $array2[stripslashes($key)] = $data; 
     174                } else { 
     175                    $array2[$key] = $data; 
     176                } 
     177            } 
     178            return $array2; 
     179        } else { 
     180            return $array; 
     181        } 
     182    } 
     183     
    166184    function stripslashes_deep($value) { 
    167185        $value = is_array($value) ? 
    …… 
    170188        return $value; 
    171189    } 
     190     
     191    $_POST = stripslashes_arraykeys($_POST); 
     192    $_GET = stripslashes_arraykeys($_GET); 
     193    $_COOKIE = stripslashes_arraykeys($_COOKIE); 
     194    $_REQUEST = stripslashes_arraykeys($_REQUEST); 
     195     
    172196    $_POST = array_map('stripslashes_deep', $_POST); 
    173197    $_GET = array_map('stripslashes_deep', $_GET); 
    …… 
    192216        $_SERVER['PATH_TRANSLATED'] = stripslashes($_SERVER['PATH_TRANSLATED']); 
    193217    } 
     218     
    194219} 
    195220 

  • devel/profile/edit.php

    r420 r454  
    6262        delete_records('profile_data','owner',$page_owner); 
    6363        foreach($profiledetails as $field => $value) { 
    64             $field = addslashes($field); 
     64            $field = trim($field); 
    6565            $value = trim($value); 
    6666 

  • devel/profile/profile.class.php

    r447 r454  
    6969         
    7070            $name_cache[$this->id]->created = time(); 
    71             $name_cache[$this->id]->data = stripslashes(get_field('users','name','ident',$this->id)); 
     71            $name_cache[$this->id]->data = get_field('users','name','ident',$this->id); 
    7272         
    7373        } 
    …… 
    299299        } 
    300300 
    301         $column1 = display_input_field(array("profiledetails[" . $fname . "]",$value->value,$ftype,$fname,$value->ident,$page_owner)); 
     301        $column1 = display_input_field(array("profiledetails[" . $fname . "]",$value->value,$ftype,$fname,@$value->ident,$page_owner)); 
    302302        $column2 = "<label>". gettext("Access Restriction:") ."<br />"; 
    303303        $column2 .= run("display:access_level_select",array("profileaccess[".$fname . "]",$value->access)) . "</label>"; 
    …… 
    353353    function search ($tagtype, $tagvalue) { 
    354354 
    355         global $data,$CFG; 
     355        global $data, $CFG, $db; 
    356356     
    357357        $handle = 0; 
    …… 
    366366        if ($handle) { 
    367367             
    368             $searchline = "tagtype = '".addslashes($tagtype)."' and tag = '".addslashes($tagvalue)."'"; 
    369             $searchline = "(" . run("users:access_level_sql_where",$_SESSION['userid']) . ") and " . $searchline; 
     368            $searchline = "tagtype = " . $db->qstr($tagtype) . " AND tag = " . $db->qstr($tagvalue) . ""; 
     369            $searchline = "(" . run("users:access_level_sql_where",$_SESSION['userid']) . ") AND " . $searchline; 
    370370            $searchline = str_replace("owner","t.owner",$searchline); 
    371371            $tagvalue = stripslashes($tagvalue); 
    …… 
    393393                        $width = 25; 
    394394                    } 
    395                     $friends_username = stripslashes($info->username); 
     395                    $friends_username = $info->username; 
    396396                    $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    397397                    $friends_menu = run("users:infobox:menu",array($info->ident)); 
    …… 
    449449    function search_ecl ($tagtype, $tagvalue) { 
    450450 
    451         global $data,$CFG; 
     451        global $data, $CFG, $db; 
    452452     
    453453        $handle = 0; 
    …… 
    464464            $sub_result = ""; 
    465465             
    466             $searchline = "tagtype = '".addslashes($tagtype)."' and tag = '".addslashes($tagvalue)."'"; 
    467             $searchline = "(" . run("users:access_level_sql_where",$_SESSION['userid']) . ") and " . $searchline; 
     466            $searchline = "tagtype = " . $db->qstr($tagtype) . " AND tag = " . $db->qstr($tagvalue) . ""; 
     467            $searchline = "(" . run("users:access_level_sql_where",$_SESSION['userid']) . ") AND " . $searchline; 
    468468            $searchline = str_replace("owner", "t.owner", $searchline); 
    469469            $tagvalue = stripslashes($tagvalue); 
    …… 
    472472                                          WHERE '.$searchline)) { 
    473473                foreach($result as $key => $info) { 
    474                     $icon = url . stripslashes($info->username).'/icons/'.$post->icon; 
     474                    $icon = url . $info->username . '/icons/'.$post->icon; 
    475475                    $sub_result .= "\t\t\t<item>\n"; 
    476476                    $sub_result .= "\t\t\t\t<name><![CDATA[" . htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8') . "]]></name>\n"; 
    477                     $sub_result .= "\t\t\t\t<link>" . url . htmlspecialchars(stripslashes($info->username), ENT_COMPAT, 'utf-8') . "</link>\n"; 
     477                    $sub_result .= "\t\t\t\t<link>" . url . htmlspecialchars($info->username, ENT_COMPAT, 'utf-8') . "</link>\n"; 
    478478                    $sub_result .= "\t\t\t\t<link>$icon</link>\n"; 
    479479                    $sub_result .= "\t\t\t</item>\n"; 
    …… 
    493493    function search_rss ($tagtype, $tagvalue) { 
    494494 
    495         global $data,$CFG; 
     495        global $data, $CFG, $db; 
    496496     
    497497        $handle = 0; 
    …… 
    506506        if ($handle) { 
    507507             
    508             $searchline = "tagtype = '".addslashes($tagtype)."' and tag = '".addslashes($tagvalue)."'"; 
    509             $searchline = "(" . run("users:access_level_sql_where",$_SESSION['userid']) . ") and " . $searchline; 
     508            $searchline = "tagtype = " . $db->qstr($tagtype) . " AND tag = " . $db->qstr($tagvalue) . ""; 
     509            $searchline = "(" . run("users:access_level_sql_where",$_SESSION['userid']) . ") AND " . $searchline; 
    510510            $searchline = str_replace("owner", "t.owner", $searchline); 
    511511            $tagvalue = stripslashes($tagvalue); 
    …… 
    516516                    $run_result .= "\t<item>\n"; 
    517517                    $run_result .= "\t\t<title><![CDATA['" . htmlspecialchars($tagtype, ENT_COMPAT, 'utf-8') . "' = " . htmlspecialchars($tagvalue, ENT_COMPAT, 'utf-8') . " :: " . htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8') . "]]></title>\n"; 
    518                     $run_result .= "\t\t<link>" . url . htmlspecialchars(stripslashes($info->username), ENT_COMPAT, 'utf-8') . "</link>\n"; 
     518                    $run_result .= "\t\t<link>" . url . htmlspecialchars($info->username, ENT_COMPAT, 'utf-8') . "</link>\n"; 
    519519                    $run_result .= "\t</item>\n"; 
    520520                } 
    …… 
    679679                    $result = get_records_select('profile_data',"name = '$profile_value' AND ($where) AND owner = ".$user_id,'','ident,value'); 
    680680                } else { 
    681                     $result = get_records_select('tags',"tagtype = '$profile_value' and ($where) and owner = $user_id",'','ident,tag AS value'); 
     681                    $result = get_records_select('tags',"tagtype = '$profile_value' and ($where) AND owner = $user_id",'','ident,tag AS value'); 
    682682                } 
    683683                if (is_array($result)) { 
    …… 
    765765                    $result = get_records_select('profile_data',"name = '$profile_value' AND ($where) AND owner = ".$user_id,'','ident,value'); 
    766766                } else { 
    767                     $result = get_records_select('tags',"tagtype = '$profile_value' and ($where) and owner = $user_id",'','ident,tag AS value'); 
     767                    $result = get_records_select('tags',"tagtype = '$profile_value' and ($where) AND owner = $user_id",'','ident,tag AS value'); 
    768768                } 
    769769                if (is_array($result)) { 
    …… 
    910910        $icon = "<img alt=\"\" src=\"".url.$info->username.'icons/'.$info->icon.'/w/67" />'; 
    911911        $name = stripslashes($info->name); 
    912         $url = url . stripslashes($info->username) . "/"; 
     912        $url = url . $info->username . "/"; 
    913913         
    914914        $body =templates_draw(array( 

  • devel/profile/rss2.php

    r447 r454  
    2727    if ($info = get_record('users','ident',$page_owner)) { 
    2828        $name = stripslashes($info->name); 
    29         $username = stripslashes($info->username); 
     29        $username = $info->username; 
    3030        $mainurl = url . $username . "/"; 
    3131        $rssurl = $mainurl . "rss/" . urlencode(trim($tag)); 
    …… 
    5757        header('Expires: ' . gmdate("D, d M Y H:i:s", (time()+3600)) . " GMT"); 
    5858         
    59         $if_none_match = preg_replace('/[^0-9a-f]/', '', $_SERVER['HTTP_IF_NONE_MATCH']); 
     59        $if_none_match = (isset($_SERVER['HTTP_IF_NONE_MATCH'])) ? preg_replace('/[^0-9a-f]/', '', $_SERVER['HTTP_IF_NONE_MATCH']) : false; 
    6060         
    6161        $etag = md5($output); 
    6262        header('ETag: "' . $etag . '"'); 
    6363         
    64         if ($if_none_match == $etag) { 
     64        if ($if_none_match && $if_none_match == $etag) { 
    6565            header("{$_SERVER['SERVER_PROTOCOL']} 304 Not Modified"); 
    6666            exit; 

  • devel/search/rss.php

    r296 r454  
    1818    // no time data on this RSS, at least not without rewriting some function outputs 
    1919     
    20     $if_none_match = preg_replace('/[^0-9a-f]/', '', $_SERVER['HTTP_IF_NONE_MATCH']); 
     20    $if_none_match = (isset($_SERVER['HTTP_IF_NONE_MATCH'])) ? preg_replace('/[^0-9a-f]/', '', $_SERVER['HTTP_IF_NONE_MATCH']) : false; 
    2121     
    2222    $etag = md5($output); 
    2323     
    24     if ($if_none_match == $etag) { 
     24    if ($if_none_match && $if_none_match == $etag) { 
    2525        header("{$_SERVER['SERVER_PROTOCOL']} 304 Not Modified"); 
    2626        exit; 

  • devel/units/admin/admin_actions.php

    r269 r454  
    178178                    $rssresult = run("profile:rss:publish", array($newid, false)); 
    179179                    $sitename = sitename; 
    180                     $username = stripslashes($new_username[$i]); 
     180                    $username = $new_username[$i]; 
    181181                    email_to_user($u,null,sprintf(gettext("Your new %s account"),sitename),  
    182182                                  sprintf(gettext("You have been added to %s!\n\nFor your records, your %s username and password are:\n\n\tUsername: %s\n\t" 
    183183                                                  ."Password: %s\n\nYou can log in at any time by visiting %s and entering these details into the login form.\n\n" 
    184                                                   ."We hope you enjoy using the system.\n\nRegards,\n\nThe %s Team"),$sitename,$sitename,$username,stripslashes($password),url,$sitename)); 
     184                                                  ."We hope you enjoy using the system.\n\nRegards,\n\nThe %s Team"),$sitename,$sitename,$username,$password,url,$sitename)); 
    185185                    $messages[] = sprintf(gettext("User %s was created."),$username); 
    186186                } 

  • devel/units/admin/admin_users_panel.php

    r269 r454  
    99        $run_result .= templates_draw(array( 
    1010                        'context' => 'adminTable', 
    11                         'name' => "<p>" . stripslashes($parameter->username) . "</p>", 
    12                         'column1' => "<a href=\"" . url . "_userdetails/?profile_id=" .$parameter->ident . "&amp;context=admin\" >" . stripslashes($parameter->name) . "</a> [<a href=\"".url . stripslashes($parameter->username) ."/\">" . gettext("Profile") . "</a>]", 
     11                        'name' => "<p>" . $parameter->username . "</p>", 
     12                        'column1' => "<a href=\"" . url . "_userdetails/?profile_id=" .$parameter->ident . "&amp;context=admin\" >" . stripslashes($parameter->name) . "</a> [<a href=\"".url . $parameter->username ."/\">" . gettext("Profile") . "</a>]", 
    1313                        'column2' => "<a href=\"mailto:" . $parameter->email. "\" >" . $parameter->email . "</a>" 
    1414                    ) 

  • devel/units/communities/communities_actions.php

    r453 r454  
    2222                $messages[] = gettext("Error! The community name cannot be blank."); 
    2323            } else { 
    24                 $username = strtolower(trim($comm_username)); 
    25                 if (record_exists('users','username',$username)) { 
    26                     $messages[] = sprintf(gettext("The username %s is already taken by another user. You will need to pick a different one."), stripslashes($username)); 
     24                $comm_username = strtolower(trim($comm_username)); 
     25                if (record_exists('users','username',$comm_username)) { 
     26                    $messages[] = sprintf(gettext("The username %s is already taken by another user. You will need to pick a different one."), $comm_username); 
    2727                } else { 
    2828                    $name = trim($comm_name); 
    2929                    $c = new StdClass; 
    3030                    $c->name = $name; 
    31                     $c->username = $username; 
     31                    $c->username = $comm_username; 
    3232                    $c->user_type = 'community'; 
    3333                    $c->owner = $USER->ident; 

  • devel/units/communities/communities_edit.php

    r447 r454  
    2121        foreach($result as $key => $info) { 
    2222            $w = 100; 
    23             if (sizeof($parameter[1]) > 4) { 
     23            if (sizeof($result) > 4) { 
    2424                $w = 50; 
    2525            } 
    26             $friends_username = stripslashes($info->username); 
    2726            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    2827            $friends_name = htmlspecialchars(run("profile:display:name",$info->ident), ENT_COMPAT, 'utf-8'); 
    …… 
    3231                <td> 
    3332                    <p> 
    34                     <a href="{$CFG->wwwroot}{$friends_username}/"> 
    35                     <img src="{$CFG->wwwroot}{$friends_username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
     33                    <a href="{$CFG->wwwroot}{$info->username}/"> 
     34                    <img src="{$CFG->wwwroot}{$info->username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
    3635                    <span class="userdetails"> 
    3736                        {$friends_name} 

  • devel/units/communities/communities_members.php

    r447 r454  
    2424                $w = 50; 
    2525            } 
    26             $friends_username = stripslashes($info->username); 
    2726            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    2827            $friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8'); 
    …… 
    3231                <td> 
    3332                    <p> 
    34                     <a href="{$CFG->wwwroot}{$friends_username}/"> 
    35                     <img src="{$CFG->wwwroot}{$friends_username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
     33                    <a href="{$CFG->wwwroot}{$info->username}/"> 
     34                    <img src="{$CFG->wwwroot}{$info->username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
    3635                    <span class="userdetails"> 
    3736                        {$friends_name} 

  • devel/units/communities/communities_membership_requests.php

    r339 r454  
    11<?php 
    22global $CFG; 
     3$body = ''; 
    34    // Lists membership requests for a community 
    45 

  • devel/units/communities/communities_moderator_of.php

    r453 r454  
    2323            //    $w = 100; 
    2424            //} 
    25             $friends_username = stripslashes($info->username); 
    2625            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    2726            $friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8'); 
    …… 
    3130        <td> 
    3231            <p> 
    33             <a href="{$CFG->wwwroot}{$friends_username}/"> 
    34             <img src="{$CFG->wwwroot}{$friends_username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
     32            <a href="{$CFG->wwwroot}{$info->username}/"> 
     33            <img src="{$CFG->wwwroot}{$info->username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
    3534            <span class="userdetails"> 
    3635                {$friends_name} 

  • devel/units/communities/communities_owned.php

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

  • devel/units/communities/community_memberships.php

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

  • devel/units/display/function_output_field_display.php

    r359 r454  
    1818    */ 
    1919     
     20        global $db; 
    2021        global $page_owner; 
    2122     
    …… 
    7879                        $where = run("users:access_level_sql_where",$_SESSION['userid']); 
    7980                        $keywords = ""; 
    80                         if ($tags = get_records_select('tags'.'('.$where.") AND tagtype = '".addslashes($parameter[2])."' and ref = ".$parameter[4],null,'tag ASC')) { 
     81                        if ($tags = get_records_select('tags'.'('.$where.") AND tagtype = " . $db->qstr($parameter[2]) . " AND ref = ".$parameter[4],null,'tag ASC')) { 
    8182                            foreach($tags as $key => $tag) { 
    8283                                if ($key > 0) { 

  • devel/units/files/function_rss_publish.php

    r453 r454  
    3737            $info = get_record('users','ident',$userid); 
    3838            $name = stripslashes($info->name); 
    39             $username = stripslashes($info->username); 
     39            $username = $info->username; 
    4040            $mainurl = $CFG->wwwroot . $username . "/files/"; 
    4141            $rssurl = $mainurl . "rss/"; 

  • devel/units/files/function_search.php

    r447 r454  
    11<?php 
    22global $CFG,$USER; 
     3global $db; 
    34global $search_exclusions; 
    45 
    56if (isset($parameter) && $parameter[0] == "file") { 
     7     
     8    $dbtag = $db->qstr($parameter[1]); 
    69     
    710    $search_exclusions[] = "folder"; 
    …… 
    912    $accessline = "(" . run("users:access_level_sql_where",$USER->ident) . ")"; 
    1013    $accessline = str_replace("owner","t.owner",$accessline); 
    11     $searchline_files = "$accessline and tagtype = 'file' and owner = $owner and tag = '".addslashes($parameter[1])."'"; 
    12     $searchline_folders = "$accessline and tagtype = 'folder' and owner = $owner and tag = '".addslashes($parameter[1])."'"; 
     14    $searchline_files = "$accessline AND tagtype = 'file' AND owner = $owner AND tag = " . $dbtag . ""; 
     15    $searchline_folders = "$accessline AND tagtype = 'folder' AND owner = $owner AND tag = " . $dbtag . ""; 
    1316    $searchline = ""; 
    1417    $searchlist = array(); 
    …… 
    3942            $run_result .= templates_draw(array( 
    4043                                                'context' => 'folder', 
    41                                                 'username' => stripslashes($folder->username), 
    42                                                 'url' => url.stripslashes($folder->username)."/files/".$folder->ident, 
     44                                                'username' => $folder->username, 
     45                                                'url' => url . $folder->username . "/files/" . $folder->ident, 
    4346                                                'ident' => $folder->ident, 
    4447                                                'name' => stripslashes($folder->name), 
    …… 
    7073                // $name = stripslashes($f->userfullname); 
    7174                $name = run("profile:display:name",$f->userid); 
    72                 $username = stripslashes($f->username); 
     75                $username = $f->username; 
    7376            } 
    7477             
    …… 
    9497        } 
    9598    } 
    96     $searchline = " tagtype IN ('file','folder') and tag = '".addslashes($parameter[1])."'"; 
     99    $searchline = " tagtype IN ('file','folder') AND tag = " . $dbtag . ""; 
    97100    $searchline = "(" . run("users:access_level_sql_where",$_SESSION['userid']) . ") and " . $searchline; 
    98101    $searchline = str_replace("owner","t.owner",$searchline); 

  • devel/units/files/function_search_ecl.php

    r447 r454  
    1010    $sitename = sitename; 
    1111     
    12     // Not sure if we still need addslashes after the magic_quotes workaround in lib/setup.php 
    13     // so wrapping it in stripslashes first just to make sure. 
    14     $parameter[1] = addslashes(stripslashes($parameter[1]));  
     12    $parameter[1] = trim($parameter[1]); 
     13     
    1514    if ($file_refs = get_records_sql('SELECT DISTINCT t.owner,1 FROM '.$CFG->prefix.'tags t  
    1615                                     LEFT JOIN '.$CFG->prefix."files f ON f.ident = t.refs 
    …… 
    2726            if ($info = get_record('users','ident',$page_owner)) { 
    2827                $name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    29                 $username = htmlspecialchars(stripslashes($info->username), ENT_COMPAT, 'utf-8'); 
    30                 $mainurl = htmlspecialchars(url . $username . "/files/", ENT_COMPAT, 'utf-8'); 
     28                $username = htmlspecialchars($info->username, ENT_COMPAT, 'utf-8'); 
     29                $mainurl = url . $username . "/files/"; 
    3130                $run_result .= <<< END 
    3231    <channel xml:base='$mainurl'> 

  • devel/units/files/function_search_rss.php

    r420 r454  
    11<?php 
    22global $CFG; 
     3global $db; 
    34global $search_exclusions; 
    45 
    …… 
    78    $search_exclusions[] = "folder"; 
    89    $search_exclusions[] = "file"; 
     10    $dbtag = $db->qstr($parameter[1]); 
    911     
    1012    $owner = optional_param('owner',0,PARAM_INT); 
    1113    $accessline = "(" . run("users:access_level_sql_where",$_SESSION['userid']) . ")"; 
    12     $searchline_files = "$accessline and tagtype = 'file' and tag = '".addslashes($parameter[1])."'"; 
    13     $searchline_folders = "$accessline and tagtype = 'folder' and tag = '".addslashes($parameter[1])."'"; 
     14    $searchline_files = "$accessline and tagtype = 'file' and tag = " . $dbtag . ""; 
     15    $searchline_folders = "$accessline and tagtype = 'folder' and tag = " . $dbtag . ""; 
    1416    $searchline_files = str_replace("access", "f.access", $searchline_files); 
    1517    $searchline_files = str_replace("owner", "f.owner", $searchline_files); 
    …… 
    3133            $run_result .= "\t<item>\n"; 
    3234            $run_result .= "\t\t<title><![CDATA[". gettext("File folder") ." :: " . (stripslashes($folder->fullname)) . " :: " . (stripslashes($folder->name)) . "]]></title>\n"; 
    33             $run_result .= "\t\t<link>" . url  . htmlspecialchars(stripslashes($folder->username), ENT_COMPAT, 'utf-8') . "/files/" . $folder->ident . "</link>\n"; 
     35            $run_result .= "\t\t<link>" . url  . $folder->username . "/files/" . $folder->ident . "</link>\n"; 
    3436            $run_result .= "\t</item>\n"; 
    3537        } 
    …… 
    4143            $run_result .= "\t<item>\n"; 
    4244            $run_result .= "\t\t<title><![CDATA[". gettext("File") ." :: " . (stripslashes($file->fullname)) . " :: " . (stripslashes($file->title)) . "]]></title>\n"; 
    43             $run_result .= "\t\t<link>" . url  . (stripslashes($file->username)) . "/files/" . $file->folder . "/" . $file->ident . "/" . urlencode(stripslashes($file->originalname)) . "</link>\n"; 
    44             $run_result .= "\t\t<enclosure url=\"" . url  . htmlspecialchars(stripslashes($file->username), ENT_COMPAT, 'utf-8') . "/files/" . $file->folder . "/" . $file->ident . "/" .urlencode(htmlspecialchars(stripslashes($file->originalname), ENT_COMPAT, 'utf-8')) . "\" length=\"". $file->size ."\" mimetype=\"$mimetype\" />\n"; 
     45            $run_result .= "\t\t<link>" . url  . $file->username . "/files/" . $file->folder . "/" . $file->ident . "/" . urlencode(stripslashes($file->originalname)) . "</link>\n"; 
     46            $run_result .= "\t\t<enclosure url=\"" . url  . $file->username, ENT_COMPAT, 'utf-8') . "/files/" . $file->folder . "/" . $file->ident . "/" .urlencode(htmlspecialchars(stripslashes($file->originalname), ENT_COMPAT, 'utf-8')) . "\" length=\"". $file->size ."\" mimetype=\"$mimetype\" />\n"; 
    4547            $run_result .= "\t</item>\n"; 
    4648        } 

  • devel/units/friends/friends_edit.php

    r453 r454  
    2323                $w = 50; 
    2424            } 
    25             $friends_username = stripslashes($info->username); 
    2625            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    2726            $friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8'); 
    …… 
    3130        <td> 
    3231            <p> 
    33             <a href="{$CFG->wwwroot}{$friends_username}/"> 
    34             <img src="{$CFG->wwwroot}{$friends_username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
     32            <a href="{$CFG->wwwroot}{$info->username}/"> 
     33            <img src="{$CFG->wwwroot}{$info->username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
    3534            <span class="userdetails"> 
    3635                {$friends_name} 

  • devel/units/friends/friends_of_edit.php

    r447 r454  
    2121        foreach($result as $key => $info) { 
    2222            $w = 100; 
    23             if (sizeof($parameter[1]) > 4) { 
     23            if (sizeof($result) > 4) { 
    2424                $w = 50; 
    2525            } 
    26             $friends_username = stripslashes($info->username); 
    2726            // $friends_name = htmlspecialchars(stripslashes($info->name), ENT_COMPAT, 'utf-8'); 
    2827            $friends_name = htmlspecialchars(run("profile:display:name", $info->ident), ENT_COMPAT, 'utf-8'); 
    …… 
    3231        <td> 
    3332            <p> 
    34             <a href="{$CFG->wwwroot}{$friends_username}/"> 
    35             <img src="{$CFG->wwwroot}{$friends_username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> 
     33            <a href="{$CFG->wwwroot}{$info->username}/"> 
     34            <img src="{$CFG->wwwroot}{$info->username}/icons/{$info->icon}/w/{$w}" alt="{$friends_name}" border="0" /></a><br /> <