Ready to tag 1.3.2

.gitignore

@@ -1 +0,0 @@
-/telaen/nbproject/private/

CHANGELOG.md

@@ -1,372 +0,0 @@
-INTRO: This documents the changes made to Telaen.
-
-First of all: Telaen would be nowhere without the effort of many beta
-	testers, other bug-and-patch submitters.
-
-Telaen was originally based on Uebimiau.
-
-LICENSE: Telaen is released under the GPLv2.
-
-
-CHANGELOG:
-----------------------------------------------------------------
-
-2.0.0-dev
-
- * Vcard support via https://github.com/jimjag/vCard-parser
- * Use better HTML sanitizer: *htmLawed*
- * Use better HTML->Txt converter: *Html2Text*
- * More robust MIME Message parsing
- * Drop support for PHP 5.3 and older
- * Email message cache no longer stored in Session data
- * Explicit error handler
- * Communication w/ IMAP and POP3 servers now uses PHP streams
- * 3rd party dependencies now located in ./vendor directory for
-   future Composer compatibility
- * Updated *PHPMailer* (5.2.9), *iCalcreator* (2.20.2), *tinymce* (4.1.6),
-   *Smarty* (3.1.21)
-
-1.3.2
-
- * [New] Performance enhancements : avoid array copying
- * [Fix] Prevent direct access to libs even if not using web-server ACLs
- 	(security)
- * [New] Update to *tiny_mce* 3.5.8
- * [New] Update to *Smarty* 2.6.27
- * [Fix] Correct bug w/ *PHPMailer* 5 compatibility
-
-1.3.1
-
- * [Fix] Sanitize `f_email` and `redir` url
-
-1.3.0
-
- * [New] Support for *PHPMailer* 5.2.1.
- * [New] Now includes an embedded appointment/event Calendar using the
- 	iCal format under the hood.
- * [New] Ability to display a System-wide "news" banner via
- 	inc/news/news.system.php
- * [New] Major speed improvements when handling the POP3 Inbox. Even
- 	though it's not recommended to store all your Email in the POP3
- 	Inbox, lots of people do which slowed down Telaen.
- * [Fix] No longer extracts vars willy-nilly from $_GET, $_POST, or
- 	$_FILES.
- * [Misc] Moved all `class.\*.php` files to `./inc/class/`. and all `config.\*`
- 	files to `./inc/config/`. This means that upgrading may involve
- 	moving and/or deleting older stale versions of files.
- * [New] Upgraded to latest *TinyMce*.
-
-1.2.1
-
- * [New] New **Forwarded** status flag and icon added.
- * [New] Since `ereg\*` is deprecated, all regexes now use the `preg_\*`
- 	family.
- * [New] *Smarty* upgraded to 2.6.26
- * [New] *PHPMailer* upgraded to 2.0.3
- * [Fix] Users cannot create folder that have the same names as system
- 	folders
-
-1.2.0
-
-[Released]
-
-1.2.0-RC1
-
- * [New] Updated Thai translation
- * [Fix] Sorting by To in Sent Messages now works.
- * [Fix] HTML Emails now have plain-text component, so that SpamAssassin
- 	doesn't score them too badly.
- * [Fix] Fixed bug on IMAP when using prefix
-
-1.2.0-beta1
-
- * [New] Removed support for versions of PHP < 4.1.0
- * [New] Smarty upgraded to 2.6.18.
- * [New] Quota handling can now be set per user or per domain (or any
- 	combination) via the new $quota_limits config variable.
- * [New] Uses POP3 UIDL for better message tracking. If server does not
- 	provide a UIDL, we create our own.
- * [New] Email filters
- * [New] Ajax function: session is mantained alive in the compose page,
- 	allowing writing long email without lose work.
- * [New] Login page now alerts when you kicked out on a session expire.
- * [Fix] Fixed regression with forward/reply of email with embedded
- 	images. downloads.php causes logout on recipient if uses telaen.
- * [Fix] Various performance improvements
- * [Fix] IMAP bug: extra text added on saved sent message cause wrong
- 	date/time display
- * [Fix] Hide attachments links only if they are embedded images. Some
- 	clients (like pine) set Content-Id on all attachment types.
-
-``1.1.3
-
- * [New] Added Malay translation
- * [New] Updates to some languages
- * [New] Included Outlook theme into package
- * [Fix] Solved bug with imap when move or delete multiple message only
- 	one was moved or deleted.
-
-1.1.3-rc2:
-
- * [Fix] Added check for on CAPA detection, avoid hangs when command is
- 	not supported.
- * [Fix] Removed target->new on attach download (not open), causes blank
- 	window remains open on IE.
- * [New] de lang up-to-date
-
-1.1.3-rc1:
-
- * [Fix] check_install.php(.txt) now correctly checks memory_limit
- 	value.
- * [New] Now automatically detects if the POP3 server supports
- 	PIPELINING, APOP, ATOP and UIDL. Can be overruled (enable or
- 	disable) from config.php.
- * [Fix] Email parsing enhancement, now can parse correctly
- 	multipart/alternative emails with multipart/mixed nested content.
- 	This emails are usually generate form Apple Mail Clients Also
- 	attachments types with dots (like application/vnd.ms-exel) are
- 	detected correctly.
- * [New] Little usability issue, error/badlogin pages are merged with
- 	login page, the errors are simply displayed in a box.  This also
- 	removes unuseful/redudant code. To use this feature, themes need to
- 	update their login.htm file (look at default/login.htm for
- 	guidance).
- * [New] TinyMce updated to version 2.0.9
- * [New] New feauture: Button for download the entire message
-
-
-1.1.2:
-
- * [New] Moved to subversion. This allowed us to rearrange the default
- 	layout more easily and move the bundled Smarty package from
- 	underneath the telaen path.
- * [New] Provide notice that the ./smarty/ directory should be moved
- 	someplace outside of the web-space. Done by renaming the directory.
- * [New] Updated Smarty to 2.6.16 Updated tinyMce to 2.0.8
- * [New] Added korean language.
- * [Fix] Fixed error when using TOP retrieve mode, the msg[size]
- 	contained an EOF that caused a bad response on the next command.
- 	Also improved the move function, the message is deleted only if the
- 	copy is done on filesystem.
- * [New] Added APOP login support. To enable, add `$mail_use_apop = yes;` to your config.php file.
- * [Fix] Better header parsing, support multi-line headers avoid wrong
- 	content-type detect.
- * [Fix] Bug on attachment filename, sometimes the name ends with ';'
- 	when receving emails from Hotmail accounts.
- * [Fix] Use the configured port on ONE-FOR-ALL mode, not depending from
- 	protocol.
- * [Fix] Use relative path on redir.php links, avoid problems on https
- 	servers.
-
-
-1.1.1:
-
- * Fixed little bug on catch-address where wrong address was added to
- 	addressbook.
-
-1.1.1-rc2:
-
- * Fixed problem where messages disappear on refresh with zero quota.
- * Little fixes on themes.
-
-1.1.1-rc1:
-
- * Added sort for personal folders on folders list and fixed a bug can
- 	cause duplicate entries in the list.
- * Fixed problem with missing header info when using IMAP. Also
- 	addresses possible "double showing" of SPAM email both Inbox and
- 	Spam folder.
- * Solved issue when attached images with upcase or capitalized
- 	extension (like .JPG or .Gif) are not displayed inline
- * Added check for exclude user address in reply-all
- * Added ability to require a return-receipt on a new message
- * Improved signature/footer attach and multiple quotes on HTML messages
- * umask value and default directory permission bitmask now configurable
- 	via the config.php file. Useful for some environs that need a more
- 	"open" permission setup. NOTE: this requires people upgrading from
- 	1.1.0 or earlier to modify their config.security.php file! Look at
- 	the config.security.php.default file for these variable settings.
- * Templates improvements: - now header.htm contains also the <head>
- 	section of html - meta tags output in <head> instead of a bad echo
- 	- menu.htm template used instead of nav_menu.htm - webmail title
- 	configurable in config.php - little restyling on quick address
- 	window (mozilla style) - added a different header for popups
- * New check on quick address window, avoid to add an address multiple
- 	times.
-
-1.1.0:
-
- * Updated Smarty to version 2.6.14
- * Added $phpmailer_sendmail and $phpmailer_timeout to
- 	config.php.default to allow admin to easily override PHPMailer's
- 	default sendmail path and SMTP timeout
- * Changed attachment window size to something large enough to be
- 	readable, but not too large.
-
-1.1.0-rc2:
-
- * Updated TinyMCE to latest rev.
- * Fixed bug on email time calc.
- * Adjusted titles alignment an other little improvements on themes.
-
-1.1.0-rc1:
-
- * Fix bug where selected messages disappear from list on mark/unmark
- 	read functions with 20 or more messages.
- * Fix bug where auto-deleting SPAM could affect other messages in the
- 	INBOX.
- * Fix nasty bug where CC addresses were not being delivered if using
- 	the 'mail' Mailer (PHPMailer bug).
- * Templates improvement, now we have a page header and footer included
- 	in all pages (actually not for login and pop-ups). This allow a
- 	faster style personalization.
-
-1.1.0-beta2:
-
- * Telaen is now aware of the SpamAssassin X-Spam-Level header, and
- 	allows users to control auto-SPAM detection sensitivity and SPAM
- 	folder autopopulation. For example, a user can specify a
- 	sensitivity of 2 (very sensitive), and all messages that have a
- 	X-Spam-Level of 2 or more will get auto-moved to the SPAM folder.
- * Bundled themes converted to be xhtml1.0 compliant.
- * Force magic_quotes_runtime to be disabled, since it conflicts with
- 	Smarty.
- * Fix issue with message lists when quotas are not used.
-
- * Provide ways to work around some issues with Redirects. We can now
- 	select whether these redirects are performed via HTTP redirects
- 	(the Location header) or via META REFRESH and Javascript (see
- 	$redirects_use_meta). Also, we can select whether the URLs used for
- 	redirects are absolute (as required by HTTP) or relative (see
- 	$redirects_are_relative).
- * New feature: mark as read/unread on message list
-
-1.1.0-beta1:
-
- * Fixed problem with possible incorrect redirects. Instead of checking
- 	that $_SERVER['HTTPS'] is non-empty, we check explicitly for it
- 	being set to 'on'. The official PHP docs are misleading (wrong)
- 	here.
- * Add in extra/check_install.php.txt which performs some simple tests
- 	of your installation and setup.
- * No longer require short_open_tag.
- * Some under-the-hood code improvements.
- * Remove the SPAM folder from the list of "folders that stuff can be
- 	moved to by the user."
- * The Advanced HTML Editor is now TinyMCE, which is bundled with
- 	Telaen. Changes to the newmsg.htm template file may be required
- 	(depending on the template) to fully use this.
- * Now, whenever Telaen adds body content (eg: whenever we parseBody), we
- 	choose to sanitize or not. This means that messages are sanitized
- 	when printed or forwarded/replied to. Added a global variable,
- 	$sanitize_html to control this ($allow_scripts also works, but is
- 	being depreciated since it doesn't reflect what we're really
- 	concerned about).
- * Fixed bug where show_body was not using the correct charset (since it
- 	was removed by HTMLFilter).
- * Removed old krufty session code to use native PHP session()
- 	capability.
- * Removed the tid/lid/sid stuff from the URL. Stored in user sessions,
- 	as it should be.
-
-1.0.0:
-
- * Revised de.txt and pt_BR.txt files.
-
-1.0.0-RC2:
-
- * Fix the default theme to use a draft Telaen logo instead of the old
- 	Uebimiau one.
- * The preferences page is now shown whenever the previously used
- 	version and the present version differ by either the Major or Minor
- 	version number. For example, moving from 1.0.0 to 1.0.1 will not
- 	make it happen, but going from 1.0.4 to 1.1.0 will. This therefore
- 	sets the assumption of what the "API" is :)
- * HTML Emails are now filtered through HTMLFilter, to protect against
- 	XSS attacks.
- * We no longer get that weird '1' on the upper left of the message list
- 	page.
- * Add in a method to adjust for server timezone offsets, if we can't
- 	figure out the real offset.
- * Use output buffering within process.php to prevent breakage with
- 	redirects.
- * Force exit after all redirects.
- * All redirects are now HTTP/1.1 compliant (ie: the use absolute URLs).
- * Some HTML cleanups for the default theme.
-
-1.0.0-RC1:
-
- * Fix calculation of timezones.
- * Rename of class files and other notices from Uebimiau to Telaen.
- * Enable marking READ messages as either READ or UNREAD upon logout.
- 	The default is UNREAD. This allows users who check their mail with
- 	other Email clients to see those messages as "new" and unread.
- 	SysAdmin can overrule user prefs by setting:
- 	$force_unmark_read_overrule; $force_unmark_read_settingyes; in
- 	config.php. Changes: o en_UK.txt: prf_unmark_read_on_exit o
- 	preferences.htm
-
-----------------------------------------------------------------
-	Uebimiau - the "jimjag" patches:
-----------------------------------------------------------------
--------- 2.7.8p3 --------
-
- * "What is SPAM" regex now definable for
-	each UM class.
-
- * Enable auto-population of the spam folder and add a user pref to
- 	auto-delete it at logout time. Spam folder options require the
- 	_autospamfolder variable in the Uebimiau class be TRUE. o
- 	en_UK.txt: spam_extended prf_empty_spam_on_exit o preferences.htm
-
- * Make the spam folder a system folder.
-
- * If using cookies, have the login page explain why a login may not
- 	have succeeded due to cookie error (eg: user does not have cookies
- 	enabled). Only important if using cookie security. This required
- 	changes to the login themes and the lang file. o en_UK.txt
- 	:lng_cookie_not_enabled lng_cookie_not_valid o login.htm
-
- * Store version number in pref's file; since new versions might change
- 	or add preferences, this means that UM can now direct the user to
- 	their Preferences page as soon as the login after an upgrade
- 	(similar to the First Login). Updated preference page theme. o
- 	preferences.htm
-
- * Address book now usable with CC and BCC fields. o newmsg.htm
-
- * Fold in many improvements submitted by MBR (Martin Blapp) regarding
- 	file and folder speedups, detection of ATOP and pipelining support,
- 	and spam folders.
-
--------- 2.7.8p2 --------
-
- * Change format of session ID to be more file
-	system friendly.
-
- * Folders are now mode 700, for security.
-
- * No longer depend on the bundled versions of PHPMailer or Smarty,
- 	which were kind of old. Instead, force any custom changes to these
- 	external projects to be local in scope, allowing us to upgrade them
- 	as needed, or to use system-installed versions. (we *do* bundle
- 	what we need, for completeness, and to make it a one-shot
- 	installation - we just bundle the latest, non-altered versions, but
- 	we don't require the version we bundle).
-
- * Fix some incorrect regex matching, especially when they touch the
- 	file system (like allowed folder names).
-
- * Fix MSIE display errors (usually exhibited as just a blank page)
- 	especially with attachments.
-
- * On login, do the inbox/attachments clean-up. Many people don't bother
- 	to logout. :)
-
- * Auto-clean the server-side inbox and attachments folder to save disk
- 	space.
-
- * Misc code cleanups.
-
--- Jim Jagielski / jim@jaguNET.com
-

INSTALL.txt

@@ -1,68 +0,0 @@
-----------------------------------------------------
-INSTALL
-----------------------------------------------------
-- Read the README file... really, you should!
-
-- Unpack the package (.tar.gz or .zip file) into temporary directory.
-
-- Move the 'telaen' folder to where you want it under your
-  public webspace.
-  eg /home/httpd/webmail (*unix) or c:\inetpub\wwwroot\webmail (Win32).
-
-- Make a non web-shared folder (users cannot see this folder through a web
-  browser), eg. /home/telaen or c:\winnt\temp\telaen
-
-- IMPORTANT: If using the bundled Smarty package, move the ./smarty_move_me/
-  directory to a non web-shared folder.
-
-- The user which the webserver is running (nobody, apache, IUSR_machine,etc)
-  need permission to write on this folder. It is best to make
-  it owned by the webserver ID and mode 700.
-
-- The default configuration is stored in "inc/config/configv2.php.default".
-  Any and all changes should be placed in the "inc/config/configv2.php"
-  file; there is no need to copy over settings which don't have any
-  local changes, but if you prefer to just copy configv2.php.default
-  to configv2.php and make your edits there, that is fine too.
-  All instructions are commented on in this file; pay attention to
-  the $config['temporary_folder'] variable and the SMARTY_DIR define!
-  Set them according your above folder names.
-
-- Check your installation setup by performing the following
-  tasks:
-      o Rename extra/check_install.php.txt to extra/check_install.php
-      o Access check_install.php via your browser, eg:
-             http://jimjag.github.io/telaen/telaen/extra/check_install.php
-      o Make any required changes.
-      o Be SURE to REMOVE check_install.php or RENAME it back to
-        check_install.php.txt !!!
-
-- Ensure that the ./inc/ directory cannot be accessed directly.
-  There are many ways to do this, but the easiest is using
-  ACLs:
-    <Location /webmail/inc>  # or whatever
-      order allow,deny
-      deny from all
-    </Location>
-
----------------
-PERFORMANCE
----------------
-
-The performance of Telaen, of course, depends on the speed of
-your Webserver, PHP and your POP3/IMAP Email server. Even so,
-here are some helpful hints:
-
-  a. Use Apache 2.4.
-  b. Just for Telaen, configure PHP with a large memory
-     allocation and a long (or non-existent) time-limit.
-  c. Use a good PHP cache, like XCache or APC.
-  d. If possible, host your Email server on your Web server,
-     so you can connect to the loopback address.
-  e. IMAP itself is a faster interface, so use that if you can.
-  f. If using POP3, there are some additional hints:
-     1. Encourage people to use Folders and to keep their
-        Inbox as small as possible.
-     2. Remove any SPAM as quickly as possible.
-  g. Enabling quotas involves some overhead which you
-     may wish to avoid.

README.md

@@ -5,42 +5,25 @@
 Telaen is a web-based e-mail client written in PHP. What is particularly
 nice about Telaen is that it is fast, lean and simple, but also extremely
 powerful. It does not require much more than a "standard" PHP
-installation, nor does it require an external database. It supports multiple
-folders, both POP3 and IMAP, is SPAM aware and incorporates WYSIWYG editors
+installation, nor does it require a database. It supports multiple
+folders, POP3 and IMAP, is SPAM aware and incorporates a WYSIWYG editor
 for Email composition. It supports multiple languages as well as
 multiple themes (or "skins").
 
 Telaen 1.3.x is compatible with PHP4 and PHP5. Starting with Telaen
-2.x, we require PHP 5.4 and later.
+2.x, support for PHP4 will be dropped.
+
+Telaen was originally based on Uebimiau.
 
 We recommend that you read the other documents in the docs/ subdirectory,
 especially the CHANGELOG.txt and INSTALL.txt files.
 
-## Design Philosophy
-
-First of all, Telaen is designed and architectured to be as small
-and as compact as possible; some may even say Telaen is "minimalistic".
-The reason is that as projects get larger and more complex, they are
-more difficult to update, to vet and review, and to keep secure.
-Simplicity, after all, is a virtue.
-
-The other basic philosophy is to leverage PHP and existing 3rd
-party libraries as much as possible, but without making the level
-of dependencies onerous for the sys-admin. There's no need to
-re-create the wheel, unless we can do it faster, or easier.
-
-Finally, as ex-sys-admins ourselves, as well as developers,
-Telaen is designed to be plug-and-play. Plugins are a great
-idea, and maybe Telaen will support them in the future, but
-requiring sys-admins to find, install, config and debug Plugins
-to add basic features that should be core to a webapp, doesn't
-make sense to us.
-
 ## Why you might need it
 
-Other PHP-based webmails require external database support as well as a long
+Other PHP-based webmails require database support as well as a long
 laundry-list of other PHP libs and extensions; not Telaen. If
-you need an powerful yet simple and clean webmail system, Telaen will likely fit the bill.
+you need an expandable, powerful yet simple webmail system,
+Telaen will likely fit the bill.
 
 And, if you are stuck running ancient Uebimiau, you should
 really move to Telaen asap.
@@ -65,14 +48,13 @@ software availability and distribution.
 - Language support
 - Themes support
 - Search in messages
-- Personalized ordering of messages
+- Personalized order messages
 - Personal preferences
-- HTML e-mail support (read/write)
+- Send HTML e-mails
 - Quota Limit
 - Auto population of SPAM folder for tagged SPAM messages
 
 ## Localization
-
 PHPMailer defaults to English, but supports other language and UI themes (or 'skins').
 
 ## Documentation
@@ -87,22 +69,20 @@ possible. The below external dependencies are bundled for convenience:
 - Smarty
 - TinyMCE
 - PHPMailer
-- iCalCreator (https://github.com/jimjag/iCalcreator.git fork)
-- vCard-parser (https://github.com/jimjag/vCard-parser fork)
-- Html2Text.php
+- iCalCreator
 
 Telaen is designed to work with both the bundled as well as the system-provided
 versions of these tools.
 
-No external database is required.
+No database is required.
 
 ## Contributing
 
 Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/jimjag/telaen/issues).
 
-We're particularly interested in fixing edge-cases, expanding test coverage and freshing-up
-the user UI.
+We're particularly interested in fixing edge-cases, expanding test coverage and dropping support for PHP4, PHP5.1
+and PHP5.2.
 
 ## Changelog
 
-See [CHANGELOG.md](https://github.com/jimjag/telaen/blob/master/CHANGELOG.md)
+See CHANGELOG.md in ./docs/

smarty_move_me/Config_File.class.php

@@ -0,0 +1,393 @@
+<?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
+ *
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com 
+ *
+ * @link http://www.smarty.net/
+ * @version 2.6.25-dev
+ * @copyright Copyright: 2001-2005 New Digital Group, Inc.
+ * @author Andrei Zmievski <andrei@php.net>
+ * @access public
+ * @package Smarty
+ */
+
+/* $Id: Config_File.class.php 3149 2009-05-23 20:59:25Z monte.ohrt $ */
+
+/**
+ * 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 ( substr($line, 0, 1) == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
+                /* section found */
+                if (substr($match[1], 0, 1) == '.') {
+                    /* 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 (substr($var_name, 0, 1) == '.') {
+            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);
+    }
+    /**#@-*/
+}
+
+?>

smarty_move_me/SmartyBC.class.php

@@ -1,477 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        SmartyBC.class.php
- * SVN:         $Id: $
- * 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
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link      http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author    Monte Ohrt <monte at ohrt dot com>
- * @author    Uwe Tews
- * @author    Rodney Rehm
- * @package   Smarty
- */
-/**
- * @ignore
- */
-require_once dirname(__FILE__) . '/Smarty.class.php';
-
-/**
- * Smarty Backward Compatibility Wrapper Class
- *
- * @package Smarty
- */
-class SmartyBC extends Smarty
-{
-    /**
-     * Smarty 2 BC
-     *
-     * @var string
-     */
-    public $_version = self::SMARTY_VERSION;
-
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-
-    /**
-     * Initialize new SmartyBC object
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * wrapper for assign_by_ref
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to assign
-     */
-    public function assign_by_ref($tpl_var, &$value)
-    {
-        $this->assignByRef($tpl_var, $value);
-    }
-
-    /**
-     * wrapper for append_by_ref
-     *
-     * @param string  $tpl_var the template variable name
-     * @param mixed   &$value  the referenced value to append
-     * @param boolean $merge   flag if array elements shall be merged
-     */
-    public function append_by_ref($tpl_var, &$value, $merge = false)
-    {
-        $this->appendByRef($tpl_var, $value, $merge);
-    }
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string $tpl_var the template variable to clear
-     */
-    public function clear_assign($tpl_var)
-    {
-        $this->clearAssign($tpl_var);
-    }
-
-    /**
-     * Registers custom function to be used in templates
-     *
-     * @param string $function      the name of the template function
-     * @param string $function_impl the name of the PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     *
-     * @throws \SmartyException
-     */
-    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregister custom function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_function($function)
-    {
-        $this->unregisterPlugin('function', $function);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string  $object        name of template object
-     * @param object  $object_impl   the referenced PHP object to register
-     * @param array   $allowed       list of allowed methods (empty = all)
-     * @param boolean $smarty_args   smarty argument format, else traditional
-     * @param array   $block_methods list of methods that are block format
-     *
-     * @throws   SmartyException
-     * @internal param array $block_functs list of methods that are block format
-     */
-    public function register_object(
-        $object,
-        $object_impl,
-        $allowed = array(),
-        $smarty_args = true,
-        $block_methods = array()
-    ) {
-        settype($allowed, 'array');
-        settype($smarty_args, 'boolean');
-        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
-    }
-
-    /**
-     * Unregister object
-     *
-     * @param string $object name of template object
-     */
-    public function unregister_object($object)
-    {
-        $this->unregisterObject($object);
-    }
-
-    /**
-     * Registers block function to be used in templates
-     *
-     * @param string $block      name of template block
-     * @param string $block_impl PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     *
-     * @throws \SmartyException
-     */
-    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregister block function
-     *
-     * @param string $block name of template function
-     */
-    public function unregister_block($block)
-    {
-        $this->unregisterPlugin('block', $block);
-    }
-
-    /**
-     * Registers compiler function
-     *
-     * @param string $function      name of template function
-     * @param string $function_impl name of PHP function to register
-     * @param bool   $cacheable
-     *
-     * @throws \SmartyException
-     */
-    public function register_compiler_function($function, $function_impl, $cacheable = true)
-    {
-        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
-    }
-
-    /**
-     * Unregister compiler function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_compiler_function($function)
-    {
-        $this->unregisterPlugin('compiler', $function);
-    }
-
-    /**
-     * Registers modifier to be used in templates
-     *
-     * @param string $modifier      name of template modifier
-     * @param string $modifier_impl name of PHP function to register
-     *
-     * @throws \SmartyException
-     */
-    public function register_modifier($modifier, $modifier_impl)
-    {
-        $this->registerPlugin('modifier', $modifier, $modifier_impl);
-    }
-
-    /**
-     * Unregister modifier
-     *
-     * @param string $modifier name of template modifier
-     */
-    public function unregister_modifier($modifier)
-    {
-        $this->unregisterPlugin('modifier', $modifier);
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type      name of resource
-     * @param array  $functions array of functions to handle resource
-     */
-    public function register_resource($type, $functions)
-    {
-        $this->registerResource($type, $functions);
-    }
-
-    /**
-     * Unregister a resource
-     *
-     * @param string $type name of resource
-     */
-    public function unregister_resource($type)
-    {
-        $this->unregisterResource($type);
-    }
-
-    /**
-     * Registers a prefilter function to apply
-     * to a template before compiling
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_prefilter($function)
-    {
-        $this->registerFilter('pre', $function);
-    }
-
-    /**
-     * Unregister a prefilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_prefilter($function)
-    {
-        $this->unregisterFilter('pre', $function);
-    }
-
-    /**
-     * Registers a postfilter function to apply
-     * to a compiled template after compilation
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_postfilter($function)
-    {
-        $this->registerFilter('post', $function);
-    }
-
-    /**
-     * Unregister a postfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_postfilter($function)
-    {
-        $this->unregisterFilter('post', $function);
-    }
-
-    /**
-     * Registers an output filter function to apply
-     * to a template output
-     *
-     * @param callable $function
-     *
-     * @throws \SmartyException
-     */
-    public function register_outputfilter($function)
-    {
-        $this->registerFilter('output', $function);
-    }
-
-    /**
-     * Unregister an outputfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_outputfilter($function)
-    {
-        $this->unregisterFilter('output', $function);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     *
-     * @throws \SmartyException
-     */
-    public function load_filter($type, $name)
-    {
-        $this->loadFilter($type, $name);
-    }
-
-    /**
-     * clear cached content for the given template and cache id
-     *
-     * @param string $tpl_file   name of template file
-     * @param string $cache_id   name of cache_id
-     * @param string $compile_id name of compile_id
-     * @param string $exp_time   expiration time
-     *
-     * @return boolean
-     */
-    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * clear the entire contents of cache (all templates)
-     *
-     * @param string $exp_time expire time
-     *
-     * @return boolean
-     */
-    public function clear_all_cache($exp_time = null)
-    {
-        return $this->clearCache(null, null, null, $exp_time);
-    }
-
-    /**
-     * test to see if valid cache exists for this template
-     *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id
-     * @param string $compile_id
-     *
-     * @return bool
-     * @throws \Exception
-     * @throws \SmartyException
-     */
-    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
-    {
-        return $this->isCached($tpl_file, $cache_id, $compile_id);
-    }
-
-    /**
-     * clear all the assigned template variables.
-     */
-    public function clear_all_assign()
-    {
-        $this->clearAllAssign();
-    }
-
-    /**
-     * clears compiled version of specified template resource,
-     * or all compiled template files if one is not specified.
-     * This function is for advanced use only, not normally needed.
-     *
-     * @param string $tpl_file
-     * @param string $compile_id
-     * @param string $exp_time
-     *
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
-    }
-
-    /**
-     * Checks whether requested template exists.
-     *
-     * @param string $tpl_file
-     *
-     * @return bool
-     * @throws \SmartyException
-     */
-    public function template_exists($tpl_file)
-    {
-        return $this->templateExists($tpl_file);
-    }
-
-    /**
-     * Returns an array containing template variables
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function get_template_vars($name = null)
-    {
-        return $this->getTemplateVars($name);
-    }
-
-    /**
-     * Returns an array containing config variables
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function get_config_vars($name = null)
-    {
-        return $this->getConfigVars($name);
-    }
-
-    /**
-     * load configuration values
-     *
-     * @param string $file
-     * @param string $section
-     * @param string $scope
-     */
-    public function config_load($file, $section = null, $scope = 'global')
-    {
-        $this->ConfigLoad($file, $section, $scope);
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name
-     *
-     * @return object
-     */
-    public function get_registered_object($name)
-    {
-        return $this->getRegisteredObject($name);
-    }
-
-    /**
-     * clear configuration values
-     *
-     * @param string $var
-     */
-    public function clear_config($var = null)
-    {
-        $this->clearConfig($var);
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string  $error_msg
-     * @param integer $error_type
-     */
-    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-}

smarty_move_me/debug.tpl

@@ -1,160 +1,157 @@
-{capture name='_smarty_debug' assign=debug_output}
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-    <head>
-        <title>Smarty Debug Console</title>
-        <style type="text/css">
-            {literal}
-            body, h1, h2, h3, td, th, p {
-                font-family: sans-serif;
-                font-weight: normal;
-                font-size: 0.9em;
-                margin: 1px;
-                padding: 0;
-            }
+{* Smarty *}
+{* debug.tpl, last updated version 2.1.0 *}
+{assign_debug_info}
+{capture assign=debug_output}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+    <title>Smarty Debug Console</title>
+{literal}
+<style type="text/css">
+/* <![CDATA[ */
+body, h1, h2, td, th, p {
+    font-family: sans-serif;
+    font-weight: normal;
+    font-size: 0.9em;
+    margin: 1px;
+    padding: 0;
+}
 
-            h1 {
-                margin: 0;
-                text-align: left;
-                padding: 2px;
-                background-color: #f0c040;
-                color: black;
-                font-weight: bold;
-                font-size: 1.2em;
-            }
+h1 {
+    margin: 0;
+    text-align: left;
+    padding: 2px;
+    background-color: #f0c040;
+    color:  black;
+    font-weight: bold;
+    font-size: 1.2em;
+ }
 
-            h2 {
-                background-color: #9B410E;
-                color: white;
-                text-align: left;
-                font-weight: bold;
-                padding: 2px;
-                border-top: 1px solid black;
-            }
-            h3 {
-                text-align: left;
-                font-weight: bold;
-                color: black;
-                font-size: 0.7em;
-                padding: 2px;
-            }
+h2 {
+    background-color: #9B410E;
+    color: white;
+    text-align: left;
+    font-weight: bold;
+    padding: 2px;
+    border-top: 1px solid black;
+}
 
-            body {
-                background: black;
-            }
+body {
+    background: black; 
+}
 
-            p, table, div {
-                background: #f0ead8;
-            }
+p, table, div {
+    background: #f0ead8;
+} 
 
-            p {
-                margin: 0;
-                font-style: italic;
-                text-align: center;
-            }
+p {
+    margin: 0;
+    font-style: italic;
+    text-align: center;
+}
 
-            table {
-                width: 100%;
-            }
+table {
+    width: 100%;
+}
 
-            th, td {
-                font-family: monospace;
-                vertical-align: top;
-                text-align: left;
-            }
+th, td {
+    font-family: monospace;
+    vertical-align: top;
+    text-align: left;
+    width: 50%;
+}
 
-            td {
-                color: green;
-            }
+td {
+    color: green;
+}
 
-            .odd {
-                background-color: #eeeeee;
-            }
+.odd {
+    background-color: #eeeeee;
+}
 
-            .even {
-                background-color: #fafafa;
-            }
+.even {
+    background-color: #fafafa;
+}
 
-            .exectime {
-                font-size: 0.8em;
-                font-style: italic;
-            }
+.exectime {
+    font-size: 0.8em;
+    font-style: italic;
+}
 
-            #bold div {
-                color: black;
-                font-weight: bold;
-            }
-            #blue h3 {
-                color: blue;
-            }
-            #normal div {
-                color: black;
-                font-weight: normal;
-            }
-            #table_assigned_vars th {
-                color: blue;
-                font-weight: bold;
-            }
+#table_assigned_vars th {
+    color: blue;
+}
 
-            #table_config_vars th {
-                color: maroon;
-            }
+#table_config_vars th {
+    color: maroon;
+}
+/* ]]> */
+</style>
+{/literal}
+</head>
+<body>
 
-            {/literal}
-        </style>
-    </head>
-    <body>
+<h1>Smarty Debug Console</h1>
 
-    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
-        -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+<h2>included templates &amp; config files (load time in seconds)</h2>
 
-    {if !empty($template_data)}
-        <h2>included templates &amp; config files (load time in seconds)</h2>
-        <div>
-            {foreach $template_data as $template}
-                <font color=brown>{$template.name}</font>
-                <br />&nbsp;&nbsp;<span class="exectime">
-                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
-                 </span>
-                <br />
-            {/foreach}
-        </div>
+<div>
+{section name=templates loop=$_debug_tpls}
+    {section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/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)}
+        <span class="exectime">
+        ({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
+        {if %templates.index% eq 0}(total){/if}
+        </span>
     {/if}
+    <br />
+{sectionelse}
+    <p>no templates included</p>
+{/section}
+</div>
 
-    <h2>assigned template variables</h2>
+<h2>assigned template variables</h2>
 
-    <table id="table_assigned_vars">
-        {foreach $assigned_vars as $vars}
-            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>${$vars@key}</font></h3>
-                    {if isset($vars['nocache'])}<b>Nocache</b><br />{/if}
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
-                </td>
-                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
-                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
-         {/foreach}
-    </table>
+<table id="table_assigned_vars">
+    {section name=vars loop=$_debug_keys}
+        <tr class="{cycle values="odd,even"}">
+            <th>{ldelim}${$_debug_keys[vars]|escape:'html'}{rdelim}</th>
+            <td>{$_debug_vals[vars]|@debug_print_var}</td></tr>
+    {sectionelse}
+        <tr><td><p>no template variables assigned</p></td></tr>
+    {/section}
+</table>
 
-    <h2>assigned config file variables</h2>
+<h2>assigned config file variables (outer template scope)</h2>
 
-    <table id="table_config_vars">
-        {foreach $config_vars as $vars}
-            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-                <td><h3><font color=blue>#{$vars@key}#</font></h3>
-                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
-                </td>
-                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
-            </tr>
-        {/foreach}
-
-    </table>
-    </body>
-    </html>
+<table id="table_config_vars">
+    {section name=config_vars loop=$_debug_config_keys}
+        <tr class="{cycle values="odd,even"}">
+            <th>{ldelim}#{$_debug_config_keys[config_vars]|escape:'html'}#{rdelim}</th>
+            <td>{$_debug_config_vals[config_vars]|@debug_print_var}</td></tr>
+    {sectionelse}
+        <tr><td><p>no config vars assigned</p></td></tr>
+    {/section}
+</table>
+</body>
+</html>
 {/capture}
+{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
+    {$debug_output}
+{else}
 <script type="text/javascript">
-    {$id = '__Smarty__'}
-    {if $display_mode}{$id = "$offset$template_name"|md5}{/if}
-    _smarty_console = window.open("", "console{$id}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
-    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
+// <![CDATA[
+    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('{$debug_output|escape:'javascript'}');
     _smarty_console.document.close();
+// ]]>
 </script>
+{/if}

smarty_move_me/internals/core.assemble_plugin_filepath.php

@@ -0,0 +1,67 @@
+<?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_CORE_DIR . '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: */
+
+?>

smarty_move_me/internals/core.assign_smarty_interface.php

@@ -0,0 +1,43 @@
+<?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: */
+
+?>

smarty_move_me/internals/core.create_dir_structure.php

@@ -0,0 +1,79 @@
+<?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 = (substr($_dir, 0, 1)=='/') ? '/' : 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: */
+
+?>

smarty_move_me/internals/core.display_debug_console.php

@@ -0,0 +1,61 @@
+<?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[] = 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: */
+
+?>

smarty_move_me/internals/core.get_include_path.php

@@ -0,0 +1,44 @@
+<?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: */
+
+?>

smarty_move_me/internals/core.get_microtime.php

@@ -0,0 +1,23 @@
+<?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: */
+
+?>

smarty_move_me/internals/core.get_php_resource.php

@@ -0,0 +1,80 @@
+<?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_CORE_DIR . '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_CORE_DIR . '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: */
+
+?>

smarty_move_me/internals/core.is_secure.php

@@ -0,0 +1,59 @@
+<?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 &&
+                     substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
+                    return true;
+                }
+            }
+        }
+        if (!empty($smarty->secure_dir)) {
+            foreach ((array)$smarty->secure_dir as $curr_dir) {
+                if ( ($_cd = realpath($curr_dir)) !== false) {
+                    if($_cd == $_rp) {
+                        return true;
+                    } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
+                        substr($_rp, strlen($_cd), 1) == 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: */
+
+?>

smarty_move_me/internals/core.is_trusted.php

@@ -0,0 +1,47 @@
+<?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
+                        && substr($_rp, strlen($_cd), 1) == 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: */
+
+?>

smarty_move_me/internals/core.load_plugins.php

@@ -0,0 +1,125 @@
+<?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: */
+
+?>

smarty_move_me/internals/core.load_resource_plugin.php

@@ -0,0 +1,74 @@
+<?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: */
+
+?>

smarty_move_me/internals/core.process_cached_inserts.php

@@ -0,0 +1,71 @@
+<?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_CORE_DIR . '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_CORE_DIR . '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'] = substr_replace($params['results'], $replace, strpos($params['results'], $cached_inserts[$i]), strlen($cached_inserts[$i]));
+        if ($smarty->debugging) {
+            $_params = array();
+            require_once(SMARTY_CORE_DIR . '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: */
+
+?>

smarty_move_me/internals/core.process_compiled_include.php

@@ -0,0 +1,37 @@
+<?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_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
+        $smarty->_include($_include_file_path, true);
+    }
+
+    foreach ($smarty->_cache_info['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;
+}
+
+?>

smarty_move_me/internals/core.read_cache_file.php

@@ -0,0 +1,101 @@
+<?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;
+    }
+
+    $_contents = $params['results'];
+    $_info_start = strpos($_contents, "\n") + 1;
+    $_info_len = (int)substr($_contents, 0, $_info_start - 1);
+    $_cache_info = unserialize(substr($_contents, $_info_start, $_info_len));
+    $params['results'] = substr($_contents, $_info_start + $_info_len);
+
+    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;
+                }
+            }
+        }
+    }
+
+    $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: */
+
+?>

smarty_move_me/internals/core.rm_auto.php

@@ -0,0 +1,71 @@
+<?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_CORE_DIR . '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_CORE_DIR . '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: */
+
+?>

smarty_move_me/internals/core.rmdir.php

@@ -0,0 +1,54 @@
+<?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']
+                    );
+                    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: */
+
+?>

smarty_move_me/internals/core.run_insert_handler.php

@@ -0,0 +1,71 @@
+<?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_CORE_DIR . '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_CORE_DIR . '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_CORE_DIR . '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: */
+
+?>

smarty_move_me/internals/core.smarty_include_php.php

@@ -0,0 +1,50 @@
+<?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_CORE_DIR . '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: */
+
+?>

smarty_move_me/internals/core.write_cache_file.php

@@ -0,0 +1,96 @@
+<?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.../nocache-tags
+    if (preg_match_all('!\{(/?)nocache\:[0-9a-f]{32}#\d+\}!', $params['results'], $match, PREG_PATTERN_ORDER)) {
+        // remove everything between every pair of outermost noache.../nocache-tags
+        // and replace it by a single nocache-tag
+        // this new nocache-tag will be replaced by dynamic contents in
+        // smarty_core_process_compiled_includes() on a cache-read
+        
+        $match_count = count($match[0]);
+        $results = preg_split('!(\{/?nocache\:[0-9a-f]{32}#\d+\})!', $params['results'], -1, PREG_SPLIT_DELIM_CAPTURE);
+        
+        $level = 0;
+        $j = 0;
+        for ($i=0, $results_count = count($results); $i < $results_count && $j < $match_count; $i++) {
+            if ($results[$i] == $match[0][$j]) {
+                // nocache tag
+                if ($match[1][$j]) { // closing tag
+                    $level--;
+                    unset($results[$i]);
+                } else { // opening tag
+                    if ($level++ > 0) unset($results[$i]);
+                }
+                $j++;
+            } elseif ($level > 0) {
+                unset($results[$i]);
+            }
+        }
+        $params['results'] = implode('', $results);
+    }
+    $smarty->_cache_info['cache_serials'] = $smarty->_cache_serials;
+
+    // prepend the cache header info into cache file
+    $_cache_info = serialize($smarty->_cache_info);
+    $params['results'] = strlen($_cache_info) . "\n" . $_cache_info . $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'], $smarty->_cache_info['expires']));
+    } 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_CORE_DIR . 'core.write_file.php');
+        smarty_core_write_file($_params, $smarty);
+        return true;
+    }
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/internals/core.write_compiled_include.php

@@ -0,0 +1,91 @@
+<?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 && \!\$this->_cache_including\)\: echo \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\'; endif;';
+    $_tag_end   = 'if \(\$this->caching && \!\$this->_cache_including\)\: echo \'\{/nocache\:(\\2)#(\\3)\}\'; endif;';
+
+    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 /* Smarty version ".$smarty->_version.", created on ".strftime("%Y-%m-%d %H:%M:%S")."\n";
+    $_include_compiled .= "         compiled from " . strtr(urlencode($params['resource_name']), array('%2F'=>'/', '%3A'=>':')) . " */\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]);
+
+            /* remove trailing <?php */
+            $open_tag = '';
+            while ($tokens) {
+                $token = array_shift($tokens);
+                if (is_array($token)) {
+                    $open_tag .= $token[1];
+                } else {
+                    $open_tag .= $token;
+                }
+                if ($open_tag == '<?php ') break;
+            }
+
+            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_CORE_DIR . 'core.write_file.php');
+    smarty_core_write_file($_params, $smarty);
+    return true;
+}
+
+
+?>

smarty_move_me/internals/core.write_compiled_resource.php

@@ -0,0 +1,35 @@
+<?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_CORE_DIR . 'core.write_file.php');
+    smarty_core_write_file($_params, $smarty);
+    return true;
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/internals/core.write_file.php

@@ -0,0 +1,54 @@
+<?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_CORE_DIR . '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);
+
+    if (DIRECTORY_SEPARATOR == '\\' || !@rename($_tmp_file, $params['filename'])) {
+        // On platforms and filesystems that cannot overwrite with rename() 
+        // delete the file before renaming it -- because windows always suffers
+        // this, it is short-circuited to avoid the initial rename() attempt
+        @unlink($params['filename']);
+        @rename($_tmp_file, $params['filename']);
+    }
+    @chmod($params['filename'], $smarty->_file_perms);
+
+    return true;
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/block.textformat.php

@@ -1,52 +1,39 @@
 <?php
 /**
- * Smarty plugin to format text blocks
- *
- * @package    Smarty
- * @subpackage PluginsBlock
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
  */
+
 /**
  * Smarty {textformat}{/textformat} block plugin
- * Type:     block function
- * Name:     textformat
+ *
+ * Type:     block function<br>
+ * Name:     textformat<br>
  * Purpose:  format text a certain way with preset styles
- *           or custom wrap/indent settings
- * Params:
- *
- * - style         - string (email)
- * - indent        - integer (0)
- * - wrap          - integer (80)
- * - wrap_char     - string ("\n")
- * - indent_char   - string (" ")
- * - wrap_boundary - boolean (true)
- *
- * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
- *         (Smarty online manual)
- *
- * @param array                    $params   parameters
- * @param string                   $content  contents of the block
- * @param Smarty_Internal_Template $template template object
- * @param boolean                  &$repeat  repeat flag
- *
- * @return string content re-formatted
+ *           or custom wrap/indent settings<br>
+ * @link http://smarty.php.net/manual/en/language.function.textformat.php {textformat}
+ *       (Smarty online manual)
+ * @param array
+ * <pre>
+ * Params:   style: string (email)
+ *           indent: integer (0)
+ *           wrap: integer (80)
+ *           wrap_char string ("\n")
+ *           indent_char: string (" ")
+ *           wrap_boundary: boolean (true)
+ * </pre>
  * @author Monte Ohrt <monte at ohrt dot com>
- * @throws \SmartyException
+ * @param string contents of the block
+ * @param Smarty clever simulation of a method
+ * @return string string $content re-formatted
  */
-function smarty_block_textformat($params, $content, Smarty_Internal_Template $template, &$repeat)
+function smarty_block_textformat($params, $content, &$smarty)
 {
     if (is_null($content)) {
         return;
     }
-    if (Smarty::$_MBSTRING) {
-        $template->_checkPlugins(
-            array(
-                array(
-                    'function' => 'smarty_modifier_mb_wordwrap',
-                    'file'     => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php'
-                )
-            )
-        );
-    }
+
     $style = null;
     $indent = 0;
     $indent_first = 0;
@@ -55,6 +42,7 @@ function smarty_block_textformat($params, $content, Smarty_Internal_Template $te
     $wrap_char = "\n";
     $wrap_cut = false;
     $assign = null;
+    
     foreach ($params as $_key => $_val) {
         switch ($_key) {
             case 'style':
@@ -63,59 +51,53 @@ function smarty_block_textformat($params, $content, Smarty_Internal_Template $te
             case 'assign':
                 $$_key = (string)$_val;
                 break;
+
             case 'indent':
             case 'indent_first':
             case 'wrap':
                 $$_key = (int)$_val;
                 break;
+
             case 'wrap_cut':
                 $$_key = (bool)$_val;
                 break;
+
             default:
-                trigger_error("textformat: unknown attribute '{$_key}'");
+                $smarty->trigger_error("textformat: unknown attribute '$_key'");
         }
     }
-    if ($style === 'email') {
+
+    if ($style == 'email') {
         $wrap = 72;
     }
+
     // split into paragraphs
-    $_paragraphs = preg_split('![\r\n]{2}!', $content);
-    foreach ($_paragraphs as &$_paragraph) {
-        if (!$_paragraph) {
+    $_paragraphs = preg_split('![\r\n][\r\n]!',$content);
+    $_output = '';
+
+    for($_x = 0, $_y = count($_paragraphs); $_x < $_y; $_x++) {
+        if ($_paragraphs[$_x] == '') {
             continue;
         }
         // convert mult. spaces & special chars to single space
-        $_paragraph =
-            preg_replace(
-                array(
-                    '!\s+!' . Smarty::$_UTF8_MODIFIER,
-                    '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER
-                ),
-                array(
-                    ' ',
-                    ''
-                ),
-                $_paragraph
-            );
+        $_paragraphs[$_x] = preg_replace(array('!\s+!','!(^\s+)|(\s+$)!'), array(' ',''), $_paragraphs[$_x]);
         // indent first line
-        if ($indent_first > 0) {
-            $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
+        if($indent_first > 0) {
+            $_paragraphs[$_x] = str_repeat($indent_char, $indent_first) . $_paragraphs[$_x];
         }
         // wordwrap sentences
-        if (Smarty::$_MBSTRING) {
-            $_paragraph = smarty_modifier_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        } else {
-            $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        }
+        $_paragraphs[$_x] = wordwrap($_paragraphs[$_x], $wrap - $indent, $wrap_char, $wrap_cut);
         // indent lines
-        if ($indent > 0) {
-            $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
+        if($indent > 0) {
+            $_paragraphs[$_x] = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraphs[$_x]);
         }
     }
     $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-    if ($assign) {
-        $template->assign($assign, $_output);
-    } else {
-        return $_output;
-    }
+
+    return $assign ? $smarty->assign($assign, $_output) : $_output;
+
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/compiler.assign.php

@@ -0,0 +1,40 @@
+<?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)
+ * @author Monte Ohrt <monte at ohrt dot com> (initial author)
+ * @author messju mohr <messju at lammfellpuschen dot de> (conversion to compiler function)
+ * @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: */
+
+?>

smarty_move_me/plugins/function.assign_debug_info.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+/**
+ * Smarty {assign_debug_info} function plugin
+ *
+ * Type:     function<br>
+ * Name:     assign_debug_info<br>
+ * Purpose:  assign debug info to the template<br>
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @param array unused in this plugin, this plugin uses {@link Smarty::$_config},
+ *              {@link Smarty::$_tpl_vars} and {@link Smarty::$_smarty_debug_info}
+ * @param Smarty
+ */
+function smarty_function_assign_debug_info($params, &$smarty)
+{
+    $assigned_vars = $smarty->_tpl_vars;
+    ksort($assigned_vars);
+    if (@is_array($smarty->_config[0])) {
+        $config_vars = $smarty->_config[0];
+        ksort($config_vars);
+        $smarty->assign("_debug_config_keys", array_keys($config_vars));
+        $smarty->assign("_debug_config_vals", array_values($config_vars));
+    }
+    
+    $included_templates = $smarty->_smarty_debug_info;
+    
+    $smarty->assign("_debug_keys", array_keys($assigned_vars));
+    $smarty->assign("_debug_vals", array_values($assigned_vars));
+    
+    $smarty->assign("_debug_tpls", $included_templates);
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.config_load.php

@@ -0,0 +1,142 @@
+<?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)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author messju mohr <messju at lammfellpuschen dot de> (added use of resources)
+ * @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_CORE_DIR . '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_CORE_DIR . '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_CORE_DIR . '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: */
+
+?>

smarty_move_me/plugins/function.counter.php

@@ -1,62 +1,80 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {counter} function plugin
- * Type:     function
- * Name:     counter
+ *
+ * Type:     function<br>
+ * Name:     counter<br>
  * Purpose:  print out a counter value
- *
  * @author Monte Ohrt <monte at ohrt dot com>
- * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
- *         (Smarty online manual)
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
+ * @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, $template)
+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);
+
+    $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' ];
+    $counter =& $counters[$name];
+
+    if (isset($params['start'])) {
+        $counter['start'] = $counter['count'] = (int)$params['start'];
     }
-    if (!empty($params[ 'assign' ])) {
-        $counter[ 'assign' ] = $params[ 'assign' ];
+
+    if (!empty($params['assign'])) {
+        $counter['assign'] = $params['assign'];
     }
-    if (isset($counter[ 'assign' ])) {
-        $template->assign($counter[ 'assign' ], $counter[ 'count' ]);
+
+    if (isset($counter['assign'])) {
+        $smarty->assign($counter['assign'], $counter['count']);
     }
-    if (isset($params[ 'print' ])) {
-        $print = (bool)$params[ 'print' ];
+    
+    if (isset($params['print'])) {
+        $print = (bool)$params['print'];
     } else {
-        $print = empty($counter[ 'assign' ]);
+        $print = empty($counter['assign']);
     }
+
     if ($print) {
-        $retval = $counter[ 'count' ];
+        $retval = $counter['count'];
     } else {
         $retval = null;
     }
-    if (isset($params[ 'skip' ])) {
-        $counter[ 'skip' ] = $params[ 'skip' ];
+
+    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' ];
+    
+    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: */
+
+?>

smarty_move_me/plugins/function.cycle.php

@@ -1,92 +1,106 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
 /**
  * Smarty {cycle} function plugin
- * Type:     function
- * Name:     cycle
- * Date:     May 3, 2002
- * Purpose:  cycle through given values
- * Params:
  *
- * - name      - name of cycle (optional)
- * - values    - comma separated list of values to cycle, or an array of values to cycle
- *               (this can be left out for subsequent calls)
- * - reset     - boolean - resets given var to true
- * - print     - boolean - print var or not. default is true
- * - advance   - boolean - whether or not to advance the cycle
- * - delimiter - the value delimiter, default is ","
- * - assign    - boolean, assigns to template var instead of printed.
- *
- * Examples:
+ * Type:     function<br>
+ * Name:     cycle<br>
+ * Date:     May 3, 2002<br>
+ * Purpose:  cycle through given values<br>
+ * Input:
+ *         - name = name of cycle (optional)
+ *         - values = comma separated list of values to cycle,
+ *                    or an array of values to cycle
+ *                    (this can be left out for subsequent calls)
+ *         - reset = boolean - resets given var to true
+ *         - print = boolean - print var or not. default is true
+ *         - advance = boolean - whether or not to advance the cycle
+ *         - delimiter = the value delimiter, default is ","
+ *         - assign = boolean, assigns to template var instead of
+ *                    printed.
  *
+ * Examples:<br>
+ * <pre>
  * {cycle values="#eeeeee,#d0d0d0d"}
  * {cycle name=row values="one,two,three" reset=true}
  * {cycle name=row}
- *
- * @link    http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
- *           (Smarty online manual)
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credit to Mark Priatel <mpriatel@rogers.com>
- * @author  credit to Gerard <gerard@interfold.com>
- * @author  credit to Jason Sweat <jsweat_php@yahoo.com>
- * @version 1.3
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
+ * </pre>
+ * @link http://smarty.php.net/manual/en/language.function.cycle.php {cycle}
+ *       (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author credit to Mark Priatel <mpriatel@rogers.com>
+ * @author credit to Gerard <gerard@interfold.com>
+ * @author credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @version  1.3
+ * @param array
+ * @param Smarty
  * @return string|null
  */
-function smarty_function_cycle($params, $template)
+function smarty_function_cycle($params, &$smarty)
 {
     static $cycle_vars;
-    $name = (empty($params[ 'name' ])) ? 'default' : $params[ 'name' ];
-    $print = (isset($params[ 'print' ])) ? (bool)$params[ 'print' ] : true;
-    $advance = (isset($params[ 'advance' ])) ? (bool)$params[ 'advance' ] : true;
-    $reset = (isset($params[ 'reset' ])) ? (bool)$params[ 'reset' ] : false;
-    if (!isset($params[ 'values' ])) {
-        if (!isset($cycle_vars[ $name ][ 'values' ])) {
-            trigger_error('cycle: missing \'values\' parameter');
+    
+    $name = (empty($params['name'])) ? 'default' : $params['name'];
+    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
+    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
+    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
+            
+    if (!in_array('values', array_keys($params))) {
+        if(!isset($cycle_vars[$name]['values'])) {
+            $smarty->trigger_error("cycle: missing 'values' parameter");
             return;
         }
     } else {
-        if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] !== $params[ 'values' ]) {
-            $cycle_vars[ $name ][ 'index' ] = 0;
+        if(isset($cycle_vars[$name]['values'])
+            && $cycle_vars[$name]['values'] != $params['values'] ) {
+            $cycle_vars[$name]['index'] = 0;
         }
-        $cycle_vars[ $name ][ 'values' ] = $params[ 'values' ];
+        $cycle_vars[$name]['values'] = $params['values'];
     }
-    if (isset($params[ 'delimiter' ])) {
-        $cycle_vars[ $name ][ 'delimiter' ] = $params[ 'delimiter' ];
-    } elseif (!isset($cycle_vars[ $name ][ 'delimiter' ])) {
-        $cycle_vars[ $name ][ 'delimiter' ] = ',';
+
+    if (isset($params['delimiter'])) {
+        $cycle_vars[$name]['delimiter'] = $params['delimiter'];
+    } elseif (!isset($cycle_vars[$name]['delimiter'])) {
+        $cycle_vars[$name]['delimiter'] = ',';       
     }
-    if (is_array($cycle_vars[ $name ][ 'values' ])) {
-        $cycle_array = $cycle_vars[ $name ][ 'values' ];
+    
+    if(is_array($cycle_vars[$name]['values'])) {
+        $cycle_array = $cycle_vars[$name]['values'];
     } else {
-        $cycle_array = explode($cycle_vars[ $name ][ 'delimiter' ], $cycle_vars[ $name ][ 'values' ]);
+        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
     }
-    if (!isset($cycle_vars[ $name ][ 'index' ]) || $reset) {
-        $cycle_vars[ $name ][ 'index' ] = 0;
+    
+    if(!isset($cycle_vars[$name]['index']) || $reset ) {
+        $cycle_vars[$name]['index'] = 0;
     }
-    if (isset($params[ 'assign' ])) {
+    
+    if (isset($params['assign'])) {
         $print = false;
-        $template->assign($params[ 'assign' ], $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]);
+        $smarty->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
     }
-    if ($print) {
-        $retval = $cycle_array[ $cycle_vars[ $name ][ 'index' ] ];
+        
+    if($print) {
+        $retval = $cycle_array[$cycle_vars[$name]['index']];
     } else {
         $retval = null;
     }
-    if ($advance) {
-        if ($cycle_vars[ $name ][ 'index' ] >= count($cycle_array) - 1) {
-            $cycle_vars[ $name ][ 'index' ] = 0;
+
+    if($advance) {
+        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
+            $cycle_vars[$name]['index'] = 0;
         } else {
-            $cycle_vars[ $name ][ 'index' ]++;
+            $cycle_vars[$name]['index']++;
         }
     }
+    
     return $retval;
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.debug.php

@@ -0,0 +1,35 @@
+<?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 <monte at ohrt dot com>
+ * @version  1.0
+ * @param array
+ * @param Smarty
+ * @return string output from {@link Smarty::_generate_debug_output()}
+ */
+function smarty_function_debug($params, &$smarty)
+{
+    if (isset($params['output'])) {
+        $smarty->assign('_smarty_debug_output', $params['output']);
+    }
+    require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
+    return smarty_core_display_debug_console(null, $smarty);
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.eval.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty {eval} function plugin
+ *
+ * Type:     function<br>
+ * Name:     eval<br>
+ * Purpose:  evaluate a template variable as a template<br>
+ * @link http://smarty.php.net/manual/en/language.function.eval.php {eval}
+ *       (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @param array
+ * @param Smarty
+ */
+function smarty_function_eval($params, &$smarty)
+{
+
+    if (!isset($params['var'])) {
+        $smarty->trigger_error("eval: missing 'var' parameter");
+        return;
+    }
+
+    if($params['var'] == '') {
+        return;
+    }
+
+    $smarty->_compile_source('evaluated template', $params['var'], $_var_compiled);
+
+    ob_start();
+    $smarty->_eval('?>' . $_var_compiled);
+    $_contents = ob_get_contents();
+    ob_end_clean();
+
+    if (!empty($params['assign'])) {
+        $smarty->assign($params['assign'], $_contents);
+    } else {
+        return $_contents;
+    }
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.fetch.php

@@ -1,204 +1,221 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {fetch} plugin
- * Type:     function
- * Name:     fetch
+ *
+ * Type:     function<br>
+ * Name:     fetch<br>
  * Purpose:  fetch file, web or ftp data and display results
- *
- * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
- *         (Smarty online manual)
+ * @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch}
+ *       (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @throws SmartyException
- * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
+ * @param array
+ * @param Smarty
+ * @return string|null if the assign parameter is passed, Smarty assigns the
+ *                     result to a template variable
  */
-function smarty_function_fetch($params, $template)
+function smarty_function_fetch($params, &$smarty)
 {
-    if (empty($params[ 'file' ])) {
-        trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
+    if (empty($params['file'])) {
+        $smarty->_trigger_fatal_error("[plugin] parameter 'file' cannot be empty");
         return;
     }
-    // strip file protocol
-    if (stripos($params[ 'file' ], 'file://') === 0) {
-        $params[ 'file' ] = substr($params[ 'file' ], 7);
-    }
-    $protocol = strpos($params[ 'file' ], '://');
-    if ($protocol !== false) {
-        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
-    }
-    if (isset($template->smarty->security_policy)) {
-        if ($protocol) {
-            // remote resource (or php stream, …)
-            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
-                return;
-            }
-        } else {
-            // local file
-            if (!$template->smarty->security_policy->isTrustedResourceDir($params[ 'file' ])) {
-                return;
-            }
-        }
-    }
+
     $content = '';
-    if ($protocol === 'http') {
-        // http fetch
-        if ($uri_parts = parse_url($params[ 'file' ])) {
-            // set defaults
-            $host = $server_name = $uri_parts[ 'host' ];
-            $timeout = 30;
-            $accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
-            $agent = 'Smarty Template Engine ' . Smarty::SMARTY_VERSION;
-            $referer = '';
-            $uri = !empty($uri_parts[ 'path' ]) ? $uri_parts[ 'path' ] : '/';
-            $uri .= !empty($uri_parts[ 'query' ]) ? '?' . $uri_parts[ 'query' ] : '';
-            $_is_proxy = false;
-            if (empty($uri_parts[ 'port' ])) {
-                $port = 80;
-            } else {
-                $port = $uri_parts[ 'port' ];
-            }
-            if (!empty($uri_parts[ 'user' ])) {
-                $user = $uri_parts[ 'user' ];
-            }
-            if (!empty($uri_parts[ 'pass' ])) {
-                $pass = $uri_parts[ 'pass' ];
-            }
-            // loop through parameters, setup headers
-            foreach ($params as $param_key => $param_value) {
-                switch ($param_key) {
-                    case 'file':
-                    case 'assign':
-                    case 'assign_headers':
-                        break;
-                    case 'user':
-                        if (!empty($param_value)) {
-                            $user = $param_value;
-                        }
-                        break;
-                    case 'pass':
-                        if (!empty($param_value)) {
-                            $pass = $param_value;
-                        }
-                        break;
-                    case 'accept':
-                        if (!empty($param_value)) {
-                            $accept = $param_value;
-                        }
-                        break;
-                    case 'header':
-                        if (!empty($param_value)) {
-                            if (!preg_match('![\w\d-]+: .+!', $param_value)) {
-                                trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
-                                return;
-                            } else {
-                                $extra_headers[] = $param_value;
-                            }
-                        }
-                        break;
-                    case 'proxy_host':
-                        if (!empty($param_value)) {
-                            $proxy_host = $param_value;
-                        }
-                        break;
-                    case 'proxy_port':
-                        if (!preg_match('!\D!', $param_value)) {
-                            $proxy_port = (int)$param_value;
-                        } else {
-                            trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
-                            return;
-                        }
-                        break;
-                    case 'agent':
-                        if (!empty($param_value)) {
-                            $agent = $param_value;
-                        }
-                        break;
-                    case 'referer':
-                        if (!empty($param_value)) {
-                            $referer = $param_value;
-                        }
-                        break;
-                    case 'timeout':
-                        if (!preg_match('!\D!', $param_value)) {
-                            $timeout = (int)$param_value;
-                        } else {
-                            trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
-                            return;
-                        }
-                        break;
-                    default:
-                        trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
-                        return;
-                }
-            }
-            if (!empty($proxy_host) && !empty($proxy_port)) {
-                $_is_proxy = true;
-                $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
-            } else {
-                $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
-            }
-            if (!$fp) {
-                trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
-                return;
-            } else {
-                if ($_is_proxy) {
-                    fputs($fp, 'GET ' . $params[ 'file' ] . " HTTP/1.0\r\n");
-                } else {
-                    fputs($fp, "GET $uri HTTP/1.0\r\n");
-                }
-                if (!empty($host)) {
-                    fputs($fp, "Host: $host\r\n");
-                }
-                if (!empty($accept)) {
-                    fputs($fp, "Accept: $accept\r\n");
-                }
-                if (!empty($agent)) {
-                    fputs($fp, "User-Agent: $agent\r\n");
-                }
-                if (!empty($referer)) {
-                    fputs($fp, "Referer: $referer\r\n");
-                }
-                if (isset($extra_headers) && is_array($extra_headers)) {
-                    foreach ($extra_headers as $curr_header) {
-                        fputs($fp, $curr_header . "\r\n");
-                    }
-                }
-                if (!empty($user) && !empty($pass)) {
-                    fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
-                }
-                fputs($fp, "\r\n");
-                while (!feof($fp)) {
-                    $content .= fgets($fp, 4096);
-                }
-                fclose($fp);
-                $csplit = preg_split("!\r\n\r\n!", $content, 2);
-                $content = $csplit[ 1 ];
-                if (!empty($params[ 'assign_headers' ])) {
-                    $template->assign($params[ 'assign_headers' ], preg_split("!\r\n!", $csplit[ 0 ]));
-                }
+    if ($smarty->security && !preg_match('!^(http|ftp)://!i', $params['file'])) {
+        $_params = array('resource_type' => 'file', 'resource_name' => $params['file']);
+        require_once(SMARTY_CORE_DIR . 'core.is_secure.php');
+        if(!smarty_core_is_secure($_params, $smarty)) {
+            $smarty->_trigger_fatal_error('[plugin] (secure mode) fetch \'' . $params['file'] . '\' is not allowed');
+            return;
+        }
+        
+        // fetch the file
+        if($fp = @fopen($params['file'],'r')) {
+            while(!feof($fp)) {
+                $content .= fgets ($fp,4096);
             }
+            fclose($fp);
         } else {
-            trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
+            $smarty->_trigger_fatal_error('[plugin] fetch cannot read file \'' . $params['file'] . '\'');
             return;
         }
     } else {
-        $content = @file_get_contents($params[ 'file' ]);
-        if ($content === false) {
-            throw new SmartyException("{fetch} cannot read resource '" . $params[ 'file' ] . "'");
+        // not a local file
+        if(preg_match('!^http://!i',$params['file'])) {
+            // http fetch
+            if($uri_parts = parse_url($params['file'])) {
+                // set defaults
+                $host = $server_name = $uri_parts['host'];
+                $timeout = 30;
+                $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+                $agent = "Smarty Template Engine ".$smarty->_version;
+                $referer = "";
+                $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
+                $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
+                $_is_proxy = false;
+                if(empty($uri_parts['port'])) {
+                    $port = 80;
+                } else {
+                    $port = $uri_parts['port'];
+                }
+                if(!empty($uri_parts['user'])) {
+                    $user = $uri_parts['user'];
+                }
+                if(!empty($uri_parts['pass'])) {
+                    $pass = $uri_parts['pass'];
+                }
+                // loop through parameters, setup headers
+                foreach($params as $param_key => $param_value) {
+                    switch($param_key) {
+                        case "file":
+                        case "assign":
+                        case "assign_headers":
+                            break;
+                        case "user":
+                            if(!empty($param_value)) {
+                                $user = $param_value;
+                            }
+                            break;
+                        case "pass":
+                            if(!empty($param_value)) {
+                                $pass = $param_value;
+                            }
+                            break;
+                        case "accept":
+                            if(!empty($param_value)) {
+                                $accept = $param_value;
+                            }
+                            break;
+                        case "header":
+                            if(!empty($param_value)) {
+                                if(!preg_match('![\w\d-]+: .+!',$param_value)) {
+                                    $smarty->_trigger_fatal_error("[plugin] invalid header format '".$param_value."'");
+                                    return;
+                                } else {
+                                    $extra_headers[] = $param_value;
+                                }
+                            }
+                            break;
+                        case "proxy_host":
+                            if(!empty($param_value)) {
+                                $proxy_host = $param_value;
+                            }
+                            break;
+                        case "proxy_port":
+                            if(!preg_match('!\D!', $param_value)) {
+                                $proxy_port = (int) $param_value;
+                            } else {
+                                $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
+                                return;
+                            }
+                            break;
+                        case "agent":
+                            if(!empty($param_value)) {
+                                $agent = $param_value;
+                            }
+                            break;
+                        case "referer":
+                            if(!empty($param_value)) {
+                                $referer = $param_value;
+                            }
+                            break;
+                        case "timeout":
+                            if(!preg_match('!\D!', $param_value)) {
+                                $timeout = (int) $param_value;
+                            } else {
+                                $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
+                                return;
+                            }
+                            break;
+                        default:
+                            $smarty->_trigger_fatal_error("[plugin] unrecognized attribute '".$param_key."'");
+                            return;
+                    }
+                }
+                if(!empty($proxy_host) && !empty($proxy_port)) {
+                    $_is_proxy = true;
+                    $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
+                } else {
+                    $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
+                }
+
+                if(!$fp) {
+                    $smarty->_trigger_fatal_error("[plugin] unable to fetch: $errstr ($errno)");
+                    return;
+                } else {
+                    if($_is_proxy) {
+                        fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
+                    } else {
+                        fputs($fp, "GET $uri HTTP/1.0\r\n");
+                    }
+                    if(!empty($host)) {
+                        fputs($fp, "Host: $host\r\n");
+                    }
+                    if(!empty($accept)) {
+                        fputs($fp, "Accept: $accept\r\n");
+                    }
+                    if(!empty($agent)) {
+                        fputs($fp, "User-Agent: $agent\r\n");
+                    }
+                    if(!empty($referer)) {
+                        fputs($fp, "Referer: $referer\r\n");
+                    }
+                    if(isset($extra_headers) && is_array($extra_headers)) {
+                        foreach($extra_headers as $curr_header) {
+                            fputs($fp, $curr_header."\r\n");
+                        }
+                    }
+                    if(!empty($user) && !empty($pass)) {
+                        fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
+                    }
+
+                    fputs($fp, "\r\n");
+                    while(!feof($fp)) {
+                        $content .= fgets($fp,4096);
+                    }
+                    fclose($fp);
+                    $csplit = preg_split("!\r\n\r\n!",$content,2);
+
+                    $content = $csplit[1];
+
+                    if(!empty($params['assign_headers'])) {
+                        $smarty->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
+                    }
+                }
+            } else {
+                $smarty->_trigger_fatal_error("[plugin] unable to parse URL, check syntax");
+                return;
+            }
+        } else {
+            // ftp fetch
+            if($fp = @fopen($params['file'],'r')) {
+                while(!feof($fp)) {
+                    $content .= fgets ($fp,4096);
+                }
+                fclose($fp);
+            } else {
+                $smarty->_trigger_fatal_error('[plugin] fetch cannot read file \'' . $params['file'] .'\'');
+                return;
+            }
         }
+
     }
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $content);
+
+
+    if (!empty($params['assign'])) {
+        $smarty->assign($params['assign'],$content);
     } else {
         return $content;
     }
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.html_checkboxes.php

@@ -1,286 +1,143 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {html_checkboxes} function plugin
- * File:       function.html_checkboxes.php
- * Type:       function
- * Name:       html_checkboxes
- * Date:       24.Feb.2003
- * Purpose:    Prints out a list of checkbox input types
- * Examples:
  *
+ * File:       function.html_checkboxes.php<br>
+ * Type:       function<br>
+ * Name:       html_checkboxes<br>
+ * Date:       24.Feb.2003<br>
+ * Purpose:    Prints out a list of checkbox input types<br>
+ * Input:<br>
+ *           - name       (optional) - string default "checkbox"
+ *           - values     (required) - array
+ *           - options    (optional) - associative array
+ *           - checked    (optional) - array default not set
+ *           - separator  (optional) - ie <br> or &nbsp;
+ *           - output     (optional) - the output next to each checkbox
+ *           - assign     (optional) - assign the output as an array to this variable
+ * Examples:
+ * <pre>
  * {html_checkboxes values=$ids output=$names}
  * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
  * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- *
- * Params:
- *
- * - name       (optional) - string default "checkbox"
- * - values     (required) - array
- * - options    (optional) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each checkbox
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- *
- * @link    http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *             (Smarty online manual)
- * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author  credits to Monte Ohrt <monte at ohrt dot com>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
+ * </pre>
+ * @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ *      (Smarty online manual)
+ * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author credits to Monte Ohrt <monte at ohrt dot com>
+ * @version    1.0
+ * @param array
+ * @param Smarty
  * @return string
- * @uses    smarty_function_escape_special_chars()
- * @throws \SmartyException
+ * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_html_checkboxes($params, Smarty_Internal_Template $template)
+function smarty_function_html_checkboxes($params, &$smarty)
 {
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
+    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+
     $name = 'checkbox';
     $values = null;
     $options = null;
-    $selected = array();
+    $selected = null;
     $separator = '';
-    $escape = true;
     $labels = true;
-    $label_ids = false;
     $output = null;
+
     $extra = '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
+
+    foreach($params as $_key => $_val) {
+        switch($_key) {
             case 'name':
             case 'separator':
-                $$_key = (string)$_val;
+                $$_key = $_val;
                 break;
-            case 'escape':
+
             case 'labels':
-            case 'label_ids':
                 $$_key = (bool)$_val;
                 break;
+
             case 'options':
                 $$_key = (array)$_val;
                 break;
+
             case 'values':
             case 'output':
                 $$_key = array_values((array)$_val);
                 break;
+
             case 'checked':
             case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, '__toString')) {
-                                $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
-                            } else {
-                                trigger_error(
-                                    'html_checkboxes: selected attribute contains an object of class \'' .
-                                    get_class($_sel) . '\' without __toString() method',
-                                    E_USER_NOTICE
-                                );
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string)$_sel);
-                        }
-                        $selected[ $_sel ] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, '__toString')) {
-                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
-                    } else {
-                        trigger_error(
-                            'html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
-                            '\' without __toString() method',
-                            E_USER_NOTICE
-                        );
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string)$_val);
-                }
+                $selected = array_map('strval', array_values((array)$_val));
                 break;
+
             case 'checkboxes':
-                trigger_error(
-                    'html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
-                    E_USER_WARNING
-                );
+                $smarty->trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
                 $options = (array)$_val;
                 break;
+
             case 'assign':
                 break;
-            case 'strict':
-                break;
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error(
-                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
-                            E_USER_NOTICE
-                        );
-                    }
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-                    break;
-                }
-            // omit break; to fall through!
-            // no break
+
             default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                if(!is_array($_val)) {
+                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
                 } else {
-                    trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                    $smarty->trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
     }
-    if (!isset($options) && !isset($values)) {
-        return '';
-    } /* raise error here? */
+
+    if (!isset($options) && !isset($values))
+        return ''; /* raise error here? */
+
+    settype($selected, 'array');
     $_html_result = array();
+
     if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] =
-                smarty_function_html_checkboxes_output(
-                    $name,
-                    $_key,
-                    $_val,
-                    $selected,
-                    $extra,
-                    $separator,
-                    $labels,
-                    $label_ids,
-                    $escape
-                );
-        }
+
+        foreach ($options as $_key=>$_val)
+            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
+
+
     } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_checkboxes_output(
-                    $name,
-                    $_key,
-                    $_val,
-                    $selected,
-                    $extra,
-                    $separator,
-                    $labels,
-                    $label_ids,
-                    $escape
-                );
+        foreach ($values as $_i=>$_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
         }
+
     }
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
+
+    if(!empty($params['assign'])) {
+        $smarty->assign($params['assign'], $_html_result);
     } else {
-        return implode("\n", $_html_result);
+        return implode("\n",$_html_result);
     }
+
 }
 
-/**
- * @param      $name
- * @param      $value
- * @param      $output
- * @param      $selected
- * @param      $extra
- * @param      $separator
- * @param      $labels
- * @param      $label_ids
- * @param bool $escape
- *
- * @return string
- */
-function smarty_function_html_checkboxes_output(
-    $name,
-    $value,
-    $output,
-    $selected,
-    $extra,
-    $separator,
-    $labels,
-    $label_ids,
-    $escape = true
-) {
+function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels) {
     $_output = '';
-    if (is_object($value)) {
-        if (method_exists($value, '__toString')) {
-            $value = (string)$value->__toString();
-        } else {
-            trigger_error(
-                'html_options: value is an object of class \'' . get_class($value) .
-                '\' without __toString() method',
-                E_USER_NOTICE
-            );
-            return '';
-        }
-    } else {
-        $value = (string)$value;
-    }
-    if (is_object($output)) {
-        if (method_exists($output, '__toString')) {
-            $output = (string)$output->__toString();
-        } else {
-            trigger_error(
-                'html_options: output is an object of class \'' . get_class($output) .
-                '\' without __toString() method',
-                E_USER_NOTICE
-            );
-            return '';
-        }
-    } else {
-        $output = (string)$output;
-    }
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(
-                preg_replace(
-                    '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
-                    '_',
-                    $name . '_' . $value
-                )
-            );
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-    $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-    if (is_array($selected)) {
-        if (isset($selected[ $value ])) {
-            $_output .= ' checked="checked"';
-        }
-    } elseif ($value === $selected) {
+    if ($labels) $_output .= '<label>';
+    $_output .= '<input type="checkbox" name="'
+        . smarty_function_escape_special_chars($name) . '[]" value="'
+        . smarty_function_escape_special_chars($value) . '"';
+
+    if (in_array((string)$value, $selected)) {
         $_output .= ' checked="checked"';
     }
     $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-    $_output .= $separator;
+    if ($labels) $_output .= '</label>';
+    $_output .=  $separator;
+
     return $_output;
 }
+
+?>

smarty_move_me/plugins/function.html_image.php

@@ -1,49 +1,43 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {html_image} function plugin
- * Type:     function
- * Name:     html_image
- * Date:     Feb 24, 2003
- * Purpose:  format HTML tags for the image
+ *
+ * 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)
+ *         - height = image height (optional, default actual height)
+ *         - width = image width (optional, default actual width)
+ *         - basedir = base directory for absolute paths, default
+ *                     is environment variable DOCUMENT_ROOT
+ *         - path_prefix = prefix for path output (optional, default empty)
+ *
  * Examples: {html_image file="/images/masthead.gif"}
  * Output:   <img src="/images/masthead.gif" width=400 height=23>
- * Params:
- *
- * - file        - (required) - file (and path) of image
- * - height      - (optional) - image height (default actual height)
- * - width       - (optional) - image width (default actual width)
- * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
- * - path_prefix - prefix for path output (optional, default empty)
- *
- * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
- *          (Smarty online manual)
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credits to Duda <duda@big.hu>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @throws SmartyException
+ * @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image}
+ *      (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author credits to Duda <duda@big.hu> - 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()
+ * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_html_image($params, Smarty_Internal_Template $template)
+function smarty_function_html_image($params, &$smarty)
 {
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
+    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+    
     $alt = '';
     $file = '';
     $height = '';
@@ -52,9 +46,10 @@ function smarty_function_html_image($params, Smarty_Internal_Template $template)
     $prefix = '';
     $suffix = '';
     $path_prefix = '';
-    $basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
+    $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 'height':
             case 'width':
@@ -63,96 +58,85 @@ function smarty_function_html_image($params, Smarty_Internal_Template $template)
             case 'basedir':
                 $$_key = $_val;
                 break;
+
             case 'alt':
-                if (!is_array($_val)) {
+                if(!is_array($_val)) {
                     $$_key = smarty_function_escape_special_chars($_val);
                 } else {
-                    throw new SmartyException(
-                        "html_image: extra attribute '{$_key}' cannot be an array",
-                        E_USER_NOTICE
-                    );
+                    $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) . '"';
+                if(!is_array($_val)) {
+                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
                 } else {
-                    throw new SmartyException(
-                        "html_image: extra attribute '{$_key}' cannot be an array",
-                        E_USER_NOTICE
-                    );
+                    $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
     }
+
     if (empty($file)) {
-        trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
+        $smarty->trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
         return;
     }
-    if ($file[ 0 ] === '/') {
+
+    if (substr($file,0,1) == '/') {
         $_image_path = $basedir . $file;
     } else {
         $_image_path = $file;
     }
-    // strip file protocol
-    if (stripos($params[ 'file' ], 'file://') === 0) {
-        $params[ 'file' ] = substr($params[ 'file' ], 7);
-    }
-    $protocol = strpos($params[ 'file' ], '://');
-    if ($protocol !== false) {
-        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
-    }
-    if (isset($template->smarty->security_policy)) {
-        if ($protocol) {
-            // remote resource (or php stream, …)
-            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+    
+    if(!isset($params['width']) || !isset($params['height'])) {
+        if(!$_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 {
-            // local file
-            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
-                return;
-            }
-        }
-    }
-    if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
-        // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
-        if (!$_image_data = @getimagesize($_image_path)) {
-            if (!file_exists($_image_path)) {
-                trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
-                return;
-            } elseif (!is_readable($_image_path)) {
-                trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
+            } else if(!is_readable($_image_path)) {
+                $smarty->trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
                 return;
             } else {
-                trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
+                $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 ($smarty->security &&
+            ($_params = array('resource_type' => 'file', 'resource_name' => $_image_path)) &&
+            (require_once(SMARTY_CORE_DIR . '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);
+        }        
+        
+        if(!isset($params['width'])) {
+            $width = $_image_data[0];
         }
-        if (!isset($params[ 'height' ])) {
-            $height = $_image_data[ 1 ];
+        if(!isset($params['height'])) {
+            $height = $_image_data[1];
         }
+
     }
-    if (isset($params[ 'dpi' ])) {
-        if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
-            // FIXME: (rodneyrehm) wrong dpi assumption
-            // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
+
+    if(isset($params['dpi'])) {
+        if(strstr($server_vars['HTTP_USER_AGENT'], 'Mac')) {
             $dpi_default = 72;
         } else {
             $dpi_default = 96;
         }
-        $_resize = $dpi_default / $params[ 'dpi' ];
+        $_resize = $dpi_default/$params['dpi'];
         $width = round($width * $_resize);
         $height = round($height * $_resize);
     }
-    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
-           $height . '"' . $extra . ' />' . $suffix;
+
+    return $prefix . '<img src="'.$path_prefix.$file.'" alt="'.$alt.'" width="'.$width.'" height="'.$height.'"'.$extra.' />' . $suffix;
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.html_options.php

@@ -1,230 +1,122 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {html_options} function plugin
- * Type:     function
- * Name:     html_options
+ *
+ * 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
- * Params:
- *
- * - 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
- * - id         (optional) - string default not set
- * - class      (optional) - string default not set
- *
- * @link   http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
- *           (Smarty online manual)
+ * @link http://smarty.php.net/manual/en/language.function.html.options.php {html_image}
+ *      (Smarty online manual)
  * @author Monte Ohrt <monte at ohrt dot com>
- * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
- *
- * @param array                     $params parameters
- *
- * @param \Smarty_Internal_Template $template
- *
+ * @param array
+ * @param Smarty
  * @return string
- * @uses   smarty_function_escape_special_chars()
- * @throws \SmartyException
+ * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_html_options($params, Smarty_Internal_Template $template)
+function smarty_function_html_options($params, &$smarty)
 {
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
+    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+    
     $name = null;
     $values = null;
     $options = null;
-    $selected = null;
+    $selected = array();
     $output = null;
-    $id = null;
-    $class = null;
+    
     $extra = '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
+    
+    foreach($params as $_key => $_val) {
+        switch($_key) {
             case 'name':
-            case 'class':
-            case 'id':
                 $$_key = (string)$_val;
                 break;
+            
             case 'options':
-                $options = (array)$_val;
+                $$_key = (array)$_val;
                 break;
+                
             case 'values':
             case 'output':
                 $$_key = array_values((array)$_val);
                 break;
+
             case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, '__toString')) {
-                                $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
-                            } else {
-                                trigger_error(
-                                    'html_options: selected attribute contains an object of class \'' .
-                                    get_class($_sel) . '\' without __toString() method',
-                                    E_USER_NOTICE
-                                );
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string)$_sel);
-                        }
-                        $selected[ $_sel ] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, '__toString')) {
-                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
-                    } else {
-                        trigger_error(
-                            'html_options: selected attribute is an object of class \'' . get_class($_val) .
-                            '\' without __toString() method',
-                            E_USER_NOTICE
-                        );
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string)$_val);
-                }
+                $$_key = array_map('strval', array_values((array)$_val));
                 break;
-            case 'strict':
-                break;
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error(
-                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
-                            E_USER_NOTICE
-                        );
-                    }
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-                    break;
-                }
-            // omit break; to fall through!
-            // no break
+                
             default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                if(!is_array($_val)) {
+                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
                 } else {
-                    trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                    $smarty->trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
     }
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-        return '';
-    }
+
+    if (!isset($options) && !isset($values))
+        return ''; /* raise error here? */
+
     $_html_result = '';
-    $_idx = 0;
+
     if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
+        
+        foreach ($options as $_key=>$_val)
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+
     } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+        
+        foreach ($values as $_i=>$_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
         }
+
     }
-    if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
-        $_html_result =
-            '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
-            '</select>' . "\n";
+
+    if(!empty($name)) {
+        $_html_result = '<select name="' . $name . '"' . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
     }
+
     return $_html_result;
+
 }
 
-/**
- * @param $key
- * @param $value
- * @param $selected
- * @param $id
- * @param $class
- * @param $idx
- *
- * @return string
- */
-function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
-{
-    if (!is_array($value)) {
-        $_key = smarty_function_escape_special_chars($key);
-        $_html_result = '<option value="' . $_key . '"';
-        if (is_array($selected)) {
-            if (isset($selected[ $_key ])) {
-                $_html_result .= ' selected="selected"';
-            }
-        } elseif ($_key === $selected) {
+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_class = !empty($class) ? ' class="' . $class . ' option"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
-        if (is_object($value)) {
-            if (method_exists($value, '__toString')) {
-                $value = smarty_function_escape_special_chars((string)$value->__toString());
-            } else {
-                trigger_error(
-                    'html_options: value is an object of class \'' . get_class($value) .
-                    '\' without __toString() method',
-                    E_USER_NOTICE
-                );
-                return '';
-            }
-        } else {
-            $value = smarty_function_escape_special_chars((string)$value);
-        }
-        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx++;
+        $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
     } else {
-        $_idx = 0;
-        $_html_result =
-            smarty_function_html_options_optgroup(
-                $key,
-                $value,
-                $selected,
-                !empty($id) ? ($id . '-' . $idx) : null,
-                $class,
-                $_idx
-            );
-        $idx++;
+        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);
     }
     return $_html_result;
 }
 
-/**
- * @param $key
- * @param $values
- * @param $selected
- * @param $id
- * @param $class
- * @param $idx
- *
- * @return string
- */
-function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
-{
+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, $id, $class, $idx);
+        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
     }
     $optgroup_html .= "</optgroup>\n";
     return $optgroup_html;
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.html_radios.php

@@ -1,266 +1,156 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {html_radios} function plugin
- * File:       function.html_radios.php
- * Type:       function
- * Name:       html_radios
- * Date:       24.Feb.2003
- * Purpose:    Prints out a list of radio input types
- * Params:
- *
- * - name       (optional) - string default "radio"
- * - values     (required) - array
- * - options    (required) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each radio button
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
  *
+ * 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     (required) - array
+ *           - options    (optional) - associative array
+ *           - checked    (optional) - array default not set
+ *           - separator  (optional) - ie <br> or &nbsp;
+ *           - output     (optional) - the output next to each radio button
+ *           - assign     (optional) - assign the output as an array to this variable
  * Examples:
- *
+ * <pre>
  * {html_radios values=$ids output=$names}
  * {html_radios values=$ids name='box' separator='<br>' output=$names}
  * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- *
- * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *          (Smarty online manual)
- * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author  credits to Monte Ohrt <monte at ohrt dot com>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
+ * </pre>
+ * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ *      (Smarty online manual)
+ * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author credits to Monte Ohrt <monte at ohrt dot com>
+ * @version    1.0
+ * @param array
+ * @param Smarty
  * @return string
- * @uses    smarty_function_escape_special_chars()
- * @throws \SmartyException
+ * @uses smarty_function_escape_special_chars()
  */
-function smarty_function_html_radios($params, Smarty_Internal_Template $template)
+function smarty_function_html_radios($params, &$smarty)
 {
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
+    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+   
     $name = 'radio';
     $values = null;
     $options = null;
     $selected = null;
     $separator = '';
-    $escape = true;
     $labels = true;
     $label_ids = false;
     $output = null;
     $extra = '';
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
+
+    foreach($params as $_key => $_val) {
+        switch($_key) {
             case 'name':
             case 'separator':
                 $$_key = (string)$_val;
                 break;
+
             case 'checked':
             case 'selected':
-                if (is_array($_val)) {
-                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, '__toString')) {
-                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
-                    } else {
-                        trigger_error(
-                            'html_radios: selected attribute is an object of class \'' . get_class($_val) .
-                            '\' without __toString() method',
-                            E_USER_NOTICE
-                        );
-                    }
+                if(is_array($_val)) {
+                    $smarty->trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
                 } else {
                     $selected = (string)$_val;
                 }
                 break;
-            case 'escape':
+
             case 'labels':
             case 'label_ids':
                 $$_key = (bool)$_val;
                 break;
+
             case 'options':
                 $$_key = (array)$_val;
                 break;
+
             case 'values':
             case 'output':
                 $$_key = array_values((array)$_val);
                 break;
+
             case 'radios':
-                trigger_error(
-                    'html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
-                    E_USER_WARNING
-                );
+                $smarty->trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
                 $options = (array)$_val;
                 break;
+
             case 'assign':
                 break;
-            case 'strict':
-                break;
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error(
-                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
-                            E_USER_NOTICE
-                        );
-                    }
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-                    break;
-                }
-            // omit break; to fall through!
-            // no break
+
             default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                if(!is_array($_val)) {
+                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
                 } else {
-                    trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                    $smarty->trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
     }
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-        return '';
-    }
+
+    if (!isset($options) && !isset($values))
+        return ''; /* raise error here? */
+
     $_html_result = array();
+
     if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] =
-                smarty_function_html_radios_output(
-                    $name,
-                    $_key,
-                    $_val,
-                    $selected,
-                    $extra,
-                    $separator,
-                    $labels,
-                    $label_ids,
-                    $escape
-                );
-        }
+
+        foreach ($options as $_key=>$_val)
+            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+
     } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_radios_output(
-                    $name,
-                    $_key,
-                    $_val,
-                    $selected,
-                    $extra,
-                    $separator,
-                    $labels,
-                    $label_ids,
-                    $escape
-                );
+
+        foreach ($values as $_i=>$_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
         }
+
     }
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
+
+    if(!empty($params['assign'])) {
+        $smarty->assign($params['assign'], $_html_result);
     } else {
-        return implode("\n", $_html_result);
+        return implode("\n",$_html_result);
     }
+
 }
 
-/**
- * @param $name
- * @param $value
- * @param $output
- * @param $selected
- * @param $extra
- * @param $separator
- * @param $labels
- * @param $label_ids
- * @param $escape
- *
- * @return string
- */
-function smarty_function_html_radios_output(
-    $name,
-    $value,
-    $output,
-    $selected,
-    $extra,
-    $separator,
-    $labels,
-    $label_ids,
-    $escape
-) {
+function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
     $_output = '';
-    if (is_object($value)) {
-        if (method_exists($value, '__toString')) {
-            $value = (string)$value->__toString();
-        } else {
-            trigger_error(
-                'html_options: value is an object of class \'' . get_class($value) .
-                '\' without __toString() method',
-                E_USER_NOTICE
-            );
-            return '';
-        }
-    } else {
-        $value = (string)$value;
-    }
-    if (is_object($output)) {
-        if (method_exists($output, '__toString')) {
-            $output = (string)$output->__toString();
-        } else {
-            trigger_error(
-                'html_options: output is an object of class \'' . get_class($output) .
-                '\' without __toString() method',
-                E_USER_NOTICE
-            );
-            return '';
-        }
-    } else {
-        $output = (string)$output;
-    }
     if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(
-                preg_replace(
-                    '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
-                    '_',
-                    $name . '_' . $value
-                )
-            );
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-    if ($value === $selected) {
+      if($label_ids) {
+          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
+          $_output .= '<label for="' . $_id . '">';
+      } else {
+          $_output .= '<label>';           
+      }
+   }
+   $_output .= '<input type="radio" name="'
+        . smarty_function_escape_special_chars($name) . '" value="'
+        . smarty_function_escape_special_chars($value) . '"';
+
+   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+
+    if ((string)$value==$selected) {
         $_output .= ' checked="checked"';
     }
     $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-    $_output .= $separator;
+    if ($labels) $_output .= '</label>';
+    $_output .=  $separator;
+
     return $_output;
 }
+
+?>

smarty_move_me/plugins/function.html_select_date.php

@@ -1,145 +1,99 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
 /**
  * Smarty {html_select_date} plugin
- * Type:     function
- * Name:     html_select_date
+ *
+ * Type:     function<br>
+ * Name:     html_select_date<br>
  * Purpose:  Prints the dropdowns for date selection.
- * ChangeLog:
- *
- *            - 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 support negative timestamps, force year
- *              dropdown to include given date unless explicitly set (Monte)
- *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
- *              of 0000-00-00 dates (cybot, boots)
- *            - 2.0 complete rewrite for performance,
- *              added attributes month_names, *_id
- *
- * @link    http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
- *           (Smarty online manual)
- * @version 2.0
- * @author  Andrei Zmievski
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  Rodney Rehm
- *
- * @param array                     $params parameters
- *
- * @param \Smarty_Internal_Template $template
  *
+ * 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 support negative timestamps, force year
+ *             dropdown to include given date unless explicitly set (Monte)
+ *           - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
+ *             of 0000-00-00 dates (cybot, boots)
+ * @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
+ *      (Smarty online manual)
+ * @version 1.3.4
+ * @author Andrei Zmievski
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @param array
+ * @param Smarty
  * @return string
- * @throws \SmartyException
  */
-function smarty_function_html_select_date($params, Smarty_Internal_Template $template)
+function smarty_function_html_select_date($params, &$smarty)
 {
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
-    // generate timestamps used for month names only
-    static $_month_timestamps = null;
-    static $_current_year = null;
-    if ($_month_timestamps === null) {
-        $_current_year = date('Y');
-        $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i++) {
-            $_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
-        }
-    }
+    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+    require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
+    require_once $smarty->_get_plugin_filepath('function','html_options');
     /* Default values. */
-    $prefix = 'Date_';
-    $start_year = null;
-    $end_year = null;
-    $display_days = true;
-    $display_months = true;
-    $display_years = true;
-    $month_format = '%B';
+    $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';
+    $month_value_format = "%m";
+    $day_format      = "%02d";
     /* Write day values using this format MB */
-    $day_value_format = '%d';
-    $year_as_text = false;
+    $day_value_format = "%d";
+    $year_as_text    = false;
     /* Display years in reverse order? Ie. 2000,1999,.... */
-    $reverse_years = false;
+    $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;
+    $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;
+    $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;
+    $all_extra       = null;
     /* Separate attributes for the tags. */
-    $day_extra = null;
-    $month_extra = null;
-    $year_extra = null;
+    $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';
+    $field_order     = 'MDY';
     /* String printed between the different fields. */
     $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-    // $all_empty = null;
-    // $day_empty = null;
-    // $month_empty = null;
-    // $year_empty = null;
-    $extra_attrs = '';
-    $all_id = null;
-    $day_id = null;
-    $month_id = null;
-    $year_id = null;
-    foreach ($params as $_key => $_value) {
+    $time = time();
+    $all_empty       = null;
+    $day_empty       = null;
+    $month_empty     = null;
+    $year_empty      = null;
+    $extra_attrs     = '';
+
+    foreach ($params as $_key=>$_value) {
         switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $template->_checkPlugins(
-                        array(
-                            array(
-                                'function' => 'smarty_make_timestamp',
-                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
-                            )
-                        )
-                    );
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-            case 'month_names':
-                if (is_array($_value) && count($_value) === 12) {
-                    $$_key = $_value;
-                } else {
-                    trigger_error('html_select_date: month_names must be an array of 12 strings', E_USER_NOTICE);
-                }
-                break;
             case 'prefix':
-            case 'field_array':
+            case 'time':
             case 'start_year':
             case 'end_year':
+            case 'month_format':
             case 'day_format':
             case 'day_value_format':
-            case 'month_format':
-            case 'month_value_format':
+            case 'field_array':
             case 'day_size':
             case 'month_size':
             case 'year_size':
@@ -149,17 +103,18 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
             case 'year_extra':
             case 'field_order':
             case 'field_separator':
-            case 'option_separator':
-            case 'all_empty':
+            case 'month_value_format':
             case 'month_empty':
             case 'day_empty':
             case 'year_empty':
-            case 'all_id':
-            case 'month_id':
-            case 'day_id':
-            case 'year_id':
                 $$_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':
@@ -167,222 +122,210 @@ function smarty_function_html_select_date($params, Smarty_Internal_Template $tem
             case 'reverse_years':
                 $$_key = (bool)$_value;
                 break;
+
             default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+                if(!is_array($_value)) {
+                    $extra_attrs .= ' '.$_key.'="'.smarty_function_escape_special_chars($_value).'"';
                 } else {
-                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                    $smarty->trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
                 }
                 break;
         }
     }
-    // Note: date() is faster than strftime()
-    // Note: explode(date()) is faster than date() date() date()
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Year' ])) {
-            // $_REQUEST[$field_array] given
-            foreach (array(
-                'Y' => 'Year',
-                'm' => 'Month',
-                'd' => 'Day'
-            ) as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
-                        date($_elementKey);
-            }
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Year' ])) {
-            // $_REQUEST given
-            foreach (array(
-                'Y' => 'Year',
-                'm' => 'Month',
-                'd' => 'Day'
-            ) as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
-            }
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_year = $_month = $_day = $time = null;
-        } else {
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
+
+    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, $found)) {
+        $time = $found[1];
     } else {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $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));
     }
-    // make syntax "+N" or "-N" work with $start_year and $end_year
-    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
-    foreach (array(
-        'start',
-        'end'
-    ) as $key) {
-        $key .= '_year';
-        $t = $$key;
-        if ($t === null) {
-            $$key = (int)$_current_year;
-        } elseif ($t[ 0 ] === '+') {
-            $$key = (int)($_current_year + (int)trim(substr($t, 1)));
-        } elseif ($t[ 0 ] === '-') {
-            $$key = (int)($_current_year - (int)trim(substr($t, 1)));
+    // 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 {
-            $$key = (int)$$key;
+            $end_year = strftime('%Y') - $match[2];
         }
     }
-    // flip for ascending or descending
-    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
-        $t = $end_year;
-        $end_year = $start_year;
-        $start_year = $t;
-    }
-    // generate year <select> or <input>
-    if ($display_years) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($year_extra) {
-            $_extra .= ' ' . $year_extra;
-        }
-        if ($year_as_text) {
-            $_html_years =
-                '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
-                $extra_attrs . ' />';
+    if (preg_match('!^(\+|\-)\s*(\d+)$!', $start_year, $match)) {
+        if ($match[1] == '+') {
+            $start_year = strftime('%Y') + $match[2];
         } else {
-            $_html_years = '<select name="' . $_name . '"';
-            if ($year_id !== null || $all_id !== null) {
-                $_html_years .= ' id="' . smarty_function_escape_special_chars(
-                        $year_id !== null ?
-                            ($year_id ? $year_id : $_name) :
-                            ($all_id ? ($all_id . $_name) :
-                                $_name)
-                    ) . '"';
-            }
-            if ($year_size) {
-                $_html_years .= ' size="' . $year_size . '"';
-            }
-            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
-            if (isset($year_empty) || isset($all_empty)) {
-                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
-                                $option_separator;
-            }
-            $op = $start_year > $end_year ? -1 : 1;
-            for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
-                $_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
-                                '</option>' . $option_separator;
-            }
-            $_html_years .= '</select>';
+            $start_year = strftime('%Y') - $match[2];
         }
     }
-    // generate month <select> or <input>
+    if (strlen($time[0]) > 0) {
+        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 = "";
+
+    $field_separator_count = -1;
     if ($display_months) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($month_extra) {
-            $_extra .= ' ' . $month_extra;
-        }
-        $_html_months = '<select name="' . $_name . '"';
-        if ($month_id !== null || $all_id !== null) {
-            $_html_months .= ' id="' . smarty_function_escape_special_chars(
-                    $month_id !== null ?
-                        ($month_id ? $month_id : $_name) :
-                        ($all_id ? ($all_id . $_name) :
-                            $_name)
-                ) . '"';
-        }
-        if ($month_size) {
-            $_html_months .= ' size="' . $month_size . '"';
-        }
-        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($month_empty) || isset($all_empty)) {
-            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
-                             $option_separator;
+    	$field_separator_count++;
+        $month_names = array();
+        $month_values = array();
+        if(isset($month_empty)) {
+            $month_names[''] = $month_empty;
+            $month_values[''] = '';
         }
         for ($i = 1; $i <= 12; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
-                ($month_format === '%m' ? $_val : strftime($month_format, $_month_timestamps[ $i ]));
-            $_value = $month_value_format === '%m' ? $_val : strftime($month_value_format, $_month_timestamps[ $i ]);
-            $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
-                             '>' . $_text . '</option>' . $option_separator;
+            $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));
         }
-        $_html_months .= '</select>';
+
+        $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 .= $extra_attrs . '>'."\n";
+
+        $month_result .= smarty_function_html_options(array('output'     => $month_names,
+                                                            'values'     => $month_values,
+                                                            'selected'   => (int)$time[1] ? strftime($month_value_format, mktime(0, 0, 0, (int)$time[1], 1, 2000)) : '',
+                                                            'print_result' => false),
+                                                      $smarty);
+        $month_result .= '</select>';
     }
-    // generate day <select> or <input>
+
     if ($display_days) {
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($day_extra) {
-            $_extra .= ' ' . $day_extra;
-        }
-        $_html_days = '<select name="' . $_name . '"';
-        if ($day_id !== null || $all_id !== null) {
-            $_html_days .= ' id="' .
-                           smarty_function_escape_special_chars(
-                               $day_id !== null ? ($day_id ? $day_id : $_name) :
-                                   ($all_id ? ($all_id . $_name) : $_name)
-                           ) . '"';
-        }
-        if ($day_size) {
-            $_html_days .= ' size="' . $day_size . '"';
-        }
-        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($day_empty) || isset($all_empty)) {
-            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
-                           $option_separator;
+    	$field_separator_count++;
+        $days = array();
+        if (isset($day_empty)) {
+            $days[''] = $day_empty;
+            $day_values[''] = '';
         }
         for ($i = 1; $i <= 31; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
-            $_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
-            $_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
-                           $_text . '</option>' . $option_separator;
+            $days[] = sprintf($day_format, $i);
+            $day_values[] = sprintf($day_value_format, $i);
         }
-        $_html_days .= '</select>';
+
+        $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 .= $extra_attrs . '>'."\n";
+        $day_result .= smarty_function_html_options(array('output'     => $days,
+                                                          'values'     => $day_values,
+                                                          'selected'   => $time[2],
+                                                          'print_result' => false),
+                                                    $smarty);
+        $day_result .= '</select>';
     }
-    // order the fields for output
-    $_html = '';
-    for ($i = 0; $i <= 2; $i++) {
-        switch ($field_order[ $i ]) {
-            case 'Y':
-            case 'y':
-                if (isset($_html_years)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_years;
-                }
-                break;
-            case 'm':
-            case 'M':
-                if (isset($_html_months)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_months;
-                }
-                break;
-            case 'd':
+
+    if ($display_years) {
+    	$field_separator_count++;
+        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);
+            } else {
+                sort($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 .= $extra_attrs . '>'."\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':
-                if (isset($_html_days)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_days;
-                }
+                $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 < $field_separator_count) {
+            $html_result .= $field_separator;
+        }
     }
-    return $_html;
+
+    return $html_result;
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.html_select_time.php

@@ -1,119 +1,64 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {html_select_time} function plugin
- * Type:     function
- * Name:     html_select_time
+ *
+ * Type:     function<br>
+ * Name:     html_select_time<br>
  * Purpose:  Prints the dropdowns for time selection
- *
- * @link   http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
- *           (Smarty online manual)
+ * @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time}
+ *          (Smarty online manual)
  * @author Roberto Berto <roberto@berto.net>
- * @author Monte Ohrt <monte AT ohrt DOT com>
- *
- * @param array                     $params parameters
- *
- * @param \Smarty_Internal_Template $template
- *
+ * @credits Monte Ohrt <monte AT ohrt DOT com>
+ * @param array
+ * @param Smarty
  * @return string
- * @uses   smarty_make_timestamp()
- * @throws \SmartyException
+ * @uses smarty_make_timestamp()
  */
-function smarty_function_html_select_time($params, Smarty_Internal_Template $template)
+function smarty_function_html_select_time($params, &$smarty)
 {
-    $template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_function_escape_special_chars',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
-            )
-        )
-    );
-    $prefix = 'Time_';
-    $field_array = null;
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-    $display_hours = true;
-    $display_minutes = true;
-    $display_seconds = true;
-    $display_meridian = true;
-    $hour_format = '%02d';
-    $hour_value_format = '%02d';
-    $minute_format = '%02d';
-    $minute_value_format = '%02d';
-    $second_format = '%02d';
-    $second_value_format = '%02d';
-    $hour_size = null;
-    $minute_size = null;
-    $second_size = null;
-    $meridian_size = null;
-    $all_empty = null;
-    $hour_empty = null;
-    $minute_empty = null;
-    $second_empty = null;
-    $meridian_empty = null;
-    $all_id = null;
-    $hour_id = null;
-    $minute_id = null;
-    $second_id = null;
-    $meridian_id = null;
-    $use_24_hours = true;
-    $minute_interval = 1;
-    $second_interval = 1;
-    $extra_attrs = '';
-    $all_extra = null;
-    $hour_extra = null;
-    $minute_extra = null;
-    $second_extra = null;
-    $meridian_extra = null;
-    foreach ($params as $_key => $_value) {
+    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 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $template->_checkPlugins(
-                        array(
-                            array(
-                                'function' => 'smarty_make_timestamp',
-                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
-                            )
-                        )
-                    );
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
             case 'prefix':
+            case 'time':
             case 'field_array':
-            case 'field_separator':
-            case 'option_separator':
             case 'all_extra':
             case 'hour_extra':
             case 'minute_extra':
             case 'second_extra':
             case 'meridian_extra':
-            case 'all_empty':
-            case 'hour_empty':
-            case 'minute_empty':
-            case 'second_empty':
-            case 'meridian_empty':
-            case 'all_id':
-            case 'hour_id':
-            case 'minute_id':
-            case 'second_id':
-            case 'meridian_id':
-            case 'hour_format':
-            case 'hour_value_format':
-            case 'minute_format':
-            case 'minute_value_format':
-            case 'second_format':
-            case 'second_value_format':
                 $$_key = (string)$_value;
                 break;
+
             case 'display_hours':
             case 'display_minutes':
             case 'display_seconds':
@@ -121,234 +66,129 @@ function smarty_function_html_select_time($params, Smarty_Internal_Template $tem
             case 'use_24_hours':
                 $$_key = (bool)$_value;
                 break;
+
             case 'minute_interval':
             case 'second_interval':
-            case 'hour_size':
-            case 'minute_size':
-            case 'second_size':
-            case 'meridian_size':
                 $$_key = (int)$_value;
                 break;
+
             default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
-                }
-                break;
+                $smarty->trigger_error("[html_select_time] unknown parameter $_key", E_USER_WARNING);
         }
     }
-    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
-        if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
-            // $_REQUEST[$field_array] given
-            foreach (array(
-                'H' => 'Hour',
-                'i' => 'Minute',
-                's' => 'Second'
-            ) as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName =
-                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
-                        date($_elementKey);
-            }
-            $_meridian =
-                isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
-                    '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
-            // $_REQUEST given
-            foreach (array(
-                'H' => 'Hour',
-                'i' => 'Minute',
-                's' => 'Second'
-            ) as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
-                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
-            }
-            $_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
-                (' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_hour = $_minute = $_second = $time = null;
-        } else {
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
-        }
-    } else {
-        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-    }
-    // generate hour <select>
+
+    $time = smarty_make_timestamp($time);
+
+    $html_result = '';
+
     if ($display_hours) {
-        $_html_hours = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
+        $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 ($hour_extra) {
-            $_extra .= ' ' . $hour_extra;
+        if (null !== $hour_extra){
+            $html_result .= ' ' . $hour_extra;
         }
-        $_html_hours = '<select name="' . $_name . '"';
-        if ($hour_id !== null || $all_id !== null) {
-            $_html_hours .= ' id="' .
-                            smarty_function_escape_special_chars(
-                                $hour_id !== null ? ($hour_id ? $hour_id : $_name) :
-                                    ($all_id ? ($all_id . $_name) : $_name)
-                            ) . '"';
+        if (null !== $all_extra){
+            $html_result .= ' ' . $all_extra;
         }
-        if ($hour_size) {
-            $_html_hours .= ' size="' . $hour_size . '"';
-        }
-        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
-                            $option_separator;
-        }
-        $start = $use_24_hours ? 0 : 1;
-        $end = $use_24_hours ? 23 : 12;
-        for ($i = $start; $i <= $end; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $hour_format === '%02d' ? $_val : sprintf($hour_format, $i);
-            $_value = $hour_value_format === '%02d' ? $_val : sprintf($hour_value_format, $i);
-            if (!$use_24_hours) {
-                $_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
-            }
-            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
-            $_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
-                            $_text . '</option>' . $option_separator;
-        }
-        $_html_hours .= '</select>';
+        $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";
     }
-    // generate minute <select>
+
     if ($display_minutes) {
-        $_html_minutes = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
+        $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 ($minute_extra) {
-            $_extra .= ' ' . $minute_extra;
+        if (null !== $minute_extra){
+            $html_result .= ' ' . $minute_extra;
         }
-        $_html_minutes = '<select name="' . $_name . '"';
-        if ($minute_id !== null || $all_id !== null) {
-            $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
-                    $minute_id !== null ?
-                        ($minute_id ? $minute_id : $_name) :
-                        ($all_id ? ($all_id . $_name) :
-                            $_name)
-                ) . '"';
+        if (null !== $all_extra){
+            $html_result .= ' ' . $all_extra;
         }
-        if ($minute_size) {
-            $_html_minutes .= ' size="' . $minute_size . '"';
-        }
-        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
-                              $option_separator;
-        }
-        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
-        for ($i = 0; $i <= 59; $i += $minute_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
-            $_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
-            $_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
-                              '>' . $_text . '</option>' . $option_separator;
-        }
-        $_html_minutes .= '</select>';
+        $html_result .= '>'."\n";
+        
+        $html_result .= smarty_function_html_options(array('output'          => $minutes,
+                                                           'values'          => $minutes,
+                                                           'selected'      => $selected,
+                                                           'print_result' => false),
+                                                     $smarty);
+        $html_result .= "</select>\n";
     }
-    // generate second <select>
+
     if ($display_seconds) {
-        $_html_seconds = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
+        $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 ($second_extra) {
-            $_extra .= ' ' . $second_extra;
+        
+        if (null !== $second_extra){
+            $html_result .= ' ' . $second_extra;
         }
-        $_html_seconds = '<select name="' . $_name . '"';
-        if ($second_id !== null || $all_id !== null) {
-            $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
-                    $second_id !== null ?
-                        ($second_id ? $second_id : $_name) :
-                        ($all_id ? ($all_id . $_name) :
-                            $_name)
-                ) . '"';
+        if (null !== $all_extra){
+            $html_result .= ' ' . $all_extra;
         }
-        if ($second_size) {
-            $_html_seconds .= ' size="' . $second_size . '"';
-        }
-        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
-                              $option_separator;
-        }
-        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
-        for ($i = 0; $i <= 59; $i += $second_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
-            $_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
-            $_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
-                              '>' . $_text . '</option>' . $option_separator;
-        }
-        $_html_seconds .= '</select>';
+        $html_result .= '>'."\n";
+        
+        $html_result .= smarty_function_html_options(array('output'          => $seconds,
+                                                           'values'          => $seconds,
+                                                           'selected'      => $selected,
+                                                           'print_result' => false),
+                                                     $smarty);
+        $html_result .= "</select>\n";
     }
-    // generate meridian <select>
+
     if ($display_meridian && !$use_24_hours) {
-        $_html_meridian = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
+        $html_result .= '<select name=';
+        if (null !== $field_array) {
+            $html_result .= '"' . $field_array . '[' . $prefix . 'Meridian]"';
+        } else {
+            $html_result .= '"' . $prefix . 'Meridian"';
         }
-        if ($meridian_extra) {
-            $_extra .= ' ' . $meridian_extra;
+        
+        if (null !== $meridian_extra){
+            $html_result .= ' ' . $meridian_extra;
         }
-        $_html_meridian = '<select name="' . $_name . '"';
-        if ($meridian_id !== null || $all_id !== null) {
-            $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
-                    $meridian_id !== null ?
-                        ($meridian_id ? $meridian_id :
-                            $_name) :
-                        ($all_id ? ($all_id . $_name) :
-                            $_name)
-                ) . '"';
+        if (null !== $all_extra){
+            $html_result .= ' ' . $all_extra;
         }
-        if ($meridian_size) {
-            $_html_meridian .= ' size="' . $meridian_size . '"';
-        }
-        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
-        if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
-                               '</option>' . $option_separator;
-        }
-        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
-                           '>AM</option>' . $option_separator . '<option value="pm"' .
-                           ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
-                           '</select>';
+        $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";
     }
-    $_html = '';
-    foreach (array(
-        '_html_hours',
-        '_html_minutes',
-        '_html_seconds',
-        '_html_meridian'
-    ) as $k) {
-        if (isset($$k)) {
-            if ($_html) {
-                $_html .= $field_separator;
-            }
-            $_html .= $$k;
-        }
-    }
-    return $_html;
+
+    return $html_result;
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.html_table.php

@@ -1,51 +1,52 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {html_table} function plugin
- * Type:     function
- * Name:     html_table
- * Date:     Feb 17, 2003
- * Purpose:  make an html table from an array of data
- * Params:
  *
- * - loop       - array to loop through
- * - cols       - number of columns, comma separated list of column names
- *                or array of column names
- * - rows       - number of rows
- * - table_attr - table attributes
- * - th_attr    - table heading attributes (arrays are cycled)
- * - tr_attr    - table row attributes (arrays are cycled)
- * - td_attr    - table cell attributes (arrays are cycled)
- * - trailpad   - value to pad trailing cells with
- * - caption    - text for caption element
- * - 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)
+ * 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, comma separated list of column names
+ *                  or array of column names
+ *         - rows = number of rows
+ *         - table_attr = table attributes
+ *         - th_attr = table heading attributes (arrays are cycled)
+ *         - tr_attr = table row attributes (arrays are cycled)
+ *         - td_attr = table cell attributes (arrays are cycled)
+ *         - trailpad = value to pad trailing cells with
+ *         - caption = text for caption element 
+ *         - 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="first,second,third" tr_attr=$colors}
- *
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author  credit to boots <boots dot smarty at yahoo dot com>
- * @version 1.1
- * @link    http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
- *           (Smarty online manual)
- *
- * @param array $params parameters
- *
+ * </pre>
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
+ * @author credit to boots <boots dot smarty at yahoo dot com>
+ * @version  1.1
+ * @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)
+function smarty_function_html_table($params, &$smarty)
 {
     $table_attr = 'border="1"';
     $tr_attr = '';
@@ -58,16 +59,18 @@ function smarty_function_html_table($params)
     $hdir = 'right';
     $inner = 'cols';
     $caption = '';
-    $loop = null;
-    if (!isset($params[ 'loop' ])) {
-        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+
+    if (!isset($params['loop'])) {
+        $smarty->trigger_error("html_table: missing 'loop' parameter");
         return;
     }
-    foreach ($params as $_key => $_value) {
+
+    foreach ($params as $_key=>$_value) {
         switch ($_key) {
             case 'loop':
                 $$_key = (array)$_value;
                 break;
+
             case 'cols':
                 if (is_array($_value) && !empty($_value)) {
                     $cols = $_value;
@@ -81,9 +84,11 @@ function smarty_function_html_table($params)
                     $cols_count = $cols;
                 }
                 break;
+
             case 'rows':
                 $$_key = (int)$_value;
                 break;
+
             case 'table_attr':
             case 'trailpad':
             case 'hdir':
@@ -92,6 +97,7 @@ function smarty_function_html_table($params)
             case 'caption':
                 $$_key = (string)$_value;
                 break;
+
             case 'tr_attr':
             case 'td_attr':
             case 'th_attr':
@@ -99,42 +105,50 @@ function smarty_function_html_table($params)
                 break;
         }
     }
+
     $loop_count = count($loop);
-    if (empty($params[ 'rows' ])) {
+    if (empty($params['rows'])) {
         /* no rows specified */
-        $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params[ 'cols' ])) {
-        if (!empty($params[ 'rows' ])) {
+        $rows = ceil($loop_count/$cols_count);
+    } elseif (empty($params['cols'])) {
+        if (!empty($params['rows'])) {
             /* no cols specified, but rows */
-            $cols_count = ceil($loop_count / $rows);
+            $cols_count = ceil($loop_count/$rows);
         }
     }
+
     $output = "<table $table_attr>\n";
+
     if (!empty($caption)) {
         $output .= '<caption>' . $caption . "</caption>\n";
     }
+
     if (is_array($cols)) {
-        $cols = ($hdir === 'right') ? $cols : array_reverse($cols);
+        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
         $output .= "<thead><tr>\n";
-        for ($r = 0; $r < $cols_count; $r++) {
+
+        for ($r=0; $r<$cols_count; $r++) {
             $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[ $r ];
+            $output .= $cols[$r];
             $output .= "</th>\n";
         }
         $output .= "</tr></thead>\n";
     }
+
     $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r++) {
+    for ($r=0; $r<$rows; $r++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
-        for ($c = 0; $c < $cols_count; $c++) {
-            $x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
-            if ($inner !== 'cols') {
+        $rx =  ($vdir == 'down') ? $r*$cols_count : ($rows-1-$r)*$cols_count;
+
+        for ($c=0; $c<$cols_count; $c++) {
+            $x =  ($hdir == 'right') ? $rx+$c : $rx+$cols_count-1-$c;
+            if ($inner!='cols') {
                 /* shuffle x to loop over rows*/
-                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+                $x = floor($x/$cols_count) + ($x%$cols_count)*$rows;
             }
-            if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
+
+            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";
             }
@@ -143,22 +157,21 @@ function smarty_function_html_table($params)
     }
     $output .= "</tbody>\n";
     $output .= "</table>\n";
+    
     return $output;
 }
 
-/**
- * @param $name
- * @param $var
- * @param $no
- *
- * @return string
- */
-function smarty_function_html_table_cycle($name, $var, $no)
-{
-    if (!is_array($var)) {
+function smarty_function_html_table_cycle($name, $var, $no) {
+    if(!is_array($var)) {
         $ret = $var;
     } else {
-        $ret = $var[ $no % count($var) ];
+        $ret = $var[$no % count($var)];
     }
-    return ($ret) ? ' ' . $ret : '';
+    
+    return ($ret) ? ' '.$ret : '';
 }
+
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.mailto.php

@@ -1,137 +1,165 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {mailto} function plugin
- * Type:     function
- * Name:     mailto
- * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally encode them.
- * Params:
  *
- * - address    - (required) - e-mail address
- * - text       - (optional) - text to display, default is address
- * - encode     - (optional) - can be one of:
- *                             * none : no encoding (default)
- *                             * javascript : encode with javascript
- *                             * javascript_charcode : encode with javascript charcode
- *                             * hex : encode with hexadecimal (no javascript)
- * - cc         - (optional) - address(es) to carbon copy
- * - bcc        - (optional) - address(es) to blind carbon copy
- * - subject    - (optional) - e-mail subject
- * - newsgroups - (optional) - newsgroup(s) to post to
- * - followupto - (optional) - address(es) to follow up to
- * - extra      - (optional) - extra tags for the href link
+ * Type:     function<br>
+ * Name:     mailto<br>
+ * Date:     May 21, 2002
+ * Purpose:  automate mailto address link creation, and optionally
+ *           encode them.<br>
+ * Input:<br>
+ *         - address = e-mail address
+ *         - text = (optional) text to display, default is address
+ *         - encode = (optional) can be one of:
+ *                * none : no encoding (default)
+ *                * javascript : encode with javascript
+ *                * javascript_charcode : encode with javascript charcode
+ *                * hex : encode with hexidecimal (no javascript)
+ *         - cc = (optional) address(es) to carbon copy
+ *         - bcc = (optional) address(es) to blind carbon copy
+ *         - subject = (optional) e-mail subject
+ *         - newsgroups = (optional) newsgroup(s) to post to
+ *         - followupto = (optional) address(es) to follow up to
+ *         - extra = (optional) extra tags for the href link
  *
  * Examples:
- *
+ * <pre>
  * {mailto address="me@domain.com"}
  * {mailto address="me@domain.com" encode="javascript"}
  * {mailto address="me@domain.com" encode="hex"}
  * {mailto address="me@domain.com" subject="Hello to you!"}
  * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
  * {mailto address="me@domain.com" extra='class="mailto"'}
- *
- * @link    http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
- *           (Smarty online manual)
- * @version 1.2
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credits to Jason Sweat (added cc, bcc and subject functionality)
- *
- * @param array $params parameters
- *
- * @return string
+ * </pre>
+ * @link http://smarty.php.net/manual/en/language.function.mailto.php {mailto}
+ *          (Smarty online manual)
+ * @version  1.2
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @author   credits to Jason Sweat (added cc, bcc and subject functionality)
+ * @param    array
+ * @param    Smarty
+ * @return   string
  */
-function smarty_function_mailto($params)
+function smarty_function_mailto($params, &$smarty)
 {
-    static $_allowed_encoding =
-        array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
     $extra = '';
-    if (empty($params[ 'address' ])) {
-        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
+
+    if (empty($params['address'])) {
+        $smarty->trigger_error("mailto: missing 'address' parameter");
         return;
     } else {
-        $address = $params[ 'address' ];
+        $address = $params['address'];
     }
+
     $text = $address;
+
     // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
     // so, don't encode it.
     $search = array('%40', '%2C');
-    $replace = array('@', ',');
+    $replace  = array('@', ',');
     $mail_parms = array();
-    foreach ($params as $var => $value) {
+    foreach ($params as $var=>$value) {
         switch ($var) {
             case 'cc':
             case 'bcc':
             case 'followupto':
-                if (!empty($value)) {
-                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
-                }
+                if (!empty($value))
+                    $mail_parms[] = $var.'='.str_replace($search,$replace,rawurlencode($value));
                 break;
+                
             case 'subject':
             case 'newsgroups':
-                $mail_parms[] = $var . '=' . rawurlencode($value);
+                $mail_parms[] = $var.'='.rawurlencode($value);
                 break;
+
             case 'extra':
             case 'text':
                 $$var = $value;
-            // no break
+
             default:
         }
     }
-    if ($mail_parms) {
-        $address .= '?' . join('&', $mail_parms);
+
+    $mail_parm_vals = '';
+    for ($i=0; $i<count($mail_parms); $i++) {
+        $mail_parm_vals .= (0==$i) ? '?' : '&';
+        $mail_parm_vals .= $mail_parms[$i];
     }
-    $encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
-    if (!isset($_allowed_encoding[ $encode ])) {
-        trigger_error(
-            "mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
-            E_USER_WARNING
-        );
+    $address .= $mail_parm_vals;
+
+    $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
+    if (!in_array($encode,array('javascript','javascript_charcode','hex','none')) ) {
+        $smarty->trigger_error("mailto: 'encode' parameter must be none, javascript or hex");
         return;
     }
-    // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
-    if ($encode === 'javascript') {
-        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+
+    if ($encode == 'javascript' ) {
+        $string = 'document.write(\'<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>\');';
+
         $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
-            $js_encode .= '%' . bin2hex($string[ $x ]);
+        for ($x=0; $x < strlen($string); $x++) {
+            $js_encode .= '%' . bin2hex($string[$x]);
         }
-        return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
-    } elseif ($encode === 'javascript_charcode') {
-        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-        for ($x = 0, $y = strlen($string); $x < $y; $x++) {
-            $ord[] = ord($string[ $x ]);
+
+        return '<script type="text/javascript">eval(unescape(\''.$js_encode.'\'))</script>';
+
+    } elseif ($encode == 'javascript_charcode' ) {
+        $string = '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
+
+        for($x = 0, $y = strlen($string); $x < $y; $x++ ) {
+            $ord[] = ord($string[$x]);   
         }
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n" . "{document.write(String.fromCharCode(" .
-                implode(',', $ord) . "))" . "}\n" . "</script>\n";
+
+        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n";
+        $_ret .= "<!--\n";
+        $_ret .= "{document.write(String.fromCharCode(";
+        $_ret .= implode(',',$ord);
+        $_ret .= "))";
+        $_ret .= "}\n";
+        $_ret .= "//-->\n";
+        $_ret .= "</script>\n";
+        
         return $_ret;
-    } elseif ($encode === 'hex') {
-        preg_match('!^(.*)(\?.*)$!', $address, $match);
-        if (!empty($match[ 2 ])) {
-            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
+        
+        
+    } elseif ($encode == 'hex') {
+
+        preg_match('!^(.*)(\?.*)$!',$address,$match);
+        if(!empty($match[2])) {
+            $smarty->trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.");
             return;
         }
         $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
-            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
-                $address_encode .= '%' . bin2hex($address[ $x ]);
+        for ($x=0; $x < strlen($address); $x++) {
+            if(preg_match('!\w!',$address[$x])) {
+                $address_encode .= '%' . bin2hex($address[$x]);
             } else {
-                $address_encode .= $address[ $x ];
+                $address_encode .= $address[$x];
             }
         }
         $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
-            $text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
+        for ($x=0; $x < strlen($text); $x++) {
+            $text_encode .= '&#x' . bin2hex($text[$x]).';';
         }
+
         $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
-        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
+        return '<a href="'.$mailto.$address_encode.'" '.$extra.'>'.$text_encode.'</a>';
+
     } else {
         // no encoding
-        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+        return '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
+
     }
+
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.math.php

@@ -1,112 +1,85 @@
 <?php
 /**
  * Smarty plugin
- * This plugin is only for Smarty2 BC
- *
- * @package    Smarty
- * @subpackage PluginsFunction
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty {math} function plugin
- * Type:     function
- * Name:     math
- * Purpose:  handle math computations in template
  *
- * @link   http://www.smarty.net/manual/en/language.function.math.php {math}
- *           (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string|null
+ * Type:     function<br>
+ * Name:     math<br>
+ * Purpose:  handle math computations in template<br>
+ * @link http://smarty.php.net/manual/en/language.function.math.php {math}
+ *          (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param array
+ * @param Smarty
+ * @return string
  */
-function smarty_function_math($params, $template)
+function smarty_function_math($params, &$smarty)
 {
-    static $_allowed_funcs =
-        array(
-            'int'   => true,
-            'abs'   => true,
-            'ceil'  => true,
-            'cos'   => true,
-            'exp'   => true,
-            'floor' => true,
-            'log'   => true,
-            'log10' => true,
-            'max'   => true,
-            'min'   => true,
-            'pi'    => true,
-            'pow'   => true,
-            'rand'  => true,
-            'round' => true,
-            'sin'   => true,
-            'sqrt'  => true,
-            'srand' => true,
-            'tan'   => true
-        );
     // be sure equation parameter is present
-    if (empty($params[ 'equation' ])) {
-        trigger_error("math: missing equation parameter", E_USER_WARNING);
+    if (empty($params['equation'])) {
+        $smarty->trigger_error("math: missing equation parameter");
         return;
     }
-    $equation = $params[ 'equation' ];
+
+    // strip out backticks, not necessary for math
+    $equation = str_replace('`','',$params['equation']);
+
     // make sure parenthesis are balanced
-    if (substr_count($equation, '(') !== substr_count($equation, ')')) {
-        trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
+    if (substr_count($equation,"(") != substr_count($equation,")")) {
+        $smarty->trigger_error("math: unbalanced parenthesis");
         return;
     }
-    // disallow backticks
-    if (strpos($equation, '`') !== false) {
-        trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
-        return;
-    }
-    // also disallow dollar signs
-    if (strpos($equation, '$') !== false) {
-        trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
-        return;
-    }
-    foreach ($params as $key => $val) {
-        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
-            // make sure value is not empty
-            if (strlen($val) === 0) {
-                trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
-                return;
-            }
-            if (!is_numeric($val)) {
-                trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
-                return;
-            }
-        }
-    }
+
     // match all vars in equation, make sure all are passed
-    preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
-    foreach ($match[ 1 ] as $curr_var) {
-        if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) {
-            trigger_error(
-                "math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'",
-                E_USER_WARNING
-            );
+    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
+    $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
+                           'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
+    
+    foreach($match[1] as $curr_var) {
+        if ($curr_var && !in_array($curr_var, array_keys($params)) && !in_array($curr_var, $allowed_funcs)) {
+            $smarty->trigger_error("math: function call $curr_var not allowed");
             return;
         }
     }
-    foreach ($params as $key => $val) {
-        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+
+    foreach($params as $key => $val) {
+        if ($key != "equation" && $key != "format" && $key != "assign") {
+            // make sure value is not empty
+            if (strlen($val)==0) {
+                $smarty->trigger_error("math: parameter $key is empty");
+                return;
+            }
+            if (!is_numeric($val)) {
+                $smarty->trigger_error("math: parameter $key: is not numeric");
+                return;
+            }
             $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
         }
     }
-    $smarty_math_result = null;
-    eval("\$smarty_math_result = " . $equation . ";");
-    if (empty($params[ 'format' ])) {
-        if (empty($params[ 'assign' ])) {
+
+    eval("\$smarty_math_result = ".$equation.";");
+
+    if (empty($params['format'])) {
+        if (empty($params['assign'])) {
             return $smarty_math_result;
         } else {
-            $template->assign($params[ 'assign' ], $smarty_math_result);
+            $smarty->assign($params['assign'],$smarty_math_result);
         }
     } else {
-        if (empty($params[ 'assign' ])) {
-            printf($params[ 'format' ], $smarty_math_result);
+        if (empty($params['assign'])){
+            printf($params['format'],$smarty_math_result);
         } else {
-            $template->assign($params[ 'assign' ], sprintf($params[ 'format' ], $smarty_math_result));
+            $smarty->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
         }
     }
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.popup.php

@@ -0,0 +1,119 @@
+<?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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param array
+ * @param Smarty
+ * @return string
+ */
+function smarty_function_popup($params, &$smarty)
+{
+    $append = '';
+    foreach ($params as $_key=>$_value) {
+        switch ($_key) {
+            case 'text':
+            case 'trigger':
+            case 'function':
+            case 'inarray':
+                $$_key = (string)$_value;
+                if ($_key == 'function' || $_key == 'inarray')
+                    $append .= ',' . strtoupper($_key) . ",'$_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 'caparray':
+            case 'capicon':
+            case 'background':
+            case 'frame':
+                $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':
+            case 'mouseoff':
+            case 'followmouse':
+            case 'closeclick':
+                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 . ');"';
+    if ($trigger == 'onmouseover')
+       $retval .= ' onmouseout="nd();"';
+
+
+    return $retval;
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/function.popup_init.php

@@ -0,0 +1,40 @@
+<?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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @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: */
+
+?>

smarty_move_me/plugins/function.um_welcome_message.php

@@ -0,0 +1,60 @@
+<?php
+/*======================================================================*\
+    Function: smarty_func_um_welcome_message
+    Purpose:  translate system boxes into different languages
+
+
+\*======================================================================*/
+
+
+function smarty_function_um_welcome_message($args, &$smarty_obj)
+{
+
+    extract($args);
+	$config_vars = $smarty_obj->_config[0]["vars"];
+
+	$array_keys = array_keys($args);
+
+    if (empty($var)) {
+        $smarty_obj->_trigger_error_msg("um_welcome_message: missing 'var' parameter");
+        return;
+    }
+
+    if (!in_array('messages',$array_keys )) {
+        $smarty_obj->_trigger_error_msg("um_welcome_message: missing 'messages' parameter");
+        return;
+    }
+
+    if (!in_array('unread', $array_keys)) {
+        $smarty_obj->_trigger_error_msg("um_welcome_message: missing 'unread' parameter");
+        return;
+    }
+    if (!in_array('var', $array_keys)) {
+        $smarty_obj->_trigger_error_msg("um_welcome_message: missing 'var' parameter");
+        return;
+    }
+
+    if (!in_array('boxname', $array_keys)) {
+        $smarty_obj->_trigger_error_msg("um_welcome_message: missing 'boxname' parameter");
+        return;
+    }
+
+	$wlcmessage = $config_vars["msg_you_have"]. " <b>$messages</b> ";
+
+	if($messages == 1)
+		$wlcmessage .= $config_vars["msg_message"].", ";
+	else
+		$wlcmessage .= $config_vars["msg_messages"].", ";
+	if($unread == 0)
+		$wlcmessage .= $config_vars["msg_none_unread"]." ";
+	elseif($unread == 1)
+		$wlcmessage .= "<b>$unread</b> ". $config_vars["msg_one_unread"]." ";
+	else
+		$wlcmessage .= "<b>$unread</b> ". $config_vars["msg_more_unread"]." ";
+
+	$wlcmessage .= $config_vars["msg_in_the_folder"]." <b>$boxname</b>";
+
+    $smarty_obj->assign($var, $wlcmessage);
+    return;
+}
+?>

smarty_move_me/plugins/modifier.capitalize.php

@@ -1,145 +1,43 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty capitalize modifier plugin
- * Type:     modifier
- * Name:     capitalize
+ *
+ * Type:     modifier<br>
+ * Name:     capitalize<br>
  * Purpose:  capitalize words in the string
- * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
- *
- * @param string  $string    string to capitalize
- * @param boolean $uc_digits also capitalize "x123" to "X123"
- * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
- *
- * @return string capitalized string
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Rodney Rehm
+ * @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE
+ *      capitalize (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return string
  */
-function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
+function smarty_modifier_capitalize($string, $uc_digits = false)
 {
-    if (Smarty::$_MBSTRING) {
-        if ($lc_rest) {
-            // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
-        } else {
-            // uppercase word breaks
-            $upper_string = preg_replace_callback(
-                "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
-                'smarty_mod_cap_mbconvert_cb',
-                $string
-            );
-        }
-        // check uc_digits case
-        if (!$uc_digits) {
-            if (preg_match_all(
-                "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
-                $string,
-                $matches,
-                PREG_OFFSET_CAPTURE
-            )
-            ) {
-                foreach ($matches[ 1 ] as $match) {
-                    $upper_string =
-                        substr_replace(
-                            $upper_string,
-                            mb_strtolower($match[ 0 ], Smarty::$_CHARSET),
-                            $match[ 1 ],
-                            strlen($match[ 0 ])
-                        );
-                }
-            }
-        }
-        $upper_string =
-            preg_replace_callback(
-                "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
-                'smarty_mod_cap_mbconvert2_cb',
-                $upper_string
-            );
-        return $upper_string;
+    smarty_modifier_capitalize_ucfirst(null, $uc_digits);
+    return preg_replace_callback('!\'?\b\w(\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;
     }
-    // lowercase first
-    if ($lc_rest) {
-        $string = strtolower($string);
-    }
-    // uppercase (including hyphenated words)
-    $upper_string =
-        preg_replace_callback(
-            "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
-            'smarty_mod_cap_ucfirst_cb',
-            $string
-        );
-    // check uc_digits case
-    if (!$uc_digits) {
-        if (preg_match_all(
-            "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
-            $string,
-            $matches,
-            PREG_OFFSET_CAPTURE
-        )
-        ) {
-            foreach ($matches[ 1 ] as $match) {
-                $upper_string =
-                    substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
-            }
-        }
-    }
-    $upper_string = preg_replace_callback(
-        "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
-        'smarty_mod_cap_ucfirst2_cb',
-        $upper_string
-    );
-    return $upper_string;
+    
+    if(substr($string[0],0,1) != "'" && !preg_match("!\d!",$string[0]) || $_uc_digits)
+        return ucfirst($string[0]);
+    else
+        return $string[0];
 }
 
-/**
- *
- * Bug: create_function() use exhausts memory when used in long loops
- * Fix: use declared functions for callbacks instead of using create_function()
- * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
- *
- * @author Kyle Renfrow
- */
-/**
- * @param $matches
- *
- * @return string
- */
-function smarty_mod_cap_mbconvert_cb($matches)
-{
-    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
-}
 
-/**
- * @param $matches
- *
- * @return string
- */
-function smarty_mod_cap_mbconvert2_cb($matches)
-{
-    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
-}
-
-/**
- * @param $matches
- *
- * @return string
- */
-function smarty_mod_cap_ucfirst_cb($matches)
-{
-    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
-}
-
-/**
- * @param $matches
- *
- * @return string
- */
-function smarty_mod_cap_ucfirst2_cb($matches)
-{
-    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
-}
+?>

smarty_move_me/plugins/modifier.cat.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty cat modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     cat<br>
+ * Date:     Feb 24, 2003
+ * Purpose:  catenate a value to a variable
+ * Input:    string to catenate
+ * Example:  {$var|cat:"foo"}
+ * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ *          (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ * @param string
+ * @param string
+ * @return string
+ */
+function smarty_modifier_cat($string, $cat)
+{
+    return $string . $cat;
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.count_characters.php

@@ -0,0 +1,32 @@
+<?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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @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: */
+
+?>

smarty_move_me/plugins/modifier.count_paragraphs.php

@@ -0,0 +1,29 @@
+<?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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @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: */
+
+?>

smarty_move_me/plugins/modifier.count_sentences.php

@@ -0,0 +1,29 @@
+<?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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @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: */
+
+?>

smarty_move_me/plugins/modifier.count_words.php

@@ -0,0 +1,33 @@
+<?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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @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: */
+
+?>

smarty_move_me/plugins/modifier.date_format.php

@@ -1,85 +1,58 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
+ * @package Smarty
+ * @subpackage plugins
  */
+
+/**
+ * Include the {@link shared.make_timestamp.php} plugin
+ */
+require_once $smarty->_get_plugin_filepath('shared', 'make_timestamp');
 /**
  * Smarty date_format modifier plugin
- * Type:     modifier
- * Name:     date_format
- * Purpose:  format datestamps via strftime
- * Input:
- *          - string: input date string
- *          - format: strftime format for output
- *          - default_date: default date if $string is empty
  *
- * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string       input date string
- * @param string $format       strftime format for output
- * @param string $default_date default date if $string is empty
- * @param string $formatter    either 'strftime' or 'auto'
- *
- * @return string |void
- * @uses   smarty_make_timestamp()
+ * Type:     modifier<br>
+ * Name:     date_format<br>
+ * Purpose:  format datestamps via strftime<br>
+ * Input:<br>
+ *         - string: input date string
+ *         - format: strftime format for output
+ *         - default_date: default date if $string is empty
+ * @link http://smarty.php.net/manual/en/language.modifier.date.format.php
+ *          date_format (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param string
+ * @param string
+ * @return string|void
+ * @uses smarty_make_timestamp()
  */
-function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
+function smarty_modifier_date_format($string, $format = '%b %e, %Y', $default_date = '')
 {
-    if ($format === null) {
-        $format = Smarty::$_DATE_FORMAT;
-    }
-    /**
-     * require_once the {@link shared.make_timestamp.php} plugin
-     */
-    static $is_loaded = false;
-    if (!$is_loaded) {
-        if (!is_callable('smarty_make_timestamp')) {
-            include_once SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php';
-        }
-        $is_loaded = true;
-    }
-    if ($string !== '' && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
+    if ($string != '') {
         $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date !== '') {
+    } elseif ($default_date != '') {
         $timestamp = smarty_make_timestamp($default_date);
     } else {
         return;
     }
-    if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
-        if (Smarty::$_IS_WINDOWS) {
-            $_win_from = array(
-                '%D',
-                '%h',
-                '%n',
-                '%r',
-                '%R',
-                '%t',
-                '%T'
-            );
-            $_win_to = array(
-                '%m/%d/%y',
-                '%b',
-                "\n",
-                '%I:%M:%S %p',
-                '%H:%M',
-                "\t",
-                '%H:%M:%S'
-            );
-            if (strpos($format, '%e') !== false) {
-                $_win_from[] = '%e';
-                $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
-            }
-            if (strpos($format, '%l') !== false) {
-                $_win_from[] = '%l';
-                $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
-            }
-            $format = str_replace($_win_from, $_win_to, $format);
+    if (DIRECTORY_SEPARATOR == '\\') {
+        $_win_from = array('%D',       '%h', '%n', '%r',          '%R',    '%t', '%T');
+        $_win_to   = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
+        if (strpos($format, '%e') !== false) {
+            $_win_from[] = '%e';
+            $_win_to[]   = sprintf('%\' 2d', date('j', $timestamp));
         }
-        return strftime($format, $timestamp);
-    } else {
-        return date($format, $timestamp);
+        if (strpos($format, '%l') !== false) {
+            $_win_from[] = '%l';
+            $_win_to[]   = sprintf('%\' 2d', date('h', $timestamp));
+        }
+        $format = str_replace($_win_from, $_win_to, $format);
     }
+    return strftime($format, $timestamp);
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.debug_print_var.php

@@ -1,62 +1,56 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage Debug
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty debug_print_var modifier plugin
- * Type:     modifier
- * Name:     debug_print_var
+ *
+ * Type:     modifier<br>
+ * Name:     debug_print_var<br>
  * Purpose:  formats variable contents for display in the console
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array|object $var     variable to be formatted
- * @param int          $max     maximum recursion depth if $var is an array or object
- * @param int          $length  maximum string length if $var is a string
- * @param int          $depth   actual recursion depth
- * @param array        $objects processed objects in actual depth to prevent recursive object processing
- *
+ * @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php
+ *          debug_print_var (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param array|object
+ * @param integer
+ * @param integer
  * @return string
  */
-function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
+function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
 {
-    $_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
+    $_replace = array(
+        "\n" => '<i>\n</i>',
+        "\r" => '<i>\r</i>',
+        "\t" => '<i>\t</i>'
+    );
+
     switch (gettype($var)) {
-        case 'array':
+        case 'array' :
             $results = '<b>Array (' . count($var) . ')</b>';
-            if ($depth === $max) {
-                break;
-            }
             foreach ($var as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
-                            '</b> =&gt; ' .
-                            smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
-                $depth--;
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
+                    . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
+                    . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                    $depth--;
             }
             break;
-        case 'object':
+        case 'object' :
             $object_vars = get_object_vars($var);
             $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
-            if (in_array($var, $objects)) {
-                $results .= ' called recursive';
-                break;
-            }
-            if ($depth === $max) {
-                break;
-            }
-            $objects[] = $var;
             foreach ($object_vars as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
-                            '</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
-                $depth--;
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
+                    . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
+                    . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                    $depth--;
             }
             break;
-        case 'boolean':
-        case 'NULL':
-        case 'resource':
+        case 'boolean' :
+        case 'NULL' :
+        case 'resource' :
             if (true === $var) {
                 $results = 'true';
             } elseif (false === $var) {
@@ -64,40 +58,33 @@ function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth =
             } elseif (null === $var) {
                 $results = 'null';
             } else {
-                $results = htmlspecialchars((string)$var);
+                $results = htmlspecialchars((string) $var);
             }
             $results = '<i>' . $results . '</i>';
             break;
-        case 'integer':
-        case 'float':
-            $results = htmlspecialchars((string)$var);
+        case 'integer' :
+        case 'float' :
+            $results = htmlspecialchars((string) $var);
             break;
-        case 'string':
+        case 'string' :
             $results = strtr($var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (isset($var[ $length ])) {
-                    $results = substr($var, 0, $length - 3) . '...';
-                }
+            if (strlen($var) > $length ) {
+                $results = substr($var, 0, $length - 3) . '...';
             }
-            $results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET);
+            $results = htmlspecialchars('"' . $results . '"');
             break;
-        case 'unknown type':
-        default:
-            $results = strtr((string)$var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (strlen($results) > $length) {
-                    $results = substr($results, 0, $length - 3) . '...';
-                }
+        case 'unknown type' :
+        default :
+            $results = strtr((string) $var, $_replace);
+            if (strlen($results) > $length ) {
+                $results = substr($results, 0, $length - 3) . '...';
             }
-            $results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
+            $results = htmlspecialchars($results);
     }
+
     return $results;
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.default.php

@@ -0,0 +1,32 @@
+<?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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param string
+ * @return string
+ */
+function smarty_modifier_default($string, $default = '')
+{
+    if (!isset($string) || $string === '')
+        return $default;
+    else
+        return $string;
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.escape.php

@@ -1,255 +1,93 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty escape modifier plugin
- * Type:     modifier
- * Name:     escape
- * Purpose:  escape string for output
  *
- * @link   http://www.smarty.net/docs/en/language.modifier.escape
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string  $string        input string
- * @param string  $esc_type      escape type
- * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
- * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
- *
- * @return string escaped input string
+ * 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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param html|htmlall|url|quotes|hex|hexentity|javascript
+ * @return string
  */
-function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
+function smarty_modifier_escape($string, $esc_type = 'html', $char_set = 'ISO-8859-1')
 {
-    static $_double_encode = null;
-    static $is_loaded_1 = false;
-    static $is_loaded_2 = false;
-    if ($_double_encode === null) {
-        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-    }
-    if (!$char_set) {
-        $char_set = Smarty::$_CHARSET;
-    }
     switch ($esc_type) {
         case 'html':
-            if ($_double_encode) {
-                // php >=5.3.2 - go native
-                return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-            } else {
-                if ($double_encode) {
-                    // php <5.2.3 - only handle double encoding
-                    return htmlspecialchars($string, ENT_QUOTES, $char_set);
-                } else {
-                    // php <5.2.3 - prevent double encoding
-                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(
-                        array(
-                            '%%%SMARTY_START%%%',
-                            '%%%SMARTY_END%%%'
-                        ),
-                        array(
-                            '&',
-                            ';'
-                        ),
-                        $string
-                    );
-                    return $string;
-                }
-            }
-        // no break
+            return htmlspecialchars($string, ENT_QUOTES, $char_set);
+
         case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                // mb_convert_encoding ignores htmlspecialchars()
-                if ($_double_encode) {
-                    // php >=5.3.2 - go native
-                    $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-                } else {
-                    if ($double_encode) {
-                        // php <5.2.3 - only handle double encoding
-                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                    } else {
-                        // php <5.2.3 - prevent double encoding
-                        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                        $string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-                        $string =
-                            str_replace(
-                                array(
-                                    '%%%SMARTY_START%%%',
-                                    '%%%SMARTY_END%%%'
-                                ),
-                                array(
-                                    '&',
-                                    ';'
-                                ),
-                                $string
-                            );
-                        return $string;
-                    }
-                }
-                // htmlentities() won't convert everything, so use mb_convert_encoding
-                return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
-            }
-            // no MBString fallback
-            if ($_double_encode) {
-                return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
-            } else {
-                if ($double_encode) {
-                    return htmlentities($string, ENT_QUOTES, $char_set);
-                } else {
-                    $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-                    $string = htmlentities($string, ENT_QUOTES, $char_set);
-                    $string = str_replace(
-                        array(
-                            '%%%SMARTY_START%%%',
-                            '%%%SMARTY_END%%%'
-                        ),
-                        array(
-                            '&',
-                            ';'
-                        ),
-                        $string
-                    );
-                    return $string;
-                }
-            }
-        // no break
+            return htmlentities($string, ENT_QUOTES, $char_set);
+
         case 'url':
             return rawurlencode($string);
+
         case 'urlpathinfo':
-            return str_replace('%2F', '/', rawurlencode($string));
+            return str_replace('%2F','/',rawurlencode($string));
+            
         case 'quotes':
             // escape unescaped single quotes
             return preg_replace("%(?<!\\\\)'%", "\\'", $string);
+
         case 'hex':
-            // escape every byte into hex
-            // Note that the UTF-8 encoded character ä will be represented as %c3%a4
+            // escape every character into hex
             $return = '';
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '%' . bin2hex($string[ $x ]);
+            for ($x=0; $x < strlen($string); $x++) {
+                $return .= '%' . bin2hex($string[$x]);
             }
             return $return;
+            
         case 'hexentity':
             $return = '';
-            if (Smarty::$_MBSTRING) {
-                if (!$is_loaded_1) {
-                    if (!is_callable('smarty_mb_to_unicode')) {
-                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
-                    }
-                    $is_loaded_1 = true;
-                }
-                $return = '';
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
-                }
-                return $return;
-            }
-            // no MBString fallback
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '&#x' . bin2hex($string[ $x ]) . ';';
+            for ($x=0; $x < strlen($string); $x++) {
+                $return .= '&#x' . bin2hex($string[$x]) . ';';
             }
             return $return;
+
         case 'decentity':
             $return = '';
-            if (Smarty::$_MBSTRING) {
-                if (!$is_loaded_1) {
-                    if (!is_callable('smarty_mb_to_unicode')) {
-                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
-                    }
-                    $is_loaded_1 = true;
-                }
-                $return = '';
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    $return .= '&#' . $unicode . ';';
-                }
-                return $return;
-            }
-            // no MBString fallback
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '&#' . ord($string[ $x ]) . ';';
+            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',
-                    '</' => '<\/'
-                )
-            );
+            return strtr($string, array('\\'=>'\\\\',"'"=>"\\'",'"'=>'\\"',"\r"=>'\\r',"\n"=>'\\n','</'=>'<\/'));
+            
         case 'mail':
-            if (Smarty::$_MBSTRING) {
-                if (!$is_loaded_2) {
-                    if (!is_callable('smarty_mb_str_replace')) {
-                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
-                    }
-                    $is_loaded_2 = true;
-                }
-                return smarty_mb_str_replace(
-                    array(
-                        '@',
-                        '.'
-                    ),
-                    array(
-                        ' [AT] ',
-                        ' [DOT] '
-                    ),
-                    $string
-                );
-            }
-            // no MBString fallback
-            return str_replace(
-                array(
-                    '@',
-                    '.'
-                ),
-                array(
-                    ' [AT] ',
-                    ' [DOT] '
-                ),
-                $string
-            );
+            // 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
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                if (!$is_loaded_1) {
-                    if (!is_callable('smarty_mb_to_unicode')) {
-                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
-                    }
-                    $is_loaded_1 = true;
-                }
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    if ($unicode >= 126) {
-                        $return .= '&#' . $unicode . ';';
-                    } else {
-                        $return .= chr($unicode);
-                    }
-                }
-                return $return;
-            }
-            $_length = strlen($string);
-            for ($_i = 0; $_i < $_length; $_i++) {
-                $_ord = ord(substr($string, $_i, 1));
-                // non-standard char, escape it
-                if ($_ord >= 126) {
-                    $return .= '&#' . $_ord . ';';
-                } else {
-                    $return .= substr($string, $_i, 1);
-                }
-            }
-            return $return;
+           // escape non-standard chars, such as ms document quotes
+           $_res = '';
+           for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
+               $_ord = ord(substr($string, $_i, 1));
+               // non-standard char, escape it
+               if($_ord >= 126){
+                   $_res .= '&#' . $_ord . ';';
+               }
+               else {
+                   $_res .= substr($string, $_i, 1);
+               }
+           }
+           return $_res;
+
         default:
             return $string;
     }
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.indent.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty indent modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     indent<br>
+ * Purpose:  indent lines of text
+ * @link http://smarty.php.net/manual/en/language.modifier.indent.php
+ *          indent (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param integer
+ * @param string
+ * @return string
+ */
+function smarty_modifier_indent($string,$chars=4,$char=" ")
+{
+    return preg_replace('!^!m',str_repeat($char,$chars),$string);
+}
+
+?>

smarty_move_me/plugins/modifier.lower.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty lower modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     lower<br>
+ * Purpose:  convert string to lowercase
+ * @link http://smarty.php.net/manual/en/language.modifier.lower.php
+ *          lower (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_lower($string)
+{
+    return strtolower($string);
+}
+
+?>

smarty_move_me/plugins/modifier.mb_wordwrap.php

@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-/**
- * Smarty wordwrap modifier plugin
- * Type:     modifier
- * Name:     mb_wordwrap
- * Purpose:  Wrap a string to a given number of characters
- *
- * @link   http://php.net/manual/en/function.wordwrap.php for similarity
- *
- * @param string  $str   the string to wrap
- * @param int     $width the width of the output
- * @param string  $break the character used to break the line
- * @param boolean $cut   ignored parameter, just for the sake of
- *
- * @return string  wrapped string
- * @author Rodney Rehm
- */
-function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
-{
-    // break words into tokens using white space as a delimiter
-    $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-    $length = 0;
-    $t = '';
-    $_previous = false;
-    $_space = false;
-    foreach ($tokens as $_token) {
-        $token_length = mb_strlen($_token, Smarty::$_CHARSET);
-        $_tokens = array($_token);
-        if ($token_length > $width) {
-            if ($cut) {
-                $_tokens = preg_split(
-                    '!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER,
-                    $_token,
-                    -1,
-                    PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE
-                );
-            }
-        }
-        foreach ($_tokens as $token) {
-            $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
-            $token_length = mb_strlen($token, Smarty::$_CHARSET);
-            $length += $token_length;
-            if ($length > $width) {
-                // remove space before inserted break
-                if ($_previous) {
-                    $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-                }
-                if (!$_space) {
-                    // add the break before the token
-                    if (!empty($t)) {
-                        $t .= $break;
-                    }
-                    $length = $token_length;
-                }
-            } elseif ($token === "\n") {
-                // hard break must reset counters
-                $length = 0;
-            }
-            $_previous = $_space;
-            // add the token
-            $t .= $token;
-        }
-    }
-    return $t;
-}

smarty_move_me/plugins/modifier.nl2br.php

@@ -0,0 +1,35 @@
+<?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 <monte at ohrt dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_nl2br($string)
+{
+    return nl2br($string);
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.regex_replace.php

@@ -1,55 +1,48 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
+ * @package Smarty
+ * @subpackage plugins
  */
-/**
- * Smarty regex_replace modifier plugin
- * Type:     modifier
- * Name:     regex_replace
- * Purpose:  regular expression search/replace
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.regex.replace.php
- *          regex_replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string       $string  input string
- * @param string|array $search  regular expression(s) to search for
- * @param string|array $replace string(s) that should be replaced
- * @param int          $limit   the maximum number of replacements
- *
- * @return string
- */
-function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
-{
-    if (is_array($search)) {
-        foreach ($search as $idx => $s) {
-            $search[ $idx ] = _smarty_regex_replace_check($s);
-        }
-    } else {
-        $search = _smarty_regex_replace_check($search);
-    }
-    return preg_replace($search, $replace, $string, $limit);
-}
+
 
 /**
- * @param  string $search string(s) that should be replaced
+ * Smarty regex_replace modifier plugin
  *
+ * Type:     modifier<br>
+ * Name:     regex_replace<br>
+ * Purpose:  regular expression search/replace
+ * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ *          regex_replace (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param string|array
+ * @param string|array
  * @return string
- * @ignore
  */
+function smarty_modifier_regex_replace($string, $search, $replace)
+{
+    if(is_array($search)) {
+      foreach($search as $idx => $s)
+        $search[$idx] = _smarty_regex_replace_check($s);
+    } else {
+      $search = _smarty_regex_replace_check($search);
+    }       
+
+    return preg_replace($search, $replace, $string);
+}
+
 function _smarty_regex_replace_check($search)
 {
-    // null-byte injection detection
-    // anything behind the first null-byte is ignored
-    if (($pos = strpos($search, "\0")) !== false) {
-        $search = substr($search, 0, $pos);
-    }
-    // remove eval-modifier from $search
-    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) {
-        $search = substr($search, 0, -strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
+    if (($pos = strpos($search,"\0")) !== false)
+      $search = substr($search,0,$pos);
+    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
+        /* remove eval-modifier from $search */
+        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
     }
     return $search;
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.replace.php

@@ -1,37 +1,30 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty replace modifier plugin
- * Type:     modifier
- * Name:     replace
+ *
+ * Type:     modifier<br>
+ * Name:     replace<br>
  * Purpose:  simple search/replace
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param string $string  input string
- * @param string $search  text to search for
- * @param string $replace replacement text
- *
+ * @link http://smarty.php.net/manual/en/language.modifier.replace.php
+ *          replace (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param string
+ * @param string
  * @return string
  */
 function smarty_modifier_replace($string, $search, $replace)
 {
-    static $is_loaded = false;
-    if (Smarty::$_MBSTRING) {
-        if (!$is_loaded) {
-            if (!is_callable('smarty_mb_str_replace')) {
-                include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
-            }
-            $is_loaded = true;
-        }
-        return smarty_mb_str_replace($search, $replace, $string);
-    }
     return str_replace($search, $replace, $string);
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.spacify.php

@@ -1,26 +1,30 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty spacify modifier plugin
- * Type:     modifier
- * Name:     spacify
+ *
+ * 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)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string       input string
- * @param string $spacify_char string to insert between characters.
- *
+ * @link http://smarty.php.net/manual/en/language.modifier.spacify.php
+ *          spacify (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param string
  * @return string
  */
 function smarty_modifier_spacify($string, $spacify_char = ' ')
 {
-    // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
+    return implode($spacify_char,
+                   preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY));
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.string_format.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty string_format modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     string_format<br>
+ * Purpose:  format strings via sprintf
+ * @link http://smarty.php.net/manual/en/language.modifier.string.format.php
+ *          string_format (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param string
+ * @return string
+ */
+function smarty_modifier_string_format($string, $format)
+{
+    return sprintf($format, $string);
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.strip.php

@@ -0,0 +1,33 @@
+<?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:"&nbsp;"}
+ * Date:     September 25th, 2002
+ * @link http://smarty.php.net/manual/en/language.modifier.strip.php
+ *          strip (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @version  1.0
+ * @param string
+ * @param string
+ * @return string
+ */
+function smarty_modifier_strip($text, $replace = ' ')
+{
+    return preg_replace('!\s+!', $replace, $text);
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.strip_tags.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty strip_tags modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     strip_tags<br>
+ * Purpose:  strip html tags from text
+ * @link http://smarty.php.net/manual/en/language.modifier.strip.tags.php
+ *          strip_tags (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param boolean
+ * @return string
+ */
+function smarty_modifier_strip_tags($string, $replace_with_space = true)
+{
+    if ($replace_with_space)
+        return preg_replace('!<[^>]*?>!', ' ', $string);
+    else
+        return strip_tags($string);
+}
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.truncate.php

@@ -1,62 +1,50 @@
 <?php
 /**
  * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
+ * @package Smarty
+ * @subpackage plugins
  */
+
+
 /**
  * Smarty truncate modifier plugin
- * Type:     modifier
- * Name:     truncate
+ *
+ * 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 or inserting $etc into the middle.
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string  $string      input string
- * @param integer $length      length of truncated text
- * @param string  $etc         end string
- * @param boolean $break_words truncate at word boundary
- * @param boolean $middle      truncate in the middle of text
- *
- * @return string truncated string
+ *           optionally splitting in the middle of a word, and
+ *           appending the $etc string or inserting $etc into the middle.
+ * @link http://smarty.php.net/manual/en/language.modifier.truncate.php
+ *          truncate (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @param integer
+ * @param string
+ * @param boolean
+ * @param boolean
+ * @return string
  */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
+function smarty_modifier_truncate($string, $length = 80, $etc = '...',
+                                  $break_words = false, $middle = false)
 {
-    if ($length === 0) {
+    if ($length == 0)
         return '';
-    }
-    if (Smarty::$_MBSTRING) {
-        if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
-            $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
-            if (!$break_words && !$middle) {
-                $string = preg_replace(
-                    '/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER,
-                    '',
-                    mb_substr($string, 0, $length + 1, Smarty::$_CHARSET)
-                );
-            }
-            if (!$middle) {
-                return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
-            }
-            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
-                   mb_substr($string, -$length / 2, $length, Smarty::$_CHARSET);
-        }
-        return $string;
-    }
-    // no MBString fallback
-    if (isset($string[ $length ])) {
+
+    if (strlen($string) > $length) {
         $length -= min($length, strlen($etc));
         if (!$break_words && !$middle) {
-            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
+            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1));
         }
-        if (!$middle) {
+        if(!$middle) {
             return substr($string, 0, $length) . $etc;
+        } else {
+            return substr($string, 0, $length/2) . $etc . substr($string, -$length/2);
         }
-        return substr($string, 0, $length / 2) . $etc . substr($string, -$length / 2);
+    } else {
+        return $string;
     }
-    return $string;
 }
+
+/* vim: set expandtab: */
+
+?>

smarty_move_me/plugins/modifier.upper.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty upper modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     upper<br>
+ * Purpose:  convert string to uppercase
+ * @link http://smarty.php.net/manual/en/language.modifier.upper.php
+ *          upper (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param string
+ * @return string
+ */
+function smarty_modifier_upper($string)
+{
+    return strtoupper($string);
+}
+
+?>

smarty_move_me/plugins/modifier.wordwrap.php

@@ -0,0 +1,29 @@
+<?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)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @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);
+}
+
+?>

smarty_move_me/plugins/modifiercompiler.cat.php

@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty cat modifier plugin
- * Type:     modifier
- * Name:     cat
- * Date:     Feb 24, 2003
- * Purpose:  catenate a value to a variable
- * Input:    string to catenate
- * Example:  {$var|cat:"foo"}
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.cat.php cat
- *           (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_cat($params)
-{
-    return '(' . implode(').(', $params) . ')';
-}

smarty_move_me/plugins/modifiercompiler.count_characters.php

@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_characters modifier plugin
- * Type:     modifier
- * Name:     count_characters
- * Purpose:  count the number of characters in a text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
- *         manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_characters($params)
-{
-    if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
-        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
-    }
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strlen(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strlen(' . $params[ 0 ] . ')';
-}

smarty_move_me/plugins/modifiercompiler.count_paragraphs.php

@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_paragraphs modifier plugin
- * Type:     modifier
- * Name:     count_paragraphs
- * Purpose:  count the number of paragraphs in a text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_paragraphs (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_paragraphs($params)
-{
-    // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
-}

smarty_move_me/plugins/modifiercompiler.count_sentences.php

@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_sentences modifier plugin
- * Type:     modifier
- * Name:     count_sentences
- * Purpose:  count the number of sentences in a text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_sentences (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_sentences($params)
-{
-    // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
-}

smarty_move_me/plugins/modifiercompiler.count_words.php

@@ -1,31 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty count_words modifier plugin
- * Type:     modifier
- * Name:     count_words
- * Purpose:  count the number of words in a text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_words($params)
-{
-    if (Smarty::$_MBSTRING) {
-        // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' .
-               $params[ 0 ] . ', $tmp)';
-    }
-    // no MBString fallback
-    return 'str_word_count(' . $params[ 0 ] . ')';
-}

smarty_move_me/plugins/modifiercompiler.default.php

@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty default modifier plugin
- * Type:     modifier
- * Name:     default
- * Purpose:  designate default value for empty variables
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_default($params)
-{
-    $output = $params[ 0 ];
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = "''";
-    }
-    array_shift($params);
-    foreach ($params as $param) {
-        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
-    }
-    return $output;
-}

smarty_move_me/plugins/modifiercompiler.escape.php

@@ -1,112 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty escape modifier plugin
- * Type:     modifier
- * Name:     escape
- * Purpose:  escape string for output
- *
- * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
- * @author Rodney Rehm
- *
- * @param array                                $params parameters
- * @param Smarty_Internal_TemplateCompilerBase $compiler
- *
- * @return string with compiled code
- * @throws \SmartyException
- */
-function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
-{
-    static $_double_encode = null;
-    static $is_loaded = false;
-    $compiler->template->_checkPlugins(
-        array(
-            array(
-                'function' => 'smarty_literal_compiler_param',
-                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
-            )
-        )
-    );
-    if ($_double_encode === null) {
-        $_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-    }
-    try {
-        $esc_type = smarty_literal_compiler_param($params, 1, 'html');
-        $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
-        $double_encode = smarty_literal_compiler_param($params, 3, true);
-        if (!$char_set) {
-            $char_set = Smarty::$_CHARSET;
-        }
-        switch ($esc_type) {
-            case 'html':
-                if ($_double_encode) {
-                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                           var_export($double_encode, true) . ')';
-                } elseif ($double_encode) {
-                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
-                } else {
-                    // fall back to modifier.escape.php
-                }
-            // no break
-            case 'htmlall':
-                if (Smarty::$_MBSTRING) {
-                    if ($_double_encode) {
-                        // php >=5.2.3 - go native
-                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
-                               var_export($char_set, true) . ', ' . var_export($double_encode, true) .
-                               '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
-                    } elseif ($double_encode) {
-                        // php <5.2.3 - only handle double encoding
-                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
-                               var_export($char_set, true) . '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
-                    } else {
-                        // fall back to modifier.escape.php
-                    }
-                }
-                // no MBString fallback
-                if ($_double_encode) {
-                    // php >=5.2.3 - go native
-                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
-                           var_export($double_encode, true) . ')';
-                } elseif ($double_encode) {
-                    // php <5.2.3 - only handle double encoding
-                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
-                } else {
-                    // fall back to modifier.escape.php
-                }
-            // no break
-            case 'url':
-                return 'rawurlencode(' . $params[ 0 ] . ')';
-            case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode(' . $params[ 0 ] . '))';
-            case 'quotes':
-                // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
-            case 'javascript':
-                // escape quotes and backslashes, newlines, etc.
-                return 'strtr(' .
-                       $params[ 0 ] .
-                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
-        }
-    } catch (SmartyException $e) {
-        // pass through to regular plugin fallback
-    }
-    // could not optimize |escape call, so fallback to regular plugin
-    if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
-            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
-            'smarty_modifier_escape';
-    } else {
-        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
-            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
-            'smarty_modifier_escape';
-    }
-    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
-}

smarty_move_me/plugins/modifiercompiler.from_charset.php

@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty from_charset modifier plugin
- * Type:     modifier
- * Name:     from_charset
- * Purpose:  convert character encoding from $charset to internal encoding
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_from_charset($params)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[ 0 ];
-    }
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = '"ISO-8859-1"';
-    }
-    return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
-}

smarty_move_me/plugins/modifiercompiler.indent.php

@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty indent modifier plugin
- * Type:     modifier
- * Name:     indent
- * Purpose:  indent lines of text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_indent($params)
-{
-    if (!isset($params[ 1 ])) {
-        $params[ 1 ] = 4;
-    }
-    if (!isset($params[ 2 ])) {
-        $params[ 2 ] = "' '";
-    }
-    return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
-}

smarty_move_me/plugins/modifiercompiler.lower.php

@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty lower modifier plugin
- * Type:     modifier
- * Name:     lower
- * Purpose:  convert string to lowercase
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_lower($params)
-{
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strtolower(' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strtolower(' . $params[ 0 ] . ')';
-}

smarty_move_me/plugins/modifiercompiler.noprint.php

@@ -1,20 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty noprint modifier plugin
- * Type:     modifier
- * Name:     noprint
- * Purpose:  return an empty string
- *
- * @author Uwe Tews
- * @return string with compiled code
- */
-function smarty_modifiercompiler_noprint()
-{
-    return "''";
-}

smarty_move_me/plugins/modifiercompiler.string_format.php

@@ -1,24 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-/**
- * Smarty string_format modifier plugin
- * Type:     modifier
- * Name:     string_format
- * Purpose:  format strings via sprintf
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_string_format($params)
-{
-    return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
-}