From 85a86ce698d84d6e71a4d7a3365f2bd103d491de Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 9 Apr 2011 12:44:54 +0000 Subject: [PATCH] * Calendar/API: fixed not working dateformat d-M-Y with French language (Juin=Jun, Juillet=Jui) --- phpgwapi/inc/class.jscalendar.inc.php | 286 +++++++++++++++++++++ phpgwapi/inc/jscalendar-setup.php | 350 ++++++++++++++++++++++++++ 2 files changed, 636 insertions(+) create mode 100644 phpgwapi/inc/class.jscalendar.inc.php create mode 100644 phpgwapi/inc/jscalendar-setup.php diff --git a/phpgwapi/inc/class.jscalendar.inc.php b/phpgwapi/inc/class.jscalendar.inc.php new file mode 100644 index 0000000000..cd63deed1d --- /dev/null +++ b/phpgwapi/inc/class.jscalendar.inc.php @@ -0,0 +1,286 @@ + + * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License + * @version $Id$ + * @package api + * @subpackage html + */ + +/** + * Wrapper for the jsCalendar + * + * The constructor loads the necessary javascript-files. + */ +class jscalendar +{ + /** + * url to the jscalendar files + * + * @var string + */ + var $jscalendar_url; + /** + * dateformat from the user-prefs + * + * @var string + */ + var $dateformat; + + /** + * Constructor + * + * @param boolean $do_header=true if true, necessary javascript and css gets loaded, only needed for input + * @param string $path='jscalendar' + * @return jscalendar + */ + function __construct($do_header=True,$path='jscalendar') + { + $this->jscalendar_url = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/'.$path; + $this->dateformat = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']; + + $args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],array('lang'=>1,'dateformat'=>1)); + if (isset($GLOBALS['egw_info']['flags']['currentapp'])) + { + $args['app'] = $GLOBALS['egw_info']['flags']['currentapp']; + } + else + { + $args['app'] = 'home'; // home can be granted to anyone. + } + if ($do_header && (strpos($GLOBALS['egw_info']['flags']['java_script'],'jscalendar')===false)) + { + $GLOBALS['egw_info']['flags']['java_script'] .= $this->get_javascript(); + } + } + + /** + * return javascript needed for jscalendar + * + * Only needed if jscalendar runs outside of egw_framework, eg. in sitemgr + * + * @return string + */ + function get_javascript() + { + $args = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],array('lang'=>1,'dateformat'=>1)); + return +' + + +'; + } + + /** + * Creates an inputfield for the jscalendar (returns the necessary html and js) + * + * @param string $name name and id of the input-field (it also names the id of the img $name.'-toggle') + * @param int/string $date date as string or unix timestamp (in server timezone) + * @param int $year=0 if $date is not used + * @param int $month=0 if $date is not used + * @param int $day=0 if $date is not used + * @param string $helpmsg='' a helpmessage for the statusline of the browser + * @param string $options='' any other options to the inputfield + * @param boolean $jsreturn=false + * @param boolean $useicon=true true: use icon to trigger popup, false: click into input triggers popup + * the input is made readonly via javascript to NOT trigger mobile devices to display a keyboard! + * @return string html + */ + function input($name,$date,$year=0,$month=0,$day=0,$helpmsg='',$options='',$jsreturn=false,$useicon=true) + { + //echo "

jscalendar::input(name='$name', date='$date'='".date('Y-m-d',$date)."', year='$year', month='$month', day='$day')

\n"; + + if ($date && (is_int($date) || is_numeric($date))) + { + $year = (int)adodb_date('Y',$date); + $month = (int)adodb_date('n',$date); + $day = (int)adodb_date('d',$date); + } + if ($year && $month && $day) + { + $date = adodb_date($this->dateformat,$ts = adodb_mktime(12,0,0,$month,$day,$year)); + if (strpos($this->dateformat,'M') !== false) + { + static $substr; + if (is_null($substr)) $substr = function_exists('mb_substr') ? 'mb_substr' : 'substr'; + static $chars_shortcut; + if (is_null($chars_shortcut)) $chars_shortcut = (int)lang('3 number of chars for month-shortcut'); // < 0 to take the chars from the end + + $markuntranslated = translation::$markuntranslated; + translation::$markuntranslated = true; // otherwise we can not detect NOT translated phrases! + $short = lang($m = adodb_date('M',$ts)); // check if we have a translation of the short-cut + if ($substr($short,-1) == '*') // if not generate one by truncating the translation of the long name + { + $short = $chars_shortcut > 0 ? $substr(lang(adodb_date('F',$ts)),0,$chars_shortcut) : + $substr(lang(adodb_date('F',$ts)),$chars_shortcut); + } + $date = str_replace(adodb_date('M',$ts),$short,$date); + translation::$markuntranslated = $markuntranslated; + } + } + if ($helpmsg !== '') + { + $options .= " onFocus=\"self.status='".addslashes($helpmsg)."'; return true;\"" . + " onBlur=\"self.status=''; return true;\""; + } + + if ($jsreturn) + { + $return_array = array( + 'html' => ''. + ($useicon ? '' : ''), + 'js' => 'Calendar.setup({inputField : "'.$name.'"'.($useicon ? ',button: "'.$name.'-trigger"' : '').' });' + ); + + return $return_array; + } + return +' + +'; + } + + /** + * Flat jscalendar with tooltips and url's for days, weeks and month + * + * @param string $url url to call if user clicks on a date (&date=YYYYmmdd is appended automatically) + * @param string/int $date=null format YYYYmmdd or timestamp + * @param string $weekUrl='' + * @param string $weekTTip='' + * @param string $monthUrl='' + * @param string $monthTTip='' + * @param string $id='calendar-container' + * @return string html + */ + function flat($url,$date=null,$weekUrl='',$weekTTip='',$monthUrl='',$monthTTip='',$id='calendar-container') + { + $javascript = $this->get_javascript(); + if ($date) // string if format YYYYmmdd or timestamp + { + $date = is_int($date) ? adodb_date('m/d/Y',$date) : + substr($date,4,2).'/'.substr($date,6,2).'/'.substr($date,0,4); + } + return ' +
+'.$javascript.' +'; + } + + /** + * Converts the date-string back to an array with year, month, day and a timestamp + * + * @param string $datestr content of the inputfield generated by jscalendar::input() + * @param boolean/string $raw='raw' key of the timestamp-field in the returned array or False of no timestamp + * @param string $day='day' keys for the array, eg. to set mday instead of day + * @param string $month='month' keys for the array + * @param string $year='year' keys for the array + * @return array/boolean array with the specified keys and values or false if $datestr == '' + */ + function input2date($datestr,$raw='raw',$day='day',$month='month',$year='year') + { + //echo "

jscalendar::input2date('$datestr') ".print_r($fields,True)."

\n"; + if ($datestr === '') + { + return False; + } + $markuntranslated = translation::$markuntranslated; + translation::$markuntranslated = true; // otherwise we can not detect NOT translated phrases! + $fields = preg_split('/[.\\/-]/',$datestr); + foreach(preg_split('/[.\\/-]/',$this->dateformat) as $n => $field) + { + if ($field == 'M') + { + if (!is_numeric($fields[$n])) + { + $partcial_match = 0; + for($i = 1; $i <= 12; $i++) + { + $long_name = lang(adodb_date('F',mktime(12,0,0,$i,1,2000))); + $short_name = lang(adodb_date('M',mktime(12,0,0,$i,1,2000))); // do we have a translation of the short-cut + if (substr($short_name,-1) == '*') // if not generate one by truncating the translation of the long name + { + $short_name = substr($long_name,0,(int) lang('3 number of chars for month-shortcut')); + } + //echo "
checking '".$fields[$n]."' against '$long_name' or '$short_name'"; + if ($fields[$n] == $long_name || $fields[$n] == $short_name) + { + //echo " ==> OK
"; + $fields[$n] = $i; + break; + } + if (@strstr($long_name,$fields[$n]) == $long_name) // partcial match => multibyte saver + { + $partcial_match = $i; + } + } + if ($i > 12 && $partcial_match) // nothing found, but a partcial match + { + $fields[$n] = $partcial_match; + } + } + $field = 'm'; + } + $date[$field] = (int)$fields[$n]; + } + translation::$markuntranslated = $markuntranslated; + + $ret = array( + $year => $date['Y'], + $month => $date['m'], + $day => $date['d'] + ); + if ($raw) + { + $ret[$raw] = adodb_mktime(12,0,0,$date['m'],$date['d'],$date['Y']); + } + //echo "

jscalendar::input2date('$datestr','$raw',$day','$month','$year') = "; print_r($ret); echo "

\n"; + + return $ret; + } +} diff --git a/phpgwapi/inc/jscalendar-setup.php b/phpgwapi/inc/jscalendar-setup.php new file mode 100644 index 0000000000..60e8e953e3 --- /dev/null +++ b/phpgwapi/inc/jscalendar-setup.php @@ -0,0 +1,350 @@ + + * @package api + * @subpackage tools + * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License + * @version $Id$ + */ + +$GLOBALS['egw_info'] = array( + 'flags' => array( + 'currentapp' => 'home', + 'noheader' => True, + 'nonavbar' => True, + 'noappheader' => True, + 'noappfooter' => True, + 'nofooter' => True, + 'nocachecontrol' => True // allow cacheing + ) +); +try { + include('../../header.inc.php'); +} +catch (egw_exception_no_permission_app $e) { + // ignore exception, if home is not allowed, eg. for sitemgr +} + +header('Content-type: text/javascript; charset='.translation::charset()); +translation::add_app('jscalendar'); + +$dateformat = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']; +if (empty($dateformat)) $dateformat = 'Y-m-d'; +$jsDateFormat = str_replace(array('Y','d','m','M'),array('%Y','%d','%m','%b'),$dateformat); +$dayFirst = strpos($dateformat,'d') < strpos($dateformat,'m'); +$jsLongDateFormat = '%a, '.($dayFirst ? '%e' : '%b').($dateformat[1] == '.' ? '. ' : ' ').($dayFirst ? '%b' : '%e'); + +/* Copyright Mihai Bazon, 2002, 2003 | http://dynarch.com/mishoo/ + * --------------------------------------------------------------------------- + * + * The DHTML Calendar + * + * Details and latest version at: + * http://dynarch.com/mishoo/calendar.epl + * + * This script is distributed under the GNU Lesser General Public License. + * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html + * + * This file defines helper functions for setting up the calendar. They are + * intended to help non-programmers get a working calendar on their site + * quickly. This script should not be seen as part of the calendar. It just + * shows you what one can do with the calendar, while in the same time + * providing a quick and simple method for setting it up. If you need + * exhaustive customization of the calendar creation process feel free to + * modify this code to suit your needs (this is recommended and much better + * than modifying calendar.js itself). + */ + +/** + * This function "patches" an input field (or other element) to use a calendar + * widget for date selection. + * + * The "params" is a single object that can have the following properties: + * + * prop. name | description + * ------------------------------------------------------------------------------------------------- + * inputField | the ID of an input field to store the date + * displayArea | the ID of a DIV or other element to show the date + * button | ID of a button or other element that will trigger the calendar + * eventName | event that will trigger the calendar, without the "on" prefix (default: "click") + * ifFormat | date format that will be stored in the input field + * daFormat | the date format that will be used to display the date in displayArea + * titleFormat | the format to show the month in the title, default '%B, %Y' + * singleClick | (true/false) wether the calendar is in single click mode or not (default: true) + * firstDay | numeric: 0 to 6. "0" means display Sunday first, "1" means display Monday first, etc. + * disableFirstDowChange| (true/false) disables manual change of first day of week + * align | alignment (default: "Br"); if you don't know what's this see the calendar documentation + * range | array with 2 elements. Default: [1900, 2999] -- the range of years available + * weekNumbers | (true/false) if it's true (default) the calendar will display week numbers + * flat | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID + * flatCallback | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar) + * flatWeekCallback| gets called if a weeknumber get clicked, params are the cal-object and a date-object representing the start of the week + * flatWeekTTip | Tooltip for the weeknumber (shown only if flatWeekCallback is set) + * flatMonthCallback| gets called if a month (title) get clicked, params are the cal-object and a date-object representing the start of the month + * flatMonthTTip | Tooltip for the month (shown only if flatMonthCallback is set) + * disableFunc | function that receives a JS Date object and should return true if that date has to be disabled in the calendar + * onSelect | function that gets called when a date is selected. You don't _have_ to supply this (the default is generally okay) + * onClose | function that gets called when the calendar is closed. [default] + * onUpdate | function that gets called after the date is updated in the input field. Receives a reference to the calendar. + * date | the date that the calendar will be initially displayed to + * showsTime | default: false; if true the calendar will include a time selector + * timeFormat | the time format; can be "12" or "24", default is "12" + * electric | if true (default) then given fields/date areas are updated for each move; otherwise they're updated only on close + * step | configures the step of the years in drop-down boxes; default: 2 + * position | configures the calendar absolute position; default: null + * cache | if "true" (but default: "false") it will reuse the same calendar object, where possible + * showOthers | if "true" (but default: "false") it will show days from other months too + * + * None of them is required, they all have default values. However, if you + * pass none of "inputField", "displayArea" or "button" you'll get a warning + * saying "nothing to setup". + */ +?> +//
+Calendar.setup = function (params) {
+	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
+
+	param_default("inputField",     null);
+	param_default("displayArea",    null);
+	param_default("button",         null);
+	param_default("eventName",      "click");
+	param_default("ifFormat",      "");
+	param_default("daFormat",      "");
+	param_default("titleFormat",    "%B %Y");
+	param_default("singleClick",    true);
+	param_default("disableFunc",    null);
+	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
+	param_default("disableFirstDowChange", true);
+	param_default("firstDay",       0,'Monday'=>1,'Tuesday'=>2,'Wednesday'=>3,'Thursday'=>4,'Friday'=>5,'Saturday'=>6);
+	echo (int) @$day2int[$GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts']]; ?>); // 
+	param_default("align",          "Bl");
+	param_default("range",          [1900, 2999]);
+	param_default("weekNumbers",    true);
+	param_default("flat",           null);
+	param_default("flatCallback",   null);
+	param_default("flatWeekCallback",null);
+	param_default("flatWeekTTip",   null);
+	param_default("flatmonthCallback",null);
+	param_default("flatmonthTTip",  null);
+	param_default("onSelect",       null);
+	param_default("onClose",        null);
+	param_default("onUpdate",       null);
+	param_default("date",           null);
+	param_default("showsTime",      false);
+	param_default("timeFormat",     "");
+	param_default("electric",       true);
+	param_default("step",           2);
+	param_default("position",       null);
+	param_default("cache",          true);
+	param_default("showOthers",     true); 
+
+	var tmp = ["inputField", "displayArea", "button"];
+	for (var i in tmp) {
+		if (typeof params[tmp[i]] == "string") {
+			params[tmp[i]] = document.getElementById(params[tmp[i]]);
+		}
+	}
+	if (!(params.flat || params.inputField || params.displayArea || params.button)) {
+		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
+		return false;
+	}
+
+	function onSelect(cal) {
+		var p = cal.params;
+		var update = (cal.dateClicked || p.electric);
+		if (update && p.flat) {
+			if (typeof p.flatCallback == "function")
+				p.flatCallback(cal);
+			else
+				alert("No flatCallback given -- doing nothing.");
+			return false;
+		}
+		if (update && p.inputField) {
+			p.inputField.value = cal.date.print(p.ifFormat);
+			if (typeof p.inputField.onchange == "function")
+				p.inputField.onchange();
+		}
+		if (update && p.displayArea)
+			p.displayArea.innerHTML = cal.date.print(p.daFormat);
+		if (update && p.singleClick && cal.dateClicked)
+			cal.callCloseHandler();
+		if (update && typeof p.onUpdate == "function")
+			p.onUpdate(cal);
+	};
+
+	if (params.flat != null) {
+		if (typeof params.flat == "string")
+			params.flat = document.getElementById(params.flat);
+		if (!params.flat) {
+			alert("Calendar.setup:\n  Flat specified but can't find parent.");
+			return false;
+		}
+		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
+		cal.showsTime = params.showsTime;
+		cal.time24 = (params.timeFormat == "24");
+		cal.params = params;
+		cal.weekNumbers = params.weekNumbers;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.showsOtherMonths = params.showOthers;
+		cal.create(params.flat);
+		cal.show();
+		return false;
+	}
+
+	var triggerEl = params.button || params.displayArea || params.inputField;
+	triggerEl["on" + params.eventName] = function() {
+		var dateEl = params.inputField || params.displayArea;
+		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
+		var mustCreate = false;
+		var cal = window.calendar;
+		if (!(cal && params.cache)) {
+			window.calendar = cal = new Calendar(params.firstDay,
+							     params.date,
+							     params.onSelect || onSelect,
+							     params.onClose || function(cal) { cal.hide(); });
+			cal.showsTime = params.showsTime;
+			cal.time24 = (params.timeFormat == "24");
+			cal.weekNumbers = params.weekNumbers;
+			mustCreate = true;
+		} else {
+			if (params.date)
+				cal.setDate(params.date);
+			cal.hide();
+		}
+		cal.showsOtherMonths = params.showOthers;
+		cal.yearStep = params.step;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.params = params;
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.setDateFormat(dateFmt);
+		if (mustCreate)
+			cal.create();
+		cal.parseDate(dateEl.value || dateEl.innerHTML);
+		cal.refresh();
+		if (!params.position)
+			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
+		else
+			cal.showAt(params.position[0], params.position[1]);
+		return false;
+	};
+};
+
+// eGroupWare translations, are read from the database
+
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, 
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+Calendar._DN = new Array
+( $n)
+{
+	echo "\n \"".lang($name).'"'.($n < 6 ? ',' : '');
+}
+?>);
+
+Calendar._SDN = new Array
+( $n)
+{
+	$short = lang($m = substr($name,0,3));	// test if our lang-file have a translation for the english short with 3 chars
+	if ($substr($short,-1) == '*')			// else create one by truncating the full translation to x chars
+	{
+		$short = $chars_shortcut > 0 ? $substr(lang($name),0,$chars_shortcut) : $substr(lang($name),$chars_shortcut);
+	}
+	echo "\n \"".$short.'"'.($n < 6 ? ',' : '');
+}
+?>);
+Calendar._SDN_len = ;
+
+Calendar._MN = new Array
+( $name)
+{
+	echo "\n \"".lang($name).'"'.($n < 11 ? ',' : '');
+}
+?>);
+
+Calendar._SMN = new Array
+( $name)
+{
+	$short = lang($m = substr($name,0,3));	// test if our lang-file have a translation for the english short with 3 chars
+	if ($substr($short,-1) == '*')			// else create one by truncating the full translation to x chars
+	{
+        $short = $chars_shortcut > 0 ? $substr(lang($name),0,$chars_shortcut) : $substr(lang($name),$chars_shortcut);
+	}
+	echo "\n \"".$short.'"'.($n < 11 ? ',' : '');
+}
+translation::$markuntranslated = $markuntranslated;
+?>);
+Calendar._SMN_len = ;
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
+"For latest version visit: http://dynarch.com/mishoo/calendar.epl\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"\n" +
+"\n" +
+"\n" +
+"";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"\n" +
+"\n" +
+"\n" +
+"";
+
+Calendar._TT["TOGGLE"] = "";
+Calendar._TT["PREV_YEAR"] = "";
+Calendar._TT["PREV_MONTH"] = "";
+Calendar._TT["GO_TODAY"] = "";
+Calendar._TT["NEXT_MONTH"] = "";
+Calendar._TT["NEXT_YEAR"] = "";
+Calendar._TT["SEL_DATE"] = "";
+Calendar._TT["DRAG_TO_MOVE"] = "";
+Calendar._TT["PART_TODAY"] = " ()";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "";
+Calendar._TT["TODAY"] = "";
+Calendar._TT["TIME_PART"] = "";
+
+// date formats
+//Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["DEF_DATE_FORMAT"] = "";
+//Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+Calendar._TT["TT_DATE_FORMAT"] = "";
+
+Calendar._TT["WK"] = "";
+Calendar._TT["TIME"] = ":";