Merge remote branch 'upstream/master'
This commit is contained in:
zottel
commit
78429926bc
2
boot.php
2
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1334' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1335' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1143 );
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
else {
|
||||
logger('diaspora_transmit: test_mode');
|
||||
return 200;
|
||||
if(was_recently_delayed($contact['id'])) {
|
||||
$return_code = 0;
|
||||
}
|
||||
|
||||
$return_code = $a->get_curl_code();
|
||||
else {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_code);
|
||||
|
||||
if((! $return_code) || (($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))) {
|
||||
|
|
|
|||
|
|
@ -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()),
|
||||
|
|
|
|||
|
|
@ -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 " : "");
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
||||
|
|
|
|||
|
|
@ -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"),
|
||||
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
||||
$ret = probe_url($url);
|
||||
call_hooks('follow', $arr);
|
||||
|
||||
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
|
||||
}
|
||||
|
|
|
|||
485
util/messages.po
485
util/messages.po
File diff suppressed because it is too large
Load diff
|
|
@ -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 }}
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue