Merge remote branch 'upstream/master'

boot.php

@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1314' );
+define ( 'FRIENDICA_VERSION',      '2.3.1320' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1138      );
 

include/api.php

@@ -567,8 +567,17 @@
 		$_REQUEST['profile_uid'] = local_user();
 		if(requestdata('parent'))
 			$_REQUEST['type'] = 'net-comment';
-		else
+		else {
 			$_REQUEST['type'] = 'wall';
+                        if(x($_FILES,'media')) {
+		                // upload the image if we have one
+		                $_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+			        require_once('mod/wall_upload.php');
+			        $media = wall_upload_post($a);
+		                if(strlen($media)>0)
+				        $_REQUEST['body'] .= "\n\n".$media;
+			        }
+		}
 
 		// set this so that the item_post() function is quiet and doesn't redirect or emit json
 

include/diaspora.php

@@ -1172,7 +1172,7 @@ function diaspora_comment($importer,$xml,$msg) {
 		proc_run('php','include/notifier.php','comment',$message_id);
 	}
 
-	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ",
 		dbesc($parent_item['uri']),
 		intval($importer['uid'])
 	);

include/items.php

@@ -2479,7 +2479,7 @@ function local_delivery($importer,$data) {
 			
 				if(!x($datarray['type']) || $datarray['type'] != 'activity') {
 
-					$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+					$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
 						dbesc($parent_uri),
 						intval($importer['importer_uid'])
 					);

mod/ping.php

@@ -134,6 +134,8 @@ function ping_init(&$a) {
 
 
 		function xmlize($href, $name, $url, $photo, $date, $seen, $message){
+			$data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
+			call_hooks('ping_xmlize', $data);
 			$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>';
 			return sprintf ( $notsxml,
 				xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)

mod/settings.php

@@ -697,7 +697,7 @@ function settings_content(&$a) {
 		$allowed_themes = array();
 		if(count($allowed_themes_raw))
 			foreach($allowed_themes_raw as $x) 
-				if(strlen(trim($x)))
+				if(strlen(trim($x)) && is_dir("view/theme/$x"))
 					$allowed_themes[] = trim($x);
 
 		

mod/wall_upload.php

@@ -5,19 +5,26 @@ require_once('Photo.php');
 function wall_upload_post(&$a) {
 
 	if($a->argc > 1) {
-		$nick = $a->argv[1];
-		$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
-			dbesc($nick)
-		);
-		if(! count($r))
-			return;
+	        if(! x($_FILES,'media')) {
+		        $nick = $a->argv[1];
+		        $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+			        dbesc($nick)
+		        );
 
+		        if(! count($r))
+                                return;
+		}
+                else {
+			$user_info = api_get_user($a);
+		        $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+			        dbesc($user_info['screen_name'])
+		        );
+                }
 	}
 	else
 		return;
 
 
-
 	$can_post  = false;
 	$visitor   = 0;
 
@@ -47,12 +54,19 @@ function wall_upload_post(&$a) {
 		killme();
 	}
 
-	if(! x($_FILES,'userfile'))
+	if(! x($_FILES,'userfile') && ! x($_FILES,'media'))
 		killme();
 
-	$src      = $_FILES['userfile']['tmp_name'];
-	$filename = basename($_FILES['userfile']['name']);
-	$filesize = intval($_FILES['userfile']['size']);
+        if(x($_FILES,'userfile')) {
+	        $src      = $_FILES['userfile']['tmp_name'];
+	        $filename = basename($_FILES['userfile']['name']);
+	        $filesize = intval($_FILES['userfile']['size']);
+        }
+        elseif(x($_FILES,'media')) {
+	        $src = $_FILES['media']['tmp_name'];
+                $filename = basename($_FILES['media']['name']);
+	        $filesize = intval($_FILES['media']['size']);
+        }
 
 	$maximagesize = get_config('system','maximagesize');
 

view/de/friend_complete_eml.tpl

@@ -1,22 +1,22 @@
 
-Liebe/r $username,
+Hallo $[username],
 
-großartige Neuigkeiten... '$fn' von '$dfrn_url' hat deine Kontaktaufnahme auf
-'$sitename' bestätigt.
+	Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat 
+deine Kontaktanfrage auf '$[sitename]' bestätigt.
 
-Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Fotos und
-EMail ohne Einschränkungen austauschen.
+Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
+ohne einschränkungen austauschen.
 
-Bitte rufe deine 'Kontakte' Seite auf $sitename auf um du Änderungen an
-dieser Freundschaft vorzunehmen.
+Rufe deine 'Kontakte' Seite auf $[sitename] auf wenn du 
+Änderungen an diesem Kontakt vornehmen willst. 
 
-$siteurl
+$[siteurl]
 
-[Du könntest zum Beispiel ein neue Profil anlegen mit Informationen die nicht
-für die Allgemeinheit bestimmt sind, die du aber gerne mit '$fn' teilen
-möchtest].
+[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthällt
+die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
 
-Mit freundlichen Grüßen
-        $sitename Administrator
+Beste Grüße,
+
+	$[sitename] Administrator
 
  

view/de/intro_complete_eml.tpl

@@ -1,18 +1,22 @@
 
-Liebe/r $username,
+Hallo $[username],
 
-'$fn' von '$dfrn_url' hat deine Kontaktanfrage auf '$sitename' bestätigt.
+	'$[fn]' auf '$[dfrn_url]' wurde akzeptiert 
+Deine Verbindungsanfrage auf '$[sitename]'.
 
-'$fn' hat sich dazu entschlossen dich als "Fan" mit eingeschränkten
-Kommunikationsmöglichkeiten zu akzeptieren. Dies umfasst private Nachrichten
-und einige Profilaktivitäten. Sollte dies eine Prominenten oder
-Gemeinschaftsseite sein, wurden diese Einstellungen automatisch vorgenommen.
+	'$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was ein 
+paar Formen der Kommunikation einschränkt - wie das schreiben von privaten Nachrichten und einige Profil
+Interaktionen. Wenn das ein Promi-Konto oder eine Forum-Seite ist, werden die Einstellungen
+automatisch angewendet.
 
-'$fn' kann sich in Zukunft dazu entschließen eure Beziehung in eine beidseitige
-Freundschaft oder freizügigere Beziehung zu erweitern.
+	'$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende 
+Beziehung in der Zukunft erweitert wird. 
 
-Ab sofort wirst du Statusmitteilungen von '$fn' erhalten, die auf deiner
-'Netzwerkseite' erscheinen werden.
+	Du empfängst jetzt die öffentlichen Beiträge von '$[fn]', 
+welche auf der "Netzwerk" Seite erscheinen werden  
 
-Mit freundlichen Grüßen,
-        $sitename Administrator
+$[siteurl]
+
+Beste Grüße,
+
+	$[sitename] Administrator

view/de/passchanged_eml.tpl

@@ -1,20 +1,20 @@
 
-Liebe/r $username,
-dein Passwort wurde wie gewünscht geändert. Bitte hebe diese Informationen
-für deine Unterlagen auf (oder ändere das Passwort augenblicklich in etwas
-das du dir merken kannst).
+Hallo $[username],
+	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
+Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort 
+in etwas, was du dir merken kannst).
 
 
-Deine Anmeldedaten sind die Folgenden:
+Deine Login Daten wurden wie folgt geändert:
 
-Adresse der Seite:	$siteurl
-Anmelde Name:	$email
-Passwort:	$new_password
+Adresse der Seite:	$[siteurl]
+Login Name:	$[email]
+Passwort:	$[new_password]
 
-Du kannst diesen Passwort auf der "Einstellungen" Seite deines Accounts
-ändern nachdem du angemeldet bits.
+Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
 
 
-Viele Grüße,
-	$sitename Administrator
+Beste Grüße,
+	$[sitename] Administrator
+
  

view/de/register_open_eml.tpl

@@ -1,19 +1,34 @@
 
-Liebe/r $username,
-danke für die Registrierung bei $sitename. Dein neuer Account wurde angelegt.
-Die Anmeldedetails sind die Folgenden.
+Hallo $[username],
+	Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. 
+Die Login Details sind die folgenden:
 
-Adresse der Seite: $siteurl
-Anmelde Name: $email
-Passwort: $password
 
-Du kannst dein Passwort auf der "Einstellungen" Seite deines Accounts ändern
-nachdem du dich angemeldet hast.
+Adresse der Seite:	$[siteurl]
+Login Name:	$[email]
+Passwort:	$[password]
 
-Nimm dir bitte ein paar Augenblicke Zeit um die anderen Einstellungen deines
-Accounts zu bearbeiten. 
+Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern 
+nachdem du dich eingeloggt hast.
+
+Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen.
+
+Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen 
+(auf der "Profile" Seite) damit andere Leute dich einfacher finden können.
+
+Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto,
+ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und 
+natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest
+dann das.
+
+Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig. 
+Wenn Du hier neu bist und keinen kennst, wird man Dir helfen
+ein paar neue und interessante Freunde zu  finden.  
+
+
+Danke dir und willkommen auf $[sitename].
+
+Beste Grüße,
+	$[sitename] Administrator
 
-Vielen Dank und Willkommen auf $sitename.
  
-Mit freundlichem Gruß,
-	$sitename Administrator

view/de/register_verify_eml.tpl

@@ -1,21 +1,25 @@
 
-Ein neuer Nutzer hat sich auf $sitename registriert. Diese Registration
-benötigt noch deine Zustimmung.
-
-Die Anmeldedetails sind Folgende:
-
-Kompletter Name: $username
-Adresse der Seite: $siteurl
-Anmelde Name: $email
+Eine Neuanmeldung auf $[sitename] benötigt 
+deine Aufmerksamkeit. 
 
 
-Um dieser Anmeldung zuzustimmen folge bitte diesem Link:
+Die Login-Einzelheiten sind die folgenden:
 
-$siteurl/regmod/allow/$hash 
+Kompletter Name:	$[username]
+Adresse der Seite:	$[siteurl]
+Login Name:	$[email]
 
 
-Um die Anfrage abzulehen und den Account zu entfernen folge diesem Link:
+Um die Anfrage zu bestätigen besuche bitte:
 
-$siteurl/regmod/deny/$hash
 
-Besten Dank!
+$[siteurl]/regmod/allow/$[hash] 
+
+
+Um die Anfrage abzulehnen und den Account zu löschen besuche bitte:
+
+
+$[siteurl]/regmod/deny/$[hash]
+
+
+Danke!

view/de/request_notify_eml.tpl

@@ -1,14 +1,17 @@
 
-Liebe/r $myname,
+Hallo $[myname],
 
-du hast gerade eine Kontaktanfrage von '$requestor' auf $sitename erhalten.
+du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename] 
 
-Du kannst dir das Profil unter $url ansehen.
+erhalten.
 
-Bitte melde dich auf deiner Seite an um die komplette Vorstellung anzusehen
-und bestätige oder ignoriere die Anfrage.
+Du kannst sein/ihr Profil unter $[url] finden.
 
-$siteurl
+Bitte melde dich an um die komplette Vorstellung einzusehen 
+und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
 
-Schöne Grüße,
-	$sitename Administrator
+$[siteurl]
+
+Beste Grüße,
+
+	$[sitename] Administrator

view/de/strings.php

@@ -1214,7 +1214,7 @@ $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["PostIt to Friendica"] = "Bei Friendica posten";
 $a->strings["Post to Friendica"] = "Wenn du diesen Link";
-$a->strings[" from anywhere by bookmarking this Link."] = " zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
+$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
 $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
 $a->strings["Your profile page"] = "Deine Profilseite";
 $a->strings["Your contacts"] = "Deine Kontakte";

view/theme/diabook-blue/communityhome.tpl

@@ -1,87 +0,0 @@
-<div id="close_pages">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
-<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $lastusers_title }}
-<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
-$nv.search
-{{ endif }}
-</div>
-
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>

view/theme/diabook-blue/photo_view.tpl

@@ -1,37 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
-
-

view/theme/diabook-blue/theme.php

@@ -1,486 +0,0 @@
-<?php
-
-/*
- * Name: Diabook-blue
- * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.020)
- * Author: 
- */
-
-
-//print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.020)";
-$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
-
-//change css on network and profilepages
-$cssFile = null;
-$resolution=false;
-$resolution = get_pconfig(local_user(), "diabook-blue", "resolution");
-if ($resolution===false) $resolution="normal";
-
-/**
- * prints last community activity
- */
-function diabook_blue_community_info(){
-	$a = get_app();
-
-	// last 12 users
-	$aside['$lastusers_title'] = t('Last users');
-	$aside['$lastusers_items'] = array();
-	$sql_extra = "";
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-	$order = " ORDER BY `register_date` DESC ";
-
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
-			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
-		0,
-		9
-	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-	if(count($r)) {
-		$photo = 'thumb';
-		foreach($r as $rr) {
-			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-			));
-			$aside['$lastusers_items'][] = $entry;
-		}
-	}
-	
-	
-	// last 10 liked items
-	$aside['$like_title'] = t('Last likes');
-	$aside['$like_items'] = array();
-	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
-			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
-			GROUP BY `uri`
-			ORDER BY `T1`.`created` DESC
-			LIMIT 0,5",
-			$a->get_baseurl(),$a->get_baseurl()
-			);
-
-	foreach ($r as $rr) {
-		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
-		switch($rr['verb']){
-			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
-					case 'http://activitystrea.ms/schema/1.0/event':
-						$post_type = t('event');
-						break;
-					default:
-						$post_type = t('status');
-				}
-				break;
-			default:
-				if ($rr['resource-id']){
-					$post_type = t('photo');
-					$m=array();	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
-					$rr['plink'] = $m[1];
-				} else {
-					$post_type = t('status');
-				}
-		}
-		$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
-
-		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-		
-	}
-	
-	
-	// last 12 photos
-	$aside['$photos_title'] = t('Last photos');
-	$aside['$photos_items'] = array();
-	$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM 
-				(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` 
-					WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
-						AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
-				INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-				`user` 
-				WHERE `user`.`uid` = `photo`.`uid`
-				AND `user`.`blockwall`=0
-				AND `user`.`hidewall`=0
-				ORDER BY `photo`.`edited` DESC
-				LIMIT 0, 9",
-				dbesc(t('Contact Photos')),
-				dbesc(t('Profile Photos'))
-				);
-		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
-		foreach($r as $rr) {
-			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-		
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $photo_page,
-				'$photo' => $photo_url,
-				'$alt-text' => $rr['username']." : ".$rr['desc'],
-			));
-
-			$aside['$photos_items'][] = $entry;
-		}
-	}
-	
-   
-   //nav FIND FRIENDS
-	if(local_user()) {
-	$nv = array();
-	$nv['title'] = Array("", t('Find Friends'), "", "");
-	$nv['directory'] = Array('directory', t('Local Directory'), "", "");
-	$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
-	$nv['match'] = Array('match', t('Similar Interests'), "", "");
-	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
-	
-	$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
-						<span class="sbox_l"></span>
-						<span class="sbox">
-						<input type="text" name="search" size="13" maxlength="50">
-						</span>
-						<span class="sbox_r" id="srch_clear"></span>';
-						
-	$aside['$nv'] = $nv;
-	};
-	//Community Page
-	if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-	
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div></div>';
-	//if (sizeof($contacts) > 0)
-		
-		$aside['$page'] = $page;
-	}		
-  //END Community Page
-  //helpers
-   $helpers = array();
-	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
-	$aside['$helpers'] = $helpers;
-   //end helpers
-   //connectable services
-   $con_services = array();
-	$con_services['title'] = Array("", t('Connect Services'), "", "");
-	
-	$aside['$con_services'] = $con_services;
-   //end connectable services
-   
-  
-   //get_baseurl   
-   $url = $a->get_baseurl($ssl_state);   
-   $aside['$url'] = $url;
-
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['right_aside'] = replace_macros($tpl, $aside);
-	
-}
-
-
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));		
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_blue_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network-wide.css";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "7") {
-	// COMMUNITY
-	diabook_blue_community_info();
-	
-	// CUSTOM CSS
-	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";}
-	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile-wide.css";}
-	}
-}
-
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
-
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
-
-//js scripts
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
-
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-	
-}
-
-
-$a->page['htmlhead'] .= '
-
-<script>
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
- });
-  
- </script>';
- 
-$a->page['htmlhead'] .= '
-
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
-
-$a->page['htmlhead'] .= '
- <script>
- 
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-    });
-      
-
-});
-
-function yt_iframe() {
-	
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-  
- </script>';
-
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "7") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
-	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
-	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
-	alert("Right-hand column was restored. Please refresh your browser");
-  }
-</script>';}
-
-$a->page['htmlhead'] .= ' 
-
-<script type="text/javascript">
-function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-											}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-}
-</script> ';

view/theme/diabook-red/admin_users.tpl

@@ -1,89 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>

view/theme/diabook-red/ch_directory_item.tpl

@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-</div>

view/theme/diabook-red/comment_item.tpl

@@ -1,41 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>

view/theme/diabook-red/config.php

@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-red', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-red', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-red', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-blue-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-red', 'font_size', $_POST['diabook-red_font_size']);
-		set_pconfig(local_user(), 'diabook-red', 'line_height', $_POST['diabook-red_line_height']);
-		set_pconfig(local_user(), 'diabook-red', 'resolution', $_POST['diabook-red_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-red', 'font_size' );
-	$line_height = get_config('diabook-red', 'line_height' );
-	$resolution = get_config('diabook-red', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-red-settings-submit'])){
-		set_config('diabook-red', 'font_size', $_POST['diabook-red_font_size']);
-		set_config('diabook-red', 'line_height', $_POST['diabook-red_line_height']);
-		set_config('diabook-red', 'resolution', $_POST['diabook-red_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-red_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}

view/theme/diabook-red/contact_template.tpl

@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>

view/theme/diabook-red/directory_item.tpl

@@ -1,11 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-			</a>
-		</div>
-	</div>
-	<div class="contact-name" id="directory-name-$id">$name</div>
-</div>

view/theme/diabook-red/generic_links_widget.tpl

@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>

view/theme/diabook-red/group_side.tpl

@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-				<a href="$group.href" class="menu-profile-list-item">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-	 {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-