Minor - format code.

1.9.x
Julio Montoya 12 years ago
parent cc720b5c36
commit 73419f9a83
  1. 41
      main/inc/lib/formvalidator/Element/datepicker.php
  2. 20
      main/inc/lib/formvalidator/Element/datepickerdate.php

@ -9,57 +9,54 @@ class HTML_QuickForm_datepicker extends HTML_QuickForm_date
/**
* Constructor
*/
function HTML_QuickForm_datepicker($elementName = null, $elementLabel = null, $attributes = null, $optionIncrement = null)
public function HTML_QuickForm_datepicker($elementName = null, $elementLabel = null, $attributes = null, $optionIncrement = null)
{
$js_form_name = $attributes['form_name'];
unset($attributes['form_name']);
HTML_QuickForm_element :: HTML_QuickForm_element($elementName, $elementLabel, $attributes);
$js_form_name = api_get_unique_id();
HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
$this->_persistantFreeze = true;
$this->_appendName = true;
$this->_type = 'datepicker';
$popup_link = '<a href="javascript:openCalendar(\''.$js_form_name.'\',\''.$elementName.'\')"><img src="'.api_get_path(WEB_IMG_PATH).'calendar_select.gif" style="vertical-align:middle;" alt="Select Date" /></a>';
$special_chars = array ('D', 'l', 'd', 'M', 'F', 'm', 'y', 'H', 'a', 'A', 's', 'i', 'h', 'g', ' ');
$popup_link = '<a href="javascript:openCalendar(\''.$js_form_name.'\',\''.$elementName.'\')">
<img src="'.api_get_path(WEB_IMG_PATH).'calendar_select.gif" style="vertical-align:middle;" alt="Select Date" /></a>';
$hour_minute_devider = get_lang("HourMinuteDivider");
foreach ($special_chars as $index => $char)
{
$special_chars = array('D', 'l', 'd', 'M', 'F', 'm', 'y', 'H', 'a', 'A', 's', 'i', 'h', 'g', ' ');
foreach ($special_chars as $char) {
$popup_link = str_replace($char, "\\".$char, $popup_link);
$hour_minute_devider = str_replace($char, "\\".$char, $hour_minute_devider);
}
$lang_code = api_get_language_isocode();
// If translation not available in PEAR::HTML_QuickForm_date, add the Chamilo-translation
if(! array_key_exists($lang_code,$this->_locale))
{
if (!array_key_exists($lang_code,$this->_locale)) {
$this->_locale[$lang_code]['months_long'] = api_get_months_long();
}
$this->_options['format'] = 'dFY '.$popup_link.' H '.$hour_minute_devider.' i';
$this->_options['minYear'] = date('Y')-5;
$this->_options['maxYear'] = date('Y')+10;
$this->_options['language'] = $lang_code;
//$this->_options['addEmptyOption'] = true;
//$this->_options['emptyOptionValue'] = 0;
//$this->_options['emptyOptionText'] = ' -- ';
if (isset($optionIncrement)) {
$this->_options['optionIncrement']['i'] = intval($optionIncrement);
$this->_options['optionIncrement']['i'] = intval($optionIncrement);
}
}
/**
* HTML code to display this datepicker
*/
function toHtml()
public function toHtml()
{
$js = $this->getElementJS();
return $js.parent :: toHtml();
}
/**
* Get the necessary javascript for this datepicker
*/
function getElementJS()
{
$js = '';
if(!defined('DATEPICKER_JAVASCRIPT_INCLUDED'))
{
define('DATEPICKER_JAVASCRIPT_INCLUDED',1);
if (!defined('DATEPICKER_JAVASCRIPT_INCLUDED')) {
define('DATEPICKER_JAVASCRIPT_INCLUDED', 1);
$js = "\n";
$js .= '<script src="';
$js .= api_get_path(WEB_CODE_PATH).'inc/lib/formvalidator/Element/';
@ -68,8 +65,11 @@ class HTML_QuickForm_datepicker extends HTML_QuickForm_date
}
return $js;
}
/**
* Export the date value in MySQL format
* @param array
* @param bool
* @return string YYYY-MM-DD HH:II:SS
*/
function exportValue(&$submitValues, $assoc = false)
@ -88,7 +88,7 @@ class HTML_QuickForm_datepicker extends HTML_QuickForm_date
$result[$this->getName()]= $datetime;
return $result;
}
/**
/**
* Sets an option to a value
*/
function setLocalOption($name,$value)
@ -96,4 +96,3 @@ class HTML_QuickForm_datepicker extends HTML_QuickForm_date
$this->_options[$name] = $value;
}
}
?>

@ -9,7 +9,8 @@ class HTML_QuickForm_datepickerdate extends HTML_QuickForm_date
/**
* Constructor
*/
function HTML_QuickForm_datepickerdate($elementName = null, $elementLabel = null, $attributes = null) {
public function HTML_QuickForm_datepickerdate($elementName = null, $elementLabel = null, $attributes = null)
{
global $myMinYear, $myMaxYear;
$js_form_name = $attributes['form_name'];
unset($attributes['form_name']);
@ -19,24 +20,20 @@ class HTML_QuickForm_datepickerdate extends HTML_QuickForm_date
$this->_type = 'datepicker';
$popup_link = '<a href="javascript:openCalendar(\''.$js_form_name.'\',\''.$elementName.'\')"><img src="'.api_get_path(WEB_IMG_PATH).'calendar_select.gif" style="vertical-align:middle;" alt="Select Date" /></a>';
$special_chars = array ('D', 'l', 'd', 'M', 'F', 'm', 'y', 'H', 'a', 'A', 's', 'i', 'h', 'g', ' ');
foreach ($special_chars as $index => $char)
{
foreach ($special_chars as $char) {
$popup_link = str_replace($char, "\\".$char, $popup_link);
}
$lang_code = api_get_language_isocode();
// If translation not available in PEAR::HTML_QuickForm_date, add the Chamilo-translation
if(! array_key_exists($lang_code,$this->_locale))
{
if (! array_key_exists($lang_code,$this->_locale)) {
$this->_locale[$lang_code]['months_long'] = api_get_months_long();
}
$this->_options['format'] = 'dFY '.$popup_link;
$this->_options['minYear'] = date('Y')-5;
$this->_options['maxYear'] = date('Y')+10;
$this->_options['language'] = $lang_code;
//$this->_options['addEmptyOption'] = true;
//$this->_options['emptyOptionValue'] = 0;
//$this->_options['emptyOptionText'] = ' -- ';
}
/**
* HTML code to display this datepicker
*/
@ -51,9 +48,8 @@ class HTML_QuickForm_datepickerdate extends HTML_QuickForm_date
function getElementJS()
{
$js = '';
if(!defined('DATEPICKER_JAVASCRIPT_INCLUDED'))
{
define('DATEPICKER_JAVASCRIPT_INCLUDED',1);
if(!defined('DATEPICKER_JAVASCRIPT_INCLUDED')) {
define('DATEPICKER_JAVASCRIPT_INCLUDED', 1);
$js = "\n";
$js .= '<script src="';
$js .= api_get_path(WEB_CODE_PATH).'inc/lib/formvalidator/Element/';
@ -62,6 +58,7 @@ class HTML_QuickForm_datepickerdate extends HTML_QuickForm_date
}
return $js;
}
/**
* Export the date value in MySQL format
* @return string YYYY-MM-DD HH:II:SS
@ -86,4 +83,3 @@ class HTML_QuickForm_datepickerdate extends HTML_QuickForm_date
$this->_options[$name] = $value;
}
}
?>
Loading…
Cancel
Save