You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(179) |
Apr
(56) |
May
(53) |
Jun
(65) |
Jul
(70) |
Aug
(89) |
Sep
(50) |
Oct
(38) |
Nov
(12) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(57) |
Feb
(226) |
Mar
(172) |
Apr
(194) |
May
(120) |
Jun
(162) |
Jul
(297) |
Aug
(156) |
Sep
(312) |
Oct
(180) |
Nov
(358) |
Dec
(362) |
| 2005 |
Jan
(275) |
Feb
(224) |
Mar
(202) |
Apr
(157) |
May
(133) |
Jun
(115) |
Jul
(211) |
Aug
(257) |
Sep
(135) |
Oct
(116) |
Nov
(106) |
Dec
(81) |
| 2006 |
Jan
(74) |
Feb
(94) |
Mar
(59) |
Apr
(125) |
May
(50) |
Jun
(71) |
Jul
(45) |
Aug
(80) |
Sep
(3) |
Oct
(44) |
Nov
(50) |
Dec
(38) |
| 2007 |
Jan
(46) |
Feb
(33) |
Mar
(24) |
Apr
(28) |
May
(19) |
Jun
(37) |
Jul
(66) |
Aug
(73) |
Sep
(87) |
Oct
(33) |
Nov
(39) |
Dec
(37) |
| 2008 |
Jan
(20) |
Feb
(54) |
Mar
(47) |
Apr
(68) |
May
(10) |
Jun
(13) |
Jul
(13) |
Aug
(25) |
Sep
(11) |
Oct
(22) |
Nov
(22) |
Dec
(34) |
| 2009 |
Jan
(34) |
Feb
(35) |
Mar
(11) |
Apr
(10) |
May
(15) |
Jun
(18) |
Jul
(28) |
Aug
(22) |
Sep
(9) |
Oct
(12) |
Nov
(6) |
Dec
(32) |
| 2010 |
Jan
(11) |
Feb
(7) |
Mar
(9) |
Apr
(3) |
May
(16) |
Jun
(1) |
Jul
(2) |
Aug
(25) |
Sep
(9) |
Oct
(8) |
Nov
(4) |
Dec
(8) |
| 2011 |
Jan
(17) |
Feb
(1) |
Mar
(6) |
Apr
(7) |
May
(5) |
Jun
(2) |
Jul
(12) |
Aug
(3) |
Sep
(18) |
Oct
(3) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(92) |
Feb
(74) |
Mar
(64) |
Apr
(55) |
May
(44) |
Jun
(91) |
Jul
(35) |
Aug
(42) |
Sep
(32) |
Oct
(56) |
Nov
(42) |
Dec
(81) |
| 2013 |
Jan
(117) |
Feb
(130) |
Mar
(33) |
Apr
(36) |
May
(155) |
Jun
(241) |
Jul
(113) |
Aug
(70) |
Sep
(50) |
Oct
(55) |
Nov
(34) |
Dec
(36) |
| 2014 |
Jan
(94) |
Feb
(67) |
Mar
(177) |
Apr
(67) |
May
(147) |
Jun
(137) |
Jul
(58) |
Aug
(56) |
Sep
(62) |
Oct
(35) |
Nov
(118) |
Dec
(53) |
| 2015 |
Jan
(204) |
Feb
(165) |
Mar
(275) |
Apr
(42) |
May
(58) |
Jun
(91) |
Jul
(81) |
Aug
(62) |
Sep
(23) |
Oct
(63) |
Nov
(29) |
Dec
(110) |
| 2016 |
Jan
(82) |
Feb
(55) |
Mar
(48) |
Apr
(92) |
May
(77) |
Jun
(41) |
Jul
(27) |
Aug
(41) |
Sep
(101) |
Oct
(84) |
Nov
(12) |
Dec
(18) |
| 2017 |
Jan
(44) |
Feb
(40) |
Mar
(23) |
Apr
(79) |
May
(27) |
Jun
(12) |
Jul
(20) |
Aug
(14) |
Sep
(3) |
Oct
(9) |
Nov
(4) |
Dec
(9) |
| 2018 |
Jan
(5) |
Feb
(23) |
Mar
(150) |
Apr
(114) |
May
(63) |
Jun
(25) |
Jul
(23) |
Aug
(54) |
Sep
(43) |
Oct
(10) |
Nov
(9) |
Dec
(1) |
| 2019 |
Jan
(1) |
Feb
(27) |
Mar
(27) |
Apr
(64) |
May
(21) |
Jun
(17) |
Jul
(12) |
Aug
(81) |
Sep
(15) |
Oct
(25) |
Nov
(15) |
Dec
(13) |
| 2020 |
Jan
(5) |
Feb
(4) |
Mar
(95) |
Apr
(59) |
May
(53) |
Jun
(22) |
Jul
(3) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(3) |
Dec
(1) |
| 2021 |
Jan
(20) |
Feb
(32) |
Mar
(34) |
Apr
(22) |
May
(58) |
Jun
(43) |
Jul
(35) |
Aug
(2) |
Sep
(14) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(6) |
Mar
(4) |
Apr
|
May
(5) |
Jun
(4) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(3) |
Nov
(38) |
Dec
(15) |
| 2023 |
Jan
(26) |
Feb
(12) |
Mar
(3) |
Apr
(9) |
May
(2) |
Jun
(5) |
Jul
(8) |
Aug
|
Sep
(39) |
Oct
(11) |
Nov
(3) |
Dec
(3) |
| 2024 |
Jan
(19) |
Feb
(20) |
Mar
(15) |
Apr
(12) |
May
(2) |
Jun
(12) |
Jul
(4) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(72) |
Feb
(80) |
Mar
(92) |
Apr
(35) |
May
(19) |
Jun
(26) |
Jul
(14) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tom S. <tom...@us...> - 2004-09-09 19:23:45
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19066 Modified Files: Tag: branch-smarty .cvsignore Log Message: Remove bogus ignore iem Index: .cvsignore =================================================================== RCS file: /cvsroot/php-blog/serendipity/.cvsignore,v retrieving revision 1.3.14.1 retrieving revision 1.3.14.2 diff -u -d -r1.3.14.1 -r1.3.14.2 --- .cvsignore 9 Sep 2004 16:41:31 -0000 1.3.14.1 +++ .cvsignore 9 Sep 2004 19:23:31 -0000 1.3.14.2 @@ -3,4 +3,3 @@ .htaccess uploads archives -templates_c |
|
From: Tom S. <tom...@us...> - 2004-09-09 19:23:17
|
Update of /cvsroot/php-blog/serendipity/templates_c In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18988 Added Files: Tag: branch-smarty .cvsignore Log Message: Ignore compiled templates --- NEW FILE: .cvsignore --- * |
|
From: Tom S. <tom...@us...> - 2004-09-09 18:50:22
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10758/templates/default Modified Files: Tag: branch-smarty smarty_layout.php Log Message: - Remove unneeded calls to compile of trackbacks.tpl when there is no data to handle Index: smarty_layout.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/smarty_layout.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- smarty_layout.php 9 Sep 2004 15:00:45 -0000 1.1.2.1 +++ smarty_layout.php 9 Sep 2004 18:50:13 -0000 1.1.2.2 @@ -56,5 +56,6 @@ // Welcome screen or whatever default: serendipity_printEntries(serendipity_fetchEntries(null, true, 15)); + break; } -?> \ No newline at end of file +?> |
|
From: Tom S. <tom...@us...> - 2004-09-09 18:50:22
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10758 Modified Files: Tag: branch-smarty serendipity_functions.inc.php serendipity_genpage.inc.php Log Message: - Remove unneeded calls to compile of trackbacks.tpl when there is no data to handle Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.1 retrieving revision 1.419.2.2 diff -u -d -r1.419.2.1 -r1.419.2.2 --- serendipity_functions.inc.php 9 Sep 2004 15:02:14 -0000 1.419.2.1 +++ serendipity_functions.inc.php 9 Sep 2004 18:50:13 -0000 1.419.2.2 @@ -239,6 +239,7 @@ if ($serendipity['smarty_raw_mode']) { $serendipity['smarty']->display(serendipity_getTemplateFile('commentform.tpl', 'serendipityPath')); } + serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl'); } function serendipity_setCookie($name,$value) { @@ -1178,7 +1179,7 @@ ) ); - ob_start(); // TODO: Remove recursion + ob_start(); // TODO: Remove recursion and output buffering serendipity_printComments( serendipity_fetchComments( $entry['id'] @@ -1266,12 +1267,7 @@ ) ); - if ($serendipity['smarty_raw_mode']) { - serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl'); - serendipity_smarty_fetch('COMMENTS', 'comments.tpl'); - serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl'); - $serendipity['smarty']->display(serendipity_getTemplateFile('entries.tpl', 'serendipityPath')); - } + serendipity_smarty_fetch('ENTRIES', 'entries.tpl'); } // end function serendipity_printEntries function serendipity_deleteComment($id, $entry_id, $type='comments') @@ -1529,6 +1525,7 @@ if ($serendipity['smarty_raw_mode']) { $serendipity['smarty']->display(serendipity_getTemplateFile('trackbacks.tpl', 'serendipityPath')); } + serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl'); } function serendipity_approveComment($cid, $entry_id, $force = false) { Index: serendipity_genpage.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v retrieving revision 1.33.2.1 retrieving revision 1.33.2.2 diff -u -d -r1.33.2.1 -r1.33.2.2 --- serendipity_genpage.inc.php 9 Sep 2004 15:02:15 -0000 1.33.2.1 +++ serendipity_genpage.inc.php 9 Sep 2004 18:50:13 -0000 1.33.2.2 @@ -48,12 +48,8 @@ // Use new Smarty driven templating // Watchout: Included files from within the templates need to be fetched in reverse order! include_once(serendipity_getTemplateFile('smarty_layout.php', 'serendipityPath')); - serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl'); - serendipity_smarty_fetch('COMMENTS', 'comments.tpl'); - serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl'); - serendipity_smarty_fetch('ENTRIES', 'entries.tpl'); serendipity_smarty_fetch('CONTENT', 'content.tpl'); } /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
|
From: Tom S. <tom...@us...> - 2004-09-09 16:41:42
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18874 Modified Files: Tag: branch-smarty .cvsignore serendipity_config.inc.php serendipity_functions_installer.inc.php Log Message: - Install template compile directory during installation, set permissions - Set verbose smarty debug and force compile of templates if $serendipity['production'] is false - Fix problem with $smarty->secure_dir not being an array - Force $smarty->compile_check - Disable $smarty->use_sub_dirs to allow Smarty to function during safe_mode - Set $smarty->compile_id to current theme to avoid conflicts and constant recompiles - Ignore templates_c in .cvsignore, CVS users should at this time create the directory manually Index: .cvsignore =================================================================== RCS file: /cvsroot/php-blog/serendipity/.cvsignore,v retrieving revision 1.3 retrieving revision 1.3.14.1 diff -u -d -r1.3 -r1.3.14.1 --- .cvsignore 2 Aug 2003 15:14:19 -0000 1.3 +++ .cvsignore 9 Sep 2004 16:41:31 -0000 1.3.14.1 @@ -2,4 +2,5 @@ serendipity_config_local.inc.php .htaccess uploads -archives \ No newline at end of file +archives +templates_c Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.1 retrieving revision 1.93.2.2 diff -u -d -r1.93.2.1 -r1.93.2.2 --- serendipity_config.inc.php 9 Sep 2004 15:02:15 -0000 1.93.2.1 +++ serendipity_config.inc.php 9 Sep 2004 16:41:31 -0000 1.93.2.2 @@ -67,6 +67,7 @@ @define('PATH_ENTRIES', 'entries'); @define('PATH_CATEGORIES', 'categories'); @define('PATH_PLUGIN', 'plugin'); +@define('PATH_SMARTY_COMPILE', 'templates_c'); // will be placed inside the template directory /* URI patterns * Note that it's important to use @ as the pattern delimiter. @@ -224,12 +225,18 @@ define('SMARTY_DIR', $serendipity['serendipityPath'] . 'bundled-libs/Smarty/libs/'); require_once SMARTY_DIR . 'Smarty.class.php'; $serendipity['smarty'] = new Smarty; -serendipity_plugin_api::hook_event('frontend_configure', $serendipity); -$serendipity['smarty']->template_dir = dirname(serendipity_getTemplateFile('index.tpl', 'serendipityPath')); -$serendipity['smarty']->compile_dir = $serendipity['serendipityPath'] . 'templates_c'; -$serendipity['smarty']->config_dir =& $serendipity['smarty']->template_dir; -$serendipity['smarty']->secure_dir =& $serendipity['smarty']->template_dir; -$serendipity['smarty']->security = true; +if ( !$serendipity['production'] ) { + $serendipity['smarty']->force_compile = true; + $serendipity['smarty']->debugging = true; +} +$serendipity['smarty']->template_dir = dirname(serendipity_getTemplateFile('index.tpl', 'serendipityPath')); +$serendipity['smarty']->compile_dir = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE; +$serendipity['smarty']->config_dir = &$serendipity['smarty']->template_dir; +$serendipity['smarty']->secure_dir = array($serendipity['smarty']->template_dir); +$serendipity['smarty']->security = true; +$serendipity['smarty']->use_sub_dirs = false; +$serendipity['smarty']->compile_check = true; +$serendipity['smarty']->compile_id = &$serendipity['template']; $serendipity['smarty']->register_modifier('makeFilename', 'serendipity_makeFilename'); $serendipity['smarty']->register_modifier('xhtml_target', 'serendipity_xhtml_target'); @@ -237,5 +244,7 @@ $serendipity['smarty']->register_modifier('printf', 'serendipity_printf'); $serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime'); +serendipity_plugin_api::hook_event('frontend_configure', $serendipity); + /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v retrieving revision 1.35 retrieving revision 1.35.2.1 diff -u -d -r1.35 -r1.35.2.1 --- serendipity_functions_installer.inc.php 30 Aug 2004 09:29:23 -0000 1.35 +++ serendipity_functions_installer.inc.php 9 Sep 2004 16:41:31 -0000 1.35.2.1 @@ -485,6 +485,15 @@ $errs[] = sprintf(DIRECTORY_RUN_CMD , 'chmod go+rws', $_POST['serendipityPath'] . $_POST['uploadPath']); } + // Attempt to create the template compile directory, it might already be there, but we just want to be sure + if (!is_dir($_POST['serendipityPath'] . PATH_SMARTY_COMPILE) && @mkdir($_POST['serendipityPath'] . PATH_SMARTY_COMPILE, $umask) !== true) { + $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . PATH_ARCHIVES); + $errs[] = sprintf(DIRECTORY_RUN_CMD , 'mkdir' , $_POST['serendipityPath'] . PATH_SMARTY_COMPILE); + $errs[] = sprintf(DIRECTORY_RUN_CMD , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_SMARTY_COMPILE); + } elseif (is_dir($_POST['serendipityPath'] . PATH_SMARTY_COMPILE) && @chmod($_POST['serendipityPath'] . PATH_SMARTY_COMPILE, $umask) !== true) { + $errs[] = sprintf(DIRECTORY_RUN_CMD , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_SMARTY_COMPILE); + } + // Attempt to create the archives directory if (!is_dir($_POST['serendipityPath'] . PATH_ARCHIVES) && @mkdir($_POST['serendipityPath'] . PATH_ARCHIVES, $umask) !== true) { $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . PATH_ARCHIVES); |
|
From: Garvin H. <gar...@us...> - 2004-09-09 15:15:08
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2770 Modified Files: Tag: branch-smarty NEWS Log Message: hooray for smarties Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214 retrieving revision 1.214.2.1 diff -u -d -r1.214 -r1.214.2.1 --- NEWS 9 Sep 2004 11:17:27 -0000 1.214 +++ NEWS 9 Sep 2004 15:14:59 -0000 1.214.2.1 @@ -1,5 +1,10 @@ # $Id$ +Version 0.8 () +------------------------------------------------------------------------ + + * Added support for SMARTY templating. (garvinhicking, tomsommer) + Version 0.7 () ------------------------------------------------------------------------ |
|
From: Garvin H. <gar...@us...> - 2004-09-09 15:02:28
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv533 Modified Files: Tag: branch-smarty serendipity_functions.inc.php serendipity_genpage.inc.php index.php serendipity_config.inc.php Log Message: initial smarty work Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93 retrieving revision 1.93.2.1 diff -u -d -r1.93 -r1.93.2.1 --- serendipity_config.inc.php 6 Sep 2004 10:08:55 -0000 1.93 +++ serendipity_config.inc.php 9 Sep 2004 15:02:15 -0000 1.93.2.1 @@ -9,7 +9,7 @@ define('IS_installed', file_exists('serendipity_config_local.inc.php')); -if ( IS_installed === true ) { +if (IS_installed === true) { define('IN_serendipity', true); } @@ -220,7 +220,22 @@ $serendipity['mailheaders'] = 'X-Mailer: Serendipity/'. $serendipity['version'] . "\n" . 'X-Engine: PHP/'. phpversion(); + +define('SMARTY_DIR', $serendipity['serendipityPath'] . 'bundled-libs/Smarty/libs/'); +require_once SMARTY_DIR . 'Smarty.class.php'; +$serendipity['smarty'] = new Smarty; serendipity_plugin_api::hook_event('frontend_configure', $serendipity); +$serendipity['smarty']->template_dir = dirname(serendipity_getTemplateFile('index.tpl', 'serendipityPath')); +$serendipity['smarty']->compile_dir = $serendipity['serendipityPath'] . 'templates_c'; +$serendipity['smarty']->config_dir =& $serendipity['smarty']->template_dir; +$serendipity['smarty']->secure_dir =& $serendipity['smarty']->template_dir; +$serendipity['smarty']->security = true; + +$serendipity['smarty']->register_modifier('makeFilename', 'serendipity_makeFilename'); +$serendipity['smarty']->register_modifier('xhtml_target', 'serendipity_xhtml_target'); +$serendipity['smarty']->register_modifier('emptyPrefix', 'serendipity_emptyPrefix'); +$serendipity['smarty']->register_modifier('printf', 'serendipity_printf'); +$serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime'); /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_genpage.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v retrieving revision 1.33 retrieving revision 1.33.2.1 diff -u -d -r1.33 -r1.33.2.1 --- serendipity_genpage.inc.php 27 Jul 2004 21:02:17 -0000 1.33 +++ serendipity_genpage.inc.php 9 Sep 2004 15:02:15 -0000 1.33.2.1 @@ -1,52 +1,59 @@ <?php # $Id$ -if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) { - // serendipity is embedded into an existing structure. No need to output headers then. - if ($serendipity['XHTML11']) { -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd"> -<?php - } else { -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<?php - } -?> -<html> -<head> - <title><?php echo htmlspecialchars($serendipity['blogTitle']) . (isset($serendipity['blogSubTitle']) ? ' - '. htmlspecialchars($serendipity['blogSubTitle']) : '') ?></title> - <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" /> - <meta name="Powered-By" content="Serendipity v.<?php echo $serendipity['version'] ?>" /> - <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" /> - <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/index.rss2" /> - <link rel="alternate" type="application/x.atom+xml" title="Atom" href="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/atom.xml" /> -<?php if (strtolower($serendipity['extCSS'])!='none') { ?> - <style type="text/css">@import "<?php echo $serendipity['extCSS']; ?>";</style> -<?php } - if (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) { ?> - <link rel="pingback" href="<?php echo $serendipity['baseURL']; ?>comment.php?type=pingback&entry_id=<?php echo $serendipity['GET']['id']; ?>" /> -<?php } ?> -<?php serendipity_plugin_api::hook_event('frontend_header', $serendipity); ?> -</head> - -<body> -<?php -} // end if (is serendipity embedded?) - else { - serendipity_plugin_api::hook_event('frontend_header', $serendipity); -} - include_once('serendipity_config.inc.php'); include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php'); include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php'); -include_once(serendipity_getTemplateFile('layout.php', 'serendipityPath')); -if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) { -?> -</body> -</html> -<?php +$serendipity['smarty_file'] = 'index.tpl'; + +if (file_exists($serendipity['smarty']->template_dir . '/layout.php')) { + $serendipity['smarty_raw_mode'] = true; +} else { + $serendipity['smarty_raw_mode'] = false; +} + +$serendipity['smarty']->assign( + array( + 'head_title' => htmlspecialchars($serendipity['blogTitle']) . (isset($serendipity['blogSubTitle']) ? ' - '. htmlspecialchars($serendipity['blogSubTitle']) : ''), + 'head_charset' => LANG_CHARSET, + 'head_version' => $serendipity['version'], + 'CONST' => get_defined_constants(), + + 'is_xhtml' => $serendipity['XHTML11'], + 'is_popup' => $serendipity['enablePopup'], + 'is_embedded' => (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) ? false : true, + 'is_raw_mode' => $serendipity['smarty_raw_mode'], + + 'entry_id' => (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) ? $serendipity['GET']['id'] : false, + + 'blogTitle' => htmlspecialchars($serendipity['blogTitle']), + 'blogSubTitle' => htmlspecialchars($serendipity['blogSubTitle']), + 'blogDescription' => htmlspecialchars($serendipity['blogDescription']), + + 'serendipityHTTPPath' => $serendipity['serendipityHTTPPath'], + 'serendipityBaseURL' => $serendipity['baseURL'], + 'serendipityRewritePrefix' => $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '', + 'serendipityIndexFile' => $serendipity['indexFile'] + ) +); + +ob_start(); +serendipity_plugin_api::hook_event('frontend_header', $serendipity); +$serendipity['smarty']->assign('plugin_frontend_header', ob_get_contents()); +ob_end_clean(); + +if ($serendipity['smarty_raw_mode']) { + // Fallback support using s9y_raw_data + include_once(serendipity_getTemplateFile('layout.php', 'serendipityPath')); +} else { + // Use new Smarty driven templating + // Watchout: Included files from within the templates need to be fetched in reverse order! + include_once(serendipity_getTemplateFile('smarty_layout.php', 'serendipityPath')); + serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl'); + serendipity_smarty_fetch('COMMENTS', 'comments.tpl'); + serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl'); + serendipity_smarty_fetch('ENTRIES', 'entries.tpl'); + serendipity_smarty_fetch('CONTENT', 'content.tpl'); } + /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419 retrieving revision 1.419.2.1 diff -u -d -r1.419 -r1.419.2.1 --- serendipity_functions.inc.php 9 Sep 2004 10:52:02 -0000 1.419 +++ serendipity_functions.inc.php 9 Sep 2004 15:02:14 -0000 1.419.2.1 @@ -209,76 +209,36 @@ function serendipity_displayCommentForm($id, $url = '', $comments = NULL, $data = NULL, $showToolbar = true, $moderate_comments = true) { global $serendipity; - if ( $comments == NULL ) { + if ($comments == NULL) { $comments = serendipity_fetchComments($id); } -?> -<div class="serendipityCommentForm"> - <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_CommentForm"></a> - <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>" method="post"> - <div><input type="hidden" name="serendipity[entry_id]" value="<?php echo $id; ?>" /></div> - <table border="0" width="100%" cellpadding="3"> - <tr> - <td class="serendipity_commentsLabel"><?php echo NAME; ?></td> - <td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="<?php echo (isset($data['name']) ? $data['name'] : (isset($serendipity['COOKIE']['name']) ? $serendipity['COOKIE']['name'] : '')); ?>" size="30" /></td> - </tr> - - <tr> - <td class="serendipity_commentsLabel"><?php echo EMAIL; ?></td> - <td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="<?php echo (isset($data['email']) ? $data['email'] : (isset($serendipity['COOKIE']['email']) ? $serendipity['COOKIE']['email'] : '')); ?>" /></td> - </tr> - - <tr> - <td class="serendipity_commentsLabel"><?php echo HOMEPAGE; ?></td> - <td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="<?php echo (isset($data['url']) ? $data['url'] : (isset($serendipity['COOKIE']['url']) ? $serendipity['COOKIE']['url'] : '')); ?>" /></td> - </tr> + ob_start(); + serendipity_plugin_api::hook_event('frontend_comment', $nullParam); + $data['frontend_comment'] = ob_get_contents(); + ob_end_clean(); - <tr> - <td class="serendipity_commentsLabel"><?php echo IN_REPLY_TO; ?></td> - <td class="serendipity_commentsValue"><?php echo serendipity_generateCommentList($id, $comments, ((isset($data['replyTo']) && ($data['replyTo'])) ? $data['replyTo'] : 0)); ?></td> - </tr> + $serendipity['smarty']->assign( + array( + 'commentform_url' => $url, + 'commentform_id' => $id, + 'commentform_name' => isset($data['name']) ? $data['name'] : (isset($serendipity['COOKIE']['name']) ? $serendipity['COOKIE']['name'] : ''), + 'commentform_email' => isset($data['email']) ? $data['email'] : (isset($serendipity['COOKIE']['email']) ? $serendipity['COOKIE']['email'] : ''), + 'commentform_url' => isset($data['url']) ? $data['url'] : (isset($serendipity['COOKIE']['url']) ? $serendipity['COOKIE']['url'] : ''), + 'commentform_remember' => isset($data['remember']) ? 'checked="checked"' : (isset($serendipity['COOKIE']['remember']) ? $serendipity['COOKIE']['remember'] : ''), + 'commentform_replyTo' => serendipity_generateCommentList($id, $comments, ((isset($data['replyTo']) && ($data['replyTo'])) ? $data['replyTo'] : 0)), + 'commentform_subscribe' => isset($data['subscribe']) ? 'checked="checked"' : '', + 'commentform_data' => isset($data['comment']) ? $data['comment'] : '', + 'plugin_frontend_comment' => $data['frontend_comment'], + 'is_commentform_showToolbar' => $showToolbar, + 'is_allowSubscriptions' => $serendipity['allowSubscriptions'], + 'is_moderate_comments' => $moderate_comments + ) + ); - <tr> - <td class="serendipity_commentsLabel"><?php echo COMMENT; ?></td> - <td class="serendipity_commentsValue"> - <textarea rows="10" cols="40" name="serendipity[comment]"><?php echo (isset($data['comment']) ? $data['comment'] : ''); ?></textarea><br /> - <?php serendipity_plugin_api::hook_event('frontend_comment', $nullParam); ?> - </td> - </tr> -<?php if ( $showToolbar ) { ?> - <tr> - <td> </td> - <td class="serendipity_commentsLabel"> - <input id="checkbox_remember" type="checkbox" name="serendipity[remember]" <?php echo (isset($data['remember']) ? 'checked="checked"' : isset($serendipity['COOKIE']['remember']) ? $serendipity['COOKIE']['remember'] : '') ; ?> /><label for="checkbox_remember"> <?php echo REMEMBER_INFO; ?></label> -<?php - if ($serendipity['allowSubscriptions']) { -?> - <br /> - <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" <?php echo (isset($data['subscribe']) ? 'checked="checked"' : ''); ?> /><label for="checkbox_subscribe"> <?php echo SUBSCRIBE_TO_THIS_ENTRY; ?></label> -<?php - } -?> -<?php } ?> - </td> - </tr> -<?php - if ($moderate_comments==true) { -?> - <tr> - <td class="serendipity_commentsValue serendipity_msg_important" colspan="2"><?php echo COMMENTS_WILL_BE_MODERATED ?></td> - </tr> -<?php - } -?> - <tr> - <td> </td> - <td><input type="submit" name="serendipity[submit]" value="<?php echo SUBMIT_COMMENT; ?>" /> <input type="submit" name="serendipity[preview]" value="<?php echo PREVIEW; ?>" /></td> - </tr> - </table> - </form> -</div> -<?php + if ($serendipity['smarty_raw_mode']) { + $serendipity['smarty']->display(serendipity_getTemplateFile('commentform.tpl', 'serendipityPath')); + } } function serendipity_setCookie($name,$value) { @@ -1100,30 +1060,22 @@ if (!isset($serendipity['GET']['page'])) { $serendipity['GET']['page'] = 1; } - } -?> -<div class='serendipity_entryFooter' style="text-align: center"> -<?php - if (!$short_output) { + if ($serendipity['GET']['page'] > 1) { -?> -<a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] - 1) . $add_query; ?>">« <?php echo PREVIOUS_PAGE; ?></a> -<?php + $serendipity['smarty']->assign('footer_prev_page', $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] - 1) . $add_query); } -?> -(<?php printf(PAGE_BROWSE_ENTRIES, $serendipity['GET']['page'], $totalPages, $totalEntries); ?>) -<?php + + $serendipity['smarty']->assign('footer_info', sprintf(PAGE_BROWSE_ENTRIES, $serendipity['GET']['page'], $totalPages, $totalEntries)); + if ($serendipity['GET']['page'] < $totalPages) { -?> - <a href="<?php echo $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query; ?>"><?php echo NEXT_PAGE; ?> »</a> -<?php + $serendipity['smarty']->assign('footer_next_page', $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query); } } + ob_start(); serendipity_plugin_api::hook_event('entries_footer', $serendipity); -?> -</div> -<?php + $serendipity['smarty']->assign('plugin_entries_footer', ob_get_contents()); + ob_end_clean(); } /** @@ -1139,131 +1091,78 @@ return; // no display of this item } - /* pre-walk the array to collect them keyed by date */ - $bydate = array(); if (!is_array($entries) || $entries[0] == false || !isset($entries[0]['timestamp'])) { - echo '<br />' . NO_ENTRIES_TO_PRINT . "\n"; + $serendipity['smarty']->assign('content_message', '<br />' . NO_ENTRIES_TO_PRINT); return; } - $lastDate = ''; + /* pre-walk the array to collect them keyed by index. Retouch the array for Smarty section + logic. It needs to walk on numerical arrays, so we can now longer use an associative + index holding a date string. So we now see which entries are made on the same date ($ts) + and then create a referring array $dateref which tells s9y that 20040918 is index 0, 20040917 is + index 1 and so on, so that the key can later be reconstracted in the smarty loop. */ + $bydate = array(); + $dateref = array(); + $dateseen = array(); + $datekey = -1; for ($x = 0, $num_entries = count($entries); $x < $num_entries; $x++) { - $d = serendipity_formatTime(DATE_FORMAT_ENTRY, $entries[$x]['timestamp']); - $bydate[$d][] = $entries[$x]; - } + $ts = date('Ymd', $entries[$x]['timestamp']); - if (!isset($serendipity['short_archives']) || !$serendipity['short_archives']) { - foreach ($bydate as $date => $ents) { -?> + if (!isset($dateseen[$ts])) { + // No entries existing for the same timestamp. Increment to the next numerical index + $datekey++; + } - <div class="serendipity_Entry_Date"> - <h3 class="serendipity_date"><?php echo $date; ?></h3> + $bydate[$datekey][] =& $entries[$x]; + $dateseen[$ts] = true; + $dateref[$datekey] = $entries[$x]['timestamp']; + } -<?php - foreach ($ents as $x => $entry) { - $entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath'); + if (!isset($serendipity['short_archives']) || !$serendipity['short_archives']) { + foreach($bydate AS $date => $ents) { + foreach($ents AS $x => $_entry) { + $entry = &$bydate[$date][$x]; serendipity_plugin_api::hook_event('frontend_display', $entry); - $html_extended = ''; - $extended_css = 'serendipity_entry_body_folded'; + $entry['entryLink'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath'); + $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL'); + $entry['title'] = htmlspecialchars($entry['title']); + $entry['extended_css'] = 'serendipity_entry_body_folded'; + $entry['commURL'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); + if ($extended && strlen($entry['extended'])) { - $html_extended = '<div class="serendipity_entry_extended"><a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>'; - $html_extended .= $entry['extended'] . '</div>'; - $extended_css = 'serendipity_entry_body_unfolded'; + $entry['is_extended'] = true; + $entry['extended_css'] = 'serendipity_entry_body_unfolded'; } if (isset($entry['exflag']) && $entry['exflag'] && !$extended) { - $html_extended = '<br /><a href="' . $entryLink . '#extended">' . sprintf(VIEW_EXTENDED_ENTRY, htmlspecialchars($entry['title'])) . '</a><br /><br />'; - } - -?> - <h4 class="serendipity_title"><a href="<?php echo $entryLink; ?>"><?php echo htmlspecialchars($entry['title']); ?></a></h4> - - <div class="serendipity_entry"> -<?php - if (is_array($entry['categories'])) { - $icon_string = ''; - foreach ($entry['categories'] as $cat) { - if ($cat['category_icon'] != '') { - $icon_string .= '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . serendipity_makeFilename($cat['category_name']) . '"><img class="serendipity_entryIcon" title="' . htmlspecialchars($cat['category_name']) . (!empty($cat['category_description']) ? ': ' . htmlspecialchars($cat['category_description']) : '') . '" alt="' . htmlspecialchars($cat['category_name']) . '" src="' . htmlspecialchars($cat['category_icon']) . '"/></a>'; - } - } - if ($icon_string != '') { - echo '<span class="serendipity_entryIcon">' . $icon_string . '</span>'; - } - } -?> - <div class="<?php echo $extended_css; ?>"><?php echo $entry['body']; ?></div> - <?php echo $html_extended; ?> - - <div class='serendipity_entryFooter'> -<?php - echo ' ' . POSTED_BY . ' ' . htmlspecialchars($entry['username']); - if (is_array($entry['categories']) && sizeof($entry['categories']) > 0) { - echo ' ' . IN . ' '; - $cats = array(); - foreach ($entry['categories'] as $cat) { - $cats[] = '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . serendipity_makeFilename($cat['category_name']) . '">' . $cat['category_name'] . '</a>'; - } - echo implode(', ', $cats); + $entry['is_extended_link'] = true; } - echo ' ' . AT . ' <a href="' . $entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n"; - - if (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['comments'] > 0) { - if (!isset($serendipity['GET']['id'])) { - $label = $entry['comments'] == 1 ? COMMENT : COMMENTS; - if ($serendipity['enablePopup']) { - $uriExtra = ' onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;"'; - $commentUri = $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&serendipity[type]=comments'; - } else { - $uriExtra = ''; - $commentUri = $entryLink .'#comments'; - } - echo ' | <a href="' . $commentUri . '"' . $uriExtra . '>' . $label . ' (' . $entry['comments'] . ')</a>'; - } + if (!isset($serendipity['GET']['id']) && (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['comments'] > 0)) { + $entry['is_comments'] = true; + $entry['comments_label'] = $entry['comments'] == 1 ? COMMENT : COMMENTS; } - if (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['trackbacks'] > 0 ) { - if ( $serendipity['enablePopup'] || !isset($serendipity['GET']['id'])) { - $label = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS; - if ($serendipity['enablePopup']) { - $uriExtra = ' onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;"'; - $trackbackUri = $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&serendipity[type]=trackbacks'; - } else { - $uriExtra = ''; - $trackbackUri = $entryLink .'#trackbacks'; - } - - echo ' | <a href="' . $trackbackUri .'"'. $uriExtra . '>' . $label . ' (' . $entry['trackbacks'] . ')</a>'; - } + if (!isset($serendipity['GET']['id']) && (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['trackbacks'] > 0)) { + $entry['is_trackbacks'] = true; + $entry['trackbacks_label'] = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS; } if ($_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $entry['authorid'])) { - echo ' | <a href="' . $serendipity['baseURL'] . 'serendipity_entries.php?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]=' . $entry['id'] . '">' . EDIT_ENTRY . '</a>'; + $entry['is_owner'] = true; } - if (!empty($entry['add_footer'])) { - echo $entry['add_footer']; - } -?> - </div> - </div> - <!-- - <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - <rdf:Description - rdf:about="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/ei_<?php echo $entry['id']; ?>.rdf" - trackback:ping="<?php echo $serendipity['baseURL']; ?>comment.php?type=trackback&entry_id=<?php echo $entry['id']; ?>" - dc:title="<?php echo htmlspecialchars($entry['title']); ?>" - dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL'); ?>" /> - </rdf:RDF> - --> -<?php $eventData = array_merge(array('display_dat' => ''), $entry); serendipity_plugin_api::hook_event('frontend_display:html:per_entry', $eventData); - echo $eventData['display_dat']; + $entry['plugin_display_dat'] = $eventData['display_dat']; + + if ($preview) { + ob_start(); + serendipity_plugin_api::hook_event('backend_preview', $entry); + $entry['backend_preview'] = ob_get_contents(); + ob_end_clean(); + } if (isset($serendipity['GET']['id'])) { $comm_url = serendipity_archiveURL( @@ -1273,60 +1172,13 @@ false ); - /********** MESSAGES *********/ - if (defined('DATA_UNSUBSCRIBED')) { - echo '<br /><div class="serendipity_center serendipity_msg_notice">'. sprintf(UNSUBSCRIBE_OK, DATA_UNSUBSCRIBED) .'</div><br />'; - } - - if (defined('DATA_TRACKBACK_DELETED')) { - echo '<br /><div class="serendipity_center serendipity_msg_notice">'. sprintf(TRACKBACK_DELETED, DATA_TRACKBACK_DELETED) .'</div><br />'; - } - - if (defined('DATA_TRACKBACK_APPROVED')) { - echo '<br /><div class="serendipity_center serendipity_msg_notice">'. sprintf(TRACKBACK_APPROVED, DATA_TRACKBACK_APPROVED) .'</div><br />'; - } - - if (defined('DATA_COMMENT_DELETED')) { - echo '<br /><div class="serendipity_center serendipity_msg_notice">'. sprintf(COMMENT_DELETED, DATA_COMMENT_DELETED) .'</div><br />'; - } - - if (defined('DATA_COMMENT_APPROVED')) { - echo '<br /><div class="serendipity_center serendipity_msg_notice">'. sprintf(COMMENT_APPROVED, DATA_COMMENT_APPROVED) .'</div><br />'; - } - - - if (!$serendipity['enablePopup']) { - $tbu = $serendipity['baseURL'] . 'comment.php?type=trackback&entry_id=' . $entry['id']; -?> - <div class="serendipity_comments"> - <br /> - <a id="trackbacks"></a> - <div class="serendipity_commentsTitle"><?php echo TRACKBACKS; ?></div> - <div class="serendipity_center"><a style="font-weight: normal" href="<?php echo $tbu; ?>" onclick="alert('<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>'); return false;" title="<?php echo htmlentities(TRACKBACK_SPECIFIC_ON_CLICK) ?>"><?php echo TRACKBACK_SPECIFIC; ?></a></div><br /> -<?php - serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id'])); -?> - </div> -<?php } ?> - <div class="serendipity_comments"> - <br /> - <a id="comments"></a> - <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div> - <?php - $comment_viewmode_url = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url . '&serendipity[cview]='; - if ( $serendipity['GET']['cview'] == VIEWMODE_LINEAR ) { - $linearLink = COMMENTS_VIEWMODE_LINEAR; - $threadLink = '<a href="'. $comment_viewmode_url . VIEWMODE_THREADED .'#comments">'. COMMENTS_VIEWMODE_THREADED .'</a>'; - $viewmode = VIEWMODE_LINEAR; - } else { - $linearLink = '<a href="'. $comment_viewmode_url . VIEWMODE_LINEAR .'#comments">'. COMMENTS_VIEWMODE_LINEAR .'</a>'; - $threadLink = COMMENTS_VIEWMODE_THREADED; - $viewmode = VIEWMODE_THREADED; - } + serendipity_printTrackbacks( + serendipity_fetchTrackbacks( + $entry['id'] + ) + ); - ?> - <div class="serendipity_center"><?php echo DISPLAY_COMMENTS_AS ?> (<?php echo $linearLink ?> | <?php echo $threadLink ?>)</div> -<?php + ob_start(); // TODO: Remove recursion serendipity_printComments( serendipity_fetchComments( $entry['id'] @@ -1353,52 +1205,34 @@ $serendipity['POST']['replyTo'] ); } + $serendipity['smarty']->assign('comments_list', ob_get_contents()); + ob_end_clean(); - if (isset($serendipity['messagestack']['comments'])) { - foreach ((array)$serendipity['messagestack']['comments'] as $message ) { -?> - <div class="serendipity_center serendipity_msg_important"><?php echo $message ?></div> -<?php - } - } - - if (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true') { -?> - <br /> - <div class="serendipity_center serendipity_msg_notice"><?php echo COMMENT_ADDED; ?></div> -<?php - } elseif (!serendipity_db_bool($entry['allow_comments'])) { -?> - <br /> - <div class="serendipity_center serendipity_msg_important"><?php echo COMMENTS_CLOSED; ?></div> -<?php + if ($serendipity['GET']['cview'] == VIEWMODE_LINEAR) { + $serendipity['smarty']->assign('is_cview_linear', true); } else { -?> - <br /> - <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div> -<?php - echo serendipity_displayCommentForm( - $entry['id'], - $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url, - true, - $serendipity['POST'], - true, - serendipity_db_bool($entry['moderate_comments']) - ); + $serendipity['smarty']->assign('is_cview_linear', false); } -?> - </div> -<?php - } -?> -<?php - if ($preview) { - serendipity_plugin_api::hook_event('backend_preview', $article); + + $serendipity['smarty']->assign( + array( + 'is_cview_linear' => ($serendipity['GET']['cview'] == VIEWMODE_LINEAR ? true : false), + 'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : false), + 'is_comment_added' => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true' ? true: false), + 'is_comment_closed' => (!serendipity_db_bool($entry['allow_comments']) ? true : false) + ) + ); + + serendipity_displayCommentForm( + $entry['id'], + $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url, + true, + $serendipity['POST'], + true, + serendipity_db_bool($entry['moderate_comments']) + ); } } // end for-loop (entries) -?> - </div> -<?php } // end for-loop (dates) if (!isset($serendipity['GET']['id']) && @@ -1409,17 +1243,35 @@ serendipity_printEntryFooter(true); } } else { // else short mode - $s = &$serendipity['GET']['range']; -?> - <div class='serendipity_date'><?php echo TOPICS_OF . ' ' . date('m/Y', mktime(0, 0, 0, substr($s, 4, 2), 1, substr($s, 0, 4))); ?></div> -<?php - foreach ($bydate as $date => $ents) { - foreach ($ents as $x => $entry) { - echo '<a href="' . serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath') . '">' . $entry['title'] . '</a>' . "\n"; - echo '<br />' . "\n"; + foreach($bydate AS $date => $ents) { + foreach($ents AS $x => $_entry) { + $entry = &$bydate[$date][$x]; + $entry['entryLink'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath'); } } + + $s = &$serendipity['GET']['range']; + $serendipity['smarty']->assign( + array( + 'is_short_mode' => true, + 'short_timestamp' => mktime(0, 0, 0, substr($s, 4, 2), 1, substr($s, 0, 4)) + ) + ); } // end else short mode + + $serendipity['smarty']->assign( + array( + 'bydate' => $bydate, + 'dateref' => $dateref + ) + ); + + if ($serendipity['smarty_raw_mode']) { + serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl'); + serendipity_smarty_fetch('COMMENTS', 'comments.tpl'); + serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl'); + $serendipity['smarty']->display(serendipity_getTemplateFile('entries.tpl', 'serendipityPath')); + } } // end function serendipity_printEntries function serendipity_deleteComment($id, $entry_id, $type='comments') @@ -1561,6 +1413,7 @@ return $retval; } +/*TODO: Don't know how to get recursion done with Smarty in a smarty way.*/ function serendipity_printComments($comments, $allow_comments = true, $show_admin = true, $parentid = 0, $indent = '') { global $serendipity; @@ -1666,37 +1519,18 @@ { global $serendipity; - if (!count($comments)) { -?> - <div class="serendipity_center"><?php echo NO_TRACKBACKS; ?></div> -<?php + if (count($comments)) { + $serendipity['smarty']->assign('is_trackbacks_owner', ($_SESSION["serendipityAuthedUser"] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment[0]['authorid'])) ? true : false); + $serendipity['smarty']->assign('trackbacks', $comments); + } else { + $serendipity['smarty']->assign('trackbacks', false); } - foreach ($comments as $comment) { - $link = empty($comment['url']) ? $comment['email'] : $comment['url']; - $name = empty($comment['author']) ? 'Anonymous' : $comment['author']; - $title= strip_tags($comment['title']); -?> - <div class="serendipity_comment"> - <a href="<?php echo strip_tags($link); ?>" <?php echo serendipity_xhtml_target('_blank'); ?>><?php echo $title; ?></a><br /> - <b><?php echo EXCERPT; ?>: </b> - <?php echo htmlspecialchars(strip_tags($comment['body'])); ?><br /> - <div class="serendipity_comment_source"> - <b>Weblog: </b> <?php echo strip_tags($name); ?><br /> - <b><?php echo TRACKED; ?>: </b> <?php echo date('M d, h:i', $comment['timestamp']); ?> -<?php - if ($_SESSION["serendipityAuthedUser"] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) { - echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&serendipity[entry]=' . $comment['entry_id'] . '&serendipity[type]=trackbacks">' . DELETE . '</a>)'; - } -?> - </div> - </div> - <br /> -<?php + if ($serendipity['smarty_raw_mode']) { + $serendipity['smarty']->display(serendipity_getTemplateFile('trackbacks.tpl', 'serendipityPath')); } } - function serendipity_approveComment($cid, $entry_id, $force = false) { global $serendipity; @@ -1767,7 +1601,7 @@ $query .= " VALUES ('$id', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe', '$status')"; serendipity_db_query($query); - $cid = serendipity_db_insert_id('comments', 'id'); + $cid = serendipity_db_insert_id(); $query = "SELECT a.email, e.title, a.mail_comments, a.mail_trackbacks, e.moderate_comments FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a @@ -2576,18 +2410,17 @@ if (!$_SESSION['serendipityRightPublish']) { $entry['isdraft'] = 'true'; } - - if(!isset($entry['allow_comments'])){ - $entry['allow_comments']='false'; - } - if(!isset($entry['moderate_comments'])){ - $entry['moderate_comments']='false'; - } + if(!isset($entry['allow_comments'])){ + $entry['allow_comments']='false'; + } + if(!isset($entry['moderate_comments'])){ + $entry['moderate_comments']='false'; + } $res = serendipity_db_insert('entries', $entry); if ($res) { - $entry['id'] = serendipity_db_insert_id('entries', 'id'); + $entry['id'] = serendipity_db_insert_id(); if (is_array($categories)) { foreach ($categories as $cat) { if (is_numeric($cat)) @@ -3583,6 +3416,38 @@ } } +function serendipity_smarty_fetch($block, $file) { +global $serendipity; + $serendipity['smarty']->assign( + $block, + $serendipity['smarty']->fetch( + 'file:'. serendipity_getTemplateFile($file, 'serendipityPath'), + null, + 'static' + ) + ); +} + +function serendipity_emptyPrefix($string, $prefix = ': ') { + return (!empty($string) ? $prefix . htmlspecialchars($string) : ''); +} + +function serendipity_printf($data, $constant) { + if (defined($constant)) { + return sprintf(constant($constant), $data); + } else { + return sprintf($constant, $data); + } +} + +function serendipity_smarty_formatTime($timestamp, $format) { + if (defined($format)) { + return serendipity_formatTime(constant($format), $timestamp); + } else { + return serendipity_formatTime($format, $timestamp); + } +} + define("serendipity_FUNCTIONS_LOADED", true); /* vim: set sts=4 ts=4 expandtab : */ ?> Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.49 retrieving revision 1.49.2.1 diff -u -d -r1.49 -r1.49.2.1 --- index.php 24 Aug 2004 17:32:45 -0000 1.49 +++ index.php 9 Sep 2004 15:02:15 -0000 1.49.2.1 @@ -6,6 +6,7 @@ // Session and serendipity_login() are needed to also remember an autologin // user on the frontend +ob_start(); session_start(); include_once('serendipity_config.inc.php'); serendipity_login(); @@ -176,7 +177,7 @@ } else if (preg_match(PAT_CATEGORIES, $uri, $matches) || preg_match('@/(index\.(php|html))?@', $uri) || preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) { - + if (count($serendipity['GET']) == 2) { if (isset($matches) && is_array($matches) && isset($matches[1])) { $serendipity['GET']['category'] = $matches[1]; @@ -211,5 +212,12 @@ serendipity_track_referrer(); } +$raw_data = ob_get_contents(); +ob_end_clean(); +$serendipity['smarty']->assign('raw_data', $raw_data); +if (empty($serendipity['smarty_file'])) { + $serendipity['smarty_file'] = '404.tpl'; +} +$serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath')); /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-09-09 15:00:55
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32695 Added Files: Tag: branch-smarty commentform.tpl comments.tpl content.tpl entries.tpl index.tpl smarty_layout.php trackbacks.tpl Removed Files: Tag: branch-smarty layout.php Log Message: added smarty template files --- NEW FILE: comments.tpl --- <!-- TODO: Remove recursion of serendipity_printEntries() :( --> {$comments_list} --- NEW FILE: commentform.tpl --- <div class="serendipityCommentForm"> <a id="serendipity_CommentForm"></a> <form id="serendipity_comment" action="{$commentform_url}" method="post"> <div><input type="hidden" name="serendipity[entry_id]" value="{$commentform_id}" /></div> <table border="0" width="100%" cellpadding="3"> <tr> <td class="serendipity_commentsLabel">{$CONST.NAME}</td> <td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="{$commentform_name}" size="30" /></td> </tr> <tr> <td class="serendipity_commentsLabel">{$CONST.EMAIL}</td> <td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="{$commentform_email}" /></td> </tr> <tr> <td class="serendipity_commentsLabel">{$CONST.HOMEPAGE}</td> <td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="{$commentform_url}" /></td> </tr> <tr> <td class="serendipity_commentsLabel">{$CONST.IN_REPLY_TO}</td> <td class="serendipity_commentsValue">{$commentform_replyTo}</td> </tr> <tr> <td class="serendipity_commentsLabel">{$CONST.COMMENT}</td> <td class="serendipity_commentsValue"> <textarea rows="10" cols="40" name="serendipity[comment]">{$commentform_data}</textarea><br /> {$plugin_frontend_comment} </td> </tr> {if $is_commentform_showToolbar} <tr> <td> </td> <td class="serendipity_commentsLabel"> <input id="checkbox_remember" type="checkbox" name="serendipity[remember]" {$commentform_remember} /><label for="checkbox_remember">{$CONST.REMEMBER_INFO}</label> {if $is_allowSubscriptions} <br /> <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" {$commentform_subscribe} /><label for="checkbox_subscribe"> {$CONST.SUBSCRIBE_TO_THIS_ENTRY}</label> {/if} </td> </tr> {/if} {if $is_moderate_comments} <tr> <td class="serendipity_commentsValue serendipity_msg_important" colspan="2">{$CONST.COMMENTS_WILL_BE_MODERATED}</td> </tr> {/if} <tr> <td> </td> <td><input type="submit" name="serendipity[submit]" value="{$CONST.SUBMIT_COMMENT}" /> <input type="submit" name="serendipity[preview]" value="{$CONST.PREVIEW}" /></td> </tr> </table> </form> </div> --- NEW FILE: entries.tpl --- <!-- ENTRIES START --> {if $is_short_mode} <div class='serendipity_date'>{$CONST.TOPICS_OF} {$short_timestamp|formatTime:DATE_FORMAT_ENTRY}</div> <div class="serendipity_entry"> {section name=date loop=$bydate} {section name=x loop=$bydate[date]} <a href="{$byedate[date][x].entryLink}">{$bydate[date][x].title}</a> <br /> {/section} {/section} </div> {else} {section name=date loop=$bydate} <div class="serendipity_Entry_Date"> <h3 class="serendipity_date">{$dateref[date]|formatTime:DATE_FORMAT_ENTRY}</h3> {section name=x loop=$bydate[date]} <h4 class="serendipity_title"><a href="{$bydate[date][x].entryLink}">{$bydate[date][x].title}</a></h4> <div class="serendipity_entry"> {if is_array($bydate[date][x][categories])} <span class="serendipity_entryIcon"> {section name=cat loop=$bydate[date][x][categories]} <a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$bydate[date][x][categories].categoryid}-{$bydate[date][x][categories].category_name|makeFilename}"><img class="serendipity_entryIcon" title="{$bydate[date][x][categories].category_name|escape}{$bydate[date][x][categories].category_description|emptyPrefix}" alt="{$bydate[date][x][categories].category_name|escape}" src="{$bydate[date][x][categories].category_icon}" /></a> {/section} </span> {/if} <div class="{$bydate[date][x].extended_css}"> {$bydate[date][x].body} </div> {if $bydate[date][x].is_extended} <div class="serendipity_entry_extended"><a id="extended"></a>{$bydate[date][x].extended}</div> {/if} {if $bydate[date][x].is_extended_link} <br /><a href="{$bydate[date][x].entryLink}#extended">{$bydate[date][x].title|printf:VIEW_EXTENDED_ENTRY}</a><br /><br /> {/if} <div class='serendipity_entryFooter'> {$CONST.POSTED_BY} {$bydate[date][x].username} {if is_array($bydate[date][x].categories)} {$CONST.IN} {section name=cat loop=$bydate[date][x].categories}<a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$bydate[date][x].categories[cat].categoryid}-{$bydate[date][x].categories[cat].category_name|makeFilename}">{$bydate[date][x].categories[cat].category_name|escape}</a> {/section} {/if} {$CONST.AT} <a href="{$bydate[date][x].entryLink}">{$bydate[date][x].timestamp|formatTime:'%H:%M'}</a> {if $bydate[date][x].is_comments} {if $is_popup} | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$bydate[date][x].id}&serendipity[type]=comments" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$bydate[date][x].comments_label} ({$bydate[date][x].comments})</a> {else} | <a href="{$bydate[date][x].entryLink}#comments">{$bydate[date][x].comments_label} ({$bydate[date][x].comments})</a> {/if} {/if} {if $bydate[date][x].is_trackbacks} {if $is_popup} | <a href="{$serendipityHTTPPath}comment.php?serendipity[entry_id]={$bydate[date][x].id}&serendipity[type]=trackbacks" onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">{$bydate[date][x].trackbacks_label} ({$bydate[date][x].trackbacks})</a> {else} | <a href="{$bydate[date][x].entryLink}#trackbacks">{$bydate[date][x].trackbacks_label} ({$bydate[date][x].trackbacks})</a> {/if} {/if} {if $bydate[date][x].is_owner} | <a href="{$serendipityBaseURL}serendipity_entries.php?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]={$bydate[date][x].id}">{$CONST.EDIT_ENTRY}</a> {/if} {$bydate[date][x].add_footer} </div> </div> <!-- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/" xmlns:dc="http://purl.org/dc/elements/1.1/"> <rdf:Description rdf:about="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/ei_{$bydate[date][x].id}.rdf" trackback:ping="{$serendipityBaseURL}comment.php?type=trackback&entry_id={$bydate[date][x].id}" dc:title="{$bydate[date][x].title}" dc:identifier="{$bydate[date][x].rdf_ident}" /> </rdf:RDF> --> {$bydate[date][x].plugin_display_dat} {if $CONST.DATA_UNSUBSCRIBED} <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|printf:UNSUBSCRIBE_OK}</div><br /> {/if} {if $CONST.DATA_TRACKBACK_DELETED} <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|printf:TRACKBACK_DELETED}</div><br /> {/if} {if $CONST.DATA_TRACKBACK_APPROVED} <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|printf:TRACKBACK_APPROVED}</div><br /> {/if} {if $CONST.DATA_COMMENT_DELETED} <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|printf:COMMENT_DELETED}</div><br /> {/if} {if $CONST.DATA_COMMENT_APPROVED} <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|printf:COMMENT_APPROVED}</div><br /> {/if} {if $entry_id and $is_popup != true} <div class="serendipity_comments"> <br /> <a id="trackbacks"></a> <div class="serendipity_commentsTitle">{$CONST.TRACKBACKS}</div> <div class="serendipity_center"> <a style="font-weight: normal" href="{$serendipityBaseURL}comment.php?type=trackback&entry_id={$entry_id}" onclick="alert('{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|escape:htmlall}'); return false;" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|escape}">{$CONST.TRACKBACK_SPECIFIC}</a> </div> <br /> {$TRACKBACKS} </div> </div> {/if} {if $entry_id} <div class="serendipity_comments"> <br /> <a id="comments"></a> <div class="serendipity_commentsTitle">{$CONST.COMMENTS}</div> <div class="serendipity_center">{$CONST.DISPLAY_COMMENTS_AS} {if $is_cview_linear} ({$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$bydate[date][x].commURL}&serendipity[cview]={$CONST.VIEWMODE_THREADED}#comments">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>) {else} (<a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$bydate[date][x].commURL}&serendipity[cview]={$CONST.VIEWMODE_LINEAR}#comments">{$CONST.COMMENTS_VIEWMODE_LINEAR}</a> | {$CONST.COMMENTS_VIEWMODE_THREADED}) {/if} </div> {$COMMENTS} {section name=message loop=$comments_messagestack} <div class="serendipity_center serendipity_msg_important">{$comments_messagestack[message]}</div> {/section} {if $is_comment_added} <br /> <div class="serendipity_center serendipity_msg_notice">{$CONST.COMMENT_ADDED}</div> {elseif $is_comment_closed} <br /> <div class="serendipity_center serendipity_msg_important">{$CONST.COMMENTS_CLOSED}</div> {else} <br /> <div class="serendipity_commentsTitle">{$CONST.ADD_COMMENT}</div> {$COMMENTFORM} {/if} </div> {/if} {$bydate[date][x].plugin_backend_preview} {/section} </div> {/section} <div class='serendipity_entryFooter' style="text-align: center"> {if $footer_prev_page} <a href="{$footer_prev_page}">« {$CONST.PREVIOUS_PAGE}</a> {/if} {if $footer_info} ({$footer_info}) {/if} {if $footer_next_page} <a href="{$footer_next_page}">» {$CONST.NEXT_PAGE}</a> {/if} {$plugin_entries_footer} </div> {/if} <!-- ENTRIES END --> --- layout.php DELETED --- --- NEW FILE: smarty_layout.php --- <?php # $Id: smarty_layout.php,v 1.1.2.1 2004/09/09 15:00:45 garvinhicking Exp $ include_once('serendipity_config.inc.php'); include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php'); include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php'); if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) { ob_start(); serendipity_plugin_api::generate_plugins('left', 'td'); $serendipity['smarty']->assign('left_sidebar', ob_get_contents()); ob_end_clean(); ob_start(); serendipity_plugin_api::generate_plugins('right', 'td'); $serendipity['smarty']->assign('right_sidebar', ob_get_contents()); ob_end_clean(); } if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) { $serendipity['GET']['range'] = date('Ymd'); } // The main area switch ($serendipity['GET']['action']) { // User wants to read the diary case 'read': if (isset($serendipity['GET']['id'])) { serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1); } else { serendipity_printEntries(serendipity_fetchEntries($serendipity['GET']['range'], true, 15)); } break; // User searches case 'search': $r = serendipity_searchEntries($serendipity['GET']['searchTerm']); if (strlen($serendipity['GET']['searchTerm']) <= 3) { $serendipity['smarty']->assign('content_message', SEARCH_TOO_SHORT); break; } if ($r === true) { $serendipity['smarty']->assign('content_message', sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm'])); break; } $serendipity['smarty']->assign('content_message', sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity['GET']['searchTerm'], count($r))); serendipity_printEntries($r); break; // Show the archive case 'archives': serendipity_printArchives(); break; // Welcome screen or whatever default: serendipity_printEntries(serendipity_fetchEntries(null, true, 15)); } ?> --- NEW FILE: index.tpl --- {if $is_xhtml} <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd"> {else} <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> {/if} {if $is_embedded != true} <html> <head> <title>{$head_title}</title> <meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" /> <meta name="Powered-By" content="Serendipity v.{$head_version}" /> <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}serendipity.css.php" /> <link rel="alternate" type="application/rss+xml" title="RSS" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" /> <link rel="alternate" type="application/x.atom+xml" title="Atom" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" /> {if $entry_id} <link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&entry_id={$entry_id}" /> {/if} {$plugin_frontend_header} </head> <body> {else} {$plugin_frontend_header} {/if} {if $is_raw_mode != true} <div id="serendipity_banner"> <h1><a class="homelink1" href="{$serendipityBaseURL}">{$blogTitle}</a></h1> {if $blogSubTitle} <h2><a class="homelink2" href="{$serendipityBaseURL}">{$blogSubTitle}</a></h2> {elseif $blogDescription} <h2><a class="homelink2" href="{$serendipityBaseURL}">{$blogDescription}</a></h2> {/if} </div> <table id="mainpane"> <tr> {$left_sidebar} <td id="content" valign="top">{$CONTENT}</td> {$right_sidebar} </tr> </table> {/if} {$raw_data} {if $is_embedded != true} </body> </html> {/if} --- NEW FILE: trackbacks.tpl --- {if $trackbacks == false} <div class="serendipity_center">{$CONST.NO_TRACKBACKS}</div> {/if} {section name=id loop=$comments} {if empty($comments[id].url)} {assign var="link" value=$comments[id].email} {else} {assign var="link" value=$comments[id].url} {/if} {if empty($comments[id].author)} {assign var="name" value=$CONST.ANONYMOUS} {else} {assign var="name" value=$comments[id].author} {/if} <div class="serendipity_comment"> <a href="{$link|strip_tags}" {'blank'|xhtml_target}>{$title}</a><br /> <b>{$CONST.EXCERPT}:</b> {$comments[id].body|strip_tags|escape:all}<br /> <div class="serendipity_comment_source"> <b>Weblog:</b> {$name|strip_tags}<br /> <b>{$CONST.TRACKED}:</b> {$comments[id].timestamp|formatTime:'%b %d, %H:%M'} {if $is_trackbacks_owner} (<a href="{$serendipityBaseURL}comment.php?serendipity[delete]={$comments[id].id}&serendipity[entry]={$comments[id].id}&serendipity[type]=trackbacks">{$CONST.DELETE}</a>) {/if} </div> </div> <br /> {/section} --- NEW FILE: content.tpl --- <!-- CONTENT START --> {$content_message} {$ENTRIES} <!-- CONTENT END --> |
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31275/Smarty/libs/core Added Files: Tag: branch-smarty core.assemble_plugin_filepath.php core.assign_smarty_interface.php core.create_dir_structure.php core.display_debug_console.php core.get_include_path.php core.get_microtime.php core.get_php_resource.php core.is_secure.php core.is_trusted.php core.load_plugins.php core.load_resource_plugin.php core.process_cached_inserts.php core.process_compiled_include.php core.read_cache_file.php core.rm_auto.php core.rmdir.php core.run_insert_handler.php core.smarty_include_php.php core.write_cache_file.php core.write_compiled_include.php core.write_compiled_resource.php core.write_file.php Log Message: added smarty libs --- NEW FILE: core.write_file.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * write out a file to disk * * @param string $filename * @param string $contents * @param boolean $create_dirs * @return boolean */ function smarty_core_write_file($params, &$smarty) { $_dirname = dirname($params['filename']); if ($params['create_dirs']) { $_params = array('dir' => $_dirname); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.create_dir_structure.php'); smarty_core_create_dir_structure($_params, $smarty); } // write to tmp file, then rename it to avoid // file locking race condition $_tmp_file = tempnam($_dirname, 'wrt'); if (!($fd = @fopen($_tmp_file, 'wb'))) { $_tmp_file = $_dirname . DIRECTORY_SEPARATOR . uniqid('wrt'); if (!($fd = @fopen($_tmp_file, 'wb'))) { $smarty->trigger_error("problem writing temporary file '$_tmp_file'"); return false; } } fwrite($fd, $params['contents']); fclose($fd); // Delete the file if it allready exists (this is needed on Win, // because it cannot overwrite files with rename() if (file_exists($params['filename'])) { @unlink($params['filename']); } @rename($_tmp_file, $params['filename']); @chmod($params['filename'], $smarty->_file_perms); return true; } /* vim: set expandtab: */ ?> --- NEW FILE: core.rmdir.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * delete a dir recursively (level=0 -> keep root) * WARNING: no tests, it will try to remove what you tell it! * * @param string $dirname * @param integer $level * @param integer $exp_time * @return boolean */ // $dirname, $level = 1, $exp_time = null function smarty_core_rmdir($params, &$smarty) { if(!isset($params['level'])) { $params['level'] = 1; } if(!isset($params['exp_time'])) { $params['exp_time'] = null; } if($_handle = @opendir($params['dirname'])) { while (false !== ($_entry = readdir($_handle))) { if ($_entry != '.' && $_entry != '..') { if (@is_dir($params['dirname'] . DIRECTORY_SEPARATOR . $_entry)) { $_params = array( 'dirname' => $params['dirname'] . DIRECTORY_SEPARATOR . $_entry, 'level' => $params['level'] + 1, 'exp_time' => $params['exp_time'] ); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rmdir.php'); smarty_core_rmdir($_params, $smarty); } else { $smarty->_unlink($params['dirname'] . DIRECTORY_SEPARATOR . $_entry, $params['exp_time']); } } } closedir($_handle); } if ($params['level']) { return @rmdir($params['dirname']); } return (bool)$_handle; } /* vim: set expandtab: */ ?> --- NEW FILE: core.get_php_resource.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Retrieves PHP script resource * * sets $php_resource to the returned resource * @param string $resource * @param string $resource_type * @param $php_resource * @return boolean */ function smarty_core_get_php_resource(&$params, &$smarty) { $params['resource_base_path'] = $smarty->trusted_dir; $smarty->_parse_resource_name($params, $smarty); /* * Find out if the resource exists. */ if ($params['resource_type'] == 'file') { $_readable = false; if(file_exists($params['resource_name']) && is_readable($params['resource_name'])) { $_readable = true; } else { // test for file in include_path $_params = array('file_path' => $params['resource_name']); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_include_path.php'); if(smarty_core_get_include_path($_params, $smarty)) { $_include_path = $_params['new_file_path']; $_readable = true; } } } else if ($params['resource_type'] != 'file') { $_template_source = null; $_readable = is_callable($smarty->_plugins['resource'][$params['resource_type']][0][0]) && call_user_func_array($smarty->_plugins['resource'][$params['resource_type']][0][0], array($params['resource_name'], &$_template_source, &$smarty)); } /* * Set the error function, depending on which class calls us. */ if (method_exists($smarty, '_syntax_error')) { $_error_funcc = '_syntax_error'; } else { $_error_funcc = 'trigger_error'; } if ($_readable) { if ($smarty->security) { require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.is_trusted.php'); if (!smarty_core_is_trusted($params, $smarty)) { $smarty->$_error_funcc('(secure mode) ' . $params['resource_type'] . ':' . $params['resource_name'] . ' is not trusted'); return false; } } } else { $smarty->$_error_funcc($params['resource_type'] . ':' . $params['resource_name'] . ' is not readable'); return false; } if ($params['resource_type'] == 'file') { $params['php_resource'] = $params['resource_name']; } else { $params['php_resource'] = $_template_source; } return true; } /* vim: set expandtab: */ ?> --- NEW FILE: core.get_include_path.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Get path to file from include_path * * @param string $file_path * @param string $new_file_path * @return boolean * @staticvar array|null */ // $file_path, &$new_file_path function smarty_core_get_include_path(&$params, &$smarty) { static $_path_array = null; if(!isset($_path_array)) { $_ini_include_path = ini_get('include_path'); if(strstr($_ini_include_path,';')) { // windows pathnames $_path_array = explode(';',$_ini_include_path); } else { $_path_array = explode(':',$_ini_include_path); } } foreach ($_path_array as $_include_path) { if (@is_readable($_include_path . DIRECTORY_SEPARATOR . $params['file_path'])) { $params['new_file_path'] = $_include_path . DIRECTORY_SEPARATOR . $params['file_path']; return true; } } return false; } /* vim: set expandtab: */ ?> --- NEW FILE: core.write_compiled_include.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Extract non-cacheable parts out of compiled template and write it * * @param string $compile_path * @param string $template_compiled * @return boolean */ function smarty_core_write_compiled_include($params, &$smarty) { $_tag_start = 'if \(\$this->caching\) \{ echo \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\';\}'; $_tag_end = 'if \(\$this->caching\) \{ echo \'\{/nocache\:(\\2)#(\\3)\}\';\}'; preg_match_all('!('.$_tag_start.'(.*)'.$_tag_end.')!Us', $params['compiled_content'], $_match_source, PREG_SET_ORDER); // no nocache-parts found: done if (count($_match_source)==0) return; // convert the matched php-code to functions $_include_compiled = "<?php /* funky header here */\n\n"; $_compile_path = $params['include_file_path']; $smarty->_cache_serials[$_compile_path] = $params['cache_serial']; $_include_compiled .= "\$this->_cache_serials['".$_compile_path."'] = '".$params['cache_serial']."';\n\n?>"; $_include_compiled .= $params['plugins_code']; $_include_compiled .= "<?php"; $this_varname = ((double)phpversion() >= 5.0) ? '_smarty' : 'this'; for ($_i = 0, $_for_max = count($_match_source); $_i < $_for_max; $_i++) { $_match =& $_match_source[$_i]; $source = $_match[4]; if ($this_varname == '_smarty') { /* rename $this to $_smarty in the sourcecode */ $tokens = token_get_all('<?php ' . $_match[4]); array_shift($tokens); /* remove the opening <.?.php */ for ($i=0, $count = count($tokens); $i < $count; $i++) { if (is_array($tokens[$i])) { if ($tokens[$i][0] == T_VARIABLE && $tokens[$i][1] == '$this') { $tokens[$i] = '$' . $this_varname; } else { $tokens[$i] = $tokens[$i][1]; } } } $source = implode('', $tokens); } /* add function to compiled include */ $_include_compiled .= " function _smarty_tplfunc_$_match[2]_$_match[3](&\$$this_varname) { $source } "; } $_include_compiled .= "\n\n?>\n"; $_params = array('filename' => $_compile_path, 'contents' => $_include_compiled, 'create_dirs' => true); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_file.php'); smarty_core_write_file($_params, $smarty); return true; } ?> --- NEW FILE: core.smarty_include_php.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * called for included php files within templates * * @param string $smarty_file * @param string $smarty_assign variable to assign the included template's * output into * @param boolean $smarty_once uses include_once if this is true * @param array $smarty_include_vars associative array of vars from * {include file="blah" var=$var} */ // $file, $assign, $once, $_smarty_include_vars function smarty_core_smarty_include_php($params, &$smarty) { $_params = array('resource_name' => $params['smarty_file']); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_php_resource.php'); smarty_core_get_php_resource($_params, $smarty); $_smarty_resource_type = $_params['resource_type']; $_smarty_php_resource = $_params['php_resource']; if (!empty($params['smarty_assign'])) { ob_start(); if ($_smarty_resource_type == 'file') { $smarty->_include($_smarty_php_resource, $params['smarty_once'], $params['smarty_include_vars']); } else { $smarty->_eval($_smarty_php_resource, $params['smarty_include_vars']); } $smarty->assign($params['smarty_assign'], ob_get_contents()); ob_end_clean(); } else { if ($_smarty_resource_type == 'file') { $smarty->_include($_smarty_php_resource, $params['smarty_once'], $params['smarty_include_vars']); } else { $smarty->_eval($_smarty_php_resource, $params['smarty_include_vars']); } } } /* vim: set expandtab: */ ?> --- NEW FILE: core.assemble_plugin_filepath.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * assemble filepath of requested plugin * * @param string $type * @param string $name * @return string|false */ function smarty_core_assemble_plugin_filepath($params, &$smarty) { static $_filepaths_cache = array(); $_plugin_filename = $params['type'] . '.' . $params['name'] . '.php'; if (isset($_filepaths_cache[$_plugin_filename])) { return $_filepaths_cache[$_plugin_filename]; } $_return = false; foreach ((array)$smarty->plugins_dir as $_plugin_dir) { $_plugin_filepath = $_plugin_dir . DIRECTORY_SEPARATOR . $_plugin_filename; // see if path is relative if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) { $_relative_paths[] = $_plugin_dir; // relative path, see if it is in the SMARTY_DIR if (@is_readable(SMARTY_DIR . $_plugin_filepath)) { $_return = SMARTY_DIR . $_plugin_filepath; break; } } // try relative to cwd (or absolute) if (@is_readable($_plugin_filepath)) { $_return = $_plugin_filepath; break; } } if($_return === false) { // still not found, try PHP include_path if(isset($_relative_paths)) { foreach ((array)$_relative_paths as $_plugin_dir) { $_plugin_filepath = $_plugin_dir . DIRECTORY_SEPARATOR . $_plugin_filename; $_params = array('file_path' => $_plugin_filepath); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_include_path.php'); if(smarty_core_get_include_path($_params, $smarty)) { $_return = $_params['new_file_path']; break; } } } } $_filepaths_cache[$_plugin_filename] = $_return; return $_return; } /* vim: set expandtab: */ ?> --- NEW FILE: core.write_cache_file.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Prepend the cache information to the cache file * and write it * * @param string $tpl_file * @param string $cache_id * @param string $compile_id * @param string $results * @return true|null */ // $tpl_file, $cache_id, $compile_id, $results function smarty_core_write_cache_file($params, &$smarty) { // put timestamp in cache header $smarty->_cache_info['timestamp'] = time(); if ($smarty->cache_lifetime > -1){ // expiration set $smarty->_cache_info['expires'] = $smarty->_cache_info['timestamp'] + $smarty->cache_lifetime; } else { // cache will never expire $smarty->_cache_info['expires'] = -1; } // collapse {nocache...}-tags $params['results'] = preg_replace('!((\{nocache\:([0-9a-f]{32})#(\d+)\})' .'.*' .'{/nocache\:\\3#\\4\})!Us' ,'\\2' ,$params['results']); $smarty->_cache_info['cache_serials'] = $smarty->_cache_serials; // prepend the cache header info into cache file $params['results'] = serialize($smarty->_cache_info)."\n".$params['results']; if (!empty($smarty->cache_handler_func)) { // use cache_handler function call_user_func_array($smarty->cache_handler_func, array('write', &$smarty, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'], null)); } else { // use local cache file if(!@is_writable($smarty->cache_dir)) { // cache_dir not writable, see if it exists if(!@is_dir($smarty->cache_dir)) { $smarty->trigger_error('the $cache_dir \'' . $smarty->cache_dir . '\' does not exist, or is not a directory.', E_USER_ERROR); return false; } $smarty->trigger_error('unable to write to $cache_dir \'' . realpath($smarty->cache_dir) . '\'. Be sure $cache_dir is writable by the web server user.', E_USER_ERROR); return false; } $_auto_id = $smarty->_get_auto_id($params['cache_id'], $params['compile_id']); $_cache_file = $smarty->_get_auto_filename($smarty->cache_dir, $params['tpl_file'], $_auto_id); $_params = array('filename' => $_cache_file, 'contents' => $params['results'], 'create_dirs' => true); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_file.php'); smarty_core_write_file($_params, $smarty); return true; } } /* vim: set expandtab: */ ?> --- NEW FILE: core.load_plugins.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Load requested plugins * * @param array $plugins */ // $plugins function smarty_core_load_plugins($params, &$smarty) { foreach ($params['plugins'] as $_plugin_info) { list($_type, $_name, $_tpl_file, $_tpl_line, $_delayed_loading) = $_plugin_info; $_plugin = &$smarty->_plugins[$_type][$_name]; /* * We do not load plugin more than once for each instance of Smarty. * The following code checks for that. The plugin can also be * registered dynamically at runtime, in which case template file * and line number will be unknown, so we fill them in. * * The final element of the info array is a flag that indicates * whether the dynamically registered plugin function has been * checked for existence yet or not. */ if (isset($_plugin)) { if (empty($_plugin[3])) { if (!is_callable($_plugin[0])) { $smarty->_trigger_fatal_error("[plugin] $_type '$_name' is not implemented", $_tpl_file, $_tpl_line, __FILE__, __LINE__); } else { $_plugin[1] = $_tpl_file; $_plugin[2] = $_tpl_line; $_plugin[3] = true; if (!isset($_plugin[4])) $_plugin[4] = true; /* cacheable */ } } continue; } else if ($_type == 'insert') { /* * For backwards compatibility, we check for insert functions in * the symbol table before trying to load them as a plugin. */ $_plugin_func = 'insert_' . $_name; if (function_exists($_plugin_func)) { $_plugin = array($_plugin_func, $_tpl_file, $_tpl_line, true, false); continue; } } $_plugin_file = $smarty->_get_plugin_filepath($_type, $_name); if (! $_found = ($_plugin_file != false)) { $_message = "could not load plugin file '$_type.$_name.php'\n"; } /* * If plugin file is found, it -must- provide the properly named * plugin function. In case it doesn't, simply output the error and * do not fall back on any other method. */ if ($_found) { include_once $_plugin_file; $_plugin_func = 'smarty_' . $_type . '_' . $_name; if (!function_exists($_plugin_func)) { $smarty->_trigger_fatal_error("[plugin] function $_plugin_func() not found in $_plugin_file", $_tpl_file, $_tpl_line, __FILE__, __LINE__); continue; } } /* * In case of insert plugins, their code may be loaded later via * 'script' attribute. */ else if ($_type == 'insert' && $_delayed_loading) { $_plugin_func = 'smarty_' . $_type . '_' . $_name; $_found = true; } /* * Plugin specific processing and error checking. */ if (!$_found) { if ($_type == 'modifier') { /* * In case modifier falls back on using PHP functions * directly, we only allow those specified in the security * context. */ if ($smarty->security && !in_array($_name, $smarty->security_settings['MODIFIER_FUNCS'])) { $_message = "(secure mode) modifier '$_name' is not allowed"; } else { if (!function_exists($_name)) { $_message = "modifier '$_name' is not implemented"; } else { $_plugin_func = $_name; $_found = true; } } } else if ($_type == 'function') { /* * This is a catch-all situation. */ $_message = "unknown tag - '$_name'"; } } if ($_found) { $smarty->_plugins[$_type][$_name] = array($_plugin_func, $_tpl_file, $_tpl_line, true, true); } else { // output error $smarty->_trigger_fatal_error('[plugin] ' . $_message, $_tpl_file, $_tpl_line, __FILE__, __LINE__); } } } /* vim: set expandtab: */ ?> --- NEW FILE: core.process_compiled_include.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Replace nocache-tags by results of the corresponding non-cacheable * functions and return it * * @param string $compiled_tpl * @param string $cached_source * @return string */ function smarty_core_process_compiled_include($params, &$smarty) { $_cache_including = $smarty->_cache_including; $smarty->_cache_including = true; $_return = $params['results']; foreach ($smarty->_cache_serials as $_include_file_path=>$_cache_serial) { $_return = preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s', array(&$smarty, '_process_compiled_include_callback'), $_return); } $smarty->_cache_including = $_cache_including; return $_return; } ?> --- NEW FILE: core.process_cached_inserts.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Replace cached inserts with the actual results * * @param string $results * @return string */ function smarty_core_process_cached_inserts($params, &$smarty) { preg_match_all('!'.$smarty->_smarty_md5.'{insert_cache (.*)}'.$smarty->_smarty_md5.'!Uis', $params['results'], $match); list($cached_inserts, $insert_args) = $match; for ($i = 0, $for_max = count($cached_inserts); $i < $for_max; $i++) { if ($smarty->debugging) { $_params = array(); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php'); $debug_start_time = smarty_core_get_microtime($_params, $smarty); } $args = unserialize($insert_args[$i]); $name = $args['name']; if (isset($args['script'])) { $_params = array('resource_name' => $smarty->_dequote($args['script'])); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_php_resource.php'); if(!smarty_core_get_php_resource($_params, $smarty)) { return false; } $resource_type = $_params['resource_type']; $php_resource = $_params['php_resource']; if ($resource_type == 'file') { $smarty->_include($php_resource, true); } else { $smarty->_eval($php_resource); } } $function_name = $smarty->_plugins['insert'][$name][0]; if (empty($args['assign'])) { $replace = $function_name($args, $smarty); } else { $smarty->assign($args['assign'], $function_name($args, $smarty)); $replace = ''; } $params['results'] = str_replace($cached_inserts[$i], $replace, $params['results']); if ($smarty->debugging) { $_params = array(); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php'); $smarty->_smarty_debug_info[] = array('type' => 'insert', 'filename' => 'insert_'.$name, 'depth' => $smarty->_inclusion_depth, 'exec_time' => smarty_core_get_microtime($_params, $smarty) - $debug_start_time); } } return $params['results']; } /* vim: set expandtab: */ ?> --- NEW FILE: core.get_microtime.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Get seconds and microseconds * @return double */ function smarty_core_get_microtime($params, &$smarty) { $mtime = microtime(); $mtime = explode(" ", $mtime); $mtime = (double)($mtime[1]) + (double)($mtime[0]); return ($mtime); } /* vim: set expandtab: */ ?> --- NEW FILE: core.assign_smarty_interface.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty assign_smarty_interface core plugin * * Type: core<br> * Name: assign_smarty_interface<br> * Purpose: assign the $smarty interface variable * @param array Format: null * @param Smarty */ function smarty_core_assign_smarty_interface($params, &$smarty) { if (isset($smarty->_smarty_vars) && isset($smarty->_smarty_vars['request'])) { return; } $_globals_map = array('g' => 'HTTP_GET_VARS', 'p' => 'HTTP_POST_VARS', 'c' => 'HTTP_COOKIE_VARS', 's' => 'HTTP_SERVER_VARS', 'e' => 'HTTP_ENV_VARS'); $_smarty_vars_request = array(); foreach (preg_split('!!', strtolower($smarty->request_vars_order)) as $_c) { if (isset($_globals_map[$_c])) { $_smarty_vars_request = array_merge($_smarty_vars_request, $GLOBALS[$_globals_map[$_c]]); } } $_smarty_vars_request = @array_merge($_smarty_vars_request, $GLOBALS['HTTP_SESSION_VARS']); $smarty->_smarty_vars['request'] = $_smarty_vars_request; } /* vim: set expandtab: */ ?> --- NEW FILE: core.is_trusted.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * determines if a resource is trusted or not * * @param string $resource_type * @param string $resource_name * @return boolean */ // $resource_type, $resource_name function smarty_core_is_trusted($params, &$smarty) { $_smarty_trusted = false; if ($params['resource_type'] == 'file') { if (!empty($smarty->trusted_dir)) { $_rp = realpath($params['resource_name']); foreach ((array)$smarty->trusted_dir as $curr_dir) { if (!empty($curr_dir) && is_readable ($curr_dir)) { $_cd = realpath($curr_dir); if (strncmp($_rp, $_cd, strlen($_cd)) == 0 && $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) { $_smarty_trusted = true; break; } } } } } else { // resource is not on local file system $_smarty_trusted = call_user_func_array($smarty->_plugins['resource'][$params['resource_type']][0][3], array($params['resource_name'], $smarty)); } return $_smarty_trusted; } /* vim: set expandtab: */ ?> --- NEW FILE: core.read_cache_file.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * read a cache file, determine if it needs to be * regenerated or not * * @param string $tpl_file * @param string $cache_id * @param string $compile_id * @param string $results * @return boolean */ // $tpl_file, $cache_id, $compile_id, &$results function smarty_core_read_cache_file(&$params, &$smarty) { static $content_cache = array(); if ($smarty->force_compile) { // force compile enabled, always regenerate return false; } if (isset($content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']])) { list($params['results'], $smarty->_cache_info) = $content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']]; return true; } if (!empty($smarty->cache_handler_func)) { // use cache_handler function call_user_func_array($smarty->cache_handler_func, array('read', &$smarty, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'], null)); } else { // use local cache file $_auto_id = $smarty->_get_auto_id($params['cache_id'], $params['compile_id']); $_cache_file = $smarty->_get_auto_filename($smarty->cache_dir, $params['tpl_file'], $_auto_id); $params['results'] = $smarty->_read_file($_cache_file); } if (empty($params['results'])) { // nothing to parse (error?), regenerate cache return false; } $cache_split = explode("\n", $params['results'], 2); $cache_header = $cache_split[0]; $_cache_info = unserialize($cache_header); if ($smarty->caching == 2 && isset ($_cache_info['expires'])){ // caching by expiration time if ($_cache_info['expires'] > -1 && (time() > $_cache_info['expires'])) { // cache expired, regenerate return false; } } else { // caching by lifetime if ($smarty->cache_lifetime > -1 && (time() - $_cache_info['timestamp'] > $smarty->cache_lifetime)) { // cache expired, regenerate return false; } } if ($smarty->compile_check) { $_params = array('get_source' => false, 'quiet'=>true); foreach (array_keys($_cache_info['template']) as $_template_dep) { $_params['resource_name'] = $_template_dep; if (!$smarty->_fetch_resource_info($_params) || $_cache_info['timestamp'] < $_params['resource_timestamp']) { // template file has changed, regenerate cache return false; } } if (isset($_cache_info['config'])) { $_params = array('resource_base_path' => $smarty->config_dir, 'get_source' => false, 'quiet'=>true); foreach (array_keys($_cache_info['config']) as $_config_dep) { $_params['resource_name'] = $_config_dep; if (!$smarty->_fetch_resource_info($_params) || $_cache_info['timestamp'] < $_params['resource_timestamp']) { // config file has changed, regenerate cache return false; } } } } foreach ($_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) { if (empty($smarty->_cache_serials[$_include_file_path])) { $smarty->_include($_include_file_path, true); } if ($smarty->_cache_serials[$_include_file_path] != $_cache_serial) { /* regenerate */ return false; } } $params['results'] = $cache_split[1]; $content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']] = array($params['results'], $_cache_info); $smarty->_cache_info = $_cache_info; return true; } /* vim: set expandtab: */ ?> --- NEW FILE: core.rm_auto.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * delete an automagically created file by name and id * * @param string $auto_base * @param string $auto_source * @param string $auto_id * @param integer $exp_time * @return boolean */ // $auto_base, $auto_source = null, $auto_id = null, $exp_time = null function smarty_core_rm_auto($params, &$smarty) { if (!@is_dir($params['auto_base'])) return false; if(!isset($params['auto_id']) && !isset($params['auto_source'])) { $_params = array( 'dirname' => $params['auto_base'], 'level' => 0, 'exp_time' => $params['exp_time'] ); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rmdir.php'); $_res = smarty_core_rmdir($_params, $smarty); } else { $_tname = $smarty->_get_auto_filename($params['auto_base'], $params['auto_source'], $params['auto_id']); if(isset($params['auto_source'])) { if (isset($params['extensions'])) { $_res = false; foreach ((array)$params['extensions'] as $_extension) $_res |= $smarty->_unlink($_tname.$_extension, $params['exp_time']); } else { $_res = $smarty->_unlink($_tname, $params['exp_time']); } } elseif ($smarty->use_sub_dirs) { $_params = array( 'dirname' => $_tname, 'level' => 1, 'exp_time' => $params['exp_time'] ); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rmdir.php'); $_res = smarty_core_rmdir($_params, $smarty); } else { // remove matching file names $_handle = opendir($params['auto_base']); $_res = true; while (false !== ($_filename = readdir($_handle))) { if($_filename == '.' || $_filename == '..') { continue; } elseif (substr($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, 0, strlen($_tname)) == $_tname) { $_res &= (bool)$smarty->_unlink($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, $params['exp_time']); } } } } return $_res; } /* vim: set expandtab: */ ?> --- NEW FILE: core.is_secure.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * determines if a resource is secure or not. * * @param string $resource_type * @param string $resource_name * @return boolean */ // $resource_type, $resource_name function smarty_core_is_secure($params, &$smarty) { if (!$smarty->security || $smarty->security_settings['INCLUDE_ANY']) { return true; } if ($params['resource_type'] == 'file') { $_rp = realpath($params['resource_name']); if (isset($params['resource_base_path'])) { foreach ((array)$params['resource_base_path'] as $curr_dir) { if ( ($_cd = realpath($curr_dir)) !== false && strncmp($_rp, $_cd, strlen($_cd)) == 0 && $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) { return true; } } } if (!empty($smarty->secure_dir)) { foreach ((array)$smarty->secure_dir as $curr_dir) { if ( ($_cd = realpath($curr_dir)) !== false && strncmp($_rp, $_cd, strlen($_cd)) == 0 && $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) { return true; } } } } else { // resource is not on local file system return call_user_func_array( $smarty->_plugins['resource'][$params['resource_type']][0][2], array($params['resource_name'], &$smarty)); } return false; } /* vim: set expandtab: */ ?> --- NEW FILE: core.create_dir_structure.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * create full directory structure * * @param string $dir */ // $dir function smarty_core_create_dir_structure($params, &$smarty) { if (!file_exists($params['dir'])) { $_open_basedir_ini = ini_get('open_basedir'); if (DIRECTORY_SEPARATOR=='/') { /* unix-style paths */ $_dir = $params['dir']; $_dir_parts = preg_split('!/+!', $_dir, -1, PREG_SPLIT_NO_EMPTY); $_new_dir = ($_dir{0}=='/') ? '/' : getcwd().'/'; if($_use_open_basedir = !empty($_open_basedir_ini)) { $_open_basedirs = explode(':', $_open_basedir_ini); } } else { /* other-style paths */ $_dir = str_replace('\\','/', $params['dir']); $_dir_parts = preg_split('!/+!', $_dir, -1, PREG_SPLIT_NO_EMPTY); if (preg_match('!^((//)|([a-zA-Z]:/))!', $_dir, $_root_dir)) { /* leading "//" for network volume, or "[letter]:/" for full path */ $_new_dir = $_root_dir[1]; /* remove drive-letter from _dir_parts */ if (isset($_root_dir[3])) array_shift($_dir_parts); } else { $_new_dir = str_replace('\\', '/', getcwd()).'/'; } if($_use_open_basedir = !empty($_open_basedir_ini)) { $_open_basedirs = explode(';', str_replace('\\', '/', $_open_basedir_ini)); } } /* all paths use "/" only from here */ foreach ($_dir_parts as $_dir_part) { $_new_dir .= $_dir_part; if ($_use_open_basedir) { // do not attempt to test or make directories outside of open_basedir $_make_new_dir = false; foreach ($_open_basedirs as $_open_basedir) { if (substr($_new_dir, 0, strlen($_open_basedir)) == $_open_basedir) { $_make_new_dir = true; break; } } } else { $_make_new_dir = true; } if ($_make_new_dir && !file_exists($_new_dir) && !@mkdir($_new_dir, $smarty->_dir_perms) && !is_dir($_new_dir)) { $smarty->trigger_error("problem creating directory '" . $_new_dir . "'"); return false; } $_new_dir .= '/'; } } } /* vim: set expandtab: */ ?> --- NEW FILE: core.display_debug_console.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty debug_console function plugin * * Type: core<br> * Name: display_debug_console<br> * Purpose: display the javascript debug console window * @param array Format: null * @param Smarty */ function smarty_core_display_debug_console($params, &$smarty) { // we must force compile the debug template in case the environment // changed between separate applications. if(empty($smarty->debug_tpl)) { // set path to debug template from SMARTY_DIR $smarty->debug_tpl = SMARTY_DIR . 'debug.tpl'; if($smarty->security && is_file($smarty->debug_tpl)) { $smarty->secure_dir[] = dirname(realpath($smarty->debug_tpl)); } $smarty->debug_tpl = 'file:' . SMARTY_DIR . 'debug.tpl'; } $_ldelim_orig = $smarty->left_delimiter; $_rdelim_orig = $smarty->right_delimiter; $smarty->left_delimiter = '{'; $smarty->right_delimiter = '}'; $_compile_id_orig = $smarty->_compile_id; $smarty->_compile_id = null; $_compile_path = $smarty->_get_compile_path($smarty->debug_tpl); if ($smarty->_compile_resource($smarty->debug_tpl, $_compile_path)) { ob_start(); $smarty->_include($_compile_path); $_results = ob_get_contents(); ob_end_clean(); } else { $_results = ''; } $smarty->_compile_id = $_compile_id_orig; $smarty->left_delimiter = $_ldelim_orig; $smarty->right_delimiter = $_rdelim_orig; return $_results; } /* vim: set expandtab: */ ?> --- NEW FILE: core.run_insert_handler.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Handle insert tags * * @param array $args * @return string */ function smarty_core_run_insert_handler($params, &$smarty) { require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php'); if ($smarty->debugging) { $_params = array(); $_debug_start_time = smarty_core_get_microtime($_params, $smarty); } if ($smarty->caching) { $_arg_string = serialize($params['args']); $_name = $params['args']['name']; if (!isset($smarty->_cache_info['insert_tags'][$_name])) { $smarty->_cache_info['insert_tags'][$_name] = array('insert', $_name, $smarty->_plugins['insert'][$_name][1], $smarty->_plugins['insert'][$_name][2], !empty($params['args']['script']) ? true : false); } return $smarty->_smarty_md5."{insert_cache $_arg_string}".$smarty->_smarty_md5; } else { if (isset($params['args']['script'])) { $_params = array('resource_name' => $smarty->_dequote($params['args']['script'])); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_php_resource.php'); if(!smarty_core_get_php_resource($_params, $smarty)) { return false; } if ($_params['resource_type'] == 'file') { $smarty->_include($_params['php_resource'], true); } else { $smarty->_eval($_params['php_resource']); } unset($params['args']['script']); } $_funcname = $smarty->_plugins['insert'][$params['args']['name']][0]; $_content = $_funcname($params['args'], $smarty); if ($smarty->debugging) { $_params = array(); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php'); $smarty->_smarty_debug_info[] = array('type' => 'insert', 'filename' => 'insert_'.$params['args']['name'], 'depth' => $smarty->_inclusion_depth, 'exec_time' => smarty_core_get_microtime($_params, $smarty) - $_debug_start_time); } if (!empty($params['args']["assign"])) { $smarty->assign($params['args']["assign"], $_content); } else { return $_content; } } } /* vim: set expandtab: */ ?> --- NEW FILE: core.load_resource_plugin.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * load a resource plugin * * @param string $type */ // $type function smarty_core_load_resource_plugin($params, &$smarty) { /* * Resource plugins are not quite like the other ones, so they are * handled differently. The first element of plugin info is the array of * functions provided by the plugin, the second one indicates whether * all of them exist or not. */ $_plugin = &$smarty->_plugins['resource'][$params['type']]; if (isset($_plugin)) { if (!$_plugin[1] && count($_plugin[0])) { $_plugin[1] = true; foreach ($_plugin[0] as $_plugin_func) { if (!is_callable($_plugin_func)) { $_plugin[1] = false; break; } } } if (!$_plugin[1]) { $smarty->_trigger_fatal_error("[plugin] resource '" . $params['type'] . "' is not implemented", null, null, __FILE__, __LINE__); } return; } $_plugin_file = $smarty->_get_plugin_filepath('resource', $params['type']); $_found = ($_plugin_file != false); if ($_found) { /* * If the plugin file is found, it -must- provide the properly named * plugin functions. */ include_once($_plugin_file); /* * Locate functions that we require the plugin to provide. */ $_resource_ops = array('source', 'timestamp', 'secure', 'trusted'); $_resource_funcs = array(); foreach ($_resource_ops as $_op) { $_plugin_func = 'smarty_resource_' . $params['type'] . '_' . $_op; if (!function_exists($_plugin_func)) { $smarty->_trigger_fatal_error("[plugin] function $_plugin_func() not found in $_plugin_file", null, null, __FILE__, __LINE__); return; } else { $_resource_funcs[] = $_plugin_func; } } $smarty->_plugins['resource'][$params['type']] = array($_resource_funcs, true); } } /* vim: set expandtab: */ ?> --- NEW FILE: core.write_compiled_resource.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * write the compiled resource * * @param string $compile_path * @param string $compiled_content * @return true */ function smarty_core_write_compiled_resource($params, &$smarty) { if(!@is_writable($smarty->compile_dir)) { // compile_dir not writable, see if it exists if(!@is_dir($smarty->compile_dir)) { $smarty->trigger_error('the $compile_dir \'' . $smarty->compile_dir . '\' does not exist, or is not a directory.', E_USER_ERROR); return false; } $smarty->trigger_error('unable to write to $compile_dir \'' . realpath($smarty->compile_dir) . '\'. Be sure $compile_dir is writable by the web server user.', E_USER_ERROR); return false; } $_params = array('filename' => $params['compile_path'], 'contents' => $params['compiled_content'], 'create_dirs' => true); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_file.php'); smarty_core_write_file($_params, $smarty); return true; } /* vim: set expandtab: */ ?> |
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31275/Smarty/libs/plugins Added Files: Tag: branch-smarty block.textformat.php compiler.assign.php function.assign_debug_info.php function.config_load.php function.counter.php function.cycle.php function.debug.php function.eval.php function.fetch.php function.html_checkboxes.php function.html_image.php function.html_options.php function.html_radios.php function.html_select_date.php function.html_select_time.php function.html_table.php function.mailto.php function.math.php function.popup.php function.popup_init.php modifier.capitalize.php modifier.cat.php modifier.count_characters.php modifier.count_paragraphs.php modifier.count_sentences.php modifier.count_words.php modifier.date_format.php modifier.debug_print_var.php modifier.default.php modifier.escape.php modifier.indent.php modifier.lower.php modifier.nl2br.php modifier.regex_replace.php modifier.replace.php modifier.spacify.php modifier.string_format.php modifier.strip.php modifier.strip_tags.php modifier.truncate.php modifier.upper.php modifier.wordwrap.php outputfilter.trimwhitespace.php shared.escape_special_chars.php shared.make_timestamp.php Log Message: added smarty libs --- NEW FILE: modifier.escape.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty escape modifier plugin * * Type: modifier<br> * Name: escape<br> * Purpose: Escape the string according to escapement type * @link http://smarty.php.net/manual/en/language.modifier.escape.php * escape (Smarty online manual) * @param string * @param html|htmlall|url|quotes|hex|hexentity|javascript * @return string */ function smarty_modifier_escape($string, $esc_type = 'html') { switch ($esc_type) { case 'html': return htmlspecialchars($string, ENT_QUOTES); case 'htmlall': return htmlentities($string, ENT_QUOTES); case 'url': return urlencode($string); case 'quotes': // escape unescaped single quotes return preg_replace("%(?<!\\\\)'%", "\\'", $string); case 'hex': // escape every character into hex $return = ''; for ($x=0; $x < strlen($string); $x++) { $return .= '%' . bin2hex($string[$x]); } return $return; case 'hexentity': $return = ''; for ($x=0; $x < strlen($string); $x++) { $return .= '&#x' . bin2hex($string[$x]) . ';'; } return $return; case 'decentity': $return = ''; for ($x=0; $x < strlen($string); $x++) { $return .= '&#' . ord($string[$x]) . ';'; } return $return; case 'javascript': // escape quotes and backslashes, newlines, etc. return strtr($string, array('\\'=>'\\\\',"'"=>"\\'",'"'=>'\\"',"\r"=>'\\r',"\n"=>'\\n','</'=>'<\/')); case 'mail': // safe way to display e-mail address on a web page return str_replace(array('@', '.'),array(' [AT] ', ' [DOT] '), $string); case 'nonstd': // escape non-standard chars, such as ms document quotes $_res = ''; for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) { $_ord = ord($string{$_i}); // non-standard char, escape it if($_ord >= 126){ $_res .= '&#' . $_ord . ';'; } else { $_res .= $string{$_i}; } } return $_res; default: return $string; } } /* vim: set expandtab: */ ?> --- NEW FILE: shared.make_timestamp.php --- <?php /** * Smarty shared plugin * @package Smarty * @subpackage plugins */ /** * Function: smarty_make_timestamp<br> * Purpose: used by other smarty functions to make a timestamp * from a string. * @param string * @return string */ function smarty_make_timestamp($string) { if(empty($string)) { $string = "now"; } $time = strtotime($string); if (is_numeric($time) && $time != -1) return $time; // is mysql timestamp format of YYYYMMDDHHMMSS? if (preg_match('/^\d{14}$/', $string)) { $time = mktime(substr($string,8,2),substr($string,10,2),substr($string,12,2), substr($string,4,2),substr($string,6,2),substr($string,0,4)); return $time; } // couldn't recognize it, try to return a time $time = (int) $string; if ($time > 0) return $time; else return time(); } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.truncate.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty truncate modifier plugin * * Type: modifier<br> * Name: truncate<br> * Purpose: Truncate a string to a certain length if necessary, * optionally splitting in the middle of a word, and * appending the $etc string. * @link http://smarty.php.net/manual/en/language.modifier.truncate.php * truncate (Smarty online manual) * @param string * @param integer * @param string * @param boolean * @return string */ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false) { if ($length == 0) return ''; if (strlen($string) > $length) { $length -= strlen($etc); if (!$break_words) $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1)); return substr($string, 0, $length).$etc; } else return $string; } /* vim: set expandtab: */ ?> --- NEW FILE: shared.escape_special_chars.php --- <?php /** * Smarty shared plugin * @package Smarty * @subpackage plugins */ /** * escape_special_chars common function * * Function: smarty_function_escape_special_chars<br> * Purpose: used by other smarty functions to escape * special chars except for already escaped ones * @param string * @return string */ function smarty_function_escape_special_chars($string) { if(!is_array($string)) { $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); $string = htmlspecialchars($string); $string = str_replace(array('%%%SMARTY_START%%%','%%%SMARTY_END%%%'), array('&',';'), $string); } return $string; } /* vim: set expandtab: */ ?> --- NEW FILE: compiler.assign.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {assign} compiler function plugin * * Type: compiler function<br> * Name: assign<br> * Purpose: assign a value to a template variable * @link http://smarty.php.net/manual/en/language.custom.functions.php#LANGUAGE.FUNCTION.ASSIGN {assign} * (Smarty online manual) * @param string containing var-attribute and value-attribute * @param Smarty_Compiler */ function smarty_compiler_assign($tag_attrs, &$compiler) { $_params = $compiler->_parse_attrs($tag_attrs); if (!isset($_params['var'])) { $compiler->_syntax_error("assign: missing 'var' parameter", E_USER_WARNING); return; } if (!isset($_params['value'])) { $compiler->_syntax_error("assign: missing 'value' parameter", E_USER_WARNING); return; } return "\$this->assign({$_params['var']}, {$_params['value']});"; } /* vim: set expandtab: */ ?> --- NEW FILE: function.config_load.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {config_load} function plugin * * Type: function<br> * Name: config_load<br> * Purpose: load config file vars * @link http://smarty.php.net/manual/en/language.function.config.load.php {config_load} * (Smarty online manual) * @param array Format: * <pre> * array('file' => required config file name, * 'section' => optional config file section to load * 'scope' => local/parent/global * 'global' => overrides scope, setting to parent if true) * </pre> * @param Smarty */ function smarty_function_config_load($params, &$smarty) { if ($smarty->debugging) { $_params = array(); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php'); $_debug_start_time = smarty_core_get_microtime($_params, $smarty); } $_file = isset($params['file']) ? $smarty->_dequote($params['file']) : null; $_section = isset($params['section']) ? $smarty->_dequote($params['section']) : null; $_scope = isset($params['scope']) ? $smarty->_dequote($params['scope']) : 'global'; $_global = isset($params['global']) ? $smarty->_dequote($params['global']) : false; if (!isset($_file) || strlen($_file) == 0) { $smarty->trigger_error("missing 'file' attribute in config_load tag", E_USER_ERROR, __FILE__, __LINE__); } if (isset($_scope)) { if ($_scope != 'local' && $_scope != 'parent' && $_scope != 'global') { $smarty->trigger_error("invalid 'scope' attribute value", E_USER_ERROR, __FILE__, __LINE__); } } else { if ($_global) { $_scope = 'parent'; } else { $_scope = 'local'; } } $_params = array('resource_name' => $_file, 'resource_base_path' => $smarty->config_dir, 'get_source' => false); $smarty->_parse_resource_name($_params); $_file_path = $_params['resource_type'] . ':' . $_params['resource_name']; if (isset($_section)) $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section); else $_compile_file = $smarty->_get_compile_path($_file_path); if($smarty->force_compile || !file_exists($_compile_file)) { $_compile = true; } elseif ($smarty->compile_check) { $_params = array('resource_name' => $_file, 'resource_base_path' => $smarty->config_dir, 'get_source' => false); $_compile = $smarty->_fetch_resource_info($_params) && $_params['resource_timestamp'] > filemtime($_compile_file); } else { $_compile = false; } if($_compile) { // compile config file if(!is_object($smarty->_conf_obj)) { require_once SMARTY_DIR . $smarty->config_class . '.class.php'; $smarty->_conf_obj = new $smarty->config_class(); $smarty->_conf_obj->overwrite = $smarty->config_overwrite; $smarty->_conf_obj->booleanize = $smarty->config_booleanize; $smarty->_conf_obj->read_hidden = $smarty->config_read_hidden; $smarty->_conf_obj->fix_newlines = $smarty->config_fix_newlines; } $_params = array('resource_name' => $_file, 'resource_base_path' => $smarty->config_dir, $_params['get_source'] = true); if (!$smarty->_fetch_resource_info($_params)) { return; } $smarty->_conf_obj->set_file_contents($_file, $_params['source_content']); $_config_vars = array_merge($smarty->_conf_obj->get($_file), $smarty->_conf_obj->get($_file, $_section)); if(function_exists('var_export')) { $_output = '<?php $_config_vars = ' . var_export($_config_vars, true) . '; ?>'; } else { $_output = '<?php $_config_vars = unserialize(\'' . strtr(serialize($_config_vars),array('\''=>'\\\'', '\\'=>'\\\\')) . '\'); ?>'; } $_params = (array('compile_path' => $_compile_file, 'compiled_content' => $_output, 'resource_timestamp' => $_params['resource_timestamp'])); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_compiled_resource.php'); smarty_core_write_compiled_resource($_params, $smarty); } else { include($_compile_file); } if ($smarty->caching) { $smarty->_cache_info['config'][$_file] = true; } $smarty->_config[0]['vars'] = @array_merge($smarty->_config[0]['vars'], $_config_vars); $smarty->_config[0]['files'][$_file] = true; if ($_scope == 'parent') { $smarty->_config[1]['vars'] = @array_merge($smarty->_config[1]['vars'], $_config_vars); $smarty->_config[1]['files'][$_file] = true; } else if ($_scope == 'global') { for ($i = 1, $for_max = count($smarty->_config); $i < $for_max; $i++) { $smarty->_config[$i]['vars'] = @array_merge($smarty->_config[$i]['vars'], $_config_vars); $smarty->_config[$i]['files'][$_file] = true; } } if ($smarty->debugging) { $_params = array(); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php'); $smarty->_smarty_debug_info[] = array('type' => 'config', 'filename' => $_file.' ['.$_section.'] '.$_scope, 'depth' => $smarty->_inclusion_depth, 'exec_time' => smarty_core_get_microtime($_params, $smarty) - $_debug_start_time); } } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.strip.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty strip modifier plugin * * Type: modifier<br> * Name: strip<br> * Purpose: Replace all repeated spaces, newlines, tabs * with a single space or supplied replacement string.<br> * Example: {$var|strip} {$var|strip:" "} * Date: September 25th, 2002 * @link http://smarty.php.net/manual/en/language.modifier.strip.php * strip (Smarty online manual) * @author Monte Ohrt <mo...@is...> * @version 1.0 * @param string * @param string * @return string */ function smarty_modifier_strip($text, $replace = ' ') { return preg_replace('!\s+!', $replace, $text); } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.default.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty default modifier plugin * * Type: modifier<br> * Name: default<br> * Purpose: designate default value for empty variables * @link http://smarty.php.net/manual/en/language.modifier.default.php * default (Smarty online manual) * @param string * @param string * @return string */ function smarty_modifier_default($string, $default = '') { if (!isset($string) || $string === '') return $default; else return $string; } /* vim: set expandtab: */ ?> --- NEW FILE: function.debug.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {debug} function plugin * * Type: function<br> * Name: debug<br> * Date: July 1, 2002<br> * Purpose: popup debug window * @link http://smarty.php.net/manual/en/language.function.debug.php {debug} * (Smarty online manual) * @author Monte Ohrt <mo...@is...> * @version 1.0 * @param array * @param Smarty * @return string output from {@link Smarty::_generate_debug_output()} */ function smarty_function_debug($params, &$smarty) { if($params['output']) { $smarty->assign('_smarty_debug_output',$params['output']); } require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.display_debug_console.php'); return smarty_core_display_debug_console(null, $smarty); } /* vim: set expandtab: */ ?> --- NEW FILE: function.popup_init.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {popup_init} function plugin * * Type: function<br> * Name: popup_init<br> * Purpose: initialize overlib * @link http://smarty.php.net/manual/en/language.function.popup.init.php {popup_init} * (Smarty online manual) * @param array * @param Smarty * @return string */ function smarty_function_popup_init($params, &$smarty) { $zindex = 1000; if (!empty($params['zindex'])) { $zindex = $params['zindex']; } if (!empty($params['src'])) { return '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:'.$zindex.';"></div>' . "\n" . '<script type="text/javascript" language="JavaScript" src="'.$params['src'].'"></script>' . "\n"; } else { $smarty->trigger_error("popup_init: missing src parameter"); } } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.nl2br.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty plugin * * Type: modifier<br> * Name: nl2br<br> * Date: Feb 26, 2003 * Purpose: convert \r\n, \r or \n to <<br>> * Input:<br> * - contents = contents to replace * - preceed_test = if true, includes preceeding break tags * in replacement * Example: {$text|nl2br} * @link http://smarty.php.net/manual/en/language.modifier.nl2br.php * nl2br (Smarty online manual) * @version 1.0 * @author Monte Ohrt <mo...@is...> * @param string * @return string */ function smarty_modifier_nl2br($string) { return nl2br($string); } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.wordwrap.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty wordwrap modifier plugin * * Type: modifier<br> * Name: wordwrap<br> * Purpose: wrap a string of text at a given length * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php * wordwrap (Smarty online manual) * @param string * @param integer * @param string * @param boolean * @return string */ function smarty_modifier_wordwrap($string,$length=80,$break="\n",$cut=false) { return wordwrap($string,$length,$break,$cut); } ?> --- NEW FILE: function.html_select_date.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {html_select_date} plugin * * Type: function<br> * Name: html_select_date<br> * Purpose: Prints the dropdowns for date selection. * * ChangeLog:<br> * - 1.0 initial release * - 1.1 added support for +/- N syntax for begin * and end year values. (Monte) * - 1.2 added support for yyyy-mm-dd syntax for * time value. (Jan Rosier) * - 1.3 added support for choosing format for * month values (Gary Loescher) * - 1.3.1 added support for choosing format for * day values (Marcus Bointon) * - 1.3.2 suppport negative timestamps, force year * dropdown to include given date unless explicitly set (Monte) * @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date} * (Smarty online manual) * @version 1.3.2 * @author Andrei Zmievski * @param array * @param Smarty * @return string */ function smarty_function_html_select_date($params, &$smarty) { require_once $smarty->_get_plugin_filepath('shared','make_timestamp'); require_once $smarty->_get_plugin_filepath('function','html_options'); /* Default values. */ $prefix = "Date_"; $start_year = strftime("%Y"); $end_year = $start_year; $display_days = true; $display_months = true; $display_years = true; $month_format = "%B"; /* Write months as numbers by default GL */ $month_value_format = "%m"; $day_format = "%02d"; /* Write day values using this format MB */ $day_value_format = "%d"; $year_as_text = false; /* Display years in reverse order? Ie. 2000,1999,.... */ $reverse_years = false; /* Should the select boxes be part of an array when returned from PHP? e.g. setting it to "birthday", would create "birthday[Day]", "birthday[Month]" & "birthday[Year]". Can be combined with prefix */ $field_array = null; /* <select size>'s of the different <select> tags. If not set, uses default dropdown. */ $day_size = null; $month_size = null; $year_size = null; /* Unparsed attributes common to *ALL* the <select>/<input> tags. An example might be in the template: all_extra ='class ="foo"'. */ $all_extra = null; /* Separate attributes for the tags. */ $day_extra = null; $month_extra = null; $year_extra = null; /* Order in which to display the fields. "D" -> day, "M" -> month, "Y" -> year. */ $field_order = 'MDY'; /* String printed between the different fields. */ $field_separator = "\n"; $time = time(); $all_empty = null; $day_empty = null; $month_empty = null; $year_empty = null; foreach ($params as $_key=>$_value) { switch ($_key) { case 'prefix': case 'time': case 'start_year': case 'end_year': case 'month_format': case 'day_format': case 'day_value_format': case 'field_array': case 'day_size': case 'month_size': case 'year_size': case 'all_extra': case 'day_extra': case 'month_extra': case 'year_extra': case 'field_order': case 'field_separator': case 'month_value_format': case 'month_empty': case 'day_empty': case 'year_empty': $$_key = (string)$_value; break; case 'all_empty': $$_key = (string)$_value; $day_empty = $month_empty = $year_empty = $all_empty; break; case 'display_days': case 'display_months': case 'display_years': case 'year_as_text': case 'reverse_years': $$_key = (bool)$_value; break; default: $smarty->trigger_error("[html_select_date] unknown parameter $_key", E_USER_WARNING); } } if(preg_match('!^-\d+$!',$time)) { // negative timestamp, use date() $time = date('Y-m-d',$time); } // If $time is not in format yyyy-mm-dd if (!preg_match('/^\d{0,4}-\d{0,2}-\d{0,2}$/', $time)) { // use smarty_make_timestamp to get an unix timestamp and // strftime to make yyyy-mm-dd $time = strftime('%Y-%m-%d', smarty_make_timestamp($time)); } // Now split this in pieces, which later can be used to set the select $time = explode("-", $time); // make syntax "+N" or "-N" work with start_year and end_year if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) { if ($match[1] == '+') { $end_year = strftime('%Y') + $match[2]; } else { $end_year = strftime('%Y') - $match[2]; } } if (preg_match('!^(\+|\-)\s*(\d+)$!', $start_year, $match)) { if ($match[1] == '+') { $start_year = strftime('%Y') + $match[2]; } else { $start_year = strftime('%Y') - $match[2]; } } if($start_year > $time[0] && !isset($params['start_year'])) { // force start year to include given date if not explicitly set $start_year = $time[0]; } if($end_year < $time[0] && !isset($params['end_year'])) { // force end year to include given date if not explicitly set $end_year = $time[0]; } $field_order = strtoupper($field_order); $html_result = $month_result = $day_result = $year_result = ""; if ($display_months) { $month_names = array(); $month_values = array(); if(isset($month_empty)) { $month_names[''] = $month_empty; $month_values[''] = ''; } for ($i = 1; $i <= 12; $i++) { $month_names[$i] = strftime($month_format, mktime(0, 0, 0, $i, 1, 2000)); $month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000)); } $month_result .= '<select name='; if (null !== $field_array){ $month_result .= '"' . $field_array . '[' . $prefix . 'Month]"'; } else { $month_result .= '"' . $prefix . 'Month"'; } if (null !== $month_size){ $month_result .= ' size="' . $month_size . '"'; } if (null !== $month_extra){ $month_result .= ' ' . $month_extra; } if (null !== $all_extra){ $month_result .= ' ' . $all_extra; } $month_result .= '>'."\n"; $month_result .= smarty_function_html_options(array('output' => $month_names, 'values' => $month_values, 'selected' => $a=$time[1] ? strftime($month_value_format, mktime(0, 0, 0, (int)$time[1], 1, 2000)) : '', 'print_result' => false), $smarty); $month_result .= '</select>'; } if ($display_days) { $days = array(); if (isset($day_empty)) { $days[''] = $day_empty; $day_values[''] = ''; } for ($i = 1; $i <= 31; $i++) { $days[] = sprintf($day_format, $i); $day_values[] = sprintf($day_value_format, $i); } $day_result .= '<select name='; if (null !== $field_array){ $day_result .= '"' . $field_array . '[' . $prefix . 'Day]"'; } else { $day_result .= '"' . $prefix . 'Day"'; } if (null !== $day_size){ $day_result .= ' size="' . $day_size . '"'; } if (null !== $all_extra){ $day_result .= ' ' . $all_extra; } if (null !== $day_extra){ $day_result .= ' ' . $day_extra; } $day_result .= '>'."\n"; $day_result .= smarty_function_html_options(array('output' => $days, 'values' => $day_values, 'selected' => $time[2], 'print_result' => false), $smarty); $day_result .= '</select>'; } if ($display_years) { if (null !== $field_array){ $year_name = $field_array . '[' . $prefix . 'Year]'; } else { $year_name = $prefix . 'Year'; } if ($year_as_text) { $year_result .= '<input type="text" name="' . $year_name . '" value="' . $time[0] . '" size="4" maxlength="4"'; if (null !== $all_extra){ $year_result .= ' ' . $all_extra; } if (null !== $year_extra){ $year_result .= ' ' . $year_extra; } $year_result .= '>'; } else { $years = range((int)$start_year, (int)$end_year); if ($reverse_years) { rsort($years, SORT_NUMERIC); } $yearvals = $years; if(isset($year_empty)) { array_unshift($years, $year_empty); array_unshift($yearvals, ''); } $year_result .= '<select name="' . $year_name . '"'; if (null !== $year_size){ $year_result .= ' size="' . $year_size . '"'; } if (null !== $all_extra){ $year_result .= ' ' . $all_extra; } if (null !== $year_extra){ $year_result .= ' ' . $year_extra; } $year_result .= '>'."\n"; $year_result .= smarty_function_html_options(array('output' => $years, 'values' => $yearvals, 'selected' => $time[0], 'print_result' => false), $smarty); $year_result .= '</select>'; } } // Loop thru the field_order field for ($i = 0; $i <= 2; $i++){ $c = substr($field_order, $i, 1); switch ($c){ case 'D': $html_result .= $day_result; break; case 'M': $html_result .= $month_result; break; case 'Y': $html_result .= $year_result; break; } // Add the field seperator if($i != 2) { $html_result .= $field_separator; } } return $html_result; } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.debug_print_var.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty debug_print_var modifier plugin * * Type: modifier<br> * Name: debug_print_var<br> * Purpose: formats variable contents for display in the console * @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php * debug_print_var (Smarty online manual) * @param array|object * @param integer * @param integer * @return string */ function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40) { $_replace = array("\n"=>'<i>\n</i>', "\r"=>'<i>\r</i>', "\t"=>'<i>\t</i>'); if (is_array($var)) { $results = "<b>Array (".count($var).")</b>"; foreach ($var as $curr_key => $curr_val) { $return = smarty_modifier_debug_print_var($curr_val, $depth+1, $length); $results .= "<br>".str_repeat(' ', $depth*2)."<b>".strtr($curr_key, $_replace)."</b> => $return"; } } else if (is_object($var)) { $object_vars = get_object_vars($var); $results = "<b>".get_class($var)." Object (".count($object_vars).")</b>"; foreach ($object_vars as $curr_key => $curr_val) { $return = smarty_modifier_debug_print_var($curr_val, $depth+1, $length); $results .= "<br>".str_repeat(' ', $depth*2)."<b>$curr_key</b> => $return"; } } else if (is_resource($var)) { $results = '<i>'.(string)$var.'</i>'; } else if (empty($var) && $var != "0") { $results = '<i>empty</i>'; } else { if (strlen($var) > $length ) { $results = substr($var, 0, $length-3).'...'; } else { $results = $var; } $results = htmlspecialchars($results); $results = strtr($results, $_replace); } return $results; } /* vim: set expandtab: */ ?> --- NEW FILE: function.html_options.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {html_options} function plugin * * Type: function<br> * Name: html_options<br> * Input:<br> * - name (optional) - string default "select" * - values (required if no options supplied) - array * - options (required if no values supplied) - associative array * - selected (optional) - string default not set * - output (required if not options supplied) - array * Purpose: Prints the list of <option> tags generated from * the passed parameters * @link http://smarty.php.net/manual/en/language.function.html.options.php {html_image} * (Smarty online manual) * @param array * @param Smarty * @return string * @uses smarty_function_escape_special_chars() */ function smarty_function_html_options($params, &$smarty) { require_once $smarty->_get_plugin_filepath('shared','escape_special_chars'); $name = null; $values = null; $options = null; $selected = array(); $output = null; $extra = ''; foreach($params as $_key => $_val) { switch($_key) { case 'name': $$_key = (string)$_val; break; case 'options': $$_key = (array)$_val; break; case 'values': case 'output': $$_key = array_values((array)$_val); break; case 'selected': $$_key = array_map('strval', array_values((array)$_val)); break; default: if(!is_array($_val)) { $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"'; } else { $smarty->trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE); } break; } } if (!isset($options) && !isset($values)) return ''; /* raise error here? */ $_html_result = ''; if (is_array($options)) { foreach ($options as $_key=>$_val) $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected); } else { foreach ((array)$values as $_i=>$_key) { $_val = isset($output[$_i]) ? $output[$_i] : ''; $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected); } } if(!empty($name)) { $_html_result = '<select name="' . $name . '"' . $extra . '>' . "\n" . $_html_result . '</select>' . "\n"; } return $_html_result; } function smarty_function_html_options_optoutput($key, $value, $selected) { if(!is_array($value)) { $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' . smarty_function_escape_special_chars($key) . '"'; if (in_array((string)$key, $selected)) $_html_result .= ' selected="selected"'; $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n"; } else { $_html_result = smarty_function_html_options_optgroup($key, $value, $selected); } return $_html_result; } function smarty_function_html_options_optgroup($key, $values, $selected) { $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n"; foreach ($values as $key => $value) { $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected); } $optgroup_html .= "</optgroup>\n"; return $optgroup_html; } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.count_characters.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty count_characters modifier plugin * * Type: modifier<br> * Name: count_characteres<br> * Purpose: count the number of characters in a text * @link http://smarty.php.net/manual/en/language.modifier.count.characters.php * count_characters (Smarty online manual) * @param string * @param boolean include whitespace in the character count * @return integer */ function smarty_modifier_count_characters($string, $include_spaces = false) { if ($include_spaces) return(strlen($string)); return preg_match_all("/[^\s]/",$string, $match); } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.count_paragraphs.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty count_paragraphs modifier plugin * * Type: modifier<br> * Name: count_paragraphs<br> * Purpose: count the number of paragraphs in a text * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php * count_paragraphs (Smarty online manual) * @param string * @return integer */ function smarty_modifier_count_paragraphs($string) { // count \r or \n characters return count(preg_split('/[\r\n]+/', $string)); } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.count_words.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty count_words modifier plugin * * Type: modifier<br> * Name: count_words<br> * Purpose: count the number of words in a text * @link http://smarty.php.net/manual/en/language.modifier.count.words.php * count_words (Smarty online manual) * @param string * @return integer */ function smarty_modifier_count_words($string) { // split text by ' ',\r,\n,\f,\t $split_array = preg_split('/\s+/',$string); // count matches that contain alphanumerics $word_count = preg_grep('/[a-zA-Z0-9\\x80-\\xff]/', $split_array); return count($word_count); } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.count_sentences.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty count_sentences modifier plugin * * Type: modifier<br> * Name: count_sentences * Purpose: count the number of sentences in a text * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php * count_sentences (Smarty online manual) * @param string * @return integer */ function smarty_modifier_count_sentences($string) { // find periods with a word before but not after. return preg_match_all('/[^\s]\.(?!\w)/', $string, $match); } /* vim: set expandtab: */ ?> --- NEW FILE: function.html_select_time.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {html_select_time} function plugin * * Type: function<br> * Name: html_select_time<br> * Purpose: Prints the dropdowns for time selection * @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time} * (Smarty online manual) * @param array * @param Smarty * @return string * @uses smarty_make_timestamp() */ function smarty_function_html_select_time($params, &$smarty) { require_once $smarty->_get_plugin_filepath('shared','make_timestamp'); require_once $smarty->_get_plugin_filepath('function','html_options'); /* Default values. */ $prefix = "Time_"; $time = time(); $display_hours = true; $display_minutes = true; $display_seconds = true; $display_meridian = true; $use_24_hours = true; $minute_interval = 1; $second_interval = 1; /* Should the select boxes be part of an array when returned from PHP? e.g. setting it to "birthday", would create "birthday[Hour]", "birthday[Minute]", "birthday[Seconds]" & "birthday[Meridian]". Can be combined with prefix. */ $field_array = null; $all_extra = null; $hour_extra = null; $minute_extra = null; $second_extra = null; $meridian_extra = null; foreach ($params as $_key=>$_value) { switch ($_key) { case 'prefix': case 'time': case 'field_array': case 'all_extra': case 'hour_extra': case 'minute_extra': case 'second_extra': case 'meridian_extra': $$_key = (string)$_value; break; case 'display_hours': case 'display_minutes': case 'display_seconds': case 'display_meridian': case 'use_24_hours': $$_key = (bool)$_value; break; case 'minute_interval': case 'second_interval': $$_key = (int)$_value; break; default: $smarty->trigger_error("[html_select_time] unknown parameter $_key", E_USER_WARNING); } } $time = smarty_make_timestamp($time); $html_result = ''; if ($display_hours) { $hours = $use_24_hours ? range(0, 23) : range(1, 12); $hour_fmt = $use_24_hours ? '%H' : '%I'; for ($i = 0, $for_max = count($hours); $i < $for_max; $i++) $hours[$i] = sprintf('%02d', $hours[$i]); $html_result .= '<select name='; if (null !== $field_array) { $html_result .= '"' . $field_array . '[' . $prefix . 'Hour]"'; } else { $html_result .= '"' . $prefix . 'Hour"'; } if (null !== $hour_extra){ $html_result .= ' ' . $hour_extra; } if (null !== $all_extra){ $html_result .= ' ' . $all_extra; } $html_result .= '>'."\n"; $html_result .= smarty_function_html_options(array('output' => $hours, 'values' => $hours, 'selected' => strftime($hour_fmt, $time), 'print_result' => false), $smarty); $html_result .= "</select>\n"; } if ($display_minutes) { $all_minutes = range(0, 59); for ($i = 0, $for_max = count($all_minutes); $i < $for_max; $i+= $minute_interval) $minutes[] = sprintf('%02d', $all_minutes[$i]); $selected = intval(floor(strftime('%M', $time) / $minute_interval) * $minute_interval); $html_result .= '<select name='; if (null !== $field_array) { $html_result .= '"' . $field_array . '[' . $prefix . 'Minute]"'; } else { $html_result .= '"' . $prefix . 'Minute"'; } if (null !== $minute_extra){ $html_result .= ' ' . $minute_extra; } if (null !== $all_extra){ $html_result .= ' ' . $all_extra; } $html_result .= '>'."\n"; $html_result .= smarty_function_html_options(array('output' => $minutes, 'values' => $minutes, 'selected' => $selected, 'print_result' => false), $smarty); $html_result .= "</select>\n"; } if ($display_seconds) { $all_seconds = range(0, 59); for ($i = 0, $for_max = count($all_seconds); $i < $for_max; $i+= $second_interval) $seconds[] = sprintf('%02d', $all_seconds[$i]); $selected = intval(floor(strftime('%S', $time) / $second_interval) * $second_interval); $html_result .= '<select name='; if (null !== $field_array) { $html_result .= '"' . $field_array . '[' . $prefix . 'Second]"'; } else { $html_result .= '"' . $prefix . 'Second"'; } if (null !== $second_extra){ $html_result .= ' ' . $second_extra; } if (null !== $all_extra){ $html_result .= ' ' . $all_extra; } $html_result .= '>'."\n"; $html_result .= smarty_function_html_options(array('output' => $seconds, 'values' => $seconds, 'selected' => $selected, 'print_result' => false), $smarty); $html_result .= "</select>\n"; } if ($display_meridian && !$use_24_hours) { $html_result .= '<select name='; if (null !== $field_array) { $html_result .= '"' . $field_array . '[' . $prefix . 'Meridian]"'; } else { $html_result .= '"' . $prefix . 'Meridian"'; } if (null !== $meridian_extra){ $html_result .= ' ' . $meridian_extra; } if (null !== $all_extra){ $html_result .= ' ' . $all_extra; } $html_result .= '>'."\n"; $html_result .= smarty_function_html_options(array('output' => array('AM', 'PM'), 'values' => array('am', 'pm'), 'selected' => strtolower(strftime('%p', $time)), 'print_result' => false), $smarty); $html_result .= "</select>\n"; } return $html_result; } /* vim: set expandtab: */ ?> --- NEW FILE: function.html_image.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {html_image} function plugin * * Type: function<br> * Name: html_image<br> * Date: Feb 24, 2003<br> * Purpose: format HTML tags for the image<br> * Input:<br> * - file = file (and path) of image (required) * - border = border width (optional, default 0) * - height = image height (optional, default actual height) * - image =image width (optional, default actual width) * - basedir = base directory for absolute paths, default * is environment variable DOCUMENT_ROOT * * Examples: {html_image file="images/masthead.gif"} * Output: <img src="images/masthead.gif" border=0 width=400 height=23> * @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image} * (Smarty online manual) * @author Monte Ohrt <mo...@is...> * @author credits to Duda <du...@bi...> - wrote first image function * in repository, helped with lots of functionality * @version 1.0 * @param array * @param Smarty * @return string * @uses smarty_function_escape_special_chars() */ function smarty_function_html_image($params, &$smarty) { require_once $smarty->_get_plugin_filepath('shared','escape_special_chars'); $alt = ''; $file = ''; $border = 0; $height = ''; $width = ''; $extra = ''; $prefix = ''; $suffix = ''; $server_vars = ($smarty->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS']; $basedir = isset($server_vars['DOCUMENT_ROOT']) ? $server_vars['DOCUMENT_ROOT'] : ''; foreach($params as $_key => $_val) { switch($_key) { case 'file': case 'border': case 'height': case 'width': case 'dpi': case 'basedir': $$_key = $_val; break; case 'alt': if(!is_array($_val)) { $$_key = smarty_function_escape_special_chars($_val); } else { $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE); } break; case 'link': case 'href': $prefix = '<a href="' . $_val . '">'; $suffix = '</a>'; break; default: if(!is_array($_val)) { $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"'; } else { $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE); } break; } } if (empty($file)) { $smarty->trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE); return; } if (substr($file,0,1) == '/') { $_image_path = $basedir . $file; } else { $_image_path = $file; } if(!isset($params['width']) || !isset($params['height'])) { if ($smarty->security && ($_params = array('resource_type' => 'file', 'resource_name' => $_image_path)) && (require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.is_secure.php')) && (!smarty_core_is_secure($_params, $smarty)) ) { $smarty->trigger_error("html_image: (secure) '$_image_path' not in secure directory", E_USER_NOTICE); } elseif (!$_image_data = @getimagesize($_image_path)) { if(!file_exists($_image_path)) { $smarty->trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE); return; } else if(!is_readable($_image_path)) { $smarty->trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE); return; } else { $smarty->trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE); return; } } if(!isset($params['width'])) { $width = $_image_data[0]; } if(!isset($params['height'])) { $height = $_image_data[1]; } } if(isset($params['dpi'])) { if(strstr($server_vars['HTTP_USER_AGENT'], 'Mac')) { $dpi_default = 72; } else { $dpi_default = 96; } $_resize = $dpi_default/$params['dpi']; $width = round($width * $_resize); $height = round($height * $_resize); } return $prefix . '<img src="'.$file.'" alt="'.$alt.'" border="'.$border.'" width="'.$width.'" height="'.$height.'"'.$extra.' />' . $suffix; } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.capitalize.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty capitalize modifier plugin * * Type: modifier<br> * Name: capitalize<br> * Purpose: capitalize words in the string * @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE * capitalize (Smarty online manual) * @param string * @return string */ function smarty_modifier_capitalize($string, $uc_digits = false) { smarty_modifier_capitalize_ucfirst(null, $uc_digits); return preg_replace_callback('!\b\w+\b!', 'smarty_modifier_capitalize_ucfirst', $string); } function smarty_modifier_capitalize_ucfirst($string, $uc_digits = null) { static $_uc_digits = false; if(isset($uc_digits)) { $_uc_digits = $uc_digits; return; } if(!preg_match('!\d!',$string[0]) || $_uc_digits) return ucfirst($string[0]); else return $string[0]; } ?> --- NEW FILE: function.html_table.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {html_table} function plugin * * Type: function<br> * Name: html_table<br> * Date: Feb 17, 2003<br> * Purpose: make an html table from an array of data<br> * Input:<br> * - loop = array to loop through * - cols = number of columns * - rows = number of rows * - table_attr = table attributes * - tr_attr = table row attributes (arrays are cycled) * - td_attr = table cell attributes (arrays are cycled) * - trailpad = value to pad trailing cells with * - vdir = vertical direction (default: "down", means top-to-bottom) * - hdir = horizontal direction (default: "right", means left-to-right) * - inner = inner loop (default "cols": print $loop line by line, * $loop will be printed column by column otherwise) * * * Examples: * <pre> * {table loop=$data} * {table loop=$data cols=4 tr_attr='"bgcolor=red"'} * {table loop=$data cols=4 tr_attr=$colors} * </pre> * @author Monte Ohrt <mo...@is...> * @version 1.0 * @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table} * (Smarty online manual) * @param array * @param Smarty * @return string */ function smarty_function_html_table($params, &$smarty) { $table_attr = 'border="1"'; $tr_attr = ''; $td_attr = ''; $cols = 3; $rows = 3; $trailpad = ' '; $vdir = 'down'; $hdir = 'right'; $inner = 'cols'; if (!isset($params['loop'])) { $smarty->trigger_error("html_table: missing 'loop' parameter"); return; } foreach ($params as $_key=>$_value) { switch ($_key) { case 'loop': $$_key = (array)$_value; break; case 'cols': case 'rows': $$_key = (int)$_value; break; case 'table_attr': case 'trailpad': case 'hdir': case 'vdir': $$_key = (string)$_value; break; case 'tr_attr': case 'td_attr': $$_key = $_value; break; } } $loop_count = count($loop); if (empty($params['rows'])) { /* no rows specified */ $rows = ceil($loop_count/$cols); } elseif (empty($params['cols'])) { if (!empty($params['rows'])) { /* no cols specified, but rows */ $cols = ceil($loop_count/$rows); } } $output = "<table $table_attr>\n"; for ($r=0; $r<$rows; $r++) { $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n"; $rx = ($vdir == 'down') ? $r*$cols : ($rows-1-$r)*$cols; for ($c=0; $c<$cols; $c++) { $x = ($hdir == 'right') ? $rx+$c : $rx+$cols-1-$c; if ($inner!='cols') { /* shuffle x to loop over rows*/ $x = floor($x/$cols) + ($x%$cols)*$rows; } if ($x<$loop_count) { $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n"; } else { $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n"; } } $output .= "</tr>\n"; } $output .= "</table>\n"; return $output; } function smarty_function_html_table_cycle($name, $var, $no) { if(!is_array($var)) { $ret = $var; } else { $ret = $var[$no % count($var)]; } return ($ret) ? ' '.$ret : ''; } /* vim: set expandtab: */ ?> --- NEW FILE: modifier.spacify.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty spacify modifier plugin * * Type: modifier<br> * Name: spacify<br> * Purpose: add spaces between characters in a string * @link http://smarty.php.net/manual/en/language.modifier.spacify.php * spacify (Smarty online manual) * @param string * @param string * @return string */ function smarty_modifier_spacify($string, $spacify_char = ' ') { return implode($spacify_char, preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY)); } /* vim: set expandtab: */ ?> --- NEW FILE: function.popup.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {popup} function plugin * * Type: function<br> * Name: popup<br> * Purpose: make text pop up in windows via overlib * @link http://smarty.php.net/manual/en/language.function.popup.php {popup} * (Smarty online manual) * @param array * @param Smarty * @return string */ function smarty_function_popup($params, &$smarty) { $append = ''; foreach ($params as $_key=>$_value) { switch ($_key) { case 'text': case 'trigger': $$_key = (string)$_value; break; case 'caption': case 'closetext': case 'status': $append .= ',' . strtoupper($_key) . ",'" . str_replace("'","\'",$_value) . "'"; break; case 'fgcolor': case 'bgcolor': case 'textcolor': case 'capcolor': case 'closecolor': case 'textfont': case 'captionfont': case 'closefont': case 'fgbackground': case 'bgbackground': case 'inarray': case 'caparray': case 'capicon': case 'background': case 'frame': case 'function': $append .= ',' . strtoupper($_key) . ",'$_value'"; break; case 'textsize': case 'captionsize': case 'closesize': case 'width': case 'height': case 'border': case 'offsetx': case 'offsety': case 'snapx': case 'snapy': case 'fixx': case 'fixy': case 'padx': case 'pady': case 'timeout': case 'delay': $append .= ',' . strtoupper($_key) . ",$_value"; break; case 'sticky': case 'left': case 'right': case 'center': case 'above': case 'below': case 'noclose': case 'autostatus': case 'autostatuscap': case 'fullhtml': case 'hauto': case 'vauto': if ($_value) $append .= ',' . strtoupper($_key); break; default: $smarty->trigger_error("[popup] unknown parameter $_key", E_USER_WARNING); } } if (empty($text) && !isset($inarray) && empty($function)) { $smarty->trigger_error("overlib: attribute 'text' or 'inarray' or 'function' required"); return false; } if (empty($trigger)) { $trigger = "onmouseover"; } $retval = $trigger . '="return overlib(\''.preg_replace(array("!'!","![\r\n]!"),array("\'",'\r'),$text).'\''; $retval .= $append . ');" onmouseout="nd();"'; return $retval; } /* vim: set expandtab: */ ?> --- NEW FILE: function.counter.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {counter} function plugin * * Type: function<br> * Name: counter<br> * Purpose: print out a counter value * @link http://smarty.php.net/manual/en/language.function.counter.php {counter} * (Smarty online manual) * @param array parameters * @param Smarty * @return string|null */ function smarty_function_counter($params, &$smarty) { static $counters = array(); $name = (isset($params['name'])) ? $params['name'] : 'default'; if (!isset($counters[$name])) { $counters[$name] = array( 'start'=>1, 'skip'=>1, 'direction'=>'up', 'count'=>1 ); } $counter =& $counters[$name]; if (isset($params['start'])) { $counter['start'] = $counter['count'] = (int)$params['start']; } if (!empty($params['assign'])) { $counter['assign'] = $params['assign']; } if (isset($counter['assign'])) { $smarty->assign($counter['assign'], $counter['count']); } if (isset($params['print'])) { $print = (bool)$params['print']; } else { $print = empty($counter['assign']); } if ($print) { $retval = $counter['count']; } else { $retval = null; } if (isset($params['skip'])) { $counter['skip'] = $params['skip']; } if (isset($params['direction'])) { $counter['direction'] = $params['direction']; } if ($counter['direction'] == "down") $counter['count'] -= $counter['skip']; else $counter['count'] += $counter['skip']; return $retval; } /* vim: set expandtab: */ ?> --- NEW FILE: function.html_radios.php --- <?php /** * Smarty plugin * @package Smarty * @subpackage plugins */ /** * Smarty {html_radios} function plugin * * File: function.html_radios.php<br> * Type: function<br> * Name: html_radios<br> * Date: 24.Feb.2003<br> * Purpose: Prints out a list of radio input types<br> * Input:<br> * - name (optional) - string default "radio" * - values (requ... [truncated message content] |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:55:53
|
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31275/Smarty/libs Added Files: Tag: branch-smarty Config_File.class.php Smarty.class.php Smarty_Compiler.class.php debug.tpl Log Message: added smarty libs --- NEW FILE: Smarty_Compiler.class.php --- <?php /** * Project: Smarty: the PHP compiling template engine * File: Smarty_Compiler.class.php * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA [...2208 lines suppressed...] * @access private * @param string $a * @param string $b * @return 0|-1|1 */ function _smarty_sort_length($a, $b) { if($a == $b) return 0; if(strlen($a) == strlen($b)) return ($a > $b) ? -1 : 1; return (strlen($a) > strlen($b)) ? -1 : 1; } /* vim: set et: */ ?> --- NEW FILE: debug.tpl --- {* Smarty *} {* debug.tpl, last updated version 2.0.1 *} {assign_debug_info} {if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"} <table border=0 width=100%> <tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr> <tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr> {section name=templates loop=$_debug_tpls} <tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth} {/section}<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html}</font>{if isset($_debug_tpls[templates].exec_time)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% eq 0} (total){/if}</i></font>{/if}</tt></td></tr> {sectionelse} <tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr> {/section} <tr bgcolor=#cccccc><td colspan=2><b>assigned template variables:</b></td></tr> {section name=vars loop=$_debug_keys} <tr bgcolor={if %vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=blue>{ldelim}${$_debug_keys[vars]}{rdelim}</font></tt></td><td nowrap><tt><font color=green>{$_debug_vals[vars]|@debug_print_var}</font></tt></td></tr> {sectionelse} <tr bgcolor=#eeeeee><td colspan=2><tt><i>no template variables assigned</i></tt></td></tr> {/section} <tr bgcolor=#cccccc><td colspan=2><b>assigned config file variables (outer template scope):</b></td></tr> {section name=config_vars loop=$_debug_config_keys} <tr bgcolor={if %config_vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=maroon>{ldelim}#{$_debug_config_keys[config_vars]}#{rdelim}</font></tt></td><td><tt><font color=green>{$_debug_config_vals[config_vars]|@debug_print_var}</font></tt></td></tr> {sectionelse} <tr bgcolor=#eeeeee><td colspan=2><tt><i>no config vars assigned</i></tt></td></tr> {/section} </table> </BODY></HTML> {else} <SCRIPT language=javascript> if( self.name == '' ) {ldelim} var title = 'Console'; {rdelim} else {ldelim} var title = 'Console_' + self.name; {rdelim} _smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes"); _smarty_console.document.write("<HTML><TITLE>Smarty Debug Console_"+self.name+"</TITLE><BODY bgcolor=#ffffff>"); _smarty_console.document.write("<table border=0 width=100%>"); _smarty_console.document.write("<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>"); _smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>"); {section name=templates loop=$_debug_tpls} _smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth} {/section}<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html|escape:javascript}</font>{if isset($_debug_tpls[templates].exec_time)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% eq 0} (total){/if}</i></font>{/if}</tt></td></tr>"); {sectionelse} _smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>"); {/section} _smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>assigned template variables:</b></td></tr>"); {section name=vars loop=$_debug_keys} _smarty_console.document.write("<tr bgcolor={if %vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=blue>{ldelim}${$_debug_keys[vars]}{rdelim}</font></tt></td><td nowrap><tt><font color=green>{$_debug_vals[vars]|@debug_print_var|escape:javascript}</font></tt></td></tr>"); {sectionelse} _smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no template variables assigned</i></tt></td></tr>"); {/section} _smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>assigned config file variables (outer template scope):</b></td></tr>"); {section name=config_vars loop=$_debug_config_keys} _smarty_console.document.write("<tr bgcolor={if %config_vars.index% is even}#eeeeee{else}#fafafa{/if}><td valign=top><tt><font color=maroon>{ldelim}#{$_debug_config_keys[config_vars]}#{rdelim}</font></tt></td><td><tt><font color=green>{$_debug_config_vals[config_vars]|@debug_print_var|escape:javascript}</font></tt></td></tr>"); {sectionelse} _smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no config vars assigned</i></tt></td></tr>"); {/section} _smarty_console.document.write("</table>"); _smarty_console.document.write("</BODY></HTML>"); _smarty_console.document.close(); </SCRIPT> {/if} --- NEW FILE: Smarty.class.php --- <?php /** * Project: Smarty: the PHP compiling template engine * File: Smarty.class.php * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA [...1892 lines suppressed...] return include($filename); } } /** * wrapper for eval() retaining $this * @return mixed */ function _eval($code, $params=null) { return eval($code); } /**#@-*/ } /* vim: set expandtab: */ ?> --- NEW FILE: Config_File.class.php --- <?php /** * Config_File class. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * @link http://smarty.php.net/ * @version 2.6.4 * @copyright Copyright: 2001-2004 ispi of Lincoln, Inc. * @author Andrei Zmievski <an...@ph...> * @access public * @package Smarty */ /* $Id: Config_File.class.php,v 1.1.2.1 2004/09/09 14:55:43 garvinhicking Exp $ */ /** * Config file reading class * @package Smarty */ class Config_File { /**#@+ * Options * @var boolean */ /** * Controls whether variables with the same name overwrite each other. */ var $overwrite = true; /** * Controls whether config values of on/true/yes and off/false/no get * converted to boolean values automatically. */ var $booleanize = true; /** * Controls whether hidden config sections/vars are read from the file. */ var $read_hidden = true; /** * Controls whether or not to fix mac or dos formatted newlines. * If set to true, \r or \r\n will be changed to \n. */ var $fix_newlines = true; /**#@-*/ /** @access private */ var $_config_path = ""; var $_config_data = array(); /**#@-*/ /** * Constructs a new config file class. * * @param string $config_path (optional) path to the config files */ function Config_File($config_path = NULL) { if (isset($config_path)) $this->set_path($config_path); } /** * Set the path where configuration files can be found. * * @param string $config_path path to the config files */ function set_path($config_path) { if (!empty($config_path)) { if (!is_string($config_path) || !file_exists($config_path) || !is_dir($config_path)) { $this->_trigger_error_msg("Bad config file path '$config_path'"); return; } if(substr($config_path, -1) != DIRECTORY_SEPARATOR) { $config_path .= DIRECTORY_SEPARATOR; } $this->_config_path = $config_path; } } /** * Retrieves config info based on the file, section, and variable name. * * @param string $file_name config file to get info for * @param string $section_name (optional) section to get info for * @param string $var_name (optional) variable to get info for * @return string|array a value or array of values */ function &get($file_name, $section_name = NULL, $var_name = NULL) { if (empty($file_name)) { $this->_trigger_error_msg('Empty config file name'); return; } else { $file_name = $this->_config_path . $file_name; if (!isset($this->_config_data[$file_name])) $this->load_file($file_name, false); } if (!empty($var_name)) { if (empty($section_name)) { return $this->_config_data[$file_name]["vars"][$var_name]; } else { if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name])) return $this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name]; else return array(); } } else { if (empty($section_name)) { return (array)$this->_config_data[$file_name]["vars"]; } else { if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"])) return (array)$this->_config_data[$file_name]["sections"][$section_name]["vars"]; else return array(); } } } /** * Retrieves config info based on the key. * * @param $file_name string config key (filename/section/var) * @return string|array same as get() * @uses get() retrieves information from config file and returns it */ function &get_key($config_key) { list($file_name, $section_name, $var_name) = explode('/', $config_key, 3); $result = &$this->get($file_name, $section_name, $var_name); return $result; } /** * Get all loaded config file names. * * @return array an array of loaded config file names */ function get_file_names() { return array_keys($this->_config_data); } /** * Get all section names from a loaded file. * * @param string $file_name config file to get section names from * @return array an array of section names from the specified file */ function get_section_names($file_name) { $file_name = $this->_config_path . $file_name; if (!isset($this->_config_data[$file_name])) { $this->_trigger_error_msg("Unknown config file '$file_name'"); return; } return array_keys($this->_config_data[$file_name]["sections"]); } /** * Get all global or section variable names. * * @param string $file_name config file to get info for * @param string $section_name (optional) section to get info for * @return array an array of variables names from the specified file/section */ function get_var_names($file_name, $section = NULL) { if (empty($file_name)) { $this->_trigger_error_msg('Empty config file name'); return; } else if (!isset($this->_config_data[$file_name])) { $this->_trigger_error_msg("Unknown config file '$file_name'"); return; } if (empty($section)) return array_keys($this->_config_data[$file_name]["vars"]); else return array_keys($this->_config_data[$file_name]["sections"][$section]["vars"]); } /** * Clear loaded config data for a certain file or all files. * * @param string $file_name file to clear config data for */ function clear($file_name = NULL) { if ($file_name === NULL) $this->_config_data = array(); else if (isset($this->_config_data[$file_name])) $this->_config_data[$file_name] = array(); } /** * Load a configuration file manually. * * @param string $file_name file name to load * @param boolean $prepend_path whether current config path should be * prepended to the filename */ function load_file($file_name, $prepend_path = true) { if ($prepend_path && $this->_config_path != "") $config_file = $this->_config_path . $file_name; else $config_file = $file_name; ini_set('track_errors', true); $fp = @fopen($config_file, "r"); if (!is_resource($fp)) { $this->_trigger_error_msg("Could not open config file '$config_file'"); return false; } $contents = ($size = filesize($config_file)) ? fread($fp, $size) : ''; fclose($fp); $this->_config_data[$config_file] = $this->parse_contents($contents); return true; } /** * Store the contents of a file manually. * * @param string $config_file file name of the related contents * @param string $contents the file-contents to parse */ function set_file_contents($config_file, $contents) { $this->_config_data[$config_file] = $this->parse_contents($contents); return true; } /** * parse the source of a configuration file manually. * * @param string $contents the file-contents to parse */ function parse_contents($contents) { if($this->fix_newlines) { // fix mac/dos formatted newlines $contents = preg_replace('!\r\n?!', "\n", $contents); } $config_data = array(); $config_data['sections'] = array(); $config_data['vars'] = array(); /* reference to fill with data */ $vars =& $config_data['vars']; /* parse file line by line */ preg_match_all('!^.*\r?\n?!m', $contents, $match); $lines = $match[0]; for ($i=0, $count=count($lines); $i<$count; $i++) { $line = $lines[$i]; if (empty($line)) continue; if ( $line{0} == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) { /* section found */ if ($match[1]{0} == '.') { /* hidden section */ if ($this->read_hidden) { $section_name = substr($match[1], 1); } else { /* break reference to $vars to ignore hidden section */ unset($vars); $vars = array(); continue; } } else { $section_name = $match[1]; } if (!isset($config_data['sections'][$section_name])) $config_data['sections'][$section_name] = array('vars' => array()); $vars =& $config_data['sections'][$section_name]['vars']; continue; } if (preg_match('/^\s*(\.?\w+)\s*=\s*(.*)/s', $line, $match)) { /* variable found */ $var_name = rtrim($match[1]); if (strpos($match[2], '"""') === 0) { /* handle multiline-value */ $lines[$i] = substr($match[2], 3); $var_value = ''; while ($i<$count) { if (($pos = strpos($lines[$i], '"""')) === false) { $var_value .= $lines[$i++]; } else { /* end of multiline-value */ $var_value .= substr($lines[$i], 0, $pos); break; } } $booleanize = false; } else { /* handle simple value */ $var_value = preg_replace('/^([\'"])(.*)\1$/', '\2', rtrim($match[2])); $booleanize = $this->booleanize; } $this->_set_config_var($vars, $var_name, $var_value, $booleanize); } /* else unparsable line / means it is a comment / means ignore it */ } return $config_data; } /**#@+ @access private */ /** * @param array &$container * @param string $var_name * @param mixed $var_value * @param boolean $booleanize determines whether $var_value is converted to * to true/false */ function _set_config_var(&$container, $var_name, $var_value, $booleanize) { if ($var_name{0} == '.') { if (!$this->read_hidden) return; else $var_name = substr($var_name, 1); } if (!preg_match("/^[a-zA-Z_]\w*$/", $var_name)) { $this->_trigger_error_msg("Bad variable name '$var_name'"); return; } if ($booleanize) { if (preg_match("/^(on|true|yes)$/i", $var_value)) $var_value = true; else if (preg_match("/^(off|false|no)$/i", $var_value)) $var_value = false; } if (!isset($container[$var_name]) || $this->overwrite) $container[$var_name] = $var_value; else { settype($container[$var_name], 'array'); $container[$var_name][] = $var_value; } } /** * @uses trigger_error() creates a PHP warning/error * @param string $error_msg * @param integer $error_type one of */ function _trigger_error_msg($error_msg, $error_type = E_USER_WARNING) { trigger_error("Config_File error: $error_msg", $error_type); } /**#@-*/ } ?> |
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31275/Smarty Added Files: Tag: branch-smarty BUGS COPYING.lib ChangeLog FAQ INSTALL NEWS README RELEASE_NOTES TODO Log Message: added smarty libs --- NEW FILE: COPYING.lib --- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS --- NEW FILE: INSTALL --- REQUIREMENTS: Smarty requires PHP 4.0.6 or later. See the on-line documentation for complete install instructions. INSTALLATION (quick): * copy the files under the libs/ directory to a directory that is in your PHP include_path, or set the SMARTY_DIR constant and put them in this directory. (if you upgrade from versions before 2.5.0 be aware that up to Smarty 2.4.2 all necessary files where in the distribution's root directory, but are now in libs/.) * for each application using Smarty, create a "templates", "configs", and a "templates_c" directory, be sure to set the appropriate directory settings in Smarty for them. If they are located in the same directory as your application, they shouldn't need to be modified. Be sure the "templates_c" directory is writable by your web server user (usually nobody). chown nobody:nobody templates_c; chmod 700 templates_c You can also chmod 777 this directory, but be aware of security issues for multi-user systems. If you are using Smarty's built-in caching, create a "cache" directory and also chown nobody:nobody. * setup your php and template files. A good working example is in the on-line documentation. * TECHNICAL NOTE: If you do not have access to the php.ini file, you can change non-server settings (such as your include_path) with the ini_set() command. example: ini_set("include_path",".:/usr/local/lib/php"); --- NEW FILE: NEWS --- Version 2.6.4 (Sept 7, 2004) ---------------------------- - add $smarty.ldelim and $smarty.rdelim to smarty special var (Monte) - fall back to old uniqid()-behaviour when tempnam() fails in core.write_file.php (messju) - fix capitalize modifier, don't rely on buggy ucwords (Monte) - make html_select_date work with negative timestamps, also force year range to include given date unless explicitly set (Garo, Monte) - fix bug with {fetch}, passing user/pass in url did not work (Monte) - fix occasional wrong error messages on mismatched tags when {else}, {elseif}, {foreachelse} or {sectionelse} is involved (messju) - fix handling of methods arguments (messju, Manfred Wischin) - remove touch() call that made the compiled-template's timestamp the same as the source-template's one. (messju) - add assign attribute to html_checkboxes and html_radios (pcg, Monte) - remove non-xhtml conformant tag from mailto function (tacker, Monte) - handle date_format codes %e, %T and %D for windows (tip, Monte) - fix unnecessary call to smarty_core_get_include_path() inside Smarty::_get_auto_filename() (c960657, messju) - add error-messages when anything else than an identifier is passed to foreach's key- or item-attribute (messju) - fix handling of digits inside tagnames (messju) - fix escaping of backslashes in Smarty_Compiler::_quote_replace() (messju) Version 2.6.3 (June 16, 2004) ----------------------------- - added escapement of '</' to '<\/' in escape:javascript modifier (c960657, Monte) - added obfuscation of protocol-string in {mailto} when using hex- encoding (bharat, messju) - enhanced auto-generated filenames for templates_c and cache (messju) - add 'nonstd' to escape modifier for escaping non-std chars, such as ms doc quote (Monte) - adjusted textformat to not output wrap chars after last para (Monte) - use tempnam() instead of unqid() to create better temporary files in smarty_core_write_file() (xces, messju) - add 'mail' to escape modifier for safe display of e-mail addresses (Monte) - add cycle function attribute "reset" to english docs (Monte) - enhanced support of numeric constants as variable-expressions (messju) - add case decentity to smarty_modifier_escape() (Konstantin A. Pelepelin, messju) - make smarty_core_write_compiled_include() php5-aware (messju) - removed unused functionality to load a subset of lines from a file (messju) - fix is_secure() should only check if a file is_readable, not if the directory where it is in is readable (sagi, messju) - fix problem displaying debug console when $default_resource_type is not "file:" (c960657, Monte) - fix permission handling with security and config_load (messju) - removed '.' from the list of default template locations in _parse_resource_name() (messju) - fix avoid warning with template_exists() on an absolute paths (messju) - fix parameters passed to resource's secure()-function (messju) - fix handling of integer values like width and delay im smarty_function_popup() (messju) Version 2.6.2 (Feb 17, 2004) ---------------------------- - fix allow empty years, months and days in html_select_date's time-attribute (messju) - fix YES and NO should not be booleanized inside triple-quotes in a config-file (messju) - fix accidently slurped line following a triple-quoted value in a config-file (messju) - change default for use_sub_dirs to false (messju) - fix quoting of values in smarty_function_popup() (messju) - fix handling of hidden sections in Config_File (messju) - add handling of resources for {config_load} (messju) - fix bug when using arrays with tr_attr and td_attr in {html_table} (messju) - add unit testing to cvs core (Monte) Version 2.6.1 (Jan 16, 2004) ---------------------------- - rename $smarty->tpl_error_reporting to $smarty->error_reporting (messju) - fix interpretation of $smarty->security in {html_image} (messju) - add caching of requested paths to _assemble_plugin_filepath() (messju) - fix handling of comments inside {php}- and {literal}-blocks (messju) - fix bug handling triple-quotes in config-files (BRDude, messju) - change default of request_use_auto_globals to true - $_SERVER is now preferred over $HTTP_SERVER_VARS (messju) - re-add support for $SCRIPT_NAME (messju) - reactivate $smarty->default_modifiers (messju) - add cookie persistance to debug console (Monte) - allow single-digit days and months without smarty_make_timestamp() in html_select_date (messju) - fix headers sent erroneously with cache_modified_check and fetch() (wphilips, messju) - fix config_file path bug (Marc Cabadas, Monte) - fix 'is even by' and 'is odd by' logic (Monte) - add day_empty, month_empty, year_empty and all_empty attributes to html_select_date (messju) - add table of explanation for {if} qualifiers in docs (boots) - fix bug when comparing array-keys to "selected" in html_options and html_checkboxes (messju) - add better checks for correctly nested tags when compiling (messju) - remove {$SCRIPT_NAME}. use {$smarty.server.SCRIPT_NAME} instead (messju) - remove $global_assign. assign global variables explicitly instead (messju) - fix example for count_characters in docs (boots) - add section new basic syntax section "Escaping Smarty Parsing" in docs (boots) - fix error handler call in config_load (boots) - remove warning in debug_print_var on php-resources (messju) - move function.assign.php to compiler.assign.php (messju) - add property $tpl_error_reporting (messju) - remove property $undefined. "null" is used literally instead (messju) Version 2.6.0 (Nov 19, 2003) ---------------------------- - move Smarty::quote_replace() to Smarty_Compiler::_quote_replace() (messju) - remove import of of attributes of {include_php} to php's namespace. use $params[name] instead (messju) Version 2.6.0-RC3 (Nov 13, 2003) -------------------------------- - fix handling of $var.key inside [] (messju) - fix handling of assign inside {insert}-tags (messju) - fix handling if [...] inside triple-quotes in config-files (messju) - fix handling of simple-math-operators inside modifiers (Dominik, messju) - fix handling of trailing-slashes in open_basedir in smarty_core_create_dir_structure() (packman, messju) Version 2.6.0-RC2 (Oct 8, 2003) ------------------------------- - apply modifiers only once to section-loop and foreach-from attrs (messju) - remove use of _smarty_cached_paths-files (messju) - remove Smarty::_plugin_implementation_exists() - use is_callable() (messju) - ignore {strip}/{/strip) inside {strip}-blocks (messju) - fixed removal of leading/trailing newlines in {strip}-blocks (messju) - fixed proper escaping of " and ' with escape:javascript (messju) - fixed bug in traversal of $smarty->plugins_dir-array. now the first matching plugin is taken (messju) - moved {strip} back into the compiler (messju) - fixed config_load: handling of section-attribute and use of multiple config-files in one template (atu, messju) Version 2.6.0-RC1 (August 11, 2003) ----------------------------------- - fixed status-header for cache_modified_check under cgi-sapi (messju) - added optional parameter $cache_attrs to register_function() and register_block(). $cache_attrs is an array containing attribute- names that should be cached on calls to functions that have $cacheable set to false. (messju) - enabled registration of class-methods as callbacks for the register_*- functions (use: array('classname', 'method_name')) as callback) (messju) - added filepath caching (Monte) - added optional assign-attribute to {capture}-tag (messju) - added $cacheable-parameter to register_compiler_function() (messju) - added $cacheable-parameter with default=true to register_function() and register_block() (messju) - add math speedup to core (Dominik, Monte) - fix newlines for tags without template output (Monte) - added config-option "request_use_auto_globals" to make auto-globals be used as request vars instead of HTTP_*_VARS (messju) - speed up config_load, simplify compiling (Monte) - added block-methods for registered objects (Bharat Mediratta, messju) - ignore one char resource names like c:foo.tpl (Monte) - added default_resource_type feature (Monte) - fix bug where config file starts with hidden section (boots, Monte) - add discrete error checking pertaining to $cache_dir and $compile_dir, their existance and writability (Monte) - fixed behaviour of start=... for {counter} (messju) - fixed assign for {counter} (messju) - added params vdir, hdir and inner to html_table to allow looping over the data in various directions (messju) - allow spaces in literal tags (Paul Lockaby, Monte) - speed up compiled templates, hardcode plugin filepaths instead of dynamically calculate at runtime. (Monte) - abstract many core components from Smarty.class.php, speeding up core class instantiation (Monte) - fixed bug in _create_dir_structure() when used with open_basedir- restriction and relative paths (messju) - use DIRECTORY_SEPARATOR exclusively, keep DIR_SEP for BC (Monte) - changed "link" to "href" in html_image. "link" is still working but deprecated (messju) - html_image always renders an alt-tag now (default alt="") (messju) - fixed assign attribute for multiple counters (messju) - added simple math operators to variables (Monte) - enabled array(&$obj. 'source', 'timestamp', 'secure', 'trusted') as callback for register_resource() (messju); - enabled array(&$obj, 'method') as callback for $default_template_handler_func (messju) - remove unnecessary close/open tags from compiled templates (Monte) - fixed errornous creation of '//' in image_path in html_image (messju) - fix escapement of special chars for key vals in debug console (Monte) - fixed debug timing logic for config_load (Tom Sommer, Monte) - all in-code doc comments converted to phpDocumentor format (Greg) - moved strip from smarty core to plugin (Monte) - moved config_load from smarty core to plugin (Monte) - added &$repeat-parameter to block-functions (messju) - enabled hex-constants in function.math.php (messju) - enabled hex-constants (0x...) as function-attributes, inside if-statements and as modifier-parameters (messju) - fixed bug with passing $smarty as reference in Smarty.compiler.class (messju) - corrected output with {strip} and PHP tag newlines (Monte) - added possibility to register function-callbacks as "array(&$obj, 'method)" this affects register_function(), -block, -compiler_function, -modifier, -prefilter, -postfilter, -outputfilter-functions() and $cache_handler_func (messju) - added <labels> to html_checkboxes and html_radios (Philippe, messju) - added "labels"-options to turn off labels in html_checkboxes and _radios (messju) Version 2.5.0 (April 11, 2003) ------------------------------ - fixed bug with default modifier when passing integer 0 (Monte) - change backtic syntax from $`foo` to `$foo` (Monte) - recognize $foo[][] syntax inside embedded quotes without backtics (Monte) - name=123 is passed as an integer (not a string) to plugins now (messju) - $length is now propagated to sub-values in debug_print_var (messju) Version 2.5.0-RC2 (March 26, 2003) ---------------------------------- - made clear_cache() ignore compile_id, when clearing cache-groups (this is when no $tpl_file is supplied) (messju) - made onmouseout XHTML-compliant in function.popup.php (messju) - applied local-var-naming-scheme to fetch() (messju) - renamed $localvars to $_localvars in cache-file-handling-functions, added _get_auto_id()-function (messju) - swapped compile_id and cache_id in read_cache_file and write_cache_file (messju) - reverted patch for cache-file-handling (messju) - made html_radios and html_checkboxes accept "selected" instead of "checked" optionally. (messju) - made compile_id ignored in clear_cache, made order of auto_file_name $cache_id.$compile_id again, applied the the new variable-naming-scheme for cache_file_handing functions (messju) - removed notice of undefined var in _rm_auto() (messju) - added warning message when an array is passed as the "checked" value of html_radios (Monte) - fixed errormessage in _compile_smarty_ref() (messju) - updated docs for html_image "name" -> "file" (messju) - fixed bug with html_options-optgroups (Nichlas Löfdahl, messju) - cleaned up calls to readdir() (messju) - fixed bug with passing multiple modifiers to a parameter (Monte) - updated docs for html_checkboxes, html_options and html_radios (messju) - fixed wrong default "name" attribute for html_options (messju) - html_checkboxes now expect the options as attribute "options" instead of "checkboxes. html_radios expect "options" instead of "radios". cleaned up indentiation (messju) - fixed too greedy str_replace in trimwhitespace outputfilter (messju) - html_checkboxes and html_radios passthru all unknown paramters now additionally their output is now XHTML compliant (messju) - html_options passthru all unknown paramters now (messju) - fix link functionality of html_image, also make output XHTML compatible (Hinrich Donner, Monte) - append "@" to default modifier vars/args supress possible warnings (Monte) - fix problem with escaped double quotes (Monte) - fix html_radios to not return an array (Monte) - fixed length in modifier.truncate.php (messju) - fixed handling of '$'-signs in trimwhitespace outputfilter (messju) - fix bug that makes config files recompile every time (Nagger, Monte) - add dpi functionality to html_image, change "name" parameter to "file" (Thomas Shulz, Monte) - fix height/width parameter index in html_image (Gerard, Monte) - get rid of unsetting name and script attributes to insert tag (Thomas Schulz, Monte) - changed argument order of string_format modifier back, was right in the first place (Monte) Version 2.5.0-RC1 (March 5, 2003) --------------------------------- - fixed notice in popup function (Nagger, Monte) - fix "once" var compiling for include_php (Monte) - added nl2br modifier to distribution (Monte) - added html_image to distribution (Monte) - added cat modifier to distribution (Monte) - added html_table to distribution (Monte) - added << >> <> support to if statments (SMK, Monte) - fix _assign_smarty_interface to not overwrite keys other than 'request' (Jerome Poudevigne, Monte) - added html_checkboxes to distribution (Christopher Kvarme, Monte) - added html_radios to distribution (Christopher Kvarme, Monte) - fixed string_format modifier args (wrong order) (Paul Lockaby, Monte) - use tmp file for file writes, avoid file lock race (Monte) - support syntax "$`smarty.config.foo`.tpl" for embedded vars in quotes, and allow full dollar var syntax (Monte) - add $smarty.config.varname variable for accessing config vars (Paul Lockaby, Monte) - silence PHP warnings in function.fetch.php (Eduardo, Monte) - added get_config_vars(), same basic functionality as get_template_vars() (Monte) - update get_template_vars() to be able to get individual vars (Monte) - fix minor logic in _fetch_template_info (Dennis Gearon, Monte) - fix cache groups with compile_id set (Monte) - add support for merging appended vars (messju, Monte) - allow null as function attribute value (André Rabold, Monte) - support $foo->bar[index] syntax (Monte) - add get_registered_object function (messju, Monte) - treat unrecognized param attribute syntax as string (Monte) - support $smarty.const.$foo syntax (messju, Monte) - remove E_NOTICE warnings from debug.tpl, escape modifier (Kanstantin, Monte) - don't count non-ascii chars in count_words modifier (Kanstantin, Monte) - clean up param calls to _parse_var and _parse_attrs (Monte) - define $template_source var, elude possible warning (Monte) - fix syntax problem with evaluating PHP constants (Monte) - add @ and === as valid if statement tokens (Monte) - enable error messages for config_load errors, use $this->config_class for loading class name (Monte) - fix html_options to not escape already escaped entities (Monte) - send Last-Modified header on cache creation (Monte) - check strict syntax of function attributes (Monte) - dropped support for modifers on object parameters, added support for objects as modifier parameters (Monte) - fixed bug with decimal numbers in if statements (Monte) Version 2.4.2 (Feb 11, 2003) ---------------------------- - support embedded variables in objects (Monte) - fix bug with objects with no properties (M Mohr, Monte) - support full dollar var syntax in quoted text (Monte) - fixed bug in $smarty.const.FOO introduced in 2.4.1 (M Mohr, Monte) Version 2.4.1 (Feb 6, 2003) --------------------------- - ignore case in IF statements (Rainer Collet, Monte) - treat undefined constants as null (Ferdinand Beyer, Monte) - fix problem with inserts and nested fetches (Rainer Collet, Monte) - added support for passing params to include_php (Tim Riley, Monte) - added support for math operators in if statements (Monte) - added support for $foo->bar[$x].blah syntax (Monte) Version 2.4.0 (Feb 2, 2003) --------------------------- - fix known problems with php tag handling in templates (recursion, echoing xml tags) (Monte) - add support for object registration (Monte) - add debug template to secure_dir, add template_dir to secure_dir by default (Ferdinand Beyer, Monte) - added support for assigned object access (Monte) - fixed bug with directories named '0' (Frank Bauer, Monte) - add javascript parameter to escape modifier (Monte) - added calling function line numbers to syntax error messages in compiler (Monte) - added support for modifiers to function calls (Monte) - support return value for custom functions instead of echoing (but echo still works) (Monte) - added direct access to constants via $smarty.const.FOO (Monte) - added support for passing modifiers to static values (Monte) - fix up regex code in compiler, more accurate and maintainable (Monte) - added day_value_format to html_select_date (Marcus Bointon, Monte) - assigned variables are no longer in global namespace, saving extract() calls and speeding up fetch() and display() linearly with no. of assigned variables (Monte) - added trimwhitespace output filter to dist. (Monte) - fix popup function to allow newlines in text (Monte) - escape html entities in html_options (Monte) - fixed bug with label for html_options (Monte) - added config_load API function (Monte) - added caching to config file loading (Monte) - added "extra" parameter to mailto function (Monte, Massimiliano Perantoni) - added mailto plugin to dist. (Monte) Version 2.3.1 (Nov 19, 2002) ---------------------------- - added optgroup support to html_options (Monte, Robert Amos) - set mtime on compile files so they match source files (Monte, Peter Bowen) - added proper support for open_basedir setting (Monte, Alessandro Astarita) - added strip variable modifier, updated docs (Monte) - fixed access to $smarty.x variables as arrays. (Andrei) - fixed errors with example setup docs (Monte, Matthew Hagerty) - added textformat block function (Monte) Version 2.3.0 (Aug 7, 2002) --------------------------- - added assign_by_ref() and append_by_ref() functions (Bob Silva, Monte) - changed default warning type for plugin errors from E_USER_WARNING to E_USER_ERROR (Monte) - added $all_extra, $hour_extra, $minute_extra, $second_extra and $meridian_extra parameters to html_select_time function (Rainer Collet, Monte) - update debug console to print objects (Simon Willison, Monte) - fix Config_File class to not error when there are no sections (Peter Kmet, Monte) - add default modifier logic (Monte) - updated popup_init to be xhtml compliant (Tom Oram, Monte) - fix filename bug with windows (Gary Loescher, Monte) - add ability to supply expire time in seconds when clearing cache or compile files (Monte) - add {debug} plugin to distribution (Monte) - fixed bug with insert tags, loading from "script" attribute when caching is enabled (Monte) - fix bug with debug_tpl file path with Windows (.SMK., Monte) - fix append() function with string/array problem (Monte) Version 2.2.0 (July 11, 2002) ----------------------------- - make debug.tpl work with any delimiter (Monte) - change logic in assign() and append() to test var names against != '' instead of empty() (Monte) - fix PHP notice in append() function (Monte) - allow $plugins_dir to be an array of directories (Andreas Kossmeier, Monte) - move debug.tpl to SMARTY_DIR, add to constructor (Monte) - fixed warning message in function.assign_debug_info (Monte) - fixed $template_dir, $compile_dir, $cache_dir, $config_dir, $plugin_dir to respect include_path (Monte) - fixed warning message with output filter array (Monte) - add optional 2nd parameter to date_format, used as the default date if the passed date is empty (Monte) - gave $reset a default value in cycle plugin (Monte) - fixed warnings with html_select_date and timestamp functions (Monte) - added support for sub directory exlusion format (Monte) - added support for grouping by cache_id, compile_id and segments thereof (Monte) - changed cache and compile files to human readable format (Monte) - remove overlib.js file from distribution (Monte) - fixed bug with 304 Not Modified response sending content (Monte) - fixed cycle function to respect delimiter after initial setting (Monte) - update $GLOBALS references to work properly with track_globals settings (Michal Prinke, Monte) - fixed bug in math function with call to assign (Grigory V. Kareev, Monte) - optimized for loops with count() function calls (Monte) - add month_value_format attribute to html_select_date plugin (Gary Loescher, Monte) - made it possible to use simple variables inside [] for indexing. (Andrei) - added "once" attribute to {include_php}. (Monte) Version 2.1.1 ------------- - added cycle function. (Monte) - fixed bug with resource testing, and include_path. (Monte) - fixed a bug with register_outputfilter function. (Monte) Version 2.1.0 ------------- - introduced output filters. (Andrei) - changed the way filters are loaded, added load_filter() API function and $autoload_filters variable. (Andrei) - added caching logic for expire times per cache file (Norbert Rocher, Monte) - fixed html_select_date when field separator is "/" (Roberto Berto, Monte) - added YYYY-MM-DD format support to html_select_date (Jan Rosier, Monte) - fixed cache_lifetime logic bug, also made -1 = never expire (Monte) - fixed directory separator issue for Windows. (Andrei) - added ability to use simple variables as array indices or object properties. (Andrei) - added ability to unregister pre/postfilters plugins at runtime. (Andrei) - added 'htmlall' attribute to escape modifier. (Monte) - added template_exists() API function. (Andrei) - fixed a problem with using dynamic values for 'file' attribute of {include_php} tag. (Andrei) - added $smarty.template variable. (Andrei) - fixed several plugins that would not work if the plugin directory was not the default one. (Andrei) - implemented support for block functions. (Andrei) - made it possible to assign variables in pre/postfilter plugins. (Andrei) Version 2.0.1 ------------- - rename plugin .make_timestamp.php to shared.make_timestamp.php. (Monte) - changed crc32() generated values, replace '-' with 'N'. (Monte) - added support for +/- N syntax in html_select_date year values. (Monte) - fixed behavior of inserts with script attribute. (Andrei) - fixed bug with $smarty.cookies and $smarty.server. (Andrei) - wordwrap and indent are missing from 2.0 release, now fixed. (Monte) - removed show_info_header and show_info_include variables. (Monte) Version 2.0.0 ------------- - added "eval" function plugin for evaluating variables as templates. (Monte) - removed $tpl_file_ext class variable, no longer used. (Monte) - added "hex" and "hexentity" escape types to escape modifier. (Monte) - removed dependency on PEAR. (Andrei) - update popup_init to accept src attribute. (Monte, Duncan Forrest) - implemented several optimizations, speeding up Smarty significantly in most cases. (Andrei,Monte) - implemented plugin architecture. (Andrei) - added wordwrap and indent modifiers. (Monte) - added support for 'If-Modified-Since' headers for cached content. (Monte) - removed insert_tag_check class variable, no longer needed. (Monte) - optimized cache fetches by scanning for insert tags only if they exist. (Monte) - fixed bugs in overlib. (Monte, Duncan Forrest) - fixed a problem with compile_id usage. (Andrei) - fixed problem with using assigned vars with {include_php ...} filepath. (Monte) Version 1.5.2 ------------- - added Smarty object as fifth argument for template resource functions. (Monte) - fixed a bug with incorrectly combined cache and compile id in clear_cache(). (Andrei) - fixed bug in smarty_make_timestamp introduced in PHP 4.1.0. (Monte) - fixed bug with cached insert debug timing. (Monte) - added 'script' attribute to {insert..} which specifies the script that the insert function can be found in. (Andrei) - added default template function handler. (Monte) Version 1.5.1 ------------- - removed error message from the generic _read_file() method, the caller should take care of that. (Andrei) - fixed a bug with incorrectly combined cache and compile id. (Andrei) Version 1.5.0 ------------- - added include_php built-in function, documented. (Monte) - added trusted_dir functionality, documented. (Monte) - consolidated secure_dir tests to one function. (Monte) - prepended _smarty_ to variable names in fetch() class function to avoid namespace conflicts. (Monte) - introduced $compile_id class variable that can be used to set persistent compile identifier across multiple display calls, documented. (Andrei) - fixed bug with concatenated null cache and compile identifiers. (Andrei) - added $smarty.section.* syntax for accessing section properties, documented. (Andrei) - added custom cache handling function ability, documented. (Monte) - added assign attribute to include, include_php, insert, fetch, math, and counter functions, documented. (Monte) - fixed bug with fetch testing for local file when http address. (Monte) - fixed bug with counter and skipval setting. (Monte) - made {config_load ...} merge globals from each config file only once per scope, thus avoiding several problems. (Andrei) - added {foreach ...} tag that can be used to iterate through non-sequential and associative arrays, documented. (Andrei) - speeded up section property access a bit. (Andrei) - removed $smarty variable from storage used by normal template variables, to prevent any problems. (Andrei) - fixed a bug that could cause parse error with quotes inside literal blocks. (Andrei, Alexander Belonosov) - added 'field_array' attribute to html_select_time function, documented. (Andrei, Michael Caplan) - documented {section} "max" attribute. (Monte) - fixed notice message in Smarty_Compiler.class.php. (Monte) - fixed bug with clear_cache introduced in 1.4.6, third parameter should default to null. (Monte) - updated Config_File class to support '\' path separator in OS/2. (Monte, Francesco Cipriani) - removed secure_ext setting (not used). (Monte) - made cache reading process more efficient. (Monte) - fixed bug, is_cached() now supports new 1.4.6 caching behavior. (Monte) - update FAQ with mailing list Reply-To header FAQ. (Monte) - supress error messages for fopen(), fix cache to regenerate if cache file is not available (i.e. cluster race condition). (Monte) - added index key example to QUICKSTART guide. (Monte) Version 1.4.6 ------------- - fixed bug with {assign ...} when passing an empty value. (Monte) - add more warning message fixes. (Monte, Tara Johnson) - documentation updates. (Monte) - update fetch function to give proper warning when fetching a non-readable or non-existant file. (Monte) - fixed problem with newline at the end of included templates (Monte, Andrei) - added feature to regenerate cache if compile_check is enabled and an involved template or config file gets modified. (Monte) - added DEBUG execution times to included files: REQUIRES updated debug.tpl file! (Monte) - added support for hidden config variables that cannot be read by templates. (Andrei) - added execution time to DEBUG console, total and inserts. (Monte) - fixed bug where DEBUG console would not appear with cached content. (Monte) - added support for postfilter functions that are applied to compiled template right after compilation. (Andrei) - fixed the name of clear_compile_tpl() API function to clear_compiled_tpl. (Andrei) - added fix for removing comments so that the line numbers are reported correctly in case of errors. (patch from Anders Janson) - made html_options output xhtml compatible code. (Monte, Arnaud Limbourg) Version 1.4.5 ------------- - update FAQ with index of questions at the top - update overlib to 3.50, adjust addon code so that the overlib.js file isn't modified, and not using the mini one. (Monte) - added many more options to html_select_date. (Alexander Skwar, Andrei) - added support for generating different compiled templates from the same source template. (Hans-Peter Oeri, Andrei) - modified Smarty to pass itself to insert functions as the second parameter. (Andrei) - modified Smarty to pass itself to prefilter functions as the second parameter. (Andrei) - fixed syntax error when including a non-existant template with security enabled. (Monte) - fixed comments handling to allow commenting out template blocks. (Andrei) - implemented named capture buffers, with results accessible via $smarty.capture.<name>. (Andrei) - added ability to index arrays directly by numbers. (Andrei) - fixed bug with SMARTY_DIR not prepended to Config_File include. (Monte) Version 1.4.4 ------------- - fixed problem with including insecure templates with security enabled. (Monte) - numerous documentation updates. (Monte) - added ENT_QUOTES to escapement of html. (Monte, Sam Beckwith) - implemented access to request variables via auto-assigned $smarty template variable. (Andrei) - fixed a bug with parsing function arguments inside {if} tags if a comma was present. (Andrei) - updated debug console with config file vars. (Monte) - added SMARTY_DIR constant as an alternative to relying on include_path. (Monte) - added popup_init and popup functions (requires overlib.js). (Monte) - updated debug console with config file vars. (Monte) - added debugging url control. (Monte) - added 'quotes' type to escape modifier. (Monte, Mike Krus) - added 'total' and 'iteration' section properties. (Andrei) - added 'start', 'max', and 'step' section attributes/properties. (Andrei) - fixed a bug with security checking of functions inside {if} tags. (Andrei) - fixed a bug in Config_File that would incorrectly booleanize values that weren't really booleans. (Andrei) Version 1.4.3 ------------- - added regex_replace modifier, documented. (Monte) - added debugging console feature and custom function assign_debug_info, documented. (Monte) - added 'scope' attribute for {config_load}, 'global' is now deprecated but is still supported. (Andrei) - reduced template symbol table pollution by moving config array into the class itself. (Andrei) - fixed a bug with passing quoted arguments to modifiers inside {if} statements. (Andrei, Sam Beckwith) - added security features for third party template editing, documented (Monte) - added assign custom function, documented. (Monte) - fixed bug with template header using version instead of _version. (Monte) - fixed a problem with putting $ followed by numbers inside {strip} and {/strip} tags. (Andrei) - fixed Config_File class to allow empty config paths (defaults to current directory). (Andrei) Version 1.4.2 ------------- - move $version to internal variable, remove from docs. (Monte) - cleaned up compiled templates global scope by moving some variables into the class itself. (Andrei) - fixed a bug that would not allow referring to a section in the including file from the included file. (Andrei) - configs directory missing from 1.4.1 release, added back in. (Monte) - added windows include_path setup instructions to FAQ & QUICKSTART. (Monte) Version 1.4.1 ------------- - fix LOCK_EX logic for all windows platforms (Monte) - fixed indexing by section properties with the new syntax. (Andrei) - updated Smarty to u... [truncated message content] |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:49:38
|
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30411/plugins Log Message: Directory /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/plugins added to the repository --> Using per-directory sticky tag `branch-smarty' |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:49:29
|
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30384/core Log Message: Directory /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs/core added to the repository --> Using per-directory sticky tag `branch-smarty' |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:48:50
|
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/unit_test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30183/unit_test Log Message: Directory /cvsroot/php-blog/serendipity/bundled-libs/Smarty/unit_test added to the repository --> Using per-directory sticky tag `branch-smarty' |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:48:49
|
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30183/misc Log Message: Directory /cvsroot/php-blog/serendipity/bundled-libs/Smarty/misc added to the repository --> Using per-directory sticky tag `branch-smarty' |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:48:40
|
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30183/libs Log Message: Directory /cvsroot/php-blog/serendipity/bundled-libs/Smarty/libs added to the repository --> Using per-directory sticky tag `branch-smarty' |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:48:39
|
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty/demo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30183/demo Log Message: Directory /cvsroot/php-blog/serendipity/bundled-libs/Smarty/demo added to the repository --> Using per-directory sticky tag `branch-smarty' |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:48:23
|
Update of /cvsroot/php-blog/serendipity/bundled-libs/Smarty In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30106/Smarty Log Message: Directory /cvsroot/php-blog/serendipity/bundled-libs/Smarty added to the repository --> Using per-directory sticky tag `branch-smarty' |
|
From: Garvin H. <gar...@us...> - 2004-09-09 14:47:43
|
Update of /cvsroot/php-blog/serendipity/templates_c In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29975/templates_c Log Message: Directory /cvsroot/php-blog/serendipity/templates_c added to the repository --> Using per-directory sticky tag `branch-smarty' |
|
From: Tom S. <tom...@us...> - 2004-09-09 11:36:46
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24646 Modified Files: serendipity_lang_da.inc.php Log Message: Update danish translations Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- serendipity_lang_da.inc.php 5 Sep 2004 19:56:57 -0000 1.78 +++ serendipity_lang_da.inc.php 9 Sep 2004 11:36:35 -0000 1.79 @@ -322,8 +322,6 @@ @define('LIMIT_TO_NUMBER', 'Hvor mange punkter skal vises?'); @define('FILTER', 'Filter'); @define('ENTRIES_PER_PAGE', 'artikler per side'); - -/* TRANSLATE */ @define('PERMISSIONS', 'Rettigheder'); /* DATABASE SETTINGS */ @@ -394,7 +392,7 @@ @define('INSTALL_EMBED', 'Er Serendipity embedded?'); @define('INSTALL_EMBED_DESC', 'Hvis du ønsker at indkapsle Serendipity inde i en normal side, aktiver da dette direktiv for at ignorere headers og kun udskrive indholdet. Du kan benytte indexFile direktivet til at lave en wrapper fil hvor du placere din normale hjemmeside headers. Konsulter README filen for mere information!'); @define('INSTALL_TOP_AS_LINKS', 'Vis top udgangssider/referencer som links?'); -@define('INSTALL_TOP_AS_LINKS_DESC', '"no": Exits and Referrers are shown as plain text to prevent google spam. "yes": Exits and Referrers are shown as hyperlinks. "default": Use setting from global configuration (recommended).'); // Translate +@define('INSTALL_TOP_AS_LINKS_DESC', '"Nej": Udgangs- og henvisende sider er vist som ren tekst for at undgå google spam. "Ja": Udgangs- og henvisende sider er vist som hyperlinks. "standard": Brug indstillinger fra global konfiguration (anbefalet).'); @define('INSTALL_BLOCKREF', 'Bloker referencer'); @define('INSTALL_BLOCKREF_DESC', 'Er der nogle specielle hosts du ikke ønsker skal vises i reference listen? Separer listen af hostnavne med \';\' og bemærk at disse er blokere med substring masker!'); @define('INSTALL_REWRITE', 'URL Omskrivning'); @@ -461,9 +459,9 @@ @define('NUMBER_FORMAT_THOUSANDS', '.'); @define('POWERED_BY_SHOW_TEXT', 'Vis "Serendipity" som tekst'); @define('POWERED_BY_SHOW_TEXT_DESC', 'Vil vise "Serendipity Weblog" som tekst'); -@define('POWERED_BY_SHOW_IMAGE', 'Vis "Serendipity" md et logo'); +@define('POWERED_BY_SHOW_IMAGE', 'Vis "Serendipity"" som et logo'); @define('POWERED_BY_SHOW_IMAGE_DESC', 'Vis Serendipity logoet'); -@define('SETTINGS_SAVED_AT', 'De nye indstillger er blevet gemt kl %s'); +@define('SETTINGS_SAVED_AT', 'De nye indstillinger er blevet gemt kl %s'); @define('PLUGIN_ITEM_DISPLAY', 'Hvor skal enheden vises?'); @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Kun udvidet artikel'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Kun i oversigten'); @@ -471,12 +469,12 @@ @define('RSS_IMPORT_DESC', 'RSS import vil hente et RSS feed og indsætte alle artiklerne i denne i dit arkiv. Du kan vælge om du vil importere disse med UDKAST eller UDGIVET status. Kategorier i det fremmede feed skal indeholde det præcist samme navn som de navne du har indtastet i Serendipity. Via det andet felt kan du vælge hvilken kategori du vil placere artikler i, der ikke matcher kategorier i det importerede feed.'); @define('RSS_IMPORT_CATEGORY', 'Brug denne kategori for kategoriløse artikler'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Der skete en ukendt fejl, filen blev ikke uploaded. Måske er din filstørrelse større end den maximale størrelse tilladt af din serveropsætning. Spørg din webudbyder eller rediger din php.ini fil for at tillade uploads af større filer.'); -@define('COMMENTS_WILL_BE_MODERATED', 'Kommentare på denne artikel vil først blive vist såfremt de bliver godkendt.'); +@define('COMMENTS_WILL_BE_MODERATED', 'Kommentarer på denne artikel vil først blive vist såfremt de bliver godkendt.'); @define('YOU_HAVE_THESE_OPTIONS', 'Du har følgende muligheder:'); @define('THIS_COMMENT_NEEDS_REVIEW', 'Advarsel: Denne kommentar kræver godkendelse førend den vil blive vist'); @define('DELETE_COMMENT', 'Slet kommentar'); @define('APPROVE_COMMENT', 'Godkend kommentar'); -@define('REQUIRES_REVIEW', 'Påkræver godkendelse'); +@define('REQUIRES_REVIEW', 'Kræver godkendelse'); @define('COMMENT_APPROVED', 'Kommentar #%s er blevet godkendt'); @define('COMMENT_DELETED', 'Kommentar #%s er blevet slettet'); @define('VIEW', 'Vis'); @@ -484,68 +482,68 @@ @define('COMMENT_EDITED', 'Den valgte kommentar er blevet redigeret'); @define('HIDE', 'Skjul'); @define('VIEW_EXTENDED_ENTRY', 'Læs resten af "%s"'); -@define('TRACKBACK_SPECIFIC_ON_CLICK', 'This link is not meant to be clicked. It contains the trackback URI for this entry. You can use this URI to send ping- & trackbacks from your own blog to this entry. To copy the link, right click and select "Copy Shortcut" in Internet Explorer or "Copy Link Location" in Mozilla.'); // Translate -@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Warning: This trackback needs approval before it will be displayed'); // Translate -@define('DELETE_TRACKBACK', 'Delete trackback'); // Translate -@define('APPROVE_TRACKBACK', 'Approve trackback'); // Translate -@define('TRACKBACK_APPROVED', 'Trackback #%s has successfully been approved'); // Translate -@define('TRACKBACK_DELETED', 'Trackback #%s has successfully been deleted'); // Translate -@define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate -@define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login'); -@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!'); -@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?'); // Translate -@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "yes": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); // Translate -@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate -@define('FILTERS', 'Filters'); // Translate -@define('FIND_ENTRIES', 'Find entries'); // Translate -@define('FIND_COMMENTS', 'Find comments'); // Translate -@define('FIND_MEDIA', 'Find media'); // Translate -@define('FILTER_DIRECTORY', 'Directory'); // Translate -@define('SORT_BY', 'Sort by'); // Translate -@define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate -@define('MEDIA', 'Media'); // Translate -@define('MEDIA_LIBRARY', 'Media library'); // Translate -@define('ADD_MEDIA', 'Add media'); // Translate -@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate -@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate -@define('SAVE_FILE_AS', 'Save the file as:'); // Translate -@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate -@define('MEDIA_RENAME', 'Rename this file'); // Translate -@define('IMAGE_RESIZE', 'Resize this image'); // Translate -@define('MEDIA_DELETE', 'Delete this file'); // Translate -@define('FILES_PER_PAGE', 'Files per page'); // Translate -@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate -@define('SELECT_FILE', 'Select file to insert'); // Translate -@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate -@define('CALENDAR_BOW_DESC', 'The day of the week that should be considered the beginning of the week. Default is Monday'); // Translate -@define('SUPERUSER', 'Blog Administration'); // Translate -@define('ALLOWS_YOU_BLAHBLAH', 'Provides a link in the sidebar to your blog administration'); // Translate -@define('CALENDAR', 'Calendar'); // Translate -@define('SUPERUSER_OPEN_ADMIN', 'Open administration'); // Translate -@define('SUPERUSER_OPEN_LOGIN', 'Open login screen'); // Translate -@define('INVERT_SELECTIONS', 'Invert Selections'); // Translate -@define('COMMENTS_DELETE_CONFIRM', 'Are you sure you wish to delete the selected comments?'); // Translate -@define('COMMENT_DELETE_CONFIRM', 'Are you sure you wish to delete comment #%d, written by %s?'); // Translate -@define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate -@define('VIEW_COMMENT', 'View comment'); // Translate -@define('VIEW_ENTRY', 'View entry'); // Translate -@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate -@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate -@define('TRACKBACK_SENDING', 'Sending trackback to URI %s...'); // Translate -@define('TRACKBACK_SENT', 'Trackback successful'); // Translate -@define('TRACKBACK_FAILED', 'Trackback failed: %s'); // Translate -@define('TRACKBACK_NOT_FOUND', 'No trackback-URI found.'); // Translate -@define('TRACKBACK_URI_MISMATCH', 'The autodiscovered trackback URI does not match our target URI.'); // Translate -@define('TRACKBACK_CHECKING', 'Checking <u>%s</u> for possible trackbacks...'); // Translate -@define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate -@define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate -@define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate -@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate -@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate -@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate -@define('SIDEBAR_PLUGINS', 'Sidebar Plugins'); // Translate -@define('EVENT_PLUGINS', 'Event Plugins'); // Translate -@define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Dette link er ikke ikke til at blive klikket. Det indeholder denne artikels trackback URI. Du kan bruge denne URI til at sende ping- & trackbacks fra din egen blog til denne artikel. For at kopiere linket, kan du højreklikke og vælge "Kopier genvej" i Internet Explorer eller "Copy Link Location" i Mozilla.'); +@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Advarsel: Dette trackback kræver godkendelse førend det vil blive vist'); +@define('DELETE_TRACKBACK', 'Slet trackback'); +@define('APPROVE_TRACKBACK', 'Godkend trackback'); +@define('TRACKBACK_APPROVED', 'Trackback #%s er blevet godkendt'); +@define('TRACKBACK_DELETED', 'Trackback #%s er blevet slettet'); +@define('COMMENTS_MODERATE', 'Kommentarer og trackbacks til denne artikel kræver godkendelse'); +@define('PLUGIN_SUPERUSER_HTTPS', 'Brug https til login'); +@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lader loginlinket pege på en https-destination. Din webserver skal understøtte dette!'); +@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Gør eksterne links klikbare?'); +@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"nej": Eksterne links (Top udgangsider, Top henvisninger, bruger kommentarer) er ikke vist/vist som ren tekst hvor brugbart, for at forhindre google spam (anbefales). "ja": Eksterne links er vist som hyperlinks. Kan overskrives inde i hver enkel sidebar plugin konfigurationen!'); +@define('PAGE_BROWSE_COMMENTS', 'Side %s af %s, i alt %s kommentarer'); +@define('FILTERS', 'Filtrer'); +@define('FIND_ENTRIES', 'Find artikler');e +@define('FIND_COMMENTS', 'Find kommentarer'); +@define('FIND_MEDIA', 'Find media'); +@define('FILTER_DIRECTORY', 'Bibliotek'); +@define('SORT_BY', 'Sorter efter'); +@define('TRACKBACK_COULD_NOT_CONNECT', 'Intet trackback sendt: Kunne ikke åbne forbindelse til %s på port %d'); +@define('MEDIA', 'Media'); +@define('MEDIA_LIBRARY', 'Mediabibliotek'); +@define('ADD_MEDIA', 'Tilføj media'); +@define('ENTER_MEDIA_URL', 'Indtast en URL til filen du vil hente'); +@define('ENTER_MEDIA_UPLOAD', 'Vælg en fil du ønsker at uploade:'); +@define('SAVE_FILE_AS', 'Gem files som:'); +@define('STORE_IN_DIRECTORY', 'Gem i følgende bibliotek:'); +@define('MEDIA_RENAME', 'Omdøb denne fil'); +@define('IMAGE_RESIZE', 'Ændre størrelse på billede'); +@define('MEDIA_DELETE', 'Slet denne fil'); +@define('FILES_PER_PAGE', 'Filer per side'); +@define('CLICK_FILE_TO_INSERT', 'Klik på filen du vil indsætte:'); +@define('SELECT_FILE', 'Vælg filen du vil indsætte'); +@define('MEDIA_FULLSIZE', 'Fuld størrelse'); +@define('CALENDAR_BOW_DESC', 'Dagen i ugen der skal bruges som den første dag i ugen. Standardværdien er Mandag'); +@define('SUPERUSER', 'Blog Administration'); +@define('ALLOWS_YOU_BLAHBLAH', 'Placerer et link i sidebaren til din blog administration'); +@define('CALENDAR', 'Kalender'); +@define('SUPERUSER_OPEN_ADMIN', 'Åbn administration'); +@define('SUPERUSER_OPEN_LOGIN', 'Åbn loginskærm'); +@define('INVERT_SELECTIONS', 'Inverter valgte elementer'); +@define('COMMENTS_DELETE_CONFIRM', 'Er du sikker på du vil slette de valgte kommentarer?'); +@define('COMMENT_DELETE_CONFIRM', 'Er du sikker på du vil slette kommentar #%d, skrevet af %s?'); +@define('DELETE_SELECTED_COMMENTS', 'Slet valgte kommentarer'); +@define('VIEW_COMMENT', 'Vis kommentar'); +@define('VIEW_ENTRY', 'Vis artikel'); +@define('DELETE_FILE', 'Slettede filen ved navn <b>%s</b>'); +@define('ABOUT_TO_DELETE_FILE', 'Du er ved at slette <b>%s</b><br />Hvis du benytter denne fil i nogle af dine artikler, vil det resultere i døde links eller billeder<br />Er du sikker på du vil fortsætte?<br /><br />'); +@define('TRACKBACK_SENDING', 'Sender trackback til URI %s...'); +@define('TRACKBACK_SENT', 'Trackback fuldført'); +@define('TRACKBACK_FAILED', 'Trackback fejl: %s'); +@define('TRACKBACK_NOT_FOUND', 'Ingen trackback URI fundet.'); +@define('TRACKBACK_URI_MISMATCH', 'Den automastiske trackback URI passer ikke vores egen URI.'); +@define('TRACKBACK_CHECKING', 'Checker <u>%s</u> for mulige trackbacks...'); +@define('TRACKBACK_NO_DATA', 'Modstående side indeholdte inden data'); +@define('TRACKBACK_SIZE', 'Modstående URI overskred den maximale filstørrelse på %s bytes.'); +@define('VIEWMODE_THREADED', 'Switch to threaded view'); +@define('COMMENTS_VIEWMODE_THREADED', 'Tråde'); +@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); +@define('DISPLAY_COMMENTS_AS', 'Vis kommentarer som'); +@define('SIDEBAR_PLUGINS', 'Sidebarplugins'); +@define('EVENT_PLUGINS', 'Hændelseplugins'); +@define('ADD_MEDIA_BLAHBLAH', '<b>Tilføj en fil til dit mediearkiv:</b><p>Her kan du uploade mediafiler, eller bede mig hente dem fra et sted på nette! Hvis du ikke har et passende billeder, <a href="http://images.google.com" target="_blank">prøv at søg efter billeder på google</a> der passer til dine tanker, resultatet er ofte brugbart og sjovt :)<p><b>Vælg metode:</b><br>'); /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> |
|
From: Garvin H. <gar...@us...> - 2004-09-09 11:17:37
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21748 Modified Files: serendipity_admin_comments.inc.php NEWS Log Message: fix comment moderation panel for postgresql Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.213 retrieving revision 1.214 diff -u -d -r1.213 -r1.214 --- NEWS 9 Sep 2004 10:52:03 -0000 1.213 +++ NEWS 9 Sep 2004 11:17:27 -0000 1.214 @@ -3,6 +3,9 @@ Version 0.7 () ------------------------------------------------------------------------ + * Fixed postgresql bug for viewing comment moderation panel + (garvinhicking) + * Fixed postgresql bug for fetching the last entry id. Will fix bug with comment counter always reporting zero and trouble with assigning multiple categories. (garvinhicking) Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- serendipity_admin_comments.inc.php 31 Aug 2004 10:58:20 -0000 1.16 +++ serendipity_admin_comments.inc.php 9 Sep 2004 11:17:27 -0000 1.17 @@ -136,7 +136,7 @@ $linkNext = '<input type="button" name="serendipity[nextpage]" value=">>>" disabled="disabled" />'; } -$limit=serendipity_db_limit_sql(($page-1)*$commentsPerPage .",". $commentsPerPage); +$limit = serendipity_db_limit_sql(serendipity_db_limit(($page-1)*$commentsPerPage, $commentsPerPage)); $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id) WHERE type = 'NORMAL' |
|
From: Garvin H. <gar...@us...> - 2004-09-09 10:52:14
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17603 Modified Files: serendipity_functions.inc.php serendipity_db_postgres.inc.php serendipity_admin_users.inc.php NEWS Log Message: postgresql bug - DB_insert_id didn't work as expected. Index: serendipity_admin_users.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_users.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- serendipity_admin_users.inc.php 30 Aug 2004 18:56:19 -0000 1.9 +++ serendipity_admin_users.inc.php 9 Sep 2004 10:52:03 -0000 1.10 @@ -41,7 +41,7 @@ '$enc_pass' )"; serendipity_db_query($query); - $serendipity['POST']['user'] = serendipity_db_insert_id(); + $serendipity['POST']['user'] = serendipity_db_insert_id('authors', 'authorid'); printf('<strong>' . CREATED_USER . '</strong>', '#' . $serendipity['POST']['user'] . ', ' . $_POST['username']); } echo '<br />'; Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.212 retrieving revision 1.213 diff -u -d -r1.212 -r1.213 --- NEWS 6 Sep 2004 12:35:02 -0000 1.212 +++ NEWS 9 Sep 2004 10:52:03 -0000 1.213 @@ -3,6 +3,10 @@ Version 0.7 () ------------------------------------------------------------------------ + * Fixed postgresql bug for fetching the last entry id. Will fix bug + with comment counter always reporting zero and trouble with + assigning multiple categories. (garvinhicking) + * Fixed "no entry to display" bug when previewing entry (garvinhicking) Index: serendipity_db_postgres.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- serendipity_db_postgres.inc.php 26 Aug 2004 10:51:28 -0000 1.17 +++ serendipity_db_postgres.inc.php 9 Sep 2004 10:52:02 -0000 1.18 @@ -40,9 +40,21 @@ return pg_affected_rows($serendipity['dbLastResult']); } -function serendipity_db_insert_id() { +function serendipity_db_insert_id($table = '', $id = '') { global $serendipity; - return pg_last_oid($serendipity['dbLastResult']); + if (empty($table) || empty($id)) { + return pg_last_oid($serendipity['dbLastResult']); + } else { + $oid = pg_last_oid($serendipity['dbLastResult']); + $query = "SELECT $id FROM {$serendipity['dbPrefix']}$table WHERE oid=$oid"; + $res = pg_query($serendipity['dbConn'], $query); + if (pg_num_rows($res)) { + $insert_id = pg_fetch_array($res, 0, PGSQL_ASSOC); + return $insert_id[$id]; + } else { + return $oid; + } + } } function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) { Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.418 retrieving revision 1.419 diff -u -d -r1.418 -r1.419 --- serendipity_functions.inc.php 6 Sep 2004 12:34:08 -0000 1.418 +++ serendipity_functions.inc.php 9 Sep 2004 10:52:02 -0000 1.419 @@ -1767,7 +1767,7 @@ $query .= " VALUES ('$id', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe', '$status')"; serendipity_db_query($query); - $cid = serendipity_db_insert_id(); + $cid = serendipity_db_insert_id('comments', 'id'); $query = "SELECT a.email, e.title, a.mail_comments, a.mail_trackbacks, e.moderate_comments FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a @@ -2576,17 +2576,18 @@ if (!$_SESSION['serendipityRightPublish']) { $entry['isdraft'] = 'true'; } - if(!isset($entry['allow_comments'])){ - $entry['allow_comments']='false'; - } - if(!isset($entry['moderate_comments'])){ - $entry['moderate_comments']='false'; - } + + if(!isset($entry['allow_comments'])){ + $entry['allow_comments']='false'; + } + if(!isset($entry['moderate_comments'])){ + $entry['moderate_comments']='false'; + } $res = serendipity_db_insert('entries', $entry); if ($res) { - $entry['id'] = serendipity_db_insert_id(); + $entry['id'] = serendipity_db_insert_id('entries', 'id'); if (is_array($categories)) { foreach ($categories as $cat) { if (is_numeric($cat)) |
|
From: Garvin H. <gar...@us...> - 2004-09-08 08:52:03
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6824 Modified Files: serendipity_lang_bg.inc.php serendipity_lang_nl.inc.php Log Message: more wysiwyg langs Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- serendipity_lang_nl.inc.php 5 Sep 2004 19:56:57 -0000 1.35 +++ serendipity_lang_nl.inc.php 8 Sep 2004 08:51:54 -0000 1.36 @@ -16,7 +16,7 @@ @define('LANG_CHARSET', 'ISO-8859-1'); @define('DATE_LOCALES', 'dutch, nl_BE, nl, nl_BE.ISO8859-1'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); -@define('WYSIWYG_LANG', 'en'); +@define('WYSIWYG_LANG', 'nl'); @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administratie'); @define('HAVE_TO_BE_LOGGED_ON', 'u moet ingelogd zijn om deze pagina te zien'); Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- serendipity_lang_bg.inc.php 5 Sep 2004 19:56:57 -0000 1.14 +++ serendipity_lang_bg.inc.php 8 Sep 2004 08:51:54 -0000 1.15 @@ -12,7 +12,7 @@ @define('LANG_CHARSET', 'windows-1251'); @define('DATE_LOCALES', 'bulgarian, bg, bg_BG'); @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y'); -@define('WYSIWYG_LANG', 'bg'); +@define('WYSIWYG_LANG', 'en'); @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Àäìèíèñòðàöèÿ'); @define('HAVE_TO_BE_LOGGED_ON', 'Òðÿáâà äà âçëåçåòå çà äà âèäèòå òàçè ñòðàíèöà:'); |
|
From: Garvin H. <gar...@us...> - 2004-09-08 08:49:49
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6424 Modified Files: serendipity_lang_pt.inc.php Log Message: correct lowercasing so that htmlarea finds language files Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- serendipity_lang_pt.inc.php 5 Sep 2004 19:56:57 -0000 1.35 +++ serendipity_lang_pt.inc.php 8 Sep 2004 08:49:29 -0000 1.36 @@ -14,7 +14,7 @@ @define('LANG_CHARSET', 'ISO-8859-1'); @define('DATE_LOCALES', 'portuguese brazilian, pt, pt_BR'); @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y'); -@define('WYSIWYG_LANG', 'pt_BR'); +@define('WYSIWYG_LANG', 'pt_br'); @define('SERENDIPITY_ADMIN_SUITE', 'Painel de Administração do Serendipity'); @define('HAVE_TO_BE_LOGGED_ON', 'Você deve entrar no sistema para ver esta página'); |
