add long description field

1 year ago · c5eef6751d
8 changed files with 67 additions and 24 deletions
--- a/database/yggtracker.mwb
+++ b/database/yggtracker.mwb
--- a/src/config/app.php.example
+++ b/src/config/app.php.example
@ -88,7 +88,10 @@ define('MAGNET_META_TITLE_MIN_LENGTH', 10);
				@@ -88,7 +88,10 @@ define('MAGNET_META_TITLE_MIN_LENGTH', 10);
 define('MAGNET_META_TITLE_MAX_LENGTH', 255);

 define('MAGNET_META_DESCRIPTION_MIN_LENGTH', 0);
-define('MAGNET_META_DESCRIPTION_MAX_LENGTH', 10000);
+define('MAGNET_META_DESCRIPTION_MAX_LENGTH', 255);
+
+define('MAGNET_DESCRIPTION_MIN_LENGTH', 0);
+define('MAGNET_DESCRIPTION_MAX_LENGTH', 10000);


 define('MAGNET_STOP_WORDS_SIMILAR',
--- a/src/library/database.php
+++ b/src/library/database.php
@ -641,6 +641,17 @@ class Database {
				@@ -641,6 +641,17 @@ class Database {
    return $query->rowCount();
  }

+  public function updateMagnetDescription(int $magnetId, string $description, int $timeUpdated) : int {
+
+    $this->_debug->query->update->total++;
+
+    $query = $this->_db->prepare('UPDATE `magnet` SET `description` = ?, `timeUpdated` = ? WHERE `magnetId` = ?');
+
+    $query->execute([$description, $timeUpdated, $magnetId]);
+
+    return $query->rowCount();
+  }
+
  public function updateMagnetPublic(int $magnetId, bool $public, int $timeUpdated) : int {

    $this->_debug->query->update->total++;
--- a/src/public/assets/theme/default/css/framework.css
+++ b/src/public/assets/theme/default/css/framework.css
@ -242,17 +242,6 @@
				@@ -242,17 +242,6 @@
  transition: opacity .2s;
 }

-.max-height-220 {
-  max-height: 220px;
-  overflow: hidden;
-  transition: max-height .2s;
-}
-
-*:hover > .max-height-parent-hover-840 {
-  max-height: 840px;
-  transition: max-height .2s;
-}
-
 .blur-2 {
  filter: blur(2px);
 }
--- a/src/public/edit.php
+++ b/src/public/edit.php
@ -42,6 +42,15 @@ $response = (object)
				@@ -42,6 +42,15 @@ $response = (object)
        'message' => false,
      ]
    ],
+    'description' => (object)
+    [
+      'value' => false,
+      'valid' => (object)
+      [
+        'success' => true,
+        'message' => false,
+      ]
+    ],
    'dn' => (object)
    [
      'value' => false,
@ -211,17 +220,27 @@ else {
				@@ -211,17 +220,27 @@ else {
    else
    {
      $response->form->metaTitle->valid->success = false;
-      $response->form->metaTitle->valid->message = sprintf(_('* required, minimum %s-%s chars'), MAGNET_META_TITLE_MIN_LENGTH, MAGNET_META_TITLE_MAX_LENGTH);
+      $response->form->metaTitle->valid->message = sprintf(_('* required, %s-%s chars'), MAGNET_META_TITLE_MIN_LENGTH, MAGNET_META_TITLE_MAX_LENGTH);
    }

-    if (MAGNET_META_DESCRIPTION_MIN_LENGTH <= mb_strlen($_POST['metaDescription']) && MAGNET_META_DESCRIPTION_MAX_LENGTH >= mb_strlen($_POST['metaDescription']))
+    if (mb_strlen($_POST['metaDescription']) < MAGNET_META_DESCRIPTION_MIN_LENGTH || mb_strlen($_POST['metaDescription']) > MAGNET_META_DESCRIPTION_MAX_LENGTH)
+    {
+      $response->form->metaDescription->valid->success = false;
+      $response->form->metaDescription->valid->message = sprintf(_('* required, %s-%s chars, %s provided'), MAGNET_META_DESCRIPTION_MIN_LENGTH, MAGNET_META_DESCRIPTION_MAX_LENGTH, mb_strlen($_POST['metaDescription']));
+    }
+    else
    {
      $db->updateMagnetMetaDescription($magnet->magnetId, trim(strip_tags(html_entity_decode($_POST['metaDescription']))), time());
    }
+
+    if (mb_strlen($_POST['description']) < MAGNET_DESCRIPTION_MIN_LENGTH || mb_strlen($_POST['description']) > MAGNET_DESCRIPTION_MAX_LENGTH)
+    {
+      $response->form->description->valid->success = false;
+      $response->form->description->valid->message = sprintf(_('* required, %s-%s chars, %s provided'), MAGNET_DESCRIPTION_MIN_LENGTH, MAGNET_DESCRIPTION_MAX_LENGTH, mb_strlen($_POST['description']));
+    }
    else
    {
-      $response->form->metaDescription->valid->success = false;
-      $response->form->metaDescription->valid->message = sprintf(_('* required, minimum %s-%s chars'), MAGNET_META_DESCRIPTION_MIN_LENGTH, MAGNET_META_DESCRIPTION_MAX_LENGTH);
+      $db->updateMagnetDescription($magnet->magnetId, trim(strip_tags(html_entity_decode($_POST['description']))), time());
    }

    // Social
@ -364,6 +383,7 @@ else {
				@@ -364,6 +383,7 @@ else {
    if ($response->success &&
        $response->form->metaTitle->valid->success &&
        $response->form->metaDescription->valid->success &&
+        $response->form->description->valid->success &&
        $response->form->tr->valid->success &&
        $response->form->as->valid->success &&
        $response->form->xs->valid->success)
@ -389,6 +409,9 @@ else {
				@@ -389,6 +409,9 @@ else {
  // Meta Description
  $response->form->metaDescription->value = $magnet->metaDescription;

+  // Description
+  $response->form->description->value = $magnet->description;
+
  // Magnet settings
  $response->form->public->value    = (bool) $magnet->public;
  $response->form->comments->value  = (bool) $magnet->comments;
@ -517,11 +540,16 @@ else {
				@@ -517,11 +540,16 @@ else {
                      <div class="margin-b-8"><?php echo $response->form->metaTitle->valid->message ?></div>
                    <?php } ?>
                    <input class="width-100 <?php echo ($response->form->metaTitle->valid->success ? false : 'background-color-red') ?>" type="text" name="metaTitle" value="<?php echo $response->form->metaTitle->value ?>" placeholder="<?php echo _('Main title') ?>" maxlength="255" />
-                    <label class="display-block margin-y-8"><?php echo _('Description') ?></label>
+                    <label class="display-block margin-y-8"><?php echo _('Short description') ?></label>
                    <?php if ($response->form->metaDescription->valid->message) { ?>
                      <div class="margin-b-8"><?php echo $response->form->metaDescription->valid->message ?></div>
                    <?php } ?>
-                    <textarea class="width-100 <?php echo ($response->form->metaDescription->valid->success ? false : 'background-color-red') ?>" name="metaDescription" placeholder="<?php echo _('Describe your magnet for others') ?>"><?php echo $response->form->metaDescription->value ?></textarea>
+                    <textarea class="width-100 <?php echo ($response->form->metaDescription->valid->success ? false : 'background-color-red') ?>" name="metaDescription" placeholder="<?php echo _('Shows in listing and meta tags') ?>"><?php echo $response->form->metaDescription->value ?></textarea>
+                    <label class="display-block margin-y-8"><?php echo _('Long description') ?></label>
+                    <?php if ($response->form->description->valid->message) { ?>
+                      <div class="margin-b-8"><?php echo $response->form->description->valid->message ?></div>
+                    <?php } ?>
+                    <textarea class="width-100 <?php echo ($response->form->description->valid->success ? false : 'background-color-red') ?>" name="description" placeholder="<?php echo _('Shows on magnet page') ?>"><?php echo $response->form->description->value ?></textarea>
                  </fieldset>
                  <fieldset class="display-block margin-b-16">
                    <legend class="text-right width-100 padding-y-8 margin-b-8 border-bottom-default"><?php echo _('BitTorrent') ?></legend>
--- a/src/public/index.php
+++ b/src/public/index.php
@ -170,7 +170,7 @@ else
				@@ -170,7 +170,7 @@ else
        'metaTitle'       => $magnet->metaTitle ? htmlentities($magnet->metaTitle) : ($magnet->dn ? htmlentities($magnet->dn): false),
        'metaDescription' => $magnet->metaDescription ? nl2br(
                                                          htmlentities(
-                                                            substr($magnet->metaDescription, 0, MAGNET_META_DESCRIPTION_LENGTH_SHORT)
+                                                            $magnet->metaDescription
                                                          )
                                                        ) : false,
        'approved'        => (bool) $magnet->approved,
@ -306,7 +306,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL ?>
				@@ -306,7 +306,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL ?>
                          <?php } ?>
                        </div>
                        <?php if ($magnet->metaDescription) { ?>
-                          <div class="margin-y-8 max-height-220 max-height-parent-hover-840"><?php echo $magnet->metaDescription ?></div>
+                          <div class="margin-y-8"><?php echo $magnet->metaDescription ?></div>
                        <?php } ?>
                        <?php if ($magnet->keywords) { ?>
                          <div class="margin-y-8">
--- a/src/public/magnet.php
+++ b/src/public/magnet.php
@ -147,9 +147,14 @@ else
				@@ -147,9 +147,14 @@ else
    'metaTitle'       => $magnet->metaTitle ? htmlentities($magnet->metaTitle) : ($magnet->dn ? htmlentities($magnet->dn): false),
    'metaDescription' => $magnet->metaDescription ? nl2br(
                                                      htmlentities(
-                                                        substr($magnet->metaDescription, 0, MAGNET_META_DESCRIPTION_LENGTH_SHORT)
+                                                        $magnet->metaDescription
                                                      )
                                                    ) : false,
+    'description'     => $magnet->description ? nl2br(
+                                                  htmlentities(
+                                                    $magnet->description
+                                                  )
+                                                ) : false,
    'approved'        => (bool) $magnet->approved,
    'public'          => (bool) $magnet->public,
    'sensitive'       => (bool) $magnet->sensitive,
@ -283,6 +288,9 @@ echo '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL ?>
				@@ -283,6 +288,9 @@ echo '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL ?>
                    <?php if ($response->magnet->metaDescription) { ?>
                      <div class="margin-y-8"><?php echo $response->magnet->metaDescription ?></div>
                    <?php } ?>
+                    <?php if ($response->magnet->description) { ?>
+                      <div class="margin-y-8"><?php echo $response->magnet->description ?></div>
+                    <?php } ?>
                    <?php if ($response->magnet->keywords) { ?>
                      <div class="margin-y-8">
                        <?php foreach ($response->magnet->keywords as $keyword) { ?>
--- a/src/public/node.php
+++ b/src/public/node.php
@ -216,13 +216,17 @@ else
				@@ -216,13 +216,17 @@ else
                      <td class="padding-t-16"><?php echo MAGNET_DEFAULT_APPROVED ? _('yes') : _('no') ?></td>
                    </tr>
                    <tr>
-                      <td><?php echo _('Title length') ?></td>
+                      <td><?php echo _('Title, chars') ?></td>
                      <td><?php echo MAGNET_META_TITLE_MIN_LENGTH ?>-<?php echo MAGNET_META_TITLE_MAX_LENGTH ?></td>
                    </tr>
                    <tr>
-                      <td><?php echo _('Description length') ?></td>
+                      <td><?php echo _('Description short, chars') ?></td>
                      <td><?php echo MAGNET_META_DESCRIPTION_MIN_LENGTH ?>-<?php echo MAGNET_META_DESCRIPTION_MAX_LENGTH ?></td>
                    </tr>
+                    <tr>
+                      <td><?php echo _('Description long, chars') ?></td>
+                      <td><?php echo MAGNET_DESCRIPTION_MIN_LENGTH ?>-<?php echo MAGNET_DESCRIPTION_MAX_LENGTH ?></td>
+                    </tr>
                    <tr>
                      <td class="padding-y-8 border-bottom-default text-right" colspan="2">
                        <?php echo _('Comments') ?>
@ -233,7 +237,7 @@ else
				@@ -233,7 +237,7 @@ else
                      <td class="padding-t-16"><?php echo COMMENT_DEFAULT_APPROVED ? _('yes') : _('no') ?></td>
                    </tr>
                    <tr>
-                      <td><?php echo _('Length') ?></td>
+                      <td><?php echo _('Length, chars') ?></td>
                      <td><?php echo COMMENT_MIN_LENGTH ?>-<?php echo COMMENT_MAX_LENGTH ?></td>
                    </tr>
                    <tr>