com web/qa: Publish PFTT Reports(5): build.php list_builds. php pftt.php pftt_report.php reports/db/.htaccess

Commit: 92c41fca6691878b51d3aba336b99d4a996e5d91 Author: v-mafick@microsoft.com <v-mafick@microsoft.com> Thu, 20 Mar 2014 15:07:59 -0700 Parents: 98a29a1f1e9b715d77ff8d1168d3daa5e9ad52d7 Branches: master Link: http://git.php.net/?p=web/qa.git;a=commitdiff;h=92c41fca6691878b51d3aba336b99d4a996e5d91 Log: Publish PFTT Reports(5) Changed paths: M build.php M list_builds.php M pftt.php M pftt_report.php M reports/db/.htaccess Diff: diff --git a/build.php b/build.php index dd6aa35..fa3add8 100755 --- a/build.php +++ b/build.php @@ -1,6 +1,6 @@ <?php -define('BASE_REPORT_DIR', dirname($_SERVER['SCRIPT_FILENAME'])."/pftt-reports/"); +define('BASE_REPORT_DIR', dirname($_SERVER['SCRIPT_FILENAME'])."/reports/db/"); $branch = $_GET['branch']; $revision = $_GET['revision']; @@ -50,7 +50,7 @@ foreach ( scandir(BASE_REPORT_DIR."/$branch/$revision") as $report ) { ?> <tr> - <td>with <a href="<?php echo dirname($_SERVER['PHP_SELF']); ?>/pftt-reports/<?php echo $branch; ?>/<?php echo $revision; ?>/<?php echo $report; ?>" target="_blank"><?php echo $report; ?></a></td> + <td>with <a href="<?php echo dirname($_SERVER['PHP_SELF']); ?>/reports/db/<?php echo $branch; ?>/<?php echo $revision; ?>/<?php echo $report; ?>" target="_blank"><?php echo $report; ?></a></td> </tr> <?php @@ -71,7 +71,7 @@ foreach ( scandir(BASE_REPORT_DIR."/$branch/$revision") as $report ) { ?> <tr> - <td>with <a href="<?php echo dirname($_SERVER['PHP_SELF']); ?>/pftt-reports/<?php echo $branch; ?>/<?php echo $revision; ?>/<?php echo $report; ?>" target="_blank"><?php echo $report; ?></a></td> + <td>with <a href="<?php echo dirname($_SERVER['PHP_SELF']); ?>/reports/db/<?php echo $branch; ?>/<?php echo $revision; ?>/<?php echo $report; ?>" target="_blank"><?php echo $report; ?></a></td> </tr> <?php diff --git a/list_builds.php b/list_builds.php index c14d11d..bd14181 100755 --- a/list_builds.php +++ b/list_builds.php @@ -1,6 +1,6 @@ <?php error_reporting(E_ALL); -define('BASE_REPORT_DIR', dirname($_SERVER['SCRIPT_FILENAME'])."/pftt-reports/"); +define('BASE_REPORT_DIR', dirname($_SERVER['SCRIPT_FILENAME'])."/reports/db/"); $branch = $_GET['branch']; if (substr($branch, 0, 3)!='PHP') { diff --git a/pftt.php b/pftt.php index fda0748..ca608ba 100755 --- a/pftt.php +++ b/pftt.php @@ -8,7 +8,7 @@ $SITE_UPDATE = date("D M d H:i:s Y T", filectime(__FILE__)); common_header(); -define('BASE_REPORT_DIR', dirname($_SERVER['SCRIPT_FILENAME'])."/pftt-reports/"); +define('BASE_REPORT_DIR', dirname($_SERVER['SCRIPT_FILENAME'])."/reports/db/"); ?> <h1>PFTT</h1> diff --git a/pftt_report.php b/pftt_report.php index ddcf964..1aff791 100755 --- a/pftt_report.php +++ b/pftt_report.php @@ -94,7 +94,7 @@ if (substr($report_name, -5) != ".html") { } // decide where to store it -$report_file = dirname($_SERVER['SCRIPT_FILENAME']) . "/pftt-reports/$branch/$revision/$report_name"; +$report_file = dirname($_SERVER['SCRIPT_FILENAME']) . "/reports/db/$branch/$revision/$report_name"; $report_dir = dirname($report_file); // ensure dir exists diff --git a/reports/db/.htaccess b/reports/db/.htaccess index 578162f..911756f 100644 --- a/reports/db/.htaccess +++ b/reports/db/.htaccess @@ -1,3 +1,7 @@ Options -Indexes -Order deny,allow -deny from all +# need to allow read access to /reports/db/ because that's where PFTT files will be stored because +# web user has write access to that +# +# should be safe to allow read access to SQLite db files +#Order deny,allow +#deny from all