diff options
| author | zottel <github@zottel.net> | 2012-05-08 09:05:38 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-08 09:05:38 +0200 |
| commit | 78429926bcf1ab7e8a4d35d0093ba666b3568708 (patch) | |
| tree | f9f1d219ecbbaa52982e1f26b842e1e824b68c85 | |
| parent | a2ea560bf397902ce5608daabf101d0bcf813f13 (diff) | |
| parent | df3574663944f50820e2d50cfb9d87f505ceff54 (diff) | |
| download | volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.tar.gz volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.tar.bz2 volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.zip | |
Merge remote branch 'upstream/master'
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/delivery.php | 11 | ||||
| -rw-r--r-- | include/diaspora.php | 18 | ||||
| -rw-r--r-- | include/onepoll.php | 6 | ||||
| -rw-r--r-- | include/poller.php | 4 | ||||
| -rw-r--r-- | include/queue_fn.php | 11 | ||||
| -rw-r--r-- | mod/admin.php | 3 | ||||
| -rw-r--r-- | mod/follow.php | 45 | ||||
| -rw-r--r-- | util/messages.po | 477 | ||||
| -rw-r--r-- | view/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/theme/diabook/communityhome.tpl | 39 | ||||
| -rw-r--r-- | view/theme/diabook/config.php | 103 | ||||
| -rw-r--r-- | view/theme/diabook/js/jquery.mapquery.mqMousePosition.js | 8 | ||||
| -rwxr-xr-x | view/theme/diabook/theme.php | 256 | ||||
| -rw-r--r-- | view/theme/diabook/theme_settings.tpl | 19 |
15 files changed, 626 insertions, 377 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1334' ); +define ( 'FRIENDICA_VERSION', '2.3.1335' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); diff --git a/include/delivery.php b/include/delivery.php index 28d81226a..5f84a548a 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -347,7 +347,10 @@ function delivery_run($argv, $argc){ } } - $deliver_status = dfrn_deliver($owner,$contact,$atom); + if(! was_recently_delayed($contact['id'])) + $deliver_status = dfrn_deliver($owner,$contact,$atom); + else + $deliver_status = (-1); logger('notifier: dfrn_delivery returns ' . $deliver_status); @@ -390,7 +393,11 @@ function delivery_run($argv, $argc){ logger('notifier: slapdelivery: ' . $contact['name']); foreach($slaps as $slappy) { if($contact['notify']) { - $deliver_status = slapper($owner,$contact['notify'],$slappy); + if(! was_recently_delayed($contact['id'])) + $deliver_status = slapper($owner,$contact['notify'],$slappy); + else + $deliver_status = (-1); + if($deliver_status == (-1)) { // queue message for redelivery add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy); diff --git a/include/diaspora.php b/include/diaspora.php index 5069c1127..2051de5fc 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2298,14 +2298,20 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) { logger('diaspora_transmit: ' . $logid . ' ' . $dest_url); - if(! intval(get_config('system','diaspora_test'))) - post_url($dest_url . '/', $slap); + if(was_recently_delayed($contact['id'])) { + $return_code = 0; + } else { - logger('diaspora_transmit: test_mode'); - return 200; + if(! intval(get_config('system','diaspora_test'))) { + post_url($dest_url . '/', $slap); + $return_code = $a->get_curl_code(); + } + else { + logger('diaspora_transmit: test_mode'); + return 200; + } } - - $return_code = $a->get_curl_code(); + logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_code); if((! $return_code) || (($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))) { diff --git a/include/onepoll.php b/include/onepoll.php index 42bce0f68..a64922aa3 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -25,6 +25,7 @@ function onepoll_run($argv, $argc){ require_once('include/email.php'); require_once('include/socgraph.php'); require_once('include/pidfile.php'); + require_once('include/queue_fn.php'); load_config('config'); load_config('system'); @@ -54,6 +55,9 @@ function onepoll_run($argv, $argc){ return; } + if(was_recently_delayed($contact_id)) + return; + $d = datetime_convert(); // Only poll from those with suitable relationships, @@ -452,7 +456,7 @@ function onepoll_run($argv, $argc){ if($xml) { logger('poller: received xml : ' . $xml, LOGGER_DATA); - if(! strstr($xml,'<?xml')) { + if((! strstr($xml,'<?xml')) && (! strstr($xml,'<rss'))) { logger('poller: post_handshake: response from ' . $url . ' did not contain XML.'); $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1", dbesc(datetime_convert()), diff --git a/include/poller.php b/include/poller.php index f6553c846..6b12445d1 100644 --- a/include/poller.php +++ b/include/poller.php @@ -126,7 +126,9 @@ function poller_run($argv, $argc){ $force = true; } - $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval'))); + $interval = intval(get_config('system','poll_interval')); + if(! $interval) + $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval'))); $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); diff --git a/include/queue_fn.php b/include/queue_fn.php index 3c1087f4e..2aca338f5 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -15,6 +15,17 @@ function remove_queue_item($id) { ); } +function was_recently_delayed($cid) { + + $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d + and last > UTC_TIMESTAMP() - interval 15 minute limit 1", + intval($cid) + ); + if(count($r)) + return true; + return false; +} + function add_to_queue($cid,$network,$msg,$batch = false) { diff --git a/mod/admin.php b/mod/admin.php index cfe5a2dd2..2810c8a8a 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -243,6 +243,7 @@ function admin_page_site_post(&$a){ $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); + $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); @@ -291,6 +292,7 @@ function admin_page_site_post(&$a){ } set_config('system','ssl_policy',$ssl_policy); set_config('system','delivery_interval',$delivery_interval); + set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); set_config('config','sitename',$sitename); if ($banner==""){ @@ -436,6 +438,7 @@ function admin_page_site(&$a) { '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")), + '$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), '$form_security_token' => get_form_security_token("admin_site"), diff --git a/mod/follow.php b/mod/follow.php index ae8cb200c..4a7f99bf0 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -10,7 +10,10 @@ function follow_init(&$a) { // NOTREACHED } + $uid = local_user(); $url = $orig_url = notags(trim($_REQUEST['url'])); + $return_url = $_SESSION['return_url']; + // remove ajax junk, e.g. Twitter @@ -18,19 +21,25 @@ function follow_init(&$a) { if(! allowed_url($url)) { notice( t('Disallowed profile URL.') . EOL); - goaway($_SESSION['return_url']); + goaway($return_url); // NOTREACHED } if(! $url) { notice( t('Connect URL missing.') . EOL); - goaway($_SESSION['return_url']); + goaway($return_url); // NOTREACHED } + $arr = array('url' => $url, 'contact' => array()); + + call_hooks('follow', $arr); - $ret = probe_url($url); + if(x($arr['contact'],'name')) + $ret = $arr['contact']; + else + $ret = probe_url($url); if($ret['network'] === NETWORK_DFRN) { if(strlen($a->path)) @@ -46,11 +55,11 @@ function follow_init(&$a) { if(get_config('system','dfrn_only')) { notice( t('This site is not configured to allow communications with other networks.') . EOL); notice( t('No compatible communication protocols or feeds were discovered.') . EOL); - goaway($_SESSION['return_url']); + goaway($return_url); } } - // This just confuses things, remove it + // This extra param just confuses things, remove it if($ret['network'] === NETWORK_DIASPORA) $ret['url'] = str_replace('?absolute=true','',$ret['url']); @@ -65,9 +74,11 @@ function follow_init(&$a) { notice( t('An author or name was not found.') . EOL); if(! x($ret,'url')) notice( t('No browser URL could be matched to this address.') . EOL); - if(strpos($url,'@') !== false) - notice('Unable to match @-style Identity Address with a known protocol or email contact'); - goaway($_SESSION['return_url']); + if(strpos($url,'@') !== false) { + notice( t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL); + notice( t('Use mailto: in front of address to force email check.') . EOL); + } + goaway($return_url); } if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) { @@ -94,7 +105,7 @@ function follow_init(&$a) { // indirect links or webfinger links $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1", - intval(local_user()), + intval($uid), dbesc($ret['poll']) ); @@ -104,7 +115,7 @@ function follow_init(&$a) { q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1", intval(CONTACT_IS_FRIEND), intval($r[0]['id']), - intval(local_user()) + intval($uid) ); } } @@ -118,7 +129,7 @@ function follow_init(&$a) { $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, `writable`, `hidden`, `blocked`, `readonly`, `pending` ) VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ", - intval(local_user()), + intval($uid), dbesc(datetime_convert()), dbesc($ret['url']), dbesc(normalise_link($ret['url'])), @@ -142,12 +153,12 @@ function follow_init(&$a) { $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", dbesc($ret['url']), - intval(local_user()) + intval($uid) ); if(! count($r)) { notice( t('Unable to retrieve contact information.') . EOL); - goaway($_SESSION['return_url']); + goaway($return_url); // NOTREACHED } @@ -156,7 +167,7 @@ function follow_init(&$a) { require_once("Photo.php"); - $photos = import_profile_photo($ret['photo'],local_user(),$contact_id); + $photos = import_profile_photo($ret['photo'],$uid,$contact_id); $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', @@ -200,7 +211,7 @@ function follow_init(&$a) { $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", - intval(local_user()) + intval($uid) ); if(count($r)) { @@ -215,9 +226,9 @@ function follow_init(&$a) { } } - if(strstr($_SESSION['return_url'],'contacts')) + if(strstr($return_url,'contacts')) goaway($a->get_baseurl() . '/contacts/' . $contact_id); - goaway($_SESSION['return_url']); + goaway($return_url); // NOTREACHED } diff --git a/util/messages.po b/util/messages.po index 6ac283127..9e9ecc4d1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1334\n" +"Project-Id-Version: 2.3.1335\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-06 10:00-0700\n" +"POT-Creation-Date: 2012-05-07 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -48,14 +48,14 @@ msgstr "" #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 #: ../../mod/item.php:140 ../../mod/profile_photo.php:19 #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 -#: ../../mod/profile_photo.php:163 ../../mod/message.php:38 -#: ../../mod/message.php:90 ../../mod/allfriends.php:9 +#: ../../mod/profile_photo.php:163 ../../mod/message.php:40 +#: ../../mod/message.php:92 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/profiles.php:365 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:495 -#: ../../include/items.php:3192 ../../index.php:306 +#: ../../include/items.php:3202 ../../index.php:306 msgid "Permission denied." msgstr "" @@ -85,7 +85,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:541 -#: ../../mod/settings.php:567 ../../mod/admin.php:640 ../../mod/admin.php:649 +#: ../../mod/settings.php:567 ../../mod/admin.php:643 ../../mod/admin.php:652 msgid "Name" msgstr "" @@ -129,9 +129,9 @@ msgstr "" #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:539 ../../mod/settings.php:685 #: ../../mod/settings.php:746 ../../mod/settings.php:940 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:402 -#: ../../mod/admin.php:637 ../../mod/admin.php:773 ../../mod/admin.php:972 -#: ../../mod/admin.php:1059 ../../mod/profiles.php:534 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:404 +#: ../../mod/admin.php:640 ../../mod/admin.php:776 ../../mod/admin.php:975 +#: ../../mod/admin.php:1062 ../../mod/profiles.php:534 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:597 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 @@ -158,8 +158,9 @@ msgstr "" #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:590 -#: ../../view/theme/diabook/config.php:95 +#: ../../view/theme/diabook/theme.php:607 +#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/config.php:107 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 #: ../../include/conversation.php:555 msgid "Submit" @@ -219,7 +220,7 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:69 +#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:66 #: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "" @@ -352,7 +353,7 @@ msgstr "" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:485 +#: ../../view/theme/diabook/theme.php:522 msgid "Contact Photos" msgstr "" @@ -375,7 +376,7 @@ msgstr "" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:486 +#: ../../view/theme/diabook/theme.php:523 msgid "Profile Photos" msgstr "" @@ -397,7 +398,7 @@ msgstr "" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1305 +#: ../../view/theme/diabook/theme.php:494 ../../include/text.php:1305 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -532,8 +533,8 @@ msgid "Share" msgstr "" #: ../../mod/photos.php:1214 ../../mod/editpost.php:104 -#: ../../mod/wallmessage.php:145 ../../mod/message.php:188 -#: ../../mod/message.php:380 ../../include/conversation.php:361 +#: ../../mod/wallmessage.php:145 ../../mod/message.php:199 +#: ../../mod/message.php:391 ../../include/conversation.php:361 #: ../../include/conversation.php:706 ../../include/conversation.php:983 msgid "Please wait" msgstr "" @@ -555,7 +556,7 @@ msgid "Preview" msgstr "" #: ../../mod/photos.php:1331 ../../mod/settings.php:602 -#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:644 +#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:647 #: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "" @@ -572,7 +573,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:71 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:68 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -631,7 +632,7 @@ msgid "Edit" msgstr "" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:186 ../../mod/message.php:378 +#: ../../mod/message.php:197 ../../mod/message.php:389 #: ../../include/conversation.php:965 msgid "Upload photo" msgstr "" @@ -641,7 +642,7 @@ msgid "Attach file" msgstr "" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:187 ../../mod/message.php:379 +#: ../../mod/message.php:198 ../../mod/message.php:390 #: ../../include/conversation.php:969 msgid "Insert web link" msgstr "" @@ -803,7 +804,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:688 ../../include/items.php:2707 +#: ../../mod/dfrn_request.php:688 ../../include/items.php:2717 msgid "[Name Withheld]" msgstr "" @@ -1214,7 +1215,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:65 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:62 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1223,7 +1224,7 @@ msgstr "" msgid "Introductions" msgstr "" -#: ../../mod/notifications.php:100 ../../mod/message.php:102 +#: ../../mod/notifications.php:100 ../../mod/message.php:104 #: ../../include/nav.php:128 msgid "Messages" msgstr "" @@ -1263,7 +1264,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:642 +#: ../../mod/admin.php:645 msgid "Approve" msgstr "" @@ -1464,12 +1465,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:290 ../../mod/contacts.php:347 -#: ../../mod/admin.php:646 +#: ../../mod/admin.php:649 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:290 ../../mod/contacts.php:347 -#: ../../mod/admin.php:645 +#: ../../mod/admin.php:648 msgid "Block" msgstr "" @@ -1562,7 +1563,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:344 ../../mod/admin.php:1117 +#: ../../mod/contacts.php:344 ../../mod/admin.php:1120 msgid "Update now" msgstr "" @@ -1655,7 +1656,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:67 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:64 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -1691,7 +1692,7 @@ msgstr "" #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742 #: ../../addon/facebook/facebook.php:680 #: ../../addon/facebook/facebook.php:1170 -#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716 +#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2726 #: ../../boot.php:686 msgid "Administrator" msgstr "" @@ -1774,7 +1775,7 @@ msgstr "" msgid "Remove account" msgstr "" -#: ../../mod/settings.php:88 ../../mod/admin.php:732 ../../mod/admin.php:937 +#: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "" @@ -2001,7 +2002,7 @@ msgstr "" msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:618 +#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:621 msgid "Normal Account" msgstr "" @@ -2009,7 +2010,7 @@ msgstr "" msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:619 +#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:622 msgid "Soapbox Account" msgstr "" @@ -2017,7 +2018,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:620 +#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:623 msgid "Community/Celebrity Account" msgstr "" @@ -2025,7 +2026,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:621 +#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:624 msgid "Automatic Friend Account" msgstr "" @@ -2367,7 +2368,7 @@ msgstr "" msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "" -#: ../../mod/wallmessage.php:56 ../../mod/message.php:59 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:61 msgid "No recipient selected." msgstr "" @@ -2375,15 +2376,15 @@ msgstr "" msgid "Unable to check your home location." msgstr "" -#: ../../mod/wallmessage.php:62 ../../mod/message.php:66 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:68 msgid "Message could not be sent." msgstr "" -#: ../../mod/wallmessage.php:65 ../../mod/message.php:69 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:71 msgid "Message collection failure." msgstr "" -#: ../../mod/wallmessage.php:68 ../../mod/message.php:72 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:74 msgid "Message sent." msgstr "" @@ -2391,12 +2392,12 @@ msgstr "" msgid "No recipient." msgstr "" -#: ../../mod/wallmessage.php:124 ../../mod/message.php:169 +#: ../../mod/wallmessage.php:124 ../../mod/message.php:171 #: ../../include/conversation.php:918 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/wallmessage.php:131 ../../mod/message.php:177 +#: ../../mod/wallmessage.php:131 ../../mod/message.php:188 msgid "Send Private Message" msgstr "" @@ -2407,18 +2408,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: ../../mod/wallmessage.php:133 ../../mod/message.php:178 -#: ../../mod/message.php:370 +#: ../../mod/wallmessage.php:133 ../../mod/message.php:189 +#: ../../mod/message.php:381 msgid "To:" msgstr "" -#: ../../mod/wallmessage.php:134 ../../mod/message.php:179 -#: ../../mod/message.php:371 +#: ../../mod/wallmessage.php:134 ../../mod/message.php:190 +#: ../../mod/message.php:382 msgid "Subject:" msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:183 -#: ../../mod/message.php:374 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:194 +#: ../../mod/message.php:385 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2600,7 +2601,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:66 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:63 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" @@ -2751,7 +2752,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:553 ../../mod/admin.php:403 +#: ../../mod/register.php:553 ../../mod/admin.php:405 msgid "Registration" msgstr "" @@ -2786,8 +2787,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:1564 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:452 -#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:489 +#: ../../view/theme/diabook/theme.php:498 ../../include/diaspora.php:1654 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" @@ -2795,7 +2796,7 @@ msgstr "" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:503 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2807,8 +2808,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 -#: ../../mod/admin.php:681 ../../mod/admin.php:880 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3074 +#: ../../mod/admin.php:684 ../../mod/admin.php:883 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3084 msgid "Item not found." msgstr "" @@ -2816,7 +2817,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:68 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:65 #: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "" @@ -2957,71 +2958,71 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/message.php:22 ../../include/nav.php:131 +#: ../../mod/message.php:9 ../../include/nav.php:131 msgid "New Message" msgstr "" -#: ../../mod/message.php:63 +#: ../../mod/message.php:65 msgid "Unable to locate contact information." msgstr "" -#: ../../mod/message.php:117 +#: ../../mod/message.php:119 msgid "Message deleted." msgstr "" -#: ../../mod/message.php:147 +#: ../../mod/message.php:149 msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:219 +#: ../../mod/message.php:230 msgid "No messages." msgstr "" -#: ../../mod/message.php:226 +#: ../../mod/message.php:237 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:229 +#: ../../mod/message.php:240 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:232 +#: ../../mod/message.php:243 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:242 ../../mod/message.php:363 +#: ../../mod/message.php:253 ../../mod/message.php:374 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:245 +#: ../../mod/message.php:256 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:247 +#: ../../mod/message.php:258 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:282 +#: ../../mod/message.php:293 msgid "Message not available." msgstr "" -#: ../../mod/message.php:347 +#: ../../mod/message.php:358 msgid "Delete message" msgstr "" -#: ../../mod/message.php:365 +#: ../../mod/message.php:376 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:369 +#: ../../mod/message.php:380 msgid "Send Reply" msgstr "" @@ -3038,19 +3039,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:401 +#: ../../mod/admin.php:96 ../../mod/admin.php:403 msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:636 ../../mod/admin.php:648 +#: ../../mod/admin.php:97 ../../mod/admin.php:639 ../../mod/admin.php:651 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:730 ../../mod/admin.php:772 +#: ../../mod/admin.php:98 ../../mod/admin.php:733 ../../mod/admin.php:775 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:935 ../../mod/admin.php:971 +#: ../../mod/admin.php:99 ../../mod/admin.php:938 ../../mod/admin.php:974 msgid "Themes" msgstr "" @@ -3062,7 +3063,7 @@ msgstr "" msgid "Software Update" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:1058 +#: ../../mod/admin.php:115 ../../mod/admin.php:1061 msgid "Logs" msgstr "" @@ -3070,9 +3071,9 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:195 ../../mod/admin.php:400 ../../mod/admin.php:635 -#: ../../mod/admin.php:729 ../../mod/admin.php:771 ../../mod/admin.php:934 -#: ../../mod/admin.php:970 ../../mod/admin.php:1057 +#: ../../mod/admin.php:195 ../../mod/admin.php:402 ../../mod/admin.php:638 +#: ../../mod/admin.php:732 ../../mod/admin.php:774 ../../mod/admin.php:937 +#: ../../mod/admin.php:973 ../../mod/admin.php:1060 msgid "Administration" msgstr "" @@ -3096,493 +3097,503 @@ msgstr "" msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:341 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:387 +#: ../../mod/admin.php:389 msgid "Closed" msgstr "" -#: ../../mod/admin.php:388 +#: ../../mod/admin.php:390 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:389 +#: ../../mod/admin.php:391 msgid "Open" msgstr "" -#: ../../mod/admin.php:393 +#: ../../mod/admin.php:395 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:394 +#: ../../mod/admin.php:396 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:397 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:406 msgid "File upload" msgstr "" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:407 msgid "Policies" msgstr "" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:408 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:410 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:413 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:414 msgid "System language" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:415 msgid "System theme" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:415 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:416 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:416 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:417 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:417 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:419 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:420 msgid "Register text" msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:420 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:421 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:421 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:422 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:422 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:424 msgid "Block public" msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:424 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:425 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:425 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:426 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:426 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:429 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:429 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:434 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:434 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:435 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:435 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:438 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:439 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:439 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:440 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:440 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:441 +msgid "Poll interval" +msgstr "" + +#: ../../mod/admin.php:441 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: ../../mod/admin.php:442 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:442 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:456 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:466 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:469 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:473 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:491 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:495 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:496 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:497 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:495 +#: ../../mod/admin.php:498 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:520 +#: ../../mod/admin.php:523 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:527 +#: ../../mod/admin.php:530 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:566 +#: ../../mod/admin.php:569 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:577 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:577 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:638 +#: ../../mod/admin.php:641 msgid "select all" msgstr "" -#: ../../mod/admin.php:639 +#: ../../mod/admin.php:642 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:640 +#: ../../mod/admin.php:643 msgid "Request date" msgstr "" -#: ../../mod/admin.php:640 ../../mod/admin.php:649 +#: ../../mod/admin.php:643 ../../mod/admin.php:652 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:641 +#: ../../mod/admin.php:644 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:643 +#: ../../mod/admin.php:646 msgid "Deny" msgstr "" -#: ../../mod/admin.php:649 +#: ../../mod/admin.php:652 msgid "Register date" msgstr "" -#: ../../mod/admin.php:649 +#: ../../mod/admin.php:652 msgid "Last login" msgstr "" -#: ../../mod/admin.php:649 +#: ../../mod/admin.php:652 msgid "Last item" msgstr "" -#: ../../mod/admin.php:649 +#: ../../mod/admin.php:652 msgid "Account" msgstr "" -#: ../../mod/admin.php:651 +#: ../../mod/admin.php:654 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:652 +#: ../../mod/admin.php:655 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:693 +#: ../../mod/admin.php:696 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:697 +#: ../../mod/admin.php:700 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:707 ../../mod/admin.php:905 +#: ../../mod/admin.php:710 ../../mod/admin.php:908 msgid "Disable" msgstr "" -#: ../../mod/admin.php:709 ../../mod/admin.php:907 +#: ../../mod/admin.php:712 ../../mod/admin.php:910 msgid "Enable" msgstr "" -#: ../../mod/admin.php:731 ../../mod/admin.php:936 +#: ../../mod/admin.php:734 ../../mod/admin.php:939 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:739 ../../mod/admin.php:946 +#: ../../mod/admin.php:742 ../../mod/admin.php:949 msgid "Author: " msgstr "" -#: ../../mod/admin.php:740 ../../mod/admin.php:947 +#: ../../mod/admin.php:743 ../../mod/admin.php:950 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:869 +#: ../../mod/admin.php:872 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:928 +#: ../../mod/admin.php:931 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:976 +#: ../../mod/admin.php:979 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:977 +#: ../../mod/admin.php:980 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1004 +#: ../../mod/admin.php:1007 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1060 +#: ../../mod/admin.php:1063 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1066 +#: ../../mod/admin.php:1069 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1067 +#: ../../mod/admin.php:1070 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1067 +#: ../../mod/admin.php:1070 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1068 +#: ../../mod/admin.php:1071 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1118 ../../view/theme/diabook/theme.php:599 +#: ../../mod/admin.php:1121 ../../view/theme/diabook/theme.php:652 msgid "Close" msgstr "" -#: ../../mod/admin.php:1124 +#: ../../mod/admin.php:1127 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1125 +#: ../../mod/admin.php:1128 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1126 +#: ../../mod/admin.php:1129 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1127 +#: ../../mod/admin.php:1130 msgid "FTP Password" msgstr "" @@ -4052,7 +4063,7 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:550 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4067,7 +4078,12 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:511 +#: ../../mod/acl.php:134 +#, php-format +msgid "%s [%s]" +msgstr "" + +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:548 msgid "Global Directory" msgstr "" @@ -4652,7 +4668,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1303 +#: ../../view/theme/diabook/theme.php:486 ../../include/text.php:1303 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5548,7 +5564,7 @@ msgid "Post to Posterous by default" msgstr "" #: ../../view/theme/cleanzero/config.php:82 -#: ../../view/theme/diabook/config.php:97 +#: ../../view/theme/diabook/config.php:109 #: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 msgid "Theme settings" msgstr "" @@ -5558,7 +5574,8 @@ msgid "Set resize level for images in posts and comments (width and height)" msgstr "" #: ../../view/theme/cleanzero/config.php:84 -#: ../../view/theme/diabook/config.php:98 ../../view/theme/dispy/config.php:73 +#: ../../view/theme/diabook/config.php:110 +#: ../../view/theme/dispy/config.php:73 msgid "Set font-size for posts and comments" msgstr "" @@ -5571,102 +5588,118 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:65 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:62 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:66 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:63 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:67 +#: ../../view/theme/diabook/theme.php:64 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:68 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:65 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:69 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:66 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:70 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:67 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:70 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:67 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:72 -#: ../../view/theme/diabook/theme.php:530 +#: ../../view/theme/diabook/theme.php:69 +#: ../../view/theme/diabook/theme.php:567 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:414 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:435 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:464 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:509 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:546 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:547 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:549 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:551 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:565 -msgid "Earth View" +#: ../../view/theme/diabook/theme.php:602 +msgid "Earth Layers" +msgstr "" + +#: ../../view/theme/diabook/theme.php:608 +#: ../../view/theme/diabook/config.php:115 +msgid "Set zoomfactor for Earth Layer" +msgstr "" + +#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/config.php:116 +msgid "Set longitude (X) for Earth Layer" +msgstr "" + +#: ../../view/theme/diabook/theme.php:610 +#: ../../view/theme/diabook/config.php:117 +msgid "Set latitude (Y) for Earth Layer" msgstr "" -#: ../../view/theme/diabook/theme.php:573 +#: ../../view/theme/diabook/theme.php:625 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:580 +#: ../../view/theme/diabook/theme.php:632 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:639 msgid "Last Tweets" msgstr "" -#: ../../view/theme/diabook/theme.php:591 -#: ../../view/theme/diabook/config.php:102 +#: ../../view/theme/diabook/theme.php:643 +#: ../../view/theme/diabook/config.php:114 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/config.php:99 ../../view/theme/dispy/config.php:74 +#: ../../view/theme/diabook/config.php:111 +#: ../../view/theme/dispy/config.php:74 msgid "Set line-height for posts and comments" msgstr "" -#: ../../view/theme/diabook/config.php:100 +#: ../../view/theme/diabook/config.php:112 msgid "Set resolution for middle column" msgstr "" -#: ../../view/theme/diabook/config.php:101 +#: ../../view/theme/diabook/config.php:113 msgid "Set color scheme" msgstr "" @@ -5699,7 +5732,7 @@ msgid "j F" msgstr "" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:448 -#: ../../include/items.php:1403 +#: ../../include/items.php:1413 msgid "Birthday:" msgstr "" @@ -6774,11 +6807,11 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/items.php:2714 +#: ../../include/items.php:2724 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2714 +#: ../../include/items.php:2724 msgid "You have a new follower at " msgstr "" diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 265f2724d..3ca03262d 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -81,6 +81,7 @@ {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$timeout }}{{ endinc }} {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} + {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }} {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }} diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index eb4385722..60d4646cc 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -22,9 +22,6 @@ just contact me, if you are intesrested in joining</p> </span> <div id="map2" style="height:350px;width:350px;"></div> <div id="mouseposition" style="width: 350px;"></div> -<div id="zoom"> -zoom:<input type="text" id="mapzoom" value=""></input> -</div> {{inc field_input.tpl with $field=$ELZoom}}{{endinc}} {{inc field_input.tpl with $field=$ELPosX}}{{endinc}} {{inc field_input.tpl with $field=$ELPosY}}{{endinc}} @@ -34,6 +31,24 @@ zoom:<input type="text" id="mapzoom" value=""></input> </form> </div> +<div id="boxsettings" style="display:none"> +<form id="boxsettingsform" action="network" method="post" > +{{inc field_select.tpl with $field=$close_pages}}{{endinc}} +{{inc field_select.tpl with $field=$close_profiles}}{{endinc}} +{{inc field_select.tpl with $field=$close_helpers}}{{endinc}} +{{inc field_select.tpl with $field=$close_services}}{{endinc}} +{{inc field_select.tpl with $field=$close_friends}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}} +{{inc field_select.tpl with $field=$close_twitter}}{{endinc}} +{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}} +<div class="settings-submit-wrapper"> +<input id="boxsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-box-sub"></input> +</div> +</form> +</div> + <div id="pos_null" style="margin-bottom:-30px;"> </div> @@ -47,7 +62,7 @@ zoom:<input type="text" id="mapzoom" value=""></input> <div id="close_profiles"> {{ if $comunity_profiles_title }} -<h3>$comunity_profiles_title<a id="close_comunity_profiles_icon" onClick="close_profiles()" class="icon close_box" title="$close"></a></h3> +<h3>$comunity_profiles_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3> <div id='lastusers-wrapper' class='items-wrapper'> {{ for $comunity_profiles_items as $i }} $i @@ -58,7 +73,7 @@ zoom:<input type="text" id="mapzoom" value=""></input> <div id="close_helpers"> {{ if $helpers }} -<h3>$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="$close"></a></h3> +<h3>$helpers.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3> <a href="http://friendica.com/resources" title="How-to's" style="margin-left: 10px; " target="blank">How-To Guides</a><br> <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> @@ -69,7 +84,7 @@ zoom:<input type="text" id="mapzoom" value=""></input> <div id="close_services"> {{ if $con_services }} -<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="$close"></a></h3> +<h3>$con_services.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3> <div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;"> <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a> <a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a> @@ -85,7 +100,7 @@ zoom:<input type="text" id="mapzoom" value=""></input> <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> +<h3>$nv.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" 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> @@ -97,7 +112,7 @@ $nv.search <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> +<h3>$lastusers_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3> <div id='lastusers-wrapper' class='items-wrapper'> {{ for $lastusers_items as $i }} $i @@ -117,7 +132,7 @@ $nv.search <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> +<h3>$photos_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3> <div id='ra-photos-wrapper' class='items-wrapper'> {{ for $photos_items as $i }} $i @@ -128,7 +143,7 @@ $nv.search <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> +<h3>$like_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3> <ul id='likes'> {{ for $like_items as $i }} <li id='ra-photos-wrapper'>$i</li> @@ -138,14 +153,14 @@ $nv.search </div> <div id="close_twitter"> -<h3 style="height:1.17em">$twitter.title.1<a id="close_twitter_icon" onClick="close_twitter()" class="icon close_box" title="$close"></a></h3> +<h3 style="height:1.17em">$twitter.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3> <div id="twitter"> </div> </div> <div id="close_mapquery"> {{ if $mapquery }} -<h3>$mapquery.title.1<a id="close_mapquery_icon" onClick="close_mapquery()" class="icon close_box" title="$close"></a></h3> +<h3>$mapquery.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3> <div id="map" style="height:165px;width:165px;margin-left:3px;margin-top:3px;margin-bottom:1px;"> </div> <div style="font-size:9px;margin-left:3px;">Data CC-By-SA by <a href="http://openstreetmap.org/">OpenStreetMap</a></div> diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php index 40a539079..84dd64834 100644 --- a/view/theme/diabook/config.php +++ b/view/theme/diabook/config.php @@ -17,8 +17,19 @@ function theme_content(&$a){ $ELZoom = get_pconfig(local_user(), 'diabook', 'ELZoom' ); $ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' ); $ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' ); + $close_pages = get_pconfig(local_user(), 'diabook', 'close_pages' ); + $close_mapquery = get_pconfig(local_user(), 'diabook', 'close_mapquery' ); + $close_profiles = get_pconfig(local_user(), 'diabook', 'close_profiles' ); + $close_helpers = get_pconfig(local_user(), 'diabook', 'close_helpers' ); + $close_services = get_pconfig(local_user(), 'diabook', 'close_services' ); + $close_friends = get_pconfig(local_user(), 'diabook', 'close_friends' ); + $close_twitter = get_pconfig(local_user(), 'diabook', 'close_twitter' ); + $close_lastusers = get_pconfig(local_user(), 'diabook', 'close_lastusers' ); + $close_lastphotos = get_pconfig(local_user(), 'diabook', 'close_lastphotos' ); + $close_lastlikes = get_pconfig(local_user(), 'diabook', 'close_lastlikes' ); - return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY); + + return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY, $close_pages, $close_mapquery, $close_profiles, $close_helpers, $close_services, $close_friends, $close_twitter, $close_lastusers, $close_lastphotos, $close_lastlikes); } function theme_post(&$a){ @@ -34,6 +45,18 @@ function theme_post(&$a){ set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']); set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); + set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); + set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']); + set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']); + set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']); + set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']); + set_pconfig(local_user(), 'diabook', 'close_services', $_POST['diabook_close_services']); + set_pconfig(local_user(), 'diabook', 'close_friends', $_POST['diabook_close_friends']); + set_pconfig(local_user(), 'diabook', 'close_twitter', $_POST['diabook_close_twitter']); + set_pconfig(local_user(), 'diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); + set_pconfig(local_user(), 'diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); + set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); + } } @@ -47,8 +70,18 @@ function theme_admin(&$a){ $ELZoom = get_config('diabook', 'ELZoom' ); $ELPosX = get_config('diabook', 'ELPosX' ); $ELPosY = get_config('diabook', 'ELPosY' ); + $close_pages = get_config('diabook', 'close_pages' ); + $close_mapquery = get_config('diabook', 'close_mapquery' ); + $close_profiles = get_config('diabook', 'close_profiles' ); + $close_helpers = get_config('diabook', 'close_helpers' ); + $close_services = get_config('diabook', 'close_services' ); + $close_friends = get_config('diabook', 'close_friends' ); + $close_twitter = get_config('diabook', 'close_twitter' ); + $close_lastusers = get_config('diabook', 'close_lastusers' ); + $close_lastphotos = get_config('diabook', 'close_lastphotos' ); + $close_lastlikes = get_config('diabook', 'close_lastlikes' ); - return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY); + return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY, $close_pages, $close_mapquery, $close_profiles, $close_helpers, $close_services, $close_friends, $close_twitter, $close_lastusers, $close_lastphotos, $close_lastlikes); } function theme_admin_post(&$a){ @@ -60,12 +93,22 @@ function theme_admin_post(&$a){ set_config('diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']); set_config('diabook', 'ELZoom', $_POST['diabook_ELZoom']); set_config('diabook', 'ELPosX', $_POST['diabook_ELPosX']); - set_config('diabook', 'ELPosY', $_POST['diabook_ELPosY']); + set_config('diabook', 'close_pages', $_POST['diabook_close_pages']); + set_config('diabook', 'close_mapquery', $_POST['diabook_close_mapquery']); + set_config('diabook', 'close_profiles', $_POST['diabook_close_profiles']); + set_config('diabook', 'close_helpers', $_POST['diabook_close_helpers']); + set_config('diabook', 'close_services', $_POST['diabook_close_services']); + set_config('diabook', 'close_friends', $_POST['diabook_close_friends']); + set_config('diabook', 'close_twitter', $_POST['diabook_close_twitter']); + set_config('diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); + set_config('diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); + set_config('diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); + } } -function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY){ +function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY, $close_pages, $close_mapquery, $close_profiles, $close_helpers, $close_services, $close_friends, $close_twitter, $close_lastusers, $close_lastphotos, $close_lastlikes){ $line_heights = array( "1.3"=>"1.3", "---"=>"---", @@ -99,7 +142,47 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear 'red'=>'red', 'dark'=>'dark', ); - + $close_pagesC = array( + '1'=>'hide', + '0'=>'show', + ); + $close_mapqueryC = array( + '1'=>'hide', + '0'=>'show', + ); + $close_profilesC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_helpersC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_servicesC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_friendsC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_twitterC = array( + '1'=>'hide', + '0'=>'show', + ); + $close_lastusersC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_lastphotosC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_lastlikesC = array( + '0'=>'show', + '1'=>'hide', + ); + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); @@ -115,6 +198,16 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear '$ELZoom' => array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom), '$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX), '$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY), + '$close_pages' => array('diabook_close_pages', t('Show "Cummunity Pages" at right-hand coloumn?'), $close_pages, '', $close_pagesC), + '$close_mapquery' => array('diabook_close_mapquery', t('Show "Earth Layers" at right-hand coloumn?'), $close_mapquery, '', $close_mapqueryC), + '$close_profiles' => array('diabook_close_profiles', t('Show "Cummunity Profiles" at right-hand coloumn?'), $close_profiles, '', $close_profilesC), + '$close_helpers' => array('diabook_close_helpers', t('Show "Help or @NewHere" at right-hand coloumn?'), $close_helpers, '', $close_helpersC), + '$close_services' => array('diabook_close_services', t('Show "Connect Services" at right-hand coloumn?'), $close_services, '', $close_servicesC), + '$close_friends' => array('diabook_close_friends', t('Show "Find Friends" at right-hand coloumn?'), $close_friends, '', $close_friendsC), + '$close_twitter' => array('diabook_close_twitter', t('Show "Last Tweets" at right-hand coloumn?'), $close_twitter, '', $close_twitterC), + '$close_lastusers' => array('diabook_close_lastusers', t('Show "Last Users" at right-hand coloumn?'), $close_lastusers, '', $close_lastusersC), + '$close_lastphotos' => array('diabook_close_lastphotos', t('Show "Last Photos" at right-hand coloumn?'), $close_lastphotos, '', $close_lastphotosC), + '$close_lastlikes' => array('diabook_close_lastlikes', t('Show "Last Likes" at right-hand coloumn?'), $close_lastlikes, '', $close_lastlikesC), )); return $o; } diff --git a/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js b/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js index 54d0c5309..d4370bfe4 100644 --- a/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js +++ b/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js @@ -94,10 +94,10 @@ $.widget("mapQuery.mqMousePosition", { new OpenLayers.Projection(mapProjection), new OpenLayers.Projection(displayProjection)); } - $("#mq-mouseposition-x", element).html( - this.options.x+': '+pos.lon.toFixed(this.options.precision)); - $("#mq-mouseposition-y", element).html( - this.options.y+': '+pos.lat.toFixed(this.options.precision)); + $("#id_diabook_ELPosX", element).val( + this.options.x+pos.lon.toFixed(this.options.precision)); + $("#id_diabook_ELPosY", element).val( + this.options.y+pos.lat.toFixed(this.options.precision)); }, _onMouseMove: function(evt, data) { diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index a6b58e103..607414f17 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -19,6 +19,67 @@ $a->page['htmlhead'] .= sprintf('<META NAME="theme" CONTENT="%s"/>', $diabook_ve //change css on network and profilepages $cssFile = null; +$close_pages = false; +$site_close_pages = get_config("diabook", "close_pages" ); +if (local_user()) {$close_pages = get_pconfig(local_user(), "diabook", "close_pages");} +if ($close_pages===false) $close_pages=$site_close_pages; +if ($close_pages===false) $close_pages="1"; + +$close_profiles = false; +$site_close_profiles = get_config("diabook", "close_profiles" ); +if (local_user()) {$close_profiles = get_pconfig(local_user(), "diabook", "close_profiles");} +if ($close_profiles===false) $close_profiles=$site_close_profiles; +if ($close_profiles===false) $close_profiles="0"; + +$close_helpers = false; +$site_close_helpers = get_config("diabook", "close_helpers" ); +if (local_user()) {$close_helpers = get_pconfig(local_user(), "diabook", "close_helpers");} +if ($close_helpers===false) $close_helpers=$site_close_helpers; +if ($close_helpers===false) $close_helpers="0"; + +$close_services = false; +$site_close_services = get_config("diabook", "close_services" ); +if (local_user()) {$close_services = get_pconfig(local_user(), "diabook", "close_services");} +if ($close_services===false) $close_services=$site_close_services; +if ($close_services===false) $close_services="0"; + +$close_friends = false; +$site_close_friends = get_config("diabook", "close_friends" ); +if (local_user()) {$close_friends = get_pconfig(local_user(), "diabook", "close_friends");} +if ($close_friends===false) $close_friends=$site_close_friends; +if ($close_friends===false) $close_friends="0"; + +$close_lastusers = false; +$site_close_lastusers = get_config("diabook", "close_lastusers" ); +if (local_user()) {$close_lastusers = get_pconfig(local_user(), "diabook", "close_lastusers");} +if ($close_lastusers===false) $close_lastusers=$site_close_lastusers; +if ($close_lastusers===false) $close_lastusers="0"; + +$close_lastphotos = false; +$site_close_lastphotos = get_config("diabook", "close_lastphotos" ); +if (local_user()) {$close_lastphotos = get_pconfig(local_user(), "diabook", "close_lastphotos");} +if ($close_lastphotos===false) $close_lastphotos=$site_close_lastphotos; +if ($close_lastphotos===false) $close_lastphotos="0"; + +$close_lastlikes = false; +$site_close_lastlikes = get_config("diabook", "close_lastlikes" ); +if (local_user()) {$close_lastlikes = get_pconfig(local_user(), "diabook", "close_lastlikes");} +if ($close_lastlikes===false) $close_lastlikes=$site_close_lastlikes; +if ($close_lastlikes===false) $close_lastlikes="0"; + +$close_twitter = false; +$site_close_twitter = get_config("diabook", "close_twitter" ); +if (local_user()) {$close_twitter = get_pconfig(local_user(), "diabook", "close_twitter");} +if ($close_twitter===false) $close_twitter=$site_close_twitter; +if ($close_twitter===false) $close_twitter="1"; + +$close_mapquery = false; +$site_close_mapquery = get_config("diabook", "close_mapquery" ); +if (local_user()) {$close_mapquery = get_pconfig(local_user(), "diabook", "close_mapquery");} +if ($close_mapquery===false) $close_mapquery=$site_close_mapquery; +if ($close_mapquery===false) $close_mapquery="1"; + + $resolution=false; $resolution = get_pconfig(local_user(), "diabook", "resolution"); if ($resolution===false) $resolution="normal"; @@ -77,8 +138,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_mapquery'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - + $ccCookie = $close_pages + $close_mapquery + $close_profiles + $close_helpers + $close_services + $close_friends + $close_twitter + $close_lastusers + $close_lastphotos + $close_lastlikes; if($ccCookie != "10") { // COMMUNITY diabook_community_info(); @@ -120,14 +180,14 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } //load jquery.twitter.search.js - if($_COOKIE['close_twitter'] != "1") { + if($close_twitter != "1") { $twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS); } //load jquery.mapquery.js - if($_COOKIE['close_mapquery'] != "1") { + if($close_mapquery != "1") { $mqtmplJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.tmpl.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mqtmplJS); $mapqueryJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.core.js"; @@ -146,8 +206,9 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $(function() { $("a.lightbox").fancybox(); // Select all links with lightbox class - $("a.#twittersettings-link").fancybox({onClosed: function() { $("#twittersettings").attr("style","display: none;");}} ); - $("a.#mapcontrol-link").fancybox({onClosed: function() { $("#mapcontrol").attr("style","display: none;");}} ); + $("a#twittersettings-link").fancybox({onClosed: function() { $("#twittersettings").attr("style","display: none;");}} ); + $("a#mapcontrol-link").fancybox({onClosed: function() { $("#mapcontrol").attr("style","display: none;");}} ); + $("a#closeicon").fancybox({onClosed: function() { $("#boxsettings").attr("style","display: none;");}} ); }); $(window).load(function() { @@ -157,7 +218,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; </script>'; //check if mapquerybox is active and print - if($_COOKIE['close_mapquery'] != "1") { + if($close_mapquery != "1") { $ELZoom=false; $ELPosX=false; $ELPosy=false; @@ -193,26 +254,24 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $("#mouseposition").mqMousePosition({ map: "#map2", - x:"lon", - y:"lat", - precision:2 + x:"", + y:"", + precision:4 }); map = $("#map2").mapQuery().data("mapQuery"); - textarea = document.getElementById("mapzoom"); - - + textarea = document.getElementById("id_diabook_ELZoom"); + $("#map2").bind("mousewheel", function(event, delta) { if (delta > 0 || delta < 0){ textarea.value = map.center().zoom; } }); - }; </script>'; } //check if twitterbox is active and print - if($_COOKIE['close_twitter'] != "1") { + if($close_twitter != "1") { $TSearchTerm=false; $site_TSearchTerm = get_config("diabook", "TSearchTerm" ); $TSearchTerm = get_pconfig(local_user(), "diabook", "TSearchTerm"); @@ -261,25 +320,14 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $a->page['htmlhead'] .= ' <script> function restore_boxes(){ - $.cookie("close_pages","2", { expires: 365, path: "/" }); - $.cookie("close_mapquery","2", { expires: 365, path: "/" }); - $.cookie("close_helpers","2", { expires: 365, path: "/" }); - $.cookie("close_profiles","2", { expires: 365, path: "/" }); - $.cookie("close_services","2", { expires: 365, path: "/" }); - $.cookie("close_friends","2", { expires: 365, path: "/" }); - $.cookie("close_twitter","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: "/" }); $.cookie("Boxorder",null, { expires: 365, path: "/" }); - alert("Right-hand column was restored. Please refresh your browser"); + alert("Boxorder at right-hand column was restored. Please refresh your browser"); } </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}); }); @@ -290,107 +338,63 @@ if ($color=="dark") $color_path = "/diabook-dark/"; <script> $("right_aside").ready(function(){ - if($.cookie("close_pages") == "1") + if('.$close_pages.') { document.getElementById( "close_pages" ).style.display = "none"; }; - if($.cookie("close_mapquery") == "1") + if('.$close_mapquery.') { document.getElementById( "close_mapquery" ).style.display = "none"; }; - if($.cookie("close_profiles") == "1") + if('.$close_profiles.') { document.getElementById( "close_profiles" ).style.display = "none"; }; - if($.cookie("close_helpers") == "1") + if('.$close_helpers.') { document.getElementById( "close_helpers" ).style.display = "none"; }; - if($.cookie("close_services") == "1") + if('.$close_services.') { document.getElementById( "close_services" ).style.display = "none"; }; - if($.cookie("close_friends") == "1") + if('.$close_friends.') { document.getElementById( "close_friends" ).style.display = "none"; }; - if($.cookie("close_twitter") == "1") + if('.$close_twitter.') { document.getElementById( "close_twitter" ).style.display = "none"; }; - if($.cookie("close_lastusers") == "1") + if('.$close_lastusers.') { document.getElementById( "close_lastusers" ).style.display = "none"; }; - if($.cookie("close_lastphotos") == "1") + if('.$close_lastphotos.') { document.getElementById( "close_lastphotos" ).style.display = "none"; }; - if($.cookie("close_lastlikes") == "1") + if('.$close_lastlikes.') { 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_mapquery(){ - document.getElementById( "close_mapquery" ).style.display = "none"; - $.cookie("close_mapquery","1", { expires: 365, path: "/" }); - }; - - function close_profiles(){ - document.getElementById( "close_profiles" ).style.display = "none"; - $.cookie("close_profiles","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_twitter(){ - document.getElementById( "close_twitter" ).style.display = "none"; - $.cookie("close_twitter","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: "/" }); - }; + + function open_boxsettings() { + $("div#boxsettings").attr("style","display: block;height:500px;width:450px;"); + $("label").attr("style","width: 350px;"); + }; + </script>';} } //end js scripts @@ -410,7 +414,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; function diabook_community_info() { $a = get_app(); // comunity_profiles - if($_COOKIE['close_profiles'] != "1") { + if($close_profiles != "1") { $aside['$comunity_profiles_title'] = t('Community Profiles'); $aside['$comunity_profiles_items'] = array(); $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id @@ -431,7 +435,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} // last 12 users - if($_COOKIE['close_lastusers'] != "1") { + if($close_lastusers != "1") { $aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_items'] = array(); $sql_extra = ""; @@ -460,7 +464,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} // last 10 liked items - if($_COOKIE['close_lastlikes'] != "1") { + if($close_lastlikes != "1") { $aside['$like_title'] = t('Last likes'); $aside['$like_items'] = array(); $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM @@ -505,7 +509,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} // last 12 photos - if($_COOKIE['close_photos'] != "1") { + if($close_photos != "1") { $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 @@ -540,7 +544,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} //right_aside FIND FRIENDS - if($_COOKIE['close_friends'] != "1") { + if($close_friends != "1") { if(local_user()) { $nv = array(); $nv['title'] = Array("", t('Find Friends'), "", ""); @@ -561,10 +565,10 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} //Community_Pages at right_aside - if($_COOKIE['close_pages'] != "1") { + if($close_pages != "1") { if(local_user()) { $page = ' - <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3> + <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="close"></a></h3> <div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">'; $pagelist = array(); @@ -597,19 +601,16 @@ if ($color=="dark") $color_path = "/diabook-dark/"; //mapquery - if($_COOKIE['close_mapquery'] != "1") { + if($close_mapquery != "1") { $mapquery = array(); $mapquery['title'] = Array("", "<a id='mapcontrol-link' href='#mapcontrol' style='text-decoration:none;' onclick='open_mapcontrol(); return false;'>".t('Earth Layers')."</a>", "", ""); $aside['$mapquery'] = $mapquery; $ELZoom = get_pconfig(local_user(), 'diabook', 'ELZoom' ); $ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' ); $ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' ); - $aside['$sub'] = t('Submit'); $aside['$ELZoom'] = array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom); $aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX); $aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY); - $baseurl = $a->get_baseurl($ssl_state); - $aside['$baseurl'] = $baseurl; if (isset($_POST['diabook-settings-map-sub']) && $_POST['diabook-settings-map-sub']!=''){ set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']); set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); @@ -618,28 +619,27 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } } //end mapquery - + //helpers - if($_COOKIE['close_helpers'] != "1") { + if($close_helpers != "1") { $helpers = array(); $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); $aside['$helpers'] = $helpers; } //end helpers //connectable services - if($_COOKIE['close_services'] != "1") { + if($close_services != "1") { $con_services = array(); $con_services['title'] = Array("", t('Connect Services'), "", ""); $aside['$con_services'] = $con_services; } //end connectable services //twitter - if($_COOKIE['close_twitter'] != "1") { + if($close_twitter != "1") { $twitter = array(); $twitter['title'] = Array("", "<a id='twittersettings-link' href='#twittersettings' style='text-decoration:none;' onclick='open_twittersettings(); return false;'>".t('Last Tweets')."</a>", "", ""); $aside['$twitter'] = $twitter; $TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' ); - $aside['$sub'] = t('Submit'); $aside['$TSearchTerm'] = array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm); $baseurl = $a->get_baseurl($ssl_state); $aside['$baseurl'] = $baseurl; @@ -649,7 +649,55 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } } //end twitter - $close = t('Close'); + if($ccCookie != "10") { + $close_pages = get_pconfig(local_user(), 'diabook', 'close_pages' ); + $close_mapquery = get_pconfig(local_user(), 'diabook', 'close_mapquery' ); + $close_profiles = get_pconfig(local_user(), 'diabook', 'close_profiles' ); + $close_helpers = get_pconfig(local_user(), 'diabook', 'close_helpers' ); + $close_services = get_pconfig(local_user(), 'diabook', 'close_services' ); + $close_friends = get_pconfig(local_user(), 'diabook', 'close_friends' ); + $close_twitter = get_pconfig(local_user(), 'diabook', 'close_twitter' ); + $close_lastusers = get_pconfig(local_user(), 'diabook', 'close_lastusers' ); + $close_lastphotos = get_pconfig(local_user(), 'diabook', 'close_lastphotos' ); + $close_lastlikes = get_pconfig(local_user(), 'diabook', 'close_lastlikes' ); + $close_pagesC = array('1'=>'hide', '0'=>'show',); + $close_mapqueryC = array('1'=>'hide', '0'=>'show',); + $close_profilesC = array('0'=>'show', '1'=>'hide',); + $close_helpersC = array('0'=>'show', '1'=>'hide',); + $close_servicesC = array('0'=>'show', '1'=>'hide',); + $close_friendsC = array('0'=>'show', '1'=>'hide',); + $close_twitterC = array('1'=>'hide', '0'=>'show',); + $close_lastusersC = array('0'=>'show', '1'=>'hide',); + $close_lastphotosC = array('0'=>'show','1'=>'hide',); + $close_lastlikesC = array('0'=>'show', '1'=>'hide',); + $aside['$close_pages'] = array('diabook_close_pages', t('Show "Cummunity Pages" at right-hand coloumn?'), $close_pages, '', $close_pagesC); + $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Show "Earth Layers" at right-hand coloumn?'), $close_mapquery, '', $close_mapqueryC); + $aside['$close_profiles'] = array('diabook_close_profiles', t('Show "Cummunity Profiles" at right-hand coloumn?'), $close_profiles, '', $close_profilesC); + $aside['$close_helpers'] = array('diabook_close_helpers', t('Show "Help or @NewHere" at right-hand coloumn?'), $close_helpers, '', $close_helpersC); + $aside['$close_services'] = array('diabook_close_services', t('Show "Connect Services" at right-hand coloumn?'), $close_services, '', $close_servicesC); + $aside['$close_friends'] = array('diabook_close_friends', t('Show "Find Friends" at right-hand coloumn?'), $close_friends, '', $close_friendsC); + $aside['$close_twitter'] = array('diabook_close_twitter', t('Show "Last Tweets" at right-hand coloumn?'), $close_twitter, '', $close_twitterC); + $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Show "Last Users" at right-hand coloumn?'), $close_lastusers, '', $close_lastusersC); + $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Show "Last Photos" at right-hand coloumn?'), $close_lastphotos, '', $close_lastphotosC); + $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Show "Last Likes" at right-hand coloumn?'), $close_lastlikes, '', $close_lastlikesC); + $aside['$sub'] = t('Submit'); + $baseurl = $a->get_baseurl($ssl_state); + $aside['$baseurl'] = $baseurl; + if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){ + set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']); + set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']); + set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']); + set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']); + set_pconfig(local_user(), 'diabook', 'close_services', $_POST['diabook_close_services']); + set_pconfig(local_user(), 'diabook', 'close_friends', $_POST['diabook_close_friends']); + set_pconfig(local_user(), 'diabook', 'close_twitter', $_POST['diabook_close_twitter']); + set_pconfig(local_user(), 'diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); + set_pconfig(local_user(), 'diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); + set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); + header("Location: network"); + } + } + $close = t('Settings'); $aside['$close'] = $close; //get_baseurl $url = $a->get_baseurl($ssl_state); diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl index 27122857c..68b22a168 100644 --- a/view/theme/diabook/theme_settings.tpl +++ b/view/theme/diabook/theme_settings.tpl @@ -14,11 +14,26 @@ {{inc field_input.tpl with $field=$ELZoom}}{{endinc}} -<div class="field select"> -<a onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a> +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" /> </div> +{{inc field_select.tpl with $field=$close_pages}}{{endinc}} +{{inc field_select.tpl with $field=$close_profiles}}{{endinc}} +{{inc field_select.tpl with $field=$close_helpers}}{{endinc}} +{{inc field_select.tpl with $field=$close_services}}{{endinc}} +{{inc field_select.tpl with $field=$close_friends}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}} +{{inc field_select.tpl with $field=$close_twitter}}{{endinc}} +{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}} + <div class="settings-submit-wrapper"> <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" /> </div> +<div class="field select"> +<a onClick="restore_boxes()" title="Restore order at right-hand column" style="cursor: pointer;">Restore order at right-hand column</a> +</div> + |