/gi,"");
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 183f2bc68d..a2829a21c1 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -150,7 +150,7 @@
rep(/ /gi,"");
diff --git a/mod/acl.php b/mod/acl.php
index 375c618c86..fe353d1eb5 100755
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -7,10 +7,10 @@ function acl_init(&$a){
return "";
- $start = (x($_POST,'start')?$_POST['start']:0);
- $count = (x($_POST,'count')?$_POST['count']:100);
- $search = (x($_POST,'search')?$_POST['search']:"");
- $type = (x($_POST,'type')?$_POST['type']:"");
+ $start = (x($_REQUEST,'start')?$_REQUEST['start']:0);
+ $count = (x($_REQUEST,'count')?$_REQUEST['count']:100);
+ $search = (x($_REQUEST,'search')?$_REQUEST['search']:"");
+ $type = (x($_REQUEST,'type')?$_REQUEST['type']:"");
if ($search!=""){
@@ -34,7 +34,7 @@ function acl_init(&$a){
$r = q("SELECT COUNT(`id`) AS c FROM `contact`
WHERE `uid` = %d AND `self` = 0
AND `blocked` = 0 AND `pending` = 0
- AND `notify` != '' $sql_extra" ,
+ AND `notify` != '' $sql_extra2" ,
intval(local_user())
);
$contact_count = (int)$r[0]['c'];
diff --git a/mod/admin.php b/mod/admin.php
index a64b269035..53b5ee3544 100755
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -583,6 +583,7 @@ function admin_page_plugins(&$a){
'$admin_form' => $admin_form,
'$function' => 'plugins',
+ '$screenshot' => '',
'$readme' => $readme
));
}
@@ -738,7 +739,11 @@ function admin_page_themes(&$a){
}
$admin_form="";
-
+
+ $screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
+ if(! stristr($screenshot[0],$theme))
+ $screenshot = null;
+
$t = get_markup_template("admin_plugins_details.tpl");
return replace_macros($t, array(
'$title' => t('Administration'),
@@ -755,6 +760,7 @@ function admin_page_themes(&$a){
'$admin_form' => $admin_form,
'$str_author' => t('Author: '),
'$str_maintainer' => t('Maintainer: '),
+ '$screenshot' => $screenshot,
'$readme' => $readme
));
}
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index fe5cd49063..6030587ce9 100755
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -26,21 +26,24 @@ function dfrn_poll_init(&$a) {
$dfrn_id = substr($dfrn_id,2);
}
- if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+ if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
killme();
}
- $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
- dbesc($a->argv[1])
- );
- if(count($r) && $r[0]['hidewall'])
- killme();
+ $user = '';
+ if($a->argc > 1) {
+ $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+ dbesc($a->argv[1])
+ );
+ if((! count($r)) || (count($r) && $r[0]['hidewall']))
+ killme();
+ $user = $r[0]['nickname'];
+ }
- logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
+ logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
header("Content-type: application/atom+xml");
- $o = get_feed_for($a, '', $a->argv[1],$last_update);
- echo $o;
+ echo get_feed_for($a, '', $user,$last_update);
killme();
}
diff --git a/mod/friendica.php b/mod/friendica.php
index ab92e31ed9..d5dad94484 100755
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -51,15 +51,20 @@ function friendica_content(&$a) {
$o .= ' ' . t('Installed plugins/addons/apps') . ' ' . t('Installed plugins/addons/apps:') . ' ' . t('No installed plugins/addons/apps');
+ $o .= ' ' . t('No installed plugins/addons/apps') . '
/gi,"[hr]");
- rep(/
/gi,"\n\n");
+ rep(/
/gi,"\n\n");
rep(/
/gi,"\n");
rep(/';
- foreach($a->plugins as $p)
- if(strlen($p))
- $o .= '
';
+ $o .= '' . $s . '';
}
else
- $o .= '';
$o .= '';
- $o .= '![' . $a->data['user']['username'] . '](' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg)
';
- $o .= '' . '' . t('Photo Albums') . '
';
+ if(! intval($a->data['user']['hidewall'])) {
+ $o .= '';
+ $o .= '
- {{ if $qcomment }}
- {{ for $qcomment as $qc }}
- $qc
-
- {{ endfor }}
- {{ endif }}
+ {{ if $qcomment }}
+
+ {{ endif }}
' . '' . t('Photo Albums') . '
';
- $o .= '';
- foreach($albums as $album) {
+ $o .= '
';
-
if(local_user() && $a->data['user']['uid'] == local_user()) {
$o .= '';
}
diff --git a/mod/pretheme.php b/mod/pretheme.php
new file mode 100644
index 0000000000..0efa587d8c
--- /dev/null
+++ b/mod/pretheme.php
@@ -0,0 +1,16 @@
+ get_theme_screenshot($theme), 'desc' => $desc));
+ }
+ killme();
+}
diff --git a/mod/profile.php b/mod/profile.php
index 428679ffc5..782d17d83d 100755
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -107,7 +107,7 @@ function profile_content(&$a, $update = 0) {
$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
- if($a->user['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+ if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
notice( t('Access to this profile has been restricted.') . EOL);
return;
}
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
index ead356f5b9..cbaef2d66c 100755
--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@@ -16,6 +16,10 @@
{{ endfor }}
+ {{ if $screenshot }}
+ ';
+ foreach($albums as $album) {
- // don't show contact photos. We once translated this name, but then you could still access it under
- // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+ // don't show contact photos. We once translated this name, but then you could still access it under
+ // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
- if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
- continue;
- $o .= '
';
}
- $o .= '
+ {{ endif }}
+
{{ if $admin_form }}
$settings
$lbl_info1
- +- $contact.photo_menu -
+ menu ++ $contact.photo_menu +
+$title
- $add -$title
-- {{ for $groups as $group }} --
-
- $group.text
-
- {{ if $group.edit }}
- $group.edit.title
- {{ endif }}
+
+
-
+ {{ for $groups as $group }} +-
{{ if $group.cid }}
+ {{ endif }}
+ {{ if $group.edit }}
+
{{ endif }}
+ $group.text
- {{ endfor }}
-
+ {{ endfor }} +$title
-- $all
- {{ for $nets as $net }}
-
- $net.name
- {{ endfor }}
+ {{ for $nets as $net }}
+ - $net.name
+ {{ endfor }}
-- {{ for $profile.menu.entries as $e }} --
-
$e.profile_name
-
- {{ endfor }}
- - $profile.menu.chg_photo
- - $profile.menu.cr_new
+ $profile.name
+
-
-$title
- -- {{ for $saved as $search }} --
- $search.term
-
-
- {{ endfor }}
-
- +$title
$searchbox ++ {{ for $saved as $search }} +-
+
+ $search.term
+
+ {{ endfor }}
+
+- $item.item_photo_menu -
++ $item.item_photo_menu +
+$item.title
{{ endif }} - $item.body +Help or @NewHere ?
+Friendica Support+Let's talk
+Local Friendica +NewHere +{{ endif }} + +{{ if $lastusers_title }} +
Connectable Services
+Find Friends
+$nv.directory.1+$nv.match.1
+$nv.suggest.1 +$nv.invite.1 +{{ endif }} + +{{ if $lastusers_title }} +
PostIt to Friendica
+$lastusers_title
+$activeusers_title
+$photos_title
+$like_title
++{{ for $like_items as $i }} +- $i
+{{ endfor }}
+
+{{ endif }} diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl new file mode 100755 index 0000000000..db1936e4b7 --- /dev/null +++ b/view/theme/diabook-blue/directory_item.tpl @@ -0,0 +1,10 @@ + +"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password...try again please"; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo <<
+ Friendika Bookmarklet
++- $ps.usermenu.status.1
+ - $ps.usermenu.photos.1
+ - $ps.usermenu.events.1
+ - $ps.usermenu.notes.1
+ - Public Groups
+ - $ps.usermenu.community.1
+
+ +'.t("Community Pages").'
'; -$a->page['aside'] .= replace_macros($tpl, array( - '$userinfo' => $userinfo, - '$ps' => $ps, - )); + $pagelist = array(); + + $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + intval($a->user['uid']) + ); + + $pageD = array(); + + // Look if the profile is a community page + foreach($contacts as $contact) { + $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); + }; + + + $contacts = $pageD; + + foreach($contacts as $contact) { + $page .= '![' . $contact['url'] . '](' . $contact['micro'] .')
'.
+ $contact["name"]."
Help or #NewHere?
-Friendica Support-Let's talk
-NewHere +
Help or @NewHere ?
+Friendica Support+Let's talk
+Local Friendica +NewHere +{{ endif }} + +{{ if $lastusers_title }} +
Connectable Services
+Find Friends
+$nv.directory.1+$nv.match.1
+$nv.suggest.1 +$nv.invite.1 +{{ endif }} + +{{ if $lastusers_title }} +
PostIt to Friendica
+$lastusers_title
-$photos_title
-$like_title
{{ for $like_items as $i }} -- $i
+ - $i
{{ endfor }}
{{ endif }} diff --git a/view/theme/diabook/fpostit/README b/view/theme/diabook/fpostit/README new file mode 100644 index 0000000000..39b7c57613 --- /dev/null +++ b/view/theme/diabook/fpostit/README @@ -0,0 +1,8 @@ +fpostit + +original author: Devlon Duthied + +see his blog posting: +http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ + +original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js new file mode 100755 index 0000000000..d183c75736 --- /dev/null +++ b/view/theme/diabook/fpostit/fpostit.js @@ -0,0 +1,6 @@ +javascript: (function() { + the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url}; + if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} + else {a_funct()}})()" \ No newline at end of file diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php new file mode 100644 index 0000000000..65c43a2b9f --- /dev/null +++ b/view/theme/diabook/fpostit/fpostit.php @@ -0,0 +1,135 @@ + + + + + + + + $content); + + // echo "posting to: $url"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password...try again please"; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo <<
+ Friendika Bookmarklet
+'.t("Community Pages").'
'; + + $pagelist = array(); + + $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + intval($a->user['uid']) + ); + + $pageD = array(); + + // Look if the profile is a community page + foreach($contacts as $contact) { + $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); + }; + + + $contacts = $pageD; + + foreach($contacts as $contact) { + $page .= '![' . $contact['url'] . '](' . $contact['micro'] .')
'.
+ $contact["name"]."
PostIt to Friendica
+"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password. Please try again."; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo <<
Friendica Bookmarklet
+@@ -37,6 +35,11 @@
PostIt to Friendica
+"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password. Please try again."; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo <<
Friendica Bookmarklet
+@@ -37,6 +35,11 @@
- $contact.photo_menu -
-$title
- -- {{ for $groups as $group }} --
- {{ if $group.cid }}
-
- {{ endif }}
- {{ if $group.edit }}
-
- {{ endif }}
- $group.text
-
- {{ endfor }}
-
-$title
-- {{ for $nets as $net }} -- $net.name
- {{ endfor }}
-
-$title
- $searchbox - -- {{ for $saved as $search }} --
-
- $search.term
-
- {{ endfor }}
-
- -- $item.item_photo_menu -
-- $item.item_photo_menu -
-- $item.item_photo_menu -
--
+ $contact.photo_menu +
+ {{ endif }} +$title
+ $add ++ {{ for $groups as $group }} +-
+
+ $group.text
+
+ {{ if $group.edit }}
+ $group.edit.title
+ {{ endif }}
+ {{ if $group.cid }}
+
+ {{ endif }}
+
+ {{ endfor }}
+
+$title
++- $all
+ {{ for $nets as $net }}
+
- $net.name
+ {{ endfor }}
+
+ ++ {{ for $profile.menu.entries as $e }} +-
+
$e.profile_name
+
+ {{ endfor }}
+ - $profile.menu.chg_photo
+ - $profile.menu.cr_new
-
+
+$title
+ ++ {{ for $saved as $search }} +-
+ $search.term
+
+
+ {{ endfor }}
+
+ + $searchbox + ++ $item.item_photo_menu +
+ +$item.title
{{ endif }} + $item.body ++ $item.item_photo_menu +
+ +$item.title
{{ endif }} + $item.body ++ $item.item_photo_menu +
+ +$item.title
{{ endif }} + $item.body +$item.to $item.owner_name $item.vwall + +
- $item.item_photo_menu -
+ menu ++ $item.item_photo_menu +
+$item.title
{{ endif }} - $item.body -- $item.item_photo_menu -
- -$item.title
{{ endif }} - $item.body -$item.to $item.owner_name $item.vwall - +
+ $item.item_photo_menu +
++