[pLog-svn] r2385 - in plugins/trunk: blogtimes plogeshi/class/plogeshi plogpoll/class/dao

[pwestbro at devel.plogworld.net]

Author: pwestbro
Date: 2005-08-01 23:08:25 +0000 (Mon, 01 Aug 2005)
New Revision: 2385

Modified:
   plugins/trunk/blogtimes/pluginblogtimes.class.php
   plugins/trunk/plogeshi/class/plogeshi/plogeshi.class.php
   plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php
Log:
Fixed bug http://bugs.plogworld.net/view.php?id=668 for the plugins

Fix warnings and notices with php5


Modified: plugins/trunk/blogtimes/pluginblogtimes.class.php
===================================================================
--- plugins/trunk/blogtimes/pluginblogtimes.class.php	2005-08-01 22:31:04 UTC (rev 2384)
+++ plugins/trunk/blogtimes/pluginblogtimes.class.php	2005-08-01 23:08:25 UTC (rev 2385)
@@ -129,8 +129,8 @@
             $height = $this->height;
             $title = $this->title;
             $lastDays = $this->lastDays;
-            $fontHeight = ImageFontHeight(2);
-            $fontWidth  = ImageFontWidth(2);
+            $fontHeight = imagefontheight(2);
+            $fontWidth  = imagefontwidth(2);
             $horzPadding = 5;
             $vertPadding = 5;
             $footerText = "Last $lastDays days";

Modified: plugins/trunk/plogeshi/class/plogeshi/plogeshi.class.php
===================================================================
--- plugins/trunk/plogeshi/class/plogeshi/plogeshi.class.php	2005-08-01 22:31:04 UTC (rev 2384)
+++ plugins/trunk/plogeshi/class/plogeshi/plogeshi.class.php	2005-08-01 23:08:25 UTC (rev 2385)
@@ -67,6 +67,11 @@
 		function preparse($text,&$table,&$hltable){
 			$lines = split("\n",$text);
 			
+			// initialize variabled
+			$noparse = '';
+			$po = '';
+			$pc = '';
+			
 			//prepare a tokens for paragraphs
 			// comento este texto porque me agrega un parrafo en la noticia <p> {noticia} </p>
 			/*
@@ -81,7 +86,7 @@
 				$line = $lines[$l];
 				
 				//look for end of multiline noparse areas
-				if($noparse){
+				if(strlen($noparse) > 0){
 					if(preg_match("#^.*?$noparse#",$line)){
 						$noparse = '';
 						$line = preg_replace("#^.*?$noparse#",$line,1);
@@ -90,7 +95,7 @@
 					}
 				}
 				
-				if(!$noparse){
+				if(strlen($noparse) == 0){
 					//skip indented lines
 					if(preg_match('#^(  |\t)#',$line)) continue;
 					//remove norparse areas which open and close on the same line
@@ -189,6 +194,7 @@
 		}
 		
 		function preformat($text,$type,$option=''){
+			global $conf;
 			//unescape
 			$text = str_replace('\\"','"',$text);
 			

Modified: plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php
===================================================================
--- plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php	2005-08-01 22:31:04 UTC (rev 2384)
+++ plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php	2005-08-01 23:08:25 UTC (rev 2385)
@@ -111,7 +111,7 @@
         "'". Db::qstr(time()). "')";
       $this->Execute($q);
       
-      return $this->updatePoll(&$poll);
+      return $this->updatePoll($poll);
     }
     else
     {