Tiki Wiki CMS Groupware

Revision: 20495
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20495&view=rev
Author:   chealer
Date:     2009-08-02 14:28:31 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
[FIX] avoid timezone_open error on TimezoneIsValidId("local")

Modified Paths:
--------------
    trunk/lib/tikidate-php5.php

Modified: trunk/lib/tikidate-php5.php
===================================================================
--- trunk/lib/tikidate-php5.php	2009-08-02 14:22:59 UTC (rev 20494)
+++ trunk/lib/tikidate-php5.php	2009-08-02 14:28:31 UTC (rev 20495)
@@ -163,7 +163,7 @@
 	}
 
 	static function TimezoneIsValidId($id) {
-		return empty($id) ? FALSE : timezone_open($id) !== FALSE ;
+		return in_array($id,timezone_abbreviations_list());
 	}
 
 }


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

Revision: 23006
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23006&view=rev
Author:   sept_7
Date:     2009-11-10 08:09:40 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
[FIX] fix pb with getDate in tikidate-php5.php, see tracker :
  http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=2851

Modified Paths:
--------------
    trunk/lib/tikidate-php5.php

Modified: trunk/lib/tikidate-php5.php
===================================================================
--- trunk/lib/tikidate-php5.php	2009-11-10 01:54:40 UTC (rev 23005)
+++ trunk/lib/tikidate-php5.php	2009-11-10 08:09:40 UTC (rev 23006)
@@ -140,6 +140,10 @@
 			$this->date = new DateTime($date);
 		}
 	}
+
+	function getDate($format = "%Y-%m-%d %T") {
+		return date($format);
+	}
 	
 	function setLocalTime($day, $month, $year, $hour, $minute, $second, $partsecond ) {
 		$this->date->setDate($year,$month,$day);


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

Stephan,

Could you commit this on branche ?


Changi.

sept_7@... a écrit :
> Revision: 23006
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23006&view=rev
> Author:   sept_7
> Date:     2009-11-10 08:09:40 +0000 (Tue, 10 Nov 2009)
>
> Log Message:
> -----------
> [FIX] fix pb with getDate in tikidate-php5.php, see tracker :
>   http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=2851
>
> Modified Paths:
> --------------
>     trunk/lib/tikidate-php5.php
>
> Modified: trunk/lib/tikidate-php5.php
> ===================================================================
> --- trunk/lib/tikidate-php5.php	2009-11-10 01:54:40 UTC (rev 23005)
> +++ trunk/lib/tikidate-php5.php	2009-11-10 08:09:40 UTC (rev 23006)
> @@ -140,6 +140,10 @@
>  			$this->date = new DateTime($date);
>  		}
>  	}
> +
> +	function getDate($format = "%Y-%m-%d %T") {
> +		return date($format);
> +	}
>  	
>  	function setLocalTime($day, $month, $year, $hour, $minute, $second, $partsecond ) {
>  		$this->date->setDate($year,$month,$day);
>
>
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>
> ------------------------------------------------------------------------------
> Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
> trial. Simplify your report design, integration and deployment - and focus on 
> what you do best, core application coding. Discover what's new with
> Crystal Reports now.  http://p.sf.net/sfu/bobj-july
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>

Le Tue, Nov 10, 2009 at 09:24:25AM +0100, "Jean-François B." écrivait :
> Stephan,
> 
> Could you commit this on branche ?

Better fix commited in trunk 23008 and branches/4.x 23009.

Thanx for your feedback.

A+
-- 
Stéphane Casset            LOGIDÉE sàrl       Se faire plaisir d'apprendre
1a, rue Pasteur        Tel : +33 388 23 69 77           casset@...
F-67540 OSTWALD        Fax : +33 388 23 69 77           http://logidee.com

Revision: 23627
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23627&view=rev
Author:   sept_7
Date:     2009-12-02 15:23:37 +0000 (Wed, 02 Dec 2009)

Log Message:
-----------
[FIX] COding style from CodeSniffer

Modified Paths:
--------------
    trunk/lib/tikidate-php5.php

Modified: trunk/lib/tikidate-php5.php
===================================================================
--- trunk/lib/tikidate-php5.php	2009-12-02 15:16:46 UTC (rev 23626)
+++ trunk/lib/tikidate-php5.php	2009-12-02 15:23:37 UTC (rev 23627)
@@ -184,7 +184,8 @@
 
 }
 
-class Date_Calc {
+class Date_Calc
+{
 
 	function daysInMonth($month,$year) {
 		return cal_days_in_month(CAL_GREGORIAN, $month, $year);


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

Revision: 24852
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24852&view=rev
Author:   jonnybradley
Date:     2010-02-04 19:38:20 +0000 (Thu, 04 Feb 2010)

Log Message:
-----------
[MOD] New function parseDateString() - usage to come...

Modified Paths:
--------------
    trunk/lib/tikidate-php5.php

Modified: trunk/lib/tikidate-php5.php
===================================================================
--- trunk/lib/tikidate-php5.php	2010-02-04 19:36:45 UTC (rev 24851)
+++ trunk/lib/tikidate-php5.php	2010-02-04 19:38:20 UTC (rev 24852)
@@ -181,6 +181,31 @@
 	static function TimezoneIsValidId($id) {
 		return array_key_exists( strtolower($id), timezone_abbreviations_list() );
 	}
+	
+	/**
+	 * Parse any (?) date string and return the Unix timestamp 
+	 * 
+	 * @param $inString
+	 * @return int
+	 */
+	static function parseDateString($inString) {
+		$timestamp = strtotime($inString);	// works on simple (US) date strings only
+		if (!$timestamp) {
+			include_once 'lib/core/lib/Zend/Date.php';
+			include_once 'lib/core/lib/Zend/Locale/Format.php';
+			try {
+				$dt = Zend_Locale_Format::getDate($inString);
+				$dt = new Zend_Date($dt);
+				$timestamp = $dt->getTimestamp();
+			} catch (Zend_Locale_Exception $e) {
+				require_once 'Zend/Date/Exception.php';
+				throw new Zend_Date_Exception($e->getMessage());
+			}
+		} else {
+			$timestamp = false;
+		}
+		return $timestamp;
+	}
 
 }
 


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

I put this only in tikidate-php5.php so far, not copied to tikidate-pear-date.php yet, as i was wondering if we can drop the PEAR one now?

The switch in tikidate.php tests for PHP version > 5.1.0 - what is the minimum version now for tiki 5?

Copying devels for a discussion...

jb

On 4 Feb 2010, at 19:38, jonnybradley@... wrote:

> Revision: 24852
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24852&view=rev
> Author:   jonnybradley
> Date:     2010-02-04 19:38:20 +0000 (Thu, 04 Feb 2010)
> 
> Log Message:
> -----------
> [MOD] New function parseDateString() - usage to come...
> 
> Modified Paths:
> --------------
>    trunk/lib/tikidate-php5.php
> 
> Modified: trunk/lib/tikidate-php5.php
> ===================================================================
> --- trunk/lib/tikidate-php5.php	2010-02-04 19:36:45 UTC (rev 24851)
> +++ trunk/lib/tikidate-php5.php	2010-02-04 19:38:20 UTC (rev 24852)
> @@ -181,6 +181,31 @@
> 	static function TimezoneIsValidId($id) {
> 		return array_key_exists( strtolower($id), timezone_abbreviations_list() );
> 	}
> +	
> +	/**
> +	 * Parse any (?) date string and return the Unix timestamp 
> +	 * 
> +	 * @param $inString
> +	 * @return int
> +	 */
> +	static function parseDateString($inString) {
> +		$timestamp = strtotime($inString);	// works on simple (US) date strings only
> +		if (!$timestamp) {
> +			include_once 'lib/core/lib/Zend/Date.php';
> +			include_once 'lib/core/lib/Zend/Locale/Format.php';
> +			try {
> +				$dt = Zend_Locale_Format::getDate($inString);
> +				$dt = new Zend_Date($dt);
> +				$timestamp = $dt->getTimestamp();
> +			} catch (Zend_Locale_Exception $e) {
> +				require_once 'Zend/Date/Exception.php';
> +				throw new Zend_Date_Exception($e->getMessage());
> +			}
> +		} else {
> +			$timestamp = false;
> +		}
> +		return $timestamp;
> +	}
> 
> }
> 
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> ------------------------------------------------------------------------------
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs

Revision: 31000
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31000&view=rev
Author:   chealer
Date:     2010-12-02 20:24:32 +0000 (Thu, 02 Dec 2010)

Log Message:
-----------
remove convertTZbyID() and clarify behavior of TimezoneIsValidId()

Modified Paths:
--------------
    trunk/lib/tikidate-php5.php

Modified: trunk/lib/tikidate-php5.php
===================================================================
--- trunk/lib/tikidate-php5.php	2010-12-02 20:09:23 UTC (rev 30999)
+++ trunk/lib/tikidate-php5.php	2010-12-02 20:24:32 UTC (rev 31000)
@@ -186,11 +186,6 @@
 		}
 		$this->date->setTimezone($dtz);
 	}
-
-	// TODO delete in Tiki 6 (if really unused)
-	function convertTZbyID($tz_id) {
-		$this->setTZbyID($tz_id);
-	}
 	
 	function convertMissingTimezone($tz_id) {
 		switch ($tz_id) {		// Convert timezones not in PHP 5
@@ -278,9 +273,10 @@
 		return $this->date->format("e");
 	}
 
+	// Checks that the string is either a timezone identifier or an abbreviation. display_timezone can be manually set to an identifier in preferences but will be an [uppercase] abbreviation if auto-detected by JavaScript.
 	static function TimezoneIsValidId($id) {
-		return array_key_exists( strtolower($id), timezone_abbreviations_list() ) ||
-			in_array($id, timezone_identifiers_list());
+		return array_key_exists( strtolower($id), DateTimeZone::listAbbreviations() ) ||
+			in_array($id, DateTimeZone::listAbbreviations());
 	}
 	
 }


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

Revision: 31303
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31303&view=rev
Author:   lphuberdeau
Date:     2010-12-08 20:32:03 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
[FIX]?\194?\160Undefined constant, unused parameter

Modified Paths:
--------------
    trunk/lib/tikidate-php5.php

Modified: trunk/lib/tikidate-php5.php
===================================================================
--- trunk/lib/tikidate-php5.php	2010-12-08 20:27:46 UTC (rev 31302)
+++ trunk/lib/tikidate-php5.php	2010-12-08 20:32:03 UTC (rev 31303)
@@ -162,9 +162,9 @@
 		return (int)$this->date->format("W");
 	}
 
-	function setDate($date, $format = DATE_FORMAT_ISO) {
+	function setDate($date, $format = 'Y-m-d H:i:s') {
 		if (is_numeric($date)) {
-			$this->date = new DateTime(date("Y-m-d H:i:s", $date));
+			$this->date = new DateTime(date($format, $date));
 		} else {
 			$this->date = new DateTime($date);
 		}


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

Revision: 31338
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31338&view=rev
Author:   chealer
Date:     2010-12-10 03:20:52 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
[FIX] timezones: TimezoneIsValidId claiming timezone identifiers are invalid
OOPS, r31000 regression

Modified Paths:
--------------
    trunk/lib/tikidate-php5.php

Modified: trunk/lib/tikidate-php5.php
===================================================================
--- trunk/lib/tikidate-php5.php	2010-12-10 03:17:43 UTC (rev 31337)
+++ trunk/lib/tikidate-php5.php	2010-12-10 03:20:52 UTC (rev 31338)
@@ -276,7 +276,7 @@
 	// Checks that the string is either a timezone identifier or an abbreviation. display_timezone can be manually set to an identifier in preferences but will be an [uppercase] abbreviation if auto-detected by JavaScript.
 	static function TimezoneIsValidId($id) {
 		return array_key_exists( strtolower($id), DateTimeZone::listAbbreviations() ) ||
-			in_array($id, DateTimeZone::listAbbreviations());
+			in_array($id, DateTimeZone::listIdentifiers());
 	}
 	
 }


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

Revision: 33400
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33400&view=rev
Author:   lphuberdeau
Date:     2011-03-15 21:00:37 +0000 (Tue, 15 Mar 2011)

Log Message:
-----------
[FIX] Make sure the datetime libraries are not called multiple time, saving a big chunk of execution time

Modified Paths:
--------------
    trunk/lib/tikidate-php5.php

Modified: trunk/lib/tikidate-php5.php
===================================================================
--- trunk/lib/tikidate-php5.php	2011-03-15 20:48:37 UTC (rev 33399)
+++ trunk/lib/tikidate-php5.php	2011-03-15 21:00:37 UTC (rev 33400)
@@ -275,10 +275,16 @@
 
 	// Checks that the string is either a timezone identifier or an abbreviation. display_timezone can be manually set to an identifier in preferences but will be an [uppercase] abbreviation if auto-detected by JavaScript.
 	static function TimezoneIsValidId($id) {
-		return array_key_exists( strtolower($id), DateTimeZone::listAbbreviations() ) ||
-			in_array($id, DateTimeZone::listIdentifiers());
+		static $abbrevs = null, $ids = null;
+
+		if (! $abbrevs) {
+			$abbrevs = DateTimeZone::listAbbreviations();
+			$ids = DateTimeZone::listIdentifiers();
+		}
+
+		return array_key_exists( strtolower($id), $abbrevs ) ||
+			in_array($id, $ids);
 	}
-	
 }
 
 class Date_Calc


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

Hi!

I have a 6.2 site that is getting performance issues related to this message:
/home/..../lib/tikidate-php5.php on line 282

Is this commit a suitable candidate for a backport to 6.x?

Thanks!

M ;-)


On Tue, Mar 15, 2011 at 5:00 PM,  <lphuberdeau@...> wrote:
> Revision: 33400
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33400&view=rev
> Author:   lphuberdeau
> Date:     2011-03-15 21:00:37 +0000 (Tue, 15 Mar 2011)
>
> Log Message:
> -----------
> [FIX] Make sure the datetime libraries are not called multiple time, saving a big chunk of execution time
>
> Modified Paths:
> --------------
>    trunk/lib/tikidate-php5.php
>
> Modified: trunk/lib/tikidate-php5.php
> ===================================================================
> --- trunk/lib/tikidate-php5.php 2011-03-15 20:48:37 UTC (rev 33399)
> +++ trunk/lib/tikidate-php5.php 2011-03-15 21:00:37 UTC (rev 33400)
> @@ -275,10 +275,16 @@
>
>        // Checks that the string is either a timezone identifier or an abbreviation. display_timezone can be manually set to an identifier in preferences but will be an [uppercase] abbreviation if auto-detected by JavaScript.
>        static function TimezoneIsValidId($id) {
> -               return array_key_exists( strtolower($id), DateTimeZone::listAbbreviations() ) ||
> -                       in_array($id, DateTimeZone::listIdentifiers());
> +               static $abbrevs = null, $ids = null;
> +
> +               if (! $abbrevs) {
> +                       $abbrevs = DateTimeZone::listAbbreviations();
> +                       $ids = DateTimeZone::listIdentifiers();
> +               }
> +
> +               return array_key_exists( strtolower($id), $abbrevs ) ||
> +                       in_array($id, $ids);
>        }
> -
>  }
>
>  class Date_Calc
>
>
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>
> ------------------------------------------------------------------------------
> Colocation vs. Managed Hosting
> A question and answer guide to determining the best fit
> for your organization - today and in the future.
> http://p.sf.net/sfu/internap-sfd2d
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>



-- 
Marc Laporte

http://MarcLaporte.com
http://Tiki.org/MarcLaporte
http://AvanTech.net

Already done in r33616 :)

jb


On 18 Apr 2011, at 02:45, Marc Laporte wrote:

> Hi!
> 
> I have a 6.2 site that is getting performance issues related to this message:
> /home/..../lib/tikidate-php5.php on line 282
> 
> Is this commit a suitable candidate for a backport to 6.x?
> 
> Thanks!
> 
> M ;-)
> 
> 
> On Tue, Mar 15, 2011 at 5:00 PM,  <lphuberdeau@...> wrote:
>> Revision: 33400
>>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33400&view=rev
>> Author:   lphuberdeau
>> Date:     2011-03-15 21:00:37 +0000 (Tue, 15 Mar 2011)
>> 
>> Log Message:
>> -----------
>> [FIX] Make sure the datetime libraries are not called multiple time, saving a big chunk of execution time
>> 
>> Modified Paths:
>> --------------
>>    trunk/lib/tikidate-php5.php
>> 
>> Modified: trunk/lib/tikidate-php5.php
>> ===================================================================
>> --- trunk/lib/tikidate-php5.php 2011-03-15 20:48:37 UTC (rev 33399)
>> +++ trunk/lib/tikidate-php5.php 2011-03-15 21:00:37 UTC (rev 33400)
>> @@ -275,10 +275,16 @@
>> 
>>        // Checks that the string is either a timezone identifier or an abbreviation. display_timezone can be manually set to an identifier in preferences but will be an [uppercase] abbreviation if auto-detected by JavaScript.
>>        static function TimezoneIsValidId($id) {
>> -               return array_key_exists( strtolower($id), DateTimeZone::listAbbreviations() ) ||
>> -                       in_array($id, DateTimeZone::listIdentifiers());
>> +               static $abbrevs = null, $ids = null;
>> +
>> +               if (! $abbrevs) {
>> +                       $abbrevs = DateTimeZone::listAbbreviations();
>> +                       $ids = DateTimeZone::listIdentifiers();
>> +               }
>> +
>> +               return array_key_exists( strtolower($id), $abbrevs ) ||
>> +                       in_array($id, $ids);
>>        }
>> -
>>  }
>> 
>>  class Date_Calc
>> 
>> 
>> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>> 
>> ------------------------------------------------------------------------------
>> Colocation vs. Managed Hosting
>> A question and answer guide to determining the best fit
>> for your organization - today and in the future.
>> http://p.sf.net/sfu/internap-sfd2d
>> _______________________________________________
>> Tikiwiki-cvs mailing list
>> Tikiwiki-cvs@...
>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>> 
> 
> 
> 
> -- 
> Marc Laporte
> 
> http://MarcLaporte.com
> http://Tiki.org/MarcLaporte
> http://AvanTech.net
> 
> ------------------------------------------------------------------------------
> Benefiting from Server Virtualization: Beyond Initial Workload 
> Consolidation -- Increasing the use of server virtualization is a top
> priority.Virtualization can reduce costs, simplify management, and improve 
> application availability and disaster protection. Learn more about boosting 
> the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>

Can the QT prioritize the review of all time/date related commits?  (There
is not just 33616)

There are many reports of blocked upgrades because of this issue. I think it
deserves a quick 6.4 with this even if we don't have time to treat all the
proposals.

http://tiki.org/tiki-view_forum_thread.php?topics_offset=1&forumId=6&comments_parentId=40789

Thanks!

M :-)

On 2011-04-18 6:01 AM, "Jonny Bradley" <jonny@...> wrote:


Already done in r33616 :)

jb



On 18 Apr 2011, at 02:45, Marc Laporte wrote:

> Hi!
>
> I have a 6.2 site that is getting perfor...
>
------------------------------------------------------------------------------
> Benefiting from Server Virtualization: Beyond Initial Workload
> Consolidation -- Increasing the use of server virtualization is a top
> priority.Virtualization can reduce costs, simplify management, and improve
> application availability and disaster protection. Learn more about
boosting
> the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev

> _______________________________________________
> Tikiwiki-cvs mailing list
> Tikiwiki-cvs@......
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev

_______________________________________________
Tikiwiki-cvs mailing list
Tikiwiki-cvs@......