* Updated smarty

* Added swedish debconf translation

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@12643 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/Changelog b/Changelog
index c7fc2b05fa93ef1f0fa33e18b2799d37f89a1f9d..e11d7d45cfa20d0a5fcea0ae8cf97c4b9e960548 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -23,6 +23,7 @@ GOsa2 changelog
   - Fixed problem with duplicated domain parts in ldap2zone
   - Updated check of user acls for new attributes
   - Fixed opengroupware pgsql login
+  - Updated integrated smarty to 2.6.20
 
 * gosa 2.5.16
   - Fixed problem with undefined ridbase in domain objects

diff --git a/debian/changelog b/debian/changelog
index 8a68fb77b40b0f3ba92a9b8f24d7a41fee1b0e71..38847858779341d6d2df7d7f0c342f818f52dd27 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gosa (2.5.17-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Cajus Pollmeier <pollmeier@gonicus.de>  Thu, 09 Oct 2008 10:10:24 +0200
+
 gosa (2.5.16.1-2) unstable; urgency=low
 
   * Added czech translation (closes:#483300)

diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644 (file)
index 0000000..2dd668e
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,43 @@
+# translation of gosa_2.5.16.1-3_sv.po to Swedish
+# GOsa desktop file installer.
+# Copyright (C) 2007 Cajus Pollmeier <cajus@debian.org>
+# This file is distributed under the same license as the gosa-desktop package.
+#
+# Cajus Pollmeier <cajus@debian.org>, 2007.
+# Martin Ågren <martin.agren@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: gosa_2.5.16.1-3_sv\n"
+"Report-Msgid-Bugs-To: cajus@debian.org\n"
+"POT-Creation-Date: 2007-06-27 10:59+0200\n"
+"PO-Revision-Date: 2008-07-23 20:47+0200\n"
+"Last-Translator: Martin Ågren <martin.agren@gmail.com>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid "URL to your GOsa installation:"
+msgstr "URL till din GOsa-installation:"
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid ""
+"The gosa start script can automatically point your browser to a system wide "
+"default location of your GOsa instance."
+msgstr ""
+"gosa-startskriptet kan automatiskt peka din webbläsare till en systemtäckande "
+"standardplats för din GOsa-instans."
+
+#. Type: string
+#. Description
+#: ../gosa-desktop.templates:1001
+msgid "Enter the URL in order to set this default."
+msgstr "Ange URL:en för att sätta detta standardvärde."
+

diff --git a/include/smarty/Config_File.class.php b/include/smarty/Config_File.class.php
index e3c3ca25c60688da42a34e54be6cab0c61c27de6..a10d30469d8975ac0c992afd2f957add103bb35d 100644 (file)
--- a/include/smarty/Config_File.class.php
+++ b/include/smarty/Config_File.class.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @link http://smarty.php.net/
- * @version 2.6.19
+ * @version 2.6.20
  * @copyright Copyright: 2001-2005 New Digital Group, Inc.
  * @author Andrei Zmievski <andrei@php.net>
  * @access public

diff --git a/include/smarty/Smarty.class.php b/include/smarty/Smarty.class.php
index 5eda787bd2c9aeb9f76c1213f53c6b4cb697fe18..19318e6a17827929d0280e1cdd4c62937eed8e4a 100644 (file)
--- a/include/smarty/Smarty.class.php
+++ b/include/smarty/Smarty.class.php
@@ -27,7 +27,7 @@
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei@php.net>
  * @package Smarty
- * @version 2.6.19
+ * @version 2.6.20
  */
 
 /* $Id: Smarty.class.php 2722 2007-06-18 14:29:00Z danilo $ */
@@ -464,7 +464,7 @@ class Smarty
      *
      * @var string
      */
-    var $_version              = '2.6.19';
+    var $_version              = '2.6.20';
 
     /**
      * current template inclusion depth

diff --git a/include/smarty/Smarty_Compiler.class.php b/include/smarty/Smarty_Compiler.class.php
index 52466d3188d7b613f30f87b5730844a692c8a756..f09f8de8dc6a0bbacde086324f362b57423d81e1 100644 (file)
--- a/include/smarty/Smarty_Compiler.class.php
+++ b/include/smarty/Smarty_Compiler.class.php
@@ -21,12 +21,12 @@
  * @link http://smarty.php.net/
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei@php.net>
- * @version 2.6.19
+ * @version 2.6.20
  * @copyright 2001-2005 New Digital Group, Inc.
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php 2736 2007-09-16 14:47:53Z mohrt $ */
+/* $Id: Smarty_Compiler.class.php 2773 2008-08-12 18:17:51Z Uwe.Tews $ */
 
 /**
  * Template compiling class
@@ -1363,9 +1363,14 @@ class Smarty_Compiler extends Smarty {
                     /* If last token was a ')', we operate on the parenthesized
                        expression. The start of the expression is on the stack.
                        Otherwise, we operate on the last encountered token. */
-                    if ($tokens[$i-1] == ')')
+                    if ($tokens[$i-1] == ')') {
                         $is_arg_start = array_pop($is_arg_stack);
-                    else
+                        if ($is_arg_start != 0) {
+                            if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
+                                $is_arg_start--;
+                            } 
+                        } 
+                    } else
                         $is_arg_start = $i-1;
                     /* Construct the argument for 'is' expression, so it knows
                        what to operate on. */

diff --git a/include/smarty/internals/core.process_compiled_include.php b/include/smarty/internals/core.process_compiled_include.php
index d539423bf740ee58787d4352a9e83b2990696b1f..904d59745288b54da60c92397a8fb854556d297c 100644 (file)
--- a/include/smarty/internals/core.process_compiled_include.php
+++ b/include/smarty/internals/core.process_compiled_include.php
@@ -25,7 +25,7 @@ function smarty_core_process_compiled_include($params, &$smarty)
         $smarty->_include($_include_file_path, true);
     }
 
-    foreach ($smarty->_cache_serials as $_include_file_path=>$_cache_serial) {
+    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);

diff --git a/include/smarty/plugins/modifier.regex_replace.php b/include/smarty/plugins/modifier.regex_replace.php
index d1f1545d8f095c6dab06d6362efa25f501e8fc7e..100b58ce4b1e7a969bef4fdee59f17d36f56f41c 100644 (file)
--- a/include/smarty/plugins/modifier.regex_replace.php
+++ b/include/smarty/plugins/modifier.regex_replace.php
@@ -21,6 +21,18 @@
  * @return string
  */
 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)
 {
     if (($pos = strpos($search,"\0")) !== false)
       $search = substr($search,0,$pos);
@@ -28,8 +40,7 @@ function smarty_modifier_regex_replace($string, $search, $replace)
         /* remove eval-modifier from $search */
         $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
     }
-       
-    return preg_replace($search, $replace, $string);
+    return $search;
 }
 
 /* vim: set expandtab: */

diff --git a/include/smarty/plugins/outputfilter.trimwhitespace.php b/include/smarty/plugins/outputfilter.trimwhitespace.php
index 97b0d21e8495185671a190b90db9c426a73482a1..739fa39b021a36fe24d8b39efee9363f1aab8cc1 100644 (file)
--- a/include/smarty/plugins/outputfilter.trimwhitespace.php
+++ b/include/smarty/plugins/outputfilter.trimwhitespace.php
@@ -28,21 +28,21 @@
 function smarty_outputfilter_trimwhitespace($source, &$smarty)
 {
     // Pull out the script blocks
-    preg_match_all("!<script[^>]+>.*?</script>!is", $source, $match);
+    preg_match_all("!<script[^>]*?>.*?</script>!is", $source, $match);
     $_script_blocks = $match[0];
-    $source = preg_replace("!<script[^>]+>.*?</script>!is",
+    $source = preg_replace("!<script[^>]*?>.*?</script>!is",
                            '@@@SMARTY:TRIM:SCRIPT@@@', $source);
 
     // Pull out the pre blocks
-    preg_match_all("!<pre>.*?</pre>!is", $source, $match);
+    preg_match_all("!<pre[^>]*?>.*?</pre>!is", $source, $match);
     $_pre_blocks = $match[0];
-    $source = preg_replace("!<pre>.*?</pre>!is",
+    $source = preg_replace("!<pre[^>]*?>.*?</pre>!is",
                            '@@@SMARTY:TRIM:PRE@@@', $source);
-
+    
     // Pull out the textarea blocks
-    preg_match_all("!<textarea[^>]+>.*?</textarea>!is", $source, $match);
+    preg_match_all("!<textarea[^>]*?>.*?</textarea>!is", $source, $match);
     $_textarea_blocks = $match[0];
-    $source = preg_replace("!<textarea[^>]+>.*?</textarea>!is",
+    $source = preg_replace("!<textarea[^>]*?>.*?</textarea>!is",
                            '@@@SMARTY:TRIM:TEXTAREA@@@', $source);
 
     // remove all leading spaces, tabs and carriage returns NOT