From f980b79edcff78a849d65de15f36f2b0475665d7 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 6 Apr 2012 11:19:12 +0200
Subject: [PATCH 1/6] new-contacts-introductions in contacts-drop-down and
 new-messages in messages-drop-down get each an additional indicator...
 profile-picture is now scaled right in firefox... fixed broken css on
 introductions-page in firefox...

---
 js/main.js                                    |  12 ++++++---
 view/theme/diabook-aerith/communityhome.tpl   |   0
 .../theme/diabook-aerith/contact_template.tpl |   0
 view/theme/diabook-aerith/directory_item.tpl  |   0
 view/theme/diabook-aerith/fpostit/fpostit.js  |   0
 view/theme/diabook-aerith/group_side.tpl      |   0
 view/theme/diabook-aerith/icons/attach.png    | Bin
 view/theme/diabook-aerith/icons/audio.png     | Bin
 view/theme/diabook-aerith/icons/camera.png    | Bin
 view/theme/diabook-aerith/icons/close_box.png | Bin
 view/theme/diabook-aerith/icons/drop.png      | Bin
 view/theme/diabook-aerith/icons/file_as.png   | Bin
 view/theme/diabook-aerith/icons/link.png      | Bin
 view/theme/diabook-aerith/icons/lock.png      | Bin
 view/theme/diabook-aerith/icons/lupe.png      | Bin
 view/theme/diabook-aerith/icons/messages.png  | Bin
 view/theme/diabook-aerith/icons/messages2.png | Bin
 view/theme/diabook-aerith/icons/next.png      | Bin
 .../diabook-aerith/icons/notifications.png    | Bin
 view/theme/diabook-aerith/icons/notify.png    | Bin
 view/theme/diabook-aerith/icons/notify2.png   | Bin
 view/theme/diabook-aerith/icons/pencil.png    | Bin
 .../theme/diabook-aerith/icons/photo-menu.jpg | Bin
 view/theme/diabook-aerith/icons/prev.png      | Bin
 view/theme/diabook-aerith/icons/recycle.png   | Bin
 view/theme/diabook-aerith/icons/remote.png    | Bin
 .../theme/diabook-aerith/icons/scroll_top.png | Bin
 view/theme/diabook-aerith/icons/selected.png  | Bin
 view/theme/diabook-aerith/icons/star.png      | Bin
 view/theme/diabook-aerith/icons/starred.png   | Bin
 view/theme/diabook-aerith/icons/tagged.png    | Bin
 view/theme/diabook-aerith/icons/unlock.png    | Bin
 view/theme/diabook-aerith/icons/unstarred.png | Bin
 view/theme/diabook-aerith/icons/video.png     | Bin
 view/theme/diabook-aerith/icons/weblink.png   | Bin
 view/theme/diabook-aerith/jot.tpl             |   0
 view/theme/diabook-aerith/mail_conv.tpl       |   0
 view/theme/diabook-aerith/nav.tpl             |   4 +--
 view/theme/diabook-aerith/photo_view.tpl      |   0
 view/theme/diabook-aerith/profile_vcard.tpl   |   2 +-
 view/theme/diabook-aerith/rs_common_tabs.tpl  |   0
 view/theme/diabook-aerith/search_item.tpl     |   0
 view/theme/diabook-aerith/style-network.css   |   7 ++---
 view/theme/diabook-aerith/style-profile.css   |   6 ++---
 view/theme/diabook-aerith/style.css           |  24 +++++++++++++++---
 view/theme/diabook-aerith/theme.php           |   2 +-
 view/theme/diabook-blue/communityhome.tpl     |   0
 view/theme/diabook-blue/contact_template.tpl  |   0
 view/theme/diabook-blue/directory_item.tpl    |   0
 view/theme/diabook-blue/fpostit/fpostit.js    |   0
 view/theme/diabook-blue/group_side.tpl        |   0
 view/theme/diabook-blue/icons/attach.png      | Bin
 view/theme/diabook-blue/icons/audio.png       | Bin
 view/theme/diabook-blue/icons/camera.png      | Bin
 view/theme/diabook-blue/icons/close_box.png   | Bin
 view/theme/diabook-blue/icons/contacts2.png   | Bin
 view/theme/diabook-blue/icons/drop.png        | Bin
 view/theme/diabook-blue/icons/file_as.png     | Bin
 view/theme/diabook-blue/icons/link.png        | Bin
 view/theme/diabook-blue/icons/lock.png        | Bin
 view/theme/diabook-blue/icons/lupe.png        | Bin
 view/theme/diabook-blue/icons/messages.png    | Bin
 view/theme/diabook-blue/icons/next.png        | Bin
 .../diabook-blue/icons/notifications.png      | Bin
 view/theme/diabook-blue/icons/notify.png      | Bin
 view/theme/diabook-blue/icons/pencil.png      | Bin
 view/theme/diabook-blue/icons/prev.png        | Bin
 view/theme/diabook-blue/icons/recycle.png     | Bin
 view/theme/diabook-blue/icons/remote.png      | Bin
 view/theme/diabook-blue/icons/scroll_top.png  | Bin
 view/theme/diabook-blue/icons/selected.png    | Bin
 view/theme/diabook-blue/icons/star.png        | Bin
 view/theme/diabook-blue/icons/starred.png     | Bin
 view/theme/diabook-blue/icons/tagged.png      | Bin
 view/theme/diabook-blue/icons/unlock.png      | Bin
 view/theme/diabook-blue/icons/unstarred.png   | Bin
 view/theme/diabook-blue/icons/video.png       | Bin
 view/theme/diabook-blue/icons/weblink.png     | Bin
 view/theme/diabook-blue/jot.tpl               |   0
 view/theme/diabook-blue/mail_conv.tpl         |   0
 view/theme/diabook-blue/nav.tpl               |   4 +--
 view/theme/diabook-blue/photo_view.tpl        |   0
 view/theme/diabook-blue/profile_vcard.tpl     |   2 +-
 view/theme/diabook-blue/rs_common_tabs.tpl    |   0
 view/theme/diabook-blue/search_item.tpl       |   0
 view/theme/diabook-blue/style-network.css     |   7 ++---
 view/theme/diabook-blue/style-profile.css     |   6 ++---
 view/theme/diabook-blue/style.css             |  24 +++++++++++++++---
 view/theme/diabook-blue/theme.php             |   2 +-
 view/theme/diabook-red/communityhome.tpl      |   0
 view/theme/diabook-red/contact_template.tpl   |   0
 view/theme/diabook-red/directory_item.tpl     |   0
 view/theme/diabook-red/fpostit/fpostit.js     |   0
 view/theme/diabook-red/group_side.tpl         |   0
 view/theme/diabook-red/icons/attach.png       | Bin
 view/theme/diabook-red/icons/audio.png        | Bin
 view/theme/diabook-red/icons/camera.png       | Bin
 view/theme/diabook-red/icons/close_box.png    | Bin
 view/theme/diabook-red/icons/contacts.png     | Bin
 view/theme/diabook-red/icons/contacts2.png    | Bin
 view/theme/diabook-red/icons/drop.png         | Bin
 view/theme/diabook-red/icons/file_as.png      | Bin
 view/theme/diabook-red/icons/link.png         | Bin
 view/theme/diabook-red/icons/lock.png         | Bin
 view/theme/diabook-red/icons/lupe.png         | Bin
 view/theme/diabook-red/icons/next.png         | Bin
 .../theme/diabook-red/icons/notifications.png | Bin
 view/theme/diabook-red/icons/pencil.png       | Bin
 view/theme/diabook-red/icons/photo-menu.jpg   | Bin
 view/theme/diabook-red/icons/prev.png         | Bin
 view/theme/diabook-red/icons/recycle.png      | Bin
 view/theme/diabook-red/icons/remote.png       | Bin
 view/theme/diabook-red/icons/scroll_top.png   | Bin
 view/theme/diabook-red/icons/selected.png     | Bin
 view/theme/diabook-red/icons/star.png         | Bin
 view/theme/diabook-red/icons/starred.png      | Bin
 view/theme/diabook-red/icons/tagged.png       | Bin
 view/theme/diabook-red/icons/unlock.png       | Bin
 view/theme/diabook-red/icons/unstarred.png    | Bin
 view/theme/diabook-red/icons/video.png        | Bin
 view/theme/diabook-red/icons/weblink.png      | Bin
 view/theme/diabook-red/jot.tpl                |   0
 view/theme/diabook-red/mail_conv.tpl          |   0
 view/theme/diabook-red/nav.tpl                |   4 +--
 view/theme/diabook-red/photo_view.tpl         |   0
 view/theme/diabook-red/rs_common_tabs.tpl     |   0
 view/theme/diabook-red/search_item.tpl        |   0
 view/theme/diabook-red/style-network.css      |   8 +++---
 view/theme/diabook-red/style-profile.css      |   6 ++---
 view/theme/diabook-red/style.css              |  24 +++++++++++++++---
 view/theme/diabook-red/theme.php              |   2 +-
 view/theme/diabook/communityhome.tpl          |   0
 view/theme/diabook/contact_template.tpl       |   0
 view/theme/diabook/directory_item.tpl         |   0
 view/theme/diabook/fpostit/fpostit.js         |   0
 view/theme/diabook/group_side.tpl             |   0
 view/theme/diabook/icons/attach.png           | Bin
 view/theme/diabook/icons/audio.png            | Bin
 view/theme/diabook/icons/camera.png           | Bin
 view/theme/diabook/icons/close_box.png        | Bin
 view/theme/diabook/icons/contacts2.png        | Bin
 view/theme/diabook/icons/drop.png             | Bin
 view/theme/diabook/icons/expand.png           | Bin
 view/theme/diabook/icons/file_as.png          | Bin
 view/theme/diabook/icons/link.png             | Bin
 view/theme/diabook/icons/lock.png             | Bin
 view/theme/diabook/icons/lupe.png             | Bin
 view/theme/diabook/icons/messages.png         | Bin
 view/theme/diabook/icons/next.png             | Bin
 view/theme/diabook/icons/notifications.png    | Bin
 view/theme/diabook/icons/notify.png           | Bin
 view/theme/diabook/icons/pencil.png           | Bin
 view/theme/diabook/icons/prev.png             | Bin
 view/theme/diabook/icons/recycle.png          | Bin
 view/theme/diabook/icons/remote.png           | Bin
 view/theme/diabook/icons/scroll_top.png       | Bin
 view/theme/diabook/icons/selected.png         | Bin
 view/theme/diabook/icons/star.png             | Bin
 view/theme/diabook/icons/starred.png          | Bin
 view/theme/diabook/icons/tagged.png           | Bin
 view/theme/diabook/icons/unlock.png           | Bin
 view/theme/diabook/icons/unstarred.png        | Bin
 view/theme/diabook/icons/video.png            | Bin
 view/theme/diabook/icons/weblink.png          | Bin
 view/theme/diabook/jot.tpl                    |   0
 view/theme/diabook/mail_conv.tpl              |   0
 view/theme/diabook/nav.tpl                    |   4 +--
 view/theme/diabook/photo_view.tpl             |   0
 view/theme/diabook/profile_vcard.tpl          |   2 +-
 view/theme/diabook/rs_common_tabs.tpl         |   0
 view/theme/diabook/search_item.tpl            |   0
 view/theme/diabook/style-profile.css          |   2 ++
 view/theme/diabook/style.css                  |  20 +++++++++++++++
 view/theme/diabook/theme.php                  |  15 ++++-------
 174 files changed, 135 insertions(+), 54 deletions(-)
 mode change 100644 => 100755 js/main.js
 mode change 100644 => 100755 view/theme/diabook-aerith/communityhome.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/contact_template.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/directory_item.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/fpostit/fpostit.js
 mode change 100644 => 100755 view/theme/diabook-aerith/group_side.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/attach.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/audio.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/camera.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/close_box.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/drop.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/file_as.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/link.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/lock.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/lupe.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/messages.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/messages2.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/next.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/notifications.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/notify.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/notify2.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/pencil.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/photo-menu.jpg
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/prev.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/recycle.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/remote.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/scroll_top.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/selected.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/star.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/starred.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/tagged.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/unlock.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/unstarred.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/video.png
 mode change 100644 => 100755 view/theme/diabook-aerith/icons/weblink.png
 mode change 100644 => 100755 view/theme/diabook-aerith/jot.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/mail_conv.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/photo_view.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/rs_common_tabs.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/search_item.tpl
 mode change 100644 => 100755 view/theme/diabook-aerith/theme.php
 mode change 100644 => 100755 view/theme/diabook-blue/communityhome.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/contact_template.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/directory_item.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/fpostit/fpostit.js
 mode change 100644 => 100755 view/theme/diabook-blue/group_side.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/icons/attach.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/audio.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/camera.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/close_box.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/contacts2.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/drop.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/file_as.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/link.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/lock.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/lupe.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/messages.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/next.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/notifications.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/notify.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/pencil.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/prev.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/recycle.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/remote.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/scroll_top.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/selected.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/star.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/starred.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/tagged.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/unlock.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/unstarred.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/video.png
 mode change 100644 => 100755 view/theme/diabook-blue/icons/weblink.png
 mode change 100644 => 100755 view/theme/diabook-blue/jot.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/mail_conv.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/photo_view.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/rs_common_tabs.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/search_item.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/theme.php
 mode change 100644 => 100755 view/theme/diabook-red/communityhome.tpl
 mode change 100644 => 100755 view/theme/diabook-red/contact_template.tpl
 mode change 100644 => 100755 view/theme/diabook-red/directory_item.tpl
 mode change 100644 => 100755 view/theme/diabook-red/fpostit/fpostit.js
 mode change 100644 => 100755 view/theme/diabook-red/group_side.tpl
 mode change 100644 => 100755 view/theme/diabook-red/icons/attach.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/audio.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/camera.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/close_box.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/contacts.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/contacts2.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/drop.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/file_as.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/link.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/lock.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/lupe.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/next.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/notifications.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/pencil.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/photo-menu.jpg
 mode change 100644 => 100755 view/theme/diabook-red/icons/prev.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/recycle.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/remote.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/scroll_top.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/selected.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/star.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/starred.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/tagged.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/unlock.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/unstarred.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/video.png
 mode change 100644 => 100755 view/theme/diabook-red/icons/weblink.png
 mode change 100644 => 100755 view/theme/diabook-red/jot.tpl
 mode change 100644 => 100755 view/theme/diabook-red/mail_conv.tpl
 mode change 100644 => 100755 view/theme/diabook-red/photo_view.tpl
 mode change 100644 => 100755 view/theme/diabook-red/rs_common_tabs.tpl
 mode change 100644 => 100755 view/theme/diabook-red/search_item.tpl
 mode change 100644 => 100755 view/theme/diabook-red/theme.php
 mode change 100644 => 100755 view/theme/diabook/communityhome.tpl
 mode change 100644 => 100755 view/theme/diabook/contact_template.tpl
 mode change 100644 => 100755 view/theme/diabook/directory_item.tpl
 mode change 100644 => 100755 view/theme/diabook/fpostit/fpostit.js
 mode change 100644 => 100755 view/theme/diabook/group_side.tpl
 mode change 100644 => 100755 view/theme/diabook/icons/attach.png
 mode change 100644 => 100755 view/theme/diabook/icons/audio.png
 mode change 100644 => 100755 view/theme/diabook/icons/camera.png
 mode change 100644 => 100755 view/theme/diabook/icons/close_box.png
 mode change 100644 => 100755 view/theme/diabook/icons/contacts2.png
 mode change 100644 => 100755 view/theme/diabook/icons/drop.png
 mode change 100644 => 100755 view/theme/diabook/icons/expand.png
 mode change 100644 => 100755 view/theme/diabook/icons/file_as.png
 mode change 100644 => 100755 view/theme/diabook/icons/link.png
 mode change 100644 => 100755 view/theme/diabook/icons/lock.png
 mode change 100644 => 100755 view/theme/diabook/icons/lupe.png
 mode change 100644 => 100755 view/theme/diabook/icons/messages.png
 mode change 100644 => 100755 view/theme/diabook/icons/next.png
 mode change 100644 => 100755 view/theme/diabook/icons/notifications.png
 mode change 100644 => 100755 view/theme/diabook/icons/notify.png
 mode change 100644 => 100755 view/theme/diabook/icons/pencil.png
 mode change 100644 => 100755 view/theme/diabook/icons/prev.png
 mode change 100644 => 100755 view/theme/diabook/icons/recycle.png
 mode change 100644 => 100755 view/theme/diabook/icons/remote.png
 mode change 100644 => 100755 view/theme/diabook/icons/scroll_top.png
 mode change 100644 => 100755 view/theme/diabook/icons/selected.png
 mode change 100644 => 100755 view/theme/diabook/icons/star.png
 mode change 100644 => 100755 view/theme/diabook/icons/starred.png
 mode change 100644 => 100755 view/theme/diabook/icons/tagged.png
 mode change 100644 => 100755 view/theme/diabook/icons/unlock.png
 mode change 100644 => 100755 view/theme/diabook/icons/unstarred.png
 mode change 100644 => 100755 view/theme/diabook/icons/video.png
 mode change 100644 => 100755 view/theme/diabook/icons/weblink.png
 mode change 100644 => 100755 view/theme/diabook/jot.tpl
 mode change 100644 => 100755 view/theme/diabook/mail_conv.tpl
 mode change 100644 => 100755 view/theme/diabook/photo_view.tpl
 mode change 100644 => 100755 view/theme/diabook/rs_common_tabs.tpl
 mode change 100644 => 100755 view/theme/diabook/search_item.tpl
 mode change 100644 => 100755 view/theme/diabook/theme.php

diff --git a/js/main.js b/js/main.js
old mode 100644
new mode 100755
index 744691b6da..7f0428b5b5
--- a/js/main.js
+++ b/js/main.js
@@ -119,9 +119,7 @@
 			var home = $(data).find('home').text();
 			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
 			$('#home-update').html(home);
-
- 
-
+			
 			var intro = $(data).find('intro').text();
 			if(intro == 0) { intro = '';  $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
 			$('#intro-update').html(intro);
@@ -129,6 +127,14 @@
 			var mail = $(data).find('mail').text();
 			if(mail == 0) { mail = '';  $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
 			$('#mail-update').html(mail);
+			
+			var intro = $(data).find('intro').text();
+			if(intro == 0) { intro = '';  $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
+			$('#intro-update-li').html(intro);
+
+			var mail = $(data).find('mail').text();
+			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
+			$('#mail-update-li').html(mail);
 
 			var eNotif = $(data).find('notif')
 			notif = eNotif.attr('count');
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index f84b902d5b..6fab83afc7 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -22,7 +22,7 @@
 				<span class="icon contacts">$nav.contacts.1</span>
 				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
@@ -35,7 +35,7 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl
index e28ec29097..6fcffcc9bb 100644
--- a/view/theme/diabook-aerith/profile_vcard.tpl
+++ b/view/theme/diabook-aerith/profile_vcard.tpl
@@ -22,7 +22,7 @@
 				
 	
 
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 6e3b3f8224..9925a90aaf 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -2093,9 +2093,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index f41c4a98ac..19fea9a83a 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -2082,10 +2082,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
 border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 3d53115df4..f7bdaeef6a 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -447,6 +447,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -2111,10 +2129,10 @@ height: 350px;
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
 border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
old mode 100644
new mode 100755
index e56f0ab742..b48f061fd1
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.012)
+ * Version: (Version: 1.013)
  * Author: 
  */
 
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/contact_template.tpl b/view/theme/diabook-blue/contact_template.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/attach.png b/view/theme/diabook-blue/icons/attach.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/audio.png b/view/theme/diabook-blue/icons/audio.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/camera.png b/view/theme/diabook-blue/icons/camera.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/close_box.png b/view/theme/diabook-blue/icons/close_box.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/contacts2.png b/view/theme/diabook-blue/icons/contacts2.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/drop.png b/view/theme/diabook-blue/icons/drop.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/link.png b/view/theme/diabook-blue/icons/link.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/lock.png b/view/theme/diabook-blue/icons/lock.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/lupe.png b/view/theme/diabook-blue/icons/lupe.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/messages.png b/view/theme/diabook-blue/icons/messages.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/notify.png b/view/theme/diabook-blue/icons/notify.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/pencil.png b/view/theme/diabook-blue/icons/pencil.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/recycle.png b/view/theme/diabook-blue/icons/recycle.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/remote.png b/view/theme/diabook-blue/icons/remote.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/scroll_top.png b/view/theme/diabook-blue/icons/scroll_top.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/star.png b/view/theme/diabook-blue/icons/star.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/starred.png b/view/theme/diabook-blue/icons/starred.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/tagged.png b/view/theme/diabook-blue/icons/tagged.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/unlock.png b/view/theme/diabook-blue/icons/unlock.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/unstarred.png b/view/theme/diabook-blue/icons/unstarred.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/video.png b/view/theme/diabook-blue/icons/video.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/icons/weblink.png b/view/theme/diabook-blue/icons/weblink.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/mail_conv.tpl b/view/theme/diabook-blue/mail_conv.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index 3b78b59952..fd29d9309d 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -22,7 +22,7 @@
 				<span class="icon contacts">$nav.contacts.1</span>
 				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
@@ -35,7 +35,7 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
index e28ec29097..6fcffcc9bb 100644
--- a/view/theme/diabook-blue/profile_vcard.tpl
+++ b/view/theme/diabook-blue/profile_vcard.tpl
@@ -22,7 +22,7 @@
 				
 	
 
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
diff --git a/view/theme/diabook-blue/rs_common_tabs.tpl b/view/theme/diabook-blue/rs_common_tabs.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/search_item.tpl b/view/theme/diabook-blue/search_item.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 991b198497..48096f7527 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -2054,9 +2054,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index fca29d088c..2c1fb0512a 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -2049,10 +2049,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
 border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 8a05fc4c4b..83fd0c47f6 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -447,6 +447,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -2067,10 +2085,10 @@ height: 350px;
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
 border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
old mode 100644
new mode 100755
index 2e7aca92a9..c64e9cd372
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,7 +3,7 @@
 /*
  * 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.012)
+ * Version: (Version: 1.013)
  * Author: 
  */
 
diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl
index fdf748cb20..dc3fd0cde6 100644
--- a/view/theme/diabook-red/nav.tpl
+++ b/view/theme/diabook-red/nav.tpl
@@ -22,7 +22,7 @@
 				<span class="icon contacts">$nav.contacts.1</span>
 				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
@@ -35,7 +35,7 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/rs_common_tabs.tpl b/view/theme/diabook-red/rs_common_tabs.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 863ad87ad9..5cec59c878 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -529,6 +529,7 @@ background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 6
 background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
 background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
 background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f');
 
 background-image: -webkit-gradient(
 	linear,
@@ -2090,9 +2091,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index dcd0092c9f..2568e93d79 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -2063,10 +2063,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
 border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index b1061f035f..5475537bb4 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -447,6 +447,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -2097,10 +2115,10 @@ height: 350px;
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
 border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
old mode 100644
new mode 100755
index 0db9818e47..a0d5ead732
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.012)
+ * Version: (Version: 1.013)
  * Author: 
  */
 
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/messages.png b/view/theme/diabook/icons/messages.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 78eb341972..522fb22b4a 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -22,7 +22,7 @@
 				<span class="icon contacts">$nav.contacts.1</span>
 				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
@@ -36,7 +36,7 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index e28ec29097..b982a20693 100644
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -22,7 +22,7 @@
 				
 	
 
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
diff --git a/view/theme/diabook/rs_common_tabs.tpl b/view/theme/diabook/rs_common_tabs.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
old mode 100644
new mode 100755
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 5ac152252a..5edfc73a3f 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -2023,6 +2023,8 @@ ul.tabs li .active {
 /* photo */
 .photo {
 border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
 	}
 .lframe {
   float: left;
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 5f60c0bfff..90291d7b6b 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -449,6 +449,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -2046,6 +2064,8 @@ height: 350px;
 /* photo */
 .photo {
 border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
 	}
 .lframe {
   float: left;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
old mode 100644
new mode 100755
index 50a7c69742..0c83a05676
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.012)
+ * Version: (Version: 1.013)
  * Author: 
  */
 
@@ -339,9 +339,10 @@ if ($a->argv[0] === "settings"){
 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";
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
 $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
 
+
 //js scripts
 
 $a->page['htmlhead'] .= '
@@ -350,15 +351,9 @@ $a->page['htmlhead'] .= '
  $(function() {
 	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
- 
- $(document).ready(function (){
-	$("iframe").each(function(){
-		var url = $(this).attr("src");
-		$(this).attr("src",url+"?wmode=transparent"); });
-    });
-  
+   
  </script>';
-
+ 
 
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
 $a->page['htmlhead'] .= '

From 665b2c8107e372fd2703f126b8c9db5c9719a36b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Apr 2012 03:10:46 -0700
Subject: [PATCH 2/6] revert config changes, we're getting duplicate keys

---
 include/config.php | 298 ++++++++++++++++++++++-----------------------
 1 file changed, 147 insertions(+), 151 deletions(-)
 mode change 100644 => 100755 include/config.php

diff --git a/include/config.php b/include/config.php
old mode 100644
new mode 100755
index c999b76f2e..4cff38090c
--- a/include/config.php
+++ b/include/config.php
@@ -1,87 +1,80 @@
 <?php
+
 /**
  *
  * Arbitrary configuration storage
  * Note:
  * Please do not store booleans - convert to 0/1 integer values
  * The get_?config() functions return boolean false for keys that are unset,
- * and this could lead to subtle bugs.
+ * and this could lead to subtle bugs.  
  *
  * There are a few places in the code (such as the admin panel) where boolean
  * configurations need to be fixed as of 10/08/2011.
- *
- * @package config;
  */
 
 
-/**
- * retrieve a "family" of config variables
- * from database to cached storage
- */
+// retrieve a "family" of config variables from database to cached storage
+
 if(! function_exists('load_config')) {
-	function load_config($family) {
-		global $a;
-		$r = q("SELECT * FROM `config` WHERE `cat` = '%s'",
-				dbesc($family)
-		);
-		if(count($r)) {
-			foreach($r as $rr) {
-				$k = $rr['k'];
-				if ($rr['cat'] === 'config') {
-					$a->config[$k] = $rr['v'];
-				} else {
-					$a->config[$family][$k] = $rr['v'];
-				}
+function load_config($family) {
+	global $a;
+	$r = q("SELECT * FROM `config` WHERE `cat` = '%s'",
+		dbesc($family)
+	);
+	if(count($r)) {
+		foreach($r as $rr) {
+			$k = $rr['k'];
+			if ($rr['cat'] === 'config') {
+				$a->config[$k] = $rr['v'];
+			} else {
+				$a->config[$family][$k] = $rr['v'];
 			}
 		}
 	}
-}
+}}
+
+// get a particular config variable given the family name
+// and key. Returns false if not set.
+// $instore is only used by the set_config function
+// to determine if the key already exists in the DB
+// If a key is found in the DB but doesn't exist in
+// local config cache, pull it into the cache so we don't have
+// to hit the DB again for this item.
 
-/**
- * get a particular config variable given the family name
- * and key. Returns false if not set.
- *
- * If a key is found in the DB but doesn't exist in
- * local config cache, pull it into the cache so we don't have
- *to hit the DB again for this item.
- */
 if(! function_exists('get_config')) {
-	function get_config($family, $key) {
-
-		global $a;
+function get_config($family, $key, $instore = false) {
 
+	global $a;
 
+	if(! $instore) {
 		if(isset($a->config[$family][$key])) {
 			if($a->config[$family][$key] === '!<unset>!') {
 				return false;
 			}
 			return $a->config[$family][$key];
 		}
-		$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
-				dbesc($family),
-				dbesc($key)
-		);
-		if(count($ret)) {
-			// manage array value
-			$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
-			$a->config[$family][$key] = $val;
-			return $val;
-		}
-		else {
-			$a->config[$family][$key] = '!<unset>!';
-		}
-		return false;
 	}
-}
+	$ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		dbesc($family),
+		dbesc($key)
+	);
+	if(count($ret)) {
+		// manage array value
+		$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
+		$a->config[$family][$key] = $val;
+		return $val;
+	}
+	else {
+		$a->config[$family][$key] = '!<unset>!';
+	}
+	return false;
+}}
+
+// Store a config value ($value) in the category ($family)
+// under the key ($key)
+// Return the value, or false if the database update failed
 
-/**
- * Store a config value ($value) in the category ($family)
- * under the key ($key)
- * 
- * Return the value, or false if the database update failed
- */
 if(! function_exists('set_config')) {
-
 function set_config($family,$key,$value) {
 	global $a;
 	
@@ -89,139 +82,142 @@ function set_config($family,$key,$value) {
 	$dbvalue = (is_array($value)?serialize($value):$value);
 	$dbvalue = (is_bool($value) ? intval($value) : $value);
 
+	if(get_config($family,$key,true) === false) {
 		$a->config[$family][$key] = $value;
-		$ret = q("REPLACE INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
-				dbesc($family),
-				dbesc($key),
-				dbesc($dbvalue)
+		$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
+			dbesc($family),
+			dbesc($key),
+			dbesc($dbvalue)
 		);
-		if($ret) {
+		if($ret) 
 			return $value;
-		}
 		return $ret;
-
 	}
-}
+	
+	$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		dbesc($dbvalue),
+		dbesc($family),
+		dbesc($key)
+	);
+
+	$a->config[$family][$key] = $value;
+
+	if($ret)
+		return $value;
+	return $ret;
+}}
 
 
 if(! function_exists('load_pconfig')) {
-	function load_pconfig($uid,$family) {
-		global $a;
-		$r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
-				dbesc($family),
-				intval($uid)
-		);
-		if(count($r)) {
-			foreach($r as $rr) {
-				$k = $rr['k'];
-				$a->config[$uid][$family][$k] = $rr['v'];
-			}
+function load_pconfig($uid,$family) {
+	global $a;
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
+		dbesc($family),
+		intval($uid)
+	);
+	if(count($r)) {
+		foreach($r as $rr) {
+			$k = $rr['k'];
+			$a->config[$uid][$family][$k] = $rr['v'];
 		}
 	}
-}
+}}
+
 
 
-/**
- * get a particular user-specific config variable given the family name, 
- * the user id and key. Returns false if not set.
- *
- * If a key is found in the DB but doesn't exist in
- * local config cache, pull it into the cache so we don't have
- * to hit the DB again for this item.
- */
 if(! function_exists('get_pconfig')) {
-	function get_pconfig($uid,$family, $key) {
-
-		global $a;
+function get_pconfig($uid,$family, $key, $instore = false) {
 
+	global $a;
 
+	if(! $instore) {
 		if(isset($a->config[$uid][$family][$key])) {
 			if($a->config[$uid][$family][$key] === '!<unset>!') {
 				return false;
 			}
 			return $a->config[$uid][$family][$key];
 		}
-
-
-		$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
-				intval($uid),
-				dbesc($family),
-				dbesc($key)
-		);
-
-		if(count($ret)) {
-			$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
-			$a->config[$uid][$family][$key] = $val;
-			return $val;
-		}
-		else {
-			$a->config[$uid][$family][$key] = '!<unset>!';
-		}
-		return false;
 	}
-}
 
-/**
- * Delete a value from config. This function 
- * deletes both: db value and cache entry. 
- */
+	$ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		intval($uid),
+		dbesc($family),
+		dbesc($key)
+	);
+
+	if(count($ret)) {
+		$val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
+		$a->config[$uid][$family][$key] = $val;
+		return $val;
+	}
+	else {
+		$a->config[$uid][$family][$key] = '!<unset>!';
+	}
+	return false;
+}}
+
 if(! function_exists('del_config')) {
-	function del_config($family,$key) {
+function del_config($family,$key) {
 
-		global $a;
-		if(x($a->config[$family],$key))
-			unset($a->config[$family][$key]);
-		$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
-				dbesc($family),
-				dbesc($key)
-		);
-		return $ret;
-	}
-}
+	global $a;
+	if(x($a->config[$family],$key))
+		unset($a->config[$family][$key]);
+	$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		dbesc($family),
+		dbesc($key)
+	);
+	return $ret;
+}}
 
 
-/**
- * Store a user-specific config value ($value) for user $uid in the category ($family)
- * under the key ($key). 
- * 
- * Return the value, or false if the database update failed
- */
+
+// Same as above functions except these are for personal config storage and take an
+// additional $uid argument.
+
 if(! function_exists('set_pconfig')) {
-	function set_pconfig($uid,$family,$key,$value) {
+function set_pconfig($uid,$family,$key,$value) {
 
-		global $a;
-
-		// manage array value
-		$dbvalue = (is_array($value)?serialize($value):$value);
-		$dbvalue = (is_bool($value)?serialize($value):$value);
+	global $a;
 
+	// manage array value
+	$dbvalue = (is_array($value)?serialize($value):$value);
 
+	if(get_pconfig($uid,$family,$key,true) === false) {
 		$a->config[$uid][$family][$key] = $value;
-		$ret = q("REPLACE INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
-				intval($uid),
-				dbesc($family),
-				dbesc($key),
-				dbesc($dbvalue)
+		$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
+			intval($uid),
+			dbesc($family),
+			dbesc($key),
+			dbesc($dbvalue)
 		);
-		if($ret) {
+		if($ret) 
 			return $value;
-		}
 		return $ret;
-
 	}
-}
+	$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		dbesc($dbvalue),
+		intval($uid),
+		dbesc($family),
+		dbesc($key)
+	);
+
+	$a->config[$uid][$family][$key] = $value;
+
+	if($ret)
+		return $value;
+	return $ret;
+}}
 
 if(! function_exists('del_pconfig')) {
-	function del_pconfig($uid,$family,$key) {
+function del_pconfig($uid,$family,$key) {
 
-		global $a;
-		if(x($a->config[$uid][$family],$key))
-			unset($a->config[$uid][$family][$key]);
-		$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
-				intval($uid),
-				dbesc($family),
-				dbesc($key)
-		);
-		return $ret;
-	}
-}
+	global $a;
+	if(x($a->config[$uid][$family],$key))
+		unset($a->config[$uid][$family][$key]);
+	$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+		intval($uid),
+		dbesc($family),
+		dbesc($key)
+	);
+	return $ret;
+}}

From 0731c177eb4a58c6dd7bb50ee3915563c33531bc Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Apr 2012 03:25:01 -0700
Subject: [PATCH 3/6] fix bad sql update

---
 boot.php   |  2 +-
 update.php | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/boot.php b/boot.php
index e1bcc078a5..f4f44a6447 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1303' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1135      );
+define ( 'DB_UPDATE_VERSION',      1136      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/update.php b/update.php
index ae35d2d50d..0c8486c316 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1135 );
+define( 'UPDATE_VERSION' , 1136 );
 
 /**
  *
@@ -1143,16 +1143,21 @@ q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `rep
 }
 
 function update_1134() {
+	// faulty update merged forward
+	// had a hardwired tablename of 'friendica' which isn't the right name on most systems
+}
+
+function update_1135() {
 	//there can't be indexes with more than 1000 bytes in mysql, 
 	//so change charset to be smaller
 	q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
 CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
 	//and add the index
-	q("ALTER TABLE `friendica`.`config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
+	q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
 	
 	//same thing for pconfig
 	q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
 	CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
 	
-	q("ALTER TABLE `friendica`.`pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); 
-}
+	q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); 
+}
\ No newline at end of file

From eb6370fa413bcc4951ccbce30e482b20727606d1 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 6 Apr 2012 12:43:20 +0200
Subject: [PATCH 4/6] small fixes for the German strings

---
 view/de/messages.po | 32 ++++++++++++++++----------------
 view/de/strings.php |  6 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 0e4cb2ea78..1036e7b750 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-04-04 15:51-0700\n"
-"PO-Revision-Date: 2012-04-06 07:35+0000\n"
+"POT-Creation-Date: 2012-04-05 10:00-0700\n"
+"PO-Revision-Date: 2012-04-06 10:40+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -411,7 +411,7 @@ msgstr "wurde getaggt in einem"
 #: ../../view/theme/diabook-blue/theme.php:82
 #: ../../view/theme/diabook/theme.php:86
 #: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294
-#: ../../include/diaspora.php:1650 ../../include/conversation.php:53
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr "Foto"
@@ -1021,8 +1021,8 @@ msgid "This is required for message delivery to work."
 msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
 
 #: ../../mod/install.php:343
-msgid "PHP \"register_argc_argv\""
-msgstr "PHP \"register_argc_argv\""
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
 #: ../../mod/install.php:364
 msgid ""
@@ -2232,7 +2232,7 @@ msgstr "Markierte"
 
 #: ../../mod/network.php:197
 msgid "Shared Links"
-msgstr "Geteilte Internetlinks"
+msgstr "Geteilte Links"
 
 #: ../../mod/network.php:270
 #, php-format
@@ -2274,7 +2274,7 @@ msgstr "Ungültiger Kontakt."
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:29
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
 msgid "Save"
 msgstr "Speichern"
@@ -2713,7 +2713,7 @@ msgstr "Personen Suche"
 #: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
 #: ../../view/theme/diabook-aerith/theme.php:77
 #: ../../view/theme/diabook-aerith/theme.php:86
-#: ../../include/diaspora.php:1650 ../../include/conversation.php:48
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
@@ -2725,7 +2725,7 @@ msgstr "Status"
 #: ../../view/theme/diabook-blue/theme.php:91
 #: ../../view/theme/diabook/theme.php:95
 #: ../../view/theme/diabook-aerith/theme.php:91
-#: ../../include/diaspora.php:1666 ../../include/conversation.php:65
+#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s"
@@ -3798,11 +3798,11 @@ msgstr "sichtbar für jeden"
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../mod/filer.php:28 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:918
 msgid "Save to Folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/filer.php:28
+#: ../../mod/filer.php:29
 msgid "- select -"
 msgstr "- auswählen -"
 
@@ -4006,7 +4006,7 @@ msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen."
 msgid "Unable to set contact photo."
 msgstr "Konnte das Bild des Kontakts nicht speichern."
 
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
@@ -5216,7 +5216,7 @@ msgstr "Hilfe oder @NewHere"
 #: ../../view/theme/diabook/theme.php:206
 #: ../../view/theme/diabook-aerith/theme.php:201
 msgid "Connect Services"
-msgstr "Mit anderen Webanwendungen verbinden"
+msgstr "Verbinde Dienste"
 
 #: ../../view/theme/diabook-red/theme.php:207
 #: ../../view/theme/diabook-blue/theme.php:207
@@ -5850,15 +5850,15 @@ msgstr "Beitrag"
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
-#: ../../include/diaspora.php:578
+#: ../../include/diaspora.php:582
 msgid "Sharing notification from Diaspora network"
 msgstr "Freigabe-Benachrichtigung von Diaspora"
 
-#: ../../include/diaspora.php:1965
+#: ../../include/diaspora.php:1969
 msgid "Attachments:"
 msgstr "Anhänge:"
 
-#: ../../include/diaspora.php:2148
+#: ../../include/diaspora.php:2152
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"
diff --git a/view/de/strings.php b/view/de/strings.php
index 811fb98d0d..28567396bb 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -212,7 +212,7 @@ $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Exec
 $a->strings["Command line PHP"] = "Kommandozeilen-PHP";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
 $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
-$a->strings["PHP \"register_argc_argv\""] = "PHP \"register_argc_argv\"";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
 $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
 $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
 $a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
@@ -491,7 +491,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
 $a->strings["Posted Order"] = "Neueste Beiträge";
 $a->strings["New"] = "Neue";
 $a->strings["Starred"] = "Markierte";
-$a->strings["Shared Links"] = "Geteilte Internetlinks";
+$a->strings["Shared Links"] = "Geteilte Links";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.",
 	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.",
@@ -1158,7 +1158,7 @@ $a->strings["Similar Interests"] = "Ähnliche Interessen";
 $a->strings["Invite Friends"] = "Freunde einladen";
 $a->strings["Community Pages"] = "Foren";
 $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
-$a->strings["Connect Services"] = "Mit anderen Webanwendungen verbinden";
+$a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["PostIt to Friendica"] = "PostIt nach Friendica";
 $a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
 $a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst.";

From 13dfb4012894c3bd724f12d75f4de7c1cce9529a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Apr 2012 05:11:09 -0700
Subject: [PATCH 5/6] fix messed up config tables w/ duplicate entries

---
 boot.php           |  2 +-
 include/plugin.php |  2 +-
 update.php         | 53 ++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index f4f44a6447..1bc4c2a9a9 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1303' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1136      );
+define ( 'DB_UPDATE_VERSION',      1137      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/include/plugin.php b/include/plugin.php
index e37ae84357..25fd32b4f0 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -34,7 +34,7 @@ function install_plugin($plugin){
 		);
 	}
 	else {
-		logger("Addons: FAILED installing " . $plugin);
+//		logger("Addons: FAILED installing " . $plugin);
 	}
 
 }}
diff --git a/update.php b/update.php
index 0c8486c316..1a36c754d8 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1136 );
+define( 'UPDATE_VERSION' , 1137 );
 
 /**
  *
@@ -1152,12 +1152,57 @@ function update_1135() {
 	//so change charset to be smaller
 	q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
 CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
-	//and add the index
-	q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
 	
 	//same thing for pconfig
 	q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
 	CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
-	
+	// faulty update merged forward. Bad update in 1134 caused duplicate k,cat pairs
+	// these have to be cleared before the unique keys can be added.	
+}
+
+function update_1136() {
+
+	$arr = array();
+
+	// order in reverse so that we save the newest entry
+
+	$r = q("select * from config where 1 order by id desc");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$found = false;
+			foreach($arr as $x) {
+				if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+					$found = true;
+					q("delete from config where id = %d limit 1",
+						intval($rr['id'])
+					);
+				}
+			}
+			if(! $found) {
+				$arr[] = $rr;
+			}
+		}
+	}
+			
+	$arr = array();
+	$r = q("select * from pconfig where 1 order by id desc");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$found = false;
+			foreach($arr as $x) {
+				if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+					$found = true;
+					q("delete from pconfig where id = %d limit 1",
+						intval($rr['id'])
+					);
+				}
+			}
+			if(! $found) {
+				$arr[] = $rr;
+			}
+		}
+	}
+	q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
 	q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); 
+
 }
\ No newline at end of file

From ecabe1d505464577fdc3d3ff0090371c8ca0cf1e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 6 Apr 2012 05:21:42 -0700
Subject: [PATCH 6/6] ignore removed plugins

---
 include/plugin.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/plugin.php b/include/plugin.php
index 25fd32b4f0..8196e87561 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -17,7 +17,12 @@ function uninstall_plugin($plugin){
 }}
 
 if (! function_exists('install_plugin')){
-function install_plugin($plugin){
+function install_plugin($plugin) {
+
+	// silently fail if plugin was removed
+
+	if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php'))
+		return false;
 	logger("Addons: installing " . $plugin);
 	$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php');
 	@include_once('addon/' . $plugin . '/' . $plugin . '.php');
@@ -32,9 +37,11 @@ function install_plugin($plugin){
 			intval($t),
 			$plugin_admin
 		);
+		return true;
 	}
 	else {
-//		logger("Addons: FAILED installing " . $plugin);
+		logger("Addons: FAILED installing " . $plugin);
+		return false;
 	}
 
 }}