some updates

diff --git a/include/functions_calendars.inc.php b/include/functions_calendars.inc.php
index 82460f007b36419f13b76114c89ca7bb548074f4..09603426258c8e9835cb67864f51f55498629c9a 100644 (file)
--- a/include/functions_calendars.inc.php
+++ b/include/functions_calendars.inc.php
@@ -2,38 +2,10 @@
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
-// Jalali UTF Calendar code by Omid Mottaghi
-function calendar_jalali_utf($format, $timestamp, $useOffset) {
-    
-    $g_d=date('j', $timestamp);
-    $g_m=date('n', $timestamp);
-    $g_y=date('Y', $timestamp);
-
+// Gregorian to Jalali Convertor, by farsiweb.info
+function g2j($g_y, $g_m, $g_d){
     $g_days_in_month = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
     $j_days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29);
-    $j_month_name = array('', 'فروردین', 'اردیبهشت', 'خرداد', 'تیر',
-            'مرداد', 'شهریور', 'مهر', 'آبان', 'آذر', 'دی', 'بهمن', 'اسفند');
-    $j_week_name = array('Saturday' => 'شنبه',
-                        'Sunday' => 'یک شنبه',
-                        'Monday' => 'دوشنبه',
-                        'Tuesday' => 'سه شنبه',
-                        'Wednesday' => 'چهارشنبه',
-                        'Thursday' => 'پنج شنبه',
-                        'Friday' => 'جمعه',
-                        'Sat' => 'ش',
-                        'Sun' => 'ی',
-                        'Mon' => 'د',
-                        'Tue' => 'س',
-                        'Wed' => 'چ',
-                        'Thu' => 'پ',
-                        'Fri' => 'ج');
-    $j_week_number = array('Sat' => '1',
-                           'Sun' => '2',
-                           'Mon' => '3',
-                           'Tue' => '4',
-                           'Wed' => '5',
-                           'Thu' => '6',
-                           'Fri' => '7');
     
     $gy = $g_y-1600;
     $gm = $g_m-1;
@@ -70,6 +42,42 @@ function calendar_jalali_utf($format, $timestamp, $useOffset) {
     $jm = $i+1;
     $jd = $j_day_no+1;
     
+    return array($jy, $jm, $jd);
+}
+
+// Jalali UTF Calendar code by Omid Mottaghi
+function calendar_jalali_utf($format, $timestamp) {
+    
+    $g_d=date('j', $timestamp);
+    $g_m=date('n', $timestamp);
+    $g_y=date('Y', $timestamp);
+
+    list($jy, $jm, $jd) = g2j($g_y, $g_m, $g_d);
+
+    $j_month_name = array('', 'فروردین', 'اردیبهشت', 'خرداد', 'تیر',
+            'مرداد', 'شهریور', 'مهر', 'آبان', 'آذر', 'دی', 'بهمن', 'اسفند');
+    $j_week_name = array('Saturday' => 'شنبه',
+                        'Sunday' => 'یک شنبه',
+                        'Monday' => 'دوشنبه',
+                        'Tuesday' => 'سه شنبه',
+                        'Wednesday' => 'چهارشنبه',
+                        'Thursday' => 'پنج شنبه',
+                        'Friday' => 'جمعه',
+                        'Sat' => 'ش',
+                        'Sun' => 'ی',
+                        'Mon' => 'د',
+                        'Tue' => 'س',
+                        'Wed' => 'چ',
+                        'Thu' => 'پ',
+                        'Fri' => 'ج');
+    $j_week_number = array('Sat' => '1',
+                           'Sun' => '2',
+                           'Mon' => '3',
+                           'Tue' => '4',
+                           'Wed' => '5',
+                           'Thu' => '6',
+                           'Fri' => '7');
+    
     // calculate string
     $percent_sign=0;
     $output_str='';