X-Git-Url: https://projects.mako.cc/source/scuttle/blobdiff_plain/72c7cbb2e150516ad71681339544650f9d89bdd7..91d3a96bb7741ba92d2d3d7a7dc7d18e0d79688f:/templates/editbookmark.tpl.php?ds=sidebyside

diff --git a/templates/editbookmark.tpl.php b/templates/editbookmark.tpl.php
index 16b56c7..358b239 100644
--- a/templates/editbookmark.tpl.php
+++ b/templates/editbookmark.tpl.php
@@ -4,16 +4,19 @@ $this->includeTemplate($GLOBALS['top_include']);
 $accessPublic = '';
 $accessShared = '';
 $accessPrivate = '';
-switch ($row['bStatus']) {
-    case 0 :
-        $accessPublic = ' selected="selected"';
-        break;
-    case 1 :
-        $accessShared = ' selected="selected"';
-        break;
-    case 2 :
-        $accessPrivate = ' selected="selected"';
-        break;
+
+if (isset($row['bStatus'])) {
+    switch ($row['bStatus']) {
+        case 0 :
+            $accessPublic = ' selected="selected"';
+            break;
+        case 1 :
+            $accessShared = ' selected="selected"';
+            break;
+        case 2 :
+            $accessPrivate = ' selected="selected"';
+            break;
+    }
 }
 ?>
 
@@ -31,12 +34,12 @@ switch ($row['bStatus']) {
 </tr>
 <tr>
     <th align="left"><?php echo T_('Description'); ?></th>
-    <td><input type="text" name="description" size="75" maxlength="255" value="<?php echo filter($row['bDescription'], 'xml'); ?>" /></td>
+    <td><textarea name="description" cols="74" rows="5" maxlength="1000"><?php echo filter($row['bDescription'], 'xml'); ?></textarea></td>
     <td></td>
 </tr>
 <tr>
     <th align="left"><?php echo T_('Tags'); ?></th>
-    <td><input type="text" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" /></td>
+    <td><input type="text" id="tags" name="tags" size="75" value="<?php if (isset($row['tags'])) { echo filter(implode(', ', $row['tags']), 'xml'); }?>" /></td>
     <td>&larr; <?php echo T_('Comma-separated'); ?></td>
 </tr>
 <tr>
@@ -54,12 +57,12 @@ switch ($row['bStatus']) {
     <td></td>
     <td>
         <input type="submit" name="submitted" value="<?php echo $btnsubmit; ?>" />
-        <?php if ($showdelete): ?>
+        <?php if (isset($showdelete) && $showdelete): ?>
           <input type="submit" name="delete" value="<?php echo T_('Delete Bookmark'); ?>" />
         <?php endif; ?>
         <?php if ($popup): ?>
           <input type="hidden" name="popup" value="1" />
-        <?php elseif ($referrer): ?>
+        <?php elseif (isset($referrer) && $referrer): ?>
           <input type="hidden" name="referrer" value="<?php echo $referrer; ?>" />
         <?php endif; ?>
     </td>
@@ -69,7 +72,7 @@ switch ($row['bStatus']) {
 </form>
 <script type="text/javascript">
 $(function() {
-  $("#address").focus();
+  $("#tags").focus();
 });
 </script>
 
@@ -78,7 +81,7 @@ $(function() {
 $this->includeTemplate('dynamictags.inc');
 
 // Bookmarklets and import links
-if (empty($_REQUEST['popup']) && !$showdelete) {
+if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) {
 ?>
 
 <h3><?php echo T_('Bookmarklet'); ?></h3>
@@ -108,4 +111,4 @@ document.write('<\/ul>');
 <?php
 }
 $this->includeTemplate($GLOBALS['bottom_include']); 
-?>
\ No newline at end of file
+?>