From b84d8bfbc93be57bf84e03fa4b858edcd5616668 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 14 Apr 2013 22:24:47 -0700 Subject: [PATCH] begin to cut the umbilical --- LICENSE | 2 +- README | 4 ++-- boot.php | 6 +++--- doc/html/boot_8php.html | 8 ++++---- doc/html/boot_8php.js | 4 ++-- doc/html/globals_0x66.html | 4 ++-- doc/html/globals_vars_0x66.html | 4 ++-- doc/html/search/all_66.js | 4 ++-- doc/html/search/variables_66.js | 4 ++-- include/api.php | 8 ++++---- include/enotify.php | 2 +- include/identity.php | 2 +- include/items.php | 2 +- mod/admin.php | 2 +- mod/siteinfo.php | 6 +++--- util/run_xgettext.sh | 2 +- view/tpl/email_notify_html.tpl | 2 +- view/tpl/head.tpl | 2 +- view/tpl/smarty3/email_notify_html.tpl | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/LICENSE b/LICENSE index 01f1c19d5..b8c943177 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2010-2013 the Friendica Project +Copyright (c) 2010-2013 the Red Project All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/README b/README index 1d65063e1..f6fcc006e 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Friendica RED -============= +RED +=== Red is essentially a "personal CMS" linked to a decentralised permissions and communication platform. This creates a grid of small servers which link together to form a much larger system (much like the internet itself). This allows one to create services with social contexts and extensible permission controls which are all integrated together as if they were offered by a single large data provider - but without the inherent privacy problems and costs associated with centralisation. Privacy and access controls are instead maintained at the local level where they can be enforced by those who own the data being shared. Additionally, identities in Red are not tied to DNS endpoints and have some degree of mobility between providers. diff --git a/boot.php b/boot.php index 2c7c76777..6a4d5934e 100644 --- a/boot.php +++ b/boot.php @@ -38,8 +38,8 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/BaseObject.php'); require_once('include/features.php'); -define ( 'FRIENDICA_PLATFORM', 'Friendica Red'); -define ( 'FRIENDICA_VERSION', trim(file_get_contents('version.inc')) . 'R'); +define ( 'RED_PLATFORM', 'Red'); +define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1040 ); @@ -873,7 +873,7 @@ class App { $this->page['htmlhead'] = replace_macros($tpl, array( '$baseurl' => $this->get_baseurl(), '$local_user' => local_user(), - '$generator' => FRIENDICA_PLATFORM . ' ' . FRIENDICA_VERSION, + '$generator' => RED_PLATFORM . ' ' . RED_VERSION, '$update_interval' => $interval, '$head_css' => head_get_css(), '$head_js' => head_get_js(), diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index b07a7a89a..939c0e396 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -210,9 +210,9 @@ Functions - + - + @@ -2203,7 +2203,7 @@ Variables

Variables

const FRIENDICA_PLATFORM 'Friendica Red'
const RED_PLATFORM 'Friendica Red'
 
const FRIENDICA_VERSION trim(file_get_contents('version.inc')) . 'R'
const RED_VERSION trim(file_get_contents('version.inc')) . 'R'
 
const ZOT_REVISION 1
 
- +
const FRIENDICA_PLATFORM 'Friendica Red'const RED_PLATFORM 'Friendica Red'
@@ -2221,7 +2221,7 @@ Variables
- +
const FRIENDICA_VERSION trim(file_get_contents('version.inc')) . 'R'const RED_VERSION trim(file_get_contents('version.inc')) . 'R'
diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 54c978d72..1910dbba8 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -98,8 +98,8 @@ var boot_8php = [ "DIRECTORY_MODE_STANDALONE", "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8", null ], [ "DIRECTORY_REALM", "boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd", null ], [ "EOL", "boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b", null ], - [ "FRIENDICA_PLATFORM", "boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3", null ], - [ "FRIENDICA_VERSION", "boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be", null ], + [ "RED_PLATFORM", "boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3", null ], + [ "RED_VERSION", "boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be", null ], [ "GRAVITY_COMMENT", "boot_8php.html#a4a12ce5de39789b0361e308d89925a20", null ], [ "GRAVITY_LIKE", "boot_8php.html#a1f5906598e90b5ea2b4245f682be4348", null ], [ "GRAVITY_PARENT", "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3", null ], diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index b390a7140..28e9d8c1d 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -279,10 +279,10 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
  • format_term_for_display() : text.php
    • -
  • FRIENDICA_PLATFORM +
  • RED_PLATFORM : boot.php
    • -
  • FRIENDICA_VERSION +
  • RED_VERSION : boot.php
  • fsuggest_content() diff --git a/doc/html/globals_vars_0x66.html b/doc/html/globals_vars_0x66.html index f866d9c70..e034e4f34 100644 --- a/doc/html/globals_vars_0x66.html +++ b/doc/html/globals_vars_0x66.html @@ -142,10 +142,10 @@ $(document).ready(function(){initNavTree('globals_vars_0x66.html','');});
  • foreach : typo.php
    • -
  • FRIENDICA_PLATFORM +
  • RED_PLATFORM : boot.php
    • -
  • FRIENDICA_VERSION +
  • RED_VERSION : boot.php
    • diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index 24b370c9b..7106bfa63 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -65,9 +65,9 @@ var searchData= ['friendica',['Friendica',['../namespaceFriendica.html',1,'']]], ['friendica_2dto_2dsmarty_2dtpl',['friendica-to-smarty-tpl',['../namespacefriendica-to-smarty-tpl.html',1,'']]], ['friendica_2dto_2dsmarty_2dtpl_2epy',['friendica-to-smarty-tpl.py',['../friendica-to-smarty-tpl_8py.html',1,'']]], - ['friendica_5fplatform',['FRIENDICA_PLATFORM',['../boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3',1,'boot.php']]], + ['friendica_5fplatform',['RED_PLATFORM',['../boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3',1,'boot.php']]], ['friendica_5fsmarty_2ephp',['friendica_smarty.php',['../friendica__smarty_8php.html',1,'']]], - ['friendica_5fversion',['FRIENDICA_VERSION',['../boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be',1,'boot.php']]], + ['friendica_5fversion',['RED_VERSION',['../boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be',1,'boot.php']]], ['friendicasmarty',['FriendicaSmarty',['../classFriendicaSmarty.html',1,'']]], ['fsuggest_2ephp',['fsuggest.php',['../fsuggest_8php.html',1,'']]], ['fsuggest_5fcontent',['fsuggest_content',['../fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998',1,'fsuggest.php']]], diff --git a/doc/html/search/variables_66.js b/doc/html/search/variables_66.js index 0428e4aa6..7792b3963 100644 --- a/doc/html/search/variables_66.js +++ b/doc/html/search/variables_66.js @@ -5,6 +5,6 @@ var searchData= ['files',['files',['../namespacefriendica-to-smarty-tpl.html#ae74419b16516956c66f7db714a93a6ac',1,'friendica-to-smarty-tpl']]], ['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]], ['foreach',['foreach',['../typo_8php.html#a3bb638ebb8472e4ee7c85afe721f4fe3',1,'typo.php']]], - ['friendica_5fplatform',['FRIENDICA_PLATFORM',['../boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3',1,'boot.php']]], - ['friendica_5fversion',['FRIENDICA_VERSION',['../boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be',1,'boot.php']]] + ['friendica_5fplatform',['RED_PLATFORM',['../boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3',1,'boot.php']]], + ['friendica_5fversion',['RED_VERSION',['../boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be',1,'boot.php']]] ]; diff --git a/include/api.php b/include/api.php index 3f01b90af..91c5b419e 100644 --- a/include/api.php +++ b/include/api.php @@ -1541,8 +1541,8 @@ require_once('include/security.php'); 'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl, 'shorturllength' => '30', 'friendica' => array( - 'FRIENDICA_PLATFORM' => FRIENDICA_PLATFORM, - 'FRIENDICA_VERSION' => FRIENDICA_VERSION, + 'RED_PLATFORM' => RED_PLATFORM, + 'RED_VERSION' => RED_VERSION, 'ZOT_REVISION' => ZOT_REVISION, 'DB_UPDATE_VERSION' => DB_UPDATE_VERSION ) @@ -1577,12 +1577,12 @@ require_once('include/security.php'); if($type === 'xml') { header("Content-type: application/xml"); - echo '' . "\r\n" . '' . FRIENDICA_VERSION . '' . "\r\n"; + echo '' . "\r\n" . '' . RED_VERSION . '' . "\r\n"; killme(); } elseif($type === 'json') { header("Content-type: application/json"); - echo '"' . FRIENDICA_VERSION . '"'; + echo '"' . RED_VERSION . '"'; killme(); } } diff --git a/include/enotify.php b/include/enotify.php index c24c15188..f789d9bf1 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -34,7 +34,7 @@ function notification($params) { push_lang($recip['account_language']); // should probably have a channel language $banner = t('Red Notification'); - $product = FRIENDICA_PLATFORM; + $product = RED_PLATFORM; $siteurl = $a->get_baseurl(true); $thanks = t('Thank You,'); $sitename = get_config('system','sitename'); diff --git a/include/identity.php b/include/identity.php index 2b7085e85..c8910c018 100644 --- a/include/identity.php +++ b/include/identity.php @@ -257,7 +257,7 @@ function identity_basic_export($channel_id) { $ret = array(); - $ret['compatibility'] = array('project' => FRIENDICA_PLATFORM, 'version' => FRIENDICA_VERSION, 'database' => DB_UPDATE_VERSION); + $ret['compatibility'] = array('project' => RED_PLATFORM, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION); $r = q("select * from channel where channel_id = %d limit 1", intval($channel_id) diff --git a/include/items.php b/include/items.php index 27213b9d2..db00118bc 100755 --- a/include/items.php +++ b/include/items.php @@ -299,7 +299,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) $salmon = feed_salmonlinks($owner_nick); $atom .= replace_macros($feed_template, array( - '$version' => xmlify(FRIENDICA_VERSION), + '$version' => xmlify(RED_VERSION), '$feed_id' => xmlify($a->get_baseurl() . '/channel/' . $owner_nick), '$feed_title' => xmlify($owner['name']), '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) , diff --git a/mod/admin.php b/mod/admin.php index bda4b0794..4679e68e9 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -188,7 +188,7 @@ function admin_page_summary(&$a) { '$users' => Array( t('Registered users'), $users), '$accounts' => $accounts, '$pending' => Array( t('Pending registrations'), $pending), - '$version' => Array( t('Version'), FRIENDICA_VERSION), + '$version' => Array( t('Version'), RED_VERSION), '$build' => get_config('system','db_version'), '$plugins' => Array( t('Active plugins'), $a->plugins ) )); diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 7ea81fec1..f2f444fac 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -28,13 +28,13 @@ function siteinfo_init(&$a) { } $data = Array( - 'version' => FRIENDICA_VERSION, + 'version' => RED_VERSION, 'url' => z_root(), 'plugins' => $visible_plugins, 'register_policy' => $register_policy[$a->config['system']['register_policy']], 'admin' => $admin, 'site_name' => $a->config['sitename'], - 'platform' => FRIENDICA_PLATFORM, + 'platform' => RED_PLATFORM, 'info' => ((x($a->config,'info')) ? $a->config['info'] : '') ); @@ -48,7 +48,7 @@ function siteinfo_init(&$a) { function siteinfo_content(&$a) { if(! get_config('system','hidden_version_siteinfo')) - $version = sprintf( t('Version %s'), FRIENDICA_VERSION ); + $version = sprintf( t('Version %s'), RED_VERSION ); else $version = ""; diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 891c04657..997446818 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -28,7 +28,7 @@ else fi -F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php); +F9KVERSION=$(sed -n "s/.*'RED_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php); echo "Friendica version $F9KVERSION" diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 3e1a814c5..c6c1ea83f 100644 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@ - + diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index f1f02a2f0..704809f38 100644 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -16,7 +16,7 @@ $head_js + title="Search in Red" />
    $product
    $product
    $preamble