aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-18 20:47:11 -0700
committerredmatrix <git@macgirvin.com>2016-04-18 20:47:11 -0700
commitf53478f1427fb90538168bbf787efb2dd2b38682 (patch)
tree641ffffecbec6121ef7b873524291154c7af4e8a
parent2a4e8972e0edfa3156d9ce54d68ce0e54c0ec289 (diff)
downloadvolse-hubzilla-f53478f1427fb90538168bbf787efb2dd2b38682.tar.gz
volse-hubzilla-f53478f1427fb90538168bbf787efb2dd2b38682.tar.bz2
volse-hubzilla-f53478f1427fb90538168bbf787efb2dd2b38682.zip
a bit more namespace wrangling
-rw-r--r--Zotlabs/Module/Cloud.php8
-rw-r--r--Zotlabs/Module/Impel.php2
-rw-r--r--Zotlabs/Module/Item.php2
-rw-r--r--Zotlabs/Module/New_channel.php4
-rw-r--r--Zotlabs/Module/Openid.php2
5 files changed, 9 insertions, 9 deletions
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
index 0e04cb68b..5f40f4af1 100644
--- a/Zotlabs/Module/Cloud.php
+++ b/Zotlabs/Module/Cloud.php
@@ -7,7 +7,7 @@ namespace Zotlabs\Module;
* Module for accessing the DAV storage area.
*/
-use Sabre\DAV;
+use Sabre\DAV as SDAV;
use \Zotlabs\Storage;
// composer autoloader for SabreDAV
@@ -70,10 +70,10 @@ class Cloud extends \Zotlabs\Web\Controller {
$rootDirectory = new \Zotlabs\Storage\Directory('/', $auth);
// A SabreDAV server-object
- $server = new DAV\Server($rootDirectory);
+ $server = new SDAV\Server($rootDirectory);
// prevent overwriting changes each other with a lock backend
- $lockBackend = new DAV\Locks\Backend\File('store/[data]/locks');
- $lockPlugin = new DAV\Locks\Plugin($lockBackend);
+ $lockBackend = new SDAV\Locks\Backend\File('store/[data]/locks');
+ $lockPlugin = new SDAV\Locks\Plugin($lockBackend);
$server->addPlugin($lockPlugin);
diff --git a/Zotlabs/Module/Impel.php b/Zotlabs/Module/Impel.php
index bdf5042dd..e326f7818 100644
--- a/Zotlabs/Module/Impel.php
+++ b/Zotlabs/Module/Impel.php
@@ -135,7 +135,7 @@ class Impel extends \Zotlabs\Web\Controller {
if($j['pagetitle']) {
require_once('library/urlify/URLify.php');
- $pagetitle = strtolower(URLify::transliterate($j['pagetitle']));
+ $pagetitle = strtolower(\URLify::transliterate($j['pagetitle']));
}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 2c7a7b572..58660a839 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -130,7 +130,7 @@ class Item extends \Zotlabs\Web\Controller {
if($pagetitle) {
require_once('library/urlify/URLify.php');
- $pagetitle = strtolower(URLify::transliterate($pagetitle));
+ $pagetitle = strtolower(\URLify::transliterate($pagetitle));
}
diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php
index b77b2660b..3dca1b0b4 100644
--- a/Zotlabs/Module/New_channel.php
+++ b/Zotlabs/Module/New_channel.php
@@ -17,7 +17,7 @@ class New_channel extends \Zotlabs\Web\Controller {
$result = array('error' => false, 'message' => '');
$n = trim($_REQUEST['name']);
- $x = strtolower(URLify::transliterate($n));
+ $x = strtolower(\URLify::transliterate($n));
$test = array();
@@ -43,7 +43,7 @@ class New_channel extends \Zotlabs\Web\Controller {
$result = array('error' => false, 'message' => '');
$n = trim($_REQUEST['nick']);
- $x = strtolower(URLify::transliterate($n));
+ $x = strtolower(\URLify::transliterate($n));
$test = array();
diff --git a/Zotlabs/Module/Openid.php b/Zotlabs/Module/Openid.php
index c24686e33..7a6e4a81f 100644
--- a/Zotlabs/Module/Openid.php
+++ b/Zotlabs/Module/Openid.php
@@ -121,7 +121,7 @@ class Openid extends \Zotlabs\Web\Controller {
}
require_once('library/urlify/URLify.php');
- $x = strtolower(URLify::transliterate($nick));
+ $x = strtolower(\URLify::transliterate($nick));
if($nick & $host)
$addr = $nick . '@' . $host;
$network = 'unknown';