From d80854dc9a670e0ee996cc89a59af2c5f8521205 Mon Sep 17 00:00:00 2001
From: Christian Weiske <christian.weiske@netresearch.de>
Date: Fri, 13 Jun 2014 10:07:24 +0200
Subject: use geshi from geshi's new pear channel

---
 src/phorkie/Renderer/Geshi.php | 6 +-----
 src/phorkie/SetupCheck.php     | 8 +++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/phorkie/Renderer/Geshi.php b/src/phorkie/Renderer/Geshi.php
index 08c6c74..9cb15a2 100644
--- a/src/phorkie/Renderer/Geshi.php
+++ b/src/phorkie/Renderer/Geshi.php
@@ -13,12 +13,8 @@ class Renderer_Geshi
      */
     public function toHtml(File $file, Tool_Result $res = null)
     {
-        /**
-         * Yes, geshi needs to be in your include path
-         * We use the mediawiki geshi extension package.
-         */
         if (!class_exists('\\GeSHi', true)) {
-            require_once $GLOBALS['phorkie']['cfg']['geshi'];
+            require_once 'geshi.php';
         }
         $geshi = new \GeSHi($file->getContent(), $this->getType($file));
         $geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index 53e4fd0..fbc99c7 100644
--- a/src/phorkie/SetupCheck.php
+++ b/src/phorkie/SetupCheck.php
@@ -47,11 +47,9 @@ class SetupCheck
         }
 
         if (!class_exists('GeSHi', true)) {
-            $geshi = stream_resolve_include_path(
-                $GLOBALS['phorkie']['cfg']['geshi']
-            );
-            if ($geshi === false) {
-                $this->fail('GeSHi not available');
+            @include_once 'geshi.php';
+            if (!class_exists('GeSHi', false)) {
+                $this->fail('PEAR package not installed: pear.geshi.org/geshi');
             }
         }
 
-- 
cgit v1.2.3


From 94b076f028c2a12f522887caf02b6289957cf4fe Mon Sep 17 00:00:00 2001
From: Christian Weiske <christian.weiske@netresearch.de>
Date: Fri, 13 Jun 2014 11:29:09 +0200
Subject: handle undefined local clone urls

---
 src/phorkie/Repository/LinkbackReceiver.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/phorkie/Repository/LinkbackReceiver.php b/src/phorkie/Repository/LinkbackReceiver.php
index c9b3d03..c808f45 100644
--- a/src/phorkie/Repository/LinkbackReceiver.php
+++ b/src/phorkie/Repository/LinkbackReceiver.php
@@ -120,13 +120,19 @@ class Repository_LinkbackReceiver
      */
     protected function localizeGitUrls($arGitUrls)
     {
-        $pub = $GLOBALS['phorkie']['cfg']['git']['public'];
-        $pri = $GLOBALS['phorkie']['cfg']['git']['private'];
+        $pub = $pri = null;
+        if (isset($GLOBALS['phorkie']['cfg']['git']['public'])) {
+            $pub = $GLOBALS['phorkie']['cfg']['git']['public'];
+        }
+        if (isset($GLOBALS['phorkie']['cfg']['git']['private'])) {
+            $pri = $GLOBALS['phorkie']['cfg']['git']['private'];
+        }
 
         $arRemoteCloneUrls = array();
         foreach ($arGitUrls as $remoteTitle => $arUrls) {
             foreach ($arUrls as $remoteCloneUrl) {
-                if (substr($remoteCloneUrl, 0, strlen($pub)) == $pub
+                if ($pub !== null
+                    && substr($remoteCloneUrl, 0, strlen($pub)) == $pub
                     && substr($remoteCloneUrl, -4) == '.git'
                 ) {
                     $id = substr($remoteCloneUrl, strlen($pub), -4);
@@ -136,7 +142,8 @@ class Repository_LinkbackReceiver
                         $arRemoteCloneUrls[$repo->gitDir] = $remoteTitle;
                     } catch (Exception $e) {
                     }
-                } else if (substr($remoteCloneUrl, 0, strlen($pri)) == $pri
+                } else if ($pri !== null
+                    && substr($remoteCloneUrl, 0, strlen($pri)) == $pri
                     && substr($remoteCloneUrl, -4) == '.git'
                 ) {
                     $id = substr($remoteCloneUrl, strlen($pri), -4);
-- 
cgit v1.2.3