bjori Tue Aug 14 12:04:12 2007 UTC
Modified files:
/phd build.php
/phd/include PhDReader.class.php
/phd/themes/php phpweb.php
Log:
WS (tabs to spaces)
http://cvs.php.net/viewvc.cgi/phd/build.php?r1=1.18&r2=1.19&diff_format=u
Index: phd/build.php
diff -u phd/build.php:1.18 phd/build.php:1.19
--- phd/build.php:1.18 Tue Aug 14 11:51:36 2007
+++ phd/build.php Tue Aug 14 12:04:12 2007
@@ -1,27 +1,27 @@
<?php
-/* $Id: build.php,v 1.18 2007/08/14 11:51:36 bjori Exp $ */
+/* $Id: build.php,v 1.19 2007/08/14 12:04:12 bjori Exp $ */
function err($no, $str, $file, $line) {
- global $notify;
- if (strpos($str, "No mapper") !== false) {
-// $notify->update("Another missing function", strstr($str,
"'"))->show();
- return false;
- }
-
- $err = new PHNotify("Something wrong!", "$str\n$file:$line\n",
"dialog-error");
- $err
- ->urgency(PHNotify::URGENCY_CRITICAL)
- ->timeout(PHNotify::EXPIRES_NEVER)
- ->hint("x", 1680/2)->hint("y", 1050/2)
- ->show();
- return false;
+ global $notify;
+ if (strpos($str, "No mapper") !== false) {
+// $notify->update("Another missing function", strstr($str,
"'"))->show();
+ return false;
+ }
+
+ $err = new PHNotify("Something wrong!", "$str\n$file:$line\n",
"dialog-error");
+ $err
+ ->urgency(PHNotify::URGENCY_CRITICAL)
+ ->timeout(PHNotify::EXPIRES_NEVER)
+ ->hint("x", 1680/2)->hint("y", 1050/2)
+ ->show();
+ return false;
}
if ($err = extension_loaded("phnotify")) {
- $notify = new PHNotify("Starting build");
- $notify->urgency(PHNotify::URGENCY_LOW)->hint("x", 1680)->hint("y",
10)->show();
- $start = microtime(true);
- set_error_handler("err");
+ $notify = new PHNotify("Starting build");
+ $notify->urgency(PHNotify::URGENCY_LOW)->hint("x", 1680)->hint("y",
10)->show();
+ $start = microtime(true);
+ set_error_handler("err");
}
http://cvs.php.net/viewvc.cgi/phd/include/PhDReader.class.php?r1=1.8&r2=1.9&diff_format=u
Index: phd/include/PhDReader.class.php
diff -u phd/include/PhDReader.class.php:1.8 phd/include/PhDReader.class.php:1.9
--- phd/include/PhDReader.class.php:1.8 Wed Aug 8 23:45:26 2007
+++ phd/include/PhDReader.class.php Tue Aug 14 12:04:12 2007
@@ -1,5 +1,5 @@
<?php
-/* $Id: PhDReader.class.php,v 1.8 2007/08/08 23:45:26 bjori Exp $ */
+/* $Id: PhDReader.class.php,v 1.9 2007/08/14 12:04:12 bjori Exp $ */
//6271
class PhDReader extends XMLReader {
@@ -20,7 +20,7 @@
'article' => true,
'appendix' => true,
'bibliography' => array(
- /* DEFAULT */ false,
+ /* DEFAULT */ false,
'article' => true,
'book' => true,
'part' => true,
@@ -29,13 +29,13 @@
'chapter' => true,
'colophon' => true,
'glossary' => array(
- /* DEFAULT */ false,
+ /* DEFAULT */ false,
'article' => true,
'book' => true,
'part' => true,
),
'index' => array(
- /* DEFAULT */ false,
+ /* DEFAULT */ false,
'article' => true,
'book' => true,
'part' => true,
@@ -182,19 +182,19 @@
}
- public function isChunk($tag) {
- if (isset($this->CHUNK_ME[$tag])) {
- $isChunk = $this->CHUNK_ME[$tag];
- if (is_array($isChunk)) {
- $isChunk = $this->notXPath($isChunk);
- }
- if (!is_bool($isChunk)) {
- return call_user_func(array($this, $isChunk),
$tag);
- }
+ public function isChunk($tag) {
+ if (isset($this->CHUNK_ME[$tag])) {
+ $isChunk = $this->CHUNK_ME[$tag];
+ if (is_array($isChunk)) {
+ $isChunk = $this->notXPath($isChunk);
+ }
+ if (!is_bool($isChunk)) {
+ return call_user_func(array($this, $isChunk), $tag);
+ }
return $isChunk;
- }
- return false;
- }
+ }
+ return false;
+ }
public function isSectionChunk($tag) {
if ($this->PREVIOUS_SIBLING == $tag && $this->checkSectionDepth()) {
return true;
http://cvs.php.net/viewvc.cgi/phd/themes/php/phpweb.php?r1=1.4&r2=1.5&diff_format=u
Index: phd/themes/php/phpweb.php
diff -u phd/themes/php/phpweb.php:1.4 phd/themes/php/phpweb.php:1.5
--- phd/themes/php/phpweb.php:1.4 Fri Aug 10 20:18:21 2007
+++ phd/themes/php/phpweb.php Tue Aug 14 12:04:12 2007
@@ -1,5 +1,5 @@
<?php
-/* $Id: phpweb.php,v 1.4 2007/08/10 20:18:21 bjori Exp $ */
+/* $Id: phpweb.php,v 1.5 2007/08/14 12:04:12 bjori Exp $ */
class phpweb extends phpdotnet implements PhDTheme {
protected $streams = array();
@@ -8,7 +8,7 @@
public function __construct($IDs, $filename, $ext = "php", $chunked =
true) {
parent::__construct($IDs, $filename, $ext, $chunked);
- if(!file_exists("php") || is_file("php")) mkdir("php") or die("Can't
create the cache directory");
+ if(!file_exists("php") || is_file("php")) mkdir("php") or die("Can't
create the cache directory");
}
public function writeChunk($id, $stream) {
rewind($stream);
