holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"- fixed typo phpgwpai (does not matter, as phpgwapi is searched anyway, if given app is not found)

Browse Source 
- php5 __construct()
- using static common::find_image()
- removed function available from php5.1 on, as that's the requirement anyway"
This commit is contained in:
Ralf Becker 2009-07-24 10:38:47 +00:00
parent 841aef5769
commit 33b8cd82aa
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
phpgwapi/inc/class.jscalendar.inc.php
View File

@ -5,6 +5,8 @@
* @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package api
* @subpackage html
* @version $Id$
*/
@ -12,10 +14,6 @@
* Wrapper for the jsCalendar
*
* The constructor loads the necessary javascript-files.
*
* @package api
* @subpackage html
* @access public
*/
class jscalendar
{
@ -39,7 +37,7 @@ class jscalendar
* @param string $path='jscalendar'
* @return jscalendar
*/
function jscalendar($do_header=True,$path='jscalendar',$scriptreturn=false)
function __construct($do_header=True,$path='jscalendar',$scriptreturn=false)
{
$this->jscalendar_url = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/'.$path;
$this->dateformat = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
@ -108,7 +106,7 @@ class jscalendar
if ($jsreturn)
{
$return_array = array(
'html' => '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/><img id="'.$name.'-trigger" src="'.$GLOBALS['egw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>',
'html' => '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/><img id="'.$name.'-trigger" src="'.common::find_image('phpgwapi','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>',
'js' => 'Calendar.setup({inputField : "'.$name.'",button: "'.$name.'-trigger" });'
);
@ -117,7 +115,7 @@ class jscalendar
return
'<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/>
<script type="text/javascript">
document.writeln(\'<img id="'.$name.'-trigger" src="'.$GLOBALS['egw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\');
document.writeln(\'<img id="'.$name.'-trigger" src="'.common::find_image('phpgwapi','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\');
Calendar.setup(
{
inputField : "'.$name.'",
@ -255,20 +253,3 @@ function monthClicked(calendar,monthstart) {
return $ret;
}
}
if (!function_exists('array_intersect_key')) // php5.1 function
{
function array_intersect_key($array1,$array2)
{
$intersection = $keys = array();
foreach(func_get_args() as $arr)
{
$keys[] = array_keys((array)$arr);
}
foreach(call_user_func_array('array_intersect',$keys) as $key)
{
$intersection[$key] = $array1[$key];
}
return $intersection;
}
}