inital commit

webroot/forum/inc/3rdparty/diff/Diff/ThreeWay/BlockBuilder.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright 2007-2017 Horde LLC (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you did
+ * not receive this file, see http://www.horde.org/licenses/lgpl21.
+ *
+ * @package Text_Diff
+ * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
+ */
+
+// Disallow direct access to this file for security reasons
+if(!defined("IN_MYBB"))
+{
+	die("Direct initialization of this file is not allowed.<br /><br />Please make sure IN_MYBB is defined.");
+}
+
+class Horde_Text_Diff_ThreeWay_BlockBuilder
+{
+    public function __construct()
+    {
+        $this->_init();
+    }
+
+    public function input($lines)
+    {
+        if ($lines) {
+            $this->_append($this->orig, $lines);
+        }
+    }
+
+    public function out1($lines)
+    {
+        if ($lines) {
+            $this->_append($this->final1, $lines);
+        }
+    }
+
+    public function out2($lines)
+    {
+        if ($lines) {
+            $this->_append($this->final2, $lines);
+        }
+    }
+
+    public function isEmpty()
+    {
+        return !$this->orig && !$this->final1 && !$this->final2;
+    }
+
+    public function finish()
+    {
+        if ($this->isEmpty()) {
+            return false;
+        } else {
+            $edit = new Horde_Text_Diff_ThreeWay_Op_Base($this->orig, $this->final1, $this->final2);
+            $this->_init();
+            return $edit;
+        }
+    }
+
+    protected function _init()
+    {
+        $this->orig = $this->final1 = $this->final2 = array();
+    }
+
+    protected function _append(&$array, $lines)
+    {
+        array_splice($array, sizeof($array), 0, $lines);
+    }
+}

webroot/forum/inc/3rdparty/diff/Diff/ThreeWay/Op/Base.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2007-2017 Horde LLC (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you did
+ * not receive this file, see http://www.horde.org/licenses/lgpl21.
+ *
+ * @package Text_Diff
+ * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
+ */
+
+// Disallow direct access to this file for security reasons
+if(!defined("IN_MYBB"))
+{
+	die("Direct initialization of this file is not allowed.<br /><br />Please make sure IN_MYBB is defined.");
+}
+
+class Horde_Text_Diff_ThreeWay_Op_Base
+{
+    public function __construct($orig = false, $final1 = false, $final2 = false)
+    {
+        $this->orig = $orig ? $orig : array();
+        $this->final1 = $final1 ? $final1 : array();
+        $this->final2 = $final2 ? $final2 : array();
+    }
+
+    public function merged()
+    {
+        if (!isset($this->_merged)) {
+            if ($this->final1 === $this->final2) {
+                $this->_merged = &$this->final1;
+            } elseif ($this->final1 === $this->orig) {
+                $this->_merged = &$this->final2;
+            } elseif ($this->final2 === $this->orig) {
+                $this->_merged = &$this->final1;
+            } else {
+                $this->_merged = false;
+            }
+        }
+
+        return $this->_merged;
+    }
+
+    public function isConflict()
+    {
+        return $this->merged() === false;
+    }
+}

webroot/forum/inc/3rdparty/diff/Diff/ThreeWay/Op/Copy.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright 2007-2017 Horde LLC (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you did
+ * not receive this file, see http://www.horde.org/licenses/lgpl21.
+ *
+ * @package Text_Diff
+ * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
+ */
+
+// Disallow direct access to this file for security reasons
+if(!defined("IN_MYBB"))
+{
+	die("Direct initialization of this file is not allowed.<br /><br />Please make sure IN_MYBB is defined.");
+}
+
+class Horde_Text_Diff_ThreeWay_Op_Copy extends Horde_Text_Diff_ThreeWay_Op_Base
+{
+    public function __construct($lines = false)
+    {
+        $this->orig = $lines ? $lines : array();
+        $this->final1 = &$this->orig;
+        $this->final2 = &$this->orig;
+    }
+
+    public function merged()
+    {
+        return $this->orig;
+    }
+
+    public function isConflict()
+    {
+        return false;
+    }
+}

webroot/forum/inc/3rdparty/diff/Diff/ThreeWay/Op/index.html

@@ -0,0 +1,8 @@
+<html>
+<head>
+<title></title>
+</head>
+<body>
+&nbsp;
+</body>
+</html>

webroot/forum/inc/3rdparty/diff/Diff/ThreeWay/index.html

@@ -0,0 +1,8 @@
+<html>
+<head>
+<title></title>
+</head>
+<body>
+&nbsp;
+</body>
+</html>