diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/admin.php | 4 | ||||
| -rw-r--r-- | mod/cloud.php | 8 | ||||
| -rw-r--r-- | mod/dav.php | 8 | ||||
| -rw-r--r-- | mod/home.php | 2 | ||||
| -rw-r--r-- | mod/invite.php | 6 | ||||
| -rw-r--r-- | mod/item.php | 8 | ||||
| -rw-r--r-- | mod/layouts.php | 2 | ||||
| -rwxr-xr-x | mod/like.php | 2 | ||||
| -rw-r--r-- | mod/mitem.php | 4 | ||||
| -rw-r--r-- | mod/p.php | 2 | ||||
| -rw-r--r-- | mod/pubsites.php | 2 | ||||
| -rwxr-xr-x | mod/setup.php | 4 | ||||
| -rw-r--r-- | mod/siteinfo.php | 10 |
13 files changed, 27 insertions, 35 deletions
diff --git a/mod/admin.php b/mod/admin.php index fd2ba510b..c74e5ad2c 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1,7 +1,7 @@ <?php /** * @file mod/admin.php - * @brief RedMatrix's admin controller. + * @brief Hubzilla's admin controller. * * Controller for the /admin/ area. */ @@ -230,7 +230,7 @@ function admin_page_summary(&$a) { $alertmsg = ''; // annoy admin about upcoming unsupported PHP version if (version_compare(PHP_VERSION, '5.4', '<')) { - $alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of RedMatrix. You are strongly urged to upgrade to a current version.' + $alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of Hubzilla. You are strongly urged to upgrade to a current version.' . '<br>PHP 5.3 has reached its <a href="http://php.net/eol.php" class="alert-link">End of Life (EOL)</a> in August 2014.' . ' A list about current PHP versions can be found <a href="http://php.net/supported-versions.php" class="alert-link">here</a>.'; } diff --git a/mod/cloud.php b/mod/cloud.php index b36e6c482..a87d36ea1 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -1,13 +1,13 @@ <?php /** * @file mod/cloud.php - * @brief Initialize RedMatrix's cloud (SabreDAV). + * @brief Initialize Hubzilla's cloud (SabreDAV). * * Module for accessing the DAV storage area. */ use Sabre\DAV; -use RedMatrix\RedDAV; +use Hubzilla\RedDAV; // composer autoloader for SabreDAV require_once('vendor/autoload.php'); @@ -117,7 +117,7 @@ function cloud_init(&$a) { if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { try { - $auth->Authenticate($server, t('RedMatrix - Guests: Username: {your email address}, Password: +++')); + $auth->Authenticate($server, t('Hubzilla - Guests: Username: {your email address}, Password: +++')); } catch (Exception $e) { logger('mod_cloud: auth exception' . $e->getMessage()); @@ -126,7 +126,7 @@ function cloud_init(&$a) { } require_once('include/RedDAV/RedBrowser.php'); - // provide a directory view for the cloud in Red Matrix + // provide a directory view for the cloud in Hubzilla $browser = new RedDAV\RedBrowser($auth); $auth->setBrowserPlugin($browser); diff --git a/mod/dav.php b/mod/dav.php index f7f89b6da..d49dd7359 100644 --- a/mod/dav.php +++ b/mod/dav.php @@ -1,13 +1,13 @@ <?php /** * @file mod/dav.php - * @brief Initialize RedMatrix's cloud (SabreDAV). + * @brief Initialize Hubzilla's cloud (SabreDAV). * * Module for accessing the DAV storage area from a DAV client. */ use Sabre\DAV; -use RedMatrix\RedDAV; +use Hubzilla\RedDAV; // composer autoloader for SabreDAV require_once('vendor/autoload.php'); @@ -118,7 +118,7 @@ function dav_init(&$a) { if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { try { - $auth->Authenticate($server, t('RedMatrix channel')); + $auth->Authenticate($server, t('Hubzilla channel')); } catch (Exception $e) { logger('mod_cloud: auth exception' . $e->getMessage()); @@ -127,7 +127,7 @@ function dav_init(&$a) { } require_once('include/RedDAV/RedBrowser.php'); - // provide a directory view for the cloud in Red Matrix + // provide a directory view for the cloud in Hubzilla $browser = new RedDAV\RedBrowser($auth); $auth->setBrowserPlugin($browser); diff --git a/mod/home.php b/mod/home.php index 7bb138d2e..5cd2fd6de 100644 --- a/mod/home.php +++ b/mod/home.php @@ -50,7 +50,7 @@ function home_content(&$a, $update = 0, $load = false) { if(get_config('system','projecthome')) { $o .= file_get_contents('assets/home.html'); $a->page['template'] = 'full'; - $a->page['title'] = t('Red Matrix - "The Network"'); + $a->page['title'] = t('Hubzilla - "The Network"'); return $o; } diff --git a/mod/invite.php b/mod/invite.php index e197278d1..81e10bcd8 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -129,12 +129,12 @@ function invite_content(&$a) { '$invite' => t('Send invitations'), '$addr_text' => t('Enter email addresses, one per line:'), '$msg_text' => t('Your message:'), - '$default_message' => t('Please join my community on RedMatrix.') . "\r\n" . "\r\n" + '$default_message' => t('Please join my community on Hubzilla.') . "\r\n" . "\r\n" . $linktxt . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: ') . $invite_code . "\r\n" . "\r\n" : '') - . t('1. Register at any RedMatrix location (they are all inter-connected)') + . t('1. Register at any Hubzilla location (they are all inter-connected)') . "\r\n" . "\r\n" . z_root() . '/register' - . "\r\n" . "\r\n" . t('2. Enter my RedMatrix network address into the site searchbar.') + . "\r\n" . "\r\n" . t('2. Enter my Hubzilla network address into the site searchbar.') . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit ') . z_root() . '/channel/' . $channel['channel_address'] . ')' . "\r\n" . "\r\n" . t('3. Click [Connect]') diff --git a/mod/item.php b/mod/item.php index a732a9f81..37c4bb24f 100644 --- a/mod/item.php +++ b/mod/item.php @@ -790,14 +790,6 @@ function item_post(&$a) { $datarray['item_flags'] = $datarray['item_flags'] | ITEM_VERIFIED; } } - - logger('Encrypting local storage'); - $key = get_config('system','pubkey'); - $datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED; - if($datarray['title']) - $datarray['title'] = json_encode(crypto_encapsulate($datarray['title'],$key)); - if($datarray['body']) - $datarray['body'] = json_encode(crypto_encapsulate($datarray['body'],$key)); } if($orig_post) { diff --git a/mod/layouts.php b/mod/layouts.php index 2e45362ba..70a09b134 100644 --- a/mod/layouts.php +++ b/mod/layouts.php @@ -99,7 +99,7 @@ function layouts_content(&$a) { dbesc(argv(3)) ); if($r) { - header('Content-type: application/x-redmatrix-layout'); + header('Content-type: application/x-hubzilla-layout'); header('Content-disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"'); echo json_encode($r); killme(); diff --git a/mod/like.php b/mod/like.php index d3b6f3ecf..fdfa2d3b7 100755 --- a/mod/like.php +++ b/mod/like.php @@ -18,7 +18,7 @@ function like_content(&$a) { if(! $observer) { $_SESSION['return_url'] = $a->query_string; $o .= t('This action is restricted to members.') . EOL; - $o .= t('Please <a href="rmagic">login with your RedMatrix ID</a> or <a href="register">register as a new RedMatrix member</a> to continue.') . EOL; + $o .= t('Please <a href="rmagic">login with your Hubzilla ID</a> or <a href="register">register as a new Redmatrix.member</a> to continue.') . EOL; return $o; } } diff --git a/mod/mitem.php b/mod/mitem.php index 06c66a323..6235987a6 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -153,7 +153,7 @@ function mitem_content(&$a) { '$aclselect' => populate_acl($perm_defaults,false), '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'), '$mitem_link' => array('mitem_link', t('Link Target'), '', 'URL of the link', '*'), - '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), true, ''), + '$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), true, ''), '$newwin' => array('newwin', t('Open link in new window'), false,''), '$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')), '$submit' => t('Submit and finish'), @@ -223,7 +223,7 @@ function mitem_content(&$a) { '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'), - '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), + '$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''), '$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')), '$submit' => t('Submit'), @@ -43,7 +43,7 @@ function p_init(&$a) { '$handle' => xmlify($myaddr), '$public' => 'true', '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : 'hubzilla') )); header('Content-type: text/xml'); diff --git a/mod/pubsites.php b/mod/pubsites.php index ff3854492..ccddff2d8 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -16,7 +16,7 @@ function pubsites_content(&$a) { $o .= '<h1>' . t('Public Sites') . '</h1>'; $o .= '<div class="descriptive-text">' . - t('The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details.') . '</div>' . EOL; + t('The listed sites allow public registration into the Hubzilla. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details.') . '</div>' . EOL; $ret = z_fetch_url($url); if($ret['success']) { diff --git a/mod/setup.php b/mod/setup.php index b885388be..0a560e6df 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -163,7 +163,7 @@ function setup_content(&$a) { global $install_wizard_pass, $db; $o = ''; $wizard_status = ""; - $install_title = t('Red Matrix Server - Setup'); + $install_title = t('Hubzilla Server - Setup'); @@ -287,7 +287,7 @@ function setup_content(&$a) { $o .= replace_macros($tpl, array( '$title' => $install_title, '$pass' => t('Database connection'), - '$info_01' => t('In order to install Red Matrix we need to know how to connect to your database.'), + '$info_01' => t('In order to install Hubzilla we need to know how to connect to your database.'), '$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'), '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'), diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 856909a27..1c39e8ecf 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -153,7 +153,7 @@ function siteinfo_content(&$a) { $o = replace_macros(get_markup_template('siteinfo.tpl'), array( '$title' => t('Red'), - '$description' => t('This is a hub of redmatrix - a global cooperative network of decentralized privacy enhanced websites.'), + '$description' => t('This is a hub of hubzilla - a global cooperative network of decentralized privacy enhanced websites.'), '$version' => $version, '$tag_txt' => t('Tag: '), '$tag' => $tag, @@ -161,11 +161,11 @@ function siteinfo_content(&$a) { '$lastpoll' => get_poller_runtime(), '$commit' => $commit, '$web_location' => t('Running at web location') . ' ' . z_root(), - '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about the Red Matrix.'), + '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about the Hubzilla.'), '$bug_text' => t('Bug reports and issues: please visit'), - '$bug_link_url' => 'https://github.com/redmatrix/redmatrix/issues', - '$bug_link_text' => 'redmatrix issues', - '$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'), + '$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues', + '$bug_link_text' => 'hubzilla issues', + '$contact' => t('Suggestions, praise, etc. - please email "hubzilla" at librelist - dot com'), '$donate' => $donate, '$adminlabel' => t('Site Administrators'), '$admininfo' => $admininfo, |