harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

begin to cut the umbilical

Browse Source
This commit is contained in:
friendica 2013-04-14 22:24:47 -07:00
parent e411a4bdc2
commit b84d8bfbc9
19 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -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

4
README
View File

@ -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.

6
boot.php
View File

@ -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(),

8
doc/html/boot_8php.html
View File

@ -210,9 +210,9 @@ Functions</h2></td></tr>
</table><table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="var-members"></a>
Variables</h2></td></tr>
<tr class="memitem:a7a27d05ec84f9eef2f06097e6b8892f3"><td class="memItemLeft" align="right" valign="top">const&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3">FRIENDICA_PLATFORM</a> 'Friendica Red'</td></tr>
<tr class="memitem:a7a27d05ec84f9eef2f06097e6b8892f3"><td class="memItemLeft" align="right" valign="top">const&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3">RED_PLATFORM</a> 'Friendica Red'</td></tr>
<tr class="separator:a7a27d05ec84f9eef2f06097e6b8892f3"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a78d5f284dc096b2a739c1fa47f22b7be"><td class="memItemLeft" align="right" valign="top">const&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be">FRIENDICA_VERSION</a> trim(file_get_contents('version.inc')) . 'R'</td></tr>
<tr class="memitem:a78d5f284dc096b2a739c1fa47f22b7be"><td class="memItemLeft" align="right" valign="top">const&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be">RED_VERSION</a> trim(file_get_contents('version.inc')) . 'R'</td></tr>
<tr class="separator:a78d5f284dc096b2a739c1fa47f22b7be"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a36b31575f992a10b5927b76efba9362e"><td class="memItemLeft" align="right" valign="top">const&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="boot_8php.html#a36b31575f992a10b5927b76efba9362e">ZOT_REVISION</a> 1</td></tr>
<tr class="separator:a36b31575f992a10b5927b76efba9362e"><td class="memSeparator" colspan="2">&#160;</td></tr>
@ -2203,7 +2203,7 @@ Variables</h2></td></tr>
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">const FRIENDICA_PLATFORM 'Friendica Red'</td>
<td class="memname">const RED_PLATFORM 'Friendica Red'</td>
</tr>
</table>
</div><div class="memdoc">
@ -2221,7 +2221,7 @@ Variables</h2></td></tr>
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">const FRIENDICA_VERSION trim(file_get_contents('version.inc')) . 'R'</td>
<td class="memname">const RED_VERSION trim(file_get_contents('version.inc')) . 'R'</td>
</tr>
</table>
</div><div class="memdoc">

4
doc/html/boot_8php.js
View File

@ -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 ],

4
doc/html/globals_0x66.html
View File

@ -279,10 +279,10 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
<li>format_term_for_display()
: <a class="el" href="text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1">text.php</a>
</li>
<li>FRIENDICA_PLATFORM
<li>RED_PLATFORM
: <a class="el" href="boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3">boot.php</a>
</li>
<li>FRIENDICA_VERSION
<li>RED_VERSION
: <a class="el" href="boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be">boot.php</a>
</li>
<li>fsuggest_content()

4
doc/html/globals_vars_0x66.html
View File

@ -142,10 +142,10 @@ $(document).ready(function(){initNavTree('globals_vars_0x66.html','');});
<li>foreach
: <a class="el" href="typo_8php.html#a3bb638ebb8472e4ee7c85afe721f4fe3">typo.php</a>
</li>
<li>FRIENDICA_PLATFORM
<li>RED_PLATFORM
: <a class="el" href="boot_8php.html#a7a27d05ec84f9eef2f06097e6b8892f3">boot.php</a>
</li>
<li>FRIENDICA_VERSION
<li>RED_VERSION
: <a class="el" href="boot_8php.html#a78d5f284dc096b2a739c1fa47f22b7be">boot.php</a>
</li>
</ul>

4
doc/html/search/all_66.js
View File

@ -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']]],

4
doc/html/search/variables_66.js
View File

@ -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']]]
];

8
include/api.php
View File

@ -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 '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . FRIENDICA_VERSION . '</version>' . "\r\n";
echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>' . RED_VERSION . '</version>' . "\r\n";
killme();
}
elseif($type === 'json') {
header("Content-type: application/json");
echo '"' . FRIENDICA_VERSION . '"';
echo '"' . RED_VERSION . '"';
killme();
}
}

2
include/enotify.php
View File

@ -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');

2
include/identity.php
View File

@ -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)

2
include/items.php
View File

@ -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)) ,

2
mod/admin.php
View File

@ -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 )
));

6
mod/siteinfo.php
View File

@ -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 = "";

2
util/run_xgettext.sh
View File

@ -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"

2
view/tpl/email_notify_html.tpl
View File

@ -7,7 +7,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/fred-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr>
<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/r!.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr>

2
view/tpl/head.tpl
View File

@ -16,7 +16,7 @@ $head_js
<link rel="search"
href="$baseurl/opensearch"
type="application/opensearchdescription+xml"
title="Search in Friendica" />
title="Search in Red" />
<script>

2
view/tpl/smarty3/email_notify_html.tpl
View File

@ -12,7 +12,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/fred-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/r!.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>