Change indentation to 4 spaces and removed closing php tag.

This commit is contained in:
Ismo Vuorinen
2014-05-25 16:39:44 +03:00
parent 2975d7c4b6
commit 2b0da24e6e

View File

@@ -12,7 +12,7 @@
**/ **/
// Use config.example.php as base for your configurations. // Use config.example.php as base for your configurations.
$lastfile = "last.txt"; $lastfile = "last.txt";
$here = dirname( __FILE__ ); $here = dirname( __FILE__ );
if( !is_readable($here . '/config.php') ) { if( !is_readable($here . '/config.php') ) {
@@ -25,57 +25,58 @@
// Check if http:// wrapper is allowed // Check if http:// wrapper is allowed
if( ini_get('allow_url_fopen') ) { if( ini_get('allow_url_fopen') ) {
$data = simplexml_load_file($feed); $data = simplexml_load_file($feed);
} else { } else {
// If http:// wrapper is disabled (by allow_url_fopen=0, for example), then fall back on cURL // If http:// wrapper is disabled (by allow_url_fopen=0, for example), then fall back on cURL
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $feed); curl_setopt($ch, CURLOPT_URL, $feed);
curl_setopt($ch, CURLOPT_FAILONERROR, 1); curl_setopt($ch, CURLOPT_FAILONERROR, 1);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 15); curl_setopt($ch, CURLOPT_TIMEOUT, 15);
$result = curl_exec($ch); $result = curl_exec($ch);
curl_close($ch); curl_close($ch);
$data = simplexml_load_string($result); $data = simplexml_load_string($result);
} }
$item = $data->entry[0]; $item = $data->entry[0];
if (file_exists($lastfile)) { if (file_exists($lastfile)) {
$f = fopen($lastfile, 'r'); $f = fopen($lastfile, 'r');
$last = (int) fread($f, 1024); $last = (int) fread($f, 1024);
fclose($f); fclose($f);
} else { } else {
$last = 0; $last = 0;
} }
$parts = explode('/', $item->id);
$current = (int) $parts[3];
if ($current > $last) {
$date = date("Y-m-d", strtotime($item->updated));
preg_match("#title=\"(.+)\"#iU", $item->summary, $t);
// To send HTML mail, the Content-type header must be set $parts = explode('/', $item->id);
//$headers = 'MIME-Version: 1.0' . "\r\n"; $current = (int) $parts[3];
$headers = 'Content-type: text/html; charset=UTF-8' . "\r\n";
$headers .= 'From: '. $from . "\r\n";
$subject = "xkcd {$date}: {$item->title}"; if ($current > $last) {
$punchline = $t[1]; $date = date("Y-m-d", strtotime($item->updated));
preg_match("#title=\"(.+)\"#iU", $item->summary, $t);
$msg = "<html><body><h1><a href=\"{$item->id}\">{$item->title}</a></h1>\n" // To send HTML mail, the Content-type header must be set
. "<small>Posted {$date}</small><br />\n" //$headers = 'MIME-Version: 1.0' . "\r\n";
. $item->summary."<br />\n" $headers = 'Content-type: text/html; charset=UTF-8' . "\r\n";
. "<p>{$punchline}</p></body></html>\n"; $headers .= 'From: '. $from . "\r\n";
mail($mail, $subject, $msg, $headers); $subject = "xkcd {$date}: {$item->title}";
$punchline = $t[1];
$f = fopen($lastfile, 'w'); $msg = "<html><body><h1><a href=\"{$item->id}\">{$item->title}</a></h1>\n"
fwrite($f, $current); . "<small>Posted {$date}</small><br />\n"
fclose($f); . $item->summary."<br />\n"
. "<p>{$punchline}</p></body></html>\n";
echo "New last is $current (was $last)\n"; mail($mail, $subject, $msg, $headers);
} else {
echo "No new XKCD: last=$last current=$current\n"; $f = fopen($lastfile, 'w');
} fwrite($f, $current);
?> fclose($f);
echo "New last is $current (was $last)\n";
} else {
echo "No new XKCD: last=$last current=$current\n";
}