From d8ace38041ad3ef161cf9c727c94b6ce2a00ce75 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 20 May 2016 22:52:47 -0700
Subject: rework the conversation object stuff at a high level - still needs a
 bit of refactoring

---
 Zotlabs/Module/Dav.php      | 2 +-
 Zotlabs/Module/Help.php     | 2 +-
 Zotlabs/Module/Linkinfo.php | 2 +-
 Zotlabs/Module/Pubsites.php | 2 +-
 Zotlabs/Module/Rsd_xml.php  | 2 +-
 Zotlabs/Module/Settings.php | 2 +-
 Zotlabs/Module/Siteinfo.php | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php
index d65ad3405..2fddabe19 100644
--- a/Zotlabs/Module/Dav.php
+++ b/Zotlabs/Module/Dav.php
@@ -64,7 +64,7 @@ class Dav extends \Zotlabs\Web\Controller {
 
 
 		$auth = new \Zotlabs\Storage\BasicAuth();
-		$auth->setRealm(ucfirst(\Zotlabs\Project\System::get_platform_name()) . 'WebDAV');
+		$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'WebDAV');
 
 //		$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($userName,$password) {
 //			if(account_verify_password($userName,$password))
diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php
index 4842c56c6..cc46c550b 100644
--- a/Zotlabs/Module/Help.php
+++ b/Zotlabs/Module/Help.php
@@ -37,7 +37,7 @@ class Help extends \Zotlabs\Web\Controller {
 					$path = trim(substr($dirname,4),'/');
 	
 					$o .= '<li><a href="help/' . (($path) ? $path . '/' : '') . $fname . '" >' . ucwords(str_replace('_',' ',notags($fname))) . '</a><br />' . 
-					str_replace('$Projectname',\Zotlabs\Project\System::get_platform_name(),substr($rr['text'],0,200)) . '...<br /><br /></li>';
+					str_replace('$Projectname',\Zotlabs\Lib\System::get_platform_name(),substr($rr['text'],0,200)) . '...<br /><br /></li>';
 	
 				}
 				$o .= '</ul>';
diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
index ef34bb465..e1a3a6abe 100644
--- a/Zotlabs/Module/Linkinfo.php
+++ b/Zotlabs/Module/Linkinfo.php
@@ -115,7 +115,7 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 	
 		// If this is a Red site, use zrl rather than url so they get zids sent to them by default
 	
-		if( x($siteinfo,'generator') && (strpos($siteinfo['generator'], \Zotlabs\Project\System::get_platform_name() . ' ') === 0))
+		if( x($siteinfo,'generator') && (strpos($siteinfo['generator'], \Zotlabs\Lib\System::get_platform_name() . ' ') === 0))
 			$template = str_replace('url','zrl',$template);
 	
 		if($siteinfo["title"] == "") {
diff --git a/Zotlabs/Module/Pubsites.php b/Zotlabs/Module/Pubsites.php
index 55f2c0ad6..31bca5f30 100644
--- a/Zotlabs/Module/Pubsites.php
+++ b/Zotlabs/Module/Pubsites.php
@@ -31,7 +31,7 @@ class Pubsites extends \Zotlabs\Web\Controller {
 				$o .= '<table class="table table-striped table-hover"><tr><td>' . t('Hub URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Software') . '</td><td colspan="2">' . t('Ratings') . '</td></tr>';
 				if($j['sites']) {
 					foreach($j['sites'] as $jj) {
-						if(strpos($jj['project'],\Zotlabs\Project\System::get_platform_name()) === false)
+						if(strpos($jj['project'],\Zotlabs\Lib\System::get_platform_name()) === false)
 							continue;
 						$host = strtolower(substr($jj['url'],strpos($jj['url'],'://')+3));
 						$rate_links = ((local_channel()) ? '<td><a href="rate?f=&target=' . $host . '" class="btn-btn-default"><i class="fa fa-check-square-o"></i> ' . t('Rate') . '</a></td>' : '');
diff --git a/Zotlabs/Module/Rsd_xml.php b/Zotlabs/Module/Rsd_xml.php
index 06af39ad1..e5059834b 100644
--- a/Zotlabs/Module/Rsd_xml.php
+++ b/Zotlabs/Module/Rsd_xml.php
@@ -6,7 +6,7 @@ class Rsd_xml extends \Zotlabs\Web\Controller {
 	function init() {
 		header ("Content-Type: text/xml");
 		echo replace_macros(get_markup_template('rsd.tpl'),array(
-			'$project' => \Zotlabs\Project\System::get_platform_name(),
+			'$project' => \Zotlabs\Lib\System::get_platform_name(),
 			'$baseurl' => z_root(),
 			'$apipath' => z_root() . '/api/'
 		));
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index 3d37faab6..32ef89f68 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -1047,7 +1047,7 @@ class Settings extends \Zotlabs\Web\Controller {
 	
 				'$h_prv' 	=> t('Security and Privacy Settings'),
 				'$permissions_set' => $permissions_set,
-				'$server_role' => \Zotlabs\Project\System::get_server_role(),
+				'$server_role' => \Zotlabs\Lib\System::get_server_role(),
 				'$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'),
 	
 				'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no),
diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php
index c65277004..41f6e9f0b 100644
--- a/Zotlabs/Module/Siteinfo.php
+++ b/Zotlabs/Module/Siteinfo.php
@@ -16,10 +16,10 @@ class Siteinfo extends \Zotlabs\Web\Controller {
 	function get() {
 	
 		if(! get_config('system','hidden_version_siteinfo')) {
-			$version = sprintf( t('Version %s'), \Zotlabs\Project\System::get_project_version());
+			$version = sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version());
 			if(@is_dir('.git') && function_exists('shell_exec')) {
 				$commit = @shell_exec('git log -1 --format="%h"');
-				$tag = \Zotlabs\Project\System::get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
+				$tag = \Zotlabs\Lib\System::get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
 			}
 			if(! isset($commit) || strlen($commit) > 16)
 				$commit = '';
-- 
cgit v1.2.3