Changeset 1340

Show
Ignore:
Timestamp:
02/22/07 12:59:24 (2 years ago)
Author:
jm3
Message:

fixed really dumb bug re: selecting tags by name and displaying lists of links within a tag when you're not the owner (i suck)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • feedmelinks/folder-by-tag-name.php

    r1339 r1340  
    77                croak( "shit, no username!" ); 
    88 
    9         if( $tok && $tok == md5( getPasswdForUser( $u ))) 
     9        if( $tok && $tok == md5( getPasswdForUser( $u )) && $u == $user) 
    1010                $authed = true; 
    1111        $who_hath = ($authed ? "You have" : "$user has" ); 
    12  
    1312 
    1413        if( ! $tag ) 
    …… 
    2019 
    2120        # allow authenticated users to view their own private tags 
    22         $qs = getQuery( "tag_by_name", $user, $tag ); 
     21        $query_to_get = $authed ? "your_tag_by_name" : "tag_by_name"; 
     22        $qs = getQuery( $query_to_get, $user, $tag ); 
    2323 
    2424        $q = mysql_query( $qs ); 

  • feedmelinks/folder.php

    r1334 r1340  
    220220                        if( $owned && !$condensed ) { ?> 
    221221 
    222 <script language="javascript"> 
    223  
    224  var numSelected = 0; 
    225  var numLinks = <?= $numRows ?>; 
    226  
    227         function updateSelectedTotal( cb ) { 
    228                 numSelected = cb.checked ? numSelected + 1 : numSelected - 1; 
    229         } 
    230  
    231         function doSelected( arg ) { 
    232                 if( numSelected ) { 
    233                         document.forms.folderForm.op.value = arg; 
    234                         document.forms.folderForm.submit(); 
    235                 } else  
    236                         alert( "Select some links first, please." ); 
    237         } 
    238  
    239         function tagSelected() { 
    240                 var f = document.forms.folderForm.newFolderID; 
    241                 if( f.selectedIndex != 0 ) 
    242                         doSelected( "tag" ); 
    243                 else 
    244                         alert( "Choose a tag first, please." ); 
    245         } 
    246  
    247         function untagSelected() { 
    248                 doSelected( "untag" ); 
    249         } 
    250  
    251         function publicizeSelected() { 
    252                 doSelected( "makePublic" ); 
    253         } 
    254  
    255         function privatizeSelected() { 
    256                 doSelected( "makePrivate" ); 
    257         } 
    258  
    259         function deleteSelected() { 
    260                 if( numSelected ) { 
    261                         if( confirm( "Delete " + ( numSelected == 1 ? "this link" : "these " + numSelected + " links" ) + " permanently?" )) {  
    262                                 document.forms.folderForm.op.value = "deleteSelected"; 
    263                                 document.forms.folderForm.submit();  
    264                         } 
    265                 } else  
    266                         alert( "Select some links first, please." ); 
    267         } 
    268  
    269         function selectAllLinks( argForm ) { 
    270                 var f = argForm; 
    271                 toggle = f.selectAll.checked; 
    272                 for( i=0; i<f.elements.length; i++ ) { 
    273                         if( f.elements[i].name && !isNaN( f.elements[i].name )) 
    274                                 f.elements[i].checked = toggle; 
    275                 } 
    276                 numSelected = numLinks; 
    277         } 
    278  
    279 </script> 
    280  
     222<script language="javascript" type="text/javascript" src="/script/bulk-management.js"></script> 
    281223<form method="post" action="/action" name="folderForm"> 
    282 &nbsp; (<a href="/edit-folder?op=edit&id=<?= $id ?>&name=<?= urlencode( $fName ) ?>&options=">click to edit this <?= getCatName() ?>'s name</a>) 
    283 <p /> 
    284                 <?php } ?> 
     224        &nbsp; (<a href="/edit-folder?op=edit&id=<?= $id ?>&name=<?= urlencode( $fName ) ?>&options=">click to edit this <?= getCatName() ?>'s name</a>) 
     225        <p /> 
     226 
     227<?php  
     228                }  
     229?> 
    285230 
    286231<!-- start block --> 
    …… 
    386331                else 
    387332                        $bg = "r1"; 
     333 
     334                        if( $isPrivate && ! $owned ) 
     335                                break; 
    388336?> 
    389337<!-- start row --> 

  • feedmelinks/modules/utils.inc.php

    r1339 r1340  
    21122112  } else if( $argWhichQuery  == "tag_by_name" ) { 
    21132113    return " 
    2114     SELECT * FROM tags WHERE (userid = '" . $args[1] . "' OR isPrivate IS NULL or isPrivate = 0) AND name='" . urlencode( $args[2] ) . "'"; 
     2114    SELECT * FROM tags WHERE userid = '" . $args[1] . "' AND (isPrivate IS NULL or isPrivate = 0) AND name='" . urlencode( $args[2] ) . "'"; 
     2115 
     2116  } else if( $argWhichQuery  == "your_tag_by_name" ) { 
     2117    return " 
     2118    SELECT * FROM tags WHERE userid = '" . $args[1] . "' AND name='" . urlencode( $args[2] ) . "'"; 
    21152119 
    21162120  } else if( $argWhichQuery  == "unused_tags" ) {