Changeset 1165
- Timestamp:
- 09/30/06 16:36:47 (2 years ago)
- Files:
-
- feedmelinks/import/handle-upload.inc.php (modified) (2 diffs)
- feedmelinks/import/present-clean-pre-flight-input.inc.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
feedmelinks/import/handle-upload.inc.php
r1156 r1165 32 32 } 33 33 34 35 34 if( move_uploaded_file($tmp, $path)) { 36 35 # fix perms: … … 39 38 $show_form = false; 40 39 } else warn( "[Please ignore this error - code in debugging mode. Couldn't move the uploaded bookmarks file ($tmp) to your user directory ($dir) for importing -- please contact the administrators...]" ); 41 } 40 } 42 41 else warn( "We require that your favorites file be smaller than " . ($max_bookmarks_file_size / 1024) . "k." ); 43 42 %> feedmelinks/import/present-clean-pre-flight-input.inc.php
r905 r1165 44 44 $url = $l[0]; 45 45 $name = $l[1]; 46 $max_length = 65; 46 47 if( substr( $line, 0, 2 ) == "X " ) { 47 $url = getCompactString( preg_replace( "/^X /", "", $url ), 48);48 echo row_wrap( " <span class='subtle'>Ignoring duplicate $url</span>", ($i % 2 == 0) ? 1 : 0 );48 $url = getCompactString( preg_replace( "/^X /", "", $url ), $max_length); 49 echo row_wrap( " <span class='subtle'>Ignoring duplicate link: <a class='subtle' href='$url' target='external'>$url</a></span>", ($i % 2 == 0) ? 1 : 0 ); 49 50 } else { 50 51 ++$num_links; 51 $url = getCompactString( $url, 48);52 echo row_wrap( " <span class='hot'> $url</span>", ($i % 2 == 0) ? 1 : 0 );52 $url = getCompactString( $url, $max_length ); 53 echo row_wrap( " <span class='hot'><a target='external' href='$url'>$url</a></span>", ($i % 2 == 0) ? 1 : 0 ); 53 54 } 54 55 echo "</div>\n";