From dd34dd2523cd2f3be340beb905e7a3baadf1f785 Mon Sep 17 00:00:00 2001 From: spiderr Date: Fri, 25 May 2012 10:22:01 -0400 Subject: replace PHP_SELF with SCRIPT_NAME --- getid3/demos/demo.browse.php | 24 +++---- getid3/demos/demo.mimeonly.php | 2 +- getid3/demos/demo.mysql.php | 146 ++++++++++++++++++++--------------------- getid3/demos/demo.write.php | 4 +- 4 files changed, 88 insertions(+), 88 deletions(-) (limited to 'getid3') diff --git a/getid3/demos/demo.browse.php b/getid3/demos/demo.browse.php index 6a9af4f..e70c35a 100644 --- a/getid3/demos/demo.browse.php +++ b/getid3/demos/demo.browse.php @@ -128,7 +128,7 @@ if (isset($_REQUEST['filename'])) { if (strstr($_REQUEST['filename'], 'http://') || strstr($_REQUEST['filename'], 'ftp://')) { echo 'Cannot browse remote filesystems
'; } else { - echo 'Browse: '.getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-8', $listdirectory).'
'; + echo 'Browse: '.getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-8', $listdirectory).'
'; } echo table_var_dump($ThisFileInfo); @@ -243,7 +243,7 @@ if (isset($_REQUEST['filename'])) { foreach ($DirectoryContents[$dirname]['dir'] as $filename => $fileinfo) { echo ''; if ($filename == '..') { - echo '
'; + echo ''; echo 'Parent directory: '; echo ' '; echo '
'; } else { - echo ''.FixTextFields($filename).''; + echo ''.FixTextFields($filename).''; } echo ''; } @@ -269,11 +269,11 @@ if (isset($_REQUEST['filename'])) { echo 'Artist'; echo 'Title'; if (isset($_REQUEST['ShowMD5'])) { - echo 'MD5 File (File) (disable)'; - echo 'MD5 Data (File) (disable)'; - echo 'MD5 Data (Source) (disable)'; + echo 'MD5 File (File) (disable)'; + echo 'MD5 Data (File) (disable)'; + echo 'MD5 Data (Source) (disable)'; } else { - echo 'MD5 Data (enable)'; + echo 'MD5 Data (enable)'; } echo 'Tags'; echo 'Errors & Warnings'; @@ -285,7 +285,7 @@ if (isset($_REQUEST['filename'])) { uksort($DirectoryContents[$dirname]['known'], 'MoreNaturalSort'); foreach ($DirectoryContents[$dirname]['known'] as $filename => $fileinfo) { echo ''; - echo ''.FixTextFields(getid3_lib::SafeStripSlashes($filename)).''; + echo ''.FixTextFields(getid3_lib::SafeStripSlashes($filename)).''; echo ' '.number_format($fileinfo['filesize']).''; echo ' '.NiceDisplayFiletypeFormat($fileinfo).''; echo ' '.(isset($fileinfo['playtime_string']) ? $fileinfo['playtime_string'] : '-').''; @@ -333,7 +333,7 @@ if (isset($_REQUEST['filename'])) { break; } echo ''; - echo ' delete'; + echo ' delete'; echo ''; } } @@ -342,7 +342,7 @@ if (isset($_REQUEST['filename'])) { uksort($DirectoryContents[$dirname]['other'], 'MoreNaturalSort'); foreach ($DirectoryContents[$dirname]['other'] as $filename => $fileinfo) { echo ''; - echo ''.$filename.''; + echo ''.$filename.''; echo ' '.(isset($fileinfo['filesize']) ? number_format($fileinfo['filesize']) : '-').''; echo ' '.NiceDisplayFiletypeFormat($fileinfo).''; echo ' '.(isset($fileinfo['playtime_string']) ? $fileinfo['playtime_string'] : '-').''; @@ -367,7 +367,7 @@ if (isset($_REQUEST['filename'])) { echo ''; echo ' '; // Edit - echo ' delete'; + echo ' delete'; echo ''; } } @@ -485,7 +485,7 @@ function table_var_dump($variable) { fwrite($tempimagefile, $value); fclose($tempimagefile); } - $returnstring .= ''; + $returnstring .= ''; } else { $returnstring .= ''.table_var_dump($value).''; } diff --git a/getid3/demos/demo.mimeonly.php b/getid3/demos/demo.mimeonly.php index dd6dec6..22fca21 100644 --- a/getid3/demos/demo.mimeonly.php +++ b/getid3/demos/demo.mimeonly.php @@ -20,7 +20,7 @@ if (!empty($_REQUEST['filename'])) { } else { - echo 'Usage: '.$_SERVER['PHP_SELF'].'?filename=filename.ext'; + echo 'Usage: '.$_SERVER['SCRIPT_NAME'].'?filename=filename.ext'; } diff --git a/getid3/demos/demo.mysql.php b/getid3/demos/demo.mysql.php index 0228749..5d55e07 100644 --- a/getid3/demos/demo.mysql.php +++ b/getid3/demos/demo.mysql.php @@ -320,7 +320,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES if (!empty($_REQUEST['rescanerrors'])) { - echo 'abort
'; + echo 'abort
'; echo 'Re-scanning all media files already in database that had errors and/or warnings in last scan
'; @@ -345,7 +345,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } elseif (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan'])) { - echo 'abort
'; + echo 'abort
'; echo 'Scanning all media files in '.str_replace('\\', '/', realpath(!empty($_REQUEST['scan']) ? $_REQUEST['scan'] : $_REQUEST['newscan'])).' (and subdirectories)
'; @@ -707,7 +707,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } elseif (!empty($_REQUEST['showfiles'])) { - echo 'show all
'; + echo 'show all
'; echo ''; $SQLquery = 'SELECT `filename`, `comments_id3v2`'; @@ -717,7 +717,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES set_time_limit(30); $CommentArray = unserialize($row['comments_id3v2']); if (($_REQUEST['encodedbydistribution'] == '%') || (!empty($CommentArray['encoded_by'][0]) && ($_REQUEST['encodedbydistribution'] == $CommentArray['encoded_by'][0]))) { - echo ''; + echo ''; echo ''; } } @@ -739,16 +739,16 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES $EncodedBy[$row['encoder_options']][@$CommentArray['encoded_by'][0]] = 1; } } - echo '.m3u version
'; + echo '.m3u version
'; echo '
m3u
m3u'.FixTextFields($row['filename']).'
'; foreach ($EncodedBy as $key => $value) { - echo ''; + echo ''; echo ''; echo ''; } @@ -803,7 +803,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { - echo '.m3u version
'; + echo '.m3u version
'; $EmptyGenreCounter = 0; echo '
m3uEncoder OptionsEncoded By (ID3v2)
m3u
m3u'.$key.''; arsort($value); foreach ($value as $string => $count) { echo ''; - echo ''; + echo ''; } echo '
'.number_format($count).' '.$string.'
'.$string.'
'; echo ''; @@ -811,7 +811,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES if (!in_array($row['fileformat'], $IgnoreNoTagFormats)) { $EmptyGenreCounter++; echo ''; - echo ''; + echo ''; echo ''; echo ''; } @@ -841,13 +841,13 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { $NonEmptyCommentsCounter = 0; - echo '.m3u version
'; + echo '.m3u version
'; echo '
m3ufilename
m3um3u'.FixTextFields($row['filename']).'
'; echo ''; while ($row = mysql_fetch_array($result)) { $NonEmptyCommentsCounter++; echo ''; - echo ''; + echo ''; echo ''; if (strlen(trim($row['comment'])) > 0) { echo ''; @@ -884,7 +884,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { - echo '.m3u version
'; + echo '.m3u version
'; $TrackZeroCounter = 0; echo '
m3ufilenamecomments
m3um3u'.FixTextFields($row['filename']).''.FixTextFields($row['comment']).'
'; echo ''; @@ -892,7 +892,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES if ((strlen($row['track']) > 0) && ($row['track'] < 1) || ($row['track'] > 99)) { $TrackZeroCounter++; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -924,12 +924,12 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { echo ''.number_format(mysql_num_rows($result)).' files with "feat." in the title (instead of the artist)

'; - echo '.m3u version
'; + echo '.m3u version
'; echo '
m3ufilenametrack
m3um3u'.FixTextFields($row['filename']).''.FixTextFields($row['track']).'
'; echo ''; while ($row = mysql_fetch_array($result)) { echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -960,12 +960,12 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { echo ''.number_format(mysql_num_rows($result)).' files with a track number, but no album

'; - echo '.m3u version
'; + echo '.m3u version
'; echo '
m3ufilenametitle
m3um3u'.FixTextFields($row['filename']).''.eregi_replace('(feat\. .*)', '\\1', FixTextFields($row['title'])).'
'; echo ''; while ($row = mysql_fetch_array($result)) { echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -1008,7 +1008,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES $TagsToCompare['id3v1'] = true; } - echo 'Auto-fix empty tags

'; + echo 'Auto-fix empty tags

'; echo '
'; echo '
m3ufilenametrackalbum
m3um3u'.FixTextFields($row['filename']).''.FixTextFields($row['track']).''.FixTextFields($row['album']).'
'; echo ''; @@ -1016,16 +1016,16 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES echo ''; echo ''; if ($TagsToCompare['id3v2']) { - echo ''; + echo ''; } if ($TagsToCompare['ape']) { - echo ''; + echo ''; } if ($TagsToCompare['lyrics3']) { echo ''; } if ($TagsToCompare['id3v1']) { - echo ''; + echo ''; } echo ''; @@ -1069,12 +1069,12 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES $ThisLine = ''; $ThisLine .= ''; - $ThisLine .= ''; + $ThisLine .= ''; $tagvalues = ''; foreach ($FieldsToCompare as $fieldname) { $tagvalues .= $fieldname.' = '.@implode(" \n", @$Comments['all'][$fieldname])." \n"; } - $ThisLine .= ''; + $ThisLine .= ''; foreach ($TagsToCompare as $tagtype => $CompareThisTagType) { if ($CompareThisTagType) { $tagvalues = ''; @@ -1195,7 +1195,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { $ThisLine .= ''; } } @@ -1249,7 +1249,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES echo ''; } echo ''; + echo ''; echo ''; @@ -1378,7 +1378,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES echo ''; echo ''; echo ''; - echo ''; + echo ''; if (@$_REQUEST['autofix']) { @@ -1393,7 +1393,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { - echo ''; } @@ -1426,7 +1426,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { - echo 'Show all Encoder Options
'; + echo 'Show all Encoder Options
'; echo 'Files with Encoder Options '.$_REQUEST['showtagfiles'].':
'; echo '
FilenameCombinedID3v2ID3v2APEAPELyrics3ID3v1ID3v1
view'.FixTextFields($row['filename']).''.FixTextFields($row['filename']).'allall'; } - $ThisLine .= ''.$tagtype.''; + $ThisLine .= ''.$tagtype.''; $ThisLine .= '
 '; - echo ''.FixTextFields($row['filename']).''.FixTextFields($row['filename']).''; echo ''; echo '
'.$TagsToSynch.'
view '.$NotMatchedReasons.''.FixTextFields($ActualFilename).''.FixTextFields($ActualFilename).''; + echo ''; echo ''.$DifferenceBoldedName.'
'; while ($row = mysql_fetch_array($result)) { @@ -1452,8 +1452,8 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES while ($row = mysql_fetch_array($result)) { echo ''; echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; } echo '
'.$row['encoder_options'].''.number_format($row['num']).'m3u'.number_format($row['num']).'m3u
'; @@ -1474,8 +1474,8 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES while ($row = mysql_fetch_array($result)) { echo ''; echo ''.$row['tags'].''; - echo ''.number_format($row['num']).''; - echo 'm3u'; + echo ''.number_format($row['num']).''; + echo 'm3u'; echo ''; } echo '
'; @@ -1610,8 +1610,8 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { - echo 'Duplicated aritst + title: (Identical Mix/Version only)
'; - echo '(.m3u version)
'; + echo 'Duplicated aritst + title: (Identical Mix/Version only)
'; + echo '(.m3u version)
'; echo ''; echo ''; @@ -1653,10 +1653,10 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -1751,8 +1751,8 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES echo ''.number_format(mysql_num_rows($result)).' files with [??]-format track numbers in album field:
'; if (mysql_num_rows($result) > 0) { - echo '(.m3u version)
'; - echo 'Try to auto-fix
'; + echo '(.m3u version)
'; + echo 'Try to auto-fix
'; echo '
 ArtistTitleVersion  Filename
'; foreach ($filenames as $file) { - echo 'play
'; + echo 'play
'; } echo '		play allplay all'.implode('
', $artists).'		'.implode('
', $titles).'		'.implode('
', $remixes).'
'; while ($row = mysql_fetch_array($result)) { echo ''; @@ -1835,9 +1835,9 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { echo ''; } - echo ''; + echo ''; echo ''; - echo ''; + echo ''; echo ''; } echo '
'.number_format($row['num']).''.number_format($row['num']).''.str_replace("\t", '
', $row['genre']).'		.m3u.m3u
'; @@ -1849,13 +1849,13 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES $SQLquery .= ' WHERE (`genre` LIKE "'.mysql_escape_string($_REQUEST['genredistribution']).'")'; $SQLquery .= ' ORDER BY `filename` ASC'; $result = safe_mysql_query($SQLquery); - echo 'All Genres
'; + echo 'All Genres
'; echo ''; echo ''; while ($row = mysql_fetch_array($result)) { echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; } @@ -1878,7 +1878,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES while ($row = mysql_fetch_array($result)) { echo ''; echo ''; - echo ''; + echo ''; echo ''; } echo '
Genrem3uFilename
'.str_replace("\t", '
', $row['genre']).'		m3um3u'.FixTextFields($row['filename']).'
'.number_format($row['num']).''.($row['fileformat'] ? $row['fileformat'] : 'unknown').(($row['audio_dataformat'] && ($row['audio_dataformat'] != $row['fileformat'])) ? '.'.$row['audio_dataformat'] : '').''.($row['fileformat'] ? $row['fileformat'] : 'unknown').(($row['audio_dataformat'] && ($row['audio_dataformat'] != $row['fileformat'])) ? '.'.$row['audio_dataformat'] : '').'
'; @@ -1904,7 +1904,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES } else { echo number_format(mysql_num_rows($result)).' files with errors or warnings:
'; - echo '(.m3u version)
'; + echo '(.m3u version)
'; echo ''; echo ''; while ($row = mysql_fetch_array($result)) { @@ -1959,7 +1959,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES echo ''; echo ''; if ($row['vbr_method']) { - echo ''; + echo ''; } else { echo ''; } @@ -1975,7 +1975,7 @@ if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUES $result = safe_mysql_query($SQLquery); echo number_format(mysql_num_rows($result)).' files with VBR_method of "'.$_REQUEST['vbrmethod'].'":
FilenameErrorWarning
'.FixTextFields(number_format($row['num'])).''.FixTextFields($row['vbr_method']).''.FixTextFields($row['vbr_method']).'CBR
'; while ($row = mysql_fetch_array($result)) { - echo ''; + echo ''; echo ''; } echo '
m3u
m3u'.FixTextFields($row['filename']).'
'; @@ -2073,42 +2073,42 @@ function BetterUCwords($string) { -echo '
'; +echo '
'; echo 'Warning: Scanning a new directory will erase all previous entries in the database!
'; echo 'Directory: '; echo ''; echo '
'; -echo '
'; +echo '
'; echo 'Re-scanning a new directory will only add new, previously unscanned files into the list (and not erase the database).
'; echo 'Directory: '; echo ''; echo '
'; echo ''; $SQLquery = 'SELECT COUNT(*) AS `TotalFiles`, SUM(`playtime_seconds`) AS `TotalPlaytime`, SUM(`filesize`) AS `TotalFilesize`, AVG(`playtime_seconds`) AS `AvgPlaytime`, AVG(`filesize`) AS `AvgFilesize`, AVG(`audio_bitrate` + `video_bitrate`) AS `AvgBitrate`'; diff --git a/getid3/demos/demo.write.php b/getid3/demos/demo.write.php index 4a878ec..05c6ff9 100644 --- a/getid3/demos/demo.write.php +++ b/getid3/demos/demo.write.php @@ -118,8 +118,8 @@ if (isset($_POST['WriteTags'])) { echo '

Sample tag editor/writer

'; echo 'Browse current directory
'; if (!empty($Filename)) { - echo 'Start Over

'; - echo ''; + echo 'Start Over

'; + echo '
'; echo ''; if (file_exists($Filename)) { -- cgit v1.3
Filename: '.$Filename.'