{page_title}

???????, ????? ???? ???? ?? ???? ????? ????? ?? ??????? (allow_url_fopen ??? ???? off). ??? ?????? ?? ?????? ?????? ??????? ???? ????? ???? ??????? ?-"data" ?? ??????, %s, ???? ????? ???:', - '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 @@ - - + + - {page_title} + {page_title} - +

' . $LANG_INSTALL[2] . ' ' . LB; // Show the language drop down selection on the first page -if ($mode == 'check_permissions') { +if (empty($mode) || ($mode == 'check_permissions')) { $display .='

' . 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 => '???? ??: ??? ?? ????? ???? ??????, ????? ????? ??? ?? ??????? ????? ?????? ??? ??? ???? ?? ????? ????. ?? ?????? ?? ????? ??? ?? ??? NewAdmin ??????? ??? password', - 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 upgrade your MySQL 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 => 'Note: 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 NewAdmin and the password is password', 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 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 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 +* @author Tony Bibbbs * @author Vincent Furia */ @@ -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 @@

このドキュメントでは最も重要な変更点や目につく変更点を簡潔に説明しています。変更点の詳細なリストは、 ChangeLogをご覧ください。 docs/changed-filesには、前回リリース以来変更されたファイルの一覧があります。

Geeklog 1.5.2

+ +

Bugfixes

+ +

Fixed a bug in the story preview where the story content was lost when + previewing a story with a duplicate story ID.
The Trackback editor didn't work since the security token was missing from + the editor template.
Fixed issues with clickable links in plain text postings.
Fixed various problems with updating feeds, e.g. when changing topic + permissions.

+ +

Fixes in the bundled Plugins

+ +

Calendar: You couldn't add a new event to your personal calendar.
Links: Changing a link's ID to one that was already in use overwrote the + other link.
Polls: Changing a poll's ID created a new poll. Also fixed an SQL error + when the poll question contained single quotes.
Static Pages: Saving a static page changed the owner to the user who saved + it.

+ +

Other Changes

+ +

Improved image quality when using gdlib to rescale uploaded images.
Theme changes are documented in the theme + documentation, 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.

+ +

Geeklog 1.5.1

Geeklog 1.5.1の大半はバグ修正リリースであり、Geeklog 1.5.0のユーザにはアップグレードをお勧めします。小さなものですが、いくつか機能追加もあります。

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 @@ 注:実際にサイトを閉鎖するかどうかを決める設定は、 siteconfig.phpファイルにある。コピーライトの年 (copyrightyear) - (コメントアウトされている) + (無効) サイトのフッタに表示するcopyrightの年を設定する。設定しない場合、現在の年が使われる。 URLリライト (url_rewrite) @@ -763,13 +763,13 @@ 画像ライブラリを「ImageMagick」、「Netpbm」、「GDライブラリ」から選ぶ。画像アップロード時にリサイズしたくない場合や、画像ライブラリを使えない場合は「なし」にする。 Mogrifyへのパス (path_to_mogrify) - (コメントアウトされている) - 上記の「画像ライブラリ」にImageMagickを選んだ場合、 mogrifyバイナリの完全なパスを '/usr/bin/mogrify' のように指定する。
+ (無効) + 上記の「画像ライブラリ」にimagemagickを選んだ場合、 mogrifyバイナリの完全なパスを '/usr/bin/mogrify' のように指定する。
かなり新しいバージョンのImageMagickが必要（バージョン5.4.9以降推奨）。 Netpbmへのパス (path_to_netpbm) - (コメントアウトされている) - 上記の「画像ライブラリ」に Netpbm を選んだ場合、Netpbmのバイナリがあるディレクトリの完全なパスを '/usr/bin/netpbm/' のように指定する。パスの最後はスラッシュ'/'でなければならない。
様々なプラットフォーム用にコンパイルされた etpbmバイナリのパッケージは、Homepage of the Gallery projectからダウンロードできる。 + (無効) + 上記の「画像ライブラリ」にnetpbmを選んだ場合、Netpbmのバイナリがあるディレクトリの完全なパスを '/usr/bin/netpbm/' のように指定する。パスの最後はスラッシュ'/'でなければならない。
様々なプラットフォーム用にコンパイルされたバイナリのパッケージは、Netpbm homepageからダウンロードできる。

画像: アップロード

@@ -788,8 +788,8 @@ はい(1)にすると、上記のように元画像を保存する場合、記事の中でリサイズされた画像を使えるようになる。言い換えると、記事中で（[imageX] に加えて）[unscaledX] タグを使えるようになる。画像アップロードのデバッグを行う(debug_image_upload) - (コメントアウトされている) - コメントアウトされておらず、はい(true)にすると、画像のアップロード中に,デバッグ情報がGeeklogのerror.logに書き込まれる。画像アップロード時の問題を解明する際に役立つ。 + いいえ(false) + はい(true)にすると、画像のアップロード中に,デバッグ情報がGeeklogのerror.logに書き込まれる。画像アップロード時の問題を解明する際に役立つ。

画像: 記事の画像

@@ -852,11 +852,11 @@ ファイルサイズの最大値。この数値を超えた場合は、リサイズ用の画像ライブラリを使っていても、その画像ファイルは拒否される。幅を固定する (force_photo_width) - (コメントアウトされている) + (無効) この設定を有効にしても、ユーザの写真を表示する ときにしか適用されない。写真表示用の <img>タグがここで指定されたサイズで出力される。つまり、実際の写真のサイズはより大きなものかもしれないが、小さな（ここで指定された）サイズでしか表示されないということである。（掲示板などで）奇妙な形をしたユーザの写真がページのレイアウトを台無しにするのを防ぎたい場合に役に立つ。デフォルトの写真 (default_photo) - (コメントアウトされている) + (無効) 有効にする場合には、画像ファイルの完全なURLを指定する。写真のないユーザの場合、このデフォルトの写真が表示される。この設定が無効でユーザが写真もアバターを持っていない場合、何も表示されない。 @@ -873,7 +873,7 @@ このオプションを有効にすると、（掲示板のスレッドなどの）複数ユーザの多数の写真を表示するページでは、スピードダウンする可能性があることに注意。 Gravatar評価を許可 (gravatar_rating) - (コメントアウトされている) + (無効) gravatar.comへ投稿されたアバターは、（米国で）映画用に使われている評価システム

(G = General：一般向け
R = Restriced：保護者同伴で入場可
X = Banned：17歳未満入場禁止

- で評価される。このオプションは表示されるアバターの最も厳しい ランクを設定する。たとえば、Rと設定すると、G, PG, Rランクのアバターは表示されるが、Xランクのアバターは一切表示されなくなる。 + で評価される。このオプションは表示されるアバターの最も厳しい ランクを設定する。たとえば、Rと設定すると、G, PG, Rランクのアバターは表示されるが、Xランクのアバターは一切表示されなくなる。 @@ -899,11 +899,11 @@ 言語ファイル名。追加の言語ファイルはhttp://www.geeklog.netでダウンロードできる。言語ファイルを翻訳した場合は、送ってください。下記のローカリゼーションも参照してください。言語ファイル[多言語モード ](language_files) - (コメントアウトされている) + (無効) 多言語サイト用。言語の短縮形('en', 'de', 'ja'など)と言語ファイルの対応関係を指定する。言語名[多言語モード ](languages) - (コメントアウトされている) + (無効) 多言語サイト用。言語の短縮形('en', 'de', 'ja'など)と言語名("English", "Deutsch", "Japanese"など)の対応関係を指定する。 @@ -961,7 +961,7 @@ 小数点以下で表示する桁数タイムゾーン(timezone) - (コメントアウトされている) + (無効) サーバが異なるタイムゾーンに配置されている場合、時刻が正しく表示されるようにローカルのタイムゾーンを設定する。この設定は、タイムゾーンハック(timezone hack)という名前で知られており、サーバによっては機能しない場合がある。 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 @@ -

Geeklog 1.5.1でのテーマの変更点

Theme changes in Geeklog 1.5.2

+ +

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.

+ +

Bugfixes

+ +

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.

+ +

The security token was missing from the trackback editor template file, + admin/trackback/trackbackeditor.thtml
The {start_storylink_anchortag} 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)
The {site_admin_url} was missing from the Configuration form + action in admin/config/configuration.thtml. This may have caused + problems making configuration changes on some setups.
Added a hidden old_pid input field to the polls editor template + file, plugins/polls/templates/admin/polleditor.thtml, to fix + problems when changing a poll's ID.

+ +

Other changes

+ +

These changes are optional. They fix cosmetic issues or issues that only +affect some setups.

+ +

Cosmetics: In the Professional theme, the last menu entry isn't different + from the other entries, so the + .header-navigation-container li.last rule in style.css + is not needed for this theme.
Internationalisation: The language direction variable, + {direction}, was not available in the printer-friendly + templates for articles and static pages.

+ + +

Geeklog 1.5.1でのテーマの変更点

注意: Geeklog 1.5.0用に作成されたテーマはたいていの場合、Geeklog 1.5.1と互換性があります。必ず変更しなければならないのは管理者メニューのコンフィギュレーション用のものが1つあるだけで、以下に列挙する変更点はすべて任意か、特別な設定時（多言語サイトや、右から左へと表示する言語など）のものです。詳細は以下をご覧ください。

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')) + . '

' . $message . '

' + . 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')) - . '

' . $message . '

' - . 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 .= '

${LANG_deleteall}$	{LANG_Author}	{LANG_Subject}	{LANG_Views}	{LANG_Replies}	{LANG_Actions}	${LANG_deleteall}$	{LANG_Author}	{LANG_Subject}	{LANG_Views}	{LANG_Replies}	{LANG_Actions}
{alertmessage}

{filter_topic_selection}
{LANG_all}	{LANG_topic}	{LANG_title}	{LANG_date}	{LANG_comments}	{LANG_topic}	{LANG_title}	{LANG_date}	{LANG_comments}

- \| - \| - \| - + \| + \| + \| +
- \| - \| - \| - + \| + \| + \| +
- \| - \| - \| - + \| + \| + \| +
- \| - \| - \| - + \| + \| + \| +
- \| - \| - \| - + \| + \| + \| +
- \| - + \| +

{lang_week} {week_num}	{lang_week} {week_num}	{allday_events}
{0_hour}	{0_hour}
{1_hour}	{1_hour}
{2_hour}	{2_hour}
{3_hour}	{3_hour}
{4_hour}	{4_hour}
{5_hour}	{5_hour}
{6_hour}	{6_hour}
{7_hour}	{7_hour}
{8_hour}	{8_hour}
{9_hour}	{9_hour}
{10_hour}	{10_hour}
{11_hour}	{11_hour}
{12_hour}	{12_hour}
{13_hour}	{13_hour}
{14_hour}	{14_hour}
{15_hour}	{15_hour}
{16_hour}	{16_hour}
{17_hour}	{17_hour}
{18_hour}	{18_hour}
{19_hour}	{19_hour}
{20_hour}	{20_hour}
{21_hour}	{21_hour}
{22_hour}	{22_hour}
{23_hour}	{23_hour}

{sp_title}

Bugfixes

Fixes in the bundled Plugins

Other Changes

Bugfixes

Other changes

An error has occurred:

This is being displayed as "Root Debugging" is enabled in your Geeklog configuration.

{sp_title}

Bugfixes

Fixes in the bundled Plugins

Other Changes

Bugfixes

Other changes

{story_title}

{story_date}

An error has occurred:

This is being displayed as "Root Debugging" is enabled in your Geeklog configuration.

{$LANG_GF01['SUBJECT']}: $A[subject]

{$LANG_GF01['SUBJECT']}: {$A['subject']}

$B[subject]

{$B['subject']}

{$LANG_GF01['SUBJECT']}: $A[subject]

{$LANG_GF01['SUBJECT']}: {$A['subject']}

$B[subject]

バージョン: 1.0.6

バージョン: 1.0.7

作成者: Yoshinori Tahara - dengen

公開日: 2008.10.24

公開日: 2009.02.15

ライセンス: GPL

概要:

バージョン: 1.0.6

バージョン: 1.0.7

作成者: Yoshinori Tahara - dengen

公開日: 2008.10.24

公開日: 2009.02.15

ライセンス: GPL

概要:

バージョン: 1.0.6

バージョン: 1.0.7

作成者: Yoshinori Tahara - dengen

公開日: 2008.10.24

公開日: 2009.02.15

ライセンス: GPL

概要:

Bugfixes

バグ修正

Fixes in the bundled Plugins

同梱されているプラグインのバグ修正

Other Changes

他のバグ修正

Geeklog History/Changes:

Feb 8, 2009 (1.5.2)

Static Pages plugin

Jan 24, 2009 (1.5.2rc1)

Calendar plugin

Links plugin

Polls plugin

Spam-X

Static Pages plugin

Sep 22, 2008 (1.5.1)

謝辞

Bugfixes

バグ修正

Other changes

他の変更点

Bugfixes

バグ修正

Fixes in the bundled Plugins

同梱されているプラグインのバグ修正

Other Changes

他のバグ修正

Geeklog History/Changes:

Feb 8, 2009 (1.5.2)

Static Pages plugin

Jan 24, 2009 (1.5.2rc1)

Calendar plugin

Links plugin

Polls plugin