diff --git a/plugins/calendar/functions.inc b/plugins/calendar/functions.inc index 97e2f202c..8f720424c 100644 --- a/plugins/calendar/functions.inc +++ b/plugins/calendar/functions.inc @@ -199,11 +199,11 @@ function phpblock_calendar( $help='', $title='' ) if( !$headline ) { if($z == 2) { if( $numRows > 0 ) { - $retval .= '' . $LANG_CAL_1[23] . ''; + $retval .= '' . $LANG_CAL_1[23] . ''; } } else { if( $totalrows > 0 ) { - $retval .= '' . $LANG_CAL_1[24] . ''; + $retval .= '' . $LANG_CAL_1[24] . ''; } } $headline = true; @@ -249,12 +249,12 @@ function phpblock_calendar( $help='', $title='' ) if( $todaysEvent ) { $retval .= ''; } - $retval .= '' . $dayName1 . ' ' - . $abbrDate1 . ''; + $retval .= '' . $dayName1 . ' ' + . $abbrDate1 . ''; // If different start and end dates, then display end date: if( $abbrDate1 != $abbrDate2 ) { - $retval .= ' - ' . $dayName2 . ' ' . $abbrDate2 . ''; + $retval .= ' - ' . $dayName2 . ' ' . $abbrDate2 . ''; } if( $todaysEvent ) { $retval .= ''; diff --git a/plugins/calendar/templates/default/addevent.thtml b/plugins/calendar/templates/default/addevent.thtml index 9fb381213..eb820b109 100644 --- a/plugins/calendar/templates/default/addevent.thtml +++ b/plugins/calendar/templates/default/addevent.thtml @@ -5,23 +5,23 @@ {intro_msg} - {lang_event}: + {lang_event}: {event_title} - {lang_starts}: + {lang_starts}: {event_start} - {lang_ends}: + {lang_ends}: {event_end} - {lang_where}: + {lang_where}: {event_location} - {lang_description}: + {lang_description}: {event_description} diff --git a/plugins/calendar/templates/default/calendar.thtml b/plugins/calendar/templates/default/calendar.thtml index b6c938b97..0c0fd0039 100644 --- a/plugins/calendar/templates/default/calendar.thtml +++ b/plugins/calendar/templates/default/calendar.thtml @@ -4,7 +4,7 @@ {lang_day} {lang_week} - {lang_month} + {lang_month} diff --git a/plugins/calendar/templates/default/calendarweek.thtml b/plugins/calendar/templates/default/calendarweek.thtml index c609ec46c..30f354ab2 100644 --- a/plugins/calendar/templates/default/calendarweek.thtml +++ b/plugins/calendar/templates/default/calendarweek.thtml @@ -1,7 +1,7 @@ {# begin {templatelocation} #} - + {cal_days} diff --git a/plugins/calendar/templates/default/dayview/dayview.thtml b/plugins/calendar/templates/default/dayview/dayview.thtml index c5ba099ec..6ba518f42 100644 --- a/plugins/calendar/templates/default/dayview/dayview.thtml +++ b/plugins/calendar/templates/default/dayview/dayview.thtml @@ -2,7 +2,7 @@
>>>>
- + diff --git a/plugins/calendar/templates/default/dayview/quickaddform.thtml b/plugins/calendar/templates/default/dayview/quickaddform.thtml index 7148b33ca..d1eaa9754 100644 --- a/plugins/calendar/templates/default/dayview/quickaddform.thtml +++ b/plugins/calendar/templates/default/dayview/quickaddform.thtml @@ -14,9 +14,9 @@ - + - + diff --git a/public_html/docs/english/trackback.html b/public_html/docs/english/trackback.html index 6cd77ebd9..04a1083b0 100644 --- a/public_html/docs/english/trackback.html +++ b/public_html/docs/english/trackback.html @@ -44,8 +44,8 @@

Pingback

Trackback

-

(We're skipping sending Pings for the moment - see below)

+

(We're skipping sending Pings for the moment - see below)

A Trackback can only be sent to one site, so you are now presented with a list of all the links in your story and have to choose which site should receive the trackback. Geeklog will then check if the site accepts trackbacks and try to determine the actual trackback URL to send the Trackback to.

diff --git a/public_html/docs/japanese/changes.html b/public_html/docs/japanese/changes.html index 151285081..70712bcdc 100644 --- a/public_html/docs/japanese/changes.html +++ b/public_html/docs/japanese/changes.html @@ -216,7 +216,7 @@

新機能と改善点

その他の変更

    -
  • Security: 自動ログイン機能の辞書攻撃による脆弱性を修正しました。 +
  • Security: 自動ログイン機能の辞書攻撃による脆弱性を修正しました。 この是弱性は元々、Nine SituationsグループのBookoo氏から報告されたものです。
  • GeeklogのPHPとMySQLのシステム条件は、 PHP 4.4.0 と MySQL 4.0.18に引き上げられました。
    • diff --git a/public_html/docs/japanese/config.html b/public_html/docs/japanese/config.html index c513804bf..6250a5f86 100644 --- a/public_html/docs/japanese/config.html +++ b/public_html/docs/japanese/config.html @@ -17,7 +17,7 @@

    Geeklogのコンフィギュレーション

    コンフィギュレーション用ファイル

    旧バージョンのGeeklogでは、主要な設定を網羅したconfig.php -という巨大なファイルを使用していました。Geeklog 1.5.0では、設定の大部分をデータベースに記録し、ユーザーは管理者機能のコンフィギュレーション(Configuration)からアクセスできるようになりました。

    +という巨大なファイルを使用していました。Geeklog 1.5.0では、設定の大部分をデータベースに記録し、ユーザーは管理者機能のコンフィギュレーション(Configuration)からアクセスできるようになりました。

    技術上の理由で、ファイルに保存しなければならない設定もあります。次の2つです:

      diff --git a/public_html/docs/japanese/polls.html b/public_html/docs/japanese/polls.html index 5f6c38523..5ca9f71db 100644 --- a/public_html/docs/japanese/polls.html +++ b/public_html/docs/japanese/polls.html @@ -143,8 +143,8 @@

      投票ブロック

      アンケートの仕組み

      -

      (Geeklog -FAQより転載)

      +

      (Geeklog +FAQより転載)

      アンケートの恣意的な操作を防ぐ（少なくとも困難にする）ために、Geeklogは投票時に次の2つのことを行います。

      diff --git a/public_html/docs/japanese/spamx.html b/public_html/docs/japanese/spamx.html index d57010aed..505476b23 100644 --- a/public_html/docs/japanese/spamx.html +++ b/public_html/docs/japanese/spamx.html @@ -15,7 +15,7 @@

      Geeklog Spam-Xプラグイン

      -

      (Hendrickson Software Componentsによる同名のEメールスパムフィルターをお探しでここに来られた方は、ここをクリックしてください。)

      +

      (Hendrickson Software Componentsによる同名のEメールスパムフィルターをお探しでここに来られた方は、ここをクリックしてください。)

      概要

      @@ -99,8 +99,8 @@

      HTTPヘッダーフィルター(HTTP Header Filter)

      HTTPヘッダーフィルターモジュールを使用すると、ある種のHTTPリクエストをブロックすることができます。たとえば、スパム送信者の中には、スパムを送信するのにPerlスクリプトを使用しているものがいます。Perlスクリプトが送信するユーザーエージェント(ブラウザー識別情報)は "libwww-perl/5.805" (バージョン番号はこれとは違う場合もある)のようなものが多いです。したがって、このユーザーエージェントが送信するスパムをブロックするには、次のように入力します。

{lang_day}{lang_day} {lang_week} {lang_month}
- - - + + + diff --git a/plugins/calendar/templates/default/editpersonalevent.thtml b/plugins/calendar/templates/default/editpersonalevent.thtml index eadce0043..dd784d3e8 100644 --- a/plugins/calendar/templates/default/editpersonalevent.thtml +++ b/plugins/calendar/templates/default/editpersonalevent.thtml @@ -7,11 +7,11 @@
{lang_event}{lang_date}{lang_time}{lang_event}{lang_date}{lang_time}
- + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/plugins/calendar/templates/default/eventdetails.thtml b/plugins/calendar/templates/default/eventdetails.thtml index be6908305..6c603bef7 100644 --- a/plugins/calendar/templates/default/eventdetails.thtml +++ b/plugins/calendar/templates/default/eventdetails.thtml @@ -3,15 +3,15 @@

{event_title}

{lang_title}:{lang_title}:
{lang_eventtype}:{lang_eventtype}:
{lang_startdate}:{lang_startdate}: {startyear_options}    - {lang_starttime}: + {lang_starttime}: @@ -47,7 +47,7 @@
{lang_enddate}:{lang_enddate}: {endyear_options}    - {lang_endtime}: + {lang_endtime}: @@ -74,41 +74,41 @@
{lang_alldayevent}:{lang_alldayevent}:
{lang_location}:{lang_location}:
{lang_addressline1}:{lang_addressline1}:
{lang_addressline2}:{lang_addressline2}:
{lang_city}:{lang_city}:
{lang_state}:{lang_state}:
{lang_zipcode}:{lang_zipcode}:
{lang_link}:{lang_link}:
{lang_description}:{lang_description}:
- + - + - + - + diff --git a/plugins/calendar/templates/default/submitevent.thtml b/plugins/calendar/templates/default/submitevent.thtml index 55ec352bd..3e3c839cc 100644 --- a/plugins/calendar/templates/default/submitevent.thtml +++ b/plugins/calendar/templates/default/submitevent.thtml @@ -27,7 +27,7 @@    - {lang_starttime}: + {lang_starttime}: @@ -53,7 +53,7 @@    - {lang_endtime}: + {lang_endtime}: diff --git a/plugins/calendar/templates/default/weekview/weekview.thtml b/plugins/calendar/templates/default/weekview/weekview.thtml index 46f1ae848..d54235f28 100644 --- a/plugins/calendar/templates/default/weekview/weekview.thtml +++ b/plugins/calendar/templates/default/weekview/weekview.thtml @@ -3,7 +3,7 @@
{lang_when}:{lang_when}: {event_start} - {event_end}
{lang_event_type}:{lang_event_type}: {event_type}
{lang_where}:{lang_where}: {event_location}{br0} {event_address1}{br1} @@ -20,7 +20,7 @@
{lang_description}:{lang_description}: {event_description}
{addremove_event} {edit_icon}
- +
{lang_day}{lang_week}{lang_week} {lang_month}
diff --git a/plugins/links/functions.inc b/plugins/links/functions.inc index 1b32d56f8..ee9773a75 100644 --- a/plugins/links/functions.inc +++ b/plugins/links/functions.inc @@ -1491,7 +1491,7 @@ function links_breadcrumbs($root, $cid) $breadcrumb = COM_createLink($content, $url) . $separator . $breadcrumb; } else { - $breadcrumb = '' . $A['category'] . '' . $breadcrumb; + $breadcrumb = '' . $A['category'] . '' . $breadcrumb; } $pid = $A['pid']; $c = $A['pid']; @@ -1501,7 +1501,7 @@ function links_breadcrumbs($root, $cid) $url = $_CONF['site_url'] . '/links/index.php'; if (empty($breadcrumb)) { - $breadcrumb = '' . $LANG_LINKS['root'] . ''; + $breadcrumb = '' . $LANG_LINKS['root'] . ''; } else { $breadcrumb = COM_createLink($LANG_LINKS['root'], $url) . $separator . $breadcrumb; } diff --git a/plugins/spamx/EditHeader.Admin.class.php b/plugins/spamx/EditHeader.Admin.class.php index a06c5bffc..3a625d69f 100644 --- a/plugins/spamx/EditHeader.Admin.class.php +++ b/plugins/spamx/EditHeader.Admin.class.php @@ -54,10 +54,10 @@ protected function getWidget() . '
' . LB . '' . LB - . '' . LB + . '' . LB . '' . LB - . '' . LB + . '' . LB . '' . LB . '
Header:
Header: e.g. User-Agent
Content:
Content: e.g. Mozilla
' . LB diff --git a/public_html/admin/auth.inc.php b/public_html/admin/auth.inc.php index de265b135..683340a0a 100644 --- a/public_html/admin/auth.inc.php +++ b/public_html/admin/auth.inc.php @@ -105,11 +105,11 @@ $display .= '' .''.LB - .''.LB + .''.LB .''.LB .''.LB .''.LB - .''.LB + .''.LB .'' .''.LB .''.LB diff --git a/public_html/admin/database.php b/public_html/admin/database.php index c8338d4cb..a2af10f9c 100644 --- a/public_html/admin/database.php +++ b/public_html/admin/database.php @@ -165,7 +165,7 @@ function listbackups() array('title' => $LANG_DB_BACKUP['download'])); $backupfile = $_CONF['backup_path'] . $backups[$i]; $backupfilesize = COM_numberFormat(filesizeHelper($backupfile)) - . ' ' . $LANG_DB_BACKUP['bytes'] . ''; + . ' ' . $LANG_DB_BACKUP['bytes'] . ''; $data_arr[$i] = array('file' => $downloadLink, 'size' => $backupfilesize, 'filename' => $backups[$i]); diff --git a/public_html/admin/install/bigdump.php b/public_html/admin/install/bigdump.php index 6f42299e5..5d880f880 100644 --- a/public_html/admin/install/bigdump.php +++ b/public_html/admin/install/bigdump.php @@ -185,7 +185,7 @@ if (!$error) { $_REQUEST["start"] = floor($_REQUEST["start"]); $_REQUEST["foffset"] = floor($_REQUEST["foffset"]); - echo '

' . $LANG_BIGDUMP[8] . ' ' . $curfilename . '

' . LB; + echo '

' . $LANG_BIGDUMP[8] . ' ' . $curfilename . '

' . LB; } // Check $_REQUEST["foffset"] upon $filesize (can't do it on gzipped files) @@ -368,7 +368,7 @@ } else { if ($delaypersession != 0) { - echo '

' . $LANG_BIGDUMP[24] . $delaypersession . $LANG_BIGDUMP[25] . LB; + echo '

' . $LANG_BIGDUMP[24] . $delaypersession . $LANG_BIGDUMP[25] . LB; } // Go to the next step @@ -378,7 +378,7 @@ . '

Continue from the line ' . $linenumber . '

' . LB . '' . LB - . '

' . $LANG_BIGDUMP[26] . ' ' . $LANG_BIGDUMP[27] . ' ' . $LANG_BIGDUMP[28] . '

' . LB; + . '

' . $LANG_BIGDUMP[26] . ' ' . $LANG_BIGDUMP[27] . ' ' . $LANG_BIGDUMP[28] . '

' . LB; } } else { echo INST_getAlertMsg($LANG_BIGDUMP[29]); diff --git a/public_html/admin/install/index.php b/public_html/admin/install/index.php index 007054714..1d493fbf1 100644 --- a/public_html/admin/install/index.php +++ b/public_html/admin/install/index.php @@ -721,7 +721,7 @@ function INST_permissionWarning($files)

' . $LANG_INSTALL[82] . '

-

' . $LANG_INSTALL[11] . '

+

' . $LANG_INSTALL[11] . '

' . LB; foreach ($files as $file) { @@ -1122,8 +1122,8 @@ function COM_errorLog($a, $b = '') $gl_path = str_replace('db-config.php', '', $_PATH['db-config.php']); $num_wrong = 0; // number of files with wrong permissions - $display_permissions = '

' . LB - . '' . $LANG_INSTALL[11] . '

' . LB; + $display_permissions = '

' . LB + . '' . $LANG_INSTALL[11] . '

' . LB; $chmod_string = 'chmod -R 777 '; // Files to check if writable $file_list = array( $_PATH['db-config.php'], diff --git a/public_html/admin/install/install-plugins.php b/public_html/admin/install/install-plugins.php index 37f02f24a..21cc409b4 100644 --- a/public_html/admin/install/install-plugins.php +++ b/public_html/admin/install/install-plugins.php @@ -445,7 +445,7 @@ . '' . '' . $pi_display_name . LB - . ($missing_autoinstall ? '

' . $LANG_PLUGINS[17] . ': ' . $LANG_PLUGINS[18] . '

' : '') + . ($missing_autoinstall ? '

' . $LANG_PLUGINS[17] . ': ' . $LANG_PLUGINS[18] . '

' : '') . '' . LB . ' - + @@ -522,7 +522,7 @@

Stories and Trackback: Trackback

check (but using option 1 and 2 doesn't make sense and will be treated as if you requested option 2).
Options are: 0 = don't perform any checks, 1 = check only for your site's main URL ($_CONF['site_url']), 2 = check for the exact URL of the entry (e.g. an article) on your site, 4 = check IP address of the sender of the trackback against the site referred to in the trackback URL.
- Example: $_CONF['check_trackback_link'] = 6; // check for the exact URL (2) and proper IP address (4) + Example: $_CONF['check_trackback_link'] = 6; // check for the exact URL (2) and proper IP address (4) diff --git a/public_html/docs/english/polls.html b/public_html/docs/english/polls.html index c74ab7277..4bb67664e 100644 --- a/public_html/docs/english/polls.html +++ b/public_html/docs/english/polls.html @@ -155,8 +155,8 @@

Poll Block

How do the polls work?

-

(Taken from the Geeklog -FAQ)

+

(Taken from the Geeklog +FAQ)

In order to prevent manipulation of polls (or at least make it harder), Geeklog does two things when you vote:

diff --git a/public_html/docs/english/spamx.html b/public_html/docs/english/spamx.html index d652cd667..d419aa909 100644 --- a/public_html/docs/english/spamx.html +++ b/public_html/docs/english/spamx.html @@ -13,7 +13,7 @@

Geeklog Spam-X Plugin

-

(If you came here looking for Hendrickson Software Components' email spam filter of the same name, please click here.)

+

(If you came here looking for Hendrickson Software Components' email spam filter of the same name, please click here.)

Introduction

@@ -154,8 +154,8 @@

HTTP Header Filter

posts made by this user agent, you would enter:

' . $pi_version diff --git a/public_html/admin/install/rescue.php b/public_html/admin/install/rescue.php index 5f48be1e7..446c0c6a6 100644 --- a/public_html/admin/install/rescue.php +++ b/public_html/admin/install/rescue.php @@ -273,7 +273,7 @@ function render($renderType, $args = array()) {

diff --git a/public_html/admin/sectest.php b/public_html/admin/sectest.php index e3250f66e..3f55a84f6 100644 --- a/public_html/admin/sectest.php +++ b/public_html/admin/sectest.php @@ -238,7 +238,7 @@ function checkInstallDir() if (is_dir($installdir)) { $retval .= '
  • ' . sprintf($LANG_SECTEST['remove_inst'], - '' . $installdir . '') . ' ' + '' . $installdir . '') . ' ' . $LANG_SECTEST['remove_inst2'] . '
    • '; $failed_tests++; } else { diff --git a/public_html/admin/trackback.php b/public_html/admin/trackback.php index a54e5800b..e2d2c36ce 100644 --- a/public_html/admin/trackback.php +++ b/public_html/admin/trackback.php @@ -242,7 +242,7 @@ function sendPingbacks ($type, $id) $result = PNB_sendPingback ($url, $URLtoPing); $resend = ''; if (empty ($result)) { - $result = '' . $LANG_TRB['pingback_success'] . ''; + $result = '' . $LANG_TRB['pingback_success'] . ''; } else if ($result != $LANG_TRB['no_pingback_url']) { $result = '' . $result . ''; // TBD: $resend = '...'; @@ -338,7 +338,7 @@ function sendPings ($type, $id) $pinged = $LANG_TRB['unknown_method'] . ': ' . $A['method']; } if (empty ($pinged)) { - $pinged = '' . $LANG_TRB['ping_success'] . ''; + $pinged = '' . $LANG_TRB['ping_success'] . ''; } else { $pinged = '' . $pinged . ''; } diff --git a/public_html/admin/user.php b/public_html/admin/user.php index 97d646d6b..0ad79b8a7 100644 --- a/public_html/admin/user.php +++ b/public_html/admin/user.php @@ -1116,7 +1116,7 @@ function importusers() $email = COM_applyFilter ($email); if ($verbose_import) { - $retval .="Working on username=$u_name, fullname=$full_name, and email=$email\n"; + $retval .="Working on username=$u_name, fullname=$full_name, and email=$email\n"; COM_errorLog ("Working on username=$u_name, fullname=$full_name, and email=$email",1); } @@ -1142,24 +1142,24 @@ function importusers() if ($result) { $successes++; if ($verbose_import) { - $retval .= " Account for $u_name created successfully.\n"; + $retval .= " Account for $u_name created successfully.\n"; COM_errorLog("Account for $u_name created successfully",1); } } else { // user creation failed - $retval .= "ERROR: There was a problem creating the account for $u_name.\n"; + $retval .= "ERROR: There was a problem creating the account for $u_name.\n"; COM_errorLog("ERROR: here was a problem creating the account for $u_name.",1); } } else { if ($verbose_import) { - $retval .= "$u_name or $email already exists, account not created.\n"; // user already exists + $retval .= "$u_name or $email already exists, account not created.\n"; // user already exists COM_errorLog("$u_name,$email: username or email already exists, account not created",1); } $failures++; } // end if $ucount == 0 && ecount == 0 } else { if ($verbose_import) { - $retval .= "$email is not a valid email address, account not created\n"; // malformed email + $retval .= "$email is not a valid email address, account not created\n"; // malformed email COM_errorLog("$email is not a valid email address, account not created",1); } $failures++; diff --git a/public_html/docs/english/changes.html b/public_html/docs/english/changes.html index 9150a13d6..b17501665 100644 --- a/public_html/docs/english/changes.html +++ b/public_html/docs/english/changes.html @@ -247,7 +247,7 @@

    New Features and Improvements

    Other changes

      -
    • Security: Fixed a vulnerability to dictionary attacks in the +
    • Security: Fixed a vulnerability to dictionary attacks in the autologin, originally reported by Bookoo of the Nine Situations Group.
    • The minimum requirements for Geeklog are now PHP 4.4.0 and MySQL 4.0.18.
      • @@ -732,8 +732,8 @@

      Geeklog 1.4.0sr1

      Geeklog 1.4.0

      -

      (Geeklog 1.4.0 was originally supposed to be called 1.3.12, so any -references you may find to a version 1.3.12 apply to version 1.4.0)

      +

      (Geeklog 1.4.0 was originally supposed to be called 1.3.12, so any +references you may find to a version 1.3.12 apply to version 1.4.0)

      New Features

      @@ -772,7 +772,7 @@

      New Features

      config.php.
    • The search now only displays a specified amount of results per page to avoid running into timeouts when searching through large databases.
      - Note: Plugins will have to be updated to support the "paged" search. + Note: Plugins will have to be updated to support the "paged" search. Until then, Geeklog fakes the paged results for plugin searches, which means that a plugin that hasn't been updated will still search through the entire database, but Geeklog will only display the results for the current diff --git a/public_html/docs/english/config.html b/public_html/docs/english/config.html index e2c696aed..21825cb20 100644 --- a/public_html/docs/english/config.html +++ b/public_html/docs/english/config.html @@ -17,7 +17,7 @@

      Configuration files

      Previous versions of Geeklog used one huge file called config.php that held all the core configuration options. As of Geeklog 1.5.0, most of the configuration options have been moved to the database and can now be -reached from the Configuration admin panel within Geeklog.

      +reached from the Configuration admin panel within Geeklog.

      For technical reasons, some configuration options still have to be stored in files. There are two such configuration files now:

      @@ -324,7 +324,7 @@

      Site: Search

    search_limits 10,15,25,30The result limits a user can select. Each value must be separated with a comma.
    The result limits a user can select. Each value must be separated with a comma.
    num_search_results 30
    multiple_trackbacks 0
    - - + +
    Header:User-Agent
    Content:^libwww-perl
    Header:User-Agent
    Content:^libwww-perl

    This would block all posts from user agents beginning with "libwww-perl".

    @@ -187,10 +187,10 @@

    Action Modules

    Once one of the examine modules detects a spam post, the action modules will decide what to do with the spam. Most of the time, you -will simply want to delete the post then, so this is what the Delete -Action module does.

    +will simply want to delete the post then, so this is what the Delete +Action module does.

    -

    As the name implies, the Mail Admin Action module sends an email to +

    As the name implies, the Mail Admin Action module sends an email to the site admin when a spam post is encountered. Since this can cause quite a lot of emails being sent, it is disabled by default.

    diff --git a/public_html/docs/english/staticpages.html b/public_html/docs/english/staticpages.html index 67ac2800c..f4f2a7711 100644 --- a/public_html/docs/english/staticpages.html +++ b/public_html/docs/english/staticpages.html @@ -59,7 +59,7 @@

    Usage

    When selecting the second of the above PHP execution options ("execute PHP") you can, however, switch back and forth between PHP and plain HTML like this:

    echo "Hello"; ?>, <b>world</b>, <?php echo "how are you?";
    -

    The above example would print out "Hello, world, how are you?".

    +

    The above example would print out "Hello, world, how are you?".

    Page ID

    diff --git a/public_html/docs/english/theme.html b/public_html/docs/english/theme.html index 5f716aafe..ac7b2d714 100644 --- a/public_html/docs/english/theme.html +++ b/public_html/docs/english/theme.html @@ -10,8 +10,8 @@

    Geeklog

    Geeklog Documentation - Theme How-To
    -

    (see below for a list of theme changes in -recent Geeklog versions)

    +

    (see below for a list of theme changes in +recent Geeklog versions)

    Creating a Theme for Geeklog

    @@ -390,7 +390,7 @@

    Other changes

    block.
  • A new option in My Account allows users to enable/disable the Advanced Editor. Requires a new template variable {advanced_editor_option} - in preferences/displayblock.thtml and a new template file + in preferences/displayblock.thtml and a new template file preferences/editor.thtml for the actual option (the option remains hidden unless Advanced Editor is enabled globally in the Configuration).
  • Added some padding to the <li> element in @@ -1406,10 +1406,10 @@

    Other changes

    CSS changes

    • The underscore '_' is not a valid character in CSS. Therefore, some class names used by the Geeklog calendar have been changed to use the dash '-' instead. You may need to change your stylesheet accordingly.
      -Names that changed: cal-oldday, cal-today, -cal-futureday, cal-nullday, weekview-curday, -weekview-offday
      • -
    • A new class named pagenav can be used to format the paged +Names that changed: cal-oldday, cal-today, +cal-futureday, cal-nullday, weekview-curday, +weekview-offday
      • +
    • A new class named pagenav can be used to format the paged navigation.
      Please note that this change was made after the release of Geeklog 1.3.6rc1 and affects the use of the paged navigation in diff --git a/public_html/docs/english/themevars.html b/public_html/docs/english/themevars.html index 80f9bcb01..e146de79c 100644 --- a/public_html/docs/english/themevars.html +++ b/public_html/docs/english/themevars.html @@ -384,11 +384,11 @@

      Stories

    		• Example Description
    story_anchortag_and_image<a href="http://www.example.com/
    index.php?topic=Geeklog"><img src="..." ...></a>     (shortened)    		<a href="http://www.example.com/
    index.php?topic=Geeklog"><img src="..." ...></a>     (shortened)    		 Topic icon for the story's topic, enclosed in a link to the site's index page, sorted by topic.
    story_anchortag_and_image_no_align<a href="http://www.example.com/
    index.php?topic=Geeklog"><img src="..." ...></a>     (shortened)    		<a href="http://www.example.com/
    index.php?topic=Geeklog"><img src="..." ...></a>     (shortened)    		 Same as {story_anchortag_and_image} but without the align attribute for the topic image.
    story_topic_image
    - - + +
    Header:User-Agent
    Content:^libwww-perl
    Header:User-Agent
    Content:^libwww-perl

    これで "libwww-perl" で始まるユーザーエージェントからのスパム投稿はすべてブロックされます。

    @@ -124,9 +124,9 @@

    Spam Number of Links (SNL)

    アクションモジュール

    -

    いったん検出モジュールがスパム投稿を検出すると、アクションモジュールがスパムをどう処理するかを判断します。たいていの場合、スパムを削除するだけでよいですが、これを行うのが削除アクション(Delete Action) モジュールです。

    +

    いったん検出モジュールがスパム投稿を検出すると、アクションモジュールがスパムをどう処理するかを判断します。たいていの場合、スパムを削除するだけでよいですが、これを行うのが削除アクション(Delete Action) モジュールです。

    -

    その名前が示すとおり、管理者メールアクション(Mail Admin Action) モジュールはスパムを検出したときに、サイト管理者にメールで通知します。多数の通知メールが送られる可能性があるため、デフォルトでは無効になっています。

    +

    その名前が示すとおり、管理者メールアクション(Mail Admin Action) モジュールはスパムを検出したときに、サイト管理者にメールで通知します。多数の通知メールが送られる可能性があるため、デフォルトでは無効になっています。

    アクションモジュールは使用する前に個別に有効にする必要があります(一方、検出モジュールはSpam-Xのディレクトリにファイルを入れるだけで有効になります。)。このため、すべてのアクションモジュールは独自の番号を持っています。有効にしたいすべてのモジュールの番号を足し合わせた数値を、「管理者用メニュー - コンフィギュレーション - Geeklog - ユーザーと投稿」の「Spam-X」に入力します。

    diff --git a/public_html/docs/japanese/staticpages.html b/public_html/docs/japanese/staticpages.html index 76c2661ed..ade9dc73b 100644 --- a/public_html/docs/japanese/staticpages.html +++ b/public_html/docs/japanese/staticpages.html @@ -60,7 +60,7 @@

    使用法

    上述の「PHPを実行する」（returnなしの方）を選択する場合は、コードの中でPHPとHTMLを次のように行き来することができます。

    echo "Hello"; ?>, <b>world</b>, <?php echo "how are you?";
    -

    この例では、"Hello, world, how are you?"と表示されます。

    +

    この例では、"Hello, world, how are you?"と表示されます。

    ページID

    diff --git a/public_html/docs/japanese/theme.html b/public_html/docs/japanese/theme.html index 18f78d0e0..3e2e0d4f2 100644 --- a/public_html/docs/japanese/theme.html +++ b/public_html/docs/japanese/theme.html @@ -12,7 +12,7 @@

    Geeklog Documentation

    Geeklogドキュメント - テーマ作成
    -

    (Geeklogの最近のバージョンにおけるテーマ変更一覧については、下記参照のこと。)

    +

    (Geeklogの最近のバージョンにおけるテーマ変更一覧については、下記参照のこと。)

    Geeklog用のテーマ作成

    @@ -1098,10 +1098,10 @@

    Other changes

    CSS changes

    • The underscore '_' is not a valid character in CSS. Therefore, some class names used by the Geeklog calendar have been changed to use the dash '-' instead. You may need to change your stylesheet accordingly.
      -Names that changed: cal-oldday, cal-today, -cal-futureday, cal-nullday, weekview-curday, -weekview-offday
      • -
    • A new class named pagenav can be used to format the paged +Names that changed: cal-oldday, cal-today, +cal-futureday, cal-nullday, weekview-curday, +weekview-offday
      • +
    • A new class named pagenav can be used to format the paged navigation.
      Please note that this change was made after the release of Geeklog 1.3.6rc1 and affects the use of the paged navigation in diff --git a/public_html/docs/japanese/themevars.html b/public_html/docs/japanese/themevars.html index 3524a54f9..d370872f1 100644 --- a/public_html/docs/japanese/themevars.html +++ b/public_html/docs/japanese/themevars.html @@ -256,10 +256,10 @@

      記事

      例 説明 story_anchortag_and_image - <a href="http://www.example.com/
      index.php?topic=Geeklog"><img src="..." ...></a>       (shortened) + <a href="http://www.example.com/
      index.php?topic=Geeklog"><img src="..." ...></a>       (shortened) 記事の話題に対応するアイコンで、話題で並べ替えられたサイトのインデックスページへのリンクになっています。 story_anchortag_and_image_no_align - <a href="http://www.example.com/
      index.php?topic=Geeklog"><img src="..." ...></a>       (shortened) + <a href="http://www.example.com/
      index.php?topic=Geeklog"><img src="..." ...></a>       (shortened) {story_anchortag_and_image}変数と同じですが、話題の画像のalign属性を含みません。 story_topic_image <img src="http://www.example.com/
      images/topics/topic_gl.gif" align="right" alt="Geeklog" title="Geeklog">       diff --git a/public_html/docs/japanese/trackback.html b/public_html/docs/japanese/trackback.html index 5ca4c18be..4852cbd19 100644 --- a/public_html/docs/japanese/trackback.html +++ b/public_html/docs/japanese/trackback.html @@ -44,7 +44,7 @@

      ピングバック

      トラックバック

      -

      (話の都合で今はピングに触れないことにします。下記参照のこと。)

      +

      (話の都合で今はピングに触れないことにします。下記参照のこと。)

      トラックバックは1つのサイトにしか送信できないので、記事の中に含まれるリンク一覧が表示され、どのサイトにトラックバックを送信するかを選ばなければなりません。Geeklogはそのサイトがトラックバックを受け入れるかどうか確認し、トラックバックを送信する実際のURLを決定しようとします。

      diff --git a/public_html/layout/modern_curve/adminnavigation.thtml b/public_html/layout/modern_curve/adminnavigation.thtml index f95c1d492..4a4c7583e 100644 --- a/public_html/layout/modern_curve/adminnavigation.thtml +++ b/public_html/layout/modern_curve/adminnavigation.thtml @@ -1,7 +1,7 @@ {# begin {templatelocation} - The Admin Navigation uses template blocks which is built into this file #} -
    • {group_label}
      • +
    • {group_label}
    • {branch_spaces}{option_label}{display_count}
      • diff --git a/public_html/layout/modern_curve/pagenavigation.thtml b/public_html/layout/modern_curve/pagenavigation.thtml index 56b8abf47..5e5d25f14 100644 --- a/public_html/layout/modern_curve/pagenavigation.thtml +++ b/public_html/layout/modern_curve/pagenavigation.thtml @@ -12,7 +12,7 @@ {page_number} -{page_number} +{page_number} | {start_next_anchortag}{lang_next}{end_next_anchortag} diff --git a/public_html/layout/professional/admin/block/blockeditor.thtml b/public_html/layout/professional/admin/block/blockeditor.thtml index 06e784932..56ab7390f 100644 --- a/public_html/layout/professional/admin/block/blockeditor.thtml +++ b/public_html/layout/professional/admin/block/blockeditor.thtml @@ -57,7 +57,7 @@ - + @@ -76,7 +76,7 @@
      {lang_phpblockoptions}{lang_phpblockoptions}
      {lang_blockfunction}: - + @@ -100,7 +100,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/public_html/layout/professional/admin/lists/inline.thtml b/public_html/layout/professional/admin/lists/inline.thtml index 09e756c4f..89c24cb96 100644 --- a/public_html/layout/professional/admin/lists/inline.thtml +++ b/public_html/layout/professional/admin/lists/inline.thtml @@ -10,5 +10,5 @@ {formfields_bottom} -

      {message}

      +

      {message}

      {google_paging} diff --git a/public_html/layout/professional/admin/lists/list.thtml b/public_html/layout/professional/admin/lists/list.thtml index 172a2a258..d956d41a5 100644 --- a/public_html/layout/professional/admin/lists/list.thtml +++ b/public_html/layout/professional/admin/lists/list.thtml @@ -12,5 +12,5 @@ {formfields_bottom} -

      {message}

      +

      {message}

      {google_paging} diff --git a/public_html/layout/professional/admin/mail/mailform.thtml b/public_html/layout/professional/admin/mail/mailform.thtml index c7270b3e5..6dde5299b 100755 --- a/public_html/layout/professional/admin/mail/mailform.thtml +++ b/public_html/layout/professional/admin/mail/mailform.thtml @@ -1,7 +1,7 @@
      {lang_portalblockoptions}{lang_portalblockoptions}
      {lang_rdfurl}: - + @@ -118,7 +118,7 @@ - + @@ -132,7 +132,7 @@ - + diff --git a/public_html/layout/professional/admin/block/defaultblockeditor.thtml b/public_html/layout/professional/admin/block/defaultblockeditor.thtml index 3347a59ac..63af8e09f 100644 --- a/public_html/layout/professional/admin/block/defaultblockeditor.thtml +++ b/public_html/layout/professional/admin/block/defaultblockeditor.thtml @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/public_html/layout/professional/admin/common/edit_permissions.thtml b/public_html/layout/professional/admin/common/edit_permissions.thtml index cb87189fe..51118e75e 100644 --- a/public_html/layout/professional/admin/common/edit_permissions.thtml +++ b/public_html/layout/professional/admin/common/edit_permissions.thtml @@ -6,11 +6,11 @@ - - - - - - + + + + + +
      {lang_normalblockoptions}{lang_normalblockoptions}
      {lang_blockcontent}:
      {lang_accessrights}{lang_accessrights}
      {lang_owner}:
      {lang_permissions}:{lang_permissions}:
      {lang_perm_key}
      {lang_accessrights}{lang_accessrights}
      {lang_owner}:{group_dropdown}
      {lang_permissions}:{lang_permissions}:
      {lang_anonymous}
      RERERRRERERR
      diff --git a/public_html/layout/professional/admin/group/groupeditor.thtml b/public_html/layout/professional/admin/group/groupeditor.thtml index a10169a8f..e29be6438 100644 --- a/public_html/layout/professional/admin/group/groupeditor.thtml +++ b/public_html/layout/professional/admin/group/groupeditor.thtml @@ -34,7 +34,7 @@
      {lang_securitygroups}{lang_securitygroups}
      {lang_securitygroupmsg}
      {lang_rights}{lang_rights}
      {lang_rightsmsg}
      - + - + - + - + - + - + diff --git a/public_html/layout/professional/admin/plugins/editor.thtml b/public_html/layout/professional/admin/plugins/editor.thtml index 0f096d559..86dae0078 100644 --- a/public_html/layout/professional/admin/plugins/editor.thtml +++ b/public_html/layout/professional/admin/plugins/editor.thtml @@ -9,31 +9,31 @@ - + - + - + - + - + - + - + diff --git a/public_html/layout/professional/admin/plugins/info.thtml b/public_html/layout/professional/admin/plugins/info.thtml index ab0ad64aa..7b8b9f0cf 100644 --- a/public_html/layout/professional/admin/plugins/info.thtml +++ b/public_html/layout/professional/admin/plugins/info.thtml @@ -8,16 +8,16 @@ - + {homepage} - + - + diff --git a/public_html/layout/professional/admin/story/storyeditor.thtml b/public_html/layout/professional/admin/story/storyeditor.thtml index e2a09fae7..819ca7ff0 100644 --- a/public_html/layout/professional/admin/story/storyeditor.thtml +++ b/public_html/layout/professional/admin/story/storyeditor.thtml @@ -208,7 +208,7 @@ - + @@ -224,7 +224,7 @@ - + diff --git a/public_html/layout/professional/admin/syndication/feededitor.thtml b/public_html/layout/professional/admin/syndication/feededitor.thtml index e7a9b662d..ec671b247 100644 --- a/public_html/layout/professional/admin/syndication/feededitor.thtml +++ b/public_html/layout/professional/admin/syndication/feededitor.thtml @@ -36,7 +36,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/public_html/layout/professional/admin/topic/topiceditor.thtml b/public_html/layout/professional/admin/topic/topiceditor.thtml index 87b366d26..4e1e57f51 100644 --- a/public_html/layout/professional/admin/topic/topiceditor.thtml +++ b/public_html/layout/professional/admin/topic/topiceditor.thtml @@ -66,7 +66,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/public_html/layout/professional/admin/trackback/pingbackform.thtml b/public_html/layout/professional/admin/trackback/pingbackform.thtml index dc5a2b1b6..9c4306f78 100644 --- a/public_html/layout/professional/admin/trackback/pingbackform.thtml +++ b/public_html/layout/professional/admin/trackback/pingbackform.thtml @@ -2,7 +2,7 @@

      {lang_explain}

      {lang_to}:{lang_to}:
      {lang_from}:{lang_from}:
      {lang_replyto}:{lang_replyto}:
      {lang_subject}:{lang_subject}:
      {lang_body}:{lang_body}:
      {lang_options}:{lang_options}: {lang_HTML}
      {lang_pluginname}:{lang_pluginname}: {pi_display_name}
      {lang_pluginhomepage}:{lang_pluginhomepage}: {pi_homepage}
      {lang_pluginversion}:{lang_pluginversion}: {pi_version}
      {lang_plugincodeversion}:{lang_plugincodeversion}: {pi_codeversion}
      {lang_dependencies}:{lang_dependencies}: {pi_dependencies}
      {lang_load}:{lang_load}: {pi_load}
      {lang_enabled}:{lang_enabled}: {pi_enabled}
      {lang_pluginname}:{lang_pluginname}: {pi_display_name}
      {lang_pluginversion}:{lang_pluginversion}: {pi_version}
      {lang_dependencies}:{lang_dependencies}: {pi_dependencies}
      {lang_accessrights}{lang_accessrights}
      {lang_owner}: 
      {lang_permissions}:{lang_permissions}:
      {lang_perm_key}
      {lang_content_length}: {lang_clen_explain} {lang_clen_explain}
      {lang_description}:
      {lang_feedlogo}: {lang_feedlogo_explain} {lang_feedlogo_explain}
      {lang_filename}:
      {lang_accessrights}{lang_accessrights}
      {lang_owner}:
      {lang_permissions}:{lang_permissions}:
      - + @@ -10,7 +10,7 @@ diff --git a/public_html/layout/professional/admin/trackback/trackbackeditor.thtml b/public_html/layout/professional/admin/trackback/trackbackeditor.thtml index bd25a3aba..2edcae7e6 100644 --- a/public_html/layout/professional/admin/trackback/trackbackeditor.thtml +++ b/public_html/layout/professional/admin/trackback/trackbackeditor.thtml @@ -2,7 +2,7 @@

      {lang_explain}

      {lang_pingback_url}:{lang_pingback_url}:
      {lang_site_url}: - {site_url} + {site_url}
      - + @@ -14,7 +14,7 @@ - + diff --git a/public_html/layout/professional/admin/user/groupedit.thtml b/public_html/layout/professional/admin/user/groupedit.thtml index 8903614c8..2be0c8b7e 100644 --- a/public_html/layout/professional/admin/user/groupedit.thtml +++ b/public_html/layout/professional/admin/user/groupedit.thtml @@ -1,5 +1,5 @@ - +
      {lang_trackback_url}:{lang_trackback_url}:
      {lang_entry_url}:{lang_entry_url}:
      {lang_securitygroups}{lang_securitygroups}

      {lang_groupinstructions}

      diff --git a/public_html/layout/professional/adminnavigation.thtml b/public_html/layout/professional/adminnavigation.thtml index 358ce053b..c7a7d60c2 100644 --- a/public_html/layout/professional/adminnavigation.thtml +++ b/public_html/layout/professional/adminnavigation.thtml @@ -1,7 +1,7 @@ {# {templatelocation} - The Admin Navigation uses template blocks which is built into this file #} -
    • {group_label}
      • +
    • {group_label}
    • {branch_spaces}{option_label}{display_count}
      • diff --git a/public_html/layout/professional/article/printable.thtml b/public_html/layout/professional/article/printable.thtml index 5c0041fdd..909127906 100644 --- a/public_html/layout/professional/article/printable.thtml +++ b/public_html/layout/professional/article/printable.thtml @@ -10,7 +10,7 @@

      {story_title}

      {story_date}

      -

      {lang_contributedby} {story_author}

      +

      {lang_contributedby} {story_author}

      {story_text_no_br} diff --git a/public_html/layout/professional/blockservices.thtml b/public_html/layout/professional/blockservices.thtml index 7d0e91aa5..1e64bd17d 100644 --- a/public_html/layout/professional/blockservices.thtml +++ b/public_html/layout/professional/blockservices.thtml @@ -1,2 +1,2 @@ -: +: {select_service} diff --git a/public_html/layout/professional/comment/commentbar.thtml b/public_html/layout/professional/comment/commentbar.thtml index 8fd4e112b..08144115d 100644 --- a/public_html/layout/professional/comment/commentbar.thtml +++ b/public_html/layout/professional/comment/commentbar.thtml @@ -1,7 +1,7 @@
      - {start_storylink_anchortag}{story_title}{end_storylink_anchortag} | {num_comments} {lang_comments} | {user_nullname} {lang_login_logout} + {start_storylink_anchortag}{story_title}{end_storylink_anchortag} | {num_comments} {lang_comments} | {user_nullname} {lang_login_logout}
      diff --git a/public_html/layout/professional/comment/commentform.thtml b/public_html/layout/professional/comment/commentform.thtml index 8685a410a..41cc4e5b6 100644 --- a/public_html/layout/professional/comment/commentform.thtml +++ b/public_html/layout/professional/comment/commentform.thtml @@ -3,7 +3,7 @@ - + - + - + - + -
      {lang_username}:{lang_username}: @@ -17,15 +17,15 @@
      {lang_title}:{lang_title}:
      {lang_comment}:{lang_comment}:
      {lang_postmode}:{lang_postmode}:
      {lang_importantstuff}
        +
      		{lang_importantstuff}
      • {lang_instr_line1}
      • {lang_instr_line2}
      • {lang_instr_line3}
        • diff --git a/public_html/layout/professional/comment/commentform_advanced.thtml b/public_html/layout/professional/comment/commentform_advanced.thtml index afd49d441..1d8390205 100644 --- a/public_html/layout/professional/comment/commentform_advanced.thtml +++ b/public_html/layout/professional/comment/commentform_advanced.thtml @@ -5,7 +5,7 @@ - + - + - + - + - {item_row}
        {lang_username}:{lang_username}: @@ -20,11 +20,11 @@
        {lang_title}:{lang_title}:
        {lang_comment}:{lang_comment}:
        @@ -35,7 +35,7 @@
        {lang_postmode}:{lang_postmode}:
        {lang_importantstuff}
          +
        		{lang_importantstuff}
        • {lang_instr_line1}
        • {lang_instr_line2}
        • {lang_instr_line3}
          • diff --git a/public_html/layout/professional/header.thtml b/public_html/layout/professional/header.thtml index 418600988..9ede13089 100644 --- a/public_html/layout/professional/header.thtml +++ b/public_html/layout/professional/header.thtml @@ -27,7 +27,7 @@ {left_blocks}

        - {welcome_msg}{datetime} + {welcome_msg}{datetime}

        diff --git a/public_html/layout/professional/lists/inline/list.thtml b/public_html/layout/professional/lists/inline/list.thtml index 15eb9df50..4d45b74e5 100755 --- a/public_html/layout/professional/lists/inline/list.thtml +++ b/public_html/layout/professional/lists/inline/list.thtml @@ -12,7 +12,7 @@ {item_row} -

        {message}

        +

        {message}

        {google_paging} {list_bottom} diff --git a/public_html/layout/professional/lists/table/list.thtml b/public_html/layout/professional/lists/table/list.thtml index fc66396f8..5a5cd0482 100755 --- a/public_html/layout/professional/lists/table/list.thtml +++ b/public_html/layout/professional/lists/table/list.thtml @@ -12,7 +12,7 @@
        -

        {message}

        +

        {message}

        {google_paging} {list_bottom} diff --git a/public_html/layout/professional/loginform_openid.thtml b/public_html/layout/professional/loginform_openid.thtml index 9e3fe0354..48ef01512 100644 --- a/public_html/layout/professional/loginform_openid.thtml +++ b/public_html/layout/professional/loginform_openid.thtml @@ -7,7 +7,7 @@