From a190ebfde1ea6b8e1ebc8a0f6acb2a019aa369c3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 22 Mar 2007 07:42:39 +0100 Subject: [PATCH] updater: render login form on access level violation (closes #123) --- locale/ru_RU/LC_MESSAGES/messages.mo | Bin 19458 -> 19629 bytes locale/ru_RU/LC_MESSAGES/messages.po | 88 ++++++++++++--------------- update.php | 4 +- 3 files changed, 40 insertions(+), 52 deletions(-) diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index 4d4399057fb8df44d86a4ccc5108b9c2582e1575..ed6893ff0f0e2edc3c0ac600833ce9d6d76d2082 100644 GIT binary patch delta 4275 zcmXZedvI079l-IuKoY@(ghzNkZU~R?NPx?;G!-F$JX9EAh-0f%p**yuOc1R|xdUp2 zp;YuL5>XJQPC;=-CM_7+j`~k2rBRD8=nRjVYTMD`6c_|4kbb|OW$xV1p1o&xf4|@E zIb{8|)SLCG?3s>jUI_eal?tI34!bFY@6)a>u{VT0r6J_wUhIo+VR!rxd*Bz?4fDE$ z&>Q<;SFFa4I1k(55^Rfgcr&g^`mFHH1&g@OV|D}Tgaz0G zU7#Nld#JxU*9tPxJ53td73Y4HXuqTXY$HRRdhJPcr@baXoPdn09K$G zt%=v0(Fy9&@jK9k_TUgafR6hVo%bAe!s}?@9XRRU-?bO@w{!#Oa8Jh}2RckfGq@XF zXhG~>gjQfRavsBT=zV*mZ=sbsi1YD7bfG~!8dh`+cE-u*xY{fY7rqY-WLf;-arCgP zM>E)jF1#JhpaGqrG5RjLz+rU379jIw!%7-XxGCPS1D)U? zTKf0V3VnoTd_3HO_$6A=3uxw7<8?v*Wd33tOMmD7)PE$6 zS#&ty=h3Io1vcZi&o_Fw_MnI85PGOSLIe9Zw!#15Fbo5dQ(uYpkHQKZk8aWZXrOBc zQ2)_1o}$COI)pCx=jbuaUIh*D;?T-bN46JDA3!NOIvnn2#OUSSRR)1~w3_;5c;LL^ShR=pmhhZpBZd zYtZ|$8)@XxcmbVwdvrJYpUz%%p|j`&=db{;;@}j2H&9p4z_7u||7z99PhkbRwcBt4 z{slRQA#X^MPz6$vY?wjAJzR{I>M`{Bd>&nJPrUwJ^hoqHF6Q_1Xoh!FSA7(%$X4{s z{05z`5nZPV4eakY+vmR{C&n}I02=9w$R`}*%aXTX2K!eg0oJ0GszWD!EV>!Zd>48+ zk6;?lAfM2}m-AItB~RB~Sm^V=jE0dtf=;**4dfN%$q6508D5LO_Zgl%&l&X1Hxuu` zr8p4}pc#IR?XhA+QkijRBJ{>*gt{U3}6QO0(uDf8zMZ7 zY-`wsPIxqW5lyHkt1ZGR^aYf|B77s-n4$je`C&S=Io^0ZUYCwaDlh^q;XE|Z^~jSK zp2bdh5DoBX^c=S1x|n_KfIZMahv6)ok5+E?XzFj{T{@iL4Bm_$eXk3#BUYgkO^W?< z(M(ohAwGegnJviL;g492=dlx3@wzj?$>MiadU2jb7L2D3Y9n882L3IB^$p!Ii>$cxdE zm*aHIU{`z`Z^0Z|nPbR#3!kA0bmj!RWn+;iG%P{`cm@slP2|>WI7x%5hYsIOUX9bx z2_iXaCujvfn?n69?FBkK)%jDCl6S!>t_R^-oR1#T6WAG>u?#O`7wkSQIWr@0 z6xX$w#!cvb`_R7y-^V$465C?MZPee4GHe)gg{f#Jo6rGoqkHxqy4US_1Pr(Wtw=RG zejXa|lKA^p?8Wu#*ar`zPsu+qAFrSRv}9=vpwX6-;vNsjNq8^1;7%;Z#^`CZgsGWH zB?^%P9m>!%b02zWpGPx)4F}?3G|;cmz*D>iJ>>Uvr@?s(nb=W>rCe{qp|}f;ya_G! zSuDV>aS`4?57$D}nTJY1FAHfVW4CX*hSnJ~JcsA6Av?xjg(xptW;xyD&D F{twJ3!JGg9 delta 4230 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 Q^`ToUUo7odxnS=90R@Y;kN^Mx diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 6e94d8a2c..a0a4a555f 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-10 12:01+0300\n" +"POT-Creation-Date: 2007-03-22 12:41+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -114,18 +114,10 @@ msgstr "Неизвестная ошибка" msgid "This program requires XmlHttpRequest " msgstr "" -#: errors.php:6 -msgid "to function properly. Your browser doesn't seem to support it." -msgstr "" - #: errors.php:8 msgid "This program requires cookies " msgstr "" -#: errors.php:9 -msgid "to function properly. Your browser doesn't seem to support them." -msgstr "" - #: errors.php:11 msgid "Backend sanity check failed" msgstr "" @@ -170,140 +162,140 @@ msgid "" "\t\tofficial site for more information." msgstr "" -#: functions.php:2027 functions.php:2066 functions.php:2343 functions.php:3022 -#: functions.php:3052 modules/pref-feeds.php:857 +#: functions.php:2098 functions.php:2137 functions.php:2418 functions.php:3097 +#: functions.php:3127 modules/pref-feeds.php:857 msgid "Uncategorized" msgstr "Нет категории" -#: functions.php:2056 functions.php:2873 +#: functions.php:2127 functions.php:2948 msgid "Special" msgstr "Особые" -#: functions.php:2058 functions.php:2899 +#: functions.php:2129 functions.php:2974 msgid "Labels" msgstr "Метки" -#: functions.php:2076 functions.php:2365 functions.php:2883 +#: functions.php:2147 functions.php:2440 functions.php:2958 msgid "Starred articles" msgstr "Отмеченные статьи" -#: functions.php:2329 +#: functions.php:2404 msgid "Global search results" msgstr "Результаты поиска" -#: functions.php:2331 +#: functions.php:2406 msgid "Tag search results" msgstr "Результаты поиска" -#: functions.php:2347 +#: functions.php:2422 msgid "Category search results" msgstr "Результаты поиска" -#: functions.php:2360 +#: functions.php:2435 msgid "Feed search results" msgstr "Результаты поиска" -#: functions.php:2373 +#: functions.php:2448 msgid "Label search results" msgstr "Результаты поиска" -#: functions.php:2568 +#: functions.php:2643 msgid "New headlines for last 24 hours, as of " msgstr "Новые заголовки за последние 24 часа, на " -#: functions.php:2612 +#: functions.php:2687 msgid "" "You have been sent this email because you have enabled daily digests in Tiny " "Tiny RSS at " msgstr "" -#: functions.php:2614 +#: functions.php:2689 msgid "" "To unsubscribe, visit your configuration options or contact instance owner.\n" msgstr "" -#: functions.php:2780 functions.php:2809 +#: functions.php:2855 functions.php:2884 msgid "Select:" msgstr "Выбрать:" -#: functions.php:2781 functions.php:2810 +#: functions.php:2856 functions.php:2885 msgid "All" msgstr "Все" -#: functions.php:2782 functions.php:2811 functions.php:2814 tt-rss.php:164 +#: functions.php:2857 functions.php:2886 functions.php:2889 tt-rss.php:164 msgid "Unread" msgstr "Новые" -#: functions.php:2783 functions.php:2812 +#: functions.php:2858 functions.php:2887 msgid "None" msgstr "Нет" -#: functions.php:2786 +#: functions.php:2861 msgid "Toggle unread" msgstr "Изм. прочитанное" -#: functions.php:2787 +#: functions.php:2862 msgid "Toggle starred" msgstr "Изм. отмеченное" -#: functions.php:2789 +#: functions.php:2864 msgid "Mark as read" msgstr "Как прочитанные" -#: functions.php:2790 +#: functions.php:2865 msgid "This page" msgstr "Эту страницу" -#: functions.php:2791 +#: functions.php:2866 msgid "Entire feed" msgstr "Весь канал" -#: functions.php:2796 +#: functions.php:2871 msgid "Next page" msgstr "След. стр." -#: functions.php:2797 +#: functions.php:2872 msgid "Previous page" msgstr "Пред. cтр." -#: functions.php:2798 +#: functions.php:2873 msgid "First page" msgstr "На первую" -#: functions.php:2814 +#: functions.php:2889 msgid "Toggle:" msgstr "Изменить:" -#: functions.php:2815 tt-rss.php:163 +#: functions.php:2890 tt-rss.php:163 msgid "Starred" msgstr "Отмеченные" -#: functions.php:2817 +#: functions.php:2892 msgid "Mark as read:" msgstr "Пометить как прочит.:" -#: functions.php:2818 +#: functions.php:2893 msgid "Page" msgstr "Страница" -#: functions.php:2819 modules/pref-feeds.php:837 modules/pref-feeds.php:890 +#: functions.php:2894 modules/pref-feeds.php:837 modules/pref-feeds.php:890 #: modules/pref-filters.php:261 msgid "Feed" msgstr "Канал" -#: functions.php:2828 +#: functions.php:2903 msgid "Convert to Label" msgstr "Превратить в метку" -#: functions.php:2855 +#: functions.php:2930 msgid "Generated feed" msgstr "" -#: functions.php:3092 +#: functions.php:3167 msgid "No feeds to display." msgstr "Нет каналов для отображения." -#: functions.php:3109 +#: functions.php:3184 msgid "Tags" msgstr "Теги" @@ -618,10 +610,6 @@ msgstr "" msgid "config: SESSION_EXPIRE_TIME should be greater or equal to" msgstr "" -#: sanity_check.php:53 -msgid "SESSION_COOKIE_LIFETIME" -msgstr "" - #: sanity_check.php:61 msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE" msgstr "" @@ -711,9 +699,9 @@ msgstr "Обновить" msgid "No feed selected." msgstr "Канал не выбран." -#: update.php:24 -msgid "Error: your access level is insufficient to run this script." -msgstr "" +#: update.php:23 +msgid "Your access level is insufficient to run this script." +msgstr "В доступе отказано - недостаточный уровень привилегий." #: update.php:49 msgid "Database Updater" diff --git a/update.php b/update.php index 27cd871f9..3851679ac 100644 --- a/update.php +++ b/update.php @@ -20,8 +20,8 @@ $owner_uid = $_SESSION["uid"]; if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) { - print "

". - __("Error: your access level is insufficient to run this script.")."

"; + $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script."); + render_login_form($link); exit; }