From 5a27ce7e8f3f90b20ba6aee7f83740776a82b578 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 15 Nov 2009 19:10:56 -0800
Subject: Save/restore $_SERVER before/after tests to avoid contamination. Fix
 albums/photos tests to make sure we're really getting the   HTTP_REFERER
 back.

---
 modules/comment/tests/Comment_Helper_Test.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/comment')

diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index 9a8c83f1..82b7ebd2 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -24,6 +24,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
   public function setup() {
     $this->_ip_address = Input::instance()->ip_address;
     $this->_user_agent = Kohana::$user_agent;
+    $this->_save = $_SERVER;
 
     $_SERVER["HTTP_ACCEPT"] = "HTTP_ACCEPT";
     $_SERVER["HTTP_ACCEPT_CHARSET"] = "HTTP_ACCEPT_CHARSET";
@@ -42,6 +43,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
   public function teardown() {
     Input::instance()->ip_address = $this->_ip_address;
     Kohana::$user_agent = $this->_user_agent;
+    $_SERVER = $this->_save;
   }
 
   public function create_comment_for_guest_test() {
-- 
cgit v1.2.3


From e0f4e6500de0b5f0e9de973eadcd879c45da8e18 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 15 Nov 2009 19:34:44 -0800
Subject: Use text::alternate() instead of hand-rolled even/odd code.

---
 modules/comment/views/admin_block_recent_comments.html.php |  4 ++--
 modules/comment/views/admin_comments.html.php              |  4 ++--
 modules/gallery/views/admin_advanced_settings.html.php     |  4 +---
 modules/gallery/views/admin_identity.html.php              |  4 +---
 modules/gallery/views/admin_maintenance.html.php           | 12 +++---------
 modules/gallery/views/admin_modules.html.php               |  4 +---
 6 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'modules/comment')

diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index 7941e02d..d9776def 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
-  <? foreach ($comments as $i => $comment): ?>
-  <li class="<?= ($i % 2 == 0) ? "g-even" : "g-odd" ?>">
+  <? foreach ($comments as $comment): ?>
+  <li class="<?= text::alternate("g-even", "g-odd") ?>">
     <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
          class="g-avatar"
          alt="<?= html::clean_attribute($comment->author_name()) ?>"
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index b138702c..20236a7a 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -103,8 +103,8 @@
           <?= t("Actions") ?>
         </th>
       </tr>
-      <? foreach ($comments as $i => $comment): ?>
-      <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+      <? foreach ($comments as $comment): ?>
+      <tr id="g-comment-<?= $comment->id ?>" class="<?= text::alternate("g-odd", "g-even") ?>">
         <td>
           <a href="#">
             <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 32fbc2c3..ff4843ab 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -16,10 +16,9 @@
         <th> <?= t("Name") ?> </th>
         <th> <?= t("Value") ?></th>
       </tr>
-      <? $i = 0; ?>
       <? foreach ($vars as $var): ?>
       <? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+      <tr class="<?= text::alternate("g-odd", "g-even") ?>">
         <td> <?= $var->module_name ?> </td>
         <td> <?= html::clean($var->name) ?> </td>
         <td>
@@ -34,7 +33,6 @@
         </a>
         </td>
       </tr>
-      <? $i++ ?>
       <? endforeach ?>
     </table>
   </div>
diff --git a/modules/gallery/views/admin_identity.html.php b/modules/gallery/views/admin_identity.html.php
index 70fe401f..51eaa58a 100644
--- a/modules/gallery/views/admin_identity.html.php
+++ b/modules/gallery/views/admin_identity.html.php
@@ -46,14 +46,12 @@
         <th> <?= t("Active") ?> </th>
         <th> <?= t("Description") ?> </th>
       </tr>
-      <? $i = 0 ?>
       <? foreach ($available as $module_name => $description):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+      <tr class="<?= text::alternate("g-odd", "g-even") ?>">
         <? $data = array("name" => "provider"); ?>
         <td> <?= form::radio($data, $module_name, $module_name == $active) ?> </td>
         <td> <?= t($description) ?> </td>
       </tr>
-      <? $i++ ?>
       <? endforeach ?>
     </table>
     <input type="submit" value="<?= t("Change")->for_html_attr() ?>" />
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 7ad75f85..ac597715 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -20,9 +20,8 @@
             <?= t("Action") ?>
           </th>
         </tr>
-        <? $i = 0; ?>
         <? foreach ($task_definitions as $task): ?>
-        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>">
+        <tr class="<?= text::alternate("g-odd", "g-even") ?> <?= log::severity_class($task->severity) ?>">
           <td class="<?= log::severity_class($task->severity) ?>">
             <?= $task->name ?>
           </td>
@@ -36,7 +35,6 @@
             </a>
           </td>
         </tr>
-        <? $i++ ?>
         <? endforeach ?>
       </table>
     </div>
@@ -68,9 +66,8 @@
             <?= t("Action") ?>
           </th>
         </tr>
-        <? $i = 0; ?>
         <? foreach ($running_tasks as $task): ?>
-        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
+        <tr class="<?= text::alternate("g-odd", "g-even") ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
           <td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>">
             <?= gallery::date_time($task->updated) ?>
           </td>
@@ -108,7 +105,6 @@
             <? endif ?>
           </td>
         </tr>
-        <? $i++ ?>
         <? endforeach ?>
       </table>
     </div>
@@ -141,9 +137,8 @@
             <?= t("Action") ?>
           </th>
         </tr>
-        <? $i = 0; ?>
         <? foreach ($finished_tasks as $task): ?>
-        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>">
+        <tr class="<?= text::alternate("g-odd", "g-even") ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>">
           <td class="<?= $task->state == "success" ? "g-success" : "g-error" ?>">
             <?= gallery::date_time($task->updated) ?>
           </td>
@@ -187,7 +182,6 @@
           </td>
         </tr>
         <? endforeach ?>
-        <? $i++ ?>
       </table>
     </div>
     <? endif ?>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 4c4976f8..aebedf09 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -15,9 +15,8 @@
           <th> <?= t("Version") ?> </th>
           <th> <?= t("Description") ?> </th>
         </tr>
-        <? $i = 0 ?>
         <? foreach ($available as $module_name => $module_info):  ?>
-        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+        <tr class="<?= text::alternate("g-odd", "g-even") ?>">
           <? $data = array("name" => $module_name); ?>
           <? if ($module_info->locked) $data["disabled"] = 1; ?>
           <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
@@ -25,7 +24,6 @@
           <td> <?= $module_info->version ?> </td>
           <td> <?= t($module_info->description) ?> </td>
         </tr>
-        <? $i++ ?>
         <? endforeach ?>
       </table>
       <input type="submit" value="<?= t("Update")->for_html_attr() ?>" />
-- 
cgit v1.2.3