Fix: broken features and uniformize code
This commit is contained in:
Regis Houssin
parent
6f8b63f0ef
commit
9813344346
@ -34,10 +34,13 @@ print '<!-- Includes for JQuery (Ajax library) -->'."\n";
|
||||
if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
|
||||
else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n"; // JQuery
|
||||
// JQuery. Must be before other includes
|
||||
$ext='.js';
|
||||
if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz';
|
||||
print '<!-- Includes JS for JQuery -->'."\n";
|
||||
if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
|
||||
else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
|
||||
print '<link rel="stylesheet" type="text/css" href="'.$conf_css.'" />
|
||||
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/dst.js"></script>'."\n";
|
||||
print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />
|
||||
<style type="text/css">
|
||||
<!--
|
||||
#login {
|
||||
@ -61,140 +64,9 @@ print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
|
||||
|
||||
<!-- Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second -->
|
||||
<script type="text/javascript">
|
||||
function DisplayDstSwitchDates(firstsecond)
|
||||
{
|
||||
var year = new Date().getYear();
|
||||
if (year < 1000) year += 1900;
|
||||
|
||||
var firstSwitch = 0;
|
||||
var secondSwitch = 0;
|
||||
var lastOffset = 99;
|
||||
|
||||
// Loop through every month of the current year
|
||||
for (i = 0; i < 12; i++)
|
||||
{
|
||||
// Fetch the timezone value for the month
|
||||
var newDate = new Date(Date.UTC(year, i, 0, 0, 0, 0, 0));
|
||||
var tz = -1 * newDate.getTimezoneOffset() / 60;
|
||||
|
||||
// Capture when a timzezone change occurs
|
||||
if (tz > lastOffset)
|
||||
firstSwitch = i-1;
|
||||
else if (tz < lastOffset)
|
||||
secondSwitch = i-1;
|
||||
|
||||
lastOffset = tz;
|
||||
}
|
||||
|
||||
// Go figure out date/time occurences a minute before
|
||||
// a DST adjustment occurs
|
||||
var secondDstDate = FindDstSwitchDate(year, secondSwitch);
|
||||
var firstDstDate = FindDstSwitchDate(year, firstSwitch);
|
||||
|
||||
if (firstsecond == 'first') return firstDstDate;
|
||||
if (firstsecond == 'second') return secondDstDate;
|
||||
|
||||
if (firstDstDate == null && secondDstDate == null)
|
||||
return 'Daylight Savings is not observed in your timezone.';
|
||||
else
|
||||
return 'Last minute before DST change occurs in ' +
|
||||
year + ': ' + firstDstDate + ' and ' + secondDstDate;
|
||||
}
|
||||
|
||||
function FindDstSwitchDate(year, month)
|
||||
{
|
||||
// Set the starting date
|
||||
var baseDate = new Date(Date.UTC(year, month, 0, 0, 0, 0, 0));
|
||||
var changeDay = 0;
|
||||
var changeMinute = -1;
|
||||
var baseOffset = -1 * baseDate.getTimezoneOffset() / 60;
|
||||
var dstDate;
|
||||
|
||||
// Loop to find the exact day a timezone adjust occurs
|
||||
for (day = 0; day < 50; day++)
|
||||
{
|
||||
var tmpDate = new Date(Date.UTC(year, month, day, 0, 0, 0, 0));
|
||||
var tmpOffset = -1 * tmpDate.getTimezoneOffset() / 60;
|
||||
|
||||
// Check if the timezone changed from one day to the next
|
||||
if (tmpOffset != baseOffset)
|
||||
{
|
||||
var minutes = 0;
|
||||
changeDay = day;
|
||||
|
||||
// Back-up one day and grap the offset
|
||||
tmpDate = new Date(Date.UTC(year, month, day-1, 0, 0, 0, 0));
|
||||
tmpOffset = -1 * tmpDate.getTimezoneOffset() / 60;
|
||||
|
||||
// Count the minutes until a timezone chnage occurs
|
||||
while (changeMinute == -1)
|
||||
{
|
||||
tmpDate = new Date(Date.UTC(year, month, day-1, 0, minutes, 0, 0));
|
||||
tmpOffset = -1 * tmpDate.getTimezoneOffset() / 60;
|
||||
|
||||
// Determine the exact minute a timezone change
|
||||
// occurs
|
||||
if (tmpOffset != baseOffset)
|
||||
{
|
||||
// Back-up a minute to get the date/time just
|
||||
// before a timezone change occurs
|
||||
tmpOffset = new Date(Date.UTC(year, month,
|
||||
day-1, 0, minutes-1, 0, 0));
|
||||
changeMinute = minutes;
|
||||
break;
|
||||
}
|
||||
else
|
||||
minutes++;
|
||||
}
|
||||
|
||||
// Add a month (for display) since JavaScript counts
|
||||
// months from 0 to 11
|
||||
dstDate = tmpOffset.getMonth() + 1;
|
||||
|
||||
// Pad the month as needed
|
||||
if (dstDate < 10) dstDate = "0" + dstDate;
|
||||
|
||||
// Add the day and year
|
||||
dstDate = year + '-' + dstDate + '-' + tmpOffset.getDate() + 'T';
|
||||
|
||||
// Capture the time stamp
|
||||
tmpDate = new Date(Date.UTC(year, month,
|
||||
day-1, 0, minutes-1, 0, 0));
|
||||
dstDate += tmpDate.toTimeString().split(' ')[0] + 'Z';
|
||||
return dstDate;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
jQuery(document).ready(function () {
|
||||
$(document).ready(function () {
|
||||
// Set focus on correct field
|
||||
<?php if ($focus_element) { ?>jQuery('#<?php echo $focus_element; ?>').focus(); <?php } ?> // Warning to use this only on visible element
|
||||
// Detect and save TZ and DST
|
||||
var rightNow = new Date();
|
||||
var jan1 = new Date(rightNow.getFullYear(), 0, 1, 0, 0, 0, 0);
|
||||
var temp = jan1.toGMTString();
|
||||
var jan2 = new Date(temp.substring(0, temp.lastIndexOf(" ")-1));
|
||||
var std_time_offset = (jan1 - jan2) / (1000 * 60 * 60);
|
||||
var june1 = new Date(rightNow.getFullYear(), 6, 1, 0, 0, 0, 0);
|
||||
temp = june1.toGMTString();
|
||||
var june2 = new Date(temp.substring(0, temp.lastIndexOf(" ")-1));
|
||||
var daylight_time_offset = (june1 - june2) / (1000 * 60 * 60);
|
||||
var dst;
|
||||
if (std_time_offset == daylight_time_offset) {
|
||||
dst = "0"; // daylight savings time is NOT observed
|
||||
} else {
|
||||
dst = "1"; // daylight savings time is observed
|
||||
}
|
||||
var dst_first=DisplayDstSwitchDates('first');
|
||||
var dst_second=DisplayDstSwitchDates('second');
|
||||
//alert(dst);
|
||||
jQuery('#tz').val(std_time_offset); // returns TZ
|
||||
jQuery('#dst_observed').val(dst); // returns if DST is observed on summer
|
||||
jQuery('#dst_first').val(dst_first); // returns DST first switch in year
|
||||
jQuery('#dst_second').val(dst_second); // returns DST second switch in year
|
||||
// Detect and save screen resolution
|
||||
jQuery('#screenwidth').val(jQuery(window).width()); // returns width of browser viewport
|
||||
jQuery('#screenheight').val(jQuery(window).height()); // returns width of browser viewport
|
||||
<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?> // Warning to use this only on visible element
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -203,11 +75,14 @@ jQuery(document).ready(function () {
|
||||
<input type="hidden" name="loginfunction" value="loginfunction" />
|
||||
<!-- Add fields to send local user information -->
|
||||
<input type="hidden" name="tz" id="tz" value="" />
|
||||
<input type="hidden" name="tz_string" id="tz_string" value="" />
|
||||
<input type="hidden" name="dst_observed" id="dst_observed" value="" />
|
||||
<input type="hidden" name="dst_first" id="dst_first" value="" />
|
||||
<input type="hidden" name="dst_second" id="dst_second" value="" />
|
||||
<input type="hidden" name="screenwidth" id="screenwidth" value="" />
|
||||
<input type="hidden" name="screenheight" id="screenheight" value="" />
|
||||
<input type="hidden" name="dol_hide_topmenu" id="dol_hide_topmenu" value="" />
|
||||
<input type="hidden" name="dol_hide_leftmenu" id="dol_hide_leftmenu" value="" />
|
||||
|
||||
<div id="infoVersion"><?php echo $title; ?></div>
|
||||
|
||||
@ -220,9 +95,15 @@ jQuery(document).ready(function () {
|
||||
<div id="logBox"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong><input type="text" id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo GETPOST('username')?GETPOST('username'):$login; ?>" tabindex="1" /></div>
|
||||
<div id="passBox"><strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong><input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="<?php echo $password; ?>" tabindex="2" /></div>
|
||||
|
||||
<?php if ($select_entity) { ?>
|
||||
<div><strong><?php echo $langs->trans('Entity'); ?></strong><?php echo $select_entity; ?></div>
|
||||
<?php } ?>
|
||||
<?php
|
||||
if (! empty($hookmanager->resArray['options'])) {
|
||||
foreach ($hookmanager->resArray['options'] as $option)
|
||||
{
|
||||
echo '<!-- Option by hook -->';
|
||||
echo $option;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
<?php if ($captcha) { ?>
|
||||
<div class="captchaBox">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user