summaryrefslogtreecommitdiff
path: root/manager/application/views
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2015-08-09 19:12:51 +0200
committerBenny Baumann <BenBE@geshi.org>2015-08-09 22:23:21 +0200
commit4edd7b57c0057f9cfab0874a198256b87bd018b7 (patch)
tree2a623eade7fea29bda28e15692991821448c8fe1 /manager/application/views
parentce38587c8459587d7a03002ebcb4427ed95fb85c (diff)
downloadcacert-mgr-4edd7b57c0057f9cfab0874a198256b87bd018b7.tar.gz
cacert-mgr-4edd7b57c0057f9cfab0874a198256b87bd018b7.tar.xz
cacert-mgr-4edd7b57c0057f9cfab0874a198256b87bd018b7.zip
bug 1396: Codestyle cleanup
Diffstat (limited to 'manager/application/views')
-rw-r--r--manager/application/views/helpers/LeftNav.php14
-rw-r--r--manager/application/views/helpers/TopNav.php14
-rw-r--r--manager/application/views/helpers/UserInfo.php38
-rw-r--r--manager/application/views/scripts/mail/full.phtml38
-rw-r--r--manager/application/views/scripts/mail/index.phtml38
-rw-r--r--manager/application/views/scripts/manage-account/assurance.phtml16
-rw-r--r--manager/application/views/scripts/manage-account/batch-assurance-form.phtml22
-rw-r--r--manager/application/views/scripts/manage-account/batch-assurance.phtml32
8 files changed, 106 insertions, 106 deletions
diff --git a/manager/application/views/helpers/LeftNav.php b/manager/application/views/helpers/LeftNav.php
index 8c1e220..9d8c2e2 100644
--- a/manager/application/views/helpers/LeftNav.php
+++ b/manager/application/views/helpers/LeftNav.php
@@ -54,13 +54,13 @@ class Zend_View_Helper_LeftNav extends Zend_View_Helper_Placeholder_Container_St
*/
public function leftNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
{
- $link = (string) $link;
+ $link = (string) $link;
if ($link !== '') {
if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
if ($setPos != 0)
- $this->items[$setPos] = $link;
+ $this->items[$setPos] = $link;
else
- $this->items[] = $link;
+ $this->items[] = $link;
} elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
$this->items = array_merge(array($link), $this->items);
} else {
@@ -80,16 +80,16 @@ class Zend_View_Helper_LeftNav extends Zend_View_Helper_Placeholder_Container_St
*/
public function toString($indent = null, $locale = null)
{
- $output = '';
- $indent = (null !== $indent)
+ $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";
+ }
+ $output .= $indent . "</ul>\n";
return $output;
}
diff --git a/manager/application/views/helpers/TopNav.php b/manager/application/views/helpers/TopNav.php
index 79da7dc..2cc2151 100644
--- a/manager/application/views/helpers/TopNav.php
+++ b/manager/application/views/helpers/TopNav.php
@@ -54,13 +54,13 @@ class Zend_View_Helper_TopNav extends Zend_View_Helper_Placeholder_Container_Sta
*/
public function topNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
{
- $link = (string) $link;
+ $link = (string) $link;
if ($link !== '') {
if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
if ($setPos != 0)
- $this->items[$setPos] = $link;
+ $this->items[$setPos] = $link;
else
- $this->items[] = $link;
+ $this->items[] = $link;
} elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
$this->items = array_merge(array($link), $this->items);
} else {
@@ -80,8 +80,8 @@ class Zend_View_Helper_TopNav extends Zend_View_Helper_Placeholder_Container_Sta
*/
public function toString($indent = null, $locale = null)
{
- $output = '';
- $indent = (null !== $indent)
+ $output = '';
+ $indent = (null !== $indent)
? $this->getWhitespace($indent)
: $this->getIndent();
@@ -91,8 +91,8 @@ class Zend_View_Helper_TopNav extends Zend_View_Helper_Placeholder_Container_Sta
foreach ($this->items as $item) {
$output .= $indent . "<li>" . $item . "</li>\n";
- }
- $output .= $indent . "</ul>\n";
+ }
+ $output .= $indent . "</ul>\n";
return $output;
}
diff --git a/manager/application/views/helpers/UserInfo.php b/manager/application/views/helpers/UserInfo.php
index e203a55..bf98f1b 100644
--- a/manager/application/views/helpers/UserInfo.php
+++ b/manager/application/views/helpers/UserInfo.php
@@ -52,10 +52,10 @@ class Zend_View_Helper_UserInfo extends Zend_View_Helper_Placeholder_Container_S
*/
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;
+ if ($ar !== null && is_array($ar)) {
+ $this->items = $ar;
+ }
+ return $this;
}
/**
@@ -67,28 +67,28 @@ class Zend_View_Helper_UserInfo extends Zend_View_Helper_Placeholder_Container_S
*/
public function toString($indent = null, $locale = null)
{
- $session = Zend_Registry::get('session');
- $this->items = $session->authdata;
+ $session = Zend_Registry::get('session');
+ $this->items = $session->authdata;
- $output = '';
+ $output = '';
- if ($session->authdata['authed'] !== true)
- return $output;
+ if ($session->authdata['authed'] !== true)
+ return $output;
-# $indent = (null !== $indent)
+# $indent = (null !== $indent)
# ? $this->getWhitespace($indent)
# : $this->getIndent();
- $indent = '';
+ $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";
+ $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/mail/full.phtml b/manager/application/views/scripts/mail/full.phtml
index 4e6d42f..1bfed87 100644
--- a/manager/application/views/scripts/mail/full.phtml
+++ b/manager/application/views/scripts/mail/full.phtml
@@ -8,30 +8,30 @@ $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.');
+ 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>
+ <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";
- }
+ 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 f63e4c4..427d0e9 100644
--- a/manager/application/views/scripts/mail/index.phtml
+++ b/manager/application/views/scripts/mail/index.phtml
@@ -8,30 +8,30 @@ $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.');
+ 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>
+ <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";
- }
+ 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/manage-account/assurance.phtml b/manager/application/views/scripts/manage-account/assurance.phtml
index db45e0a..79e1b19 100644
--- a/manager/application/views/scripts/manage-account/assurance.phtml
+++ b/manager/application/views/scripts/manage-account/assurance.phtml
@@ -9,12 +9,12 @@
<p><?php print I18n::_('The following assurances were added to your account:')?></p>
<table>
- <thead>
- <tr><th>#</th><th><?php print I18n::_('Number of points')?></th></tr>
- </thead>
- <tbody>
- <?php foreach ($this->assurancesDone as $i => $points) {
- printf('<tr><td> %1$d </td><td> %2$d </td></tr>', $i, $points);
- }?>
- </tbody>
+ <thead>
+ <tr><th>#</th><th><?php print I18n::_('Number of points')?></th></tr>
+ </thead>
+ <tbody>
+ <?php foreach ($this->assurancesDone as $i => $points) {
+ printf('<tr><td> %1$d </td><td> %2$d </td></tr>', $i, $points);
+ }?>
+ </tbody>
</table>
diff --git a/manager/application/views/scripts/manage-account/batch-assurance-form.phtml b/manager/application/views/scripts/manage-account/batch-assurance-form.phtml
index 3a68691..0fc829f 100644
--- a/manager/application/views/scripts/manage-account/batch-assurance-form.phtml
+++ b/manager/application/views/scripts/manage-account/batch-assurance-form.phtml
@@ -7,22 +7,22 @@
<h1><?php print I18n::_('Do Multiple Assurances at Once') ?></h1>
<p><?php print I18n::_('Assure multiple dummy accounts in one step. '.
- 'The assurances look just like normal assurances and can be used to gain '.
+ 'The assurances look just like normal assurances and can be used to gain '.
'experience points without suffering from RSI (also known as mouse arm).')
?></p>
<p><?php print I18n::_('The amount of points given per Assurance can be '.
- 'specified in two ways:') ?></p>
+ 'specified in two ways:') ?></p>
<dl>
- <dt><?php print I18n::_('Percentage') ?></dt>
- <dd><?php print I18n::_('n percent of the maximal possible points are '.
- 'given per Assurance. If it\'s not an integer it is rounded down to '.
- 'the next integer') ?></dd>
- <dt><?php print I18n::_('Absolute') ?></dt>
- <dd><?php print I18n::_('Exactly n points are given. If n exceeds the '.
- 'current maximum of points that may be given, it is set to the '.
- 'maximum until due to the gained experience points more points may be '.
- 'given') ?></dd>
+ <dt><?php print I18n::_('Percentage') ?></dt>
+ <dd><?php print I18n::_('n percent of the maximal possible points are '.
+ 'given per Assurance. If it\'s not an integer it is rounded down to '.
+ 'the next integer') ?></dd>
+ <dt><?php print I18n::_('Absolute') ?></dt>
+ <dd><?php print I18n::_('Exactly n points are given. If n exceeds the '.
+ 'current maximum of points that may be given, it is set to the '.
+ 'maximum until due to the gained experience points more points may be '.
+ 'given') ?></dd>
</dl>
<?php print $this->batch_assurance_form ?>
diff --git a/manager/application/views/scripts/manage-account/batch-assurance.phtml b/manager/application/views/scripts/manage-account/batch-assurance.phtml
index b13d226..32af13e 100644
--- a/manager/application/views/scripts/manage-account/batch-assurance.phtml
+++ b/manager/application/views/scripts/manage-account/batch-assurance.phtml
@@ -9,20 +9,20 @@
<p><?php print I18n::_('The following assurances were executed:')?></p>
<table>
- <thead>
- <tr>
- <th>#</th>
- <th><?php print I18n::_('Assuree')?></th>
- <th><?php print I18n::_('Number of points')?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($this->assurances as $i => $assurance) {?>
- <tr>
- <td><?php print $i ?></td>
- <td><?php print $assurance['assuree'] ?></td>
- <td><?php print $assurance['points'] ?></td>
- </tr>
- <?php }?>
- </tbody>
+ <thead>
+ <tr>
+ <th>#</th>
+ <th><?php print I18n::_('Assuree')?></th>
+ <th><?php print I18n::_('Number of points')?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($this->assurances as $i => $assurance) {?>
+ <tr>
+ <td><?php print $i ?></td>
+ <td><?php print $assurance['assuree'] ?></td>
+ <td><?php print $assurance['points'] ?></td>
+ </tr>
+ <?php }?>
+ </tbody>
</table> \ No newline at end of file