[Linpha-cvs] SF.net SVN: linpha: [4867] trunk/linpha2

[<fan...@us...>]

Revision: 4867
          http://linpha.svn.sourceforge.net/linpha/?rev=4867&view=rev
Author:   fangehrn
Date:     2008-02-11 13:31:42 -0800 (Mon, 11 Feb 2008)

Log Message:
-----------
 * fixed some E_STRICT error messages, there are a lot of them...

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/lib/classes/adodb-errorhandler.inc.php
    trunk/linpha2/lib/classes/linpha.sql.class.php
    trunk/linpha2/lib/plugins/watermark/func.watermark.php
    trunk/linpha2/templates/default/themes/default/colorsettings.php
    trunk/linpha2/templates/misc/roundcorners.php

Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2008-02-11 19:21:34 UTC (rev 4866)
+++ trunk/linpha2/ChangeLog	2008-02-11 21:31:42 UTC (rev 4867)
@@ -2,6 +2,7 @@
 2008-02-11 flo
  * deleted "debug" files and added them to the ignore list
    -> we will not forget them on releases and they will not be on any snapshot
+ * fixed some E_STRICT error messages, there are a lot of them...
 
 2008-02-11 bzrudi
  * Removed all calls for ADODB_FETCH_NUM as they do no longer work.

Modified: trunk/linpha2/lib/classes/adodb-errorhandler.inc.php
===================================================================
--- trunk/linpha2/lib/classes/adodb-errorhandler.inc.php	2008-02-11 19:21:34 UTC (rev 4866)
+++ trunk/linpha2/lib/classes/adodb-errorhandler.inc.php	2008-02-11 21:31:42 UTC (rev 4867)
@@ -86,4 +86,4 @@
     echo $s.'<br />';
     linLog(LOG_TYPE_DB, LOG_ERR, 'adodb', $s);
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/linpha2/lib/classes/linpha.sql.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.sql.class.php	2008-02-11 19:21:34 UTC (rev 4866)
+++ trunk/linpha2/lib/classes/linpha.sql.class.php	2008-02-11 21:31:42 UTC (rev 4867)
@@ -57,8 +57,7 @@
         }
         else
         {
-            //error_reporting('E_ALL');
-            error_reporting(0);
+            error_reporting(E_ALL);   //  | E_STRICT  error_reporting is turned off by make_release.sh
             include_once(LINPHA_DIR.'/lib/classes/adodb-errorhandler.inc.php');
             
             /**

Modified: trunk/linpha2/lib/plugins/watermark/func.watermark.php
===================================================================
--- trunk/linpha2/lib/plugins/watermark/func.watermark.php	2008-02-11 19:21:34 UTC (rev 4866)
+++ trunk/linpha2/lib/plugins/watermark/func.watermark.php	2008-02-11 21:31:42 UTC (rev 4867)
@@ -26,7 +26,7 @@
 * @author  flo
 * @todo  adapt from linpha1
 */
-function needWatermark($imgid)
+static function needWatermark($imgid)
 {
 	if( $GLOBALS['linpha']->sql->config->value['plugins_active_wm']
 	 && $GLOBALS['linpha']->sql->config->value['plugins_wm_active']
@@ -41,7 +41,7 @@
 /**
  * returns array with all the configs and the default values, they are only defined here
  */
-function getWatermarkArray()
+static function getWatermarkArray()
 {
 	return array (
 		'wm_active' => "0",
@@ -67,7 +67,7 @@
 	);
 }
 
-function readWatermark()
+static function readWatermark()
 {
 	$arr_config = LinWatermark::getWatermarkArray();
 	while(list($name,$value) = each($arr_config) )
@@ -77,7 +77,7 @@
 	return $arr_read;
 }
 
-function updateWatermark()
+static function updateWatermark()
 {
 	$arr_config = LinWatermark::getWatermarkArray();
 	while(list($name,$value) = each($arr_config) )
@@ -89,7 +89,7 @@
 /**
  * restore watermark settings to initial settings or to examples
  */
-function restoreWatermark()
+static function restoreWatermark()
 {
 	global $wm_restore_to;
 
@@ -155,7 +155,7 @@
  * $resize: resize factor in percent
  * 
  */
-function wmArrResized($w,$h,$org_width,$org_height,$resize)
+static function wmArrResized($w,$h,$org_width,$org_height,$resize)
 {
 	$arr_resized['w'] = round($w * $resize/100);
 	$arr_resized['h'] = round($h * $resize/100);
@@ -321,7 +321,7 @@
 /**
  * not used anymore
  */
-function getHtmlColorFromRgb($r,$g,$b)
+static function getHtmlColorFromRgb($r,$g,$b)
 {
 	if(strlen(dechex($r))==1) {
 		$r = '0'.$r;
@@ -346,7 +346,7 @@
  * used to check if it is a valid html color
  * @uses  isHtmlColor()
  */
-function everyCharIsHex($string)
+static function everyCharIsHex($string)
 {
 	for($i=0;$i<strlen($string);$i++)
 	{
@@ -387,7 +387,7 @@
  * used to check if it is a valid html color
  * @uses  getRgbFromAll()
  */
-function isHtmlColor($string)
+static function isHtmlColor($string)
 {
 	switch(strlen($string))
 	{
@@ -412,7 +412,7 @@
  * it doesn't matter if the html color is '#00FF00' or '00FF00'
  * @uses  getRgbFromAll()
  */
-function getRgbFromHtml($string)
+static function getRgbFromHtml($string)
 {
 	switch(strlen($string))
 	{
@@ -438,7 +438,7 @@
  * 
  * @uses  watermark_gd()
  */
-function getRgbFromAll($string)
+static function getRgbFromAll($string)
 {
 	if( isset( LinWatermark::$Colors[$string]) )
 	{
@@ -459,7 +459,7 @@
  * 
  * used in linpha2 - admin - settings_layout
  */
-function getHtmlFromAll($string)
+static function getHtmlFromAll($string)
 {
 	if(LinWatermark::isHtmlColor($string))
 	{
@@ -493,7 +493,7 @@
  * pos_x, pos_y: additional adjust for the image
  * 
  */
-function calcAlign($align, $src_w, $src_h, $dst_w, $dst_h, $pos_x, $pos_y)
+static function calcAlign($align, $src_w, $src_h, $dst_w, $dst_h, $pos_x, $pos_y)
 {
 
 	switch($align)

Modified: trunk/linpha2/templates/default/themes/default/colorsettings.php
===================================================================
--- trunk/linpha2/templates/default/themes/default/colorsettings.php	2008-02-11 19:21:34 UTC (rev 4866)
+++ trunk/linpha2/templates/default/themes/default/colorsettings.php	2008-02-11 21:31:42 UTC (rev 4867)
@@ -5,7 +5,7 @@
  * force caching in browser
  * works in firefox and internet explorer
  */
-Header("Last-Modified: " . gmdate("D, d M Y H:i:s",mktime (0,0,0,1,1,2000)) . " GMT");  // Date in the past
+Header("Last-Modified: " . gmdate("D, d M Y H:i:s",gmmktime (0,0,0,1,1,2000)));  // Date in the past
 Header("Expires: Mon, 26 Jul 2100 05:00:00 GMT");    // In other words... never expire the image
 Header("Cache-Control: max-age=10000000, s-maxage=1000000, proxy-revalidate, must-revalidate");
 

Modified: trunk/linpha2/templates/misc/roundcorners.php
===================================================================
--- trunk/linpha2/templates/misc/roundcorners.php	2008-02-11 19:21:34 UTC (rev 4866)
+++ trunk/linpha2/templates/misc/roundcorners.php	2008-02-11 21:31:42 UTC (rev 4867)
@@ -74,7 +74,7 @@
  * force caching in browser
  * works in firefox and internet explorer
  */
-Header("Last-Modified: " . gmdate("D, d M Y H:i:s",mktime (0,0,0,1,1,2000)) . " GMT");  // Date in the past
+Header("Last-Modified: " . gmdate("D, d M Y H:i:s",gmmktime (0,0,0,1,1,2000)));  // Date in the past
 Header("Expires: Mon, 26 Jul 2100 05:00:00 GMT");    // In other words... never expire the image
 Header("Cache-Control: max-age=10000000, s-maxage=1000000, proxy-revalidate, must-revalidate");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.