diff options
| author | Andrew Dolgov <[email protected]> | 2006-08-19 08:04:45 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2006-08-19 08:04:45 +0100 |
| commit | 1d3a17c71ed490c5e0f2f0f9558f5865c3b30e54 (patch) | |
| tree | 30586abde40ae0c9e4aaa44cacb63e9d175961af | |
| parent | 660c059f88bfc2f60952beb24a5fa2fa7ae543f7 (diff) | |
change short php tags to long ones
| -rw-r--r-- | backend-rpc.php | 2 | ||||
| -rw-r--r-- | backend.php | 4 | ||||
| -rw-r--r-- | compat.php | 2 | ||||
| -rw-r--r-- | db-prefs.php | 2 | ||||
| -rw-r--r-- | db.php | 2 | ||||
| -rw-r--r-- | errors.php | 2 | ||||
| -rw-r--r-- | functions.php | 2 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | login.php | 22 | ||||
| -rw-r--r-- | logout.php | 4 | ||||
| -rw-r--r-- | opml.php | 4 | ||||
| -rw-r--r-- | prefs.php | 72 | ||||
| -rw-r--r-- | sanity_check.php | 2 | ||||
| -rw-r--r-- | sessions.php | 2 | ||||
| -rw-r--r-- | stats.php | 4 | ||||
| -rw-r--r-- | tt-rss.php | 80 | ||||
| -rw-r--r-- | update_daemon.php | 2 | ||||
| -rw-r--r-- | update_feeds.php | 2 | ||||
| -rw-r--r-- | version.php | 2 | ||||
| -rw-r--r-- | xml-rpc.php | 2 |
20 files changed, 109 insertions, 107 deletions
diff --git a/backend-rpc.php b/backend-rpc.php index 3d9894ee7..e7b42244a 100644 --- a/backend-rpc.php +++ b/backend-rpc.php @@ -1,4 +1,4 @@ -<? +<?php function handle_rpc_request($link) { $subop = $_GET["subop"]; diff --git a/backend.php b/backend.php index 8b31297fb..30e236cec 100644 --- a/backend.php +++ b/backend.php @@ -1,4 +1,4 @@ -<? +<?php require_once "sessions.php"; require_once "backend-rpc.php"; @@ -3876,5 +3876,5 @@ db_close($link); ?> -<!-- <?= sprintf("Backend execution time: %.4f seconds", getmicrotime() - $script_started) ?> --> +<!-- <?php echo sprintf("Backend execution time: %.4f seconds", getmicrotime() - $script_started) ?> --> diff --git a/compat.php b/compat.php index 57875398b..29f96236b 100644 --- a/compat.php +++ b/compat.php @@ -1,4 +1,4 @@ -<? +<?php if (!function_exists('mb_strlen')) { diff --git a/db-prefs.php b/db-prefs.php index 519b35f23..07c4548d3 100644 --- a/db-prefs.php +++ b/db-prefs.php @@ -1,4 +1,4 @@ -<? +<?php require_once "config.php"; require_once "db.php"; @@ -1,4 +1,4 @@ -<? +<?php require_once "config.php"; diff --git a/errors.php b/errors.php index 603ef7056..2963beb8d 100644 --- a/errors.php +++ b/errors.php @@ -1,4 +1,4 @@ -<? +<?php $ERRORS[0] = "Unknown error"; $ERRORS[1] = "This program requires XmlHttpRequest " . diff --git a/functions.php b/functions.php index 728d10f4e..e9863c36a 100644 --- a/functions.php +++ b/functions.php @@ -1,4 +1,4 @@ -<? +<?php /* if ($_GET["debug"]) { define('DEFAULT_ERROR_LEVEL', E_ALL); @@ -1 +1 @@ -<? require "tt-rss.php" ?> +<?php require "tt-rss.php" ?> @@ -1,4 +1,4 @@ -<? +<?php // require_once "sessions.php"; require_once "sanity_check.php"; @@ -26,6 +26,7 @@ $login = $_POST["login"]; $password = $_POST["password"]; $return_to = $_POST["rt"]; + $action = $_POST["action"]; if ($_COOKIE[get_session_cookie_name()]) { require_once "sessions.php"; @@ -66,7 +67,7 @@ } else { $error_msg = "Error: Unable to authenticate user. Please check login and password."; } - } else { + } else if ($action) { $error_msg = "Error: Either login or password is blank."; } @@ -112,9 +113,9 @@ window.onload = init; </td> </tr><tr> <td align="center" valign="middle" class="loginMiddle" height="100%"> - <? if ($error_msg) { ?> - <div class="loginError"><?= $error_msg ?></div> - <? } ?> + <?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></tr> @@ -126,16 +127,17 @@ window.onload = init; </td></tr> <tr><td colspan="2" align="right"> <input type="submit" class="button" value="Login"> - <input type="hidden" name="rt" value="<?= $_GET['rt'] ?>"> + <input type="hidden" name="action" value="login"> + <input type="hidden" name="rt" value="<?php echo $_GET['rt'] ?>"> </td></tr> </table> </td> </tr><tr> <td align="center" class="loginBottom"> - <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?= VERSION ?> © 2005-2006 Andrew Dolgov - <? if (WEB_DEMO_MODE) { ?> + <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?php echo VERSION ?> © 2005-2006 Andrew Dolgov + <?php if (WEB_DEMO_MODE) { ?> <br>Running in demo mode, some functionality is disabled. - <? } ?> + <?php } ?> </td> </tr> @@ -143,7 +145,7 @@ window.onload = init; </form> -<? db_close($link); ?> +<?php db_close($link); ?> <script type="text/javascript"> /* for IE */ diff --git a/logout.php b/logout.php index 056cc025d..f3987d853 100644 --- a/logout.php +++ b/logout.php @@ -1,4 +1,4 @@ -<? +<?php require_once "sessions.php"; require_once "config.php"; @@ -39,4 +39,4 @@ </div> </body> </html> -<? } ?> +<?php } ?> @@ -1,4 +1,4 @@ -<? +<?php require_once "sessions.php"; require_once "sanity_check.php"; @@ -25,7 +25,7 @@ if ($op == "Export") { header("Content-type: application/xml+opml"); - print "<?xml version=\"1.0\"?>"; + print "<?phpxml version=\"1.0\"?>"; } if ($op == "Export") { @@ -1,4 +1,4 @@ -<? +<?php require_once "functions.php"; basic_nosid_redirect_check(); @@ -22,33 +22,33 @@ <title>Tiny Tiny RSS : Preferences</title> <link rel="stylesheet" href="tt-rss.css" type="text/css"> - <? $user_theme = $_SESSION["theme"]; + <?php $user_theme = $_SESSION["theme"]; if ($user_theme) { ?> - <link rel="stylesheet" type="text/css" href="themes/<?= $user_theme ?>/theme.css"> - <? } ?> + <link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css"> + <?php } ?> - <? if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?> + <?php if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?> - <? $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?> - <? if ($user_css_url) { ?> - <link type="text/css" href="<?= $user_css_url ?>"/> - <? } ?> + <?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?> + <?php if ($user_css_url) { ?> + <link type="text/css" href="<?php echo $user_css_url ?>"/> + <?php } ?> - <? if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { ?> + <?php if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { ?> <link rel="stylesheet" href="tt-rss_compact.css" type="text/css"> - <? } else { ?> + <?php } else { ?> <link title="Compact Stylesheet" rel="alternate stylesheet" type="text/css" href="tt-rss_compact.css"/> - <? } ?> + <?php } ?> <script type="text/javascript" src="prototype.js"></script> - <script type="text/javascript" src="functions.js?<?= $dt_add ?>"></script> - <script type="text/javascript" src="prefs.js?<?= $dt_add ?>"></script> + <script type="text/javascript" src="functions.js?<?php echo $dt_add ?>"></script> + <script type="text/javascript" src="prefs.js?<?php echo $dt_add ?>"></script> <div id="infoBoxShadow"><div id="infoBox">BAH</div></div> @@ -89,57 +89,57 @@ window.onload = init; </div></div> <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main"> -<? if (get_pref($link, 'DISPLAY_HEADER')) { ?> +<?php if (get_pref($link, 'DISPLAY_HEADER')) { ?> <tr> <td colspan="2"> <table cellspacing="0" cellpadding="0" width="100%"><tr> <td rowspan="2" class="header" valign="middle"> - <img src="<?= $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"> + <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"> </td> <td valign="top" class="notifyBox"> <div id="notify" class="notify"><span id="notify_body"> </span></div> </td> </tr><tr><td class="welcomePrompt"> - <? if (!SINGLE_USER_MODE) { ?> - Hello, <b><?= $_SESSION["name"] ?></b> + <?php if (!SINGLE_USER_MODE) { ?> + Hello, <b><?php echo $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>) - <? } ?> + <?php } ?> </td> </tr></table> </td> </tr> -<? } else { ?> +<?php } else { ?> <tr> <td class="small"> <div id="notify" class="notify_sm"><span id="notify_body"> </span></div> <div id="userDlgShadow"><div id="userDlg"> </div></div> </td><td class="welcomePrompt"> - <? if (!SINGLE_USER_MODE) { ?> - Hello, <b><?= $_SESSION["name"] ?></b> + <?php if (!SINGLE_USER_MODE) { ?> + Hello, <b><?php echo $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>) - <? } ?> + <?php } ?> </td></tr> -<? } ?> +<?php } ?> <tr> <td class="prefsTabs" align="left" valign="bottom"> <input id="genConfigTab" class="prefsTab" type="submit" value="Preferences" onclick="selectTab('genConfig')"> <input id="feedConfigTab" class="prefsTab" type="submit" value="My Feeds" onclick="selectTab('feedConfig')"> - <? if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { ?> + <?php if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { ?> <input id="feedBrowserTab" class="prefsTab" type="submit" value="Other Feeds" onclick="selectTab('feedBrowser')"> - <? } ?> + <?php } ?> <input id="filterConfigTab" class="prefsTab" type="submit" value="Content Filtering" onclick="selectTab('filterConfig')"> - <? if (get_pref($link, 'ENABLE_LABELS')) { ?> + <?php if (get_pref($link, 'ENABLE_LABELS')) { ?> <input id="labelConfigTab" class="prefsTab" type="submit" value="Label Editor" onclick="selectTab('labelConfig')"> - <? } ?> - <? if ($_SESSION["access_level"] >= 10) { ?> + <?php } ?> + <?php if ($_SESSION["access_level"] >= 10) { ?> <input id="userConfigTab" class="prefsTab" type="submit" value="User Manager" onclick="selectTab('userConfig')"> - <? } ?> + <?php } ?> </td> <td class="prefsToolbar" valign="middle" align="right"> <input type="submit" onclick="gotoMain()" class="button" value="Return to main"> @@ -152,19 +152,19 @@ window.onload = init; </td> </tr> -<? if (get_pref($link, 'DISPLAY_FOOTER')) { ?> +<?php if (get_pref($link, 'DISPLAY_FOOTER')) { ?> <tr> <td class="footer" colspan="2"> - <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?= VERSION ?> © 2005-2006 Andrew Dolgov - <? if (WEB_DEMO_MODE) { ?> + <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?php echo VERSION ?> © 2005-2006 Andrew Dolgov + <?php if (WEB_DEMO_MODE) { ?> <br>Running in demo mode, some functionality is disabled. - <? } ?> + <?php } ?> </td> </td> -<? } ?> +<?php } ?> </table> -<? db_close($link); ?> +<?php db_close($link); ?> <script type="text/javascript"> /* for IE */ diff --git a/sanity_check.php b/sanity_check.php index 9b3e4b1eb..1addd7b7e 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -1,4 +1,4 @@ -<? +<?php define('EXPECTED_CONFIG_VERSION', 3); if (!file_exists("config.php")) { diff --git a/sessions.php b/sessions.php index c64455b61..aab945d4d 100644 --- a/sessions.php +++ b/sessions.php @@ -1,4 +1,4 @@ -<? +<?php // Original from http://www.daniweb.com/code/snippet43.html require_once "config.php"; @@ -1,4 +1,4 @@ -<? +<?php require_once "sessions.php"; require_once "sanity_check.php"; @@ -27,7 +27,7 @@ <h2>Counters</h2> -<? +<?php $result = db_query($link, "SELECT count(id) AS cid, SUM(LENGTH(content)) AS size FROM ttrss_entries"); diff --git a/tt-rss.php b/tt-rss.php index 1c52f203d..aa38a0d01 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -1,4 +1,4 @@ -<? +<?php require_once "functions.php"; basic_nosid_redirect_check(); @@ -23,33 +23,33 @@ <link rel="stylesheet" type="text/css" href="tt-rss.css"> - <? $user_theme = $_SESSION["theme"]; + <?php $user_theme = $_SESSION["theme"]; if ($user_theme) { ?> - <link rel="stylesheet" type="text/css" href="themes/<?= $user_theme ?>/theme.css"> - <? } ?> + <link rel="stylesheet" type="text/css" href="themes/<?php echo $user_theme ?>/theme.css"> + <?php } ?> - <? if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?> + <?php if ($user_theme) { $theme_image_path = "themes/$user_theme/"; } ?> - <? $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?> - <? if ($user_css_url) { ?> - <link type="text/css" href="<?= $user_css_url ?>"/> - <? } ?> + <?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?> + <?php if ($user_css_url) { ?> + <link type="text/css" href="<?php echo $user_css_url ?>"/> + <?php } ?> - <? if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { ?> + <?php if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { ?> <link rel="stylesheet" href="tt-rss_compact.css" type="text/css"> - <? } else { ?> + <?php } else { ?> <link title="Compact Stylesheet" rel="alternate stylesheet" type="text/css" href="tt-rss_compact.css"/> - <? } ?> + <?php } ?> <script type="text/javascript" src="prototype.js"></script> - <script type="text/javascript" src="tt-rss.js?<?= $dt_add ?>"></script> - <script type="text/javascript" src="functions.js?<?= $dt_add ?>"></script> + <script type="text/javascript" src="tt-rss.js?<?php echo $dt_add ?>"></script> + <script type="text/javascript" src="functions.js?<?php echo $dt_add ?>"></script> <!--[if gte IE 5.5000]> <script type="text/javascript" src="pngfix.js"></script> <link rel="stylesheet" type="text/css" href="tt-rss-ie.css"> @@ -94,43 +94,43 @@ window.onload = init; <div id="infoBoxShadow"><div id="infoBox"> </div></div> <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="main"> -<? if (get_pref($link, 'DISPLAY_HEADER')) { ?> +<?php if (get_pref($link, 'DISPLAY_HEADER')) { ?> <tr> <td colspan="2" class="headerBox" id="mainHeader"> <table cellspacing="0" cellpadding="0" width="100%"><tr> <td rowspan="2" class="header" valign="middle"> - <img src="<?= $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"> + <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"> </td> <td valign="top" class="notifyBox"> <div id="notify" class="notify"><span id="notify_body"> </span></div> </td> </tr><tr><td class="welcomePrompt"> - <? if (!SINGLE_USER_MODE) { ?> - Hello, <b><?= $_SESSION["name"] ?></b> + <?php if (!SINGLE_USER_MODE) { ?> + Hello, <b><?php echo $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>) - <? } ?> + <?php } ?> </td> </tr></table> </td> </tr> -<? } else { ?> +<?php } else { ?> <tr> <td class="small" id="mainHeader"> <div id="notify" class="notify_sm"><span id="notify_body"> </span></div> <div id="userDlgShadow"><div id="userDlg"> </div></div> </td><td class="welcomePrompt"> - <? if (!SINGLE_USER_MODE) { ?> - Hello, <b><?= $_SESSION["name"] ?></b> + <?php if (!SINGLE_USER_MODE) { ?> + Hello, <b><?php echo $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>) - <? } ?> + <?php } ?> </td></tr> -<? } ?> +<?php } ?> <tr> - <? if (get_pref($link, 'COMBINED_DISPLAY_MODE')) + <?php if (get_pref($link, 'COMBINED_DISPLAY_MODE')) $feeds_rowspan = 2; else $feeds_rowspan = 3; ?> - <td valign="top" rowspan="<?= $feeds_rowspan ?>" class="feeds"> + <td valign="top" rowspan="<?php echo $feeds_rowspan ?>" class="feeds"> <table class="innerFeedTable" cellspacing="0" cellpadding="0" height="100%" width="100%"> <tr><td> @@ -153,14 +153,14 @@ window.onload = init; <form id="main_toolbar_form"> - <? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?> + <?php if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?> <input name="query" onKeyPress="return filterCR(event)" onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();"> <input class="button" type="submit" onclick="return viewCurrentFeed(0)" value="Search"> - <? } ?> + <?php } ?> View: <select name="view_mode" onchange="viewCurrentFeed(0, '')"> @@ -171,7 +171,7 @@ window.onload = init; </select> Limit: - <? + <?php $limits = array(15 => 15, 30 => 30, 60 => 60, 0 => "All"); $def_art_limit = get_pref($link, 'DEFAULT_ARTICLE_LIMIT'); @@ -214,9 +214,9 @@ window.onload = init; <!-- <option>Edit this feed</option> --> <option disabled>--------</option> <option style="color : #5050aa" disabled>All feeds:</option> - <? if (!ENABLE_UPDATE_DAEMON && !DAEMON_REFRESH_ONLY) { ?> + <?php if (!ENABLE_UPDATE_DAEMON && !DAEMON_REFRESH_ONLY) { ?> <option value="qmcUpdateFeeds"> Update</option> - <? } ?> + <?php } ?> <option value="qmcCatchupAll"> Mark as read</option> <option value="qmcShowOnlyUnread"> Show only unread</option> <option disabled>--------</option> @@ -228,14 +228,14 @@ window.onload = init; </table> </td> </tr> -<? if (get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?> +<?php if (get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?> <tr> <td id="headlines" class="headlines2" valign="top"> <iframe frameborder="0" name="headlines-frame" id="headlines-frame" class="headlinesFrame"></iframe> </td> </tr> -<? } else { ?> +<?php } else { ?> <tr> <td id="headlines" class="headlines" valign="top"> <iframe frameborder="0" name="headlines-frame" @@ -247,20 +247,20 @@ window.onload = init; id="content-frame" class="contentFrame"> </iframe> </td> </tr> -<? } ?> -<? if (get_pref($link, 'DISPLAY_FOOTER')) { ?> +<?php } ?> +<?php if (get_pref($link, 'DISPLAY_FOOTER')) { ?> <tr> <td colspan="2" class="footer" id="mainFooter"> - <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?= VERSION ?> © 2005-2006 Andrew Dolgov - <? if (WEB_DEMO_MODE) { ?> + <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?php echo VERSION ?> © 2005-2006 Andrew Dolgov + <?php if (WEB_DEMO_MODE) { ?> <br>Running in demo mode, some functionality is disabled. - <? } ?> + <?php } ?> </td> </td> -<? } ?> +<?php } ?> </table> -<? db_close($link); ?> +<?php db_close($link); ?> <script type="text/javascript"> /* for IE */ diff --git a/update_daemon.php b/update_daemon.php index a6fb5461d..5c7036820 100644 --- a/update_daemon.php +++ b/update_daemon.php @@ -1,5 +1,5 @@ #!/usr/bin/php4 -<? +<?php // this daemon runs in the background and updates all feeds // continuously diff --git a/update_feeds.php b/update_feeds.php index 31e3a1283..5d8ea2da8 100644 --- a/update_feeds.php +++ b/update_feeds.php @@ -1,5 +1,5 @@ #!/usr/bin/php4 -<? +<?php // this script is probably run not from your httpd-user, so cache // directory defined in config.php won't be accessible define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-cli'); diff --git a/version.php b/version.php index 5e474734d..9450b9bbb 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@ -<? +<?php define(VERSION, "1.2.1.99"); ?> diff --git a/xml-rpc.php b/xml-rpc.php index b02400dc2..eaa55e566 100644 --- a/xml-rpc.php +++ b/xml-rpc.php @@ -1,4 +1,4 @@ -<? +<?php require "xmlrpc/lib/xmlrpc.inc"; require "xmlrpc/lib/xmlrpcs.inc"; |