little stuff - name change, live updates, new network types

boot.php

@@ -8,8 +8,8 @@ require_once("include/pgettext.php");
 require_once('include/nav.php');
 require_once('include/cache.php');
 
-define ( 'FRIENDIKA_PLATFORM',     'Friendica');
-define ( 'FRIENDIKA_VERSION',      '2.3.1174' );
+define ( 'FRIENDICA_PLATFORM',     'Friendica');
+define ( 'FRIENDICA_VERSION',      '2.3.1174' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1105      );
 
@@ -100,6 +100,8 @@ define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known
 define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
 define ( 'NETWORK_MAIL',             'mail');    // IMAP/POP
 define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API     
+define ( 'NETWORK_LINKEDIN',         'lnkd');    // LinkedIn
+define ( 'NETWORK_XMPP',             'xmpp');    // XMPP     
 
 
 /**
@@ -415,7 +417,7 @@ class App {
 		$tpl = file_get_contents('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
 			'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
-			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION,
+			'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
 			'$delitem' => t('Delete this item?'),
 			'$comment' => t('Comment'),
 			'$showmore' => t('show more'),

include/delivery.php

@@ -241,7 +241,7 @@ function delivery_run($argv, $argc){
 				$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
 
 			$atom .= replace_macros($feed_template, array(
-					'$version'      => xmlify(FRIENDIKA_VERSION),
+					'$version'      => xmlify(FRIENDICA_VERSION),
 					'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
 					'$feed_title'   => xmlify($owner['name']),
 					'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,

include/items.php

@@ -143,7 +143,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(FRIENDIKA_VERSION),
+		'$version'      => xmlify(FRIENDICA_VERSION),
 		'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
 		'$feed_title'   => xmlify($owner['name']),
 		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,

include/notifier.php

@@ -323,7 +323,7 @@ function notifier_run($argv, $argc){
 		$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
 
 	$atom .= replace_macros($feed_template, array(
-			'$version'      => xmlify(FRIENDIKA_VERSION),
+			'$version'      => xmlify(FRIENDICA_VERSION),
 			'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
 			'$feed_title'   => xmlify($owner['name']),
 			'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,

include/remoteupdate.php

@@ -1,7 +1,7 @@
 <?php
-/* update friendika */
+/* update friendica */
 define('APIBASE', 'http://github.com/api/v2/');
-define('F9KREPO', 'friendika/friendika');
+define('F9KREPO', 'friendica/friendica');
 
 $up_totalfiles = 0;
 $up_countfiles = 0;
@@ -19,14 +19,14 @@ function checkUpdate(){
 	
 	if ($tag==0.0) return false;
 	$f = fetch_url("https://raw.github.com/".F9KREPO."/".$tag."/boot.php","r");
-	preg_match("|'FRIENDIKA_VERSION', *'([^']*)'|", $f, $m);
+	preg_match("|'FRIENDICA_VERSION', *'([^']*)'|", $f, $m);
 	$version =  $m[1];
 	
-	$lv = explode(".", FRIENDIKA_VERSION);
+	$lv = explode(".", FRIENDICA_VERSION);
 	$rv = explode(".",$version);
 	foreach($lv as $i=>$v){
 		if ((int)$lv[$i] < (int)$rv[$i]) {
-			return array($tag, $version, "https://github.com/friendika/friendika/zipball/".$tag);
+			return array($tag, $version, "https://github.com/friendica/friendica/zipball/".$tag);
 			break;
 		}
 	}

js/main.js

@@ -224,7 +224,7 @@
 
 		$.get(update_url,function(data) {
 			in_progress = false;
-			$('.ccollapse-wrapper',data).each(function() {
+			$('.collapsed-comments',data).each(function() {
 				var ident = $(this).attr('id');
 				var is_hidden = $('#' + ident).is(':hidden');
 				if($('#' + ident).length) {

mod/admin.php

@@ -146,7 +146,7 @@ function admin_page_summary(&$a) {
 		'$users' => Array( t('Registered users'), $users),
 		'$accounts' => $accounts,
 		'$pending' => Array( t('Pending registrations'), $pending),
-		'$version' => Array( t('Version'), FRIENDIKA_VERSION),
+		'$version' => Array( t('Version'), FRIENDICA_VERSION),
 		'$build' =>  get_config('system','build'),
 		'$plugins' => Array( t('Active plugins'), $a->plugins )
 	));
@@ -700,7 +700,7 @@ function admin_page_remoteupdate(&$a) {
 		'$baseurl' => $a->get_baseurl(),
 		'$submit' => t("Update now"),
 		'$close' => t("Close"),
-		'$localversion' => FRIENDIKA_VERSION,
+		'$localversion' => FRIENDICA_VERSION,
 		'$remoteversion' => $u[1],
 		'$needupdate' => $needupdate,
 		'$canwrite' => $canwrite,

mod/friendica.php

@@ -15,13 +15,13 @@ function friendica_init(&$a) {
 		}
 
 		$data = Array(
-			'version' => FRIENDIKA_VERSION,
+			'version' => FRIENDICA_VERSION,
 			'url' => z_root(),
 			'plugins' => $a->plugins,
 			'register_policy' =>  $register_policy[$a->config['register_policy']],
 			'admin' => $admin,
 			'site_name' => $a->config['sitename'],
-			'platform' => FRIENDIKA_PLATFORM,
+			'platform' => FRIENDICA_PLATFORM,
 			'info' => ((x($a->config,'info')) ? $a->config['info'] : '')			
 		);
 
@@ -40,7 +40,7 @@ function friendica_content(&$a) {
 
 	$o .= '<p></p><p>';
 
-	$o .= t('This is Friendica, version') . ' ' . FRIENDIKA_VERSION . ' ';
+	$o .= t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' ';
 	$o .= t('running at web location') . ' ' . z_root() . '</p><p>';
 
 	$o .= t('Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendica project.') . '</p><p>';	

update.php

@@ -885,7 +885,7 @@ function update_1102() {
 
 
 function update_1103() {
-	q("ALTER TABLE `item` ADD INDEX ( `wall` ) ");
+//	q("ALTER TABLE `item` ADD INDEX ( `wall` ) ");
 	q("ALTER TABLE `item` ADD FULLTEXT ( `tag` ) "); 
 	q("ALTER TABLE `contact` ADD INDEX ( `pending` ) ");
 	q("ALTER TABLE `user` ADD INDEX ( `hidewall` ) ");

util/run_xgettext.sh

@@ -3,9 +3,9 @@
 FULLPATH=$(dirname $(readlink -f "$0"))
 cd "$FULLPATH/../view/en/"
 
-F9KVERSION=$(sed -n "s/.*'FRIENDIKA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php);
+F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php);
 
-echo "Friendika version $F9KVERSION"
+echo "Friendica version $F9KVERSION"
 
 OPTS=
 OUTFILE="$FULLPATH/messages.po"
@@ -25,11 +25,11 @@ echo "extract strings to $OUTFILE.."
 find ../../ -name "*.php" | xargs xgettext $KEYWORDS $OPTS -o "$OUTFILE" --from-code=UTF-8
 
 echo "setup base info.."
-sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDIKA Distributed Social Network/g" "$OUTFILE"
-sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011 Mike Macgirvin/g" "$OUTFILE"
+sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDICA Distributed Social Network/g" "$OUTFILE"
+sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011 the Friendica Project/g" "$OUTFILE"
 sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
 sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
-sed -i "s/PACKAGE/Friendika/g" "$OUTFILE"
+sed -i "s/PACKAGE/Friendica/g" "$OUTFILE"
 sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
 sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE"
 

view/cs/messages.po

@@ -1,4 +1,4 @@
-# FRIENDIKA Distributed Social Network
+# FRIENDICA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # 

view/de/messages.po

@@ -1,4 +1,4 @@
-# FRIENDIKA Distributed Social Network
+# FRIENDICA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # 

view/es/messages.po

@@ -1,4 +1,4 @@
-# FRIENDIKA Distributed Social Network
+# FRIENDICA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # 

view/fr/messages.po

@@ -1,4 +1,4 @@
-# FRIENDIKA Distributed Social Network
+# FRIENDICA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # 

view/it/messages.po

@@ -1,4 +1,4 @@
-# FRIENDIKA Distributed Social Network
+# FRIENDICA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # 

view/pt-br/messages.po

@@ -1,4 +1,4 @@
-# FRIENDIKA Distributed Social Network
+# FRIENDICA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # 

view/ru/messages.po

@@ -1,4 +1,4 @@
-# FRIENDIKA Distributed Social Network
+# FRIENDICA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 #