Eliminate temporary variables by passing the $item into the view and

making API calls on the item.

2 files changed, 5 insertions, 7 deletions

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index c92b4f7e..4cd3cec7 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -27,9 +27,7 @@ class Server_Add_Controller extends Controller {
 
     $item = ORM::factory("item", $id);
     $view = new View("server_add_tree_dialog.html");
-    $view->action = url::abs_site("__ARGS__/{$id}__TASK_ID__?csrf=" . access::csrf_token());
-    $view->parents = $item->parents();
-    $view->album_title = $item->title;
+    $view->item = $item;
 
     $tree = new View("server_add_tree.html");
     $tree->data = array();
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 8b296987..e2aa5d44 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -7,17 +7,17 @@
   });
 </script>
 <div id="gServerAdd">
-  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => p::clean($album_title))) ?></h1>
+  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => p::clean($item->title))) ?></h1>
 
   <p id="gDescription"><?= t("Photos will be added to album:") ?></p>
   <ul class="gBreadcrumbs">
-    <? foreach ($parents as $parent): ?>
+    <? foreach ($item->parents() as $parent): ?>
     <li><?= p::clean($parent->title) ?></li>
     <? endforeach ?>
-    <li class="active"><?= p::clean($album_title) ?></li>
+    <li class="active"><?= p::clean($item->title) ?></li>
   </ul>
 
-  <?= form::open($action, array("method" => "post")) ?>
+  <?= form::open(url::abs_site("__ARGS__/{$id}__TASK_ID__?csrf=$csrf"), array("method" => "post")) ?>
   <div id="gServerAddTree" >
     <?= $tree ?>
   </div>