bug 1396: Normalize Linefeed to Unix format in Repository

9 files changed, 409 insertions, 409 deletions

diff --git a/manager/application/views/helpers/LeftNav.php b/manager/application/views/helpers/LeftNav.php
index 01d31e5..8c1e220 100644
--- a/manager/application/views/helpers/LeftNav.php
+++ b/manager/application/views/helpers/LeftNav.php
@@ -1,96 +1,96 @@
-<?php

-/**

- * Zend Framework

- *

- * LICENSE

- *

- * This source file is subject to the new BSD license that is bundled

- * with this package in the file LICENSE.txt.

- * It is also available through the world-wide-web at this URL:

- * http://framework.zend.com/license/new-bsd

- * If you did not receive a copy of the license and are unable to

- * obtain it through the world-wide-web, please send an email

- * to license@zend.com so we can send you a copy immediately.

- *

- * @category   Zend

- * @package    Zend_View

- * @subpackage Helper

- * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)

- * @version    $Id: LeftNav.php 8 2009-11-24 10:32:47Z markus $

- * @license    http://framework.zend.com/license/new-bsd     New BSD License

- */

-

-/** Zend_View_Helper_Placeholder_Container_Standalone */

-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';

-

-/**

- * Helper for building an applications top navigation bar

- *

- * @uses       Zend_View_Helper_Placeholder_Container_Standalone

- * @package    Zend_View

- * @subpackage Helper

- * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)

- * @license    http://framework.zend.com/license/new-bsd     New BSD License

- */

-class Zend_View_Helper_LeftNav extends Zend_View_Helper_Placeholder_Container_Standalone

-{

-    /**

-     * Registry key for placeholder

-     * @var string

-     */

-    protected $_regKey = 'Zend_View_Helper_LeftNav';

-

-    protected $items = array();

-

-    /**

-     * Retrieve placeholder for navigation element and optionally set state

-     *

-     * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);

-     *

-     * @param  string $link

-     * @param  string $setType

-     * @param  string $setPos

-     * @return Zend_View_Helper_LeftNav

-     */

-    public function leftNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)

-    {

-    	$link = (string) $link;

-        if ($link !== '') {

-            if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {

-                if ($setPos != 0)

-                	$this->items[$setPos] = $link;

-                else

-                	$this->items[] = $link;

-            } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {

-                $this->items = array_merge(array($link), $this->items);

-            } else {

-                $this->items[] = $link;

-            }

-        }

-

-        return $this;

-    }

-

-    /**

-     * Turn helper into string

-     *

-     * @param  string|null $indent

-     * @param  string|null $locale

-     * @return string

-     */

-    public function toString($indent = null, $locale = null)

-    {

-		$output = '';

-    	$indent = (null !== $indent)

-                ? $this->getWhitespace($indent)

-                : $this->getIndent();

-

-        $output .= $indent . "<ul>\n";

-        foreach ($this->items as $item) {

-                $output .= $indent . "<li>" . $item . "</li>\n";

- 		}

-		$output .= $indent . "</ul>\n";

-

-        return $output;

-    }

-}

+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id: LeftNav.php 8 2009-11-24 10:32:47Z markus $
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for building an applications top navigation bar
+ *
+ * @uses       Zend_View_Helper_Placeholder_Container_Standalone
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_LeftNav extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+    /**
+     * Registry key for placeholder
+     * @var string
+     */
+    protected $_regKey = 'Zend_View_Helper_LeftNav';
+
+    protected $items = array();
+
+    /**
+     * Retrieve placeholder for navigation element and optionally set state
+     *
+     * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
+     *
+     * @param  string $link
+     * @param  string $setType
+     * @param  string $setPos
+     * @return Zend_View_Helper_LeftNav
+     */
+    public function leftNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
+    {
+    	$link = (string) $link;
+        if ($link !== '') {
+            if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
+                if ($setPos != 0)
+                	$this->items[$setPos] = $link;
+                else
+                	$this->items[] = $link;
+            } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
+                $this->items = array_merge(array($link), $this->items);
+            } else {
+                $this->items[] = $link;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Turn helper into string
+     *
+     * @param  string|null $indent
+     * @param  string|null $locale
+     * @return string
+     */
+    public function toString($indent = null, $locale = null)
+    {
+		$output = '';
+    	$indent = (null !== $indent)
+                ? $this->getWhitespace($indent)
+                : $this->getIndent();
+
+        $output .= $indent . "<ul>\n";
+        foreach ($this->items as $item) {
+                $output .= $indent . "<li>" . $item . "</li>\n";
+ 		}
+		$output .= $indent . "</ul>\n";
+
+        return $output;
+    }
+}
diff --git a/manager/application/views/helpers/TopNav.php b/manager/application/views/helpers/TopNav.php
index 151b03f..79da7dc 100644
--- a/manager/application/views/helpers/TopNav.php
+++ b/manager/application/views/helpers/TopNav.php
@@ -1,99 +1,99 @@
-<?php

-/**

- * Zend Framework

- *

- * LICENSE

- *

- * This source file is subject to the new BSD license that is bundled

- * with this package in the file LICENSE.txt.

- * It is also available through the world-wide-web at this URL:

- * http://framework.zend.com/license/new-bsd

- * If you did not receive a copy of the license and are unable to

- * obtain it through the world-wide-web, please send an email

- * to license@zend.com so we can send you a copy immediately.

- *

- * @category   Zend

- * @package    Zend_View

- * @subpackage Helper

- * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)

- * @version    $Id: TopNav.php 20 2009-12-01 14:26:22Z markus $

- * @license    http://framework.zend.com/license/new-bsd     New BSD License

- */

-

-/** Zend_View_Helper_Placeholder_Container_Standalone */

-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';

-

-/**

- * Helper for building an applications top navigation bar

- *

- * @uses       Zend_View_Helper_Placeholder_Container_Standalone

- * @package    Zend_View

- * @subpackage Helper

- * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)

- * @license    http://framework.zend.com/license/new-bsd     New BSD License

- */

-class Zend_View_Helper_TopNav extends Zend_View_Helper_Placeholder_Container_Standalone

-{

-    /**

-     * Registry key for placeholder

-     * @var string

-     */

-    protected $_regKey = 'Zend_View_Helper_TopNav';

-

-    protected $items = array();

-

-    /**

-     * Retrieve placeholder for navigation element and optionally set state

-     *

-     * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);

-     *

-     * @param  string $link

-     * @param  string $setType

-     * @param  string $setPos

-     * @return Zend_View_Helper_TopNav

-     */

-    public function topNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)

-    {

-    	$link = (string) $link;

-        if ($link !== '') {

-            if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {

-                if ($setPos != 0)

-                	$this->items[$setPos] = $link;

-                else

-                	$this->items[] = $link;

-            } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {

-                $this->items = array_merge(array($link), $this->items);

-            } else {

-                $this->items[] = $link;

-            }

-        }

-

-        return $this;

-    }

-

-    /**

-     * Turn helper into string

-     *

-     * @param  string|null $indent

-     * @param  string|null $locale

-     * @return string

-     */

-    public function toString($indent = null, $locale = null)

-    {

-		$output = '';

-    	$indent = (null !== $indent)

-                ? $this->getWhitespace($indent)

-                : $this->getIndent();

-

-        ksort($this->items);

-

-        $output .= $indent . "<ul>\n";

-

-        foreach ($this->items as $item) {

-                $output .= $indent . "<li>" . $item . "</li>\n";

- 		}

-		$output .= $indent . "</ul>\n";

-

-        return $output;

-    }

-}

+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id: TopNav.php 20 2009-12-01 14:26:22Z markus $
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for building an applications top navigation bar
+ *
+ * @uses       Zend_View_Helper_Placeholder_Container_Standalone
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_TopNav extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+    /**
+     * Registry key for placeholder
+     * @var string
+     */
+    protected $_regKey = 'Zend_View_Helper_TopNav';
+
+    protected $items = array();
+
+    /**
+     * Retrieve placeholder for navigation element and optionally set state
+     *
+     * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
+     *
+     * @param  string $link
+     * @param  string $setType
+     * @param  string $setPos
+     * @return Zend_View_Helper_TopNav
+     */
+    public function topNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
+    {
+    	$link = (string) $link;
+        if ($link !== '') {
+            if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
+                if ($setPos != 0)
+                	$this->items[$setPos] = $link;
+                else
+                	$this->items[] = $link;
+            } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
+                $this->items = array_merge(array($link), $this->items);
+            } else {
+                $this->items[] = $link;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Turn helper into string
+     *
+     * @param  string|null $indent
+     * @param  string|null $locale
+     * @return string
+     */
+    public function toString($indent = null, $locale = null)
+    {
+		$output = '';
+    	$indent = (null !== $indent)
+                ? $this->getWhitespace($indent)
+                : $this->getIndent();
+
+        ksort($this->items);
+
+        $output .= $indent . "<ul>\n";
+
+        foreach ($this->items as $item) {
+                $output .= $indent . "<li>" . $item . "</li>\n";
+ 		}
+		$output .= $indent . "</ul>\n";
+
+        return $output;
+    }
+}
diff --git a/manager/application/views/helpers/UserInfo.php b/manager/application/views/helpers/UserInfo.php
index 5ec31ed..e203a55 100644
--- a/manager/application/views/helpers/UserInfo.php
+++ b/manager/application/views/helpers/UserInfo.php
@@ -1,95 +1,95 @@
-<?php

-/**

- * Zend Framework

- *

- * LICENSE

- *

- * This source file is subject to the new BSD license that is bundled

- * with this package in the file LICENSE.txt.

- * It is also available through the world-wide-web at this URL:

- * http://framework.zend.com/license/new-bsd

- * If you did not receive a copy of the license and are unable to

- * obtain it through the world-wide-web, please send an email

- * to license@zend.com so we can send you a copy immediately.

- *

- * @category   Zend

- * @package    Zend_View

- * @subpackage Helper

- * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)

- * @version    $Id: UserInfo.php 33 2009-12-10 15:08:38Z markus $

- * @license    http://framework.zend.com/license/new-bsd     New BSD License

- */

-

-/** Zend_View_Helper_Placeholder_Container_Standalone */

-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';

-

-/**

- * Helper for displaying an user info div somewhere

- *

- * @uses       Zend_View_Helper_Placeholder_Container_Standalone

- * @package    Zend_View

- * @subpackage Helper

- * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)

- * @license    http://framework.zend.com/license/new-bsd     New BSD License

- */

-class Zend_View_Helper_UserInfo extends Zend_View_Helper_Placeholder_Container_Standalone

-{

-    /**

-     * Registry key for placeholder

-     * @var string

-     */

-    protected $_regKey = 'Zend_View_Helper_UserInfo';

-

-    private $items = array();

-

-    /**

-     * Retrieve placeholder for navigation element and optionally set state

-     *

-     * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);

-     *

-     * @param  array $data

-     * @return Zend_View_Helper_UserData

-     */

-    public function UserInfo($ar = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)

-    {

-    	if ($ar !== null && is_array($ar)) {

-    		$this->items = $ar;

-    	}

-    	return $this;

-    }

-

-    /**

-     * Turn helper into string

-     *

-     * @param  string|null $indent

-     * @param  string|null $locale

-     * @return string

-     */

-    public function toString($indent = null, $locale = null)

-    {

-    	$session = Zend_Registry::get('session');

-		$this->items = $session->authdata;

-

-    	$output = '';

-

-    	if ($session->authdata['authed'] !== true)

-			return $output;

-

-#    	$indent = (null !== $indent)

-#                ? $this->getWhitespace($indent)

-#                : $this->getIndent();

-		$indent = '';

-

-        $output .= $indent . "<div id=\"userinfo\">\n";

-		$output .= $indent . "\tUser: " . $this->items['authed_username'] . "<br>\n";

-		$output .= $indent . "\tName: " . $this->items['authed_fname'] . ' ' . $this->items['authed_lname'] . "<br>\n";

-		$output .= $indent . "\tRole: " . $this->items['authed_role'] . "<br>\n";

-		if ($this->items['authed_by_crt'] === true)

-			$output .= $indent . "\tLoginmethod: CRT<br>\n";

-		else

-			$output .= $indent . "\tLoginmethod: PASSWD<br>\n";

-		$output .= $indent . "</div>\n";

-

-        return $output;

-    }

-}

+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id: UserInfo.php 33 2009-12-10 15:08:38Z markus $
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for displaying an user info div somewhere
+ *
+ * @uses       Zend_View_Helper_Placeholder_Container_Standalone
+ * @package    Zend_View
+ * @subpackage Helper
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_View_Helper_UserInfo extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+    /**
+     * Registry key for placeholder
+     * @var string
+     */
+    protected $_regKey = 'Zend_View_Helper_UserInfo';
+
+    private $items = array();
+
+    /**
+     * Retrieve placeholder for navigation element and optionally set state
+     *
+     * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
+     *
+     * @param  array $data
+     * @return Zend_View_Helper_UserData
+     */
+    public function UserInfo($ar = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
+    {
+    	if ($ar !== null && is_array($ar)) {
+    		$this->items = $ar;
+    	}
+    	return $this;
+    }
+
+    /**
+     * Turn helper into string
+     *
+     * @param  string|null $indent
+     * @param  string|null $locale
+     * @return string
+     */
+    public function toString($indent = null, $locale = null)
+    {
+    	$session = Zend_Registry::get('session');
+		$this->items = $session->authdata;
+
+    	$output = '';
+
+    	if ($session->authdata['authed'] !== true)
+			return $output;
+
+#    	$indent = (null !== $indent)
+#                ? $this->getWhitespace($indent)
+#                : $this->getIndent();
+		$indent = '';
+
+        $output .= $indent . "<div id=\"userinfo\">\n";
+		$output .= $indent . "\tUser: " . $this->items['authed_username'] . "<br>\n";
+		$output .= $indent . "\tName: " . $this->items['authed_fname'] . ' ' . $this->items['authed_lname'] . "<br>\n";
+		$output .= $indent . "\tRole: " . $this->items['authed_role'] . "<br>\n";
+		if ($this->items['authed_by_crt'] === true)
+			$output .= $indent . "\tLoginmethod: CRT<br>\n";
+		else
+			$output .= $indent . "\tLoginmethod: PASSWD<br>\n";
+		$output .= $indent . "</div>\n";
+
+        return $output;
+    }
+}
diff --git a/manager/application/views/scripts/index/index.phtml b/manager/application/views/scripts/index/index.phtml
index 58c9dc9..480afca 100644
--- a/manager/application/views/scripts/index/index.phtml
+++ b/manager/application/views/scripts/index/index.phtml
@@ -1,7 +1,7 @@
-<?php

-/**

- * @author markus

- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $

- */

-?>

-<H1><?php print I18n::_('Dashboard'); ?></H1>

+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+?>
+<H1><?php print I18n::_('Dashboard'); ?></H1>
diff --git a/manager/application/views/scripts/login/index.phtml b/manager/application/views/scripts/login/index.phtml
index 57f49ea..a7bceaa 100644
--- a/manager/application/views/scripts/login/index.phtml
+++ b/manager/application/views/scripts/login/index.phtml
@@ -1,16 +1,16 @@
-<?php

-/**

- * @author markus

- * $Id: index.phtml 36 2009-12-15 15:49:57Z markus $

- */

-

-// $this->headScript()->appendFile('js/1st.js');

-// $this->headScript()->appendFile('js/2nd.js');

-$this->headLink()->appendStylesheet('/css/login.css');

-

-$this->headLink()->appendStylesheet('/css/form_dl.css');

-?>

-

-<H1><?php print I18n::_('Please log in'); ?></H1>

-<?php print $this->form;?>

-<a href='/login/crt'><?php print I18n::_('Client Cert Login'); ?></a>
\ No newline at end of file
+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 36 2009-12-15 15:49:57Z markus $
+ */
+
+// $this->headScript()->appendFile('js/1st.js');
+// $this->headScript()->appendFile('js/2nd.js');
+$this->headLink()->appendStylesheet('/css/login.css');
+
+$this->headLink()->appendStylesheet('/css/form_dl.css');
+?>
+
+<H1><?php print I18n::_('Please log in'); ?></H1>
+<?php print $this->form;?>
+<a href='/login/crt'><?php print I18n::_('Client Cert Login'); ?></a>
diff --git a/manager/application/views/scripts/mail/delete.phtml b/manager/application/views/scripts/mail/delete.phtml
index d01cec8..9d2e46c 100644
--- a/manager/application/views/scripts/mail/delete.phtml
+++ b/manager/application/views/scripts/mail/delete.phtml
@@ -1,12 +1,12 @@
-<?php

-/**

- * @author markus

- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $

- */

-$this->headLink()->appendStylesheet('/css/mail.css');

-$this->headScript()->appendFile('/js/mail_redirect.js');

-?>

-<H1><?php print I18n::_('Delete Mail'); ?></H1>

-<?php

-print $this->message;

-print '<input type="hidden" id="returnto" value="' . $this->returnto .  '">';

+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+$this->headLink()->appendStylesheet('/css/mail.css');
+$this->headScript()->appendFile('/js/mail_redirect.js');
+?>
+<H1><?php print I18n::_('Delete Mail'); ?></H1>
+<?php
+print $this->message;
+print '<input type="hidden" id="returnto" value="' . $this->returnto .  '">';
diff --git a/manager/application/views/scripts/mail/full.phtml b/manager/application/views/scripts/mail/full.phtml
index ba1986b..4e6d42f 100644
--- a/manager/application/views/scripts/mail/full.phtml
+++ b/manager/application/views/scripts/mail/full.phtml
@@ -1,37 +1,37 @@
-<?php

-/**

- * @author markus

- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $

- */

-$this->headLink()->appendStylesheet('/css/mail.css');

-?>

-<H1><?php print I18n::_('View all Mail'); ?></H1>

-<?php

-if (count($this->headers) == 0) {

-	print I18n::_('You currently have no mail.');

-}

-else {

-?>

-<table>

-	<tr>

-		<th class="col1"><?php print I18n::_('From');?></th>

-		<th class="col2"><?php print I18n::_('To');?></th>

-		<th class="col3"><?php print I18n::_('Subject');?></th>

-		<th class="col4"><?php print I18n::_('Date');?></th>

-		<th class="col5"><?php print I18n::_('Size');?></th>

-		<th class="col6"><?php print I18n::_('Del');?></th>

-	</tr>

-<?php

-	foreach ($this->headers as $header) {

-		print "        <tr>\n";

-		print "            <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";

-		print "            <td>" . $header->toaddress . "</td>";

-		print "            <td>" . $header->subject . "</td>";

-		print "            <td>" . $header->date . "</td>";

-		print "            <td>" . $header->Size . "</td>";

-		print "            <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";

-		print "        </tr>\n";

-	}

-}

-?>

-</table>

+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+$this->headLink()->appendStylesheet('/css/mail.css');
+?>
+<H1><?php print I18n::_('View all Mail'); ?></H1>
+<?php
+if (count($this->headers) == 0) {
+	print I18n::_('You currently have no mail.');
+}
+else {
+?>
+<table>
+	<tr>
+		<th class="col1"><?php print I18n::_('From');?></th>
+		<th class="col2"><?php print I18n::_('To');?></th>
+		<th class="col3"><?php print I18n::_('Subject');?></th>
+		<th class="col4"><?php print I18n::_('Date');?></th>
+		<th class="col5"><?php print I18n::_('Size');?></th>
+		<th class="col6"><?php print I18n::_('Del');?></th>
+	</tr>
+<?php
+	foreach ($this->headers as $header) {
+		print "        <tr>\n";
+		print "            <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
+		print "            <td>" . $header->toaddress . "</td>";
+		print "            <td>" . $header->subject . "</td>";
+		print "            <td>" . $header->date . "</td>";
+		print "            <td>" . $header->Size . "</td>";
+		print "            <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
+		print "        </tr>\n";
+	}
+}
+?>
+</table>
diff --git a/manager/application/views/scripts/mail/index.phtml b/manager/application/views/scripts/mail/index.phtml
index 85288e4..f63e4c4 100644
--- a/manager/application/views/scripts/mail/index.phtml
+++ b/manager/application/views/scripts/mail/index.phtml
@@ -1,37 +1,37 @@
-<?php

-/**

- * @author markus

- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $

- */

-$this->headLink()->appendStylesheet('/css/mail.css');

-?>

-<H1><?php print I18n::_('View own Mail'); ?></H1>

-<?php

-if (count($this->headers) == 0) {

-	print I18n::_('You currently have no mail.');

-}

-else {

-?>

-<table>

-	<tr>

-		<th class="col1"><?php print I18n::_('From');?></th>

-		<th class="col2"><?php print I18n::_('To');?></th>

-		<th class="col3"><?php print I18n::_('Subject');?></th>

-		<th class="col4"><?php print I18n::_('Date');?></th>

-		<th class="col5"><?php print I18n::_('Size');?></th>

-		<th class="col6"><?php print I18n::_('Del');?></th>

-	</tr>

-<?php

-	foreach ($this->headers as $header) {

-		print "        <tr>\n";

-		print "            <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";

-		print "            <td>" . $header->toaddress . "</td>";

-		print "            <td>" . $header->subject . "</td>";

-		print "            <td>" . $header->date . "</td>";

-		print "            <td>" . $header->Size . "</td>";

-		print "            <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";

-		print "        </tr>\n";

-	}

-}

-?>

-</table>

+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+$this->headLink()->appendStylesheet('/css/mail.css');
+?>
+<H1><?php print I18n::_('View own Mail'); ?></H1>
+<?php
+if (count($this->headers) == 0) {
+	print I18n::_('You currently have no mail.');
+}
+else {
+?>
+<table>
+	<tr>
+		<th class="col1"><?php print I18n::_('From');?></th>
+		<th class="col2"><?php print I18n::_('To');?></th>
+		<th class="col3"><?php print I18n::_('Subject');?></th>
+		<th class="col4"><?php print I18n::_('Date');?></th>
+		<th class="col5"><?php print I18n::_('Size');?></th>
+		<th class="col6"><?php print I18n::_('Del');?></th>
+	</tr>
+<?php
+	foreach ($this->headers as $header) {
+		print "        <tr>\n";
+		print "            <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
+		print "            <td>" . $header->toaddress . "</td>";
+		print "            <td>" . $header->subject . "</td>";
+		print "            <td>" . $header->date . "</td>";
+		print "            <td>" . $header->Size . "</td>";
+		print "            <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
+		print "        </tr>\n";
+	}
+}
+?>
+</table>
diff --git a/manager/application/views/scripts/mail/read.phtml b/manager/application/views/scripts/mail/read.phtml
index 21ac131..24b6838 100644
--- a/manager/application/views/scripts/mail/read.phtml
+++ b/manager/application/views/scripts/mail/read.phtml
@@ -1,10 +1,10 @@
-<?php

-/**

- * @author markus

- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $

- */

-$this->headLink()->appendStylesheet('/css/mail.css');

-?>

-<H1><?php print I18n::_('Read Mail'); ?></H1>

-<?php

-print nl2br(htmlspecialchars(quoted_printable_decode($this->mail_body), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));

+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+$this->headLink()->appendStylesheet('/css/mail.css');
+?>
+<H1><?php print I18n::_('Read Mail'); ?></H1>
+<?php
+print nl2br(htmlspecialchars(quoted_printable_decode($this->mail_body), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));