codes****@googl*****
codes****@googl*****
2009年 2月 7日 (土) 19:53:23 JST
Author: tacahi
Date: Sat Feb 7 02:32:45 2009
New Revision: 1139
Added:
trunk/geeklog-1-jp/sql/updates/mssql_1.5.1_to_1.5.2.php (contents,
props changed)
trunk/geeklog-1-jp/sql/updates/mysql_1.5.1_to_1.5.2.php (contents,
props changed)
trunk/geeklog-1-jp/system/pear/Archive/Zip.php
- copied unchanged from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Archive/Zip.php
trunk/geeklog-1-jp/system/pear/Auth/
- copied from r1137, /externals/geeklog-1.5.2rc1/system/pear/Auth/
trunk/geeklog-1-jp/system/pear/Auth/SASL/
- copied from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Auth/SASL/
trunk/geeklog-1-jp/system/pear/Auth/SASL.php
- copied unchanged from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Auth/SASL.php
trunk/geeklog-1-jp/system/pear/Auth/SASL/Anonymous.php
- copied unchanged from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Auth/SASL/Anonymous.php
trunk/geeklog-1-jp/system/pear/Auth/SASL/Common.php
- copied unchanged from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Auth/SASL/Common.php
trunk/geeklog-1-jp/system/pear/Auth/SASL/CramMD5.php
- copied unchanged from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Auth/SASL/CramMD5.php
trunk/geeklog-1-jp/system/pear/Auth/SASL/DigestMD5.php
- copied unchanged from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Auth/SASL/DigestMD5.php
trunk/geeklog-1-jp/system/pear/Auth/SASL/Login.php
- copied unchanged from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Auth/SASL/Login.php
trunk/geeklog-1-jp/system/pear/Auth/SASL/Plain.php
- copied unchanged from r1137,
/externals/geeklog-1.5.2rc1/system/pear/Auth/SASL/Plain.php
Removed:
trunk/geeklog-1-jp/public_html/admin/install/addindex.php
Modified:
trunk/geeklog-1-jp/language/german.php
trunk/geeklog-1-jp/language/german_formal.php
trunk/geeklog-1-jp/language/german_formal_utf-8.php
trunk/geeklog-1-jp/language/german_utf-8.php
trunk/geeklog-1-jp/language/polish.php
trunk/geeklog-1-jp/language/polish_utf-8.php
trunk/geeklog-1-jp/plugins/calendar/functions.inc
trunk/geeklog-1-jp/plugins/links/functions.inc
trunk/geeklog-1-jp/plugins/links/language/slovenian.php
trunk/geeklog-1-jp/plugins/links/language/slovenian_utf-8.php
trunk/geeklog-1-jp/plugins/polls/functions.inc
trunk/geeklog-1-jp/plugins/polls/install_defaults.php
trunk/geeklog-1-jp/plugins/polls/templates/admin/polleditor.thtml
trunk/geeklog-1-jp/plugins/spamx/functions.inc
trunk/geeklog-1-jp/plugins/spamx/language/hebrew_utf-8.php
trunk/geeklog-1-jp/plugins/staticpages/functions.inc
trunk/geeklog-1-jp/plugins/staticpages/language/japanese_utf-8.php
trunk/geeklog-1-jp/plugins/staticpages/services.inc.php
trunk/geeklog-1-jp/plugins/staticpages/templates/printable.thtml
trunk/geeklog-1-jp/public_html/admin/install/config-install.php
trunk/geeklog-1-jp/public_html/admin/install/index.php
trunk/geeklog-1-jp/public_html/admin/install/language/german.php
trunk/geeklog-1-jp/public_html/admin/install/language/hebrew_utf-8.php
trunk/geeklog-1-jp/public_html/admin/install/language/polish.php
trunk/geeklog-1-jp/public_html/admin/moderation.php
trunk/geeklog-1-jp/public_html/admin/plugins.php
trunk/geeklog-1-jp/public_html/admin/plugins/calendar/install.php
trunk/geeklog-1-jp/public_html/admin/plugins/links/index.php
trunk/geeklog-1-jp/public_html/admin/plugins/links/install.php
trunk/geeklog-1-jp/public_html/admin/plugins/polls/index.php
trunk/geeklog-1-jp/public_html/admin/plugins/polls/install.php
trunk/geeklog-1-jp/public_html/admin/plugins/spamx/install.php
trunk/geeklog-1-jp/public_html/admin/plugins/staticpages/install.php
trunk/geeklog-1-jp/public_html/admin/story.php
trunk/geeklog-1-jp/public_html/admin/syndication.php
trunk/geeklog-1-jp/public_html/admin/topic.php
trunk/geeklog-1-jp/public_html/admin/user.php
trunk/geeklog-1-jp/public_html/article.php
trunk/geeklog-1-jp/public_html/calendar/event.php
trunk/geeklog-1-jp/public_html/calendar/index.php
trunk/geeklog-1-jp/public_html/docs/changes.html
trunk/geeklog-1-jp/public_html/docs/config.html
trunk/geeklog-1-jp/public_html/docs/history
trunk/geeklog-1-jp/public_html/docs/theme.html
trunk/geeklog-1-jp/public_html/lib-common.php
trunk/geeklog-1-jp/public_html/links/index.php
trunk/geeklog-1-jp/public_html/profiles.php
trunk/geeklog-1-jp/public_html/siteconfig.php
trunk/geeklog-1-jp/public_html/staticpages/index.php
trunk/geeklog-1-jp/public_html/users.php
trunk/geeklog-1-jp/public_html/usersettings.php
trunk/geeklog-1-jp/readme
trunk/geeklog-1-jp/sql/mssql_tableanddata.php
trunk/geeklog-1-jp/sql/mysql_tableanddata.php
trunk/geeklog-1-jp/sql/updates/mssql_1.4.1_to_1.5.0.php
trunk/geeklog-1-jp/sql/updates/mysql_1.3.9_to_1.3.10.php
trunk/geeklog-1-jp/sql/updates/mysql_1.4.1_to_1.5.0.php
trunk/geeklog-1-jp/system/classes/calendar.class.php
trunk/geeklog-1-jp/system/classes/config.class.php
trunk/geeklog-1-jp/system/classes/downloader.class.php
trunk/geeklog-1-jp/system/classes/sanitize.class.php
trunk/geeklog-1-jp/system/classes/story.class.php
trunk/geeklog-1-jp/system/classes/syndication/feedparserbase.class.php
trunk/geeklog-1-jp/system/classes/upload.class.php
trunk/geeklog-1-jp/system/lib-admin.php
trunk/geeklog-1-jp/system/lib-comment.php
trunk/geeklog-1-jp/system/lib-plugins.php
trunk/geeklog-1-jp/system/lib-story.php
trunk/geeklog-1-jp/system/lib-syndication.php
trunk/geeklog-1-jp/system/pear/HTTP/Request.php
trunk/geeklog-1-jp/system/pear/HTTP/Request/Listener.php
trunk/geeklog-1-jp/system/pear/Net/SMTP.php
Log:
geeklog-1.5.1とgeeklog-1.5.2rc1の差分をマージします。
Modified: trunk/geeklog-1-jp/language/german.php
==============================================================================
--- trunk/geeklog-1-jp/language/german.php (original)
+++ trunk/geeklog-1-jp/language/german.php Sat Feb 7 02:32:45 2009
@@ -1514,7 +1514,7 @@
'records_found' => 'Eintr�ge',
'addchild' => 'Add child',
'list' => 'auflisten',
- 'list_all' => 'alle auflisten'
+ 'list_all' => 'Alle auflisten'
);
# Localisation of the texts for the various drop-down menus that are
actually
@@ -1788,7 +1788,7 @@
'sg_site' => 'Site',
'sg_stories' => 'Artikel und Trackbacks',
'sg_theme' => 'Theme',
- 'sg_blocks' => 'Blocks',
+ 'sg_blocks' => 'Bl�cke',
'sg_users' => 'User und Beitr�ge',
'sg_images' => 'Images',
'sg_locale' => 'Sprache und Lokalisierung',
Modified: trunk/geeklog-1-jp/language/german_formal.php
==============================================================================
--- trunk/geeklog-1-jp/language/german_formal.php (original)
+++ trunk/geeklog-1-jp/language/german_formal.php Sat Feb 7 02:32:45 2009
@@ -1515,7 +1515,7 @@
'records_found' => 'Eintr�ge',
'addchild' => 'Add child',
'list' => 'auflisten',
- 'list_all' => 'alle auflisten'
+ 'list_all' => 'Alle auflisten'
);
# Localisation of the texts for the various drop-down menus that are
actually
@@ -1789,7 +1789,7 @@
'sg_site' => 'Site',
'sg_stories' => 'Artikel und Trackbacks',
'sg_theme' => 'Theme',
- 'sg_blocks' => 'Blocks',
+ 'sg_blocks' => 'Bl�cke',
'sg_users' => 'User und Beitr�ge',
'sg_images' => 'Images',
'sg_locale' => 'Sprache und Lokalisierung',
Modified: trunk/geeklog-1-jp/language/german_formal_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/language/german_formal_utf-8.php (original)
+++ trunk/geeklog-1-jp/language/german_formal_utf-8.php Sat Feb 7 02:32:45
2009
@@ -1515,7 +1515,7 @@
'records_found' => 'Einträge',
'addchild' => 'Add child',
'list' => 'auflisten',
- 'list_all' => 'alle auflisten'
+ 'list_all' => 'Alle auflisten'
);
# Localisation of the texts for the various drop-down menus that are
actually
@@ -1789,7 +1789,7 @@
'sg_site' => 'Site',
'sg_stories' => 'Artikel und Trackbacks',
'sg_theme' => 'Theme',
- 'sg_blocks' => 'Blocks',
+ 'sg_blocks' => 'Blöcke',
'sg_users' => 'User und Beiträge',
'sg_images' => 'Images',
'sg_locale' => 'Sprache und Lokalisierung',
Modified: trunk/geeklog-1-jp/language/german_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/language/german_utf-8.php (original)
+++ trunk/geeklog-1-jp/language/german_utf-8.php Sat Feb 7 02:32:45 2009
@@ -1514,7 +1514,7 @@
'records_found' => 'Einträge',
'addchild' => 'Add child',
'list' => 'auflisten',
- 'list_all' => 'alle auflisten'
+ 'list_all' => 'Alle auflisten'
);
# Localisation of the texts for the various drop-down menus that are
actually
@@ -1788,7 +1788,7 @@
'sg_site' => 'Site',
'sg_stories' => 'Artikel und Trackbacks',
'sg_theme' => 'Theme',
- 'sg_blocks' => 'Blocks',
+ 'sg_blocks' => 'Blöcke',
'sg_users' => 'User und Beiträge',
'sg_images' => 'Images',
'sg_locale' => 'Sprache und Lokalisierung',
Modified: trunk/geeklog-1-jp/language/polish.php
==============================================================================
--- trunk/geeklog-1-jp/language/polish.php (original)
+++ trunk/geeklog-1-jp/language/polish.php Sat Feb 7 02:32:45 2009
@@ -2,7 +2,7 @@
###############################################################################
# polish.php
-# This is the Polish language page for GeekLog!
+# This is the Polish language file for Geeklog!
# Special thanks to Robert Stadnik geekl****@geekl***** for his work on
this project
#
# Copyright (C) 2000 Jason Whittenburg
@@ -80,7 +80,7 @@
37 => 'Brak artyku��w u�ytkownika',
38 => 'Syndykacja Tre�ci',
39 => 'Od�wie�',
- 40 => 'Masz <tt>register_globals = Off</tt> w pliku <tt>php.ini</tt>.
Niestety, Geeklog wymaga <tt>register_globals</tt> aby by�y ustawione na
<strong>on</strong>. Prosz� zminie� ustawienia na <strong>on</strong> i
restartowa� serwer www.',
+ 40 => 'Masz <tt>register_globals = Off</tt> w pliku <tt>php.ini</tt>.
Niestety, Geeklog wymaga <tt>register_globals</tt> aby by�y ustawione na
<strong>on</strong>. Prosz� zmienie� ustawienia na <strong>on</strong> i
restartowa� serwer www.',
41 => 'Go��',
42 => 'Autor:',
43 => 'Odpowiedz',
@@ -1579,90 +1579,90 @@
'sections' => 'Configuration Sections',
'restore' => 'Restore',
'add_element' => 'Add Element',
- 'save_changes' => 'Save Changes',
- 'reset_form' => 'Reset Form',
+ 'save_changes' => 'Zapisz zmiany',
+ 'reset_form' => 'Resetuj zmiany',
'changes_made' => 'Changes were successfully made to',
- 'title' => 'Configuration Manager',
- 'disable' => 'Click to disable this option'
+ 'title' => 'Menad�er ustawie�',
+ 'disable' => 'Kliknij aby wy��czy� t� opcj�'
);
$LANG_configsections['Core'] = array(
'label' => 'Geeklog',
- 'title' => 'Geeklog Configuration'
+ 'title' => 'Konfiguracja Geeklog-a'
);
$LANG_confignames['Core'] = array(
- 'path_html' => 'HTML Path',
- 'site_url' => 'Site URL',
- 'site_admin_url' => 'Admin URL',
- 'site_mail' => 'Site E-Mail',
- 'noreply_mail' => 'No-Reply E-Mail',
- 'site_name' => 'Site Name',
+ 'path_html' => '�cie�ka HTML',
+ 'site_url' => 'Adres URL',
+ 'site_admin_url' => 'Adres panelu administracyjnego',
+ 'site_mail' => 'E-Mail strony',
+ 'noreply_mail' => 'E-Mail w jedn� stron�',
+ 'site_name' => 'Nazwa strony',
'site_slogan' => 'Slogan',
- 'microsummary_short' => 'Microsummary',
+ 'microsummary_short' => 'Mikro streszczenie',
'path_log' => 'Log',
- 'path_language' => 'Language',
- 'backup_path' => 'Backup',
- 'path_data' => 'Data',
- 'path_images' => 'Images',
- 'path_pear' => 'Path Pear',
- 'have_pear' => 'Have Pear?',
- 'mail_settings' => 'Mail Settings',
- 'allow_mysqldump' => 'Allow MySQL Dump',
- 'mysqldump_path' => 'Path of Executable',
- 'mysqldump_options' => 'MySQL Dump Options',
- 'theme' => 'Theme',
- 'menu_elements' => 'Menu Elements',
- 'path_themes' => 'Themes Path',
- 'disable_new_user_registration' => 'Disable New Registrations',
- 'allow_user_themes' => 'Allow User Themes',
- 'allow_user_language' => 'Allow User Language',
- 'allow_user_photo' => 'Allow User Photo',
- 'allow_username_change' => 'Allow Username Changes',
- 'allow_account_delete' => 'Allow Account Deletion',
- 'hide_author_exclusion' => 'Allow Hide Author',
- 'show_fullname' => 'Show Fullname',
- 'show_servicename' => 'Show Service Name',
- 'custom_registration' => 'Enable Custom Registration',
- 'user_login_method' => 'User Login Method',
- 'spamx' => 'Spam-X Actions',
- 'sort_admin' => 'Sort Links',
- 'language' => 'Language',
- 'locale' => 'Locale',
- 'date' => 'Date Format',
- 'daytime' => 'Daytime Format',
- 'shortdate' => 'Short Date Format',
- 'dateonly' => 'Date Only Format',
- 'timeonly' => 'Time Only Format',
- 'week_start' => 'Week Start',
- 'hour_mode' => 'Hour Mode',
- 'thousand_separator' => 'Thousands Separator',
- 'decimal_separator' => 'Decimal Separator',
- 'decimal_count' => 'Decimal Count',
- 'language_files' => 'Language Files',
- 'languages' => 'Languages',
- 'timezone' => 'Timezone',
- 'site_disabled_msg' => 'Site Disabled Message or URL',
+ 'path_language' => 'J�zyk',
+ 'backup_path' => 'Kopia zapasowa',
+ 'path_data' => 'Dane',
+ 'path_images' => 'Zdj�cia',
+ 'path_pear' => '�cie�ka do Pear',
+ 'have_pear' => 'Czy jest biblioteka Pear?',
+ 'mail_settings' => 'Ustawienia poczty',
+ 'allow_mysqldump' => 'Zezwalaj na zrzut MySQL',
+ 'mysqldump_path' => '�cie�ka do plik�w wykonawczych',
+ 'mysqldump_options' => 'Opcje zrzutu MySQL',
+ 'theme' => 'Layout',
+ 'menu_elements' => 'Elementy Menu',
+ 'path_themes' => '�cie�ka do katalogu z layoutami',
+ 'disable_new_user_registration' => 'Wy��cz rejestracj� nowych
u�ytkownik�w',
+ 'allow_user_themes' => 'U�ytkownik mo�e zmienia� layout',
+ 'allow_user_language' => 'U�ytkownik mo�e zmienia� j�zyk',
+ 'allow_user_photo' => 'U�ytkownik mo�e doda� swoje zdj�cie',
+ 'allow_username_change' => 'U�ytkownik mo�e zmieni� nazw� konta',
+ 'allow_account_delete' => 'U�ytkownik mo�e usun�� swoje',
+ 'hide_author_exclusion' => 'Zezwalaj na ukrycie autora',
+ 'show_fullname' => 'Poka� pe�n� nazw� u�ytkwonika',
+ 'show_servicename' => 'Pokazuj nazw� us�ugi',
+ 'custom_registration' => 'W��cz w�asn� rejestracj�',
+ 'user_login_method' => 'Metoda logowania u�ytkownika',
+ 'spamx' => 'Spam-X ustawienia',
+ 'sort_admin' => 'Sortowanie odno�nik�w',
+ 'language' => 'J�zyk',
+ 'locale' => 'Opcje regionalne',
+ 'date' => 'Format Daty',
+ 'daytime' => 'Format daty dziennej',
+ 'shortdate' => 'Format daty kr�tkiej',
+ 'dateonly' => 'Tylko data - format',
+ 'timeonly' => 'Tylko godzina - format',
+ 'week_start' => 'Pocz�tek Tygodnia',
+ 'hour_mode' => 'Tryb godzinowy',
+ 'thousand_separator' => 'Separator tysi�czny',
+ 'decimal_separator' => 'Separator dziesi�tny',
+ 'decimal_count' => 'Liczenie dziesi�tne',
+ 'language_files' => 'Pliki j�zykowe',
+ 'languages' => 'J�zyki',
+ 'timezone' => 'Strefa czasowa',
+ 'site_disabled_msg' => 'Komunikat lub odno�nik podczas wy��czenia
strony',
'rootdebug' => 'Root Debugging',
- 'cookie_session' => 'Session Cookie Name',
- 'cookie_name' => 'Permanent Cookie Name',
- 'cookie_password' => 'Password Cookie Name',
- 'cookie_theme' => 'Theme Cookie Name',
- 'cookie_language' => 'Language Cookie Name',
- 'cookie_tzid' => 'Timezone Cookie Name',
- 'cookie_ip' => 'Cookies embed IP?',
- 'default_perm_cookie_timeout' => 'Permanent Timeout',
- 'session_cookie_timeout' => 'Session Timeout',
- 'cookie_path' => 'Cookie Path',
- 'cookiedomain' => 'Cookie Domain',
+ 'cookie_session' => 'Nazwa ciasteczka sesji',
+ 'cookie_name' => 'Nazwa ciasteczka sta�ego',
+ 'cookie_password' => 'Nazwa ciasteczka z has�em',
+ 'cookie_theme' => 'Nazwa ciasteczka layoutu',
+ 'cookie_language' => 'Nazwa ciasteczka j�zykowego',
+ 'cookie_tzid' => 'Nazwa ciasteczka strefy czasowej',
+ 'cookie_ip' => 'Czy ciasteczko ma zawiera� adres IP?',
+ 'default_perm_cookie_timeout' => 'Sta�e wyga�ni�cie',
+ 'session_cookie_timeout' => 'Wyga�ni�cie sesji',
+ 'cookie_path' => '�cie�ka ciasteczek',
+ 'cookiedomain' => 'Domena ciasteczek',
'cookiesecure' => 'Cookie Secure',
- 'lastlogin' => 'Record Last Login?',
- 'pdf_enabled' => 'PDF Enabled?',
- 'num_search_results' => 'Number of Search Results',
- 'loginrequired' => 'Login Required?',
- 'submitloginrequired' => 'Submit Login Required?',
- 'commentsloginrequired' => 'Comment Login Required?',
- 'statsloginrequired' => 'Stats Login Required?',
+ 'lastlogin' => 'Zarejestrowa� ostatnie logowanie?',
+ 'pdf_enabled' => 'PDF w��czony?',
+ 'num_search_results' => 'Liczba wynik�w z wyszukiwarki',
+ 'loginrequired' => 'Wymagane zalogowanie?',
+ 'submitloginrequired' => 'Wymagane zalogowanie do przes�ania
materia��w?',
+ 'commentsloginrequired' => 'Wymagane zalogowanie do skomentowania?',
+ 'statsloginrequired' => 'Wymagane zalogowanie do przegl�dania
statystyk?',
'searchloginrequired' => 'Search Login Required?',
'profileloginrequired' => 'Profile Login Required?',
'emailuserloginrequired' => 'E-Mail User Login Required?',
@@ -1708,33 +1708,33 @@
'pingback_excerpt' => 'Create Pingback Excerpt?',
'link_documentation' => 'Link to Documentation?',
'link_versionchecker' => 'Link to Version Checker?',
- 'maximagesperarticle' => 'Max Images per Article',
- 'limitnews' => 'Stories per Page',
- 'minnews' => 'Min. Stories per Page',
- 'contributedbyline' => 'Show "Contributed By"?"',
- 'hideviewscount' => 'Hide Views Count?',
- 'hideemailicon' => 'Hide E-Mail Icon?',
- 'hideprintericon' => 'Hide Print Icon?',
- 'allow_page_breaks' => 'Allow Page Breaks?',
- 'page_break_comments' => 'Comments on Multi-Page Articles',
- 'article_image_align' => 'Topic Icon Alignment',
- 'show_topic_icon' => 'Show Topic Icon?',
+ 'maximagesperarticle' => 'Maks. liczba zdj�� w artykule',
+ 'limitnews' => 'Liczba artyku��w na stron�',
+ 'minnews' => 'Min. liczba artyku��w na stron�',
+ 'contributedbyline' => 'Poka� "Autor"?"',
+ 'hideviewscount' => 'Ukryj liczb� ods�on?',
+ 'hideemailicon' => 'Ukryj ikon� emaila?',
+ 'hideprintericon' => 'Ukryj ikon� drukowania?',
+ 'allow_page_breaks' => 'Zezwalaj na �amanie stron?',
+ 'page_break_comments' => 'Komentarze dla artyku��w wielostronicowych',
+ 'article_image_align' => 'Wyr�wnywanie ikon sekcji',
+ 'show_topic_icon' => 'Poka� ikon� sekcji?',
'draft_flag' => 'Draft Flag Default',
'frontpage' => 'Frontpage Default',
'hide_no_news_msg' => 'Hide "No News" Message?',
'hide_main_page_navigation' => 'Hide Main Page Navigation?',
'onlyrootfeatures' => 'Only Root can Feature?',
- 'aftersave_story' => 'After Saving Story',
- 'aftersave_user' => 'After Saving User',
- 'show_right_blocks' => 'Always Show Right Blocks?',
- 'showfirstasfeatured' => 'Show First Story as Featured?',
- 'backend' => 'Enable Feeds?',
- 'rdf_file' => 'Syndication Output Folder',
- 'rdf_limit' => 'Feed Limit',
- 'rdf_storytext' => 'Length of Stories in Feed',
- 'rdf_language' => 'Feed Language',
- 'syndication_max_headlines' => 'Max. Number of Headlines (portal
blocks)',
- 'copyrightyear' => 'Copyright Year',
+ 'aftersave_story' => 'Po zapisaniu artyku�u',
+ 'aftersave_user' => 'Po zapisaniu u�ytkownika',
+ 'show_right_blocks' => 'Zawsze pokazuj prawe bloki?',
+ 'showfirstasfeatured' => 'Poka� pierwszy artyku� jako Artyku� Dnia?',
+ 'backend' => 'W��cz kana�y RSS?',
+ 'rdf_file' => 'Katalog z plikami do syndykacji tre�ci',
+ 'rdf_limit' => 'Limit kana��w RSS',
+ 'rdf_storytext' => 'D�ugo�� artyku�u w pliku RSS',
+ 'rdf_language' => 'J�zyk kana�u RSS',
+ 'syndication_max_headlines' => 'Maks. liczba tytu��w (bloki
portalowe)',
+ 'copyrightyear' => 'Prawa Autorskie Rok',
'image_lib' => 'Image Library',
'path_to_mogrify' => 'Path to Mogrify',
'path_to_netpbm' => 'Path to Netpbm',
@@ -1770,7 +1770,7 @@
'censorreplace' => 'Censor Replace Text',
'censorlist' => 'Censor List',
'ip_lookup' => 'IP Lookup',
- 'url_rewrite' => 'Enable URL Rewrite',
+ 'url_rewrite' => 'W��cz przyjazne adresy URL',
'default_permissions_block' => 'Block Default Permissions',
'default_permissions_story' => 'Story Default Permissions',
'default_permissions_topic' => 'Topic Default Permissions',
@@ -1780,80 +1780,80 @@
);
$LANG_configsubgroups['Core'] = array(
- 'sg_site' => 'Site',
- 'sg_stories' => 'Stories and Trackback',
- 'sg_theme' => 'Theme',
- 'sg_blocks' => 'Blocks',
- 'sg_users' => 'Users and Submissions',
- 'sg_images' => 'Images',
- 'sg_locale' => 'Languages and Locale',
- 'sg_misc' => 'Miscellaneous'
+ 'sg_site' => 'Strona',
+ 'sg_stories' => 'Artyku�y i Powiadomienia Zwrotne',
+ 'sg_theme' => 'Layout',
+ 'sg_blocks' => 'Bloki',
+ 'sg_users' => 'U�ytkownicy i Przes�ane materia�y',
+ 'sg_images' => 'Zdj�cia',
+ 'sg_locale' => 'J�zyki i Ustawienia regionalne',
+ 'sg_misc' => 'R�ne'
);
$LANG_fs['Core'] = array(
- 'fs_site' => 'Site',
- 'fs_paths' => 'Paths',
- 'fs_theme' => 'Theme',
- 'fs_mail' => 'Mail',
+ 'fs_site' => 'Strona',
+ 'fs_paths' => '�cie�ki',
+ 'fs_theme' => 'Layout',
+ 'fs_mail' => 'Poczta',
'fs_pear' => 'Pear',
'fs_mysql' => 'MySQL',
- 'fs_users' => 'Users',
- 'fs_misc' => 'Miscellaneous',
+ 'fs_users' => 'U�ytkownicy',
+ 'fs_misc' => 'R�ne',
'fs_spamx' => 'Spam-X',
'fs_admin_block' => 'Admin Block',
- 'fs_locale' => 'Locale',
- 'fs_language' => 'Language',
+ 'fs_locale' => 'Ustawienia regionalne',
+ 'fs_language' => 'J�zyk',
'fs_debug' => 'Debug',
- 'fs_cookies' => 'Cookies',
- 'fs_login' => 'Login Settings',
- 'fs_search' => 'Search',
- 'fs_user_submission' => 'User Submission',
- 'fs_submission' => 'Submission Settings',
- 'fs_topics_block' => 'Topics Block',
+ 'fs_cookies' => 'Ciasteczka',
+ 'fs_login' => 'Ustawienia logowania',
+ 'fs_search' => 'Szukaj',
+ 'fs_user_submission' => 'Materia�y u�ytkownik�w',
+ 'fs_submission' => 'Ustawienia przesy�ania materia��w',
+ 'fs_topics_block' => 'Blok sekcji',
'fs_whosonline_block' => 'Who\'s Online Block',
'fs_daily_digest' => 'Daily Digest',
- 'fs_whatsnew_block' => 'What\'s New Block',
+ 'fs_whatsnew_block' => 'Nowo�ci',
'fs_trackback' => 'Trackback',
'fs_pingback' => 'Pingback',
- 'fs_story' => 'Story',
- 'fs_theme_advanced' => 'Advanced Settings',
- 'fs_syndication' => 'Syndication',
- 'fs_imagelib' => 'Image Library',
- 'fs_upload' => 'Upload',
- 'fs_articleimg' => 'Images in Articles',
- 'fs_topicicon' => 'Topic Icons',
- 'fs_userphoto' => 'Photos',
+ 'fs_story' => 'Artyku�',
+ 'fs_theme_advanced' => 'Ustawienia zaawansowane',
+ 'fs_syndication' => 'Syndykacja tre�ci',
+ 'fs_imagelib' => 'Katalog zdj��',
+ 'fs_upload' => '�aduj',
+ 'fs_articleimg' => 'Zdj�cia w artyku�ach',
+ 'fs_topicicon' => 'Ikony sekcji',
+ 'fs_userphoto' => 'Zdj�cia',
'fs_gravatar' => 'Gravatar',
- 'fs_comments' => 'Comments',
- 'fs_htmlfilter' => 'HTML Filtering',
- 'fs_censoring' => 'Censoring',
- 'fs_iplookup' => 'IP Lookup',
- 'fs_perm_story' => 'Story Default Permission',
- 'fs_perm_topic' => 'Topic Default Permission',
- 'fs_perm_block' => 'Block Default Permission',
- 'fs_webservices' => 'Webservices'
+ 'fs_comments' => 'Komentarze',
+ 'fs_htmlfilter' => 'Filtrowanie HTML',
+ 'fs_censoring' => 'Cenzura',
+ 'fs_iplookup' => 'Podgl�d IP',
+ 'fs_perm_story' => 'Domy�lne ustawienia dla artyku��w',
+ 'fs_perm_topic' => 'Domy�lne ustawienia dla sekcji',
+ 'fs_perm_block' => 'Domy�lne ustawienia dla blok�w',
+ 'fs_webservices' => 'Us�ugi WWW'
);
$LANG_configselects['Core'] = array(
- 0 => array('True' => 1, 'False' => 0),
- 1 => array('True' => true, 'False' => false),
- 2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple
Posts' => 2),
- 3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
- 4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' =>
1, 'Check full URL' => 2, 'Check against Site URL and full URL' =>
3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP
and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted'
=> 'html'),
+ 0 => array('Tak' => 1, 'Nie' => 0),
+ 1 => array('Tak' => true, 'Nie' => false),
+ 2 => array('Odrzu�' => 0, 'Tylko Najnowsze' => 1, 'Zezwalaj na Wiele
Post�w' => 2),
+ 3 => array('Trackback W��czony' => 0, 'Trackback Wy��czony' => -1),
+ 4 => array('Nie sprawdzaj Niczego' => 0, 'Sprawd� wedle adresu strony'
=> 1, 'Sprawd� ca�y URL' => 2, 'Sprawd� wedle adresu strony i kompletnego
URL' => 3, 'Check IP against Site IP' => 4, 'Sprawd� IP i URL strony' =>
5, 'Sprawd� IP i pe�ny URL' => 6, 'Sprawd� IP, pe�ny URL, i URL strony' =>
7),
+ 5 => array('Tekst' => 'plaintext', 'HTML' => 'html'),
6 => array('12' => 12, '24' => 24),
- 7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every
Page' => 'all'),
- 8 => array('Right' => 'right', 'Left' => 'left'),
- 9 => array('Forward to page' => 'item', 'Display List'
=> 'list', 'Display Home' => 'home', 'Display Admin' => 'admin'),
- 10 => array('None' => '', 'Netpbm' => 'netpbm', 'ImageMagick'
=> 'imagemagick', 'gdLib' => 'gdlib'),
- 11 => array('Flat' => 'flat', 'Nested' => 'nested', 'Threaded'
=> 'threaded', 'No Comments' => 'nocomment'),
- 12 => array('No access' => 0, 'Read-Only' => 2, 'Read-Write' => 3),
- 13 => array('Skip' => 0, 'Allow, with speedlimit' => 1, 'Allow, no
speedlimit' => 2),
- 14 => array('Sunday' => 'Sun', 'Monday' => 'Mon'),
- 15 => array('By Number' => 'sortnum', 'Alphabetically' => 'alpha'),
- 16 => array('No Login required' => 0, 'Advanced Search only' =>
1, 'Simple + Advanced Search' => 2),
- 17 => array('Comments Enabled' => 0, 'Comments Disabled' => -1),
- 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled
(Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3)
+ 7 => array('Ostatnia Strona' => 'last', 'Pierwsza Strona'
=> 'first', 'Wszystkie Strony' => 'all'),
+ 8 => array('Prawa' => 'right', 'Lewa' => 'left'),
+ 9 => array('Id� do strony' => 'item', 'Poka� list�' => 'list', 'Poka�
stron� g��wn�' => 'home', 'Poka� panel sterowania' => 'admin'),
+ 10 => array('Brak' => '', 'Netpbm' => 'netpbm', 'ImageMagick'
=> 'imagemagick', 'gdLib' => 'gdlib'),
+ 11 => array('Lista' => 'flat', 'Chronologicznie' => 'nested', 'Wg
w�tku' => 'threaded', 'Bez komentarzy' => 'nocomment'),
+ 12 => array('Brak dost�pu' => 0, 'Tylko do Odczytu' =>
2, 'Odczyt-Zapis' => 3),
+ 13 => array('Pomi�' => 0, 'Allow, with speedlimit' => 1, 'Allow, no
speedlimit' => 2),
+ 14 => array('Niedziela' => 'Sun', 'Poniedzia�ek' => 'Mon'),
+ 15 => array('Liczbowo' => 'sortnum', 'Alfabetycznie' => 'alpha'),
+ 16 => array('Login nie wymagany' => 0, 'Tylko wyszukiwanie
zaawansowane' => 1, 'Wyszukiwanie proste + zaawansowane' => 2),
+ 17 => array('Komentarze w��czone' => 0, 'Komentarze wy��czone' => -1),
+ 18 => array('Wy��czone' => 0, 'W��czone (Dok�adne trafienie)' =>
1, 'W��czone (Pocz�tek s�owa)' => 2, 'W��czone (Fragment s�owa)' => 3)
);
-?>
\ No newline at end of file
+?>
Modified: trunk/geeklog-1-jp/language/polish_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/language/polish_utf-8.php (original)
+++ trunk/geeklog-1-jp/language/polish_utf-8.php Sat Feb 7 02:32:45 2009
@@ -2,7 +2,7 @@
###############################################################################
# polish_utf-8.php
-# This is the Polish language page for GeekLog!
+# This is the Polish language file for Geeklog!
# Special thanks to Robert Stadnik geekl****@geekl***** for his work on
this project
#
# Copyright (C) 2000 Jason Whittenburg
@@ -80,7 +80,7 @@
37 => 'Brak artykułów użytkownika',
38 => 'Syndykacja Treści',
39 => 'Odśwież',
- 40 => 'Masz <tt>register_globals = Off</tt> w pliku <tt>php.ini</tt>.
Niestety, Geeklog wymaga <tt>register_globals</tt> aby były ustawione na
<strong>on</strong>. Proszę zminieć ustawienia na <strong>on</strong> i
restartować serwer www.',
+ 40 => 'Masz <tt>register_globals = Off</tt> w pliku <tt>php.ini</tt>.
Niestety, Geeklog wymaga <tt>register_globals</tt> aby były ustawione na
<strong>on</strong>. Proszę zmienieć ustawienia na <strong>on</strong> i
restartować serwer www.',
41 => 'Gość',
42 => 'Autor:',
43 => 'Odpowiedz',
@@ -1579,90 +1579,90 @@
'sections' => 'Configuration Sections',
'restore' => 'Restore',
'add_element' => 'Add Element',
- 'save_changes' => 'Save Changes',
- 'reset_form' => 'Reset Form',
+ 'save_changes' => 'Zapisz zmiany',
+ 'reset_form' => 'Resetuj zmiany',
'changes_made' => 'Changes were successfully made to',
- 'title' => 'Configuration Manager',
- 'disable' => 'Click to disable this option'
+ 'title' => 'Menadżer ustawień',
+ 'disable' => 'Kliknij aby wyłączyć tą opcję'
);
$LANG_configsections['Core'] = array(
'label' => 'Geeklog',
- 'title' => 'Geeklog Configuration'
+ 'title' => 'Konfiguracja Geeklog-a'
);
$LANG_confignames['Core'] = array(
- 'path_html' => 'HTML Path',
- 'site_url' => 'Site URL',
- 'site_admin_url' => 'Admin URL',
- 'site_mail' => 'Site E-Mail',
- 'noreply_mail' => 'No-Reply E-Mail',
- 'site_name' => 'Site Name',
+ 'path_html' => 'Ścieżka HTML',
+ 'site_url' => 'Adres URL',
+ 'site_admin_url' => 'Adres panelu administracyjnego',
+ 'site_mail' => 'E-Mail strony',
+ 'noreply_mail' => 'E-Mail w jedną stronę',
+ 'site_name' => 'Nazwa strony',
'site_slogan' => 'Slogan',
- 'microsummary_short' => 'Microsummary',
+ 'microsummary_short' => 'Mikro streszczenie',
'path_log' => 'Log',
- 'path_language' => 'Language',
- 'backup_path' => 'Backup',
- 'path_data' => 'Data',
- 'path_images' => 'Images',
- 'path_pear' => 'Path Pear',
- 'have_pear' => 'Have Pear?',
- 'mail_settings' => 'Mail Settings',
- 'allow_mysqldump' => 'Allow MySQL Dump',
- 'mysqldump_path' => 'Path of Executable',
- 'mysqldump_options' => 'MySQL Dump Options',
- 'theme' => 'Theme',
- 'menu_elements' => 'Menu Elements',
- 'path_themes' => 'Themes Path',
- 'disable_new_user_registration' => 'Disable New Registrations',
- 'allow_user_themes' => 'Allow User Themes',
- 'allow_user_language' => 'Allow User Language',
- 'allow_user_photo' => 'Allow User Photo',
- 'allow_username_change' => 'Allow Username Changes',
- 'allow_account_delete' => 'Allow Account Deletion',
- 'hide_author_exclusion' => 'Allow Hide Author',
- 'show_fullname' => 'Show Fullname',
- 'show_servicename' => 'Show Service Name',
- 'custom_registration' => 'Enable Custom Registration',
- 'user_login_method' => 'User Login Method',
- 'spamx' => 'Spam-X Actions',
- 'sort_admin' => 'Sort Links',
- 'language' => 'Language',
- 'locale' => 'Locale',
- 'date' => 'Date Format',
- 'daytime' => 'Daytime Format',
- 'shortdate' => 'Short Date Format',
- 'dateonly' => 'Date Only Format',
- 'timeonly' => 'Time Only Format',
- 'week_start' => 'Week Start',
- 'hour_mode' => 'Hour Mode',
- 'thousand_separator' => 'Thousands Separator',
- 'decimal_separator' => 'Decimal Separator',
- 'decimal_count' => 'Decimal Count',
- 'language_files' => 'Language Files',
- 'languages' => 'Languages',
- 'timezone' => 'Timezone',
- 'site_disabled_msg' => 'Site Disabled Message or URL',
+ 'path_language' => 'Język',
+ 'backup_path' => 'Kopia zapasowa',
+ 'path_data' => 'Dane',
+ 'path_images' => 'Zdjęcia',
+ 'path_pear' => 'Ścieżka do Pear',
+ 'have_pear' => 'Czy jest biblioteka Pear?',
+ 'mail_settings' => 'Ustawienia poczty',
+ 'allow_mysqldump' => 'Zezwalaj na zrzut MySQL',
+ 'mysqldump_path' => 'Ścieżka do plików wykonawczych',
+ 'mysqldump_options' => 'Opcje zrzutu MySQL',
+ 'theme' => 'Layout',
+ 'menu_elements' => 'Elementy Menu',
+ 'path_themes' => 'Ścieżka do katalogu z layoutami',
+ 'disable_new_user_registration' => 'Wyłącz rejestrację nowych
użytkowników',
+ 'allow_user_themes' => 'Użytkownik może zmieniać layout',
+ 'allow_user_language' => 'Użytkownik może zmieniać język',
+ 'allow_user_photo' => 'Użytkownik może dodać swoje zdjęcie',
+ 'allow_username_change' => 'Użytkownik może zmienić nazwę konta',
+ 'allow_account_delete' => 'Użytkownik może usunąć swoje',
+ 'hide_author_exclusion' => 'Zezwalaj na ukrycie autora',
+ 'show_fullname' => 'Pokaż pełną nazwę użytkwonika',
+ 'show_servicename' => 'Pokazuj nazwę usługi',
+ 'custom_registration' => 'Włącz własną rejestrację',
+ 'user_login_method' => 'Metoda logowania użytkownika',
+ 'spamx' => 'Spam-X ustawienia',
+ 'sort_admin' => 'Sortowanie odnośników',
+ 'language' => 'Język',
+ 'locale' => 'Opcje regionalne',
+ 'date' => 'Format Daty',
+ 'daytime' => 'Format daty dziennej',
+ 'shortdate' => 'Format daty krótkiej',
+ 'dateonly' => 'Tylko data - format',
+ 'timeonly' => 'Tylko godzina - format',
+ 'week_start' => 'Początek Tygodnia',
+ 'hour_mode' => 'Tryb godzinowy',
+ 'thousand_separator' => 'Separator tysięczny',
+ 'decimal_separator' => 'Separator dziesiętny',
+ 'decimal_count' => 'Liczenie dziesiętne',
+ 'language_files' => 'Pliki językowe',
+ 'languages' => 'Języki',
+ 'timezone' => 'Strefa czasowa',
+ 'site_disabled_msg' => 'Komunikat lub odnośnik podczas wyłączenia
strony',
'rootdebug' => 'Root Debugging',
- 'cookie_session' => 'Session Cookie Name',
- 'cookie_name' => 'Permanent Cookie Name',
- 'cookie_password' => 'Password Cookie Name',
- 'cookie_theme' => 'Theme Cookie Name',
- 'cookie_language' => 'Language Cookie Name',
- 'cookie_tzid' => 'Timezone Cookie Name',
- 'cookie_ip' => 'Cookies embed IP?',
- 'default_perm_cookie_timeout' => 'Permanent Timeout',
- 'session_cookie_timeout' => 'Session Timeout',
- 'cookie_path' => 'Cookie Path',
- 'cookiedomain' => 'Cookie Domain',
+ 'cookie_session' => 'Nazwa ciasteczka sesji',
+ 'cookie_name' => 'Nazwa ciasteczka stałego',
+ 'cookie_password' => 'Nazwa ciasteczka z hasłem',
+ 'cookie_theme' => 'Nazwa ciasteczka layoutu',
+ 'cookie_language' => 'Nazwa ciasteczka językowego',
+ 'cookie_tzid' => 'Nazwa ciasteczka strefy czasowej',
+ 'cookie_ip' => 'Czy ciasteczko ma zawierać adres IP?',
+ 'default_perm_cookie_timeout' => 'Stałe wygaśnięcie',
+ 'session_cookie_timeout' => 'Wygaśnięcie sesji',
+ 'cookie_path' => 'Ścieżka ciasteczek',
+ 'cookiedomain' => 'Domena ciasteczek',
'cookiesecure' => 'Cookie Secure',
- 'lastlogin' => 'Record Last Login?',
- 'pdf_enabled' => 'PDF Enabled?',
- 'num_search_results' => 'Number of Search Results',
- 'loginrequired' => 'Login Required?',
- 'submitloginrequired' => 'Submit Login Required?',
- 'commentsloginrequired' => 'Comment Login Required?',
- 'statsloginrequired' => 'Stats Login Required?',
+ 'lastlogin' => 'Zarejestrować ostatnie logowanie?',
+ 'pdf_enabled' => 'PDF włączony?',
+ 'num_search_results' => 'Liczba wyników z wyszukiwarki',
+ 'loginrequired' => 'Wymagane zalogowanie?',
+ 'submitloginrequired' => 'Wymagane zalogowanie do przesłania
materiałów?',
+ 'commentsloginrequired' => 'Wymagane zalogowanie do skomentowania?',
+ 'statsloginrequired' => 'Wymagane zalogowanie do przeglądania
statystyk?',
'searchloginrequired' => 'Search Login Required?',
'profileloginrequired' => 'Profile Login Required?',
'emailuserloginrequired' => 'E-Mail User Login Required?',
@@ -1708,33 +1708,33 @@
'pingback_excerpt' => 'Create Pingback Excerpt?',
'link_documentation' => 'Link to Documentation?',
'link_versionchecker' => 'Link to Version Checker?',
- 'maximagesperarticle' => 'Max Images per Article',
- 'limitnews' => 'Stories per Page',
- 'minnews' => 'Min. Stories per Page',
- 'contributedbyline' => 'Show "Contributed By"?"',
- 'hideviewscount' => 'Hide Views Count?',
- 'hideemailicon' => 'Hide E-Mail Icon?',
- 'hideprintericon' => 'Hide Print Icon?',
- 'allow_page_breaks' => 'Allow Page Breaks?',
- 'page_break_comments' => 'Comments on Multi-Page Articles',
- 'article_image_align' => 'Topic Icon Alignment',
- 'show_topic_icon' => 'Show Topic Icon?',
+ 'maximagesperarticle' => 'Maks. liczba zdjęć w artykule',
+ 'limitnews' => 'Liczba artykułów na stronę',
+ 'minnews' => 'Min. liczba artykułów na stronę',
+ 'contributedbyline' => 'Pokaż "Autor"?"',
+ 'hideviewscount' => 'Ukryj liczbę odsłon?',
+ 'hideemailicon' => 'Ukryj ikonę emaila?',
+ 'hideprintericon' => 'Ukryj ikonę drukowania?',
+ 'allow_page_breaks' => 'Zezwalaj na łamanie stron?',
+ 'page_break_comments' => 'Komentarze dla artykułów wielostronicowych',
+ 'article_image_align' => 'Wyrównywanie ikon sekcji',
+ 'show_topic_icon' => 'Pokaż ikonę sekcji?',
'draft_flag' => 'Draft Flag Default',
'frontpage' => 'Frontpage Default',
'hide_no_news_msg' => 'Hide "No News" Message?',
'hide_main_page_navigation' => 'Hide Main Page Navigation?',
'onlyrootfeatures' => 'Only Root can Feature?',
- 'aftersave_story' => 'After Saving Story',
- 'aftersave_user' => 'After Saving User',
- 'show_right_blocks' => 'Always Show Right Blocks?',
- 'showfirstasfeatured' => 'Show First Story as Featured?',
- 'backend' => 'Enable Feeds?',
- 'rdf_file' => 'Syndication Output Folder',
- 'rdf_limit' => 'Feed Limit',
- 'rdf_storytext' => 'Length of Stories in Feed',
- 'rdf_language' => 'Feed Language',
- 'syndication_max_headlines' => 'Max. Number of Headlines (portal
blocks)',
- 'copyrightyear' => 'Copyright Year',
+ 'aftersave_story' => 'Po zapisaniu artykułu',
+ 'aftersave_user' => 'Po zapisaniu użytkownika',
+ 'show_right_blocks' => 'Zawsze pokazuj prawe bloki?',
+ 'showfirstasfeatured' => 'Pokaż pierwszy artykuł jako Artykuł Dnia?',
+ 'backend' => 'Włącz kanały RSS?',
+ 'rdf_file' => 'Katalog z plikami do syndykacji treści',
+ 'rdf_limit' => 'Limit kanałów RSS',
+ 'rdf_storytext' => 'Długość artykułu w pliku RSS',
+ 'rdf_language' => 'Język kanału RSS',
+ 'syndication_max_headlines' => 'Maks. liczba tytułów (bloki
portalowe)',
+ 'copyrightyear' => 'Prawa Autorskie Rok',
'image_lib' => 'Image Library',
'path_to_mogrify' => 'Path to Mogrify',
'path_to_netpbm' => 'Path to Netpbm',
@@ -1770,7 +1770,7 @@
'censorreplace' => 'Censor Replace Text',
'censorlist' => 'Censor List',
'ip_lookup' => 'IP Lookup',
- 'url_rewrite' => 'Enable URL Rewrite',
+ 'url_rewrite' => 'Włącz przyjazne adresy URL',
'default_permissions_block' => 'Block Default Permissions',
'default_permissions_story' => 'Story Default Permissions',
'default_permissions_topic' => 'Topic Default Permissions',
@@ -1780,80 +1780,80 @@
);
$LANG_configsubgroups['Core'] = array(
- 'sg_site' => 'Site',
- 'sg_stories' => 'Stories and Trackback',
- 'sg_theme' => 'Theme',
- 'sg_blocks' => 'Blocks',
- 'sg_users' => 'Users and Submissions',
- 'sg_images' => 'Images',
- 'sg_locale' => 'Languages and Locale',
- 'sg_misc' => 'Miscellaneous'
+ 'sg_site' => 'Strona',
+ 'sg_stories' => 'Artykuły i Powiadomienia Zwrotne',
+ 'sg_theme' => 'Layout',
+ 'sg_blocks' => 'Bloki',
+ 'sg_users' => 'Użytkownicy i Przesłane materiały',
+ 'sg_images' => 'Zdjęcia',
+ 'sg_locale' => 'Języki i Ustawienia regionalne',
+ 'sg_misc' => 'Różne'
);
$LANG_fs['Core'] = array(
- 'fs_site' => 'Site',
- 'fs_paths' => 'Paths',
- 'fs_theme' => 'Theme',
- 'fs_mail' => 'Mail',
+ 'fs_site' => 'Strona',
+ 'fs_paths' => 'Ścieżki',
+ 'fs_theme' => 'Layout',
+ 'fs_mail' => 'Poczta',
'fs_pear' => 'Pear',
'fs_mysql' => 'MySQL',
- 'fs_users' => 'Users',
- 'fs_misc' => 'Miscellaneous',
+ 'fs_users' => 'Użytkownicy',
+ 'fs_misc' => 'Różne',
'fs_spamx' => 'Spam-X',
'fs_admin_block' => 'Admin Block',
- 'fs_locale' => 'Locale',
- 'fs_language' => 'Language',
+ 'fs_locale' => 'Ustawienia regionalne',
+ 'fs_language' => 'Język',
'fs_debug' => 'Debug',
- 'fs_cookies' => 'Cookies',
- 'fs_login' => 'Login Settings',
- 'fs_search' => 'Search',
- 'fs_user_submission' => 'User Submission',
- 'fs_submission' => 'Submission Settings',
- 'fs_topics_block' => 'Topics Block',
+ 'fs_cookies' => 'Ciasteczka',
+ 'fs_login' => 'Ustawienia logowania',
+ 'fs_search' => 'Szukaj',
+ 'fs_user_submission' => 'Materiały użytkowników',
+ 'fs_submission' => 'Ustawienia przesyłania materiałów',
+ 'fs_topics_block' => 'Blok sekcji',
'fs_whosonline_block' => 'Who\'s Online Block',
'fs_daily_digest' => 'Daily Digest',
- 'fs_whatsnew_block' => 'What\'s New Block',
+ 'fs_whatsnew_block' => 'Nowości',
'fs_trackback' => 'Trackback',
'fs_pingback' => 'Pingback',
- 'fs_story' => 'Story',
- 'fs_theme_advanced' => 'Advanced Settings',
- 'fs_syndication' => 'Syndication',
- 'fs_imagelib' => 'Image Library',
- 'fs_upload' => 'Upload',
- 'fs_articleimg' => 'Images in Articles',
- 'fs_topicicon' => 'Topic Icons',
- 'fs_userphoto' => 'Photos',
+ 'fs_story' => 'Artykuł',
+ 'fs_theme_advanced' => 'Ustawienia zaawansowane',
+ 'fs_syndication' => 'Syndykacja treści',
+ 'fs_imagelib' => 'Katalog zdjęć',
+ 'fs_upload' => 'Ładuj',
+ 'fs_articleimg' => 'Zdjęcia w artykułach',
+ 'fs_topicicon' => 'Ikony sekcji',
+ 'fs_userphoto' => 'Zdjęcia',
'fs_gravatar' => 'Gravatar',
- 'fs_comments' => 'Comments',
- 'fs_htmlfilter' => 'HTML Filtering',
- 'fs_censoring' => 'Censoring',
- 'fs_iplookup' => 'IP Lookup',
- 'fs_perm_story' => 'Story Default Permission',
- 'fs_perm_topic' => 'Topic Default Permission',
- 'fs_perm_block' => 'Block Default Permission',
- 'fs_webservices' => 'Webservices'
+ 'fs_comments' => 'Komentarze',
+ 'fs_htmlfilter' => 'Filtrowanie HTML',
+ 'fs_censoring' => 'Cenzura',
+ 'fs_iplookup' => 'Podgląd IP',
+ 'fs_perm_story' => 'Domyślne ustawienia dla artykułów',
+ 'fs_perm_topic' => 'Domyślne ustawienia dla sekcji',
+ 'fs_perm_block' => 'Domyślne ustawienia dla bloków',
+ 'fs_webservices' => 'Usługi WWW'
);
$LANG_configselects['Core'] = array(
- 0 => array('True' => 1, 'False' => 0),
- 1 => array('True' => true, 'False' => false),
- 2 => array('Reject' => 0, 'Only Keep Latest' => 1, 'Allow Multiple
Posts' => 2),
- 3 => array('Trackback Enabled' => 0, 'Trackback Disabled' => -1),
- 4 => array('Don\'t Check Anything' => 0, 'Check against Site URL' =>
1, 'Check full URL' => 2, 'Check against Site URL and full URL' =>
3, 'Check IP against Site IP' => 4, 'Check IP and Site URL' => 5, 'Check IP
and Full URL' => 6, 'Check IP, Full URL, and Site URL' => 7),
- 5 => array('Plain Old Text' => 'plaintext', 'HTML Formatted'
=> 'html'),
+ 0 => array('Tak' => 1, 'Nie' => 0),
+ 1 => array('Tak' => true, 'Nie' => false),
+ 2 => array('Odrzuć' => 0, 'Tylko Najnowsze' => 1, 'Zezwalaj na Wiele
Postów' => 2),
+ 3 => array('Trackback Włączony' => 0, 'Trackback Wyłączony' => -1),
+ 4 => array('Nie sprawdzaj Niczego' => 0, 'Sprawdź wedle adresu strony'
=> 1, 'Sprawdź cały URL' => 2, 'Sprawdź wedle adresu strony i kompletnego
URL' => 3, 'Check IP against Site IP' => 4, 'Sprawdź IP i URL strony' =>
5, 'Sprawdź IP i pełny URL' => 6, 'Sprawdź IP, pełny URL, i URL strony' =>
7),
+ 5 => array('Tekst' => 'plaintext', 'HTML' => 'html'),
6 => array('12' => 12, '24' => 24),
- 7 => array('Last Page' => 'last', 'First Page' => 'first', 'Every
Page' => 'all'),
- 8 => array('Right' => 'right', 'Left' => 'left'),
- 9 => array('Forward to page' => 'item', 'Display List'
=> 'list', 'Display Home' => 'home', 'Display Admin' => 'admin'),
- 10 => array('None' => '', 'Netpbm' => 'netpbm', 'ImageMagick'
=> 'imagemagick', 'gdLib' => 'gdlib'),
- 11 => array('Flat' => 'flat', 'Nested' => 'nested', 'Threaded'
=> 'threaded', 'No Comments' => 'nocomment'),
- 12 => array('No access' => 0, 'Read-Only' => 2, 'Read-Write' => 3),
- 13 => array('Skip' => 0, 'Allow, with speedlimit' => 1, 'Allow, no
speedlimit' => 2),
- 14 => array('Sunday' => 'Sun', 'Monday' => 'Mon'),
- 15 => array('By Number' => 'sortnum', 'Alphabetically' => 'alpha'),
- 16 => array('No Login required' => 0, 'Advanced Search only' =>
1, 'Simple + Advanced Search' => 2),
- 17 => array('Comments Enabled' => 0, 'Comments Disabled' => -1),
- 18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled
(Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3)
+ 7 => array('Ostatnia Strona' => 'last', 'Pierwsza Strona'
=> 'first', 'Wszystkie Strony' => 'all'),
+ 8 => array('Prawa' => 'right', 'Lewa' => 'left'),
+ 9 => array('Idź do strony' => 'item', 'Pokaż listę' => 'list', 'Pokaż
stronę główną' => 'home', 'Pokaż panel sterowania' => 'admin'),
+ 10 => array('Brak' => '', 'Netpbm' => 'netpbm', 'ImageMagick'
=> 'imagemagick', 'gdLib' => 'gdlib'),
+ 11 => array('Lista' => 'flat', 'Chronologicznie' => 'nested', 'Wg
wątku' => 'threaded', 'Bez komentarzy' => 'nocomment'),
+ 12 => array('Brak dostępu' => 0, 'Tylko do Odczytu' =>
2, 'Odczyt-Zapis' => 3),
+ 13 => array('Pomiń' => 0, 'Allow, with speedlimit' => 1, 'Allow, no
speedlimit' => 2),
+ 14 => array('Niedziela' => 'Sun', 'Poniedziałek' => 'Mon'),
+ 15 => array('Liczbowo' => 'sortnum', 'Alfabetycznie' => 'alpha'),
+ 16 => array('Login nie wymagany' => 0, 'Tylko wyszukiwanie
zaawansowane' => 1, 'Wyszukiwanie proste + zaawansowane' => 2),
+ 17 => array('Komentarze włączone' => 0, 'Komentarze wyłączone' => -1),
+ 18 => array('Wyłączone' => 0, 'Włączone (Dokładne trafienie)' =>
1, 'Włączone (Początek słowa)' => 2, 'Włączone (Fragment słowa)' => 3)
);
-?>
\ No newline at end of file
+?>
Modified: trunk/geeklog-1-jp/plugins/calendar/functions.inc
==============================================================================
--- trunk/geeklog-1-jp/plugins/calendar/functions.inc (original)
+++ trunk/geeklog-1-jp/plugins/calendar/functions.inc Sat Feb 7 02:32:45
2009
@@ -10,7 +10,7 @@
// | API method and 2) implements all the common code needed by the
CAlendar |
// | plugin' PHP
files. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - twillett AT users DOT sourceforge DOT
net |
@@ -33,8 +33,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.95 2008/09/21 08:37:07 dhaun Exp $
if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
die('This file can not be used on its own.');
@@ -59,7 +57,7 @@
$_CA_CONF = $ca_config->get_config('calendar');
}
-$_CA_CONF['version'] = '1.0.2';
+$_CA_CONF['version'] = '1.0.3';
//
+---------------------------------------------------------------------------+
// | Geeklog Plugin API
Implementations |
@@ -830,7 +828,7 @@
DB_delete($_TABLES['events'], 'eid', $eid);
DB_delete($_TABLES['personal_events'], 'eid', $eid);
- COM_rdfUpToDateCheck('geeklog', 'calendar', $eid);
+ COM_rdfUpToDateCheck('calendar');
return
COM_refresh($_CONF['site_admin_url'] . '/plugins/calendar/index.php?msg=18');
} elseif ($type == 'submission') {
Modified: trunk/geeklog-1-jp/plugins/links/functions.inc
==============================================================================
--- trunk/geeklog-1-jp/plugins/links/functions.inc (original)
+++ trunk/geeklog-1-jp/plugins/links/functions.inc Sat Feb 7 02:32:45 2009
@@ -10,7 +10,7 @@
// | API method and 2) implements all the common code needed by the
Links |
// | Plugins' PHP
files. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimb****@users***** DOT
net |
@@ -35,8 +35,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.111 2008/09/21 08:37:08 dhaun Exp $
if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
die('This file can not be used on its own.');
@@ -61,7 +59,7 @@
$_LI_CONF = $li_config->get_config('links');
}
-$_LI_CONF['version'] = '2.0.0';
+$_LI_CONF['version'] = '2.0.1';
//
+---------------------------------------------------------------------------+
// | Geeklog Plugin API
Implementation |
@@ -363,13 +361,13 @@
// link search
$select = 'SELECT lid,title,url,owner_id,hits,UNIX_TIMESTAMP(date) AS
day';
- $sql = " FROM {$_TABLES['links']} WHERE date <> 1 ";
+ $sql = " FROM {$_TABLES['links']} WHERE date <> 1";
if (!empty ($query)) {
if ($keyType == 'phrase') {
$mysearchterm = addslashes ($query);
- $sql .= " AND (description LIKE '%$mysearchterm%')"
- . " OR (title LIKE '%$mysearchterm%')";
+ $sql .= " AND ((description LIKE '%$mysearchterm%')"
+ . " OR (title LIKE '%$mysearchterm%'))";
} else if ($keyType == 'all') {
$mywords = explode (' ', $query);
$sql .= ' AND (';
@@ -377,8 +375,8 @@
foreach ($mywords AS $mysearchterm) {
$mysearchterm = addslashes (trim ($mysearchterm));
if (!empty ($mysearchterm)) {
- $tmp .= "(description LIKE '%$mysearchterm%')"
- . " OR (title LIKE '%$mysearchterm%') AND ";
+ $tmp .= "((description LIKE '%$mysearchterm%')"
+ . " OR (title LIKE '%$mysearchterm%')) AND ";
}
}
$tmp = substr ($tmp, 0, strlen ($tmp) - 5);
@@ -390,16 +388,16 @@
foreach ($mywords AS $mysearchterm) {
$mysearchterm = addslashes (trim ($mysearchterm));
if (!empty ($mysearchterm)) {
- $tmp .= "(description LIKE '%$mysearchterm%')"
- . " OR (title LIKE '%$mysearchterm%') OR ";
+ $tmp .= "((description LIKE '%$mysearchterm%')"
+ . " OR (title LIKE '%$mysearchterm%')) OR ";
}
}
$tmp = substr ($tmp, 0, strlen ($tmp) - 4);
$sql .= $tmp . ')';
} else { // quick search
$mysearchterm = addslashes ($query);
- $sql .= " AND (description LIKE '%$mysearchterm%')"
- . " OR (title LIKE '%$mysearchterm%')";
+ $sql .= " AND ((description LIKE '%$mysearchterm%')"
+ . " OR (title LIKE '%$mysearchterm%'))";
}
}
@@ -415,9 +413,9 @@
}
if (!empty ($author)) {
- $sql .= "AND (owner_id = '$author')";
+ $sql .= " AND (owner_id = '$author')";
}
- $sql .= COM_getPermSQL ('AND');
+ $sql .= COM_getPermSQL('AND');
$sql .= ' GROUP BY date, lid, cid, url, description, title, hits,
owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon ORDER
BY date DESC';
$l = ($perpage * $page) - $perpage;
$sql .= ' LIMIT ' . $l . ',' . $perpage;
Modified: trunk/geeklog-1-jp/plugins/links/language/slovenian.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/links/language/slovenian.php (original)
+++ trunk/geeklog-1-jp/plugins/links/language/slovenian.php Sat Feb 7
02:32:45 2009
@@ -1,7 +1,7 @@
<?php
###############################################################################
-# slovenian.php - version 1.4.1
+# slovenian.php - version 1.5.1
# This is the slovenian language file for the Geeklog Links Plugin
# language file for geeklog version 1.4.1 beta by mb
# gape****@gape***** ; za pripombe, predloge ipd ... pi�i na email
@@ -43,16 +43,16 @@
88 => 'Ni nedavnih novih povezav',
114 => 'Povezave',
116 => 'Dodaj povezavo',
- 117 => 'Report Broken Link',
- 118 => 'Broken Link Report',
- 119 => 'The following link has been reported to be broken: ',
- 120 => 'To edit the link, click here: ',
- 121 => 'The broken Link was reported by: ',
- 122 => 'Thank you for reporting this broken link. The administrator
will correct the problem as soon as possible',
- 123 => 'Thank you',
+ 117 => 'Prijavi napako v povezavi',
+ 118 => 'Prijava napake v povezavi',
+ 119 => 'Te povezave so prijavljene kot nedelujo�e: ',
+ 120 => 'Da popravi� povezavo klikni tukj: ',
+ 121 => 'Napako v povezavi je prijavil: ',
+ 122 => 'Hvala da ste prijavili to napako v povezavi. Administrator bo
odpravil te�avo takoj ko bo mogo�e.',
+ 123 => 'Hvala',
124 => 'Go',
- 125 => 'Categories',
- 126 => 'You are here:',
+ 125 => 'Kategorije',
+ 126 => 'Ti si tukaj:',
'root' => 'Root'
);
@@ -60,10 +60,10 @@
# for stats
$LANG_LINKS_STATS = array(
- 'links' => 'Links (Clicks) in the System',
- 'stats_headline' => 'Top Ten Links',
- 'stats_page_title' => 'Links',
- 'stats_hits' => 'Hits',
+ 'links' => 'Povezave (Kliki) v Sistemu',
+ 'stats_headline' => '10 najbolj popularnih povezav',
+ 'stats_page_title' => 'Povezave',
+ 'stats_hits' => 'Zadetki',
'stats_no_hits' => 'Izgleda, da na tem mestu ni povezav ali pa �e
nikoli ni nih�e kliknil na nobeno.'
);
@@ -74,7 +74,7 @@
'results' => 'Rezultati povezav',
'title' => 'Naslov',
'date' => 'Dodani datum',
- 'author' => 'Odposlal:',
+ 'author' => 'Avtor:',
'hits' => 'Kliki'
);
@@ -102,20 +102,20 @@
$PLG_links_MESSAGE2 = 'Tvoja povezava je uspe�no shranjena.';
$PLG_links_MESSAGE3 = 'Povezava je uspe�no izbrisana.';
$PLG_links_MESSAGE4 = "Hvala, da si povezavo oddal/a na spletno mesto
{$_CONF['site_name']}. Sedaj jo lahko vidi� v razdelku <a
href={$_CONF['site_url']}/links/index.php>povezave</a>.";
-$PLG_links_MESSAGE5 = 'You do not have sufficient access rights to view
this category.';
-$PLG_links_MESSAGE6 = 'You do not have sufficient rights to edit this
category.';
-$PLG_links_MESSAGE7 = 'Please enter a Category Name and Description.';
-$PLG_links_MESSAGE10 = 'Your category has been successfully saved.';
-$PLG_links_MESSAGE11 = 'You are not allowed to set the id of a category
to "site" or "user" - these are reserved for internal use.';
+$PLG_links_MESSAGE5 = 'Nima� zadosti visokih pravic za prikaz te
kategorije.';
+$PLG_links_MESSAGE6 = 'Nima� zadosti visokih pravic za urejanje te
kategorije.';
+$PLG_links_MESSAGE7 = 'Prosim vpi�i ime kategorije in njen opis.';
+$PLG_links_MESSAGE10 = 'Kategorija je bila uspe�no shranjena.';
+$PLG_links_MESSAGE11 = 'Ni dovoljeno uporabiti imen "site" ali "user" za
kategorijo - ta so rezervirana za notranjo uporabo.';
$PLG_links_MESSAGE12 = 'You are trying to make a parent category the child
of it\'s own subcategory. This would create an orphan category, so please
first move the child category or categories up to a higher level.';
-$PLG_links_MESSAGE13 = 'The category has been successfully deleted.';
-$PLG_links_MESSAGE14 = 'Category contains links and/or categories. Please
remove these first.';
-$PLG_links_MESSAGE15 = 'You do not have sufficient rights to delete this
category.';
-$PLG_links_MESSAGE16 = 'No such category exists.';
-$PLG_links_MESSAGE17 = 'This category id is already in use.';
+$PLG_links_MESSAGE13 = 'Kategorija je bila uspe�no izbrisana.';
+$PLG_links_MESSAGE14 = 'Kategorija vsebuje povezave in ali kategorije.
Prosim da jih prej izbri�e�.';
+$PLG_links_MESSAGE15 = 'Nima� dovolj visokih pravic za izbris te
kategorije.';
+$PLG_links_MESSAGE16 = 'Kategorija s tem imenom ne obstaja.';
+$PLG_links_MESSAGE17 = 'Ime (id) te kategorije je �e uporabljeno.';
// Messages for the plugin upgrade
-$PLG_links_MESSAGE3001 = 'Plugin upgrade not supported.';
+$PLG_links_MESSAGE3001 = 'Nadgradnja vti�nika ni podprta.';
$PLG_links_MESSAGE3002 = $LANG32[9];
###############################################################################
@@ -141,7 +141,7 @@
21 => 'shrani',
22 => 'prekli�i',
23 => 'izbri�i',
- 24 => 'Link not found',
+ 24 => 'Ne najdem povezave',
25 => 'The link you selected for editing could not be found.',
26 => 'Validate Links',
27 => 'HTML Status',
@@ -258,4 +258,4 @@
12 => array('No access' => 0, 'Read-Only' => 2, 'Read-Write' => 3)
);
-?>
\ No newline at end of file
+?>
Modified: trunk/geeklog-1-jp/plugins/links/language/slovenian_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/links/language/slovenian_utf-8.php (original)
+++ trunk/geeklog-1-jp/plugins/links/language/slovenian_utf-8.php Sat Feb
7 02:32:45 2009
@@ -1,7 +1,7 @@
<?php
###############################################################################
-# slovenian.php - version 1.4.1
+# slovenian_utf-8.php - version 1.5.1
# This is the slovenian language file for the Geeklog Links Plugin
# language file for geeklog version 1.4.1 beta by mb
# gape****@gape***** ; za pripombe, predloge ipd ... piši na email
@@ -43,16 +43,16 @@
88 => 'Ni nedavnih novih povezav',
114 => 'Povezave',
116 => 'Dodaj povezavo',
- 117 => 'Report Broken Link',
- 118 => 'Broken Link Report',
- 119 => 'The following link has been reported to be broken: ',
- 120 => 'To edit the link, click here: ',
- 121 => 'The broken Link was reported by: ',
- 122 => 'Thank you for reporting this broken link. The administrator
will correct the problem as soon as possible',
- 123 => 'Thank you',
+ 117 => 'Prijavi napako v povezavi',
+ 118 => 'Prijava napake v povezavi',
+ 119 => 'Te povezave so prijavljene kot nedelujoče: ',
+ 120 => 'Da popraviš povezavo klikni tukj: ',
+ 121 => 'Napako v povezavi je prijavil: ',
+ 122 => 'Hvala da ste prijavili to napako v povezavi. Administrator bo
odpravil težavo takoj ko bo mogoče.',
+ 123 => 'Hvala',
124 => 'Go',
- 125 => 'Categories',
- 126 => 'You are here:',
+ 125 => 'Kategorije',
+ 126 => 'Ti si tukaj:',
'root' => 'Root'
);
@@ -60,10 +60,10 @@
# for stats
$LANG_LINKS_STATS = array(
- 'links' => 'Links (Clicks) in the System',
- 'stats_headline' => 'Top Ten Links',
- 'stats_page_title' => 'Links',
- 'stats_hits' => 'Hits',
+ 'links' => 'Povezave (Kliki) v Sistemu',
+ 'stats_headline' => '10 najbolj popularnih povezav',
+ 'stats_page_title' => 'Povezave',
+ 'stats_hits' => 'Zadetki',
'stats_no_hits' => 'Izgleda, da na tem mestu ni povezav ali pa še
nikoli ni nihče kliknil na nobeno.'
);
@@ -74,7 +74,7 @@
'results' => 'Rezultati povezav',
'title' => 'Naslov',
'date' => 'Dodani datum',
- 'author' => 'Odposlal:',
+ 'author' => 'Avtor:',
'hits' => 'Kliki'
);
@@ -102,20 +102,20 @@
$PLG_links_MESSAGE2 = 'Tvoja povezava je uspešno shranjena.';
$PLG_links_MESSAGE3 = 'Povezava je uspešno izbrisana.';
$PLG_links_MESSAGE4 = "Hvala, da si povezavo oddal/a na spletno mesto
{$_CONF['site_name']}. Sedaj jo lahko vidiš v razdelku <a
href={$_CONF['site_url']}/links/index.php>povezave</a>.";
-$PLG_links_MESSAGE5 = 'You do not have sufficient access rights to view
this category.';
-$PLG_links_MESSAGE6 = 'You do not have sufficient rights to edit this
category.';
-$PLG_links_MESSAGE7 = 'Please enter a Category Name and Description.';
-$PLG_links_MESSAGE10 = 'Your category has been successfully saved.';
-$PLG_links_MESSAGE11 = 'You are not allowed to set the id of a category
to "site" or "user" - these are reserved for internal use.';
+$PLG_links_MESSAGE5 = 'Nimaš zadosti visokih pravic za prikaz te
kategorije.';
+$PLG_links_MESSAGE6 = 'Nimaš zadosti visokih pravic za urejanje te
kategorije.';
+$PLG_links_MESSAGE7 = 'Prosim vpiši ime kategorije in njen opis.';
+$PLG_links_MESSAGE10 = 'Kategorija je bila uspešno shranjena.';
+$PLG_links_MESSAGE11 = 'Ni dovoljeno uporabiti imen "site" ali "user" za
kategorijo - ta so rezervirana za notranjo uporabo.';
$PLG_links_MESSAGE12 = 'You are trying to make a parent category the child
of it\'s own subcategory. This would create an orphan category, so please
first move the child category or categories up to a higher level.';
-$PLG_links_MESSAGE13 = 'The category has been successfully deleted.';
-$PLG_links_MESSAGE14 = 'Category contains links and/or categories. Please
remove these first.';
-$PLG_links_MESSAGE15 = 'You do not have sufficient rights to delete this
category.';
-$PLG_links_MESSAGE16 = 'No such category exists.';
-$PLG_links_MESSAGE17 = 'This category id is already in use.';
+$PLG_links_MESSAGE13 = 'Kategorija je bila uspešno izbrisana.';
+$PLG_links_MESSAGE14 = 'Kategorija vsebuje povezave in ali kategorije.
Prosim da jih prej izbrišeš.';
+$PLG_links_MESSAGE15 = 'Nimaš dovolj visokih pravic za izbris te
kategorije.';
+$PLG_links_MESSAGE16 = 'Kategorija s tem imenom ne obstaja.';
+$PLG_links_MESSAGE17 = 'Ime (id) te kategorije je že uporabljeno.';
// Messages for the plugin upgrade
-$PLG_links_MESSAGE3001 = 'Plugin upgrade not supported.';
+$PLG_links_MESSAGE3001 = 'Nadgradnja vtičnika ni podprta.';
$PLG_links_MESSAGE3002 = $LANG32[9];
###############################################################################
@@ -141,7 +141,7 @@
21 => 'shrani',
22 => 'prekliči',
23 => 'izbriši',
- 24 => 'Link not found',
+ 24 => 'Ne najdem povezave',
25 => 'The link you selected for editing could not be found.',
26 => 'Validate Links',
27 => 'HTML Status',
Modified: trunk/geeklog-1-jp/plugins/polls/functions.inc
==============================================================================
--- trunk/geeklog-1-jp/plugins/polls/functions.inc (original)
+++ trunk/geeklog-1-jp/plugins/polls/functions.inc Sat Feb 7 02:32:45 2009
@@ -10,7 +10,7 @@
// | API method and 2) implements all the common code needed by the
Polls |
// | plugin' PHP
files. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - twillett AT users DOT sourceforge DOT
net |
@@ -33,8 +33,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.92 2008/09/21 08:37:08 dhaun Exp $
if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
die('This file can not be used on its own.');
@@ -59,7 +57,7 @@
$_PO_CONF = $po_config->get_config('polls');
}
-$_PO_CONF['version'] = '2.0.1';
+$_PO_CONF['version'] = '2.0.2';
//
+---------------------------------------------------------------------------+
// | Geeklog Plugin API
Implementations |
Modified: trunk/geeklog-1-jp/plugins/polls/install_defaults.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/polls/install_defaults.php (original)
+++ trunk/geeklog-1-jp/plugins/polls/install_defaults.php Sat Feb 7
02:32:45 2009
@@ -10,7 +10,7 @@
// | records. These settings are only used during the initial
installation |
// | and not referenced any more once the plugin is
installed. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2008 by the following
authors: |
+// | Copyright (C) 2009 by the following
authors: |
//
|
|
// | Authors: Dirk Haun - dirk AT haun-online DOT
de |
//
+---------------------------------------------------------------------------+
@@ -30,8 +30,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: install_defaults.php,v 1.8 2008/09/21 08:37:08 dhaun Exp $
if (strpos(strtolower($_SERVER['PHP_SELF']), 'install_defaults.php') !==
false) {
die('This file can not be used on its own!');
@@ -54,8 +52,8 @@
// Set to 1 to hide the "Polls" entry from the top menu:
$_PO_DEFAULT['hidepollsmenu'] = 0;
-$_PO_DEFAULT['maxquestions'] = 10; // max. number of questions in a
poll
-$_PO_DEFAULT['maxanswers'] = 10; // max. number of options in a
question
+$_PO_DEFAULT['maxquestions'] = 5; // max. number of questions in a
poll
+$_PO_DEFAULT['maxanswers'] = 8; // max. number of options in a
question
// 'submitorder' is the order in which answers are saved in admin/poll.php
// 'voteorder' will list answers ordered by number of votes
(highest->lowest);
Modified: trunk/geeklog-1-jp/plugins/polls/templates/admin/polleditor.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/polls/templates/admin/polleditor.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/polls/templates/admin/polleditor.thtml Sat
Feb 7 02:32:45 2009
@@ -42,5 +42,10 @@
<p>{lang_permissionskey}</p>
<div>{permissions_editor}</div>
<p>{lang_permissions_msg}</p>
- <p><input type="submit" name="mode"
value="{lang_save}"{xhtml}><input type="submit" name="mode"
value="{lang_cancel}"{xhtml}>{delete_option}<input type="hidden"
name="{gltoken_name}" value="{gltoken}"{xhtml}></p>
+ <p>
+ <input type="submit" name="mode"
value="{lang_save}"{xhtml}>
+ <input type="submit" name="mode"
value="{lang_cancel}"{xhtml}>{delete_option}
+ <input type="hidden"
name="{gltoken_name}" value="{gltoken}"{xhtml}>
+ <input type="hidden" value="{poll_id}"
name="old_pid"{xhtml}>
+ </p>
</form>
Modified: trunk/geeklog-1-jp/plugins/spamx/functions.inc
==============================================================================
--- trunk/geeklog-1-jp/plugins/spamx/functions.inc (original)
+++ trunk/geeklog-1-jp/plugins/spamx/functions.inc Sat Feb 7 02:32:45 2009
@@ -4,13 +4,12 @@
* File: functions.inc
* This is the functions.inc for the Geeklog Spam-X plugin
*
- * Copyright (C) 2004-2008 by the following authors:
+ * Copyright (C) 2004-2009 by the following authors:
* Authors Tom Willett tomw AT pigstye DOT net
* Dirk Haun dirk AT haun-online DOT de
*
* Licensed under GNU General Public License
*
- * $Id: functions.inc,v 1.37 2008/09/21 08:37:08 dhaun Exp $
*/
if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
@@ -39,7 +38,7 @@
$_SPX_CONF = $spx_config->get_config('spamx');
}
-$_SPX_CONF['version'] = '1.1.1';
+$_SPX_CONF['version'] = '1.1.2';
//
+---------------------------------------------------------------------------+
// | Geeklog Plugin API
Implementations |
Modified: trunk/geeklog-1-jp/plugins/spamx/language/hebrew_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/spamx/language/hebrew_utf-8.php (original)
+++ trunk/geeklog-1-jp/plugins/spamx/language/hebrew_utf-8.php Sat Feb 7
02:32:45 2009
@@ -105,7 +105,7 @@
'import_success' => '<p>יובאו בהצלחה %d פרטי רשימות שחורות.',
'import_failure' => '<p><strong>שגיאה:</strong> לא נמצאו פריטים.',
'allow_url_fopen' => '<p>מצטערים, כיוון השרת שלכם לא מרשה לקרוא קבצים
לא מקומיים (<code>allow_url_fopen</code> הוא במצב off). אנא הורידו את
הרשימה השחורה מהכתובת הבאה והעלו אותה לספריית ה-"data" של התוכנה,
<tt>%s</tt>, לפנו שתנסו שוב:',
- 'documentation' => 'הדוקומנצטיה של ה-Spam-X Plugin',
+ 'documentation' => 'הדוקומנטציה של ה-Spam-X Plugin',
'emailmsg' => "פריט ספאם חדש נשלח ב: \"%s\"\nקוד זיהוי משתמש:
\"%s\"\n\nתוכן:\"%s\"",
'emailsubject' => 'פריט ספאם ב: %s',
'ipblack' => 'הרשימה השחורה של כתובות IP של Spam-X',
Modified: trunk/geeklog-1-jp/plugins/staticpages/functions.inc
==============================================================================
--- trunk/geeklog-1-jp/plugins/staticpages/functions.inc (original)
+++ trunk/geeklog-1-jp/plugins/staticpages/functions.inc Sat Feb 7
02:32:45 2009
@@ -10,7 +10,7 @@
// | API method and 2) implements all the common code needed by the
Static |
// | Pages' PHP
files. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - twillett AT users DOT sourceforge DOT
net |
@@ -33,8 +33,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: functions.inc,v 1.127 2008/09/21 08:37:08 dhaun Exp $
if (strpos(strtolower($_SERVER['PHP_SELF']), 'functions.inc') !== false) {
die('This file can not be used on its own.');
@@ -59,7 +57,7 @@
$_SP_CONF = $sp_config->get_config('staticpages');
}
-$_SP_CONF['version'] = '1.5.0';
+$_SP_CONF['version'] = '1.5.1';
//
+---------------------------------------------------------------------------+
// | Plugin API -
Services |
@@ -260,14 +258,15 @@
/**
* Prepare static page for display.
*
-* @param string $page static page id
-* @param array $A static page data
-* @param string comment_order sorting of comments
-* @param string comment_mode
-* @return string HTML for the static page
+* @param string $page static page id
+* @param array $A static page data
+* @param string $comment_order sorting of comments
+* @param string $comment_mode comment mode (nested, flat, etc.)
+* @param int $msg optional message number
+* @return string HTML for the static page
*
*/
-function SP_displayPage ($page, $A, $comment_order = 'ASC', $comment_mode
='nested')
+function SP_displayPage ($page, $A, $comment_order = 'ASC', $comment_mode
= 'nested', $msg = 0)
{
global $_CONF, $_TABLES, $_USER,
$LANG01, $LANG11, $LANG_STATIC, $_IMAGE_TYPE, $_SP_CONF;
@@ -281,6 +280,9 @@
$retval .= COM_siteHeader ('none');
}
}
+ if ($msg > 0) {
+ $retval .= COM_showMessage($msg, 'staticpages');
+ }
if (($A['sp_inblock'] == 1) && ($A['sp_format'] != 'blankpage')) {
$retval .= COM_startBlock (stripslashes ($A['sp_title']),
$A['sp_help'],
COM_getBlockTemplate
('_staticpages_block', 'header'));
@@ -391,59 +393,66 @@
* @return string HTML for the static page
*
*/
-function SP_printPage ($page, $A)
+function SP_printPage($page, $A)
{
- global $_CONF, $LANG01, $_TABLES;
+ global $_CONF, $_TABLES, $LANG01, $LANG_DIRECTION;
- $template_path = staticpages_templatePath ();
- $print = new Template ($template_path);
- $print->set_file (array ('print' => 'printable.thtml'));
- $print->set_var ('site_url', $_CONF['site_url']);
- $print->set_var ('site_name', $_CONF['site_name']);
- $print->set_var ('site_slogan', $_CONF['site_slogan']);
-
- $print->set_var ('page_title', $_CONF['site_name'] . ' - '
- . stripslashes ($A['sp_title']));
- $sp_url = COM_buildUrl ($_CONF['site_url']
- . '/staticpages/index.php?page=' . $page);
- $print->set_var ('sp_url', $sp_url);
- $print->set_var ('sp_title', stripslashes ($A['sp_title']));
- $print->set_var ('sp_content',
- SP_render_content (stripslashes ($A['sp_content']),
$A['sp_php']));
- $print->set_var ('sp_hits', COM_numberFormat ($A['sp_hits']));
+ $template_path = staticpages_templatePath();
+ $print = new Template($template_path);
+ $print->set_file(array('print' => 'printable.thtml'));
+ $print->set_var('site_url', $_CONF['site_url']);
+ $print->set_var('site_admin_url', $_CONF['site_admin_url']);
+ $print->set_var('layout_url', $_CONF['layout_url']);
+ $print->set_var('site_name', $_CONF['site_name']);
+ $print->set_var('site_slogan', $_CONF['site_slogan']);
+
+ $print->set_var('direction', $LANG_DIRECTION);
+ COM_setLangIdAndAttribute($print);
+ $print->set_var('xhtml', XHTML);
+ $print->set_var('page_title', $_CONF['site_name'] . ' - '
+ . stripslashes($A['sp_title']));
+ $sp_url = COM_buildUrl($_CONF['site_url']
+ . '/staticpages/index.php?page=' .
$page);
+ $print->set_var('sp_url', $sp_url);
+ $print->set_var('sp_title', stripslashes($A['sp_title']));
+ $print->set_var('sp_content',
+ SP_render_content(stripslashes($A['sp_content']),
$A['sp_php']));
+ $print->set_var('sp_hits', COM_numberFormat($A['sp_hits']));
if ($A['commentcode'] >= 0) {
$commentsUrl = $sp_url . '#comments';
$comments = DB_count($_TABLES['comments'],
array('sid', 'type'),
array($page, 'staticpages'));
- $numComments = COM_numberFormat ($comments);
- $print->set_var ('story_comments', $numComments);
- $print->set_var ('comments_url', $commentsUrl);
- $print->set_var ('comments_text', $numComments . ' ' . $LANG01[3]);
- $print->set_var ('comments_count', $numComments);
- $print->set_var ('lang_comments', $LANG01[3]);
- $comments_with_count = sprintf ($LANG01[121], $numComments);
+ $numComments = COM_numberFormat($comments);
+ $print->set_var('story_comments', $numComments);
+ $print->set_var('comments_url', $commentsUrl);
+ $print->set_var('comments_text', $numComments . ' ' . $LANG01[3]);
+ $print->set_var('comments_count', $numComments);
+ $print->set_var('lang_comments', $LANG01[3]);
+ $comments_with_count = sprintf($LANG01[121], $numComments);
if ($comments > 0) {
- $comments_with_count = COM_createLink($comments_with_count,
$commentsUrl);
+ $comments_with_count = COM_createLink($comments_with_count,
+ $commentsUrl);
}
- $print->set_var ('comments_with_count', $comments_with_count);
+ $print->set_var('comments_with_count', $comments_with_count);
}
- $print->parse ('output', 'print');
+ $print->parse('output', 'print');
- return $print->finish ($print->get_var ('output'));
+ return $print->finish($print->get_var('output'));
}
/**
* Prepare static page for display
*
-* @param string $page static page id
-* @param string $mode type of display to return
('', 'print', 'autotag'
-* @param string comment_order sorting of comments
-* @param string comment_mode
-* @return string HTML for the static page
+* @param string $page static page id
+* @param string $mode type of display to return
('', 'print', 'autotag'
+* @param string $comment_order sorting of comments
+* @param string $comment_mode comment mode (nested, flat, etc.)
+* @param int $msg optional message number
+* @return string HTML for the static page
*
*/
-function SP_returnStaticpage($page='', $mode='', $comment_order = 'ASC',
$comment_mode ='nested')
+function SP_returnStaticpage($page='', $mode='', $comment_order = 'ASC',
$comment_mode = 'nested', $msg = 0)
{
global $_CONF, $_TABLES, $LANG_ACCESS, $LANG_STATIC, $LANG_LOGIN;
@@ -462,7 +471,7 @@
} else if ($mode =='autotag') {
$retval =
SP_render_content(stripslashes($retval['sp_content']), $retval['sp_php']);
} else {
- $retval = SP_displayPage($page, $retval, $comment_order,
$comment_mode);
+ $retval = SP_displayPage($page, $retval, $comment_order,
$comment_mode, $msg);
}
// increment hit counter for page
Modified: trunk/geeklog-1-jp/plugins/staticpages/language/japanese_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/staticpages/language/japanese_utf-8.php
(original)
+++ trunk/geeklog-1-jp/plugins/staticpages/language/japanese_utf-8.php Sat
Feb 7 02:32:45 2009
@@ -163,4 +163,4 @@
12 => array('アクセス不可' => 0, '表示' => 2, '表示・編集' => 3)
);
-?>
\ No newline at end of file
+?>
Modified: trunk/geeklog-1-jp/plugins/staticpages/services.inc.php
==============================================================================
--- trunk/geeklog-1-jp/plugins/staticpages/services.inc.php (original)
+++ trunk/geeklog-1-jp/plugins/staticpages/services.inc.php Sat Feb 7
02:32:45 2009
@@ -51,6 +51,8 @@
global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $LANG12, $LANG_STATIC,
$LANG_LOGIN, $_GROUPS, $_SP_CONF;
+ require_once $_CONF['path_system'] . '/lib-webservices.php';
+
$output = '';
if (!SEC_hasRights('staticpages.edit')) {
@@ -101,7 +103,9 @@
}
}
- $args['sp_uid'] = $_USER['uid'];
+ if (!isset($args['sp_uid'])) {
+ $args['sp_uid'] = $_USER['uid'];
+ }
if (empty($args['sp_title']) && !empty($args['title'])) {
$args['sp_title'] = $args['title'];
@@ -116,7 +120,9 @@
$args['sp_tid'] = $args['category'][0];
}
- $args['owner_id'] = $_USER['uid'];
+ if (!isset($args['owner_id'])) {
+ $args['owner_id'] = $_USER['uid'];
+ }
if (empty($args['group_id'])) {
$args['group_id'] = SEC_getFeatureGroup('staticpages.edit',
$_USER['uid']);
@@ -125,7 +131,11 @@
$args['sp_id'] = COM_sanitizeID($args['sp_id']);
if (!$gl_edit) {
if (strlen($args['sp_id']) > STATICPAGE_MAX_ID_LENGTH) {
- $args['sp_id'] = WS_makeId($args['slug'],
STATICPAGE_MAX_ID_LENGTH);
+ $slug = '';
+ if (isset($args['slug'])) {
+ $slug = $args['slug'];
+ }
+ $args['sp_id'] = WS_makeId($slug, STATICPAGE_MAX_ID_LENGTH);
}
}
Modified: trunk/geeklog-1-jp/plugins/staticpages/templates/printable.thtml
==============================================================================
--- trunk/geeklog-1-jp/plugins/staticpages/templates/printable.thtml
(original)
+++ trunk/geeklog-1-jp/plugins/staticpages/templates/printable.thtml Sat
Feb 7 02:32:45 2009
@@ -1,9 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML
4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html {lang_attribute}>
<head>
- <title>{page_title}</title>
+ <title>{page_title}</title>
</head>
-<body>
+<body dir="{direction}">
<h1>{sp_title}</h1>
<p>{sp_content}</p>
@@ -13,6 +13,6 @@
<p>{site_name}<br{xhtml}>
<a href="{sp_url}">{sp_url}</a>
</p>
-({comments_text})
+<p>({comments_text})</p>
</body>
</html>
Modified: trunk/geeklog-1-jp/public_html/admin/install/config-install.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/install/config-install.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/install/config-install.php Sat
Feb 7 02:32:45 2009
@@ -8,7 +8,7 @@
//
|
|
// | Initial configuration
setup. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2007-2008 by the following
authors: |
+// | Copyright (C) 2007-2009 by the following
authors: |
//
|
|
// | Authors: Aaron Blankstein - kantai AT gmail DOT
com |
//
+---------------------------------------------------------------------------+
@@ -51,7 +51,7 @@
$c->add('site_slogan','','text',0,0,NULL,70,TRUE);
$c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
$c->add('site_disabled_msg','Geeklog Site is down. Please come back
soon.','text',0,0,NULL,510,TRUE);
- $c->add('copyrightyear','2008','text',0,0,NULL,1440,FALSE);
+ $c->add('copyrightyear',date('Y'),'text',0,0,NULL,1440,FALSE);
$c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
$c->add('fs_mail', NULL, 'fieldset', 0, 1, NULL, 0, TRUE);
Modified: trunk/geeklog-1-jp/public_html/admin/install/index.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/install/index.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/install/index.php Sat Feb 7
02:32:45 2009
@@ -8,7 +8,7 @@
//
|
|
// | Geeklog installation
script. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT
net |
@@ -36,8 +36,6 @@
// | You don't need to change anything in this
file. |
// | Please read docs/install.html which describes how to install
Geeklog. |
//
+---------------------------------------------------------------------------+
-//
-// $Id: index.php,v 1.55 2008/09/06 14:46:24 dhaun Exp $
// this should help expose parse errors even when
// display_errors is set to Off in php.ini
@@ -50,7 +48,7 @@
define("LB", "\n");
}
if (!defined('VERSION')) {
- define('VERSION', '1.5.1');
+ define('VERSION', '1.5.2');
}
if (!defined('XHTML')) {
define('XHTML', ' /');
@@ -412,8 +410,14 @@
$site_admin_url = isset($_POST['site_admin_url']) ?
$_POST['site_admin_url'] : 'http://' . $_SERVER['HTTP_HOST'] .
preg_replace('/\/install.*/', '', $_SERVER['PHP_SELF']) ;
$host_name = explode(':', $_SERVER['HTTP_HOST']);
$host_name = $host_name[0];
- $site_mail = isset($_POST['site_mail']) ?
$_POST['site_mail'] : ($_CONF['site_mail'] == 'admin****@examp*****' ?
$_CONF['site_mail'] : 'admin@' . $host_name);
- $noreply_mail = isset($_POST['noreply_mail']) ?
$_POST['noreply_mail'] : ($_CONF['noreply_mail'] == 'norep****@examp*****' ?
$_CONF['noreply_mail'] : 'noreply@' . $host_name);
+ if (empty($_CONF['site_mail'])) {
+ $_CONF['site_mail'] = 'admin****@examp*****';
+ }
+ $site_mail = isset($_POST['site_mail']) ?
$_POST['site_mail'] : ($_CONF['site_mail'] != 'admin****@examp*****' ?
$_CONF['site_mail'] : 'admin@' . $host_name);
+ if (empty($_CONF['noreply_mail'])) {
+ $_CONF['noreply_mail'] = 'norep****@examp*****';
+ }
+ $noreply_mail = isset($_POST['noreply_mail']) ?
$_POST['noreply_mail'] : ($_CONF['noreply_mail'] != 'norep****@examp*****' ?
$_CONF['noreply_mail'] : 'noreply@' . $host_name);
if (isset($_POST['utf8']) && ($_POST['utf8'] == 'on')) {
$utf8 = true;
} else {
@@ -665,7 +669,7 @@
. '<p>' .
$LANG_INSTALL[91] . '</p>';
} else {
- $old_versions =
array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0');
+ $old_versions =
array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0','1.5.1');
if (empty($curv)) {
// If we were unable to determine the
current GL
// version is then ask the user what
it is
@@ -1027,6 +1031,7 @@
case 'mysql':
$test = array(
+ '1.5.2' => array("SELECT value FROM {$_TABLES['vars']} WHERE
name = 'database_version'", '1.5.2'),
'1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE
name = 'database_version'", 'database_version'),
'1.5.0' => array("DESCRIBE {$_TABLES['storysubmission']}
bodytext",''),
'1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']}
WHERE ft_name = 'syndication.edit'", 'syndication.edit'),
@@ -1049,6 +1054,7 @@
case 'mssql':
$test = array(
+ '1.5.2' => array("SELECT value FROM {$_TABLES['vars']} WHERE
name = 'database_version'", '1.5.2'),
'1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE
name = 'database_version'", 'database_version'),
'1.5.0' => array("SELECT c.name FROM syscolumns c JOIN
sysobjects o ON o.id = c.id WHERE c.name='bodytext' AND
o.name='{$_TABLES['storysubmission']}'",'bodytext'),
'1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']}
WHERE ft_name = 'syndication.edit'", 'syndication.edit')
@@ -1730,6 +1736,14 @@
$_SQL = '';
break;
+ case '1.5.1':
+ require_once $_CONF['path'] . 'sql/updates/' .
$_DB_dbms . '_1.5.1_to_1.5.2.php';
+ INST_updateDB($_SQL);
+
+ $current_gl_version = '1.5.2';
+ $_SQL = '';
+ break;
+
default:
$done = true;
}
@@ -1922,7 +1936,7 @@
<div class="header-slogan">' . $LANG_INSTALL[2] . ' <br' .
XHTML . '><br' . XHTML . '>' . LB;
// Show the language drop down selection on the first page
-if ($mode == 'check_permissions') {
+if (empty($mode) || ($mode == 'check_permissions')) {
$display .='<form action="index.php" method="post"
style="display:inline;">' . LB;
$_PATH = array('dbconfig', 'public_html');
Modified: trunk/geeklog-1-jp/public_html/admin/install/language/german.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/install/language/german.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/install/language/german.php Sat
Feb 7 02:32:45 2009
@@ -8,7 +8,7 @@
//
|
|
// | German language file for the Geeklog installation
script |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT
net |
@@ -33,8 +33,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: german.php,v 1.9 2008/05/28 18:46:52 dhaun Exp $
//
+---------------------------------------------------------------------------+
@@ -97,7 +95,7 @@
44 => 'Optionale Einstellungen',
45 => 'URL der Website',
46 => '(ohne Slash am Ende)',
- 47 => 'Pfad f�r das "admin"-Verzeichnis',
+ 47 => 'URL f. "admin"-Verzeichnis',
48 => 'Website-Email-Adresse',
49 => '"No Reply"-Email-Adresse',
50 => 'Installieren',
Modified:
trunk/geeklog-1-jp/public_html/admin/install/language/hebrew_utf-8.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/install/language/hebrew_utf-8.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/install/language/hebrew_utf-8.php
Sat Feb 7 02:32:45 2009
@@ -148,25 +148,25 @@
0 => 'ההתקנה הושלמה',
1 => 'ההתקנה של Geeklog ',
2 => ' הושלמה!',
- 3 => 'כל הכבוד, הצלחתם להתקין את ',
- 4 => ' Geeklog. אנא קחו רגע לקרוא את המידע המצוין להלן.',
+ 3 => 'כל הכבוד, הצלחתם ',
+ 4 => ' Geeklog. אנא קחו רגע כדי לקרוא את המידע המצוין להלן.',
5 => 'כדי להזדהות באתר ה-Geeklog החדש שלכם, אנא השתמשו בחשבון זה:',
6 => 'שם משתמש:',
7 => 'Admin',
8 => 'סיסמה:',
9 => 'password',
10 => 'אזהרת אבטחה',
- 11 => 'אל תשכחו',
+ 11 => 'אל תשכחו לבצע',
12 => 'דברים',
- 13 => 'הסרת או שינוי שם ספריית התקנה,',
- 14 => 'שינוי של',
- 15 => 'סיסמת החשבון.',
- 16 => 'הגדרת הרשאות של',
- 17 => 'וגם',
- 18 => 'בחזרה אל',
+ 13 => 'להסיר או לשנות את שם ספריית ההתקנה,',
+ 14 => 'לשנות ל-',
+ 15 => 'את סיסמת החשבון.',
+ 16 => 'לשנות את ההרשאות של',
+ 17 => 'וגם של',
+ 18 => 'בחזרה ל:',
19 => '<strong>שימו לב:</strong> עקב כך ששונה מודל האבטחה, יצרנו חשבון
חדש עם ההרשאות שהנכם זקוקים להן כדי לנהל את אתרכם החדש. שם המשתמש של חשבון
חדש זה הוא <b>NewAdmin</b> והסיסמה היא <b>password</b>',
- 20 => 'מותקן',
- 21 => 'משודרג'
+ 20 => 'להתקין את',
+ 21 => 'לשדרג את'
);
//
+---------------------------------------------------------------------------+
Modified: trunk/geeklog-1-jp/public_html/admin/install/language/polish.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/install/language/polish.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/install/language/polish.php Sat
Feb 7 02:32:45 2009
@@ -95,12 +95,12 @@
42 => 'Has�o do Bazy Danych',
43 => 'Prefix Tabeli w Bazie Danych',
44 => 'Ustawienia Opcjonalne',
- 45 => 'Site URL',
- 46 => '(No trailing slash)',
- 47 => 'Admin Directory Path',
- 48 => 'Site Email',
- 49 => 'Site No-Reply Email',
- 50 => 'Install',
+ 45 => 'Adres URL strony',
+ 46 => '(Bez ko�cowego slasha)',
+ 47 => '�cie�ka do katalogu administratora',
+ 48 => 'Adres email strony',
+ 49 => 'Bezzwrotny adres email strony',
+ 50 => 'Instaluj',
51 => 'Wymagana baza MySQL 3.23.2',
52 => 'Sorry, but Geeklog requires at least MySQL 3.23.2 to run (you
have version ',
53 => '). Please <a
href="http://dev.mysql.com/downloads/mysql/">upgrade your MySQL</a> install
or ask your hosting service to do it for you.',
@@ -153,21 +153,21 @@
1 => 'Instalacja Geeklog-a ',
2 => ' zako�czona!',
3 => 'Gratulacje, pomy�lnie ',
- 4 => ' Geeklog-a. Please take a minute to read the information
displayed below.',
+ 4 => ' Geeklog-a. Prosz� po�wi�ci� chwil� na przeczytanie informacji
poni�ej.',
5 => 'Aby zalogowa� si� prosz� u�y� nast�puj�cego konta:',
6 => 'U�ytkownik:',
7 => 'Admin',
8 => 'Has�o:',
9 => 'password',
- 10 => 'Security Warning',
- 11 => 'Don\'t forget to do',
- 12 => 'things',
+ 10 => 'UWAGA!',
+ 11 => 'Nie zapomnij o ',
+ 12 => 'rzeczach',
13 => 'Usu� lub zmie� nazw� katalogu z plikami instalacyjnymi,',
14 => 'Zmie� has�o dla konta',
15 => '.',
- 16 => 'Set permissions on',
- 17 => 'and',
- 18 => 'back to',
+ 16 => 'Zmie� atrybuty dost�pu do plik�w ',
+ 17 => 'i',
+ 18 => 'z powrotem na',
19 => '<strong>Note:</strong> Because the security model has been
changed, we have created a new account with the rights you need to
administer your new site. The username for this new account is
<b>NewAdmin</b> and the password is <b>password</b>',
20 => 'zainstalowano',
21 => 'aktualizowano'
Modified: trunk/geeklog-1-jp/public_html/admin/moderation.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/moderation.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/moderation.php Sat Feb 7 02:32:45
2009
@@ -667,17 +667,7 @@
$display = '';
$display .= COM_siteHeader ('menu', $LANG29[34]);
-$msg = 0;
-if (isset($_GET['msg'])) {
- $msg = COM_applyFilter($_GET['msg'], true);
-}
-if ($msg > 0) {
- $plugin = '';
- if (isset($_GET['plugin'])) {
- $plugin = COM_applyFilter($_GET['plugin']);
- }
- $display .= COM_showMessage($msg, $plugin);
-}
+$display .= COM_showMessageFromParameter();
if (isset ($_POST['mode']) && ($_POST['mode'] == 'moderation') &&
SEC_checkToken()) {
$action = array();
Modified: trunk/geeklog-1-jp/public_html/admin/plugins.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins.php Sat Feb 7 02:32:45
2009
@@ -144,7 +144,12 @@
if ($A['pi_enabled'] == 1) {
$plg_templates->set_var('enabled_checked', 'checked="checked"');
} else {
- $plg_templates->set_var('enabled_checked', '');
+ if (file_exists($_CONF['path'] . 'plugins/' . $pi_name
+ . '/functions.inc')) {
+ $plg_templates->set_var('enabled_checked', '');
+ } else {
+
$plg_templates->set_var('enabled_checked', 'disabled="disabled"');
+ }
}
$plg_templates->set_var('gltoken', SEC_createToken());
$plg_templates->set_var('gltoken_name', CSRF_TOKEN);
Modified: trunk/geeklog-1-jp/public_html/admin/plugins/calendar/install.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/calendar/install.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/calendar/install.php Sat
Feb 7 02:32:45 2009
@@ -11,7 +11,7 @@
//
+---------------------------------------------------------------------------+
// | Based on the Universal Plugin and prior work by the following
authors: |
//
|
|
-// | Copyright (C) 2002-2008 by the following
authors: |
+// | Copyright (C) 2002-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - tom AT pigstye DOT
net |
@@ -35,8 +35,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: install.php,v 1.15 2008/05/23 13:36:12 dhaun Exp $
require_once '../../../lib-common.php';
@@ -46,7 +44,7 @@
//
$pi_display_name = 'Calendar';
$pi_name = 'calendar';
-$pi_version = '1.0.2';
+$pi_version = '1.0.3';
$gl_version = '1.5.0';
$pi_url = 'http://www.geeklog.net/';
Modified: trunk/geeklog-1-jp/public_html/admin/plugins/links/index.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/links/index.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/links/index.php Sat Feb 7
02:32:45 2009
@@ -53,7 +53,6 @@
require_once '../../../lib-common.php';
require_once '../../auth.inc.php';
-require_once $_CONF['path_system'] . 'lib-security.php';
// Uncomment the lines below if you need to debug the HTTP variables being
passed
// to the script. This will sometimes cause errors but it will allow you
to see
@@ -63,14 +62,11 @@
$display = '';
-if (!SEC_hasRights ('links.edit')) {
- $display .= COM_siteHeader ('menu', $MESSAGE[30]);
- $display .= COM_startBlock ($MESSAGE[30], '',
- COM_getBlockTemplate
('_msg_block', 'header'));
- $display .= $MESSAGE[34];
- $display .= COM_endBlock (COM_getBlockTemplate
('_msg_block', 'footer'));
- $display .= COM_siteFooter ();
- COM_accessLog ("User {$_USER['username']} tried to illegally access
the links administration screen.");
+if (!SEC_hasRights('links.edit')) {
+ $display .= COM_siteHeader('menu', $MESSAGE[30])
+ . COM_showMessageText($MESSAGE[34], $MESSAGE[30])
+ . COM_siteFooter();
+ COM_accessLog("User {$_USER['username']} tried to illegally access the
links administration screen.");
echo $display;
exit;
}
@@ -273,15 +269,25 @@
$perm_anon = 2;
}
- $lid = COM_sanitizeID ($lid);
- if (empty ($lid)) {
- if (empty ($old_lid)) {
- $lid = COM_makeSid ();
+ $lid = COM_sanitizeID($lid);
+ $old_lid = COM_sanitizeID($old_lid);
+ if (empty($lid)) {
+ if (empty($old_lid)) {
+ $lid = COM_makeSid();
} else {
$lid = $old_lid;
}
}
+ // check for link id change
+ if (!empty($old_lid) && ($lid != $old_lid)) {
+ // check if new lid is already in use
+ if (DB_count($_TABLES['links'], 'lid', $lid) > 0) {
+ // TBD: abort, display editor with all content intact again
+ $lid = $old_lid; // for now ...
+ }
+ }
+
$access = 0;
$old_lid = addslashes ($old_lid);
if (DB_count ($_TABLES['links'], 'lid', $old_lid) > 0) {
@@ -294,13 +300,10 @@
$access = SEC_hasAccess ($owner_id, $group_id, $perm_owner,
$perm_group,
$perm_members, $perm_anon);
}
- if (($access < 3) || !SEC_inGroup ($group_id)) {
- $display .= COM_siteHeader ('menu', $MESSAGE[30]);
- $display .= COM_startBlock ($MESSAGE[30], '',
- COM_getBlockTemplate ('_msg_block', 'header'));
- $display .= $MESSAGE[31];
- $display .= COM_endBlock (COM_getBlockTemplate
('_msg_block', 'footer'));
- $display .= COM_siteFooter ();
+ if (($access < 3) || !SEC_inGroup($group_id)) {
+ $display .= COM_siteHeader('menu', $MESSAGE[30])
+ . COM_showMessageText($MESSAGE[31], $MESSAGE[30])
+ . COM_siteFooter();
COM_accessLog("User {$_USER['username']} tried to illegally submit
or edit link $lid.");
echo $display;
exit;
@@ -524,15 +527,15 @@
}
$display .= COM_siteFooter ();
} else { // 'cancel' or no mode at all
- $display .= COM_siteHeader ('menu', $LANG_LINKS_ADMIN[11]);
- if (isset ($_REQUEST['msg'])) {
- $msg = COM_applyFilter ($_REQUEST['msg'], true);
+ $display .= COM_siteHeader('menu', $LANG_LINKS_ADMIN[11]);
+ if (isset($_GET['msg'])) {
+ $msg = COM_applyFilter($_GET['msg'], true);
if ($msg > 0) {
- $display .= COM_showMessage ($msg, 'links');
+ $display .= COM_showMessage($msg, 'links');
}
}
$display .= listlinks();
- $display .= COM_siteFooter ();
+ $display .= COM_siteFooter();
}
echo $display;
Modified: trunk/geeklog-1-jp/public_html/admin/plugins/links/install.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/links/install.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/links/install.php Sat Feb
7 02:32:45 2009
@@ -11,7 +11,7 @@
//
+---------------------------------------------------------------------------+
// | Based on the Universal Plugin and prior work by the following
authors: |
//
|
|
-// | Copyright (C) 2002-2008 by the following
authors: |
+// | Copyright (C) 2002-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - tom AT pigstye DOT
net |
@@ -37,8 +37,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: install.php,v 1.26 2008/05/23 13:36:12 dhaun Exp $
require_once '../../../lib-common.php';
@@ -48,7 +46,7 @@
//
$pi_display_name = 'Links';
$pi_name = 'links';
-$pi_version = '2.0.0';
+$pi_version = '2.0.1';
$gl_version = '1.5.0';
$pi_url = 'http://www.geeklog.net/';
@@ -91,6 +89,10 @@
}
if (!function_exists('SEC_createToken')) {
+ return false;
+ }
+
+ if (!function_exists('COM_showMessageText')) {
return false;
}
Modified: trunk/geeklog-1-jp/public_html/admin/plugins/polls/index.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/polls/index.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/polls/index.php Sat Feb 7
02:32:45 2009
@@ -8,7 +8,7 @@
//
|
|
// | Geeklog poll administration
page |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT
net |
@@ -31,8 +31,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: index.php,v 1.59 2008/06/10 17:26:50 dhaun Exp $
// Set this to true if you want to log debug messages to error.log
$_POLL_VERBOSE = false;
@@ -40,17 +38,13 @@
require_once '../../../lib-common.php';
require_once '../../auth.inc.php';
-
$display = '';
-if (!SEC_hasRights ('polls.edit')) {
- $display .= COM_siteHeader ('menu', $MESSAGE[30]);
- $display .= COM_startBlock ($MESSAGE[30], '',
- COM_getBlockTemplate
('_msg_block', 'header'));
- $display .= $MESSAGE[36];
- $display .= COM_endBlock (COM_getBlockTemplate
('_msg_block', 'footer'));
- $display .= COM_siteFooter ();
- COM_accessLog ("User {$_USER['username']} tried to illegally access
the poll administration screen.");
+if (!SEC_hasRights('polls.edit')) {
+ $display .= COM_siteHeader('menu', $MESSAGE[30])
+ . COM_showMessageText($MESSAGE[36], $MESSAGE[30])
+ . COM_siteFooter();
+ COM_accessLog("User {$_USER['username']} tried to illegally access the
poll administration screen.");
echo $display;
exit;
}
@@ -124,6 +118,7 @@
* Saves a poll topic and potential answers to the database
*
* @param string $pid Poll topic ID
+* @param string $old_pid Previous poll topic ID
* @param array $Q Array of poll questions
* @param string $mainpage Checkbox: poll appears on homepage
* @param string $topic The text for the topic
@@ -143,9 +138,9 @@
* @return string HTML redirect or error message
*
*/
-function savepoll($pid, $Q, $mainpage, $topic, $statuscode, $open,
$hideresults,
- $commentcode, $A, $V, $R, $owner_id, $group_id,
$perm_owner,
- $perm_group, $perm_members, $perm_anon)
+function savepoll($pid, $old_pid, $Q, $mainpage, $topic, $statuscode,
$open,
+ $hideresults, $commentcode, $A, $V, $R, $owner_id,
$group_id,
+ $perm_owner, $perm_group, $perm_members, $perm_anon)
{
global $_CONF, $_TABLES, $_USER, $LANG21, $LANG25, $MESSAGE,
$_POLL_VERBOSE,
@@ -156,8 +151,16 @@
// Convert array values to numeric permission values
list($perm_owner,$perm_group,$perm_members,$perm_anon) =
SEC_getPermissionValues($perm_owner,$perm_group,$perm_members,$perm_anon);
- $pid = COM_sanitizeID($pid);
$topic = COM_stripslashes($topic);
+ $pid = COM_sanitizeID($pid);
+ $old_pid = COM_sanitizeID($old_pid);
+ if (empty($pid)) {
+ if (empty($old_pid)) {
+ $pid = COM_makeSid();
+ } else {
+ $pid = $old_pid;
+ }
+ }
// check if any question was entered
if (empty($topic) or (sizeof($Q) == 0) or (strlen($Q[0]) == 0) or
@@ -177,12 +180,21 @@
. '/plugins/polls/index.php');
}
+ // check for poll id change
+ if (!empty($old_pid) && ($pid != $old_pid)) {
+ // check if new pid is already in use
+ if (DB_count($_TABLES['polltopics'], 'pid', $pid) > 0) {
+ // TBD: abort, display editor with all content intact again
+ $pid = $old_pid; // for now ...
+ }
+ }
+
// start processing the poll topic
if ($_POLL_VERBOSE) {
COM_errorLog ('**** Inside savepoll() in '
.
$_CONF['site_admin_url'] . '/plugins/polls/index.php ***');
}
- $pid = str_replace (' ', '', $pid); // strip spaces from poll id
+
$access = 0;
if (DB_count ($_TABLES['polltopics'], 'pid', $pid) > 0) {
$result = DB_query ("SELECT
owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon FROM
{$_TABLES['polltopics']} WHERE pid = '{$pid}'");
@@ -194,14 +206,10 @@
$access = SEC_hasAccess ($owner_id, $group_id, $perm_owner,
$perm_group, $perm_members, $perm_anon);
}
- if (($access < 3) || !SEC_inGroup ($group_id)) {
- $display .= COM_siteHeader ('menu', $MESSAGE[30]);
- $display .= COM_startBlock ($MESSAGE[30], '',
- COM_getBlockTemplate ('_msg_block', 'header'));
- $display .= $MESSAGE[31];
- $display .= COM_endBlock ();
- $display .= COM_siteFooter (COM_getBlockTemplate ('_msg_block',
- 'footer'));
+ if (($access < 3) || !SEC_inGroup($group_id)) {
+ $display .= COM_siteHeader('menu', $MESSAGE[30])
+ . COM_showMessageText($MESSAGE[31], $MESSAGE[30])
+ . COM_siteFooter();
COM_accessLog("User {$_USER['username']} tried to illegally submit
or edit poll $pid.");
echo $display;
exit;
@@ -217,24 +225,34 @@
COM_errorLog('member permissions: ' . $perm_members, 1);
COM_errorLog('anonymous permissions: ' . $perm_anon, 1);
}
+
// we delete everything and re-create it with the input from the form
- DB_delete ($_TABLES['polltopics'], 'pid', $pid);
- DB_delete ($_TABLES['pollanswers'], 'pid', $pid);
- DB_delete ($_TABLES['pollquestions'], 'pid', $pid);
+ $del_pid = $pid;
+ if (!empty($old_pid) && ($pid != $old_pid)) {
+ $del_pid = $old_pid; // delete by old pid, create using new pid
below
+ }
+ DB_delete($_TABLES['polltopics'], 'pid', $del_pid);
+ DB_delete($_TABLES['pollanswers'], 'pid', $del_pid);
+ DB_delete($_TABLES['pollquestions'], 'pid', $del_pid);
$topic = addslashes ($topic);
$k = 0; // set up a counter to make sure we do assign a straight line
of question id's
$v = 0; // re-count votes sine they might have been changed
// first dimension of array are the questions
- for ($i=0; $i<sizeof($Q); $i++) {
- $Q[$i] = COM_stripslashes ($Q[$i]);
- if (strlen ($Q[$i]) > 0) { // only insert questions that exist
- DB_save ($_TABLES['pollquestions'], 'qid, pid,
question', "'$k', '$pid', '$Q[$i]'");
- // within the questions, we have another dimensions with
answers, votes and remarks
- for ($j=0; $j<sizeof($A[$i]); $j++) {
- $A[$i][$j] = COM_stripslashes ($A[$i][$j]);
- if (strlen ($A[$i][$j]) > 0) { // only insert answers etc
that exist
+ $num_questions = sizeof($Q);
+ for ($i = 0; $i < $num_questions; $i++) {
+ $Q[$i] = COM_stripslashes($Q[$i]);
+ if (strlen($Q[$i]) > 0) { // only insert questions that exist
+ $Q[$i] = addslashes($Q[$i]);
+ DB_save($_TABLES['pollquestions'], 'qid, pid, question',
+ "'$k', '$pid', '$Q[$i]'");
+ // within the questions, we have another dimensions with
answers,
+ // votes and remarks
+ $num_answers = sizeof($A[$i]);
+ for ($j = 0; $j < $num_answers; $j++) {
+ $A[$i][$j] = COM_stripslashes($A[$i][$j]);
+ if (strlen($A[$i][$j]) > 0) { // only insert answers etc
that exist
if (!is_numeric($V[$i][$j])) {
$V[$i][$j] = "0";
}
@@ -531,8 +549,18 @@
$display .= editpoll ($pid);
$display .= COM_siteFooter ();
} elseif (($mode == $LANG_ADMIN['save']) && !empty($LANG_ADMIN['save'])) {
- $pid = COM_applyFilter ($_POST['pid']);
- if (!empty ($pid)) {
+ $pid = COM_applyFilter($_POST['pid']);
+ $old_pid = '';
+ if (isset($_POST['old_pid'])) {
+ $old_pid = COM_applyFilter($_POST['old_pid']);
+ }
+ if (empty($pid) && !empty($old_pid)) {
+ $pid = $old_pid;
+ }
+ if (empty($old_pid) && (! empty($pid))) {
+ $old_pid = $pid;
+ }
+ if (!empty($pid)) {
$statuscode = 0;
if (isset ($_POST['statuscode'])) {
$statuscode = COM_applyFilter ($_POST['statuscode'], true);
@@ -549,8 +577,8 @@
if (isset ($_POST['hideresults'])) {
$hideresults = COM_applyFilter ($_POST['hideresults']);
}
- $display .= savepoll ($pid, $_POST['question'], $mainpage,
$_POST['topic'],
- $statuscode, $open, $hideresults,
+ $display .= savepoll ($pid, $old_pid, $_POST['question'],
$mainpage,
+ $_POST['topic'], $statuscode, $open, $hideresults,
COM_applyFilter ($_POST['commentcode'], true),
$_POST['answer'], $_POST['votes'],
$_POST['remark'],
COM_applyFilter ($_POST['owner_id'], true),
Modified: trunk/geeklog-1-jp/public_html/admin/plugins/polls/install.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/polls/install.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/polls/install.php Sat Feb
7 02:32:45 2009
@@ -11,7 +11,7 @@
//
+---------------------------------------------------------------------------+
// | Based on the Universal Plugin and prior work by the following
authors: |
//
|
|
-// | Copyright (C) 2002-2008 by the following
authors: |
+// | Copyright (C) 2002-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - tom AT pigstye DOT
net |
@@ -35,8 +35,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: install.php,v 1.24 2008/05/23 13:36:12 dhaun Exp $
require_once '../../../lib-common.php';
@@ -46,7 +44,7 @@
//
$pi_display_name = 'Polls';
$pi_name = 'polls';
-$pi_version = '2.0.1';
+$pi_version = '2.0.2';
$gl_version = '1.5.0';
$pi_url = 'http://www.geeklog.net/';
@@ -93,6 +91,10 @@
}
if (!function_exists('SEC_createToken')) {
+ return false;
+ }
+
+ if (!function_exists('COM_showMessageText')) {
return false;
}
Modified: trunk/geeklog-1-jp/public_html/admin/plugins/spamx/install.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/spamx/install.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/spamx/install.php Sat Feb
7 02:32:45 2009
@@ -11,7 +11,7 @@
//
+---------------------------------------------------------------------------+
// | Based on the Universal Plugin and prior work by the following
authors: |
//
|
|
-// | Copyright (C) 2002-2008 by the following
authors: |
+// | Copyright (C) 2002-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - tom AT pigstye DOT
net |
@@ -35,8 +35,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: install.php,v 1.26 2008/05/23 13:36:12 dhaun Exp $
require_once '../../../lib-common.php';
@@ -46,7 +44,7 @@
//
$pi_display_name = 'Spam-X';
$pi_name = 'spamx';
-$pi_version = '1.1.1';
+$pi_version = '1.1.2';
$gl_version = '1.5.0';
$pi_url
= 'http://www.pigstye.net/gplugs/staticpages/index.php/spamx';
@@ -80,15 +78,15 @@
*/
function plugin_compatible_with_this_geeklog_version()
{
- if (function_exists('PLG_spamAction')) {
- return true;
+ if (! function_exists('PLG_spamAction')) {
+ return false;
}
- if (function_exists('SEC_createToken')) {
- return true;
+ if (! function_exists('SEC_createToken')) {
+ return false;
}
- return false;
+ return true;
}
/**
Modified:
trunk/geeklog-1-jp/public_html/admin/plugins/staticpages/install.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/plugins/staticpages/install.php
(original)
+++ trunk/geeklog-1-jp/public_html/admin/plugins/staticpages/install.php
Sat Feb 7 02:32:45 2009
@@ -12,7 +12,7 @@
// | Based on the Universal Plugin and prior work by the following
authors: |
// | Upgraded for GL version 1.5 online config
manager |
//
|
|
-// | Copyright (C) 2002-2008 by the following
authors: |
+// | Copyright (C) 2002-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Tom Willett - tom AT pigstye DOT
net |
@@ -36,8 +36,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: install.php,v 1.33 2008/05/23 13:36:12 dhaun Exp $
require_once '../../../lib-common.php';
@@ -47,7 +45,7 @@
//
$pi_display_name = 'Static Page';
$pi_name = 'staticpages';
-$pi_version = '1.5.0';
+$pi_version = '1.5.1';
$gl_version = '1.5.0';
$pi_url = 'http://www.geeklog.net/';
@@ -63,7 +61,7 @@
$FEATURES = array();
$FEATURES['staticpages.edit'] = 'Access to Static Pages editor';
$FEATURES['staticpages.delete'] = 'Ability to delete static pages';
-$FEATURES['staticpages.PHP'] = 'Ability use PHP in static pages';
+$FEATURES['staticpages.PHP'] = 'Ability to use PHP in static pages';
$MAPPINGS = array();
$MAPPINGS['staticpages.edit'] = array ($pi_admin);
Modified: trunk/geeklog-1-jp/public_html/admin/story.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/story.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/story.php Sat Feb 7 02:32:45 2009
@@ -8,7 +8,7 @@
//
|
|
// | Geeklog story administration
page. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT
net |
@@ -31,8 +31,6 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: story.php,v 1.270 2008/09/13 07:26:43 mjervis Exp $
/**
* This is the Geeklog story administration page.
@@ -293,7 +291,7 @@
return COM_refresh( $_CONF['site_admin_url'] . '/story.php' );
}
} elseif( $result == STORY_DUPLICATE_SID) {
- $display .= COM_errorLog ($LANG24[24], 2);
+ $display .= COM_showMessageText($LANG24[24]);
}
// Load HTML templates
@@ -340,7 +338,7 @@
if ($advanced_editormode AND $previewContent != '' ) {
$story_templates->set_var('preview_content', $previewContent);
} elseif ($previewContent != '') {
- $display = COM_startBlock ($LANG24[26], '',
+ $display .= COM_startBlock ($LANG24[26], '',
COM_getBlockTemplate
('_admin_block', 'header'));
$display .= $previewContent;
$display .= COM_endBlock (COM_getBlockTemplate
('_admin_block', 'footer'));
Modified: trunk/geeklog-1-jp/public_html/admin/syndication.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/syndication.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/syndication.php Sat Feb 7
02:32:45 2009
@@ -529,18 +529,23 @@
* @return string HTML redirect
*
*/
-function deletefeed ($fid)
+function deletefeed($fid)
{
global $_CONF, $_TABLES;
if ($fid > 0) {
- DB_delete ($_TABLES['syndication'], 'fid', $fid);
+ $feedfile = DB_getItem($_TABLES['syndication'], 'filename',
+ "fid = $fid");
+ if (!empty($feedfile)) {
+ @unlink(SYND_getFeedPath($feedfile));
+ }
+ DB_delete($_TABLES['syndication'], 'fid', $fid);
- return COM_refresh ($_CONF['site_admin_url']
- . '/syndication.php?msg=59');
+ return COM_refresh($_CONF['site_admin_url']
+ . '/syndication.php?msg=59');
}
- return COM_refresh ($_CONF['site_admin_url'] . '/syndication.php');
+ return COM_refresh($_CONF['site_admin_url'] . '/syndication.php');
}
@@ -579,7 +584,11 @@
}
elseif (($mode == $LANG_ADMIN['delete']) && !empty($LANG_ADMIN['delete'])
&& SEC_checkToken())
{
- $display .= deletefeed(COM_applyFilter($_REQUEST['fid']));
+ $fid = 0;
+ if (isset($_POST['fid'])) {
+ $fid = COM_applyFilter($_POST['fid'], true);
+ }
+ $display .= deletefeed($fid);
}
else
{
Modified: trunk/geeklog-1-jp/public_html/admin/topic.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/topic.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/topic.php Sat Feb 7 02:32:45 2009
@@ -286,8 +286,8 @@
DB_save($_TABLES['topics'],'tid, topic, imageurl, sortnum,
limitnews, is_default, archive_flag, owner_id, group_id, perm_owner,
perm_group, perm_members,
perm_anon',"'$tid', '$topic', '$imageurl','$sortnum','$limitnews',$is_default,'$is_archive',$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon");
// update feed(s) and Older Stories block
- COM_rdfUpToDateCheck ('geeklog', $tid);
- COM_olderStuff ();
+ COM_rdfUpToDateCheck('article', $tid);
+ COM_olderStuff();
$retval = COM_refresh
($_CONF['site_admin_url'] . '/topic.php?msg=13');
} else {
@@ -439,8 +439,8 @@
DB_delete ($_TABLES['topics'], 'tid', $tid);
// update feed(s) and Older Stories block
- COM_rdfUpToDateCheck ('geeklog');
- COM_olderStuff ();
+ COM_rdfUpToDateCheck('article');
+ COM_olderStuff();
return COM_refresh ($_CONF['site_admin_url'] . '/topic.php?msg=14');
}
Modified: trunk/geeklog-1-jp/public_html/admin/user.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/admin/user.php (original)
+++ trunk/geeklog-1-jp/public_html/admin/user.php Sat Feb 7 02:32:45 2009
@@ -45,14 +45,11 @@
// Make sure user has access to this page
if (!SEC_hasRights('user.edit')) {
- $retval .= COM_siteHeader ('menu', $MESSAGE[30]);
- $retval .= COM_startBlock ($MESSAGE[30], '',
- COM_getBlockTemplate ('_msg_block', 'header'));
- $retval .= $MESSAGE[37];
- $retval .= COM_endBlock (COM_getBlockTemplate
('_msg_block', 'footer'));
- $retval .= COM_siteFooter ();
+ $display .= COM_siteHeader('menu', $MESSAGE[30])
+ . COM_showMessageText($MESSAGE[37], $MESSAGE[30])
+ . COM_siteFooter();
COM_accessLog("User {$_USER['username']} tried to illegally access the
user administration screen.");
- echo $retval;
+ echo $display;
exit;
}
@@ -361,7 +358,7 @@
function listusers()
{
- global $_CONF, $_TABLES, $LANG_ADMIN, $LANG28, $_IMAGE_TYPE;
+ global $_CONF, $_TABLES, $LANG_ADMIN, $LANG04, $LANG28, $_IMAGE_TYPE;
require_once $_CONF['path_system'] . 'lib-admin.php';
@@ -380,10 +377,14 @@
array('text' => $LANG28[37], 'field' =>
$_TABLES['users'] . '.uid', 'sort' => true),
array('text' => $LANG28[3], 'field'
=> 'username', 'sort' => true),
array('text' => $LANG28[4], 'field'
=> 'fullname', 'sort' => true),
- array('text' => $login_text, 'field' =>
$login_field, 'sort' => true)
+ array('text' => $login_text, 'field' =>
$login_field, 'sort' => true),
+ array('text' => $LANG28[7], 'field' => 'email', 'sort'
=> true)
);
- $header_arr[] = array('text' => $LANG28[7], 'field' => 'email', 'sort'
=> true);
+ if ($_CONF['user_login_method']['openid'] ||
+ $_CONF['user_login_method']['3rdparty']) {
+ $header_arr[] = array('text' => $LANG04[121], 'field'
=> 'remoteservice', 'sort' => true);
+ }
$defsort_arr = array('field' => $_TABLES['users'] . '.uid',
'direction' => 'ASC');
@@ -414,9 +415,15 @@
'help_url' => ''
);
+ $join_userinfo = '';
+ $select_userinfo = '';
if ($_CONF['lastlogin']) {
- $join_userinfo="LEFT JOIN {$_TABLES['userinfo']} ON
{$_TABLES['users']}.uid={$_TABLES['userinfo']}.uid ";
- $select_userinfo=",lastlogin";
+ $join_userinfo .= "LEFT JOIN {$_TABLES['userinfo']} ON
{$_TABLES['users']}.uid={$_TABLES['userinfo']}.uid ";
+ $select_userinfo .= ",lastlogin";
+ }
+ if ($_CONF['user_login_method']['openid'] ||
+ $_CONF['user_login_method']['3rdparty']) {
+ $select_userinfo .= ',remoteservice';
}
$sql = "SELECT
{$_TABLES['users']}.uid,username,fullname,email,photo,status,regdate$select_userinfo "
. "FROM {$_TABLES['users']} $join_userinfo WHERE 1=1";
@@ -1250,10 +1257,8 @@
. batchdelete()
. COM_siteFooter();
} else { // 'cancel' or no mode at all
- $display .= COM_siteHeader ('menu', $LANG28[11]);
- if (isset ($_REQUEST['msg'])) {
- $display .= COM_showMessage (COM_applyFilter ($_REQUEST['msg'],
true));
- }
+ $display .= COM_siteHeader('menu', $LANG28[11]);
+ $display .= COM_showMessageFromParameter();
$display .= listusers();
$display .= COM_siteFooter();
}
Modified: trunk/geeklog-1-jp/public_html/article.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/article.php (original)
+++ trunk/geeklog-1-jp/public_html/article.php Sat Feb 7 02:32:45 2009
@@ -8,7 +8,7 @@
//
|
|
// | Shows articles in various
formats. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Jason Whittenburg - jwhitten AT securitygeeks DOT
com |
@@ -31,15 +31,13 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: article.php,v 1.99 2008/07/27 09:11:29 dhaun Exp $
/**
* This page is responsible for showing a single article in different modes
which
* may, or may not, include the comments attached
*
* @author Jason Whittenburg
-* @author Tony Bibbbs <tony****@tonyb*****>
+* @author Tony Bibbbs <tony AT tonybibbs DOT com>
* @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
*/
@@ -136,96 +134,65 @@
} elseif ( $output == STORY_INVALID_SID ) {
$display .= COM_refresh($_CONF['site_url'] . '/index.php');
} elseif (($mode == 'print') && ($_CONF['hideprintericon'] == 0)) {
- $story_template = new Template ($_CONF['path_layout'] . 'article');
- $story_template->set_file ('article', 'printable.thtml');
- $story_template->set_var ('xhtml', XHTML);
- $story_template->set_var ('page_title',
+ $story_template = new Template($_CONF['path_layout'] . 'article');
+ $story_template->set_file('article', 'printable.thtml');
+ $story_template->set_var('xhtml', XHTML);
+ $story_template->set_var('direction', $LANG_DIRECTION);
+ $story_template->set_var('page_title',
$_CONF['site_name'] . ': ' .
$story->displayElements('title'));
- $story_template->set_var ( 'story_title',
$story->DisplayElements( 'title' ) );
- header ('Content-Type: text/html; charset=' . COM_getCharset ());
- $story_template->set_var ('story_date',
$story->displayElements('date'));
+ $story_template->set_var('story_title',
+ $story->DisplayElements('title'));
+ header('Content-Type: text/html; charset=' . COM_getCharset());
+ $story_template->set_var('story_date',
$story->displayElements('date'));
if ($_CONF['contributedbyline'] == 1) {
- $story_template->set_var ('lang_contributedby', $LANG01[1]);
- $authorname = COM_getDisplayName
($story->displayElements('uid'));
- $story_template->set_var ('author', $authorname);
- $story_template->set_var ('story_author', $authorname);
- $story_template->set_var ('story_author_username',
$story->DisplayElements('username'));
+ $story_template->set_var('lang_contributedby', $LANG01[1]);
+ $authorname =
COM_getDisplayName($story->displayElements('uid'));
+ $story_template->set_var('author', $authorname);
+ $story_template->set_var('story_author', $authorname);
+ $story_template->set_var('story_author_username',
+ $story->DisplayElements('username'));
}
- $story_template->set_var ('story_introtext',
- $story->DisplayElements('introtext'));
- $story_template->set_var ('story_bodytext',
- $story->DisplayElements('bodytext'));
-
- $story_template->set_var ('site_url', $_CONF['site_url']);
- $story_template->set_var ('layout_url', $_CONF['layout_url']);
- $story_template->set_var ('site_name', $_CONF['site_name']);
- $story_template->set_var ('site_slogan', $_CONF['site_slogan']);
- $story_template->set_var ('story_id', $story->getSid());
- $articleUrl = COM_buildUrl ($_CONF['site_url']
- . '/article.php?story=' .
$story->getSid());
+ $story_template->set_var('story_introtext',
+ $story->DisplayElements('introtext'));
+ $story_template->set_var('story_bodytext',
+ $story->DisplayElements('bodytext'));
+
+ $story_template->set_var('site_url', $_CONF['site_url']);
+ $story_template->set_var('site_admin_url',
$_CONF['site_admin_url']);
+ $story_template->set_var('layout_url', $_CONF['layout_url']);
+ $story_template->set_var('site_name', $_CONF['site_name']);
+ $story_template->set_var('site_slogan', $_CONF['site_slogan']);
+ $story_template->set_var('story_id', $story->getSid());
+ $articleUrl = COM_buildUrl($_CONF['site_url']
+ . '/article.php?story=' .
$story->getSid());
if ($story->DisplayElements('commentcode') >= 0) {
$commentsUrl = $articleUrl . '#comments';
$comments = $story->DisplayElements('comments');
- $numComments = COM_numberFormat ($comments);
- $story_template->set_var ('story_comments', $numComments);
- $story_template->set_var ('comments_url', $commentsUrl);
- $story_template->set_var ('comments_text',
+ $numComments = COM_numberFormat($comments);
+ $story_template->set_var('story_comments', $numComments);
+ $story_template->set_var('comments_url', $commentsUrl);
+ $story_template->set_var('comments_text',
$numComments . ' ' . $LANG01[3]);
- $story_template->set_var ('comments_count', $numComments);
- $story_template->set_var ('lang_comments', $LANG01[3]);
- $comments_with_count = sprintf ($LANG01[121], $numComments);
+ $story_template->set_var('comments_count', $numComments);
+ $story_template->set_var('lang_comments', $LANG01[3]);
+ $comments_with_count = sprintf($LANG01[121], $numComments);
if ($comments > 0) {
- $comments_with_count =
COM_createLink($comments_with_count, $commentsUrl);
+ $comments_with_count = COM_createLink($comments_with_count,
+ $commentsUrl);
}
- $story_template->set_var ('comments_with_count',
$comments_with_count);
+ $story_template->set_var('comments_with_count',
+ $comments_with_count);
}
$story_template->set_var ('lang_full_article', $LANG08[33]);
$story_template->set_var ('article_url', $articleUrl);
- $langAttr = '';
- if( !empty( $_CONF['languages'] ) && !empty(
$_CONF['language_files'] ))
- {
- $langId = COM_getLanguageId();
- }
- else
- {
- // try to derive the language id from the locale
- $l = explode( '.', $_CONF['locale'] );
- $langId = $l[0];
- }
- if( !empty( $langId ))
- {
- $l = explode( '-', str_replace( '_', '-', $langId ));
- if(( count( $l ) == 1 ) && ( strlen( $langId ) == 2 ))
- {
- $langAttr = 'lang="' . $langId . '"';
- }
- else if( count( $l ) == 2 )
- {
- if(( $l[0] == 'i' ) || ( $l[0] == 'x' ))
- {
- $langId = implode( '-', $l );
- $langAttr = 'lang="' . $langId . '"';
- }
- else if( strlen( $l[0] ) == 2 )
- {
- $langId = implode( '-', $l );
- $langAttr = 'lang="' . $langId . '"';
- }
- else
- {
- $langId = $l[0];
- }
- }
- }
- $story_template->set_var( 'lang_id', $langId );
- $story_template->set_var( 'lang_attribute', $langAttr );
+ COM_setLangIdAndAttribute($story_template);
- $story_template->parse ('output', 'article');
- $display = $story_template->finish
($story_template->get_var('output'));
+ $story_template->parse('output', 'article');
+ $display =
$story_template->finish($story_template->get_var('output'));
} else {
// Set page title
$pagetitle = $story->DisplayElements('title');
@@ -246,8 +213,15 @@
}
$display .= COM_siteHeader ('menu', $pagetitle, $rdf);
- if (isset ($_GET['msg'])) {
- $display .= COM_showMessage (COM_applyFilter ($_GET['msg'],
true));
+ if (isset($_GET['msg'])) {
+ $msg = COM_applyFilter($_GET['msg'], true);
+ if ($msg > 0) {
+ $plugin = '';
+ if (isset($_GET['plugin'])) {
+ $plugin = COM_applyFilter($_GET['plugin']);
+ }
+ $display .= COM_showMessage($msg, $plugin);
+ }
}
DB_query ("UPDATE {$_TABLES['stories']} SET hits = hits + 1 WHERE
(sid = '".$story->getSid()."') AND (date <= NOW()) AND (draft_flag = 0)");
@@ -307,6 +281,15 @@
array('type' =>
$feedType,
'class' =>
$feedClass));
}
+ }
+ if ($_CONF['trackback_enabled'] &&
+ ($story->displayElements('trackbackcode') >= 0) &&
+ SEC_hasRights('story.ping') &&
+ ($story->displayElements('draft_flag') == 0) &&
+ ($story->displayElements('day') < time ())) {
+ $url = $_CONF['site_admin_url']
+ . '/trackback.php?mode=sendall&id=' .
$story->getSid();
+ $story_options[] = COM_createLink($LANG_TRB['send_trackback'],
$url);
}
$related = STORY_whatsRelated($story->displayElements('related'),
$story->displayElements('uid'),
Modified: trunk/geeklog-1-jp/public_html/calendar/event.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/calendar/event.php (original)
+++ trunk/geeklog-1-jp/public_html/calendar/event.php Sat Feb 7 02:32:45
2009
@@ -553,6 +553,7 @@
$event_title = stripslashes($A['title']);
if (!empty($A['url'])) {
$event_title = COM_createLink($event_title, $A['url']);
+ $cal_templates->set_var('event_url', $A['url']);
}
$cal_templates->set_var('event_title', $event_title);
if (($_CA_CONF['personalcalendars'] == 1)
Modified: trunk/geeklog-1-jp/public_html/calendar/index.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/calendar/index.php (original)
+++ trunk/geeklog-1-jp/public_html/calendar/index.php Sat Feb 7 02:32:45
2009
@@ -801,12 +801,8 @@
break;
case 'addentry':
- if (SEC_checkToken()) {
- $display .= plugin_submit_calendar($mode);
- $display .= COM_siteFooter();
- } else {
- $display = COM_refresh($_CONF['site_url'] . '/calendar/index.php');
- }
+ $display .= plugin_submit_calendar($mode);
+ $display .= COM_siteFooter();
break;
case 'savepersonal':
Modified: trunk/geeklog-1-jp/public_html/docs/changes.html
==============================================================================
--- trunk/geeklog-1-jp/public_html/docs/changes.html (original)
+++ trunk/geeklog-1-jp/public_html/docs/changes.html Sat Feb 7 02:32:45
2009
@@ -16,6 +16,43 @@
<p>このドキュメントでは最も重要な変更点や目につく変更点を簡潔に説明していま
す。変更点の詳細なリストは、
<a href="history">ChangeLog</a>をご覧ください。
<tt>docs/changed-files</tt>には、前回リリース以来変更されたファイルの一覧が
あります。</p>
+<h2><a name="changes152">Geeklog 1.5.2</a></h2>
+
+<h3>Bugfixes</h3>
+
+<ul>
+<li>Fixed a bug in the story preview where the story content was lost when
+ previewing a story with a duplicate story ID.</li>
+<li>The Trackback editor didn't work since the security token was missing
from
+ the editor template.</li>
+<li>Fixed issues with clickable links in plain text postings.</li>
+<li>Fixed various problems with updating feeds, e.g. when changing topic
+ permissions.</li>
+</ul>
+
+<h3>Fixes in the bundled Plugins</h3>
+
+<ul>
+<li>Calendar: You couldn't add a new event to your personal calendar.</li>
+<li>Links: Changing a link's ID to one that was already in use overwrote
the
+ other link.</li>
+<li>Polls: Changing a poll's ID created a new poll. Also fixed an SQL error
+ when the poll question contained single quotes.</li>
+<li>Static Pages: Saving a static page changed the owner to the user who
saved
+ it.</li>
+</ul>
+
+<h3>Other Changes</h3>
+
+<ul>
+<li>Improved image quality when using gdlib to rescale uploaded
images.</li>
+<li>Theme changes are documented in the <a href="theme.html#changes">theme
+ documentation</a>, as usual. There are 4 bugfixes (one of which is in
the
+ templates for the Polls plugin) that should be applied to all themes
for
+ the 1.5.x series.</li>
+</ul>
+
+
<h2><a name="changes151">Geeklog 1.5.1</a></h2>
<p>Geeklog 1.5.1の大半はバグ修正リリースであり、Geeklog 1.5.0のユーザにはア
ップグレードをお勧めします。小さなものですが、いくつか機能追加もあります。
</p>
Modified: trunk/geeklog-1-jp/public_html/docs/config.html
==============================================================================
--- trunk/geeklog-1-jp/public_html/docs/config.html (original)
+++ trunk/geeklog-1-jp/public_html/docs/config.html Sat Feb 7 02:32:45 2009
@@ -74,7 +74,7 @@
<strong>注:</strong>実際にサイトを閉鎖するかどうかを決める設定は、
<tt>siteconfig.php</tt>ファイルにある。</td></tr>
<tr>
<td valign="top"><a name="desc_copyrightyear">コピーライトの年
(copyrightyear)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
+ <td valign="top"><i>(無効)</i></td>
<td valign="top">サイトのフッタに表示するcopyrightの年を設定する。設定し
ない場合、現在の年が使われる。</td></tr>
<tr>
<td valign="top"><a name="desc_url_rewrite">URLリライト
(url_rewrite)</a></td>
@@ -763,13 +763,13 @@
<td valign="top">画像ライブラリを「ImageMagick」、「Netpbm」、「GDライブ
ラリ」から選ぶ。画像アップロード時にリサイズしたくない場合や、画像ライブラリ
を使えない場合は「なし」にする。</td></tr>
<tr>
<td valign="top"><a name="desc_path_to_mogrify">Mogrifyへのパス
(path_to_mogrify)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
- <td valign="top">上記の「画像ライブラリ」にImageMagickを選んだ場合、
mogrifyバイナリの<strong>完全なパス</strong>を '/usr/bin/mogrify' のように指
定する。<br>
+ <td valign="top"><i>(無効)</i></td>
+ <td valign="top">上記の「画像ライブラリ」にimagemagickを選んだ場合、
mogrifyバイナリの<strong>完全なパス</strong>を '/usr/bin/mogrify' のように指
定する。<br>
かなり新しいバージョンの<a
href="http://www.imagemagick.org/">ImageMagick</a>が必要（バージョン5.4.9以
降推奨）。</td></tr>
<tr>
<td valign="top"><a name="desc_path_to_netpbm">Netpbmへのパス
(path_to_netpbm)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
- <td valign="top">上記の「画像ライブラリ」に Netpbm を選んだ場合、Netpbmの
バイナリがある<em>ディレクトリ</em>の完全なパスを
<code>'/usr/bin/netpbm/'</code> のように指定する。パスの最後はスラッシ
ュ'/'でなければならない。<br>様々なプラットフォーム用にコンパイルされた
etpbmバイナリのパッケージは、<a
href="http://sourceforge.net/projects/gallery/">Homepage of the Gallery
project</a>からダウンロードできる。</td></tr>
+ <td valign="top"><i>(無効)</i></td>
+ <td valign="top">上記の「画像ライブラリ」にnetpbmを選んだ場合、Netpbmのバ
イナリがある<em>ディレクトリ</em>の完全なパスを
<code>'/usr/bin/netpbm/'</code> のように指定する。パスの最後はスラッシ
ュ'/'でなければならない。<br>様々なプラットフォーム用にコンパイルされたバイ
ナリのパッケージは、<a href="http://netpbm.sourceforge.net/">Netpbm
homepage</a>からダウンロードできる。</td></tr>
</table>
<h3><a name="images_upload">画像: アップロード</a></h3>
@@ -788,8 +788,8 @@
<td valign="top">はい(1)にすると、上記のように元画像を保存する場合、記事
の中でリサイズされた画像を使えるようになる。言い換えると、記事中で
（<code>[image<i>X</i>]</code> に加えて）<code>[unscaled<i>X</i>]</code> タ
グを使えるようになる。</td></tr>
<tr>
<td valign="top"><a name="desc_debug_image_upload">画像アップロードのデバ
ッグを行う(debug_image_upload)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
- <td valign="top">コメントアウトされておらず、はい(<code>true</code>)にす
ると、画像のアップロード中に,デバッグ情報がGeeklogの<tt>error.log</tt>に書き
込まれる。画像アップロード時の問題を解明する際に役立つ。</td></tr>
+ <td valign="top"><i>いいえ(false)</i></td>
+ <td valign="top">はい(<code>true</code>)にすると、画像のアップロード中
に,デバッグ情報がGeeklogの<tt>error.log</tt>に書き込まれる。画像アップロード
時の問題を解明する際に役立つ。</td></tr>
</table>
<h3><a name="images_articles">画像: 記事の画像</a></h3>
@@ -852,11 +852,11 @@
<td valign="top">ファイルサイズの最大値。この数値を超えた場合は、リサイズ
用の画像ライブラリを使っていても、その画像ファイルは拒否される。</td></tr>
<tr>
<td valign="top"><a name="desc_force_photo_width">幅を固定する
(force_photo_width)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
+ <td valign="top"><i>(無効)</i></td>
<td valign="top">この設定を有効にしても、ユーザの写真を<em>表示する
</em>ときにしか適用されない。写真表示用の <code><img></code>タグがここ
で指定されたサイズで出力される。つまり、実際の写真のサイズはより大きなものか
もしれないが、小さな（ここで指定された）サイズでしか表示されないということで
ある。（掲示板などで）奇妙な形をしたユーザの写真がページのレイアウトを台無し
にするのを防ぎたい場合に役に立つ。</td></tr>
<tr>
<td valign="top"><a name="desc_default_photo">デフォルトの写真
(default_photo)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
+ <td valign="top"><i>(無効)</i></td>
<td valign="top">有効にする場合には、画像ファイルの完全なURLを指定する。
写真のないユーザの場合、このデフォルトの写真が表示される。この設定が無効で
ユーザが写真もアバターを持っていない場合、何も表示されない。</td></tr>
</table>
@@ -873,7 +873,7 @@
このオプションを有効にすると、（掲示板のスレッドなどの）複数ユーザの多
数の写真を表示するページでは、スピードダウンする可能性があることに注意。
</td></tr>
<tr>
<td valign="top"><a name="desc_gravatar_rating">Gravatar評価を許可
(gravatar_rating)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
+ <td valign="top"><i>(無効)</i></td>
<td valign="top">gravatar.comへ投稿されたアバターは、（米国で）映画用に使
われている評価システム<br>
<ul>
<li>(G = General：一般向け</li>
@@ -881,7 +881,7 @@
<li>R = Restriced：保護者同伴で入場可</li>
<li>X = Banned：17歳未満入場禁止</li>
</ul>
- で<a href="http://gravatar.com/rating.php">評価される</a>。このオプション
は表示されるアバターの<em>最も厳しい</em> ランクを設定する。たとえば、Rと設
定すると、G, PG, Rランクのアバターは表示されるが、Xランクのアバターは一切表
示されなくなる。</td></tr>
+ で評価される。このオプションは表示されるアバターの<em>最も厳しい</em> ラ
ンクを設定する。たとえば、Rと設定すると、G, PG, Rランクのアバターは表示され
るが、Xランクのアバターは一切表示されなくなる。</td></tr>
</table>
@@ -899,11 +899,11 @@
<td valign="top">言語ファイル名。追加の言語ファイルは<a
href="http://www.geeklog.net/">http://www.geeklog.net</a>でダウンロードでき
る。言語ファイルを翻訳した場合は、送ってください。下記の<a
href="#Localization">ローカリゼーション</a>も参照してください。</td></tr>
<tr>
<td valign="top"><a name="desc_language_files">言語ファイル[多言語モード
](language_files)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
+ <td valign="top"><i>(無効)</i></td>
<td valign="top">多言語サイト用。言語の短縮形('en', 'de', 'ja'など)と言語
ファイルの対応関係を指定する。</td></tr>
<tr>
<td valign="top"><a name="desc_languages">言語名[多言語モード
](languages)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
+ <td valign="top"><i>(無効)</i></td>
<td valign="top">多言語サイト用。言語の短縮形('en', 'de', 'ja'など)と言語
名("English", "Deutsch", "Japanese"など)の対応関係を指定する。</td></tr>
</table>
@@ -961,7 +961,7 @@
<td valign="top">小数点以下で表示する桁数</td></tr>
<tr>
<td valign="top"><a name="desc_timezone">タイムゾーン(timezone)</a></td>
- <td valign="top"><i>(コメントアウトされている)</i></td>
+ <td valign="top"><i>(無効)</i></td>
<td valign="top">サーバが異なるタイムゾーンに配置されている場合、時刻が正
しく表示されるようにローカルのタイムゾーンを設定する。この設定は、<a
href="http://www.geeklog.net/forum/viewtopic.php?showtopic=21232">タイムゾー
ンハック(timezone hack)</a>という名前で知られており、サーバによっては機能し
ない場合がある。</td></tr>
</table>
Modified: trunk/geeklog-1-jp/public_html/docs/history
==============================================================================
--- trunk/geeklog-1-jp/public_html/docs/history (original)
+++ trunk/geeklog-1-jp/public_html/docs/history Sat Feb 7 02:32:45 2009
@@ -1,5 +1,121 @@
Geeklog History/Changes:
+Jan 24, 2009 (1.5.2rc1)
+------------
+
+- Fixed various issues with COM_makeClickableLinks (bug #0000767, #0000793,
+ #0000796) [Sami]
+- The comment submission form didn't show the user's full name when
+ $_CONF['show_fullname'] was enabled [Dirk]
+- Comments were always showing the username, even when
$_CONF['show_fullname']
+ was enabled (reported and patch provided by mystral-kk, bug #0000800)
+- Fixed story preview losing the story when the sid already existed (bug
+ #0000789) [Dirk]
+- Fixed wrong use of str_replace in STORY_extractLinks (bug #0000794)
[Dirk]
+- Added "Send Pings" to the Story Options block (if enabled and allowed
for the
+ current user) [Dirk]
+- Don't let the user enable plugins when there's no functions.inc for the
+ plugin [Dirk]
+- When the install script can't find db-config.php, that message was always
+ displayed in English, i.e. you could not change the language for that
screen
+ [Dirk]
+- When upgrading from a Geeklog version prior to 1.5.0, the plugin
config.php
+ files are no longer renamed [Dirk]
+- Admin lists allowed non-sortable columns to be sortable (reported and
patch
+ provided by hiroron, bug #0000791)
+- Fixed STORY_getItemInfo - need to check the draft flag and for a publish
date
+ in the future [mystral-kk, Dirk]
+- Fixed wrong use of COM_isAnonUser in COM_getPermSQL (since 1.5.0) [Dirk]
+- When calling COM_getYearFormOptions with a $startoffset parameter, the
list
+ of years was off by one (bug #0000783; patch provided by hiroron)
+- Fixed updating feeds after changing topic permissions (bug #0000779)
[Dirk]
+- The security token was missing from the trackback editor template file
+ (reported and patch provided by hiroron, bug #0000778)
+- Removed rel="tag" from topic links in lib-story.php as that would
indicate a
+ Microformat with a slightly different meaning [Dirk]
+- Don't include X-Originating-IP header in emails sent from the site's
admin
+ area (bug #0000701) [Dirk]
+- Check if COM_errorLog exists before using it in the config class (for
possible
+ problems during installation, bug #0000768) [Dirk]
+- Fixed filling out the Site Email / No-Reply Email fields in the install
+ script, which was overwriting the correct values from config.php during
+ upgrades (bug #0000759) [Dirk]
+- Set language direction in templates for printable versions of articles
and
+ static pages. Also set $LANG_DIRECTION to 'ltr' now if the language file
does
+ not already define it (bug #0000762) [Dirk]
+- Removing an element from the middle of the censorlist caused the
censoring
+ to act up (bug #0000763) [Dirk]
+- Saving a story tried to update a feed of type 'geeklog' instead
of 'article'
+ (reported by Tom Homer)
+- Delete a feed's file when deleting a feed (bug #0000758) [Dirk]
+- When using gdlib, use imagecopyresampled instead or imagecopyresized to
scale
+ images. This should result in better image quality (part of Feature
request
+ #0000720) [Dirk]
+- The {start_storylink_anchortag} variable in the story templates was
missing
+ a '>' (reported by Michael Brusletten) [Dirk]
+- Display a "Service" column in the Admin's list of users when remote auth
is
+ activated [Dirk]
+- Introduced new function COM_showMessageText to display a free-form text
in a
+ "System Message" box (feature request #0000676) [Dirk]
+- Introduced new function COM_showMessageFromParameter for easy and
consistent
+ display of messages passed in the URL, including plugin messages (second
+ attempt to fix bug #0000618) [Dirk]
+- Display confirmation message when emailing a story (feature request
#0000689)
+ [Dirk]
+- Implemented new function COM_renderWikiText to convert wiki-formatted
text
+ to (X)HTML (feature request #0000643) [Dirk]
+- Added support for CUSTOM_formatEmailAddress and CUSTOM_emailEscape
functions
+ (feature request #0000727) [Dirk]
+- Fixed 'cookiedomain' being reported as changed in the Configuration
+ (bug #0000638) [Dirk]
+- Reverted fix for bug #0000618 (COM_showMessage automatically picking up a
+ 'plugin' parameter) as it's causing problems when displaying more than
one
+ message on the same page [Dirk]
+- Added missing check for allowed IP addresses in downloader class
+ (bug #0000709) [Dirk]
+- Force a refresh after uninstalling a plugin so that the plugin's entry
+ disappears from the Admins block [Dirk]
+- Fixed an issue with story expiry dates on PHP 4/Windows (reported by zeb)
+ [Mike]
+
+- Updated Hebrew language file for the install script and Spam-X plugin,
+ provided by LWC
+- Updated Japanese language files, provided by the Geeklog.jp group
+- Updated Polish language files, provided by Robert Stadnik
+- Updated Slovenian language file for the Links plugin, provided by gape
+
+Calendar plugin
+---------------
+- Fix for calendar plugin - unable to add personal event [Blaine]
+- Make {event_url} available in eventdetails.thtml [Dirk]
+
+Links plugin
+------------
+- Missing parentheses my have resulted in incorrect search results [Dirk]
+- Added urlencoded versions of {link_actual_url} and {link_name} [Dirk]
+- Prevent overwriting existing links when changing the link ID [Dirk]
+
+Polls plugin
+------------
+- Lowered the default number of questions per poll to 5 and the number of
+ answers per question to 8 to avoid running into Suhosin's default
+ post.max_vars limit (for new installs only) [Dirk]
+- Fixed SQL error when poll questions contained single quotes (bug
#0000756)
+ [Dirk]
+- Fixed handling of poll IDs in Polls editor (bug #0000753) [Dirk]
+
+Spam-X
+------
+- Fixed compatibility check in the plugin install script [Dirk]
+
+Static Pages plugin
+-------------------
+- The owner of a static page changed to the user who last edited it
+ (bug #0000777) [Dirk]
+- Fixed call to WS_makeId when sp_id was longer than
STATICPAGE_MAX_ID_LENGTH
+ (found by Marc Maier) [Dirk]
+
+
Sep 22, 2008 (1.5.1)
------------
Modified: trunk/geeklog-1-jp/public_html/docs/theme.html
==============================================================================
--- trunk/geeklog-1-jp/public_html/docs/theme.html (original)
+++ trunk/geeklog-1-jp/public_html/docs/theme.html Sat Feb 7 02:32:45 2009
@@ -103,7 +103,51 @@
</ol>
-<h2><a name="changes">Geeklog 1.5.1でのテーマの変更点</a></h2>
+<h2><a name="changes">Theme changes in Geeklog 1.5.2</a></h2>
+
+<p>Note: Themes made for Geeklog 1.5.0 or 1.5.1 should work just fine with
+Geeklog 1.5.2. In this release, we only fixed a few problems in the themes
+(detailed below) that also affected 1.5.0 and 1.5.1. The other changes
listed
+here are optional.</p>
+
+<h3>Bugfixes</h3>
+
+<p>These changes are actual bugs in the template files that also exist in
+Geeklog 1.5.0 and 1.5.1. We recommend making these changes to all custom
+themes.</p>
+
+<ul>
+<li>The security token was missing from the trackback editor template file,
+ <tt>admin/trackback/trackbackeditor.thtml</tt></li>
+<li>The <code>{start_storylink_anchortag}</code> variable in the story
templates
+ was missing the closing '>'. This caused the story title to
disappear
+ on some themes. (This was a bug in Geeklog's code, so no theme changes
+ required)</li>
+<li>The <code>{site_admin_url}</code> was missing from the Configuration
form
+ action in <tt>admin/config/configuration.thtml</tt>. This may have
caused
+ problems making configuration changes on some setups.</li>
+<li>Added a hidden <code>old_pid</code> input field to the polls editor
template
+ file, <tt>plugins/polls/templates/admin/polleditor.thtml</tt>, to fix
+ problems when changing a poll's ID.</li>
+</ul>
+
+<h3>Other changes</h3>
+
+<p>These changes are optional. They fix cosmetic issues or issues that only
+affect some setups.</p>
+
+<ul>
+<li>Cosmetics: In the Professional theme, the last menu entry isn't
different
+ from the other entries, so the
+ <code>.header-navigation-container li.last</code> rule in
<tt>style.css</tt>
+ is not needed for this theme.</li>
+<li>Internationalisation: The language direction variable,
+ <code>{direction}</code>, was not available in the printer-friendly
+ templates for articles and static pages.</li>
+</ul>
+
+
+<h2><a name="changes151">Geeklog 1.5.1でのテーマの変更点</a></h2>
<p>注意: Geeklog 1.5.0用に作成されたテーマはたいていの場合、Geeklog 1.5.1と
互換性があります。必ず変更しなければならないのは管理者メニューのコンフィギュ
レーション用のものが1つあるだけで、以下に列挙する変更点はすべて任意か、特別
な設定時（多言語サイトや、右から左へと表示する言語など）のものです。詳細は以
下をご覧ください。</p>
Modified: trunk/geeklog-1-jp/public_html/lib-common.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/lib-common.php (original)
+++ trunk/geeklog-1-jp/public_html/lib-common.php Sat Feb 7 02:32:45 2009
@@ -394,7 +394,12 @@
*
*/
-require_once( $_CONF['path_language'] . $_CONF['language'] . '.php' );
+require_once $_CONF['path_language'] . $_CONF['language'] . '.php';
+
+if (empty($LANG_DIRECTION)) {
+ // default to left-to-right
+ $LANG_DIRECTION = 'ltr';
+}
COM_switchLocaleSettings();
@@ -1011,48 +1016,7 @@
}
$header->set_var('page_title_and_site_name', $title_and_name);
- $langAttr = '';
- if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files']
))
- {
- $langId = COM_getLanguageId();
- }
- else
- {
- // try to derive the language id from the locale
- $l = explode( '.', $_CONF['locale'] );
- $langId = $l[0];
- }
- if( !empty( $langId ))
- {
- $l = explode( '-', str_replace( '_', '-', $langId ));
- if(( count( $l ) == 1 ) && ( strlen( $langId ) == 2 ))
- {
- $langAttr = 'lang="' . $langId . '"';
- }
- else if( count( $l ) == 2 )
- {
- if(( $l[0] == 'i' ) || ( $l[0] == 'x' ))
- {
- $langId = implode( '-', $l );
- $langAttr = 'lang="' . $langId . '"';
- }
- else if( strlen( $l[0] ) == 2 )
- {
- $langId = implode( '-', $l );
- $langAttr = 'lang="' . $langId . '"';
- }
- else
- {
- $langId = $l[0];
- }
- }
- }
- $header->set_var('lang_id', $langId );
- if (!empty($_CONF['languages']) && !empty($_CONF['language_files'])) {
- $header->set_var('lang_attribute', $langAttr);
- } else {
- $header->set_var('lang_attribute', '');
- }
+ COM_setLangIdAndAttribute($header);
$header->set_var( 'background_image', $_CONF['layout_url']
. '/images/bg.' . $_IMAGE_TYPE );
@@ -1084,16 +1048,8 @@
$header->set_var( 'css_url', $_CONF['layout_url'] . '/style.css' );
$header->set_var( 'theme', $_CONF['theme'] );
- $header->set_var( 'charset', COM_getCharset());
- if( empty( $LANG_DIRECTION ))
- {
- // default to left-to-right
- $header->set_var( 'direction', 'ltr' );
- }
- else
- {
- $header->set_var( 'direction', $LANG_DIRECTION );
- }
+ $header->set_var('charset', COM_getCharset());
+ $header->set_var('direction', $LANG_DIRECTION);
// Now add variables for buttons like e.g. those used by the Yahoo
theme
$header->set_var( 'button_home', $LANG_BUTTONS[1] );
@@ -2873,10 +2829,11 @@
break;
}
- $censor_entries = count( $_CONF['censorlist'] );
- for( $i = 0; $i < $censor_entries; $i++ )
- {
- $EditedMessage = MBYTE_eregi_replace( $RegExPrefix .
$_CONF['censorlist'][$i] . $RegExSuffix, "\\1$Replacement\\2",
$EditedMessage );
+ foreach ($_CONF['censorlist'] as $c) {
+ if (!empty($c)) {
+ $EditedMessage = MBYTE_eregi_replace($RegExPrefix . $c
+ . $RegExSuffix, "\\1$Replacement\\2",
$EditedMessage);
+ }
}
}
}
@@ -3126,14 +3083,8 @@
{
global $_CONF;
- /**
- * @author geeklog.jp
- * @note This hack is to return a string WITHOUT being escaped when
- * CUSTOM_mail() is defined. The string will be escaped
later in
- * CUSTOM_emailEscape(().
- */
- if (function_exists('CUSTOM_mail')) {
- return $string;
+ if (function_exists('CUSTOM_emailEscape')) {
+ return CUSTOM_emailEscape($string);
}
$charset = COM_getCharset();
@@ -3173,15 +3124,10 @@
*/
function COM_formatEmailAddress( $name, $address )
{
- /**
- * @author geeklog.jp
- * @note This hack is to return an email address WITHOUT being
escaped
- * when CUSTOM_mail() is defined. The email address will be
- * escaped and formatted later in CUSTOM_formatEmailAddress().
- */
- if (function_exists('CUSTOM_mail')) {
- return $name . ' <' . $address . '>';
+ if (function_exists('CUSTOM_formatEmailAddress')) {
+ return CUSTOM_formatEmailAddress($name, $address);
}
+
$formatted_name = COM_emailEscape( $name );
// if the name comes back unchanged, it's not UTF-8, so preg_match is
fine
@@ -3290,7 +3236,11 @@
if (!empty($_SERVER['REMOTE_ADDR']) && !empty($_SERVER['SERVER_ADDR'])
&&
($_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'])) {
- $headers['X-Originating-IP'] = $_SERVER['REMOTE_ADDR'];
+ $url = COM_getCurrentURL();
+ if (substr($url, 0, strlen($_CONF['site_admin_url']))
+ != $_CONF['site_admin_url']) {
+ $headers['X-Originating-IP'] = $_SERVER['REMOTE_ADDR'];
+ }
}
$retval = $mailobj->send( $to, $headers, $message );
@@ -4477,6 +4427,35 @@
return $retval;
}
+/**
+* Displays a message text in a "System Message" block
+*
+* @param string $message Message text; may contain HTML
+* @param string $title (optional) alternative block title
+* @return string HTML block with message
+*
+*/
+function COM_showMessageText($message, $title = '')
+{
+ global $_CONF, $MESSAGE, $_IMAGE_TYPE;
+
+ $retval = '';
+
+ if (!empty($message)) {
+ if (empty($title)) {
+ $title = $MESSAGE[40];
+ }
+ $timestamp = strftime($_CONF['daytime']);
+ $retval .= COM_startBlock($title . ' - ' . $timestamp, '',
+
COM_getBlockTemplate('_msg_block', 'header'))
+ . '<p class="sysmessage"><img src="' . $_CONF['layout_url']
+ . '/images/sysmessage.' . $_IMAGE_TYPE . '" alt="" ' .
XHTML
+ . '>' . $message . '</p>'
+ .
COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
+ }
+
+ return $retval;
+}
/**
* Displays a message on the webpage
@@ -4484,22 +4463,17 @@
* Pulls $msg off the URL string and gets the corresponding message and
returns
* it for display on the calling page
*
-* @param int $msg ID of message to show
-* @param string $plugin Optional Name of plugin to lookup plugin
defined message
-* @return string HTML block with message
+* @param int $msg ID of message to show
+* @param string $plugin Optional Name of plugin to lookup plugin
defined message
+* @return string HTML block with message
*/
-
function COM_showMessage($msg, $plugin = '')
{
- global $_CONF, $MESSAGE, $_IMAGE_TYPE;
+ global $MESSAGE;
$retval = '';
- if (empty($plugin) AND !empty($_REQUEST['plugin'])) {
- $plugin = COM_applyFilter($_REQUEST['plugin']);
- };
if ($msg > 0) {
- $timestamp = strftime($_CONF['daytime']);
if (!empty($plugin)) {
$var = 'PLG_' . $plugin . '_MESSAGE' . $msg;
global $$var;
@@ -4513,17 +4487,41 @@
$message = $MESSAGE[$msg];
}
- $retval .= COM_startBlock($MESSAGE[40] . ' - ' . $timestamp, '',
-
COM_getBlockTemplate('_msg_block', 'header'))
- . '<p class="sysmessage"><img src="' . $_CONF['layout_url']
- . '/images/sysmessage.' . $_IMAGE_TYPE . '" alt="" ' .
XHTML
- . '>' . $message . '</p>'
- .
COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
+ if (!empty($message)) {
+ $retval .= COM_showMessageText($message);
+ }
}
return $retval;
}
+/**
+* Displays a message, as defined by URL parameters
+*
+* Helper function to display a message, if URL parameters 'msg'
and 'plugin'
+* (optional) are defined. Only for GET requests, but that's what Geeklog
uses
+* everywhere anyway.
+*
+* @return string HTML block with message
+*
+*/
+function COM_showMessageFromParameter()
+{
+ $retval = '';
+
+ if (isset($_GET['msg'])) {
+ $msg = COM_applyFilter($_GET['msg'], true);
+ if ($msg > 0) {
+ $plugin = '';
+ if (isset($_GET['plugin'])) {
+ $plugin = COM_applyFilter($_GET['plugin']);
+ }
+ $retval .= COM_showMessage($msg, $plugin);
+ }
+ }
+
+ return $retval;
+}
/**
* Prints Google(tm)-like paging navigation
@@ -4901,34 +4899,23 @@
* @return string HTML years as option values
*/
-function COM_getYearFormOptions( $selected = '', $startoffset=0,
$endoffset=5 )
+function COM_getYearFormOptions($selected = '', $startoffset = -1,
$endoffset = 5)
{
$year_options = '';
- if ($startoffset != 0)
- {
- $start_year = date ( 'Y' ) + $startoffset;
- }
- else
- {
- $start_year = date( 'Y', time() );
- }
- $cur_year = date( 'Y', time() );
+ $start_year = date('Y') + $startoffset;
+ $cur_year = date('Y', time());
$finish_year = $cur_year + $endoffset;
- if( !empty( $selected ))
- {
- if( $selected < $cur_year )
- {
+ if (!empty($selected)) {
+ if ($selected < $cur_year) {
$start_year = $selected;
}
}
- for( $i = $start_year - 1; $i <= $finish_year; $i++ )
- {
+ for ($i = $start_year; $i <= $finish_year; $i++) {
$year_options .= '<option value="' . $i . '"';
- if( $i == $selected )
- {
+ if ($i == $selected) {
$year_options .= ' selected="selected"';
}
@@ -5402,7 +5389,7 @@
}
$UserGroups = array();
- if( COM_isAnonUser() || ( $uid == $_USER['uid'] ))
+ if(( empty( $_USER['uid'] ) && ( $uid == 1 )) || ( $uid ==
$_USER['uid'] ))
{
if( empty( $_GROUPS ))
{
@@ -5715,19 +5702,42 @@
* Detect links in a plain-ascii text and turn them into clickable links.
* Will detect links starting with "http:", "https:", "ftp:", and "www.".
*
-* Derived from a newsgroup posting by Andreas Schwarz in
-* news:de.comp.lang.php <aieq4p$12jn2i$3****@ID-16*****>
-*
* @param string $text the (plain-ascii) text string
* @return string the same string, with links enclosed in <a>...</a>
tags
*
*/
function COM_makeClickableLinks( $text )
{
- $regex = '/((ht|f)tp(s?)\:\/\/|~\/|
\/)?([\w]+:\w+@)?(([a-zA-Z]{1}([\w\-]+\.)+([\w]{2,5}))(:[\d]{1,5})?((\/?\w+\/)+|
\/?)([\w\-%]+(\.[\w]{3,4})?)?((\?|&|&)[\w\-%]+=[\w\-%]+)*)/is';
+ // These regular expressions will work for this purpuse, but
+ // they should NOT be used for validating links.
+
+ // matches anything starting with http:// or https:// or ftp:// or
ftps://
+ $regex[] = '/(?<=^|[\n\r\t\s\(\)\[\]<>";])((?:(?:ht|
f)tps?:\/{2})(?:[^\n\r\t\s\(\)\[\]<>"&]+(?:&)?)+)(?=[\n\r\t\s\(\)\[\]<>"&]|
$)/ei';
+ $replace[] = "COM_makeClickableLinksCallback('', '\\1')";
+
+ // matches anything containing a top level domain: xxx.com or
xxx.yyy.net/stuff.php or xxx.yyy.zz
+ // list taken from: http://en.wikipedia.org/wiki/List_of_Internet_TLDs
+ $regex[] = '/(?<=^|
[\n\r\t\s\(\)\[\]<>";])((?:[a-z0-9]+\.)*[a-z0-9]+\.(?:aero|asia|biz|cat|com|
coop|edu|gov|info|int|jobs|mil|mobi|museum|name|net|org|pro|tel|travel|
[a-z]{2})(?:[\/?#](?:[^\n\r\t\s\(\)\[\]<>"&]+(?:&)?)*)?)(?=[\n\r\t\s\(\)\[\]<>"&]|
$)/ei';
+ $replace[] = "COM_makeClickableLinksCallback('http://', '\\1')";
+
+ $text = preg_replace( $regex, $replace, $text );
+
+ return $text;
+}
+
+/**
+* Callback function to help format links in COM_makeClickableLinks
+*
+* @param string $http set to 'http://' when not aleady in the url
+* @param string $link the url
+* @return string link enclosed in <a>...</a> tags
+*
+*/
+function COM_makeClickableLinksCallback( $http, $link )
+{
+ $text = COM_truncate( $link, 50, '...', '10' );
- $text = preg_replace( $regex, '<a href="\\1\\5">\\6</a>', $text );
- return $text;
+ return "<a href=\"$http$link\">$text</a>";
}
/**
@@ -6484,22 +6494,23 @@
* e.g. '...', to indicate the truncation.
* This function is multi-byte string aware, based on a patch by Yusuke
Sakata.
*
-* @param string $text the text string to truncate
-* @param int $maxlen max. number of characters in the truncated
string
-* @param string $filler optional filler string, e.g. '...'
-* @return string truncated string
+* @param string $text the text string to truncate
+* @param int $maxlen max. number of characters in the truncated
string
+* @param string $filler optional filler string, e.g. '...'
+* @param int $endchars number of characters to show after the
filler
+* @return string truncated string
*
* @note The truncated string may be shorter but will never be longer than
* $maxlen characters, i.e. the $filler string is taken into account.
*
*/
-function COM_truncate( $text, $maxlen, $filler = '' )
+function COM_truncate( $text, $maxlen, $filler = '', $endchars = 0 )
{
$newlen = $maxlen - MBYTE_strlen( $filler );
$len = MBYTE_strlen( $text );
if( $len > $maxlen )
{
- $text = MBYTE_substr( $text, 0, $newlen ) . $filler;
+ $text = MBYTE_substr( $text, 0, $newlen - $endchars ) . $filler .
MBYTE_substr( $text, $len - $endchars, $endchars );
}
return $text;
@@ -6557,34 +6568,45 @@
global $_CONF, $_USER;
// Handle @ operator
- if( error_reporting() == 0 )
- {
+ if (error_reporting() == 0) {
return;
}
- /* If in PHP4, then respect error_reporting */
- if( (PHP_VERSION < 5) && (($errno & error_reporting()) == 0) ) return;
+ // If in PHP4, then respect error_reporting
+ if ((PHP_VERSION < 5) && (($errno & error_reporting()) == 0)) {
+ return;
+ }
/*
* If we have a root user, then output detailed error message:
*/
- if( ( is_array($_USER) && function_exists('SEC_inGroup') ) ||
(isset($_CONF['rootdebug']) && $_CONF['rootdebug']) )
- {
- if($_CONF['rootdebug'] || SEC_inGroup('Root'))
- {
+ if ((is_array($_USER) && function_exists('SEC_inGroup'))
+ || (isset($_CONF['rootdebug']) && $_CONF['rootdebug'])) {
+ if ($_CONF['rootdebug'] || SEC_inGroup('Root')) {
+
+ header('HTTP/1.1 500 Internal Server Error');
+ header('Status: 500 Internal Server Error');
+
+ $title = 'An Error Occurred';
+ if (!empty($_CONF['site_name'])) {
+ $title = $_CONF['site_name'] . ' - ' . $title;
+ }
+ echo("<html><head><title>$title</title></head>\n<body>\n");
+
echo('<h1>An error has occurred:</h1>');
- if($_CONF['rootdebug']) {
+ if ($_CONF['rootdebug']) {
echo('<h2 style="color: red">This is being displayed
as "Root Debugging" is enabled
in your Geeklog configuration.</h2><p>If this is a
production
website you <strong><em>must disable</em></strong>
this
option once you have resolved any issues you are
investigating.</p>');
} else {
- echo('(This text is only displayed to users in the group
\'Root\')<br>');
+ echo('<p>(This text is only displayed to users in the
group \'Root\')</p>');
}
- echo("$errno - $errstr @ $errfile line $errline<br>");
- if(!SEC_inGroup('Root')) {
- if('force' != ''.$_CONF['rootdebug']) {
+ echo("<p>$errno - $errstr @ $errfile line $errline</p>");
+
+ if (!function_exists('SEC_inGroup') || !SEC_inGroup('Root')) {
+ if ('force' != ''.$_CONF['rootdebug']) {
$errcontext = COM_rootDebugClean($errcontext);
} else {
echo('<h2 style="color: red">Root Debug is set
to "force", this
@@ -6597,7 +6619,7 @@
var_dump($errcontext);
$errcontext = htmlspecialchars(ob_get_contents());
ob_end_clean();
- echo("$errcontext</pre>");
+ echo("$errcontext</pre></body></html>");
exit;
}
}
@@ -6605,15 +6627,12 @@
/* If there is a custom error handler, fail over to that, but only
* if the error wasn't in lib-custom.php
*/
- if( is_array($_CONF) && !(strstr($errfile, 'lib-custom.php')))
- {
- if( array_key_exists('path_system', $_CONF) )
- {
- if (file_exists($_CONF['path_system'].'lib-custom.php')) {
- require_once($_CONF['path_system'].'lib-custom.php');
+ if (is_array($_CONF) && !(strstr($errfile, 'lib-custom.php'))) {
+ if (array_key_exists('path_system', $_CONF)) {
+ if (file_exists($_CONF['path_system'] . 'lib-custom.php')) {
+ require_once $_CONF['path_system'] . 'lib-custom.php';
}
- if( function_exists('CUSTOM_handleError') )
- {
+ if (function_exists('CUSTOM_handleError')) {
CUSTOM_handleError($errno, $errstr, $errfile, $errline,
$errcontext);
exit;
}
@@ -6623,14 +6642,17 @@
// if we do not throw the error back to an admin, still log it in the
error.log
COM_errorLog("$errno - $errstr @ $errfile line $errline", 1);
- /* Does the theme implement an error message html file? */
+ header('HTTP/1.1 500 Internal Server Error');
+ header('Status: 500 Internal Server Error');
+
+ // Does the theme implement an error message html file?
if (!empty($_CONF['path_layout']) &&
file_exists($_CONF['path_layout'] . 'errormessage.html')) {
// NOTE: NOT A TEMPLATE! JUST HTML!
include $_CONF['path_layout'] . 'errormessage.html';
} else {
- /* Otherwise, display simple error message */
- $title = "An Error Occurred";
+ // Otherwise, display simple error message
+ $title = 'An Error Occurred';
if (!empty($_CONF['site_name'])) {
$title = $_CONF['site_name'] . ' - ' . $title;
}
@@ -6711,20 +6733,93 @@
}
}
-// Now include all plugin functions
-foreach( $_PLUGINS as $pi_name )
+/**
+* Convert wiki-formatted text to (X)HTML
+*
+* @param string $wikitext wiki-formatted text
+* @return string XHTML formatted text
+*
+*/
+function COM_renderWikiText($wikitext)
{
- require_once( $_CONF['path'] . 'plugins/' .
$pi_name . '/functions.inc' );
+ global $_CONF;
+
+ if (!$_CONF['wikitext_editor']) {
+ return $wikitext;
+ }
+
+ require_once 'Text/Wiki.php';
+
+ $wiki = &new Text_Wiki();
+ $wiki->disableRule('wikilink');
+ $wiki->disableRule('freelink');
+ $wiki->disableRule('interwiki');
+
+ return $wiki->transform($wikitext, 'Xhtml');
+}
+
+/**
+* Set the {lang_id} and {lang_attribute} variables for a template
+*
+* @param ref $template template to use
+* @return void
+* @note {lang_attribute} is only set in multi-language environments.
+*
+*/
+function COM_setLangIdAndAttribute(&$template)
+{
+ global $_CONF;
+
+ $langAttr = '';
+ $langId = '';
+
+ if (!empty($_CONF['languages']) && !empty($_CONF['language_files'])) {
+ $langId = COM_getLanguageId();
+ } else {
+ // try to derive the language id from the locale
+ $l = explode('.', $_CONF['locale']); // get rid of character set
+ $langId = $l[0];
+ $l = explode('@', $langId); // get rid of '@euro', etc.
+ $langId = $l[0];
+ }
+
+ if (!empty($langId)) {
+ $l = explode('-', str_replace('_', '-', $langId));
+ if ((count($l) == 1) && (strlen($langId) == 2)) {
+ $langAttr = 'lang="' . $langId . '"';
+ } else if (count($l) == 2) {
+ if (($l[0] == 'i') || ($l[0] == 'x')) {
+ $langId = implode('-', $l);
+ $langAttr = 'lang="' . $langId . '"';
+ } else if (strlen($l[0]) == 2) {
+ $langId = implode('-', $l);
+ $langAttr = 'lang="' . $langId . '"';
+ } else {
+ $langId = $l[0];
+ // this isn't a valid lang attribute, so don't set
$langAttr
+ }
+ }
+ }
+ $template->set_var('lang_id', $langId);
+
+ if (!empty($_CONF['languages']) && !empty($_CONF['language_files'])) {
+ $template->set_var('lang_attribute', $langAttr);
+ } else {
+ $template->set_var('lang_attribute', '');
+ }
+}
+
+// Now include all plugin functions
+foreach ($_PLUGINS as $pi_name) {
+ require_once $_CONF['path'] . 'plugins/' . $pi_name . '/functions.inc';
}
// Check and see if any plugins (or custom functions)
// have scheduled tasks to perform
-if( $_CONF['cron_schedule_interval'] > 0 )
-{
- if(( DB_getItem(
$_TABLES['vars'], 'value', "name='last_scheduled_run'" )
- + $_CONF['cron_schedule_interval'] ) <= time())
- {
- DB_query( "UPDATE {$_TABLES['vars']} SET value=UNIX_TIMESTAMP()
WHERE name='last_scheduled_run'" );
+if ($_CONF['cron_schedule_interval'] > 0) {
+ if ((DB_getItem($_TABLES['vars'], 'value', "name='last_scheduled_run'")
+ + $_CONF['cron_schedule_interval']) <= time()) {
+ DB_query("UPDATE {$_TABLES['vars']} SET value=UNIX_TIMESTAMP()
WHERE name='last_scheduled_run'");
PLG_runScheduledTask();
}
}
Modified: trunk/geeklog-1-jp/public_html/links/index.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/links/index.php (original)
+++ trunk/geeklog-1-jp/public_html/links/index.php Sat Feb 7 02:32:45 2009
@@ -348,7 +348,9 @@
. '/links/portal.php?what=link&item=' . $A['lid']);
$template->set_var ('link_url', $url);
$template->set_var ('link_actual_url', $A['url']);
+ $template->set_var ('link_actual_url_encoded', urlencode($A['url']));
$template->set_var ('link_name', stripslashes ($A['title']));
+ $template->set_var ('link_name_encoded', urlencode($A['title']));
$template->set_var ('link_hits', COM_numberFormat ($A['hits']));
$template->set_var ('link_description',
nl2br (stripslashes ($A['description'])));
Modified: trunk/geeklog-1-jp/public_html/profiles.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/profiles.php (original)
+++ trunk/geeklog-1-jp/public_html/profiles.php Sat Feb 7 02:32:45 2009
@@ -2,14 +2,14 @@
/* Reminder: always indent with 4 spaces (no tabs). */
//
+---------------------------------------------------------------------------+
-// | Geeklog
1.4 |
+// | Geeklog
1.5 |
//
+---------------------------------------------------------------------------+
// |
profiles.php |
//
|
|
// | This pages lets GL users communicate with each other without risk
of |
// | their email address being intercepted by
spammers. |
//
+---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2006 by the following
authors: |
+// | Copyright (C) 2000-2009 by the following
authors: |
//
|
|
// | Authors: Tony Bibbs - tony AT tonybibbs DOT
com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT
net |
@@ -32,10 +32,8 @@
// | Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. |
//
|
|
//
+---------------------------------------------------------------------------+
-//
-// $Id: profiles.php,v 1.56 2008/02/20 20:32:37 mjervis Exp $
-require_once ('lib-common.php');
+require_once 'lib-common.php';
/**
* Mails the contents of the contact form to that user
@@ -54,10 +52,10 @@
$retval = '';
// check for correct $_CONF permission
- if (empty ($_USER['username']) &&
- (($_CONF['loginrequired'] == 1) ||
($_CONF['emailuserloginrequired'] == 1))
- && ($uid != 2)) {
- return COM_refresh ($_CONF['site_url'] . '/index.php');
+ if (COM_isAnonUser() && (($_CONF['loginrequired'] == 1) ||
+ ($_CONF['emailuserloginrequired'] == 1))
+ && ($uid != 2)) {
+ return COM_refresh($_CONF['site_url'] . '/index.php?msg=85');
}
// check for correct 'to' user preferences
@@ -70,13 +68,13 @@
}
if ((($P['emailfromadmin'] != 1) && $isAdmin) ||
(($P['emailfromuser'] != 1) && !$isAdmin)) {
- return COM_refresh ($_CONF['site_url'] . '/index.php');
+ return COM_refresh ($_CONF['site_url'] . '/index.php?msg=85');
}
// check mail speedlimit
COM_clearSpeedlimit ($_CONF['speedlimit'], 'mail');
if (COM_checkSpeedlimit ('mail') > 0) {
- return COM_refresh ($_CONF['site_url'] . '/index.php');
+ return COM_refresh ($_CONF['site_url'] . '/index.php?msg=85');
}
if (!empty($author) && !empty($subject) && !empty($message)) {
@@ -86,8 +84,9 @@
// Append the user's signature to the message
$sig = '';
- if (isset ($_USER['uid']) && ($_USER['uid'] > 1)) {
- $sig = DB_getItem
($_TABLES['users'], 'sig', "uid={$_USER['uid']}");
+ if (!COM_isAnonUser()) {
+ $sig = DB_getItem($_TABLES['users'], 'sig',
+ "uid={$_USER['uid']}");
if (!empty ($sig)) {
$sig = strip_tags (COM_stripslashes ($sig));
$sig = "\n\n-- \n" . $sig;
@@ -125,10 +124,12 @@
}
$from = COM_formatEmailAddress ($author, $authoremail);
- COM_mail ($to, $subject, $message, $from);
- COM_updateSpeedlimit ('mail');
+ $sent = COM_mail($to, $subject, $message, $from);
+ COM_updateSpeedlimit('mail');
- $retval .=
COM_refresh($_CONF['site_url'] . '/index.php?msg=27');
+ $retval .= COM_refresh($_CONF['site_url']
+ . '/users.php?mode=profile&uid=' .
$uid
+ . '&msg=' . ($sent ? '27' : '85'));
} else {
$subject = strip_tags ($subject);
$subject = substr ($subject, 0, strcspn ($subject, "\r\n"));
@@ -166,8 +167,8 @@
$retval = '';
- if (empty ($_USER['username']) &&
- (($_CONF['loginrequired'] == 1) ||
($_CONF['emailuserloginrequired'] == 1))) {
+ if (COM_isAnonUser() && (($_CONF['loginrequired'] == 1) ||
+ ($_CONF['emailuserloginrequired'] == 1))) {
$retval = COM_startBlock ($LANG_LOGIN[1], '',
COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
@@ -202,7 +203,7 @@
$mail_template->set_var ('site_url', $_CONF['site_url']);
$mail_template->set_var ('lang_description', $LANG08[26]);
$mail_template->set_var ('lang_username', $LANG08[11]);
- if (empty ($_USER['username'])) {
+ if (COM_isAnonUser()) {
$sender = '';
if (isset ($_POST['author'])) {
$sender = strip_tags ($_POST['author']);
@@ -216,7 +217,7 @@
$_USER['fullname']));
}
$mail_template->set_var ('lang_useremail', $LANG08[12]);
- if (empty ($_USER['email'])) {
+ if (COM_isAnonUser()) {
$email = '';
if (isset ($_POST['authoremail'])) {
$email = strip_tags ($_POST['authoremail']);
@@ -271,16 +272,20 @@
* this code
*
*/
-function mailstory ($sid, $to, $toemail, $from, $fromemail, $shortmsg)
+function mailstory($sid, $to, $toemail, $from, $fromemail, $shortmsg)
{
- global $_CONF, $_TABLES, $_USER, $LANG01, $LANG08;
+ global $_CONF, $_TABLES, $LANG01, $LANG08;
- $retval = COM_refresh (COM_buildUrl ($_CONF['site_url']
- . '/article.php?story=' . $sid));
+ $storyurl = COM_buildUrl($_CONF['site_url'] . '/article.php?story=' .
$sid);
+ if ($_CONF['url_rewrite']) {
+ $retval = COM_refresh($storyurl . '?msg=85');
+ } else {
+ $retval = COM_refresh($storyurl . '&msg=85');
+ }
// check for correct $_CONF permission
- if (empty ($_USER['username']) &&
- (($_CONF['loginrequired'] == 1) ||
($_CONF['emailstoryloginrequired'] == 1))) {
+ if (COM_isAnonUser() && (($_CONF['loginrequired'] == 1) ||
+ ($_CONF['emailstoryloginrequired'] == 1))) {
return $retval;
}
@@ -290,8 +295,8 @@
}
// check mail speedlimit
- COM_clearSpeedlimit ($_CONF['speedlimit'], 'mail');
- if (COM_checkSpeedlimit ('mail') > 0) {
+ COM_clearSpeedlimit($_CONF['speedlimit'], 'mail');
+ if (COM_checkSpeedlimit('mail') > 0) {
return $retval;
}
@@ -338,12 +343,18 @@
$mailfrom = COM_formatEmailAddress ($from, $fromemail);
$subject =
COM_undoSpecialChars(strip_tags(stripslashes('Re: '.$A['title'])));
- COM_mail ($mailto, $subject, $mailtext, $mailfrom);
+ $sent = COM_mail ($mailto, $subject, $mailtext, $mailfrom);
COM_updateSpeedlimit ('mail');
// Increment numemails counter for story
DB_query ("UPDATE {$_TABLES['stories']} SET numemails = numemails + 1
WHERE sid = '$sid'");
+ if ($_CONF['url_rewrite']) {
+ $retval = COM_refresh($storyurl . '?msg=' . ($sent ? '27' : '85'));
+ } else {
+ $retval = COM_refresh($storyurl . '&msg=' .
($sent ? '27' : '85'));
+ }
+
return $retval;
}
@@ -361,8 +372,8 @@
$retval = '';
- if (empty ($_USER['username']) &&
- (($_CONF['loginrequired'] == 1) ||
($_CONF['emailstoryloginrequired'] == 1))) {
+ if (COM_isAnonUser() && (($_CONF['loginrequired'] == 1) ||
+ ($_CONF['emailstoryloginrequired'] == 1))) {
$retval = COM_startBlock ($LANG_LOGIN[1], '',
COM_getBlockTemplate ('_msg_block', 'header'));
$login = new Template($_CONF['path_layout'] . 'submit');
@@ -386,7 +397,7 @@
}
if (empty ($from) && empty ($fromemail)) {
- if (!empty ($_USER['username'])) {
+ if (!COM_isAnonUser()) {
$from = COM_getDisplayName ($_USER['uid'], $_USER['username'],
$_USER['fullname']);
$fromemail = DB_getItem ($_TABLES['users'], 'email',
@@ -481,7 +492,7 @@
$_POST['shortmsg'])
. COM_siteFooter ();
} else {
- $msg = PLG_itemPreSave ('emailstory', $message);
+ $msg = PLG_itemPreSave ('emailstory', $_POST['shortmsg']);
if (!empty ($msg)) {
$display .= COM_siteHeader ('menu', '')
. COM_errorLog ($msg, 2)
Modified: trunk/geeklog-1-jp/public_html/siteconfig.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/siteconfig.php (original)
+++ trunk/geeklog-1-jp/public_html/siteconfig.php Sat Feb 7 02:32:45 2009
@@ -20,7 +20,7 @@
// If you have errors on your site, can't login, or can't get to the
// config UI, then you can comment this in to set the root debug option
// on and get detailed error messages. You can set this to 'force' (which
the
-// Config UI won't allow you to do, to override hiding of password and
cookie
+// Config UI won't allow you to do) to override hiding of password and
cookie
// items in the debug trace.
// $_CONF['rootdebug'] = true;
@@ -38,7 +38,7 @@
define('LB',"\n");
}
if (!defined('VERSION')) {
- define('VERSION', '1.5.1');
+ define('VERSION', '1.5.2rc1');
}
?>
Modified: trunk/geeklog-1-jp/public_html/staticpages/index.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/staticpages/index.php (original)
+++ trunk/geeklog-1-jp/public_html/staticpages/index.php Sat Feb 7
02:32:45 2009
@@ -65,7 +65,19 @@
$display_mode = '';
}
-$retval = SP_returnStaticpage($page, $display_mode, $comment_order,
$comment_mode);
+$msg = 0;
+if (isset($_GET['msg'])) {
+ $msg = COM_applyFilter($_GET['msg'], true);
+ if ($msg <= 0) {
+ $msg = 0;
+ }
+}
+
+$retval = SP_returnStaticpage($page, $display_mode, $comment_order,
$comment_mode, $msg);
+
+if ($display_mode == 'print') {
+ header('Content-Type: text/html; charset=' . COM_getCharset());
+}
echo $retval;
Modified: trunk/geeklog-1-jp/public_html/users.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/users.php (original)
+++ trunk/geeklog-1-jp/public_html/users.php Sat Feb 7 02:32:45 2009
@@ -63,10 +63,11 @@
*
* @param int $user User ID of profile to get
* @param int $msg Message to display (if != 0)
+* @param string $plugin optional plugin name for message
* @return string HTML for user profile page
*
*/
-function userprofile ($user, $msg = 0)
+function userprofile($user, $msg = 0, $plugin = '')
{
global $_CONF, $_TABLES, $_USER, $LANG01, $LANG04, $LANG09, $LANG28,
$LANG_LOGIN;
@@ -109,7 +110,7 @@
$retval .= COM_siteHeader ('menu', $LANG04[1] . ' ' . $display_name);
if ($msg > 0) {
- $retval .= COM_showMessage ($msg);
+ $retval .= COM_showMessage($msg, $plugin);
}
// format date/time to user preference
@@ -867,10 +868,14 @@
$uid = COM_applyFilter ($_GET['uid'], true);
if (is_numeric ($uid) && ($uid > 0)) {
$msg = 0;
- if (isset ($_GET['msg'])) {
- $msg = COM_applyFilter ($_GET['msg'], true);
+ if (isset($_GET['msg'])) {
+ $msg = COM_applyFilter($_GET['msg'], true);
}
- $display .= userprofile ($uid, $msg);
+ $plugin = '';
+ if (($msg > 0) && isset($_GET['plugin'])) {
+ $plugin = COM_applyFilter($_GET['plugin']);
+ }
+ $display .= userprofile($uid, $msg, $plugin);
} else {
$display .= COM_refresh ($_CONF['site_url'] . '/index.php');
}
@@ -1109,6 +1114,7 @@
$_CONF['site_url'], // Trust root.
null,
"email,nickname,fullname")); // Required fields.
+ exit;
}
} elseif (isset($query['openid.mode']) ||
isset($query['openid_mode'])) {
$openid_mode = '';
Modified: trunk/geeklog-1-jp/public_html/usersettings.php
==============================================================================
--- trunk/geeklog-1-jp/public_html/usersettings.php (original)
+++ trunk/geeklog-1-jp/public_html/usersettings.php Sat Feb 7 02:32:45 2009
@@ -1511,14 +1511,8 @@
break;
default: // also if $mode == 'edit', 'preferences', or 'comments'
- $display .= COM_siteHeader ('menu', $LANG04[16]);
- $msg = 0;
- if (isset ($_GET['msg'])) {
- $msg = COM_applyFilter ($_GET['msg'], true);
- if ($msg > 0) {
- $display .= COM_showMessage ($msg);
- }
- }
+ $display .= COM_siteHeader('menu', $LANG04[16]);
+ $display .= COM_showMessageFromParameter();
$display .= edituser();
$display .= COM_siteFooter();
break;
Modified: trunk/geeklog-1-jp/readme
==============================================================================
--- trunk/geeklog-1-jp/readme (original)
+++ trunk/geeklog-1-jp/readme Sat Feb 7 02:32:45 2009
@@ -124,9 +124,7 @@
All known issues are tracked in our bug tracker. If you identify a bug
please
let us know by filling out a bug report at:
-http://project.geeklog.net/tracker/?group_id=6&atid=105
-
-*** Currently down for maintenance for an undefined period of time, Tony!
***
+http://project.geeklog.net/tracking/
4) System Requirements and Installation
Modified: trunk/geeklog-1-jp/sql/mssql_tableanddata.php
==============================================================================
--- trunk/geeklog-1-jp/sql/mssql_tableanddata.php (original)
+++ trunk/geeklog-1-jp/sql/mssql_tableanddata.php Sat Feb 7 02:32:45 2009
@@ -1568,7 +1568,7 @@
INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core)
VALUES (18,'staticpages.delete','Ability to delete static pages',0)
INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core)
VALUES (19,'story.submit','May skip the story submission queue',1)
INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core)
VALUES (21,'calendar.submit','May skip the event submission queue',1)
-INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core)
VALUES (22,'staticpages.PHP','Ability use PHP in static pages',0)
+INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core)
VALUES (22,'staticpages.PHP','Ability to use PHP in static pages',0)
INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core)
VALUES (23,'spamx.admin', 'Full access to Spam-X plugin', 0)
INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core)
VALUES (24,'story.ping', 'Ability to send pings, pingbacks, or trackbacks
for stories', 1)
INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr, ft_gl_core)
VALUES (3,'links.moderate','Ability to moderate pending links',0)
@@ -1670,11 +1670,11 @@
-$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('staticpages', '1.5','1.4.1',1,'http://www.geeklog.net/')";
-$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('spamx', '1.1.1','1.4.1',1,'http://www.pigstye.net/gplugs/staticpages/index.php/spamx')";
-$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES ('links', '2.0', '1.4.1',
1, 'http://www.geeklog.net/')";
-$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('polls', '2.0.1', '1.4.1', '1', 'http://www.geeklog.net/')";
-$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('calendar', '1.0.2', '1.4.1', '1', 'http://www.geeklog.net/')";
+$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('staticpages', '1.5.1','1.5.0',1,'http://www.geeklog.net/')";
+$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('spamx', '1.1.2','1.5.0',1,'http://www.pigstye.net/gplugs/staticpages/index.php/spamx')";
+$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES ('links', '2.0.1', '1.5.0',
1, 'http://www.geeklog.net/')";
+$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('polls', '2.0.2', '1.5.0', '1', 'http://www.geeklog.net/')";
+$_SQL[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('calendar', '1.0.3', '1.5.0', '1', 'http://www.geeklog.net/')";
$_DATA[] = "INSERT INTO `{$_TABLES['pollquestions']}` (`pid`, `qid`,
`question`) VALUES ('geeklogfeaturepoll', 0, 'What is the best new feature
of Geeklog?');";
$_DATA[] = "INSERT INTO `{$_TABLES['pollquestions']}` (`pid`, `qid`,
`question`) VALUES ('geeklogfeaturepoll', 1, 'What is the all-time best
feature of Geeklog?');";
Modified: trunk/geeklog-1-jp/sql/mysql_tableanddata.php
==============================================================================
--- trunk/geeklog-1-jp/sql/mysql_tableanddata.php (original)
+++ trunk/geeklog-1-jp/sql/mysql_tableanddata.php Sat Feb 7 02:32:45 2009
@@ -840,7 +840,7 @@
$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr,
ft_gl_core) VALUES (19,'story.submit','May skip the story submission
queue',1) ";
$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr,
ft_gl_core) VALUES (20,'links.submit','May skip the links submission
queue',0) ";
$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr,
ft_gl_core) VALUES (21,'calendar.submit','May skip the event submission
queue',1) ";
-$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr,
ft_gl_core) VALUES (22,'staticpages.PHP','Ability use PHP in static
pages',0) ";
+$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr,
ft_gl_core) VALUES (22,'staticpages.PHP','Ability to use PHP in static
pages',0) ";
$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr,
ft_gl_core) VALUES (23,'spamx.admin', 'Full access to Spam-X plugin', 0) ";
$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr,
ft_gl_core) VALUES (24,'story.ping', 'Ability to send pings, pingbacks, or
trackbacks for stories', 1) ";
$_DATA[] = "INSERT INTO {$_TABLES['features']} (ft_id, ft_name, ft_descr,
ft_gl_core) VALUES (25,'syndication.edit', 'Access to Content Syndication',
1) ";
@@ -918,11 +918,11 @@
$_DATA[] = "INSERT INTO {$_TABLES['pingservice']} (pid, name, site_url,
ping_url, method, is_enabled) VALUES
(1, 'Ping-O-Matic', 'http://pingomatic.com/', 'http://rpc.pingomatic.com/', 'weblogUpdates.ping',
1)";
-$_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
pi_gl_version, pi_enabled, pi_homepage) VALUES
('staticpages', '1.5.0','1.5.0',1,'http://www.geeklog.net/') ";
-$_DATA[] = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version,
==============================================================================
Diff truncated at 200k characters