Merge branch 'master' into remotefork

diff --git a/data/templates/fork-remote.htm b/data/templates/fork-remote.htm
new file mode 100644 (file)
index 0000000..f599ec6
--- /dev/null
+++ b/data/templates/fork-remote.htm
@@ -0,0 +1,6 @@
+{% extends "base.htm" %}
+{% block title %}Fork remote paste{% endblock %}
+
+{% block content %}
+ {% include 'new-fork-remote.htm' %}
+{% endblock %}

diff --git a/data/templates/new-fork-remote.htm b/data/templates/new-fork-remote.htm
new file mode 100644 (file)
index 0000000..02a94e2
--- /dev/null
+++ b/data/templates/new-fork-remote.htm
@@ -0,0 +1,12 @@
+<form method="post" action="/fork-remote" enctype="multipart/form-data" class="well form-inline">
+ <p>
+  <strong>Copy a paste from a remote server:</strong>
+  Just paste the website or git clone URL.
+ </p>
+
+ <button type="submit" class="btn btn-primary" style="float: right">
+  <i class="icon-share icon-white"></i>Fork remote paste
+ </button>
+ <label for="remote-url">Remote paste URL</label>
+ <input type="text" name="remote_url" id="remote-url" value="{{remote_url}}" class="input-xlarge"/>
+</form>

diff --git a/data/templates/new.htm b/data/templates/new.htm
index 89c2fe01a5d4168f75e877e26f1d02269e459abf..f846fe5cd7faf05bd263b3ad062a9f73f9ee7ef9 100644 (file)
--- a/data/templates/new.htm
+++ b/data/templates/new.htm
@@ -20,6 +20,9 @@
  </div>
 
 </form>
+
+{% include 'new-fork-remote.htm' %}
+
 <script type="application/javascript">
 $(document).ready(function() {
     initEdit();

diff --git a/src/phorkie/ForkRemote.php b/src/phorkie/ForkRemote.php
new file mode 100644 (file)
index 0000000..f3639b2
--- /dev/null
+++ b/src/phorkie/ForkRemote.php
@@ -0,0 +1,42 @@
+<?php
+namespace phorkie;
+
+class ForkRemote
+{
+    protected $url;
+
+    public function __construct($url)
+    {
+        $this->url = $url;
+    }
+
+    public function parse()
+    {
+        $scheme = parse_url($this->url, PHP_URL_SCHEME);
+        switch ($scheme) {
+        case 'git':
+            //clearly a git url
+            $this->gitUrl = $this->url;
+            return true;
+
+        case 'ssh':
+            //FIXME: maybe loosen this when we know how to skip the 
+            //"do you trust this server" question of ssh
+            $this->error = 'ssh:// URLs are not supported';
+            return false;
+
+        case 'http':
+        case 'https':
+            return $this->extractUrlsFromHtml($this->url);
+        }
+
+        $this->error = 'Unknown URLs scheme: ' . $scheme;
+        return false;
+    }
+
+    protected function extractUrlsFromHtml($url)
+    {
+    }
+}
+
+?>

diff --git a/www/.htaccess b/www/.htaccess
index 1f03facd28af0b2222a9e94c7a6c46dd8fafe203..03bbf60fc5d26d5231538b3d36355584643c9f37 100644 (file)
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -13,6 +13,7 @@ RewriteRule ^([0-9]+)/rev/(.+)$ /revision.php?id=$1&rev=$2
 RewriteRule ^([0-9]+)/rev-raw/(.+)/(.+)$ /raw.php?id=$1&rev=$2&file=$3
 RewriteRule ^([0-9]+)/tool/([^/]+)/(.+)$ /tool.php?id=$1&tool=$2&file=$3
 
+RewriteRule ^fork-remote$ /fork-remote.php
 RewriteRule ^new$ /new.php
 
 RewriteRule ^list$ /list.php

diff --git a/www/fork-remote.php b/www/fork-remote.php
new file mode 100644 (file)
index 0000000..dd58165
--- /dev/null
+++ b/www/fork-remote.php
@@ -0,0 +1,24 @@
+<?php
+namespace phorkie;
+/**
+ * Fork a remote repository.
+ * Displays a URL selection form when multiple git urls have been found
+ */
+require_once 'www-header.php';
+
+if (isset($_POST['remote_url'])) {
+    $fr = new ForkRemote($_POST['remote_url']);
+    $fr->parse();
+    if ($fr->hasUniqueGitUrl()) {
+        //FIXME: fork
+    }
+    //FIXME: display error or selection list
+}
+
+render(
+    'fork-remote',
+    array(
+        'remote_url' => isset($_POST['remote_url']) ? $_POST['remote_url'] : ''
+    )
+);
+?>