Add legals to Twig templates

classes/env.class.php

@@ -29,7 +29,7 @@ class ENV
 
 
     /**
-     * __functions()
+     * __functions
      */
 
     # Prevents outside construction
@@ -49,6 +49,15 @@ class ENV
         );
     }
 
+    # Prevents unserializing
+    public function __wakeup()
+    {
+        return trigger_error(
+            'wakeup() not allowed',
+            E_USER_ERROR
+        );
+    }
+
     # $this->key returns public->key
     public function __get($key)
     {
@@ -263,6 +272,7 @@ class RecursiveArrayObject extends \ArrayObject
         return $this;
     }
 
+
     /**
      * __set
      */
@@ -275,6 +285,7 @@ class RecursiveArrayObject extends \ArrayObject
         }
     }
 
+
     /**
      * __get
      */
@@ -289,6 +300,7 @@ class RecursiveArrayObject extends \ArrayObject
         }
     }
 
+
     /**
      * __isset
      */
@@ -297,6 +309,7 @@ class RecursiveArrayObject extends \ArrayObject
         return array_key_exists($name, $this);
     }
 
+    
     /**
      * __unset
      */

classes/twig.class.php

@@ -15,7 +15,7 @@ declare(strict_types=1);
 class Twig
 {
     /**
-     * Singleton stuff
+     * __functions
      */
 
     private static $Twig = null;
@@ -33,6 +33,18 @@ class Twig
         );
     }
 
+    public function __wakeup()
+    {
+        return trigger_error(
+            'wakeup() not allowed',
+            E_USER_ERROR
+        );
+    }
+
+
+    /**
+     * go
+     */
     public static function go()
     {
         return (self::$Twig === null)
@@ -48,7 +60,7 @@ class Twig
     private static function factory(): \Twig\Environment
     {
         $ENV = ENV::go();
-        $twig = new \Twig\Environment(
+        $Twig = new \Twig\Environment(
             new \Twig\Loader\FilesystemLoader("$ENV->SERVER_ROOT/templates"),
             [
                 'auto_reload' => true,
@@ -58,49 +70,49 @@ class Twig
         ]
         );
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'article',
             function ($word) {
                 return preg_match('/^[aeiou]/i', $word) ? 'an' : 'a';
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'b64',
             function (string $binary) {
                 return base64_encode($binary);
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'bb_format',
             function ($text) {
                 return new \Twig\Markup(\Text::full_format($text), 'UTF-8');
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'checked',
             function ($isChecked) {
                 return $isChecked ? ' checked="checked"' : '';
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'image',
             function ($i) {
                 return new \Twig\Markup(\ImageTools::process($i, true), 'UTF-8');
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'ipaddr',
             function ($ipaddr) {
                 return new \Twig\Markup(\Tools::display_ip($ipaddr), 'UTF-8');
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'octet_size',
             function ($size, array $option = []) {
                 return \Format::get_size($size, empty($option) ? 2 : $option[0]);
@@ -108,42 +120,42 @@ class Twig
             ['is_variadic' => true]
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'plural',
             function ($number) {
                 return plural($number);
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'selected',
             function ($isSelected) {
                 return $isSelected ? ' selected="selected"' : '';
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'shorten',
             function (string $text, int $length) {
                 return shortenString($text, $length);
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'time_diff',
             function ($time) {
                 return new \Twig\Markup(time_diff($time), 'UTF-8');
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'ucfirst',
             function ($text) {
                 return ucfirst($text);
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'ucfirstall',
             function ($text) {
                 return implode(' ', array_map(function ($w) {
@@ -152,28 +164,28 @@ class Twig
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'user_url',
             function ($userId) {
                 return new \Twig\Markup(\Users::format_username($userId, false, false, false), 'UTF-8');
             }
         ));
 
-        $twig->addFilter(new \Twig\TwigFilter(
+        $Twig->addFilter(new \Twig\TwigFilter(
             'user_full',
             function ($userId) {
                 return new \Twig\Markup(\Users::format_username($userId, true, true, true, true), 'UTF-8');
             }
         ));
 
-        $twig->addFunction(new \Twig\TwigFunction('donor_icon', function ($icon, $userId) {
+        $Twig->addFunction(new \Twig\TwigFunction('donor_icon', function ($icon, $userId) {
             return new \Twig\Markup(
                 \ImageTools::process($icon, false, 'donoricon', $userId),
                 'UTF-8'
             );
         }));
 
-        $twig->addFunction(new \Twig\TwigFunction('privilege', function ($default, $config, $key) {
+        $Twig->addFunction(new \Twig\TwigFunction('privilege', function ($default, $config, $key) {
             return new \Twig\Markup(
                 (
                     $default
@@ -197,14 +209,14 @@ class Twig
             );
         }));
 
-        $twig->addFunction(new \Twig\TwigFunction('ratio', function ($up, $down) {
+        $Twig->addFunction(new \Twig\TwigFunction('ratio', function ($up, $down) {
             return new \Twig\Markup(
                 \Format::get_ratio_html($up, $down),
                 'UTF-8'
             );
         }));
 
-        $twig->addFunction(new \Twig\TwigFunction('resolveCountryIpv4', function ($addr) {
+        $Twig->addFunction(new \Twig\TwigFunction('resolveCountryIpv4', function ($addr) {
             return new \Twig\Markup(
                 (function ($ip) {
                     static $cache = [];
@@ -225,7 +237,7 @@ class Twig
             );
         }));
 
-        $twig->addFunction(new \Twig\TwigFunction('resolveIpv4', function ($addr) {
+        $Twig->addFunction(new \Twig\TwigFunction('resolveIpv4', function ($addr) {
             return new \Twig\Markup(
                 (function ($ip) {
                     if (!$ip) {
@@ -244,19 +256,19 @@ class Twig
             );
         }));
 
-        $twig->addFunction(new \Twig\TwigFunction('shorten', function ($text, $length) {
+        $Twig->addFunction(new \Twig\TwigFunction('shorten', function ($text, $length) {
             return new \Twig\Markup(
                 shortenString($text, $length),
                 'UTF-8'
             );
         }));
 
-        $twig->addTest(
+        $Twig->addTest(
             new \Twig\TwigTest('numeric', function ($value) {
                 return is_numeric($value);
             })
         );
 
-        return $twig;
+        return $Twig;
     }
 }

sections/legal/index.php

@@ -1,18 +1,25 @@
 <?php
 declare(strict_types=1);
 
+$Twig = Twig::go();
 $p = $_GET['p'];
 
 switch ($p) {
     case 'privacy':
-        require_once 'privacy.php';
+        View::show_header('Privacy');
+        echo $Twig->render('legal/privacy.html');
+        View::show_footer();
         break;
     
     case 'dmca':
-        require_once 'dmca.php';
+        View::show_header('DMCA');
+        echo $Twig->render('legal/dmca.html');
+        View::show_footer();
         break;
     
     default:
+        View::show_header('404 Not Found');
         error(404);
+        View::show_footer();
         break;
 }

sections/tools/data/registration_log.php

@@ -53,7 +53,7 @@ $RS = "
     im.Enabled,
     ii.Donor,
     ii.Warned,
-    ii.JoinDate,
+    ii.JoinDate
   FROM users_main AS m
     LEFT JOIN users_info AS i ON i.UserID = m.ID
     LEFT JOIN users_main AS im ON i.Inviter = im.ID

sections/legal/dmca.php → templates/legal/dmca.html

@@ -1,8 +1,3 @@
-<?php
-declare(strict_types=1);
-
-View::show_header('DMCA'); ?>
-
 <h2>DMCA Information</h2>
 
 <section class="tldr">
@@ -37,7 +32,6 @@ View::show_header('DMCA'); ?>
       that you're authorized to act on behalf of an allegedly infringed exclusive right.
     </li>
 
-
     <li>
       Your physical or electronic signature, or of someone authorized to act on your behalf.
     </li>
@@ -53,45 +47,6 @@ View::show_header('DMCA'); ?>
     Omics Tools LLC reserves the right to ignore requests for unregistered works.
   </p>
 
-  <?php
-  /*
-  <p>
-    Circumstances that may delay processing, including not limited:
-  </p>
-
-  <ul class="p">
-    <li>
-      URI formulations that violate BioTorrents.de's normal access rules,
-      e.g., unsecured HTTP, <em>or</em> requests that fail to identify specific pieces of UGC.
-    </li>
-
-    <li>
-      Generic or boilerplate statements.
-      Neither statement should contain passages with quoted online search results.
-    </li>
-
-    <li>
-      Requests signed by other means than Ed25519 or RSA 4096,
-      or encoded in other formats than UTF-8 or ASCII.
-    </li>
-
-    <li>
-      PO boxes, addresses outside the U.S., or addresses that can't accept USPS Certified Mail.
-      VoIP telephone numbers or numbers without a <code>+1</code> country code.
-    </li>
-
-    <li>
-      Email servers that don't comply with at least two of:
-      <a href="https://tools.ietf.org/html/rfc7208">RFC 7208 (SPF)</a>,
-      <a href="https://tools.ietf.org/html/rfc8463">RFC 8463 (DKIM)</a>, and
-      <a href="https://tools.ietf.org/html/rfc7489">RFC 7489 (DMARC)</a>.
-      Requests from free mailboxes such as Gmail, ProtonMail, etc.
-      Any email that violates
-      <a href="https://www.law.cornell.edu/uscode/text/15/7704">15 USC 7704(a)</a>.
-    </li>
-  </ul>
-  */ ?>
-
   <p>
     We'll expeditiously disable access to the targets of valid requests.
     Our agent to receive notifications of claimed infringement is:
@@ -132,5 +87,3 @@ View::show_header('DMCA'); ?>
     if you wish.
   </p>
 </section>
-
-<?php View::show_footer();

sections/legal/privacy.php → templates/legal/privacy.html

@@ -1,8 +1,3 @@
-<?php
-declare(strict_types=1);
-
-View::show_header('Privacy'); ?>
-
 <h2>Privacy Policy</h2>
 
 <section class="tldr">
@@ -97,6 +92,7 @@ View::show_header('Privacy'); ?>
   </p>
 
   <p>
+    We don't store IP address, geolocation, passphrase, or passkey history.
     Note that we may need to keep data for archiving purposes.
   </p>
 
@@ -192,7 +188,7 @@ View::show_header('Privacy'); ?>
   </h3>
 
   <p>
-    We last updated this policy on 2021-02-13.
+    We last updated this policy on 2021-07-14.
   </p>
 
 
@@ -233,5 +229,3 @@ View::show_header('Privacy'); ?>
     if you wish.
   </p>
 </section>
-
-<?php View::show_footer();

templates/torrent_form/version.html

@@ -14,6 +14,6 @@
       value="{{ version }}"
     />
 
-    <p>{{ note }}}}</p>
+    <p>{{ note }}</p>
   </td>
 </tr>

templates/upload/result_warnings.twig

@@ -1,10 +0,0 @@
-<h1>Warning</h1>
-<p><strong>Your torrent has been uploaded; however, you must download your torrent from <a href="torrents.php?id={{ group_id }}">here</a> because:</strong></p>
-<ul>
-{% if public %}
-    <li><strong>You didn't make your torrent using the "private" option</strong></li>
-{% endif %}
-{% if unsourced %}
-    <li><strong>The "source" flag was not set to OPS. Please read the <a href="/wiki.php?action=article&id={{ source_flag_wiki_id }}">wiki page about source flags</a> to find out why this is important. </strong></li>
-{% endif %}
-</ul>