From f2e2632810ad3ac465edcf4cf80e1dc89e995c82 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 29 Mar 2012 00:04:00 -0400 Subject: [PATCH 01/57] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: some reported warnings cleaned up network permission ids wrong var for notify total fix notification total improved rw notifications bug #349 - email notls setting add a searchbox to "find friends" for global search bugfix in diabook title not updated when editing post New parameter in html2plain for plain text exports. More compatibility in API API: added max_id API: Now threading seems to work API: Seesmic is now working. Optimizing text export. Quotes with author are now having an "open/close" link New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements * master: From 5921dc6f1679afdcc0551da248f94d24db9ed360 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 29 Mar 2012 16:01:44 -0700 Subject: [PATCH 02/57] typo in function name --- boot.php | 2 +- include/dba.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index b02e686bad..4a4adbbc82 100755 --- a/boot.php +++ b/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.1295' ); +define ( 'FRIENDICA_VERSION', '2.3.1296' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1133 ); diff --git a/include/dba.php b/include/dba.php index 138e82b58b..76cc0bc7b9 100755 --- a/include/dba.php +++ b/include/dba.php @@ -209,9 +209,8 @@ function q($sql) { if($db && $db->connected) { $stmt = vsprintf($sql,$args); if($stmt === false) - logger('dba: vsprintf error: ' . print_r(debug_bracktrace(),true)); - $ret = $db->q($stmt); - return $ret; + logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true)); + return $db->q($stmt); } /** From 3b4016168ddb9927f710775008d3a80ee582e34f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 29 Mar 2012 20:19:43 -0400 Subject: [PATCH 03/57] tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now. Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 22 +++++++++++++++++----- view/theme/dispy-dark/theme.php | 23 ++--------------------- view/theme/dispy-dark/wall_item.tpl | 8 ++++---- view/theme/dispy/style.css | 20 ++++++++++++++++---- view/theme/dispy/theme.php | 21 +-------------------- view/theme/dispy/wall_item.tpl | 8 ++++---- 6 files changed, 44 insertions(+), 58 deletions(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 3616489992..5dc0776e03 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -1031,6 +1031,7 @@ section { font-size: 0.8em; padding-right: 230px; min-width: 475px; + width: 65%; } /** tabs **/ @@ -1161,10 +1162,18 @@ section { transition: all 1s ease-in-out; } .wall-item-subtools1 { - list-style: none; + height: 30px; + list-style: none outside none; + margin: 20px 0 30px -20px; + padding: 0; + width: 30px; } .wall-item-subtools2 { - list-style: none; + height: 25px; + list-style: none outside none; + margin: -75px 0 0 5px; + padding: 0; + width: 25px; } .wall-item-title { font-size: 1.2em; @@ -1172,11 +1181,15 @@ section { margin-bottom: 1em; } .wall-item-body { - margin: 10px 10px 10px 0px; + margin: 20px 20px 10px 0px; text-align: left; } .wall-item-lock-wrapper { float: right; + height: 22px; + margin: 0 -5px 0 0; + width: 22px; + opacity: 1; } .wall-item-dislike, .wall-item-like { @@ -2141,8 +2154,7 @@ div[id$="wrapper"] br { opacity: 0.1; filter:alpha(opacity=10); float: right; - margin-right: 10px; - + margin-right: 5px; } .item-select:hover, .checkeditem { opacity: 1; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index cebe9eb4fc..7115faca15 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -6,14 +6,9 @@ * Version: 1.0 * Author: Simon * Maintainer: Simon - * Screenshot: screenshot + * Screenshot: Screenshot */ - -$a->theme_info = array( - 'extends' => 'dispy-dark' -); - $a->page['htmlhead'] .= <<< EOT EOT; @@ -157,6 +138,6 @@ function dispydark_community_info() { } // aside on profile page -if ($a->argv[0] === "profile") { +if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { dispydark_community_info(); } diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index 4b973bf93e..b54f753d3f 100644 --- a/view/theme/dispy-dark/wall_item.tpl +++ b/view/theme/dispy-dark/wall_item.tpl @@ -16,11 +16,11 @@
{{ if $item.location }}$item.location {{ endif }}
-
    -
  • +
    {{ if $item.lock }}
    $item.lock
    {{ else }}
    {{ endif }} -
    • +
+
    {{ if $item.star }}
  • @@ -37,7 +37,7 @@
    • {{ endif }} -
+
    {{ if $item.filer }}
    • diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index c2c7467671..1d6bba738d 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1031,6 +1031,7 @@ section { font-size: 0.8em; padding-right: 230px; min-width: 475px; + width: 65%; } /** tabs **/ @@ -1161,10 +1162,18 @@ section { transition: all 1s ease-in-out; } .wall-item-subtools1 { - list-style: none; + height: 30px; + list-style: none outside none; + margin: 20px 0 30px -20px; + padding: 0; + width: 30px; } .wall-item-subtools2 { - list-style: none; + height: 25px; + list-style: none outside none; + margin: -75px 0 0 5px; + padding: 0; + width: 25px; } .wall-item-title { font-size: 1.2em; @@ -1172,11 +1181,15 @@ section { margin-bottom: 1em; } .wall-item-body { - margin: 10px 10px 10px 0px; + margin: 20px 20px 10px 0px; text-align: left; } .wall-item-lock-wrapper { float: right; + height: 22px; + margin: 0 -5px 0 0; + width: 22px; + opacity: 1; } .wall-item-dislike, .wall-item-like { @@ -2142,7 +2155,6 @@ div[id$="wrapper"] br { filter:alpha(opacity=10); float: right; margin-right: 10px; - } .item-select:hover, .checkeditem { opacity: 1; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 9789fd0fa3..f3c54caf9e 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -9,11 +9,6 @@ * Screenshot: Screenshot */ - -$a->theme_info = array( - 'extends' => 'dispy' -); - $a->page['htmlhead'] .= <<< EOT EOT; @@ -157,6 +138,6 @@ function dispy_community_info() { } // aside on profile page -if ($a->argv[0] === "profile") { +if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { dispy_community_info(); } diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 4b973bf93e..b54f753d3f 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -16,11 +16,11 @@
    {{ if $item.location }}$item.location {{ endif }}
    -
      -
    • +
      {{ if $item.lock }}
      $item.lock
      {{ else }}
      {{ endif }} -
      • +
    +
      {{ if $item.star }}
    • @@ -37,7 +37,7 @@
      • {{ endif }} -
    +

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 8a8fac662b..23db84c2c8 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -194,6 +194,16 @@ aside { font-weight: bold; background: #3465a4 url('friendika-16.png') no-repeat 95% center; } +#wallmessage-link { + display: block; + color: #FFFFFF; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 5px; + font-weight: bold; + background-color: #3465a4; +} /* section */ section { diff --git a/view/wallmessage.tpl b/view/wallmessage.tpl new file mode 100755 index 0000000000..66b2bc3a05 --- /dev/null +++ b/view/wallmessage.tpl @@ -0,0 +1,32 @@ + +

$header

+ +

$subheader

+ +
+
+ +$parent + +
$to
+$recipname + +
$subject
+ + +
$yourmessage
+ + + +
+ + +
+ +
+
+
+
+
diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl new file mode 100755 index 0000000000..cb39225725 --- /dev/null +++ b/view/wallmsg-header.tpl @@ -0,0 +1,82 @@ + + + + + From f0b8d016154e274f5bfe4d3ec5ac3950621cc2ce Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 03:19:37 -0700 Subject: [PATCH 47/57] try slightly better detection of html in feeds --- include/items.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 9f7eb84d96..e09b888cab 100755 --- a/include/items.php +++ b/include/items.php @@ -416,7 +416,7 @@ function get_atom_elements($feed,$item) { // the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining // html. - if((strpos($res['body'],'<') !== false) || (strpos($res['body'],'>') !== false)) { + if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) { $res['body'] = reltoabs($res['body'],$base_url); @@ -429,13 +429,14 @@ function get_atom_elements($feed,$item) { // we shouldn't need a whitelist, because the bbcode converter // will strip out any unsupported tags. - // $config->set('HTML.Allowed', 'p,b,a[href],i'); $purifier = new HTMLPurifier($config); $res['body'] = $purifier->purify($res['body']); - $res['body'] = html2bbcode($res['body']); + $res['body'] = @html2bbcode($res['body']); } + else + $res['body'] = escape_tags($res['body']); $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); if($allow && $allow[0]['data'] == 1) From bc283f7c5df4b848a6a96db07450af011f03c515 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 03:37:41 -0700 Subject: [PATCH 48/57] qcomment overflow --- view/theme/duepuntozero/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 23db84c2c8..1f897f3b05 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2989,6 +2989,14 @@ div.jGrowl div.info { padding: 3px; margin-top: 15px; margin-left: 25px; + width: 125px; + overflow-y: auto; +} + + +.qcomment option { + width: 125px; + overflow-x: hidden; } .qcomment { From 15ba0ef5d0bbfed0174c9b9360ebf6f912c90e80 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 1 Apr 2012 13:12:15 +0200 Subject: [PATCH 49/57] various bugfixes and css-fixes --- view/theme/diabook-aerith/jot.tpl | 2 +- view/theme/diabook-aerith/nav.tpl | 22 ++++++++++++---------- view/theme/diabook-aerith/theme.php | 5 ++++- view/theme/diabook-blue/nav.tpl | 22 ++++++++++++---------- view/theme/diabook-blue/theme.php | 5 ++++- view/theme/diabook-red/nav.tpl | 22 ++++++++++++---------- view/theme/diabook-red/theme.php | 5 ++++- view/theme/diabook/nav.tpl | 22 ++++++++++++---------- view/theme/diabook/photo-menu.jpg | Bin 0 -> 459 bytes view/theme/diabook/style.css | 2 +- view/theme/diabook/theme.php | 8 +++++++- 11 files changed, 69 insertions(+), 46 deletions(-) create mode 100755 view/theme/diabook/photo-menu.jpg diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl index 5ef723d727..59066a19c5 100755 --- a/view/theme/diabook-aerith/jot.tpl +++ b/view/theme/diabook-aerith/jot.tpl @@ -34,7 +34,7 @@
-
+
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl index c344361031..f84b902d5b 100644 --- a/view/theme/diabook-aerith/nav.tpl +++ b/view/theme/diabook-aerith/nav.tpl @@ -11,16 +11,16 @@ {{ if $nav.network }} {{ endif }} {{ if $nav.contacts }}
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

Account ID:
Password:

diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index e9fe8e0f0e..4900107507 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -139,7 +139,8 @@ function diabook_aerith_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index cff75cd40a..3b95b376e2 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

Find Friends

$nv.directory.1
+$nv.global_directory.1
$nv.match.1
$nv.suggest.1
$nv.invite.1 diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php index 65c43a2b9f..4505c99469 100644 --- a/view/theme/diabook-blue/fpostit/fpostit.php +++ b/view/theme/diabook-blue/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

- Friendika Bookmarklet

+ Friendica Bookmarklet
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

Account ID:
Password:

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 3d54ba9efc..891c13cbf3 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -139,7 +139,8 @@ function diabook_blue_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl index 326c766b25..91935a9d35 100755 --- a/view/theme/diabook-red/communityhome.tpl +++ b/view/theme/diabook-red/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

Find Friends

$nv.directory.1
+$nv.global_directory.1
$nv.match.1
$nv.suggest.1
$nv.invite.1 diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php index 65c43a2b9f..4505c99469 100644 --- a/view/theme/diabook-red/fpostit/fpostit.php +++ b/view/theme/diabook-red/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

- Friendika Bookmarklet

+ Friendica Bookmarklet
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

Account ID:
Password:

diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index b091295b7d..44a76a5e45 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -139,7 +139,8 @@ function diabook_red_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 91871a7b96..d344cad31a 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

Find Friends

$nv.directory.1
+$nv.global_directory.1
$nv.match.1
$nv.suggest.1
$nv.invite.1 diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php index 65c43a2b9f..4505c99469 100644 --- a/view/theme/diabook/fpostit/fpostit.php +++ b/view/theme/diabook/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

- Friendika Bookmarklet

+ Friendica Bookmarklet
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

Account ID:
Password:

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 6ac64bedac..d6ee57316a 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -143,7 +143,8 @@ function diabook_community_info(){ //right_aside FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", "");