a bit more namespace wrangling
This commit is contained in:
parent
2a4e8972e0
commit
f53478f142
@ -7,7 +7,7 @@ namespace Zotlabs\Module;
|
|||||||
* Module for accessing the DAV storage area.
|
* Module for accessing the DAV storage area.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Sabre\DAV;
|
use Sabre\DAV as SDAV;
|
||||||
use \Zotlabs\Storage;
|
use \Zotlabs\Storage;
|
||||||
|
|
||||||
// composer autoloader for SabreDAV
|
// composer autoloader for SabreDAV
|
||||||
@ -70,10 +70,10 @@ class Cloud extends \Zotlabs\Web\Controller {
|
|||||||
$rootDirectory = new \Zotlabs\Storage\Directory('/', $auth);
|
$rootDirectory = new \Zotlabs\Storage\Directory('/', $auth);
|
||||||
|
|
||||||
// A SabreDAV server-object
|
// A SabreDAV server-object
|
||||||
$server = new DAV\Server($rootDirectory);
|
$server = new SDAV\Server($rootDirectory);
|
||||||
// prevent overwriting changes each other with a lock backend
|
// prevent overwriting changes each other with a lock backend
|
||||||
$lockBackend = new DAV\Locks\Backend\File('store/[data]/locks');
|
$lockBackend = new SDAV\Locks\Backend\File('store/[data]/locks');
|
||||||
$lockPlugin = new DAV\Locks\Plugin($lockBackend);
|
$lockPlugin = new SDAV\Locks\Plugin($lockBackend);
|
||||||
|
|
||||||
$server->addPlugin($lockPlugin);
|
$server->addPlugin($lockPlugin);
|
||||||
|
|
||||||
|
@ -135,7 +135,7 @@ class Impel extends \Zotlabs\Web\Controller {
|
|||||||
|
|
||||||
if($j['pagetitle']) {
|
if($j['pagetitle']) {
|
||||||
require_once('library/urlify/URLify.php');
|
require_once('library/urlify/URLify.php');
|
||||||
$pagetitle = strtolower(URLify::transliterate($j['pagetitle']));
|
$pagetitle = strtolower(\URLify::transliterate($j['pagetitle']));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ class Item extends \Zotlabs\Web\Controller {
|
|||||||
|
|
||||||
if($pagetitle) {
|
if($pagetitle) {
|
||||||
require_once('library/urlify/URLify.php');
|
require_once('library/urlify/URLify.php');
|
||||||
$pagetitle = strtolower(URLify::transliterate($pagetitle));
|
$pagetitle = strtolower(\URLify::transliterate($pagetitle));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ class New_channel extends \Zotlabs\Web\Controller {
|
|||||||
$result = array('error' => false, 'message' => '');
|
$result = array('error' => false, 'message' => '');
|
||||||
$n = trim($_REQUEST['name']);
|
$n = trim($_REQUEST['name']);
|
||||||
|
|
||||||
$x = strtolower(URLify::transliterate($n));
|
$x = strtolower(\URLify::transliterate($n));
|
||||||
|
|
||||||
$test = array();
|
$test = array();
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ class New_channel extends \Zotlabs\Web\Controller {
|
|||||||
$result = array('error' => false, 'message' => '');
|
$result = array('error' => false, 'message' => '');
|
||||||
$n = trim($_REQUEST['nick']);
|
$n = trim($_REQUEST['nick']);
|
||||||
|
|
||||||
$x = strtolower(URLify::transliterate($n));
|
$x = strtolower(\URLify::transliterate($n));
|
||||||
|
|
||||||
$test = array();
|
$test = array();
|
||||||
|
|
||||||
|
@ -121,7 +121,7 @@ class Openid extends \Zotlabs\Web\Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
require_once('library/urlify/URLify.php');
|
require_once('library/urlify/URLify.php');
|
||||||
$x = strtolower(URLify::transliterate($nick));
|
$x = strtolower(\URLify::transliterate($nick));
|
||||||
if($nick & $host)
|
if($nick & $host)
|
||||||
$addr = $nick . '@' . $host;
|
$addr = $nick . '@' . $host;
|
||||||
$network = 'unknown';
|
$network = 'unknown';
|
||||||
|
Reference in New Issue
Block a user