Changeset 1328
- Timestamp:
- 02/09/07 19:08:04 (2 years ago)
- Files:
-
- feedmelinks/admin/snuff.php (modified) (2 diffs)
- feedmelinks/bin/tiny-from-thumb-path.sh (added)
- feedmelinks/img/new-user (added)
- feedmelinks/img/new-user/beasties (added)
- feedmelinks/img/new-user/beasties/profile (added)
- feedmelinks/img/new-user/beasties/profile/1.png (added)
- feedmelinks/img/new-user/beasties/profile/2.png (added)
- feedmelinks/img/new-user/beasties/profile/3.png (added)
- feedmelinks/img/new-user/beasties/profile/4.png (added)
- feedmelinks/img/new-user/beasties/profile/5.png (added)
- feedmelinks/img/new-user/beasties/thumb (added)
- feedmelinks/img/new-user/beasties/thumb/1.png (added)
- feedmelinks/img/new-user/beasties/thumb/2.png (added)
- feedmelinks/img/new-user/beasties/thumb/3.png (added)
- feedmelinks/img/new-user/beasties/thumb/4.png (added)
- feedmelinks/img/new-user/beasties/thumb/5.png (added)
- feedmelinks/img/new-user/beasties/tiny (added)
- feedmelinks/img/new-user/beasties/tiny/1.png (added)
- feedmelinks/img/new-user/beasties/tiny/2.png (added)
- feedmelinks/img/new-user/beasties/tiny/4.png (added)
- feedmelinks/img/new-user/beasties/tiny/5.png (added)
- feedmelinks/img/new-user/current-icon (added)
- feedmelinks/img/new-user/profile.php (added)
- feedmelinks/img/new-user/thumb.php (added)
- feedmelinks/import/ready-to-import.php (modified) (1 diff)
- feedmelinks/modules/recent-with-times.inc.php (modified) (1 diff)
- feedmelinks/modules/utils.inc.php (modified) (4 diffs)
- feedmelinks/testing/make_thumbnail_for_user.php (added)
- feedmelinks/users.php (modified) (2 diffs)
- feedmelinks/usr/NO_PROFILE/tiny.png (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
feedmelinks/admin/snuff.php
r1326 r1328 1 < %1 <?php 2 2 include_once( "../modules/utils.inc.php" ); 3 3 $no_base_href = true; 4 $nobody = true; 4 5 include( "$modules/header.inc.php" ); 5 %>6 ?> 6 7 7 <title> snuff a user </title> 8 <title> Snuff a user </title> 9 <body onLoad="document.forms.snuff_next.who.focus()"> 8 10 <h3>meat for the beast:</h3> 9 11 <p /> … … 46 48 if( $user && !is_privileged_importer( $user ) && !isSuperUser( $user ) && $confirm == "true" ) { 47 49 50 $user = urlencode( $user ); 48 51 $status = snuff_user( $user ); 49 52 %> 50 53 51 54 <h2>Who's next?</h2> 52 <form action="/users.php" >53 <input name="who" />55 <form action="/users.php" name="snuff_next"> 56 <input type="text" name="who" /> 54 57 </form> 55 58 feedmelinks/import/ready-to-import.php
r1306 r1328 42 42 $ls < $max_allowed_links 43 43 && $ts < $max_allowed_tags 44 && ($tr < $max_tags_to_links_ratio || $ls < 1 5)44 && ($tr < $max_tags_to_links_ratio || $ls < 18) 45 45 ) 46 46 || is_privileged_importer( $u ) ) feedmelinks/modules/recent-with-times.inc.php
r1299 r1328 94 94 <% } %> 95 95 <div class="r<%= $realCount % 2 == 0 ? 1 : 0 %><%= $realCount == $limit - 1 ? " last" : "" %>"> 96 <%= makeNamedLinkOut( $id, getCompactString( urldecode( $name ) ) ) %> <%= makePermaLink( $id ) %> - <%= makeUserLink( $user) %>96 <%= makeNamedLinkOut( $id, getCompactString( urldecode( $name ) ) ) %> <%= makePermaLink( $id ) %> - <%= makeUserLink( urldecode( $user ) ) %> 97 97 <% if( !$hideTimes ) { %><span class="subtle">(<%= $time %> ago)</span><% } %> 98 98 in <%= getTagLink( $tagID, $tag ) %> feedmelinks/modules/utils.inc.php
r1326 r1328 265 265 function make_thumbnail_for_user( $u ) { 266 266 $i = get_profile_image( $u ); 267 $out = "/" . get_user_folder( $u ) . "/thumb.png"; 268 imagepng( get_png_thumbnail_from_image( $i ), get_root() . $out ); 269 return $out; 267 $path = get_root() . "/" . get_user_folder( $u ); 268 imagepng( get_png_thumbnail_from_image( $i, 64 ), "$path/thumb.png"); 269 $tiny = imagepng( get_png_thumbnail_from_image( $i, 14 ), "$path/tiny.png" ); 270 exec( "mogrify -contrast $path/tiny.png" ); 271 return "$path/thumb.png"; 270 272 } 271 273 272 274 # returns an image OBJECT of the newly created thumbnail 273 function get_png_thumbnail_from_image( $i ) {274 $goal = 64;275 function get_png_thumbnail_from_image( $i, $goal ) { 276 $goal = $goal ? $goal : 64; 275 277 list($width, $height, $type, $attr) = getimagesize( $i ); 276 278 … … 2431 2433 } 2432 2434 } 2435 return "/img/new-user/profile"; 2436 } 2437 2438 function get_tiny_image( $u ) { 2439 return get_user_image( $u, "tiny" ); 2433 2440 } 2434 2441 … … 2437 2444 make_thumbnail_for_user( $u ); 2438 2445 if( ! is_file( get_user_image( $u, "thumb" ))) 2439 return "/ usr/NO_PROFILE/thumb.png";2446 return "/img/new-user/thumb"; 2440 2447 else 2441 2448 return get_user_image( $u, "thumb" ); … … 2464 2471 } else { 2465 2472 %> 2466 <img src="/ usr/NO_PROFILE/thumb.png" height="<%= $pxl_size %>" class="profileImage" alt="" border="0" >2473 <img src="/img/new-user/thumb" height="<%= $pxl_size %>" class="profileImage" alt="" border="0" > 2467 2474 <% 2468 2475 } feedmelinks/users.php
r1302 r1328 46 46 $con_users = mysql_connect(); 47 47 mysql_selectdb( getDBName() ); 48 $qs = getQuery( "find_user", $userId);48 $qs = getQuery( "find_user", urlencode( $userId ) ); 49 49 $q = mysql_query( $qs ); 50 50 if( $q ) { … … 53 53 # DESTROY SNUFFED USERS 54 54 if( mysql_result($q,$i,"disabled") == 1 ) { 55 if( snuffed( $userId)) {55 if( snuffed( urlencode( $userId ) )) { 56 56 %> 57 57 <center>