Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-1971

Browse source 
Remove "?>" from the end of pure-PHP files to prevent "HEADERS ALREADY SENT"
This commit is contained in:
paul.baranowski 2011-02-22 18:22:31 +01:00
parent b44de03c71
commit 15153727c1
64 changed files with 113 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/configs/conf.php
View file

@ -179,5 +179,3 @@ function load_db_config(){
'phptype' => 'pgsql', 'phptype' => 'pgsql',
'database' => $ini_array['database']['dbname']); 'database' => $ini_array['database']['dbname']);
} }
?>

1
application/controllers/ApiController.php
View file

@ -212,4 +212,3 @@ class ApiController extends Zend_Controller_Action
} }
} }
?>

1
application/models/AccessRecur.php
View file

@ -181,4 +181,3 @@ class AccessRecur {
} }
} // class AccessRecur } // class AccessRecur
?>

1
application/models/Alib.php
View file

@ -619,4 +619,3 @@ class Alib {
} // fn test } // fn test
} // class Alib } // class Alib
?>

1
application/models/Backup.php
View file

@ -484,4 +484,3 @@ class Backup
} }
} // classs Backup } // classs Backup
?>

2
application/models/BasicStor.php
View file

@ -2183,4 +2183,4 @@ class BasicStor {
} }
} // class BasicStor } // class BasicStor
?>

1
application/models/GreenBox.php
View file

@ -1723,4 +1723,3 @@ class GreenBox extends BasicStor {
} // fn removePerm } // fn removePerm
} // class GreenBox } // class GreenBox
?>

1
application/models/LocStor.php
View file

@ -1746,4 +1746,3 @@ class LocStor extends BasicStor {
/* ==================================================== auxiliary methods */ /* ==================================================== auxiliary methods */
} // class LocStor } // class LocStor
?>

1
application/models/M3uPlaylist.php
View file

@ -349,4 +349,3 @@ class M3uPlaylistAnimateElement {
} }
} }
?>

1
application/models/Playlist.php
View file

@ -1386,4 +1386,3 @@ class PlaylistMetadataExport
} }
} }
?>

2
application/models/Prefs.php
View file

@ -439,4 +439,4 @@ class Prefs {
} }
} // class Prefs } // class Prefs
?>

1
application/models/Renderer.php
View file

@ -287,4 +287,3 @@ class Renderer
} // class Renderer } // class Renderer
?>

2
application/models/Restore.php
View file

@ -433,4 +433,4 @@ class Restore {
} }
} // class Restore } // class Restore
?>

1
application/models/Schedule.php
View file

@ -701,4 +701,3 @@ class Schedule {
} }
?>

1
application/models/SmilPlaylist.php
View file

@ -310,4 +310,3 @@ class SmilPlaylistAnimateElement {
} }
} // class SmilPlaylistAnimateElement } // class SmilPlaylistAnimateElement
?>

2
application/models/StoredFile.php
View file

@ -1958,4 +1958,4 @@ class StoredFile {
} }
} }
?>

2
application/models/Subjects.php
View file

@ -680,4 +680,4 @@ class Subjects {
} // fn test } // fn test
} // class Subjects } // class Subjects
?>

2
application/models/Transport.php
View file

@ -1830,4 +1830,4 @@ class Transport
} }
?>

2
application/models/TransportRecord.php
View file

@ -416,4 +416,4 @@ class TransportRecord
} }
} // class TransportRecord } // class TransportRecord
?>

2
application/models/Validator.php
View file

@ -382,4 +382,4 @@ class Validator {
} // class Validator } // class Validator
?>

2
application/models/XmlParser.php
View file

@ -395,4 +395,4 @@ class XmlParser {
} }
} }
?>

2
application/models/audioClipFormat.php
View file

@ -324,5 +324,3 @@ $audioClipFormat = array(
// 'regexp'=>'^\d{4}(-\d{2}(-\d{2}(T\d{2}:\d{2}(:\d{2}\.\d+)?(Z)|([\+\-]?\d{2}:\d{2}))?)?)?$', // 'regexp'=>'^\d{4}(-\d{2}(-\d{2}(T\d{2}:\d{2}(:\d{2}\.\d+)?(Z)|([\+\-]?\d{2}:\d{2}))?)?)?$',
), ),
); );
?>

2
application/models/cron/Cron.php
View file

@ -211,4 +211,4 @@ class Cron {
return $this->cronfile.' "'.str_replace('"','\"',serialize($this->params)).'"'; return $this->cronfile.' "'.str_replace('"','\"',serialize($this->params)).'"';
} }
} }
?>

2
application/models/cron/CronJob.php
View file

@ -14,4 +14,4 @@ class CronJob
{ {
} }
} }
?>

2
application/models/cron/Crontab.php
View file

@ -281,4 +281,4 @@ class Crontab
return $returnar; return $returnar;
} }
} }
?>

1
application/models/cron/croncall.php
View file

@ -6,4 +6,3 @@ require_once (dirname(__FILE__).'/'.$p['class'].'.php');
$cronjob = new $p['class'](); $cronjob = new $p['class']();
$ret = $cronjob->execute($p['params']); $ret = $cronjob->execute($p['params']);
exit(0); exit(0);
?>

1
application/models/cron/transportCron.php
View file

@ -18,4 +18,3 @@ if (!$r) {
} }
exit(0); exit(0);
?>

1
application/models/cron/transportCronJob.php
View file

@ -39,4 +39,3 @@ if (TR_LOG_LEVEL>1) {
$tr->trLog("transportCronJob($pid) end ($trtok)"); $tr->trLog("transportCronJob($pid) end ($trtok)");
} }
exit(0); exit(0);
?>

14
application/models/index.php
View file

@ -1,17 +1,3 @@
<?php <?php
header ("location: html/"); header ("location: html/");
exit; exit;
/*
?>
<html><head>
<title>StorageServer module</title>
</head><body>
<h3>StorageServer module</h3>
<br>
<a href="../html/" accesskey="H"><b>H</b>TML client</a><br>
<a href="../xmlrpc/" accesskey="X"><b>X</b>mlRpc test</a><br>
<a href="../tests/" accesskey="T"><b>T</b>est</a><br>
</body></html>
<?
*/
?>

5
application/models/playlistFormat.php
View file

@ -110,8 +110,3 @@ $playlistFormat = array(
*/ */
); );
/*
?
ls:filename Text auto
*/
?>

2
application/models/tests/AllTests.php
View file

@ -21,4 +21,4 @@ $result = PHPUnit::run($suite);
echo $result->toString(); echo $result->toString();
?>

2
application/models/tests/PlaylistTests.php
View file

@ -178,4 +178,4 @@ class PlaylistTests extends PHPUnit_TestCase {
} }
} }
?>

1
application/models/tests/SchedulerExportTests.php
View file

@ -39,4 +39,3 @@ class SchedulerExportTests extends PHPUnit_TestCase {
} }
} }
?>

1
application/models/tests/SchedulerTests.php
View file

@ -125,4 +125,3 @@ class SchedulerTests extends PHPUnit_TestCase {
} }
} }
?>

1
application/models/tests/StoredFileTests.php
View file

@ -84,4 +84,3 @@ class StoredFileTest extends PHPUnit_TestCase {
} }
} }
?>

1
application/models/tests/analyze.php
View file

@ -22,4 +22,3 @@ if (is_array($r)) {
print_r($r); print_r($r);
} }
echo"\n"; echo"\n";
?>

1
application/models/tests/index.php
View file

@ -1,4 +1,3 @@
<?php <?php
header ("location: ../"); header ("location: ../");
exit; exit;
?>

2
application/models/tests/pdoTest.php
View file

@ -22,4 +22,4 @@ $sql3 = "SELECT TIMESTAMP '2011-01-01 00:00:00.000' + INTERVAL '01:00:00.123456'
$result3 = $con->query($sql3); $result3 = $con->query($sql3);
var_dump($result3->fetchAll()); var_dump($result3->fetchAll());
?>

1
application/models/tests/transTest.php
View file

@ -140,4 +140,3 @@ $comm = "ls -l ".$CC_CONFIG['storageDir']."/a23"; echo `$comm`;
if(file_exists("../trans/log")) echo `tail -n 25 ../trans/log`; if(file_exists("../trans/log")) echo `tail -n 25 ../trans/log`;
echo "#Transport test: OK.\n\n"; echo "#Transport test: OK.\n\n";
*/ */
?>

1
application/models/tests/webstreamTest.php
View file

@ -59,4 +59,3 @@ echo "$r\n";
echo "#storeWebstream test: OK.\n\n" echo "#storeWebstream test: OK.\n\n"
*/ */
?>

5
application/models/webstreamFormat.php
View file

@ -338,8 +338,3 @@ $webstreamFormat = array(
*/ */
); );
/*
?
ls:filename Text auto
*/
?>

2
application/models/xmlrpc/XR_LocStor.php
View file

@ -3830,4 +3830,4 @@ class XR_LocStor extends LocStor {
} // class XR_LocStor } // class XR_LocStor
?>

1
application/models/xmlrpc/index.php
View file

@ -1,4 +1,3 @@
<?php <?php
header ("location: xrLocStor.php"); header ("location: xrLocStor.php");
exit; exit;
?>

2
application/models/xmlrpc/put.php
View file

@ -96,4 +96,4 @@ fclose($fp);
fclose($putdata); fclose($putdata);
header("HTTP/1.1 200"); header("HTTP/1.1 200");
?>

1
application/models/xmlrpc/schedulerPhpClient.php
View file

@ -508,4 +508,3 @@ $r = $spc->DisplayScheduleMethod($this->Base->sessid, '20040101T00:00:00', '2005
#$r = $spc->GetSchedulerTimeMethod(); var_dump($r); #$r = $spc->GetSchedulerTimeMethod(); var_dump($r);
================= */ ================= */
?>

1
application/models/xmlrpc/simpleGet.php
View file

@ -125,4 +125,3 @@ switch ($ftype) {
// var_dump($ftype); // var_dump($ftype);
http_error(500, "500 Unknown ftype ($ftype)"); http_error(500, "500 Unknown ftype ($ftype)");
} }
?>

2
application/models/xmlrpc/xrLocStor.php
View file

@ -169,4 +169,4 @@ foreach ($methods as $method => $description) {
$s = new XML_RPC_Server($defs); $s = new XML_RPC_Server($defs);
?>

1
application/models/xmlrpc/xr_cli_test.php
View file

@ -365,4 +365,3 @@ if (isset($infos[$method]['r'])) {
} }
} }
?>

1
application/validate/UserNameValidate.php
View file

@ -23,4 +23,3 @@ class Application_Validate_UserNameValidate extends Zend_Validate_Abstract
} }
} }
?>

1
application/views/helpers/LoggedInAs.php
View file

@ -14,4 +14,3 @@ class Airtime_View_Helper_LoggedInAs extends Zend_View_Helper_Abstract
} }
} }
?>

2
install/airtime-install.php
View file

@ -132,4 +132,4 @@ $command = __DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/nul
$command = "python ".__DIR__."/../pypo/install/pypo-install.py"; $command = "python ".__DIR__."/../pypo/install/pypo-install.py";
system($command); system($command);
echo "******************************* Install Complete *******************************\n"; echo "******************************* Install Complete *******************************\n";
?>

2
install/airtime-uninstall.php
View file

@ -227,4 +227,4 @@ airtime_uninstall_delete_files($CC_CONFIG['storageDir']);
$command = "python ".__DIR__."/../pypo/install/pypo-uninstall.py"; $command = "python ".__DIR__."/../pypo/install/pypo-uninstall.py";
system($command); system($command);
echo "****************************** Uninstall Complete ******************************\n"; echo "****************************** Uninstall Complete ******************************\n";
?>

2
install/airtime-user.php
View file

@ -99,4 +99,4 @@ if (PEAR::isError($r)) {
die($r->getMessage()); die($r->getMessage());
} }
exit(0); exit(0);
?>

1
install/index.php
View file

@ -1,4 +1,3 @@
<?php <?php
header ("location: ../"); header ("location: ../");
exit; exit;
?>

2
install/installInit.php
View file

@ -84,4 +84,4 @@ function install_setDirPermissions($filePath) {
// } // }
} }
?>

7
install/install_twitter_plugin.php
View file

@ -8,12 +8,7 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
exit(1); exit(1);
} }
?>
//------------------------------------------------------------------------
// Install twitter Cron job
//------------------------------------------------------------------------
<?php
require_once(dirname(__FILE__).'/../../../storageServer/var/cron/Cron.php'); require_once(dirname(__FILE__).'/../../../storageServer/var/cron/Cron.php');
$m = '*'; $m = '*';
$h ='*'; $h ='*';
@ -41,4 +36,4 @@ echo " adding new entry\n";
$cron->ct->addCron($m, $h, $dom, $mon, $dow, $command); $cron->ct->addCron($m, $h, $dom, $mon, $dow, $command);
$cron->closeCrontab(); $cron->closeCrontab();
echo "Done.\n"; echo "Done.\n";
?>

6
install/uninstall_twitter_plugin.php
View file

@ -8,12 +8,7 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
exit(1); exit(1);
} }
?>
//------------------------------------------------------------------------
// Uninstall twitter Cron job
//------------------------------------------------------------------------
<?php
require_once(dirname(__FILE__).'/../../../storageServer/var/cron/Cron.php'); require_once(dirname(__FILE__).'/../../../storageServer/var/cron/Cron.php');
$old_regex = '/ui_twitterCron\.php/'; $old_regex = '/ui_twitterCron\.php/';
@ -34,4 +29,3 @@ foreach ($cron->ct->getByType(CRON_CMD) as $id => $line) {
$cron->closeCrontab(); $cron->closeCrontab();
echo "Done.\n"; echo "Done.\n";
?>

1
pypo/test/airtime-schedule-insert.php
View file

@ -97,4 +97,3 @@ $scheduleGroup = new ScheduleGroup();
$scheduleGroup->add($playTime, null, $pl->getId()); $scheduleGroup->add($playTime, null, $pl->getId());
echo " SUCCESS: Playlist scheduled at $playTime\n\n"; echo " SUCCESS: Playlist scheduled at $playTime\n\n";
?>

1
utils/CleanStor.php
View file

@ -122,4 +122,3 @@ switch($argv[1]){
} }
?>

2
utils/airtime-backup.php
View file

@ -192,5 +192,3 @@ function admDumpGroup(&$bs, $gid, $ind='')
#var_export($res); #var_export($res);
#var_dump($res); #var_dump($res);
echo "$res"; echo "$res";
?>

1
utils/airtime-import.php
View file

@ -346,4 +346,3 @@ if ($g_errors > 0) {
echo " *** Total: ".($g_fileCount+$g_duplicates)." files in $time seconds = $speed files/second.\n"; echo " *** Total: ".($g_fileCount+$g_duplicates)." files in $time seconds = $speed files/second.\n";
echo "==========================================================================\n"; echo "==========================================================================\n";
?>

1
utils/restore.php
View file

@ -252,4 +252,3 @@ foreach ($groups as $grname => $group) {
/* -------------------------------------------------------- restoring objects */ /* -------------------------------------------------------- restoring objects */
ls_restore_restoreObject($tree, /*$storId,*/ FALSE); ls_restore_restoreObject($tree, /*$storId,*/ FALSE);
?>

5
utils/restore2.php
View file

@ -1,5 +1,3 @@
#!/usr/bin/php
<?php <?php
/** /**
* Do database restore in background. - command line php application * Do database restore in background. - command line php application
@ -31,11 +29,8 @@
$rs->addLogItem('argv:'.print_r($argv,true)); $rs->addLogItem('argv:'.print_r($argv,true));
} }
# sleep(2);
$backupfile = $argv[1]; $backupfile = $argv[1];
$token = $argv[3]; $token = $argv[3];
$sessid = $argv[4]; $sessid = $argv[4];
$rs->startRestore($backupfile,$token,$sessid); $rs->startRestore($backupfile,$token,$sessid);
?>

3
utils/serbianLatinToCyrillicConverter.py
View file

@ -22,9 +22,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author$
# Version : $Revision$
# Location : $URL$
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------