Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
8209ae6455
|
|
@ -24,4 +24,11 @@ report/
|
|||
#ignore OSX .DS_Store files
|
||||
.DS_Store
|
||||
|
||||
/nbproject/private/
|
||||
/nbproject/private/
|
||||
|
||||
#ignore smarty cache
|
||||
/view/smarty3/compiled/
|
||||
|
||||
#ignore cache folders
|
||||
/privacy_image_cache/
|
||||
/photo/
|
||||
|
|
|
|||
12
boot.php
12
boot.php
|
|
@ -1107,6 +1107,10 @@ if(! function_exists('get_max_import_size')) {
|
|||
* Profile information is placed in the App structure for later retrieval.
|
||||
* Honours the owner's chosen theme for display.
|
||||
*
|
||||
* IMPORTANT: Should only be run in the _init() functions of a module. That ensures that
|
||||
* the theme is chosen before the _init() function of a theme is run, which will usually
|
||||
* load a lot of theme-specific content
|
||||
*
|
||||
*/
|
||||
|
||||
if(! function_exists('profile_load')) {
|
||||
|
|
@ -1166,7 +1170,7 @@ if(! function_exists('profile_load')) {
|
|||
|
||||
if(! $r[0]['is-default']) {
|
||||
$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
|
||||
intval($profile_uid)
|
||||
intval($r[0]['profile_uid'])
|
||||
);
|
||||
if($x && count($x))
|
||||
$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
|
||||
|
|
@ -1174,7 +1178,7 @@ if(! function_exists('profile_load')) {
|
|||
|
||||
$a->profile = $r[0];
|
||||
|
||||
$a->profile['mobile-theme'] = get_pconfig($profile_uid, 'system', 'mobile_theme');
|
||||
$a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
|
||||
|
||||
|
||||
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
|
||||
|
|
@ -1185,6 +1189,8 @@ if(! function_exists('profile_load')) {
|
|||
* load/reload current theme info
|
||||
*/
|
||||
|
||||
set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one
|
||||
|
||||
$theme_info_file = "view/theme/".current_theme()."/theme.php";
|
||||
if (file_exists($theme_info_file)){
|
||||
require_once($theme_info_file);
|
||||
|
|
@ -1611,7 +1617,7 @@ if(! function_exists('current_theme')) {
|
|||
// $mobile_detect = new Mobile_Detect();
|
||||
// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
|
||||
$is_mobile = $a->is_mobile || $a->is_tablet;
|
||||
|
||||
|
||||
if($is_mobile) {
|
||||
if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
|
||||
$system_theme = '';
|
||||
|
|
|
|||
|
|
@ -944,7 +944,7 @@
|
|||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||
|
||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`,
|
||||
`contact`.`name`, `contact`.`photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
|
||||
`contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
|
||||
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||
FROM `item`, `contact`
|
||||
|
|
@ -957,7 +957,18 @@
|
|||
);
|
||||
|
||||
if ($r[0]['body'] != "") {
|
||||
$_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
|
||||
if (intval(get_config('system','new_share'))) {
|
||||
$post = "[share author='".str_replace("'", "'", $r[0]['reply_author']).
|
||||
"' profile='".$r[0]['reply_url'].
|
||||
"' avatar='".$r[0]['reply_photo'].
|
||||
"' link='".$r[0]['plink']."']";
|
||||
|
||||
$post .= $r[0]['body'];
|
||||
$post .= "[/share]";
|
||||
$_REQUEST['body'] = $post;
|
||||
} else
|
||||
$_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
|
||||
|
||||
$_REQUEST['profile_uid'] = api_user();
|
||||
$_REQUEST['type'] = 'wall';
|
||||
$_REQUEST['api_source'] = true;
|
||||
|
|
|
|||
|
|
@ -310,6 +310,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
|||
|
||||
// remove some newlines before the general conversion
|
||||
$Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text);
|
||||
$Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism","[quote$1]$2[/quote]",$Text);
|
||||
|
||||
// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
|
||||
if (!$tryoembed)
|
||||
|
|
@ -324,6 +325,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
|||
|
||||
$Text = trim($Text);
|
||||
$Text = str_replace("\r\n","\n", $Text);
|
||||
|
||||
// removing multiplicated newlines
|
||||
$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]");
|
||||
$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]");
|
||||
do {
|
||||
$oldtext = $Text;
|
||||
$Text = str_replace($search, $replace, $Text);
|
||||
} while ($oldtext != $Text);
|
||||
|
||||
$Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
|
||||
|
||||
if($preserve_nl)
|
||||
|
|
|
|||
|
|
@ -99,14 +99,26 @@ function poller_run(&$argv, &$argc){
|
|||
proc_run('php','include/expire.php');
|
||||
}
|
||||
|
||||
// clear old cache
|
||||
Cache::clear();
|
||||
$last = get_config('system','cache_last_cleared');
|
||||
|
||||
// clear old item cache files
|
||||
clear_cache();
|
||||
if($last) {
|
||||
$next = $last + (3600); // Once per hour
|
||||
$clear_cache = ($next <= time());
|
||||
} else
|
||||
$clear_cache = true;
|
||||
|
||||
// clear cache for photos
|
||||
clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
|
||||
if ($clear_cache) {
|
||||
// clear old cache
|
||||
Cache::clear();
|
||||
|
||||
// clear old item cache files
|
||||
clear_cache();
|
||||
|
||||
// clear cache for photos
|
||||
clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
|
||||
|
||||
set_config('system','cache_last_cleared', time());
|
||||
}
|
||||
|
||||
$manual_id = 0;
|
||||
$generation = 0;
|
||||
|
|
|
|||
18
index.php
18
index.php
|
|
@ -377,15 +377,9 @@ if($a->module != 'install') {
|
|||
}
|
||||
|
||||
/**
|
||||
* Build the page - now that we have all the components
|
||||
* Add a "toggle mobile" link if we're using a mobile device
|
||||
*/
|
||||
|
||||
if(!$a->theme['stylesheet'])
|
||||
$stylesheet = current_theme_url();
|
||||
else
|
||||
$stylesheet = $a->theme['stylesheet'];
|
||||
$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
|
||||
|
||||
if($a->is_mobile || $a->is_tablet) {
|
||||
if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
|
||||
$link = $a->get_baseurl() . '/toggle_mobile?address=' . curPageURL();
|
||||
|
|
@ -399,6 +393,16 @@ if($a->is_mobile || $a->is_tablet) {
|
|||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the page - now that we have all the components
|
||||
*/
|
||||
|
||||
if(!$a->theme['stylesheet'])
|
||||
$stylesheet = current_theme_url();
|
||||
else
|
||||
$stylesheet = $a->theme['stylesheet'];
|
||||
$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
|
||||
|
||||
$page = $a->page;
|
||||
$profile = $a->profile;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,22 @@
|
|||
<?php
|
||||
|
||||
|
||||
function display_content(&$a, $update = 0) {
|
||||
function display_init(&$a) {
|
||||
|
||||
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
|
||||
notice( t('Public access denied.') . EOL);
|
||||
killme();
|
||||
return;
|
||||
}
|
||||
|
||||
$nick = (($a->argc > 1) ? $a->argv[1] : '');
|
||||
profile_load($a,$nick);
|
||||
|
||||
}
|
||||
|
||||
|
||||
function display_content(&$a, $update = 0) {
|
||||
|
||||
require_once("include/bbcode.php");
|
||||
require_once('include/security.php');
|
||||
require_once('include/conversation.php');
|
||||
|
|
@ -25,7 +34,6 @@ function display_content(&$a, $update = 0) {
|
|||
else {
|
||||
$nick = (($a->argc > 1) ? $a->argv[1] : '');
|
||||
}
|
||||
profile_load($a,$nick);
|
||||
|
||||
if($update) {
|
||||
$item_id = $_REQUEST['item_id'];
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ function profile_init(&$a) {
|
|||
auto_redir($a, $which);
|
||||
}
|
||||
|
||||
set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one
|
||||
profile_load($a,$which,$profile);
|
||||
|
||||
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
|
||||
|
|
|
|||
263
mod/profiles.php
263
mod/profiles.php
|
|
@ -1,6 +1,147 @@
|
|||
<?php
|
||||
|
||||
|
||||
function profiles_init(&$a) {
|
||||
|
||||
nav_set_selected('profiles');
|
||||
|
||||
if(! local_user()) {
|
||||
notice( t('Permission denied.') . EOL);
|
||||
killme();
|
||||
return;
|
||||
}
|
||||
|
||||
if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
|
||||
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
|
||||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
notice( t('Profile not found.') . EOL);
|
||||
goaway($a->get_baseurl(true) . '/profiles');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
|
||||
|
||||
// move every contact using this profile as their default to the user default
|
||||
|
||||
$r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
|
||||
intval(local_user()),
|
||||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
$r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if($r)
|
||||
info( t('Profile deleted.') . EOL);
|
||||
|
||||
goaway($a->get_baseurl(true) . '/profiles');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if(($a->argc > 1) && ($a->argv[1] === 'new')) {
|
||||
|
||||
check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
|
||||
|
||||
$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
|
||||
intval(local_user()));
|
||||
$num_profiles = count($r0);
|
||||
|
||||
$name = t('Profile-') . ($num_profiles + 1);
|
||||
|
||||
$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
|
||||
intval(local_user()));
|
||||
|
||||
$r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
|
||||
VALUES ( %d, '%s', '%s', '%s', '%s' )",
|
||||
intval(local_user()),
|
||||
dbesc($name),
|
||||
dbesc($r1[0]['name']),
|
||||
dbesc($r1[0]['photo']),
|
||||
dbesc($r1[0]['thumb'])
|
||||
);
|
||||
|
||||
$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
|
||||
intval(local_user()),
|
||||
dbesc($name)
|
||||
);
|
||||
|
||||
info( t('New profile created.') . EOL);
|
||||
if(count($r3) == 1)
|
||||
goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
|
||||
|
||||
goaway($a->get_baseurl(true) . '/profiles');
|
||||
}
|
||||
|
||||
if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
|
||||
|
||||
check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
|
||||
|
||||
$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
|
||||
intval(local_user()));
|
||||
$num_profiles = count($r0);
|
||||
|
||||
$name = t('Profile-') . ($num_profiles + 1);
|
||||
$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||
intval(local_user()),
|
||||
intval($a->argv[2])
|
||||
);
|
||||
if(! count($r1)) {
|
||||
notice( t('Profile unavailable to clone.') . EOL);
|
||||
killme();
|
||||
return;
|
||||
}
|
||||
unset($r1[0]['id']);
|
||||
$r1[0]['is-default'] = 0;
|
||||
$r1[0]['publish'] = 0;
|
||||
$r1[0]['net-publish'] = 0;
|
||||
$r1[0]['profile-name'] = dbesc($name);
|
||||
|
||||
dbesc_array($r1[0]);
|
||||
|
||||
$r2 = dbq("INSERT INTO `profile` (`"
|
||||
. implode("`, `", array_keys($r1[0]))
|
||||
. "`) VALUES ('"
|
||||
. implode("', '", array_values($r1[0]))
|
||||
. "')" );
|
||||
|
||||
$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
|
||||
intval(local_user()),
|
||||
dbesc($name)
|
||||
);
|
||||
info( t('New profile created.') . EOL);
|
||||
if(count($r3) == 1)
|
||||
goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
|
||||
|
||||
goaway($a->get_baseurl(true) . '/profiles');
|
||||
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
if(($a->argc > 1) && (intval($a->argv[1]))) {
|
||||
$r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($a->argv[1]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
notice( t('Profile not found.') . EOL);
|
||||
killme();
|
||||
return;
|
||||
}
|
||||
|
||||
profile_load($a,$a->user['nickname'],$r[0]['id']);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function profiles_post(&$a) {
|
||||
|
||||
if(! local_user()) {
|
||||
|
|
@ -425,126 +566,6 @@ function profile_activity($changed, $value) {
|
|||
function profiles_content(&$a) {
|
||||
|
||||
$o = '';
|
||||
nav_set_selected('profiles');
|
||||
|
||||
if(! local_user()) {
|
||||
notice( t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
|
||||
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
|
||||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if(! count($r)) {
|
||||
notice( t('Profile not found.') . EOL);
|
||||
goaway($a->get_baseurl(true) . '/profiles');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
|
||||
|
||||
// move every contact using this profile as their default to the user default
|
||||
|
||||
$r = q("UPDATE `contact` SET `profile-id` = (SELECT `profile`.`id` AS `profile-id` FROM `profile` WHERE `profile`.`is-default` = 1 AND `profile`.`uid` = %d LIMIT 1) WHERE `profile-id` = %d AND `uid` = %d ",
|
||||
intval(local_user()),
|
||||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
$r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
if($r)
|
||||
info( t('Profile deleted.') . EOL);
|
||||
|
||||
goaway($a->get_baseurl(true) . '/profiles');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if(($a->argc > 1) && ($a->argv[1] === 'new')) {
|
||||
|
||||
check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
|
||||
|
||||
$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
|
||||
intval(local_user()));
|
||||
$num_profiles = count($r0);
|
||||
|
||||
$name = t('Profile-') . ($num_profiles + 1);
|
||||
|
||||
$r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
|
||||
intval(local_user()));
|
||||
|
||||
$r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
|
||||
VALUES ( %d, '%s', '%s', '%s', '%s' )",
|
||||
intval(local_user()),
|
||||
dbesc($name),
|
||||
dbesc($r1[0]['name']),
|
||||
dbesc($r1[0]['photo']),
|
||||
dbesc($r1[0]['thumb'])
|
||||
);
|
||||
|
||||
$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
|
||||
intval(local_user()),
|
||||
dbesc($name)
|
||||
);
|
||||
|
||||
info( t('New profile created.') . EOL);
|
||||
if(count($r3) == 1)
|
||||
goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
|
||||
|
||||
goaway($a->get_baseurl(true) . '/profiles');
|
||||
}
|
||||
|
||||
if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
|
||||
|
||||
check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
|
||||
|
||||
$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
|
||||
intval(local_user()));
|
||||
$num_profiles = count($r0);
|
||||
|
||||
$name = t('Profile-') . ($num_profiles + 1);
|
||||
$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||
intval(local_user()),
|
||||
intval($a->argv[2])
|
||||
);
|
||||
if(! count($r1)) {
|
||||
notice( t('Profile unavailable to clone.') . EOL);
|
||||
return;
|
||||
}
|
||||
unset($r1[0]['id']);
|
||||
$r1[0]['is-default'] = 0;
|
||||
$r1[0]['publish'] = 0;
|
||||
$r1[0]['net-publish'] = 0;
|
||||
$r1[0]['profile-name'] = dbesc($name);
|
||||
|
||||
dbesc_array($r1[0]);
|
||||
|
||||
$r2 = dbq("INSERT INTO `profile` (`"
|
||||
. implode("`, `", array_keys($r1[0]))
|
||||
. "`) VALUES ('"
|
||||
. implode("', '", array_values($r1[0]))
|
||||
. "')" );
|
||||
|
||||
$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
|
||||
intval(local_user()),
|
||||
dbesc($name)
|
||||
);
|
||||
info( t('New profile created.') . EOL);
|
||||
if(count($r3) == 1)
|
||||
goaway($a->get_baseurl(true) . '/profiles/' . $r3[0]['id']);
|
||||
|
||||
goaway($a->get_baseurl(true) . '/profiles');
|
||||
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
if(($a->argc > 1) && (intval($a->argv[1]))) {
|
||||
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
|
|
@ -556,8 +577,6 @@ function profiles_content(&$a) {
|
|||
return;
|
||||
}
|
||||
|
||||
profile_load($a,$a->user['nickname'],$r[0]['id']);
|
||||
|
||||
require_once('include/profile_selectors.php');
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -115,10 +115,10 @@ class Item extends BaseObject {
|
|||
$drop = array(
|
||||
'dropping' => $dropping,
|
||||
'pagedrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $item['pagedrop'] : ''),
|
||||
'select' => t('Select'),
|
||||
'select' => t('Select'),
|
||||
'delete' => t('Delete'),
|
||||
);
|
||||
|
||||
|
||||
$filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false);
|
||||
|
||||
$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
|
||||
|
|
@ -133,7 +133,7 @@ class Item extends BaseObject {
|
|||
if($sp)
|
||||
$sparkle = ' sparkle';
|
||||
else
|
||||
$profile_link = zrl($profile_link);
|
||||
$profile_link = zrl($profile_link);
|
||||
|
||||
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
|
||||
if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
|
||||
|
|
@ -212,9 +212,14 @@ class Item extends BaseObject {
|
|||
|
||||
localize_item($item);
|
||||
|
||||
if ($item["postopts"]) {
|
||||
$langdata = explode(";", $item["postopts"]);
|
||||
$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
|
||||
}
|
||||
|
||||
$body = prepare_body($item,true);
|
||||
|
||||
list($categories, $folders) = get_cats_and_terms($item);
|
||||
list($categories, $folders) = get_cats_and_terms($item);
|
||||
|
||||
if($a->theme['template_engine'] === 'internal') {
|
||||
$body_e = template_escape($body);
|
||||
|
|
@ -235,7 +240,7 @@ class Item extends BaseObject {
|
|||
|
||||
$tmp_item = array(
|
||||
'template' => $this->get_template(),
|
||||
|
||||
|
||||
'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
|
||||
'tags' => $tags,
|
||||
'hashtags' => $hashtags,
|
||||
|
|
@ -285,7 +290,8 @@ class Item extends BaseObject {
|
|||
'comment' => $this->get_comment_box($indent),
|
||||
'previewing' => ($conv->is_preview() ? ' preview ' : ''),
|
||||
'wait' => t('Please wait'),
|
||||
'thread_level' => $thread_level
|
||||
'thread_level' => $thread_level,
|
||||
'postopts' => $langstr
|
||||
);
|
||||
|
||||
$arr = array('item' => $item, 'output' => $tmp_item);
|
||||
|
|
|
|||
1907
view/pl/messages.po
1907
view/pl/messages.po
File diff suppressed because it is too large
Load Diff
|
|
@ -258,9 +258,14 @@ $a->strings["This is most often a permission setting, as the web server may not
|
|||
$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "";
|
||||
$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
|
||||
$a->strings[".htconfig.php is writable"] = "";
|
||||
$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "";
|
||||
$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "";
|
||||
$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "";
|
||||
$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "";
|
||||
$a->strings["view/smarty3 is writable"] = "";
|
||||
$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
|
||||
$a->strings["Url rewrite is working"] = "";
|
||||
$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
|
||||
$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Konfiguracja bazy danych pliku \".htconfig.php\" nie mogła zostać zapisana. Proszę użyć załączonego tekstu, aby utworzyć folder konfiguracyjny w sieci serwera.";
|
||||
$a->strings["Errors encountered creating database tables."] = "Zostały napotkane błędy przy tworzeniu tabeli bazy danych.";
|
||||
$a->strings["<h1>What next</h1>"] = "";
|
||||
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "";
|
||||
|
|
@ -495,7 +500,7 @@ $a->strings["StatusNet"] = "";
|
|||
$a->strings["Email access is disabled on this site."] = "Dostęp do e-maila nie jest w pełni sprawny na tej stronie";
|
||||
$a->strings["Connector Settings"] = "Ustawienia konektora";
|
||||
$a->strings["Email/Mailbox Setup"] = "Ustawienia emaila/skrzynki mailowej";
|
||||
$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "";
|
||||
$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Jeżeli życzysz sobie komunikowania z kontaktami email używając tego serwisu (opcjonalne), opisz jak połaczyć się z Twoją skrzynką email.";
|
||||
$a->strings["Last successful email check:"] = "Ostatni sprawdzony e-mail:";
|
||||
$a->strings["IMAP server name:"] = "Nazwa serwera IMAP:";
|
||||
$a->strings["IMAP port:"] = "Port IMAP:";
|
||||
|
|
@ -583,7 +588,7 @@ $a->strings["You are tagged in a post"] = "Jesteś oznaczony w poście";
|
|||
$a->strings["You are poked/prodded/etc. in a post"] = "";
|
||||
$a->strings["Advanced Account/Page Type Settings"] = "";
|
||||
$a->strings["Change the behaviour of this account for special situations"] = "";
|
||||
$a->strings["Manage Identities and/or Pages"] = "";
|
||||
$a->strings["Manage Identities and/or Pages"] = "Zarządzaj Tożsamościami i/lub Stronami.";
|
||||
$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "";
|
||||
$a->strings["Select an identity to manage: "] = "Wybierz tożsamość do zarządzania:";
|
||||
$a->strings["Search Results For:"] = "Szukaj wyników dla:";
|
||||
|
|
@ -615,7 +620,9 @@ $a->strings["Save"] = "Zapisz";
|
|||
$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro.";
|
||||
$a->strings["Import"] = "";
|
||||
$a->strings["Move account"] = "";
|
||||
$a->strings["You can import an account from another Friendica server. <br>\r\n You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "";
|
||||
$a->strings["You can import an account from another Friendica server."] = "";
|
||||
$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "";
|
||||
$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "";
|
||||
$a->strings["Account file"] = "";
|
||||
$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "";
|
||||
$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
|
||||
|
|
@ -693,7 +700,7 @@ $a->strings["Failed to send email message. Here is the message that failed."] =
|
|||
$a->strings["Your registration can not be processed."] = "Twoja rejestracja nie może zostać przeprowadzona. ";
|
||||
$a->strings["Registration request at %s"] = "Prośba o rejestrację u %s";
|
||||
$a->strings["Your registration is pending approval by the site owner."] = "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny.";
|
||||
$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "";
|
||||
$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Masz możliwość (opcjonalnie) wypełnić ten formularz przez OpenID poprzez załączenie Twojego OpenID i kliknięcie 'Zarejestruj'.";
|
||||
$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów.";
|
||||
$a->strings["Your OpenID (optional): "] = "Twój OpenID (opcjonalnie):";
|
||||
$a->strings["Include your profile in member directory?"] = "Czy dołączyć twój profil do katalogu członków?";
|
||||
|
|
@ -800,6 +807,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
|
|||
$a->strings["File upload"] = "Plik załadowano";
|
||||
$a->strings["Policies"] = "zasady";
|
||||
$a->strings["Advanced"] = "Zaawansowany";
|
||||
$a->strings["Performance"] = "";
|
||||
$a->strings["Site name"] = "Nazwa strony";
|
||||
$a->strings["Banner/Logo"] = "Logo";
|
||||
$a->strings["System language"] = "Język systemu";
|
||||
|
|
@ -809,6 +817,8 @@ $a->strings["Mobile system theme"] = "";
|
|||
$a->strings["Theme for mobile devices"] = "";
|
||||
$a->strings["SSL link policy"] = "";
|
||||
$a->strings["Determines whether generated links should be forced to use SSL"] = "";
|
||||
$a->strings["'Share' element"] = "";
|
||||
$a->strings["Activates the bbcode element 'share' for repeating items."] = "";
|
||||
$a->strings["Maximum image size"] = "Maksymalny rozmiar zdjęcia";
|
||||
$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "";
|
||||
$a->strings["Maximum image length"] = "Maksymalna długość obrazu";
|
||||
|
|
@ -864,6 +874,14 @@ $a->strings["Poll interval"] = "";
|
|||
$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "";
|
||||
$a->strings["Maximum Load Average"] = "";
|
||||
$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
|
||||
$a->strings["Use MySQL full text engine"] = "";
|
||||
$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "";
|
||||
$a->strings["Path to item cache"] = "";
|
||||
$a->strings["Cache duration in seconds"] = "";
|
||||
$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "";
|
||||
$a->strings["Path for lock file"] = "";
|
||||
$a->strings["Temp path"] = "";
|
||||
$a->strings["Base path to installation"] = "";
|
||||
$a->strings["Update has been marked successful"] = "";
|
||||
$a->strings["Executing %s failed. Check system logs."] = "";
|
||||
$a->strings["Update %s was successfully applied."] = "";
|
||||
|
|
@ -1091,7 +1109,7 @@ $a->strings["Our site encryption key is apparently messed up."] = "Klucz kodują
|
|||
$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Został dostarczony pusty URL lub nie może zostać rozszyfrowany przez nas.";
|
||||
$a->strings["Contact record was not found for you on our site."] = "Nie znaleziono kontaktu na naszej stronie";
|
||||
$a->strings["Site public key not available in contact record for URL %s."] = "";
|
||||
$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "";
|
||||
$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "ID dostarczone przez Twój system jest już w naszeym systemie. Powinno zadziałać jeżeli spróbujesz ponownie.";
|
||||
$a->strings["Unable to set your contact credentials on our system."] = "Niezdolny do ustalenie tożsamości twoich kontaktów w naszym systemie";
|
||||
$a->strings["Unable to update your contact profile details on our system"] = "Niezdolny do aktualizacji szczegółowych danych profilowych twoich kontaktów w naszym systemie";
|
||||
$a->strings["Connection accepted at %s"] = "Połączenie zaakceptowane %s";
|
||||
|
|
@ -1157,6 +1175,7 @@ $a->strings["Remove Facebook Post connector"] = "";
|
|||
$a->strings["Suppress \"View on friendica\""] = "";
|
||||
$a->strings["Post to page/group:"] = "Napisz na stronę/grupę:";
|
||||
$a->strings["Facebook Post Settings"] = "Ustawienia wpisu z Facebooka";
|
||||
$a->strings["%s:"] = "";
|
||||
$a->strings["%d person likes this"] = array(
|
||||
0 => " %d osoba lubi to",
|
||||
1 => " %d osób lubi to",
|
||||
|
|
@ -1876,6 +1895,7 @@ $a->strings["Inbox"] = "Odebrane";
|
|||
$a->strings["Outbox"] = "Wysłane";
|
||||
$a->strings["Manage"] = "Zarządzaj";
|
||||
$a->strings["Manage other pages"] = "Zarządzaj innymi stronami";
|
||||
$a->strings["Delegations"] = "";
|
||||
$a->strings["Profiles"] = "Profile";
|
||||
$a->strings["Manage/Edit Profiles"] = "";
|
||||
$a->strings["Manage/edit friends and contacts"] = "Zarządzaj listą przyjaciół i kontaktami";
|
||||
|
|
@ -1918,8 +1938,8 @@ $a->strings["seconds"] = "sekundy";
|
|||
$a->strings["%1\$d %2\$s ago"] = "";
|
||||
$a->strings["%s's birthday"] = "";
|
||||
$a->strings["Happy Birthday %s"] = "";
|
||||
$a->strings["From: "] = "Z:";
|
||||
$a->strings["Image/photo"] = "Obrazek/zdjęcie";
|
||||
$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>:</span>"] = "";
|
||||
$a->strings["$1 wrote:"] = "$1 napisał:";
|
||||
$a->strings["Encrypted content"] = "";
|
||||
$a->strings["General Features"] = "";
|
||||
|
|
@ -2053,8 +2073,9 @@ $a->strings["Delete Selected Items"] = "Usuń zaznaczone elementy";
|
|||
$a->strings["Follow Thread"] = "";
|
||||
$a->strings["%s likes this."] = "%s lubi to.";
|
||||
$a->strings["%s doesn't like this."] = "%s nie lubi tego.";
|
||||
$a->strings["<span %1\$s>%2\$d people</span> like this."] = "<span %1\$s>%2\$d people</span> lubię to.";
|
||||
$a->strings["<span %1\$s>%2\$d people</span> don't like this."] = "<span %1\$s>%2\$d people</span> nie lubię tego";
|
||||
$a->strings["like this"] = "";
|
||||
$a->strings["don't like this"] = "";
|
||||
$a->strings["people"] = "";
|
||||
$a->strings["and"] = "i";
|
||||
$a->strings[", and %d other people"] = ", i %d innych ludzi";
|
||||
$a->strings["%s like this."] = "%s lubi to.";
|
||||
|
|
@ -2079,6 +2100,10 @@ $a->strings["Password: "] = "Hasło:";
|
|||
$a->strings["Remember me"] = "";
|
||||
$a->strings["Or login using OpenID: "] = "Lub zaloguj się korzystając z OpenID:";
|
||||
$a->strings["Forgot your password?"] = "Zapomniałeś swojego hasła?";
|
||||
$a->strings["Website Terms of Service"] = "";
|
||||
$a->strings["terms of service"] = "";
|
||||
$a->strings["Website Privacy Policy"] = "";
|
||||
$a->strings["privacy policy"] = "";
|
||||
$a->strings["Requested account is not available."] = "";
|
||||
$a->strings["Edit profile"] = "Edytuj profil";
|
||||
$a->strings["Message"] = "Wiadomość";
|
||||
|
|
|
|||
|
|
@ -5,12 +5,13 @@
|
|||
* Version:
|
||||
* Author: Christian Vogeley (https://christian-vogeley.de/profile/christian)
|
||||
*/
|
||||
|
||||
function cleanzero_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function cleanzero_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
|
||||
function comix_plain_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
|
|
@ -59,3 +60,5 @@ $('.savedsearchterm').hover(
|
|||
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
|
||||
function comix_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
|
|
@ -59,3 +60,5 @@ $('.savedsearchterm').hover(
|
|||
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
*/
|
||||
|
||||
|
||||
function darkbubble_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'testbubble',
|
||||
);
|
||||
|
|
@ -21,3 +22,4 @@ $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
|||
});
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
* Author: Mike Macgirvin <mike@macgirvin.com>
|
||||
*/
|
||||
|
||||
function darkzero_NS_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
|
||||
function darkzero_NS_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
@ -94,4 +94,4 @@ $('.savedsearchterm').hover(
|
|||
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
* Maintainer: Mike Macgirvin <mike@macgirvin.com>
|
||||
*/
|
||||
|
||||
function darkzero_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function darkzero_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
|
|||
|
|
@ -7,9 +7,6 @@
|
|||
* Author:
|
||||
*/
|
||||
|
||||
$a = get_app();
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function get_diabook_config($key, $default = false) {
|
||||
if (local_user()) {
|
||||
$result = get_pconfig(local_user(), "diabook", $key);
|
||||
|
|
@ -26,6 +23,8 @@ function get_diabook_config($key, $default = false) {
|
|||
|
||||
function diabook_init(&$a) {
|
||||
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook (Version: 1.027)";
|
||||
$a->page['htmlhead'] .= sprintf('<META NAME=generator CONTENT="%s"/>', $diabook_version);
|
||||
|
|
|
|||
|
|
@ -8,14 +8,13 @@
|
|||
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
|
||||
*/
|
||||
|
||||
$a = get_app();
|
||||
$a->theme_info = array(
|
||||
'family' => 'dispy',
|
||||
'name' => 'dark',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function dispy_dark_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'family' => 'dispy',
|
||||
'name' => 'dark',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
/** @purpose set some theme defaults
|
||||
*/
|
||||
$cssFile = null;
|
||||
|
|
|
|||
|
|
@ -8,15 +8,14 @@
|
|||
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
|
||||
*/
|
||||
|
||||
$a = get_app();
|
||||
$a->theme_info = array(
|
||||
'family' => 'dispy',
|
||||
'name' => 'light',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function dispy_light_init(&$a) {
|
||||
|
||||
$a->theme_info = array(
|
||||
'family' => 'dispy',
|
||||
'name' => 'light',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
/** @purpose set some theme defaults
|
||||
*/
|
||||
$cssFile = null;
|
||||
|
|
|
|||
|
|
@ -17,15 +17,14 @@
|
|||
* or rename to prefix1_function_name (prefix2_function_name), etc.
|
||||
*/
|
||||
|
||||
$a = get_app();
|
||||
$a->theme_info = array(
|
||||
'family' => 'dispy',
|
||||
'version' => '1.2.2'
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function dispy_init(&$a) {
|
||||
|
||||
$a->theme_info = array(
|
||||
'family' => 'dispy',
|
||||
'version' => '1.2.2'
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
/** @purpose set some theme defaults
|
||||
*/
|
||||
$cssFile = null;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
<?php
|
||||
|
||||
function easterbunny_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
<?php
|
||||
|
||||
function facepark_init(&$a) {
|
||||
$a->theme_info = array();
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
|
|
@ -48,3 +50,5 @@ $('.savedsearchterm').hover(
|
|||
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
<?php
|
||||
|
||||
function greenzero_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function greenzero_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
<?php
|
||||
|
||||
function purplezero_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function purplezero_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
* Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
|
||||
*/
|
||||
|
||||
function quattro_init(&$a) {
|
||||
$a->theme_info = array();
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function quattro_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
<?php
|
||||
|
||||
function slack_NS_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
|
||||
function slack_NS_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
@ -86,4 +87,4 @@ $('.savedsearchterm').hover(
|
|||
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
<?php
|
||||
|
||||
function slackr_init(&$a) {
|
||||
$a->theme_info = array(
|
||||
'extends' => 'duepuntozero',
|
||||
);
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function slackr_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
|
|||
|
|
@ -9,11 +9,10 @@
|
|||
* Screenshot: <a href="screenshot.png">Screenshot</a>
|
||||
*/
|
||||
|
||||
$a = get_app();
|
||||
$a->theme_info = array();
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
function smoothly_init(&$a) {
|
||||
$a->theme_info = array();
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
$cssFile = null;
|
||||
$ssl_state = null;
|
||||
$baseurl = $a->get_baseurl($ssl_state);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
* Maintainer: Mike Macgirvin <mike@macgirvin.com>
|
||||
*/
|
||||
|
||||
|
||||
function testbubble_init(&$a) {
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
|
|
@ -18,3 +20,4 @@ $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
|||
});
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
<div class="clear"></div>
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
<div class="vcard">
|
||||
|
||||
<div class="tool">
|
||||
<div class="fn label">$profile.name</div>
|
||||
{{ if $profile.edit }}
|
||||
<div class="action">
|
||||
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
|
||||
<ul id="profiles-menu" class="menu-popup">
|
||||
{{ for $profile.menu.entries as $e }}
|
||||
<li>
|
||||
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
|
||||
</li>
|
||||
{{ endfor }}
|
||||
<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
|
||||
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
|
||||
<li><a href="profiles" >$profile.edit.3</a></li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
|
||||
<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
|
||||
|
||||
{{ if $location }}
|
||||
<dl class="location"><dt class="location-label">$location</dt><br>
|
||||
<dd class="adr">
|
||||
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
|
||||
<span class="city-state-zip">
|
||||
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
|
||||
<span class="region">$profile.region</span>
|
||||
<span class="postal-code">$profile.postal-code</span>
|
||||
</span>
|
||||
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
|
||||
</dd>
|
||||
</dl>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
|
||||
|
||||
{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
|
||||
|
||||
{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
|
||||
|
||||
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
|
||||
|
||||
{{ inc diaspora_vcard.tpl }}{{ endinc }}
|
||||
|
||||
<div id="profile-extra-links">
|
||||
<ul>
|
||||
{{ if $connect }}
|
||||
<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
|
||||
{{ endif }}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
$contact_block
|
||||
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
<div class="clear"></div>
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
<div class="vcard">
|
||||
|
||||
<div class="tool">
|
||||
<div class="fn label">{{$profile.name}}</div>
|
||||
{{if $profile.edit}}
|
||||
<div class="action">
|
||||
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
|
||||
<ul id="profiles-menu" class="menu-popup">
|
||||
{{foreach $profile.menu.entries as $e}}
|
||||
<li>
|
||||
<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
|
||||
<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
|
||||
<li><a href="profiles" >{{$profile.edit.3}}</a></li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
{{else}}
|
||||
<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
|
||||
<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
|
||||
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
|
||||
|
||||
|
||||
{{if $location}}
|
||||
<dl class="location"><dt class="location-label">{{$location}}</dt><br>
|
||||
<dd class="adr">
|
||||
{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
|
||||
<span class="city-state-zip">
|
||||
<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
|
||||
<span class="region">{{$profile.region}}</span>
|
||||
<span class="postal-code">{{$profile.postal-code}}</span>
|
||||
</span>
|
||||
{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
|
||||
</dd>
|
||||
</dl>
|
||||
{{/if}}
|
||||
|
||||
{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
|
||||
|
||||
{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
|
||||
|
||||
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
|
||||
|
||||
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
|
||||
|
||||
{{include file="diaspora_vcard.tpl"}}
|
||||
|
||||
<div id="profile-extra-links">
|
||||
<ul>
|
||||
{{if $connect}}
|
||||
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{$contact_block}}
|
||||
|
||||
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="icon-folder-close icon-large"></i></a>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="wall-item-location">{{$item.location}}</div>
|
||||
<div class="wall-item-location">{{$item.location}} {{$item.postopts}}</div>
|
||||
<div class="wall-item-actions-tools">
|
||||
|
||||
{{if $item.drop.pagedrop}}
|
||||
|
|
@ -128,14 +128,16 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
<div class="wall-item-links"></div>
|
||||
<div class="wall-item-links">
|
||||
</div>
|
||||
<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
|
||||
<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
|
||||
</div>
|
||||
|
||||
{{if $item.threaded}}{{if $item.comment}}
|
||||
<div class="wall-item-bottom">
|
||||
<div class="wall-item-links"></div>
|
||||
<div class="wall-item-links">
|
||||
</div>
|
||||
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
|
||||
{{$item.comment}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,10 @@
|
|||
@import url("css/font-awesome.css") all;
|
||||
@import url("css/font2.css") all;
|
||||
|
||||
img {
|
||||
border: 0px;
|
||||
}
|
||||
|
||||
/* ========= */
|
||||
/* = Admin = */
|
||||
/* ========= */
|
||||
|
|
@ -1067,8 +1071,9 @@ border-bottom: 1px solid #D2D2D2;
|
|||
text-align: left;
|
||||
width: 80px;
|
||||
}
|
||||
.wall-item-container .wall-item-location {
|
||||
padding-right: 40px;
|
||||
.wall-item-container {
|
||||
/* padding-right: 30px; */
|
||||
padding-right: 0px;
|
||||
}
|
||||
.wall-item-container .wall-item-ago {
|
||||
word-wrap: break-word;
|
||||
|
|
@ -1077,7 +1082,7 @@ border-bottom: 1px solid #D2D2D2;
|
|||
color: #999;
|
||||
}
|
||||
.wall-item-location {
|
||||
width: 180px;
|
||||
width: 350px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
|
@ -1253,7 +1258,8 @@ border-bottom: 1px solid #D2D2D2;
|
|||
|
||||
#profile-jot-form #profile-jot-text {
|
||||
height: 2.0em;
|
||||
width: 99%;
|
||||
/* width: 99%; */
|
||||
width: 752px;
|
||||
font-size: 15px;
|
||||
color: #999999;
|
||||
border: 1px solid #DDD;
|
||||
|
|
@ -1267,7 +1273,8 @@ border-bottom: 1px solid #D2D2D2;
|
|||
font-weight: bold;
|
||||
height: 20px;
|
||||
margin: 0 0 5px;
|
||||
width: 60%;
|
||||
/* width: 60%; */
|
||||
width: 762px;
|
||||
border: 1px solid #d2d2d2;
|
||||
}
|
||||
|
||||
|
|
@ -1282,6 +1289,10 @@ border-bottom: 1px solid #D2D2D2;
|
|||
height: 100px;
|
||||
}
|
||||
|
||||
#profile-jot-perms {
|
||||
float: right;
|
||||
}
|
||||
|
||||
#jot-preview-content {
|
||||
padding-top: 25px;
|
||||
}
|
||||
|
|
@ -1689,7 +1700,7 @@ div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-
|
|||
border: 1px solid lightgray;
|
||||
color: black;
|
||||
background: #F2F2F2;
|
||||
padding: 3px 7px 2px 7px;
|
||||
padding: 2px 7px 2px 7px;
|
||||
margin-top: 2px;
|
||||
margin-bottom: 2px;
|
||||
|
||||
|
|
@ -1816,10 +1827,15 @@ div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-
|
|||
}
|
||||
|
||||
.profile-edit-side-div {
|
||||
display: none;
|
||||
/* float: right; */
|
||||
/* display: none; */
|
||||
float: right;
|
||||
}
|
||||
|
||||
/* aside div.clear {
|
||||
clear: none;
|
||||
float: left;
|
||||
} */
|
||||
|
||||
#register-form label,
|
||||
#profile-edit-form label {
|
||||
width: 300px; float: left;
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
* Description: "Vier" uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
|
||||
*/
|
||||
|
||||
function vier_init(&$a) {
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
$a->theme_info = array();
|
||||
|
||||
function vier_init(&$a) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@
|
|||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"><i class="icon-folder-close icon-large"></i></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
<div class="wall-item-location">$item.location</div>
|
||||
<div class="wall-item-location">$item.location $item.postopts</div>
|
||||
<div class="wall-item-actions-tools">
|
||||
|
||||
{{ if $item.drop.pagedrop }}
|
||||
|
|
@ -128,14 +128,16 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
<div class="wall-item-links"></div>
|
||||
<div class="wall-item-links">
|
||||
</div>
|
||||
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
|
||||
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
|
||||
</div>
|
||||
|
||||
{{ if $item.threaded }}{{ if $item.comment }}
|
||||
<div class="wall-item-bottom">
|
||||
<div class="wall-item-links"></div>
|
||||
<div class="wall-item-links">
|
||||
</div>
|
||||
<div class="wall-item-comment-wrapper" id="item-comments-$item.id" style="display: none;">
|
||||
$item.comment
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user