fixes few php warnings

git-svn-id: https://phpfreechat.svn.sourceforge.net/svnroot/phpfreechat/trunk@1268 2772adf2-ac07-0410-9d30-e29d8120292e
Frumph · Jan 14, 2010 · bc12670 · bc12670
1 parent 06d6178
commit bc12670
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/demo/demo32_show_last_messages-chat.php b/demo/demo32_show_last_messages-chat.php
@@ -2,7 +2,7 @@
 
 require_once dirname(__FILE__)."/../src/phpfreechat.class.php";
 require_once dirname(__FILE__)."/demo32_show_last_messages-config.php";
-$chat = new phpFreeChat($pfc_config);
+$chat = new phpFreeChat($params);
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

diff --git a/demo/demo32_show_last_messages-config.php b/demo/demo32_show_last_messages-config.php
@@ -1,10 +1,10 @@
 <?php
 
 require_once dirname(__FILE__)."/../src/phpfreechat.class.php";
+$params = array();
 $params["title"]    = "Show last posted messages channel";
 $params["serverid"] = md5($params["title"]); // calculate a unique id for this chat
 $params["max_msg"]  = 20;
 $params["channels"] = array("channel1");
-$pfc_config =& pfcGlobalConfig::Instance( $params );
 
 ?>
diff --git a/demo/demo34_add_a_link_on_nicknames.php b/demo/demo34_add_a_link_on_nicknames.php
@@ -33,7 +33,7 @@
 ?>
 
 <?php
-  $filename = dirname(__FILE__)."/demo34_add_a_link_on_nicknames/mytheme/customize.js";
+  $filename = dirname(__FILE__)."/demo34_add_a_link_on_nicknames/mytheme/customize.js.php";
   echo "<p><code>".$filename."</code></p>";
   echo "<pre style=\"margin: 0 50px 0 50px; padding: 10px; background-color: #DDD;\">";
   $content = file_get_contents($filename);

diff --git a/demo/demo43_change_the_nicknames_colors.php b/demo/demo43_change_the_nicknames_colors.php
@@ -32,14 +32,5 @@
   echo "</pre>";
 ?>
 
-<?php
-  $filename = dirname(__FILE__)."/demo43_change_the_nicknames_colors/mytheme/templates/pfcclient-custo.js.tpl.php";
-  echo "<p><code>".$filename."</code></p>";
-  echo "<pre style=\"margin: 0 50px 0 50px; padding: 10px; background-color: #DDD;\">";
-  $content = file_get_contents($filename);
-  highlight_string($content);
-  echo "</pre>";
-?>
-
   </body>
 </html>
diff --git a/demo/demo5_customized_style.php b/demo/demo5_customized_style.php
@@ -41,7 +41,7 @@
 ?>
 
 <?php
-  $filename = dirname(__FILE__)."/demo5_customized_style_data/mytheme/templates/style.css.tpl.php";
+  $filename = dirname(__FILE__)."/demo5_customized_style_data/mytheme/style.css.php";
   echo "<p><code>".$filename."</code></p>";
   echo "<pre style=\"margin: 0 50px 0 50px; padding: 10px; background-color: #DDD;\">";
   $content = file_get_contents($filename);

diff --git a/src/containers/file.class.php b/src/containers/file.class.php
@@ -2,7 +2,7 @@
 /**
  * file.class.php
  *
- * Copyright © 2006 Stephane Gully <[email protected]>
+ * Copyright � 2006 Stephane Gully <[email protected]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -110,7 +110,7 @@ function setMeta($group, $subgroup, $leaf, $leafvalue = NULL)
     $leafexists = file_exists($leaffilename);
     if ($leafvalue == NULL)
     {
-      unlink($leaffilename);
+      @unlink($leaffilename);
       touch($leaffilename);
     }
     else

diff --git a/src/pfcglobalconfig.class.php b/src/pfcglobalconfig.class.php
@@ -962,15 +962,15 @@ function init()
 
     if (in_array('log',$this->proxies)) {
       // test the LOCK_EX feature because the log proxy needs to write in a file
-      $filename = $c->data_private_path.'/filemtime2.test';
+      $filename = $this->data_private_path.'/filemtime2.test';
       if (is_writable(dirname($filename)))
       {
-	$data1 = time();
-	file_put_contents($filename, $data1, LOCK_EX);
-	$data2 = file_get_contents($filename);
-	if ($data1 != $data2) {
-          unset($this->proxies[array_search('log',$this->proxies)]);
-	}
+        $data1 = time();
+        file_put_contents($filename, $data1, LOCK_EX);
+        $data2 = file_get_contents($filename);
+        if ($data1 != $data2) {
+              unset($this->proxies[array_search('log',$this->proxies)]);
+        }
       }
     }