Upload files to 'classes'

classes/wiki.class.php

@@ -1,65 +1,71 @@
-<?
-class Wiki {
-  /**
-   * Normalize an alias
-   * @param string $str
-   * @return string
-   */
-  public static function normalize_alias($str) {
-    return trim(substr(preg_replace('/[^a-z0-9]/', '', strtolower(htmlentities($str))), 0, 50));
-  }
+<?php
+class Wiki
+{
+    /**
+     * Normalize an alias
+     * @param string $str
+     * @return string
+     */
+    public static function normalize_alias($str)
+    {
+        return trim(substr(preg_replace('/[^a-z0-9]/', '', strtolower(htmlentities($str))), 0, 50));
+    }
 
-  /**
-   * Get all aliases in an associative array of Alias => ArticleID
-   * @return array
-   */
-  public static function get_aliases() {
-    $Aliases = G::$Cache->get_value('wiki_aliases');
-    if (!$Aliases) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    /**
+     * Get all aliases in an associative array of Alias => ArticleID
+     * @return array
+     */
+    public static function get_aliases()
+    {
+        $Aliases = G::$Cache->get_value('wiki_aliases');
+        if (!$Aliases) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT Alias, ArticleID
         FROM wiki_aliases");
-      $Aliases = G::$DB->to_pair('Alias', 'ArticleID');
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('wiki_aliases', $Aliases, 3600 * 24 * 14); // 2 weeks
+            $Aliases = G::$DB->to_pair('Alias', 'ArticleID');
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value('wiki_aliases', $Aliases, 3600 * 24 * 14); // 2 weeks
+        }
+        return $Aliases;
     }
-    return $Aliases;
-  }
 
-  /**
-   * Flush the alias cache. Call this whenever you touch the wiki_aliases table.
-   */
-  public static function flush_aliases() {
-    G::$Cache->delete_value('wiki_aliases');
-  }
+    /**
+     * Flush the alias cache. Call this whenever you touch the wiki_aliases table.
+     */
+    public static function flush_aliases()
+    {
+        G::$Cache->delete_value('wiki_aliases');
+    }
 
-  /**
-   * Get the ArticleID corresponding to an alias
-   * @param string $Alias
-   * @return int
-   */
-  public static function alias_to_id($Alias) {
-    $Aliases = self::get_aliases();
-    $Alias = self::normalize_alias($Alias);
-    if (!isset($Aliases[$Alias])) {
-      return false;
-    } else {
-      return (int)$Aliases[$Alias];
+    /**
+     * Get the ArticleID corresponding to an alias
+     * @param string $Alias
+     * @return int
+     */
+    public static function alias_to_id($Alias)
+    {
+        $Aliases = self::get_aliases();
+        $Alias = self::normalize_alias($Alias);
+        if (!isset($Aliases[$Alias])) {
+            return false;
+        } else {
+            return (int)$Aliases[$Alias];
+        }
     }
-  }
 
-  /**
-   * Get an article; returns false on error if $Error = false
-   * @param int $ArticleID
-   * @param bool $Error
-   * @return array|bool
-   */
-  public static function get_article($ArticleID, $Error = true) {
-    $Contents = G::$Cache->get_value('wiki_article_'.$ArticleID);
-    if (!$Contents) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    /**
+     * Get an article; returns false on error if $Error = false
+     * @param int $ArticleID
+     * @param bool $Error
+     * @return array|bool
+     */
+    public static function get_article($ArticleID, $Error = true)
+    {
+        $Contents = G::$Cache->get_value('wiki_article_'.$ArticleID);
+        if (!$Contents) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           w.Revision,
           w.Title,
@@ -76,25 +82,26 @@ class Wiki {
           LEFT JOIN users_main AS u ON u.ID=w.Author
         WHERE w.ID='$ArticleID'
         GROUP BY w.ID");
-      if (!G::$DB->has_results()) {
-        if ($Error) {
-          error(404);
-        } else {
-          return false;
+            if (!G::$DB->has_results()) {
+                if ($Error) {
+                    error(404);
+                } else {
+                    return false;
+                }
+            }
+            $Contents = G::$DB->to_array();
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value('wiki_article_'.$ArticleID, $Contents, 3600 * 24 * 14); // 2 weeks
         }
-      }
-      $Contents = G::$DB->to_array();
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('wiki_article_'.$ArticleID, $Contents, 3600 * 24 * 14); // 2 weeks
+        return $Contents;
     }
-    return $Contents;
-  }
 
-  /**
-   * Flush an article's cache. Call this whenever you edited a wiki article or its aliases.
-   * @param int $ArticleID
-   */
-  public static function flush_article($ArticleID) {
-    G::$Cache->delete_value('wiki_article_'.$ArticleID);
-  }
+    /**
+     * Flush an article's cache. Call this whenever you edited a wiki article or its aliases.
+     * @param int $ArticleID
+     */
+    public static function flush_article($ArticleID)
+    {
+        G::$Cache->delete_value('wiki_article_'.$ArticleID);
+    }
 }

classes/zip.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 /*************************************************************************|
 |--------------- Zip class -----------------------------------------------|
 |*************************************************************************|
@@ -74,97 +74,102 @@ http://www.fileformat.info/tool/hexdump.htm - Useful for analyzing ZIP files
 |*************************************************************************/
 
 if (!extension_loaded('zlib')) {
-  error('Zlib Extension not loaded.');
+    error('Zlib Extension not loaded.');
 }
 
-class Zip {
-  public $ArchiveSize = 0; // Total size
-  public $ArchiveFiles = 0; // Total files
-  private $Structure = ''; // Structure saved to memory
-  private $FileOffset = 0; // Offset to write data
-  private $Data = ''; //An idea
-
-  public function __construct ($ArchiveName = 'Archive') {
-    header("Content-type: application/octet-stream"); // Stream download
-    header("Content-disposition: attachment; filename=\"$ArchiveName.zip\""); // Name the archive - Should not be urlencoded
-  }
-
-  public static function unlimit () {
-    ob_end_clean();
-    set_time_limit(3600); // Limit 1 hour
-    ini_set('memory_limit', '1024M'); // Because the buffers can get extremely large
-  }
-
-  public function add_file ($FileData, $ArchivePath, $TimeStamp = 0) {
-    /* File header */
-    $this->Data = "\x50\x4b\x03\x04"; // PK signature
-    $this->Data .= "\x14\x00"; // Version requirements
-    $this->Data .= "\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
-    $this->Data .= "\x08\x00"; // Compression
-    $this->Data .= "\x00\x00\x00\x00";
-    $DataLength = strlen($FileData); // Saved as variable to avoid wasting CPU calculating it multiple times.
-    $CRC32 = crc32($FileData); // Ditto.
-    $ZipData = gzcompress($FileData); // Ditto.
-    $ZipData = substr ($ZipData, 2, (strlen($ZipData) - 6)); // Checksum resolution
-    $ZipLength = strlen($ZipData); // Ditto.
-    $this->Data .= pack('V', $CRC32); // CRC-32
-    $this->Data .= pack('V', $ZipLength); // Compressed file size
-    $this->Data .= pack('V', $DataLength); // Uncompressed file size
-    $this->Data .= pack('v', strlen($ArchivePath)); // Path name length
-    $this->Data .="\x00\x00"; // Extra field length (0'd so we can ignore this)
-    $this->Data .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
-    /* END file header */
-
-    /* File data */
-    $this->Data .= $ZipData; // File data
-    /* END file data */
-
-    /* Data descriptor
-    Not needed (only needed when 3rd bitflag is set), causes problems with OS X archive utility
-    $this->Data .= pack('V', $CRC32); // CRC-32
-    $this->Data .= pack('V', $ZipLength); // Compressed file size
-    $this->Data .= pack('V', $DataLength); // Uncompressed file size
-    END data descriptor */
-
-    $FileDataLength = strlen($this->Data);
-    $this->ArchiveSize = $this->ArchiveSize + $FileDataLength; // All we really need is the size
-    $CurrentOffset = $this->ArchiveSize; // Update offsets
-    echo $this->Data; // Get this out to reduce our memory consumption
-
-    /* Central Directory Structure */
-    $CDS = "\x50\x4b\x01\x02"; // CDS signature
-    $CDS .="\x14\x00"; // Constructor version
-    $CDS .="\x14\x00"; // Version requirements
-    $CDS .="\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
-    $CDS .="\x08\x00"; // Compression
-    $CDS .="\x00\x00\x00\x00"; // Last modified
-    $CDS .= pack('V', $CRC32); // CRC-32
-    $CDS .= pack('V', $ZipLength); // Compressed file size
-    $CDS .= pack('V', $DataLength); // Uncompressed file size
-    $CDS .= pack('v', strlen($ArchivePath)); // Path name length
-    $CDS .="\x00\x00"; // Extra field length (0'd so we can ignore this)
-    $CDS .="\x00\x00"; // File comment length  (no comment, 0'd)
-    $CDS .="\x00\x00"; // Disk number start (0 seems valid)
-    $CDS .="\x00\x00"; // Internal file attributes (again with the 0's)
-    $CDS .="\x20\x00\x00\x00"; // External file attributes
-    $CDS .= pack('V', $this->FileOffset); // Offsets
-    $CDS .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
-    /* END central Directory Structure */
-
-    $this->FileOffset = $CurrentOffset; // Update offsets
-    $this->Structure .= $CDS; // Append to structure
-    $this->ArchiveFiles++; // Increment file count
-  }
-
-  public function close_stream() {
-    echo $this->Structure; // Structure Root
-    echo "\x50\x4b\x05\x06"; // End of central directory signature
-    echo "\x00\x00"; // This disk
-    echo "\x00\x00"; // CDS start
-    echo pack('v', $this->ArchiveFiles); // Handle the number of entries
-    echo pack('v', $this->ArchiveFiles); // Ditto
-    echo pack('V', strlen($this->Structure)); //Size
-    echo pack('V', $this->ArchiveSize); // Offset
-    echo "\x00\x00"; // No comment, close it off
-  }
+class Zip
+{
+    public $ArchiveSize = 0; // Total size
+    public $ArchiveFiles = 0; // Total files
+    private $Structure = ''; // Structure saved to memory
+    private $FileOffset = 0; // Offset to write data
+    private $Data = ''; //An idea
+
+    public function __construct($ArchiveName = 'Archive')
+    {
+        header("Content-type: application/octet-stream"); // Stream download
+        header("Content-disposition: attachment; filename=\"$ArchiveName.zip\""); // Name the archive - Should not be urlencoded
+    }
+
+    public static function unlimit()
+    {
+        ob_end_clean();
+        set_time_limit(3600); // Limit 1 hour
+        ini_set('memory_limit', '1024M'); // Because the buffers can get extremely large
+    }
+
+    public function add_file($FileData, $ArchivePath, $TimeStamp = 0)
+    {
+        /* File header */
+        $this->Data = "\x50\x4b\x03\x04"; // PK signature
+        $this->Data .= "\x14\x00"; // Version requirements
+        $this->Data .= "\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
+        $this->Data .= "\x08\x00"; // Compression
+        $this->Data .= "\x00\x00\x00\x00";
+        $DataLength = strlen($FileData); // Saved as variable to avoid wasting CPU calculating it multiple times.
+        $CRC32 = crc32($FileData); // Ditto.
+        $ZipData = gzcompress($FileData); // Ditto.
+        $ZipData = substr($ZipData, 2, (strlen($ZipData) - 6)); // Checksum resolution
+        $ZipLength = strlen($ZipData); // Ditto.
+        $this->Data .= pack('V', $CRC32); // CRC-32
+        $this->Data .= pack('V', $ZipLength); // Compressed file size
+        $this->Data .= pack('V', $DataLength); // Uncompressed file size
+        $this->Data .= pack('v', strlen($ArchivePath)); // Path name length
+        $this->Data .="\x00\x00"; // Extra field length (0'd so we can ignore this)
+        $this->Data .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
+      /* END file header */
+
+        /* File data */
+        $this->Data .= $ZipData; // File data
+        /* END file data */
+
+        /* Data descriptor
+        Not needed (only needed when 3rd bitflag is set), causes problems with OS X archive utility
+        $this->Data .= pack('V', $CRC32); // CRC-32
+        $this->Data .= pack('V', $ZipLength); // Compressed file size
+        $this->Data .= pack('V', $DataLength); // Uncompressed file size
+        END data descriptor */
+
+        $FileDataLength = strlen($this->Data);
+        $this->ArchiveSize = $this->ArchiveSize + $FileDataLength; // All we really need is the size
+        $CurrentOffset = $this->ArchiveSize; // Update offsets
+        echo $this->Data; // Get this out to reduce our memory consumption
+
+      /* Central Directory Structure */
+        $CDS = "\x50\x4b\x01\x02"; // CDS signature
+        $CDS .="\x14\x00"; // Constructor version
+        $CDS .="\x14\x00"; // Version requirements
+        $CDS .="\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
+        $CDS .="\x08\x00"; // Compression
+        $CDS .="\x00\x00\x00\x00"; // Last modified
+        $CDS .= pack('V', $CRC32); // CRC-32
+        $CDS .= pack('V', $ZipLength); // Compressed file size
+        $CDS .= pack('V', $DataLength); // Uncompressed file size
+        $CDS .= pack('v', strlen($ArchivePath)); // Path name length
+        $CDS .="\x00\x00"; // Extra field length (0'd so we can ignore this)
+        $CDS .="\x00\x00"; // File comment length  (no comment, 0'd)
+        $CDS .="\x00\x00"; // Disk number start (0 seems valid)
+        $CDS .="\x00\x00"; // Internal file attributes (again with the 0's)
+        $CDS .="\x20\x00\x00\x00"; // External file attributes
+        $CDS .= pack('V', $this->FileOffset); // Offsets
+        $CDS .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
+      /* END central Directory Structure */
+
+        $this->FileOffset = $CurrentOffset; // Update offsets
+        $this->Structure .= $CDS; // Append to structure
+        $this->ArchiveFiles++; // Increment file count
+    }
+
+    public function close_stream()
+    {
+        echo $this->Structure; // Structure Root
+        echo "\x50\x4b\x05\x06"; // End of central directory signature
+        echo "\x00\x00"; // This disk
+        echo "\x00\x00"; // CDS start
+        echo pack('v', $this->ArchiveFiles); // Handle the number of entries
+        echo pack('v', $this->ArchiveFiles); // Ditto
+        echo pack('V', strlen($this->Structure)); //Size
+        echo pack('V', $this->ArchiveSize); // Offset
+        echo "\x00\x00"; // No comment, close it off
+    }
 }