diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/functions.php | 25 | ||||
-rw-r--r-- | include/login_form.php | 28 |
2 files changed, 29 insertions, 24 deletions
diff --git a/include/functions.php b/include/functions.php index 01ffa751f..bad01eb96 100644 --- a/include/functions.php +++ b/include/functions.php @@ -961,23 +961,28 @@ } function file_is_locked($filename) { - if (function_exists('flock') && file_exists(LOCK_DIRECTORY . "/$filename")) { - $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r"); - if ($fp) { - if (flock($fp, LOCK_EX | LOCK_NB)) { - flock($fp, LOCK_UN); + if (file_exists(LOCK_DIRECTORY . "/$filename")) { + if (function_exists('flock')) { + $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r"); + if ($fp) { + if (flock($fp, LOCK_EX | LOCK_NB)) { + flock($fp, LOCK_UN); + fclose($fp); + return false; + } fclose($fp); + return true; + } else { return false; } - fclose($fp); - return true; - } else { - return false; } + return true; // consider the file always locked and skip the test + } else { + return false; } - return true; // consider the file always locked and skip the test } + function make_lockfile($filename) { $fp = fopen(LOCK_DIRECTORY . "/$filename", "w"); diff --git a/include/login_form.php b/include/login_form.php index 0637c453a..891e25e13 100644 --- a/include/login_form.php +++ b/include/login_form.php @@ -1,3 +1,4 @@ +<?php startup_gettext(); ?> <html> <head> <title>Tiny Tiny RSS : Login</title> @@ -6,12 +7,12 @@ <link rel="shortcut icon" type="image/png" href="images/favicon.png"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <script type="text/javascript" src="lib/dojo/dojo.js"></script> - <script type="text/javascript" src="lib/dijit/dijit.js"></script> <script type="text/javascript" src="lib/dojo/tt-rss-layer.js"></script> <script type="text/javascript" src="lib/prototype.js"></script> <script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script> <script type="text/javascript"> + require({cache:{}}); Event.observe(window, 'load', function() { init(); }); @@ -104,20 +105,19 @@ <script type="text/javascript"> function init() { - dojo.require("dijit.form.Button"); - dojo.require("dijit.form.CheckBox"); - dojo.require("dijit.form.Form"); - dojo.require("dijit.form.Select"); - dojo.require("dijit.form.TextBox"); - dojo.require("dijit.form.ValidationTextBox"); - dojo.parser.parse(); + require(['dojo/parser','dijit/form/Button','dijit/form/CheckBox','dijit/form/Form', + 'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser){ + parser.parse(); + //show tooltip node only after this widget is instaniated. + dojo.query('div[dojoType="dijit.Tooltip"]').style({ + display:'' + }); + fetchProfiles(); + dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true'); + document.forms.loginForm.login.focus(); + }); - fetchProfiles(); - - dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true'); - - document.forms.loginForm.login.focus(); } function fetchProfiles() { @@ -217,7 +217,7 @@ function bwLimitChange(elem) { <label id="bw_limit_label" style='display : inline' for="bw_limit"><?php echo __("Use less traffic") ?></label> </div> - <div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below"> + <div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below" style="display:none"> <?php echo __("Does not display images in articles, reduces automatic refreshes."); ?> </div> |