valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of bah.org.ru:public_html/testbox/tt-rss

This commit is contained in:
Andrew Dolgov 2010-01-26 11:28:23 +03:00
parent 51c78a881c 4fab608e66
commit 5439fbd3d2
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend.php
View File

@ -539,9 +539,8 @@
print "</select>"; print "</select>";
$_SESSION = array(); $_SESSION = array();
break;
} }
break;
} // Select action according to $op value. } // Select action according to $op value.

5
config.php-dist
View File

@ -100,9 +100,8 @@
// If update daemon and update_feeds should send digests // If update daemon and update_feeds should send digests
// Disable if you prefer querying special URL (see wiki) // Disable if you prefer querying special URL (see wiki)
define('ENABLE_TRANSLATIONS', false); define('ENABLE_TRANSLATIONS', true);
// Enable experimental support for interface translations // Enable support for interface translations
// based on PHP-Gettext. This is of no much use right now.
define('MYSQL_CHARSET', ''); define('MYSQL_CHARSET', '');
// Connection charset for MySQL. Only enable if having charset-related // Connection charset for MySQL. Only enable if having charset-related

22
login_form.php
View File

@ -14,20 +14,15 @@
<script type="text/javascript"> <script type="text/javascript">
function init() { function init() {
if (arguments.callee.done) return;
arguments.callee.done = true;
var login = document.forms["loginForm"].login;
var limit_set = getCookie("ttrss_bwlimit"); var limit_set = getCookie("ttrss_bwlimit");
if (limit_set == "true") { if (limit_set == "true") {
document.forms["loginForm"].bw_limit.checked = true; document.forms["loginForm"].bw_limit.checked = true;
} }
login.focus(); document.forms["loginForm"].login.focus();
} }
function fetchProfiles() { function fetchProfiles() {
try { try {
var params = Form.serialize('loginForm'); var params = Form.serialize('loginForm');
@ -102,10 +97,9 @@ function validateLoginForm(f) {
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
if (document.addEventListener) { Event.observe(window, 'load', function() {
document.addEventListener("DOMContentLoaded", init, null); init();
} });
window.onload = init;
</script> </script>
<form action="" method="POST" id="loginForm" name="loginForm" onsubmit="return validateLoginForm(this)"> <form action="" method="POST" id="loginForm" name="loginForm" onsubmit="return validateLoginForm(this)">
@ -125,11 +119,11 @@ window.onload = init;
<table> <table>
<tr><td align="right"><?php echo __("Login:") ?></td> <tr><td align="right"><?php echo __("Login:") ?></td>
<td align="right"><input name="login" <td align="right"><input name="login"
onchange="fetchProfiles()" onchange="fetchProfiles()" onfocus="fetchProfiles()"
value="<?php echo $_SERVER["REMOTE_USER"] ?>"></td></tr> value="<?php echo $_SERVER["REMOTE_USER"] ?>"></td></tr>
<tr><td align="right"><?php echo __("Password:") ?></td> <tr><td align="right"><?php echo __("Password:") ?></td>
<td align="right"><input type="password" name="password" <td align="right"><input type="password" name="password"
onchange="fetchProfiles()" onchange="fetchProfiles()" onfocus="fetchProfiles()"
value="<?php echo $_SERVER["REMOTE_USER"] ?>"></td></tr> value="<?php echo $_SERVER["REMOTE_USER"] ?>"></td></tr>
<?php if (ENABLE_TRANSLATIONS) { ?> <?php if (ENABLE_TRANSLATIONS) { ?>
<tr><td align="right"><?php echo __("Language:") ?></td> <tr><td align="right"><?php echo __("Language:") ?></td>
@ -155,7 +149,7 @@ window.onload = init;
<tr><td colspan="2" align="right" class="innerLoginCell"> <tr><td colspan="2" align="right" class="innerLoginCell">
<button name='click'><?php echo __('Log in') ?></button> <button type="submit" name='click'><?php echo __('Log in') ?></button>
<?php if (defined('ENABLE_REGISTRATION') && ENABLE_REGISTRATION) { ?> <?php if (defined('ENABLE_REGISTRATION') && ENABLE_REGISTRATION) { ?>
<button onclick="return gotoRegForm()"> <button onclick="return gotoRegForm()">
<?php echo __("Create new account") ?></button> <?php echo __("Create new account") ?></button>