diff options
| author | Andrew Dolgov <[email protected]> | 2006-08-19 09:52:33 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2006-08-19 09:52:33 +0100 |
| commit | e9e95daec28936b87d97f5e4e8c62608d2424608 (patch) | |
| tree | efc536cc128c7881262a2854213a9e02b50e9b96 /mobile | |
| parent | 20862e584fae334be87a1c0e0b9a91937e4832c7 (diff) | |
remove short php tags in mobile version, fix star action in vfeeds
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/functions.php | 4 | ||||
| -rw-r--r-- | mobile/index.php | 2 | ||||
| -rw-r--r-- | mobile/login.php | 17 | ||||
| -rw-r--r-- | mobile/logout.php | 4 | ||||
| -rw-r--r-- | mobile/mobile.css | 6 | ||||
| -rw-r--r-- | mobile/tt-rss.php | 6 |
6 files changed, 28 insertions, 11 deletions
diff --git a/mobile/functions.php b/mobile/functions.php index 398a12a55..b4a645aa1 100644 --- a/mobile/functions.php +++ b/mobile/functions.php @@ -1,4 +1,4 @@ -<? +<?php define('MOBILE_FEEDLIST_ENABLE_ICONS', false); define('TTRSS_SESSION_NAME', 'ttrss_m_sid'); @@ -641,7 +641,7 @@ print "<li class='$class'>"; - print "<a href=\"?go=vf&id=$feed_id&ts=$id\">$marked_pic</a>"; + print "<a href=\"?go=vf&id=$feed&ts=$id\">$marked_pic</a>"; print $content_link; diff --git a/mobile/index.php b/mobile/index.php index b0c2b7779..1078eedea 100644 --- a/mobile/index.php +++ b/mobile/index.php @@ -1 +1 @@ -<? require "tt-rss.php" ?> +<?php require "tt-rss.php" ?> diff --git a/mobile/login.php b/mobile/login.php index bcf151ee1..a9ee69be0 100644 --- a/mobile/login.php +++ b/mobile/login.php @@ -1,4 +1,4 @@ -<? +<?php require_once "functions.php"; require_once "../version.php"; @@ -18,6 +18,7 @@ $login = $_POST["login"]; $password = $_POST["password"]; $return_to = $_POST["rt"]; + $action = $_POST["action"]; if ($_COOKIE[get_session_cookie_name()]) { require_once "../sessions.php"; @@ -52,7 +53,12 @@ } header("Location: $redirect_base/$return_to"); exit; + } else { + $error_msg = "Error: Unable to authenticate user. Please check login and password."; } + + } else if ($action) { + $error_msg = "Error: Either login or password is blank."; } ?> @@ -69,7 +75,12 @@ <div id="heading">Tiny Tiny RSS</div> <form action="login.php" method="POST"> - <input type="hidden" name="rt" value="<?= $_GET['rt'] ?>"> + <input type="hidden" name="rt" value="<?php echo $_GET['rt'] ?>"> + <input type="hidden" name="action" value="login"> + + <?php if ($error_msg) { ?> + <div class="loginError"><?php echo $error_msg ?></div> + <?php } ?> <table> <tr><td align='right'>Login:</td><td><input name="login"></td> @@ -88,5 +99,5 @@ </body> </html> -<? db_close($link); ?> +<?php db_close($link); ?> diff --git a/mobile/logout.php b/mobile/logout.php index f23fd9bb3..76641467d 100644 --- a/mobile/logout.php +++ b/mobile/logout.php @@ -1,4 +1,4 @@ -<? +<?php require_once "functions.php"; require_once "../config.php"; @@ -37,4 +37,4 @@ </body> </html> -<? } ?> +<?php } ?> diff --git a/mobile/mobile.css b/mobile/mobile.css index 5317890fc..83da7da22 100644 --- a/mobile/mobile.css +++ b/mobile/mobile.css @@ -174,3 +174,9 @@ div.footerAddon { margin-top : 5px; margin-bottom : 5px; } + +.loginError { + color : red; + margin : 0.5em; +} + diff --git a/mobile/tt-rss.php b/mobile/tt-rss.php index f13a83105..a52c63f81 100644 --- a/mobile/tt-rss.php +++ b/mobile/tt-rss.php @@ -1,4 +1,4 @@ -<? +<?php require_once "../config.php"; require_once "functions.php"; require_once "../functions.php"; @@ -59,7 +59,7 @@ <body> <div id="content"> -<? +<?php if (!$go) { render_feeds_list($link); } else if ($go == "vf") { @@ -74,7 +74,7 @@ </div> <div id="footer"> - <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?= VERSION ?> © 2005-2006 Andrew Dolgov + <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?php echo VERSION ?> © 2005-2006 Andrew Dolgov </div> </body> |