remove short php tags in mobile version, fix star action in vfeeds

author Andrew Dolgov <fox@bah.spb.su>

Sat, 19 Aug 2006 08:52:33 +0000 (09:52 +0100)

committer Andrew Dolgov <fox@bah.spb.su>

Sat, 19 Aug 2006 08:52:33 +0000 (09:52 +0100)
author Andrew Dolgov <fox@bah.spb.su>
Sat, 19 Aug 2006 08:52:33 +0000 (09:52 +0100)
committer Andrew Dolgov <fox@bah.spb.su>
Sat, 19 Aug 2006 08:52:33 +0000 (09:52 +0100)
diff --git a/mobile/functions.php b/mobile/functions.php

index 398a12a5531e40ed3bb45fad2491498e4a69db53..b4a645aa136f027a6b4d14feada9f2daa4070105 100644 (file)
--- 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 b0c2b7779cc4cff83115934b3827489ff9ab7583..1078eedea1d5f88e9ecebe0e42f7efcc3befeb8d 100644 (file)
--- 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 bcf151ee1d0d48e0022cc585f9040b854b482afd..a9ee69be0268aa5ddf9818efb2e622c3db40370b 100644 (file)
--- 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 f23fd9bb369cf0b7863dc42f72e0c087f5df4d23..76641467ddfb6d66500753840812f71faaa8c0d8 100644 (file)
--- 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 5317890fc4cd88b015250f65d83c91da429da21f..83da7da22d60e0499e0568700144be9a4e7f6f70 100644 (file)
--- 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 f13a83105ac1b9c6cd5ddfff365d0a5dc65b8bf0..a52c63f81a2a5d3518125efd593dec6de831ad55 100644 (file)
--- 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 ?> &copy; 2005-2006 Andrew Dolgov
+       <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov
  </div>
  
  </body>
author	Andrew Dolgov <fox@bah.spb.su>
	Sat, 19 Aug 2006 08:52:33 +0000 (09:52 +0100)
committer	Andrew Dolgov <fox@bah.spb.su>
	Sat, 19 Aug 2006 08:52:33 +0000 (09:52 +0100)
mobile/functions.php		patch \| blob \| history
mobile/index.php		patch \| blob \| history
mobile/login.php		patch \| blob \| history
mobile/logout.php		patch \| blob \| history
mobile/mobile.css		patch \| blob \| history
mobile/tt-rss.php		patch \| blob \| history