Improve failed open handling

diff --git a/Styles/quote.style b/Styles/quote.style
index 0763b08..c876865 100644 (file)
--- a/Styles/quote.style
+++ b/Styles/quote.style
@@ -30,7 +30,7 @@
     <ifont><font size=-1 color="#<box-fgcolor>">
     <?
       # FIXME: Was gibt fopen() zurück, wenn die Datei nicht geöffnet werden konnte?
-      if (is_file ("<get-var fortune>") && ($fortune = fopen ("<get-var fortune>", "r"))) {
+      if (is_file ("<get-var fortune>") && (($fortune = fopen ("<get-var fortune>", "r")) !== false)) {
        while (!feof ($fortune)) {
          $line = fgets ($fortune, 255);
          echo $line;
@@ -89,7 +89,7 @@
        bgcolor="#<box-bgcolor>">
     <font face="helvetica,arial" size=-1 color="#<box-fgcolor>">
 <?
-  if ($fortune = fopen ("index-fortune.html", "r")) {
+  if (($fortune = fopen ("index-fortune.html", "r")) !== false) {
     while (!feof ($fortune)) {
       $line = fgets ($fortune, 255);
       echo $line;
@@ -107,7 +107,7 @@
        bgcolor="#<box-bgcolor>">
     <font face="helvetica,arial" size=-1 color="#<box-fgcolor>">
 <?
-  if ($fortune = fopen ("index-fortune.html", "r")) {
+  if (($fortune = fopen ("index-fortune.html", "r")) !== false) {
     while (!feof ($fortune)) {
       $line = fgets ($fortune, 255);
       echo $line;
@@ -194,7 +194,7 @@
   } else {
     $fortune = popen ("<get-var source>", "r");
   }
-  if ($fortune) {
+  if ($fortune !== false) {
     $cookie = array ();
     while (!feof ($fortune)) {
       $line = fgets ($fortune, 255);

diff --git a/src/Debian/lists.wml b/src/Debian/lists.wml
index 431c94b..09d3236 100644 (file)
--- a/src/Debian/lists.wml
+++ b/src/Debian/lists.wml
@@ -7,7 +7,7 @@
 
 <?
   if (($s = stat ("mailing-lists.txt"))) {
-    if (($f = fopen ("mailing-lists.txt", "r"))) {
+    if (($f = fopen ("mailing-lists.txt", "r")) != false) {
       $lists = array ("debian-user-de","debian-events-de");
       while (!feof ($f)) {
         $line = fgets ($f, 255);

diff --git a/src/Infodrom/fortunes/fortunes.inc b/src/Infodrom/fortunes/fortunes.inc
index 884056f..073ee47 100644 (file)
--- a/src/Infodrom/fortunes/fortunes.inc
+++ b/src/Infodrom/fortunes/fortunes.inc
@@ -8,7 +8,7 @@
     else
       $fortunes = fopen ("$db", "r");
 
-    while (!feof ($fortunes) && $skip > 0) {
+    while ($fortunes !== false && !feof ($fortunes) && $skip > 0) {
       $line = fgets ($fortunes, 255);
       if ($line == "%\n") {
         $skip--;
@@ -58,7 +58,7 @@
     $fortunes = fopen ($file, "r");
 
     $count = 0;
-    while (!feof ($fortunes)) {
+    while ($fortunes !== false && !feof ($fortunes)) {
       $line = fgets ($fortunes, 255);
       if ($line == "%\n") {
        $count++;

diff --git a/src/Infodrom/fortunes/lookup.wml b/src/Infodrom/fortunes/lookup.wml
index cc81351..0201c3d 100644 (file)
--- a/src/Infodrom/fortunes/lookup.wml
+++ b/src/Infodrom/fortunes/lookup.wml
@@ -20,7 +20,7 @@
       chdir ("/org/infodrom.org/fortunes");
 
       $fortunes = popen ($cmd, "r");
-      if (!$fortunes) exit();
+      if ($fortunes === false) exit();
 
       while (!feof ($fortunes)) {
         $line = fgets ($fortunes, 255);

diff --git a/src/Infodrom/fortunes/news.wml b/src/Infodrom/fortunes/news.wml
index 8b379bc..c6105f2 100644 (file)
--- a/src/Infodrom/fortunes/news.wml
+++ b/src/Infodrom/fortunes/news.wml
@@ -66,7 +66,7 @@
     } else {
       $skipfirst = 0;
     }
-    while (!feof ($fortune)) {
+    while ($fortunes !== false && !feof ($fortune)) {
       $line = chop (fgets ($fortune, 255));
       if ($lineno >= $ignore) {
        if (!strcmp ($line, "%")) {

diff --git a/src/Linux/HOWTO/index.wml b/src/Linux/HOWTO/index.wml
index b1aa243..92194a5 100644 (file)
--- a/src/Linux/HOWTO/index.wml
+++ b/src/Linux/HOWTO/index.wml
@@ -19,7 +19,7 @@
 
   
   if (($s = stat ("index.txt"))) {
-    if (($f = fopen ("index.txt", "r"))) {
+    if (($f = fopen ("index.txt", "r")) !== false) {
       $howto = array ();
       while (!feof ($f)) {
        $line = fgets ($f, 255);

diff --git a/src/Mail-Archive/index.wml b/src/Mail-Archive/index.wml
index 136761c..24f339a 100644 (file)
--- a/src/Mail-Archive/index.wml
+++ b/src/Mail-Archive/index.wml
@@ -54,7 +54,7 @@
     $file = $dirs[$i] . "/" . "index.inc";
     if (is_file ($file)) {
       $f = fopen ($file, "r");
-      if ($f) {
+      if ($f !== false) {
         while (!feof ($f)) {
           $line = fgets ($f, 255);
          print ($line);

diff --git a/src/News/ticker/index.wml b/src/News/ticker/index.wml
index d23265d..8bf92d7 100644 (file)
--- a/src/News/ticker/index.wml
+++ b/src/News/ticker/index.wml
@@ -10,7 +10,7 @@
     $file = "ticker.inc";
     if (is_file ($file)) {
       $f = fopen ($file, "r");
-      if ($f) {
+      if ($f !== false) {
         while (!feof ($f)) {
           $line = fgets ($f, 255);
           print ($line);