Prep for public tracker and web seed support

classes/bencode.class.php

@@ -1,96 +1,104 @@
-<?
+<?php
 /**
  * If we're running a 32bit PHP version, we use small objects to store ints.
  * Overhead from the function calls is small enough to not worry about
  */
-class Int64 {
-  private $Num;
+class Int64
+{
+    private $Num;
 
-  public function __construct($Val) {
-    $this->Num = $Val;
-  }
+    public function __construct($Val)
+    {
+        $this->Num = $Val;
+    }
 
-  public static function make($Val) {
-    return PHP_INT_SIZE === 4 ? new Int64($Val) : (int)$Val;
-  }
+    public static function make($Val)
+    {
+        return PHP_INT_SIZE === 4 ? new Int64($Val) : (int)$Val;
+    }
 
-  public static function get($Val) {
-    return PHP_INT_SIZE === 4 ? $Val->Num : $Val;
-  }
+    public static function get($Val)
+    {
+        return PHP_INT_SIZE === 4 ? $Val->Num : $Val;
+    }
 
-  public static function is_int($Val) {
-    return is_int($Val) || (is_object($Val) && get_class($Val) === 'Int64');
-  }
+    public static function is_int($Val)
+    {
+        return is_int($Val) || (is_object($Val) && get_class($Val) === 'Int64');
+    }
 }
 
 /**
  * The encode class is simple and straightforward. The only thing to
  * note is that empty dictionaries are represented by boolean trues
  */
-class Bencode {
-  private $DefaultKeys = array( // Get rid of everything except these keys to save some space
+class Bencode
+{
+    private $DefaultKeys = array( // Get rid of everything except these keys to save some space
       'created by', 'creation date', 'encoding', 'info', 'comment');
-  private $Data;
-  public $Enc;
+    private $Data;
+    public $Enc;
 
-  /**
-   * Encode an arbitrary array (usually one that's just been decoded)
-   *
-   * @param array $Arg the thing to encode
-   * @param mixed $Keys string or array with keys in the input array to encode or true to encode everything
-   * @return bencoded string representing the content of the input array
-   */
-  public function encode($Arg = false, $Keys = false) {
-    if ($Arg === false) {
-      $Data =& $this->Dec;
-    } else {
-      $Data =& $Arg;
+    /**
+     * Encode an arbitrary array (usually one that's just been decoded)
+     *
+     * @param array $Arg the thing to encode
+     * @param mixed $Keys string or array with keys in the input array to encode or true to encode everything
+     * @return bencoded string representing the content of the input array
+     */
+    public function encode($Arg = false, $Keys = false)
+    {
+        if ($Arg === false) {
+            $Data =& $this->Dec;
+        } else {
+            $Data =& $Arg;
+        }
+        if ($Keys === true) {
+            $this->Data = $Data;
+        } elseif ($Keys === false) {
+            $this->Data = array_intersect_key($Data, array_flip($this->DefaultKeys));
+        } elseif (is_array($Keys)) {
+            $this->Data = array_intersect_key($Data, array_flip($Keys));
+        } else {
+            $this->Data = isset($Data[$Keys]) ? $Data[$Keys] : false;
+        }
+        if (!$this->Data) {
+            return false;
+        }
+        $this->Enc = $this->_benc();
+        return $this->Enc;
     }
-    if ($Keys === true) {
-      $this->Data = $Data;
-    } elseif ($Keys === false) {
-      $this->Data = array_intersect_key($Data, array_flip($this->DefaultKeys));
-    } elseif (is_array($Keys)) {
-      $this->Data = array_intersect_key($Data, array_flip($Keys));
-    } else {
-      $this->Data = isset($Data[$Keys]) ? $Data[$Keys] : false;
-    }
-    if (!$this->Data) {
-      return false;
-    }
-    $this->Enc = $this->_benc();
-    return $this->Enc;
-  }
 
-  /**
-   * Internal encoding function that does the actual job
-   *
-   * @return bencoded string
-   */
-  private function _benc() {
-    if (!is_array($this->Data)) {
-      if (Int64::is_int($this->Data)) { // Integer
-        return 'i'.Int64::get($this->Data).'e';
-      }
-      if ($this->Data === true) { // Empty dictionary
-        return 'de';
-      }
-      return strlen($this->Data).':'.$this->Data; // String
-    }
-    if (empty($this->Data) || Int64::is_int(key($this->Data))) {
-      $IsDict = false;
-    } else {
-      $IsDict = true;
-      ksort($this->Data); // Dictionaries must be sorted
-    }
-    $Ret = $IsDict ? 'd' : 'l';
-    foreach ($this->Data as $Key => $Value) {
-      if ($IsDict) {
-        $Ret .= strlen($Key).':'.$Key;
-      }
-      $this->Data = $Value;
-      $Ret .= $this->_benc();
+    /**
+     * Internal encoding function that does the actual job
+     *
+     * @return bencoded string
+     */
+    private function _benc()
+    {
+        if (!is_array($this->Data)) {
+            if (Int64::is_int($this->Data)) { // Integer
+                return 'i'.Int64::get($this->Data).'e';
+            }
+            if ($this->Data === true) { // Empty dictionary
+                return 'de';
+            }
+            return strlen($this->Data).':'.$this->Data; // String
+        }
+        if (empty($this->Data) || Int64::is_int(key($this->Data))) {
+            $IsDict = false;
+        } else {
+            $IsDict = true;
+            ksort($this->Data); // Dictionaries must be sorted
+        }
+        $Ret = $IsDict ? 'd' : 'l';
+        foreach ($this->Data as $Key => $Value) {
+            if ($IsDict) {
+                $Ret .= strlen($Key).':'.$Key;
+            }
+            $this->Data = $Value;
+            $Ret .= $this->_benc();
+        }
+        return $Ret.'e';
     }
-    return $Ret.'e';
-  }
 }

classes/bencodedecode.class.php

@@ -1,94 +1,99 @@
-<?
+<?php
 /**
  * The decode class is simple and straightforward. The only thing to
  * note is that empty dictionaries are represented by boolean trues
  */
-class BencodeDecode extends Bencode {
-  private $Data;
-  private $Length;
-  private $Pos = 0;
-  public $Dec = [];
-  public $ExitOnError = true;
-  const SnipLength = 40;
+class BencodeDecode extends Bencode
+{
+    private $Data;
+    private $Length;
+    private $Pos = 0;
+    public $Dec = [];
+    public $ExitOnError = true;
+    const SnipLength = 40;
 
-  /**
-   * Decode prepararations
-   *
-   * @param string $Arg bencoded string or path to bencoded file to decode
-   * @param bool $IsPath needs to be true if $Arg is a path
-   * @return decoded data with a suitable structure
-   */
-  function __construct($Arg = false, $IsPath = false, $Strict = true) {
-    if (!$Strict) {
-      $this->ExitOnError = false;
-    }
-    if ($Arg === false) {
-      if (empty($this->Enc)) {
-        return false;
-      }
-    } else {
-      if ($IsPath === true) {
-        return $this->bdec_file($Arg);
-      }
-      $this->Data = $Arg;
+    /**
+     * Decode prepararations
+     *
+     * @param string $Arg bencoded string or path to bencoded file to decode
+     * @param bool $IsPath needs to be true if $Arg is a path
+     * @return decoded data with a suitable structure
+     */
+    public function __construct($Arg = false, $IsPath = false, $Strict = true)
+    {
+        if (!$Strict) {
+            $this->ExitOnError = false;
+        }
+        if ($Arg === false) {
+            if (empty($this->Enc)) {
+                return false;
+            }
+        } else {
+            if ($IsPath === true) {
+                return $this->bdec_file($Arg);
+            }
+            $this->Data = $Arg;
+        }
+        return $this->decode();
     }
-    return $this->decode();
-  }
 
-  /**
-   * Decodes a bencoded file
-   *
-   * @param $Path path to bencoded file to decode
-   * @return decoded data with a suitable structure
-   */
-  public function bdec_file($Path = false) {
-    if (empty($Path)) {
-      return false;
-    }
-    if (!$this->Data = @file_get_contents($Path, FILE_BINARY)) {
-      return $this->error("Error: file '$Path' could not be opened.\n");
+    /**
+     * Decodes a bencoded file
+     *
+     * @param $Path path to bencoded file to decode
+     * @return decoded data with a suitable structure
+     */
+    public function bdec_file($Path = false)
+    {
+        if (empty($Path)) {
+            return false;
+        }
+        if (!$this->Data = @file_get_contents($Path, FILE_BINARY)) {
+            return $this->error("Error: file '$Path' could not be opened.\n");
+        }
+        return $this->decode();
     }
-    return $this->decode();
-  }
 
-  /**
-   * Decodes a string with bencoded data
-   *
-   * @param mixed $Arg bencoded data or false to decode the content of $this->Data
-   * @return decoded data with a suitable structure
-   */
-  public function decode($Arg = false) {
-    if ($Arg !== false) {
-      $this->Data = $Arg;
-    } elseif (!$this->Data) {
-      $this->Data = $this->Enc;
-    }
-    if (!$this->Data) {
-      return false;
-    }
-    $this->Length = strlen($this->Data);
-    $this->Pos = 0;
-    $this->Dec = $this->_bdec();
-    if ($this->Pos < $this->Length) {
-      // Not really necessary, but if the torrent is invalid, it's better to warn than to silently truncate it
-      return $this->error();
+    /**
+     * Decodes a string with bencoded data
+     *
+     * @param mixed $Arg bencoded data or false to decode the content of $this->Data
+     * @return decoded data with a suitable structure
+     */
+    public function decode($Arg = false)
+    {
+        if ($Arg !== false) {
+            $this->Data = $Arg;
+        } elseif (!$this->Data) {
+            $this->Data = $this->Enc;
+        }
+        if (!$this->Data) {
+            return false;
+        }
+        $this->Length = strlen($this->Data);
+        $this->Pos = 0;
+        $this->Dec = $this->_bdec();
+        if ($this->Pos < $this->Length) {
+            // Not really necessary, but if the torrent is invalid, it's better to warn than to silently truncate it
+            return $this->error();
+        }
+        return $this->Dec;
     }
-    return $this->Dec;
-  }
 
-  /**
-   * Internal decoding function that does the actual job
-   *
-   * @return decoded data with a suitable structure
-   */
-  private function _bdec() {
-    switch ($this->Data[$this->Pos]) {
+    /**
+     * Internal decoding function that does the actual job
+     *
+     * @return decoded data with a suitable structure
+     */
+    private function _bdec()
+    {
+        switch ($this->Data[$this->Pos]) {
 
       case 'i':
         $this->Pos++;
         $Value = substr($this->Data, $this->Pos, strpos($this->Data, 'e', $this->Pos) - $this->Pos);
         if (!ctype_digit($Value) && !($Value[0] == '-' && ctype_digit(substr($Value, 1)))) {
-          return $this->error();
+            return $this->error();
         }
         $this->Pos += strlen($Value) + 1;
         return Int64::make($Value);
@@ -97,10 +102,10 @@ class BencodeDecode extends Bencode {
         $Value = [];
         $this->Pos++;
         while ($this->Data[$this->Pos] != 'e') {
-          if ($this->Pos >= $this->Length) {
-            return $this->error();
-          }
-          $Value[] = $this->_bdec();
+            if ($this->Pos >= $this->Length) {
+                return $this->error();
+            }
+            $Value[] = $this->_bdec();
         }
         $this->Pos++;
         return $Value;
@@ -109,16 +114,16 @@ class BencodeDecode extends Bencode {
         $Value = [];
         $this->Pos++;
         while ($this->Data[$this->Pos] != 'e') {
-          $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos);
-          if (!ctype_digit($Length)) {
-            return $this->error();
-          }
-          $this->Pos += strlen($Length) + $Length + 1;
-          $Key = substr($this->Data, $this->Pos - $Length, $Length);
-          if ($this->Pos >= $this->Length) {
-            return $this->error();
-          }
-          $Value[$Key] = $this->_bdec();
+            $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos);
+            if (!ctype_digit($Length)) {
+                return $this->error();
+            }
+            $this->Pos += strlen($Length) + $Length + 1;
+            $Key = substr($this->Data, $this->Pos - $Length, $Length);
+            if ($this->Pos >= $this->Length) {
+                return $this->error();
+            }
+            $Value[$Key] = $this->_bdec();
         }
         $this->Pos++;
         // Use boolean true to keep track of empty dictionaries
@@ -127,61 +132,66 @@ class BencodeDecode extends Bencode {
       default:
         $Length = substr($this->Data, $this->Pos, strpos($this->Data, ':', $this->Pos) - $this->Pos);
         if (!ctype_digit($Length)) {
-          return $this->error(); // Even if the string is likely to be decoded correctly without this check, it's malformed
+            return $this->error(); // Even if the string is likely to be decoded correctly without this check, it's malformed
         }
         $this->Pos += strlen($Length) + $Length + 1;
         return substr($this->Data, $this->Pos - $Length, $Length);
     }
-  }
-
-  /**
-   * Convert everything to the correct data types and optionally escape strings
-   *
-   * @param bool $Escape whether to escape the textual data
-   * @param mixed $Data decoded data or false to use the $Dec property
-   * @return decoded data with more useful data types
-   */
-  public function dump($Escape = true, $Data = false) {
-    if ($Data === false) {
-      $Data = $this->Dec;
-    }
-    if (Int64::is_int($Data)) {
-      return Int64::get($Data);
     }
-    if (is_bool($Data)) {
-      return [];
-    }
-    if (is_array($Data)) {
-      $Output = [];
-      foreach ($Data as $Key => $Val) {
-        $Output[$Key] = $this->dump($Escape, $Val);
-      }
-      return $Output;
-    }
-    return $Escape ? htmlentities($Data) : $Data;
-  }
 
-  /**
-   * Display an error and halt the operation unless the $ExitOnError property is false
-   *
-   * @param string $ErrMsg the error message to display
-   */
-  private function error($ErrMsg = false) {
-    static $ErrorPos;
-    if ($this->Pos === $ErrorPos) {
-      // The recursive nature of the class requires this to avoid duplicate error messages
-      return false;
+    /**
+     * Convert everything to the correct data types and optionally escape strings
+     *
+     * @param bool $Escape whether to escape the textual data
+     * @param mixed $Data decoded data or false to use the $Dec property
+     * @return decoded data with more useful data types
+     */
+    public function dump($Escape = true, $Data = false)
+    {
+        if ($Data === false) {
+            $Data = $this->Dec;
+        }
+        if (Int64::is_int($Data)) {
+            return Int64::get($Data);
+        }
+        if (is_bool($Data)) {
+            return [];
+        }
+        if (is_array($Data)) {
+            $Output = [];
+            foreach ($Data as $Key => $Val) {
+                $Output[$Key] = $this->dump($Escape, $Val);
+            }
+            return $Output;
+        }
+        return $Escape ? htmlentities($Data) : $Data;
     }
-    if ($this->ExitOnError) {
-      if ($ErrMsg === false) {
-        printf("Malformed string. Invalid character at pos 0x%X: %s\n",
-            $this->Pos, str_replace(array("\r","\n"), array('',' '), htmlentities(substr($this->Data, $this->Pos, self::SnipLength))));
-      } else {
-        echo $ErrMsg;
-      }
-      exit();
+
+    /**
+     * Display an error and halt the operation unless the $ExitOnError property is false
+     *
+     * @param string $ErrMsg the error message to display
+     */
+    private function error($ErrMsg = false)
+    {
+        static $ErrorPos;
+        if ($this->Pos === $ErrorPos) {
+            // The recursive nature of the class requires this to avoid duplicate error messages
+            return false;
+        }
+        if ($this->ExitOnError) {
+            if ($ErrMsg === false) {
+                printf(
+                    "Malformed string. Invalid character at pos 0x%X: %s\n",
+                    $this->Pos,
+                    str_replace(array("\r","\n"), array('',' '), htmlentities(substr($this->Data, $this->Pos, self::SnipLength)))
+                );
+            } else {
+                echo $ErrMsg;
+            }
+            exit();
+        }
+        $ErrorPos = $this->Pos;
+        return false;
     }
-    $ErrorPos = $this->Pos;
-    return false;
-  }
 }

classes/bencodetorrent.class.php

@@ -1,158 +1,171 @@
-<?
+<?php
 /**
  * Torrent class that contains some convenient functions related to torrent meta data
  */
-class BencodeTorrent extends BencodeDecode {
-  private $PathKey = 'path';
-  public $Files = [];
-  public $Size = 0;
+class BencodeTorrent extends BencodeDecode
+{
+    private $PathKey = 'path';
+    public $Files = [];
+    public $Size = 0;
 
-  /**
-   * Create a list of the files in the torrent and their sizes as well as the total torrent size
-   *
-   * @return array with a list of files and file sizes
-   */
-  public function file_list() {
-    if (empty($this->Dec)) {
-      return false;
-    }
-    $InfoDict =& $this->Dec['info'];
-    if (!isset($InfoDict['files'])) {
-      // Single-file torrent
-      $this->Size = (Int64::is_int($InfoDict['length'])
+    /**
+     * Create a list of the files in the torrent and their sizes as well as the total torrent size
+     *
+     * @return array with a list of files and file sizes
+     */
+    public function file_list()
+    {
+        if (empty($this->Dec)) {
+            return false;
+        }
+        $InfoDict =& $this->Dec['info'];
+        if (!isset($InfoDict['files'])) {
+            // Single-file torrent
+            $this->Size = (Int64::is_int($InfoDict['length'])
         ? Int64::get($InfoDict['length'])
         : $InfoDict['length']);
-      $Name = (isset($InfoDict['name.utf-8'])
+            $Name = (isset($InfoDict['name.utf-8'])
         ? $InfoDict['name.utf-8']
         : $InfoDict['name']);
-      $this->Files[] = array($this->Size, $Name);
-    } else {
-      if (isset($InfoDict['path.utf-8']['files'][0])) {
-        $this->PathKey = 'path.utf-8';
-      }
-      foreach ($InfoDict['files'] as $File) {
-        $TmpPath = [];
-        foreach ($File[$this->PathKey] as $SubPath) {
-          $TmpPath[] = $SubPath;
-        }
-        $CurSize = (Int64::is_int($File['length'])
+            $this->Files[] = array($this->Size, $Name);
+        } else {
+            if (isset($InfoDict['path.utf-8']['files'][0])) {
+                $this->PathKey = 'path.utf-8';
+            }
+            foreach ($InfoDict['files'] as $File) {
+                $TmpPath = [];
+                foreach ($File[$this->PathKey] as $SubPath) {
+                    $TmpPath[] = $SubPath;
+                }
+                $CurSize = (Int64::is_int($File['length'])
           ? Int64::get($File['length'])
           : $File['length']);
-        $this->Files[] = array($CurSize, implode('/', $TmpPath));
-        $this->Size += $CurSize;
-      }
-      uasort($this->Files, function($a, $b) {
-          return strnatcasecmp($a[1], $b[1]);
-        });
+                $this->Files[] = array($CurSize, implode('/', $TmpPath));
+                $this->Size += $CurSize;
+            }
+            uasort($this->Files, function ($a, $b) {
+                return strnatcasecmp($a[1], $b[1]);
+            });
+        }
+        return array($this->Size, $this->Files);
     }
-    return array($this->Size, $this->Files);
-  }
 
-  /**
-   * Find out the name of the torrent
-   *
-   * @return string torrent name
-   */
-  public function get_name() {
-    if (empty($this->Dec)) {
-      return false;
-    }
-    if (isset($this->Dec['info']['name.utf-8'])) {
-      return $this->Dec['info']['name.utf-8'];
+    /**
+     * Find out the name of the torrent
+     *
+     * @return string torrent name
+     */
+    public function get_name()
+    {
+        if (empty($this->Dec)) {
+            return false;
+        }
+        if (isset($this->Dec['info']['name.utf-8'])) {
+            return $this->Dec['info']['name.utf-8'];
+        }
+        return $this->Dec['info']['name'];
     }
-    return $this->Dec['info']['name'];
-  }
 
-  /**
-   * Find out the total size of the torrent
-   *
-   * @return string torrent size
-   */
-  public function get_size() {
-    if (empty($this->Files)) {
-      if (empty($this->Dec)) {
-        return false;
-      }
-      $FileList = $this->file_list();
+    /**
+     * Find out the total size of the torrent
+     *
+     * @return string torrent size
+     */
+    public function get_size()
+    {
+        if (empty($this->Files)) {
+            if (empty($this->Dec)) {
+                return false;
+            }
+            $FileList = $this->file_list();
+        }
+        return $FileList[0];
     }
-    return $FileList[0];
-  }
 
-  /**
-   * Checks if the "private" flag is present in the torrent
-   *
-   * @return true if the "private" flag is set
-   */
-  public function is_private() {
-    if (empty($this->Dec)) {
-      return false;
-    }
-    return isset($this->Dec['info']['private']) && Int64::get($this->Dec['info']['private']) == 1;
-  }
-  /**
-   * Add the "private" flag to the torrent
-   *
-   * @return true if a change was required
-   */
-  public function make_private() {
-    if (empty($this->Dec)) {
-      return false;
+    /**
+     * Checks if the "private" flag is present in the torrent
+     *
+     * @return true if the "private" flag is set
+     */
+    public function is_private()
+    {
+        if (empty($this->Dec)) {
+            return false;
+        }
+        return isset($this->Dec['info']['private']) && Int64::get($this->Dec['info']['private']) == 1;
     }
-    if ($this->is_private()) {
-      return false;
+    
+    /**
+     * Add the "private" flag to the torrent
+     *
+     * @return true if a change was required
+     */
+    public function make_private()
+    {
+        if (empty($this->Dec)) {
+            return false;
+        }
+        if ($this->is_private()) {
+            return false;
+        }
+        $this->Dec['info']['private'] = Int64::make(1);
+        ksort($this->Dec['info']);
+        return true;
     }
-    $this->Dec['info']['private'] = Int64::make(1);
-    ksort($this->Dec['info']);
-    return true;
-  }
 
-  /**
-   * Add the "source" field to the torrent
-   *
-   * @return true if a change was required
-   */
-  public function make_sourced() {
-    $Sources = Users::get_upload_sources();
-    if (empty($this->Dec)) { return false; }
-    if (isset($this->Dec['info']['source']) && ($this->Dec['info']['source'] == $Sources[0] || $this->Dec['info']['source'] == $Sources[1])) {
-      return false;
+    /**
+     * Add the "source" field to the torrent
+     *
+     * @return true if a change was required
+     */
+    public function make_sourced()
+    {
+        $Sources = Users::get_upload_sources();
+        if (empty($this->Dec)) {
+            return false;
+        }
+        if (isset($this->Dec['info']['source']) && ($this->Dec['info']['source'] == $Sources[0] || $this->Dec['info']['source'] == $Sources[1])) {
+            return false;
+        }
+        $this->Dec['info']['source'] = $Sources[0];
+        ksort($this->Dec['info']);
+        return true;
     }
-    $this->Dec['info']['source'] = $Sources[0];
-    ksort($this->Dec['info']);
-    return true;
-  }
 
-  /**
-   * Calculate the torrent's info hash
-   *
-   * @return info hash in hexadecimal form
-   */
-  public function info_hash() {
-    if (empty($this->Dec) || !isset($this->Dec['info'])) {
-      return false;
+    /**
+     * Calculate the torrent's info hash
+     *
+     * @return info hash in hexadecimal form
+     */
+    public function info_hash()
+    {
+        if (empty($this->Dec) || !isset($this->Dec['info'])) {
+            return false;
+        }
+        return sha1($this->encode(false, 'info'));
     }
-    return sha1($this->encode(false, 'info'));
-  }
 
-  /**
-   * Add the announce URL to a torrent
-   */
-  public static function add_announce_url($Data, $Url) {
-    return 'd8:announce'.strlen($Url).':'.$Url.substr($Data, 1);
-  }
+    /**
+     * Add the announce URL to a torrent
+     */
+    public static function add_announce_url($Data, $Url)
+    {
+        return 'd8:announce'.strlen($Url).':'.$Url.substr($Data, 1);
+    }
 
-  /**
-   * Add list of announce URLs to a torrent
-   */
-  public static function add_announce_list($Data, $Urls) {
-    $r = 'd13:announce-listl';
-    for ($i = 0; $i < count($Urls); $i++) {
-      $r .= 'l';
-      for ($j = 0; $j < count($Urls[$i]); $j++) {
-        $r .= strlen($Urls[$i][$j]).':'.$Urls[$i][$j];
-      }
-      $r .= 'e';
+    /**
+     * Add list of announce URLs to a torrent
+     */
+    public static function add_announce_list($Data, $Urls)
+    {
+        $r = 'd13:announce-listl';
+        for ($i = 0; $i < count($Urls); $i++) {
+            $r .= 'l';
+            for ($j = 0; $j < count($Urls[$i]); $j++) {
+                $r .= strlen($Urls[$i][$j]).':'.$Urls[$i][$j];
+            }
+            $r .= 'e';
+        }
+        return $r.'e'.substr($Data, 1);
     }
-    return $r.'e'.substr($Data, 1);
-  }
 }

static/styles/oppai/style.css

@@ -310,7 +310,7 @@ ul.thin li { margin:0px 0px; padding:0px; }
   border: 1px solid transparent;
   box-sizing: border-box;
   padding: 2px 2px 2px 4px;
-  font-size: 0.9em;
+  /* font-size: 0.9em; */
   background-color: white;
   width: 100%;
   color: black;
@@ -371,11 +371,10 @@ ul.thin li { margin:0px 0px; padding:0px; }
   text-align: center;
   color: black;
   font-weight: bold;
-  font-size: 0.95em;
+  /* font-size: 0.95em; */
   width: 350px;
-  margin: 0 auto 0px auto;
+  margin: 2em auto;
   padding: 10px;
-  margin-bottom: 8px;
 }
 .alertbar.warning {
   background-color: #ffe68a;
@@ -618,7 +617,7 @@ table.slice {
 }
 
 .error_message {
-  padding: 8px 0px;
+  padding: 10px;
   background-color: #AF2525;
   text-align: center;
   color: white;
@@ -626,10 +625,12 @@ table.slice {
 }
 
 .save_message {
-  padding: 8px 0px;
-  background-color: #F8C2E8;
+  padding: 10px;
+  width: 50%;
+  margin: 2em auto;
+  background: #fbe180;
   text-align: center;
-  color: #555555;
+  color: black;
   font-weight: bold;
 }