keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
tommy tomson 2012-03-06 08:28:21 +01:00
commit eaaf030c18
12 changed files with 707 additions and 536 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1271' );
define ( 'FRIENDICA_VERSION', '2.3.1272' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );

7
include/security.php
View file

@ -108,14 +108,18 @@ function can_write_wall(&$a,$owner) {
if(remote_user()) {
// user remembered decision and avoid a DB lookup for each and every display item
// use remembered decision and avoid a DB lookup for each and every display item
// DO NOT use this function if there are going to be multiple owners
// We have a contact-id for an authenticated remote user, this block determines if the contact
// belongs to this page owner, and has the necessary permissions to post content
if($verified === 2)
return true;
elseif($verified === 1)
return false;
else {
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `user`.`blockwall` = 0 AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
@ -125,6 +129,7 @@ function can_write_wall(&$a,$owner) {
intval(CONTACT_IS_FRIEND),
intval(PAGE_COMMUNITY)
);
if(count($r)) {
$verified = 2;
return true;

8
mod/admin.php
View file

@ -145,8 +145,9 @@ function admin_page_summary(&$a) {
Array( t('Automatic Friend Account'), 0)
);
$users=0;
foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+=$u['count']; }
foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
logger('accounts: ' . print_r($accounts,true));
$r = q("SELECT COUNT(id) as `count` FROM `register`");
$pending = $r[0]['count'];
@ -574,6 +575,8 @@ function admin_page_plugins(&$a){
'$status' => $status,
'$action' => $action,
'$info' => get_plugin_info($plugin),
'$str_author' => t('Author: '),
'$str_maintainer' => t('Maintainer: '),
'$admin_form' => $admin_form,
'$function' => 'plugins',
@ -747,7 +750,8 @@ function admin_page_themes(&$a){
'$info' => get_theme_info($theme),
'$function' => 'themes',
'$admin_form' => $admin_form,
'$str_author' => t('Author: '),
'$str_maintainer' => t('Maintainer: '),
'$readme' => $readme
));
}

1100
util/messages.po
View file

File diff suppressed because it is too large Load diff

7
view/admin_plugins_details.tpl
View file

@ -4,12 +4,17 @@
<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t">$action</a></p>
<p>$info.description</p>
<p class="author">
<p class="author">$str_author
{{ for $info.author as $a }}
{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
{{ endfor }}
</p>
<p class="maintainer">$str_maintainer
{{ for $info.maintainer as $a }}
{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
{{ endfor }}
</p>
{{ if $admin_form }}
<h3>$settings</h3>

2
view/admin_summary.tpl
View file

@ -13,7 +13,7 @@
{{ for $accounts as $p }}
<dl>
<dt>$p.0</dt>
<dd>$p.1</dd>
<dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd>
</dl>
{{ endfor }}

3
view/theme/darkzero/style.css
View file

@ -24,7 +24,8 @@ nav #banner #logo-text a { color: #ffffff; }
.wall-item-content-wrapper { border: 1px solid #444444; }
.wall-item-tools { background-color: #444444; background-image: none;}
.comment-edit-wrapper{ background-color: #333333; }
.comment-wwedit-wrapper{ background-color: #333333; }
.comment-edit-preview{ color: #000000; }
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
.photo-top-album-name{ background-color: #333333; }
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }

2
view/theme/darkzero/theme.php
View file

@ -4,6 +4,8 @@
* Name: Darkzero
* Version: 1.0
* Author: Fabio Communi <fabrix.xm@gmail.com>
* Maintainer: Fabio Communi <fabrix.xm@gmail.com>
* Maintainer: Mike Macgirvin <mike@macgirvin.com>
*/
$a->theme_info = array(

40
view/theme/dispy/style.css
View file

@ -1703,11 +1703,11 @@ div[id$="wrapper"] br {
}
#settings-nickname-desc {
background-color:#DDEFFF;
-webkit-border-radius:5px;
-moz-border-radius:5px;
border-radius:5px;
padding:5px;
background-color: #def;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
padding: 5px;
}
#register-form div,
@ -2116,7 +2116,7 @@ div[id$="wrapper"] br {
margin: 0 10px 0.2em 0;
border: 1px #999 solid;
padding: 5px;
background: #f2eedf;
background: #def;
vertical-align: middle;
}
.field input {
@ -2132,7 +2132,7 @@ div[id$="wrapper"] br {
}
.field_help {
display: block;
margin-left: 0px;
margin-left: 297px;
color: #666;
}
.field .onoff {
@ -2142,32 +2142,26 @@ div[id$="wrapper"] br {
.field .onoff a {
display: block;
border: 1px solid #666;
background: url("../../../images/onoff.jpg") no-repeat;
padding: 4px 2px 2px;
padding: 3px 6px 4px 10px;
height: 16px;
text-decoration: none;
}
.field .onoff .off {
border-color: #666;
padding-left: 40px;
background: #ccc left center;
color: #666;
text-align:right;
}
.field .onoff .on {
border-color:#204a87;
padding-right:40px;
background-position:right center;
background-color:#3465A4;
color:#fff;
text-align:left;
background: url("../../../images/onoff.jpg") no-repeat 42px 1px #def;
color: #333;
text-align: left;
}
.field .onoff .off {
background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
color: #333;
text-align: right;
}
.hidden {
display:none !important;
}
.field.radio .field_help {
margin-left:0;
margin-left: 0;
}

5
view/theme/testbubble/nav.tpl
View file

@ -58,6 +58,9 @@
</div>
</nav>
<ul id="nav-notifications-template" style="display:none;" rel="template">
<li><a href="{0}">{2} <span class="notif-when">{3}</span></a></li>
<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
</ul>

61
view/theme/testbubble/style.css
View file

@ -55,7 +55,7 @@ p {
}
label {
font-variant:small-caps;
/* font-variant:small-caps; */
}
li {
@ -455,7 +455,7 @@ aside a{
.vcard {
font-size: 1em;
font-variant:small-caps;
/* font-variant:small-caps; */
}
.vcard dd {
@ -488,7 +488,7 @@ aside h4 { font-size: 1.3em; }
color: #626262;
text-align: center;
font-weight: bold;
font-variant:small-caps;
/* font-variant:small-caps; */
font-size: 1.1em;
}
.allcontact-link a {
@ -1041,7 +1041,7 @@ profile-jot-banner-wrapper {
font-size: 0.9em;
margin: 4px 0px 0px 140px;
padding-left: 10px;
font-variant:small-caps;
/* font-variant:small-caps; */
}
.wall-item-author a {
@ -1063,7 +1063,7 @@ profile-jot-banner-wrapper {
margin-left: 25px;
font-size: 0.9em;
display: block;
font-variant:small-caps;
/* font-variant:small-caps; */
color: #898989;
}
@ -1072,7 +1072,7 @@ profile-jot-banner-wrapper {
.wall-item-conv a{
font-size: 0.9em;
color: #898989;
font-variant:small-caps;
/* font-variant:small-caps; */
}
.wallwall .wwto {
@ -1157,7 +1157,7 @@ profile-jot-banner-wrapper {
font-size: 0.9em;
color: #898989;
margin-left: 60px;
font-variant:small-caps;
/* font-variant:small-caps; */
}
.wall-item-outside-wrapper.comment { margin-left: 70px; }
@ -1189,7 +1189,7 @@ profile-jot-banner-wrapper {
.icollapse-wrapper {
font-size: 0.9em;
color: #898989;
font-variant:small-caps;
/* font-variant:small-caps; */
}
.comment-wwedit-wrapper,
@ -1266,7 +1266,7 @@ profile-jot-banner-wrapper {
margin-bottom: 0px;
padding-bottom: 5px;
font-size: 18px;
font-variant:small-caps;
/* font-variant:small-caps; */
}
div[id$="wrapper"] { height: 100%;}
@ -1298,7 +1298,7 @@ div[id$="wrapper"] br { clear: left; }
.profile-listing-name {
font-size: 1em;
font-variant: small-caps;
/* font-variant: small-caps;*/
}
.profile-listing-name a {
color: #898989;
@ -1342,7 +1342,7 @@ div[id$="wrapper"] br { clear: left; }
.profile-match-name a{
color: #999;
font-variant: small-caps;
/* font-variant: small-caps; */
font-size: 1em;
}
@ -1462,7 +1462,7 @@ div[id$="wrapper"] br { clear: left; }
padding: 0px 5px;
font-weight: bold;
font-stretch:semi-expanded;
font-variant:small-caps;
/* font-variant:small-caps; */
}
.photo-top-album-name a{
@ -1476,7 +1476,7 @@ div[id$="wrapper"] br { clear: left; }
text-align: center;
color: #6e6e6e;
font-size: 0.9em;
font-variant: small-caps;
/* font-variant: small-caps; */
}
#photo-photo{
@ -1487,7 +1487,7 @@ div[id$="wrapper"] br { clear: left; }
#photo-caption {
margin-top: 10px;
color: #6E6E6E;
font-variant:small-caps;
/* font-variant:small-caps; */
font-size: 1.1em;
}
@ -1712,18 +1712,18 @@ input#photo_edit_form {
}
#prvmail-subject-label {
font-variant:small-caps;
/* font-variant:small-caps; */
}
#prvmail-to {
padding-left: 10px;
}
#prvmail-to-label {
font-variant:small-caps;
/* font-variant:small-caps; */
}
#prvmail-message-label {
font-variant:small-caps;
/* font-variant:small-caps; */
font-size: 1em;
}
@ -1769,7 +1769,7 @@ margin-left: 0px;
.mail-list-sender-name {
font-size: 1.1em;
display: inline;
font-variant:small-caps;
/* font-variant:small-caps; */
}
.mail-list-date {
@ -1779,7 +1779,7 @@ margin-left: 0px;
font-size: 0.9em;
padding-left: 10px;
font-stretch:ultra-condensed;
font-variant:small-caps;
/* font-variant:small-caps; */
}
.mail-list-subject {
@ -1808,8 +1808,8 @@ margin-left: 0px;
height: 64px;
}
.mail-conv-sender-name { float: left; font-variant:small-caps; font-style: bold; }
.mail-conv-date { float: right; font-variant:small-caps; }
.mail-conv-sender-name { float: left; font-style: bold; }
.mail-conv-date { float: right; }
.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
.mail-conv-body {
clear: both;
@ -1903,7 +1903,7 @@ margin-left: 0px;
font: #999;
font-size: 12px;
text-align:center;
font-variant:small-caps;
/* font-variant:small-caps; */
font-weight: bold;
margin-top:5px;
}
@ -1920,7 +1920,7 @@ margin-left: 0px;
background-color: #ffffff;
}
#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; font-variant: small-caps; }
#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; }
#contact-edit-update-now {
@ -2003,7 +2003,7 @@ margin-left: 0px;
}
.view-contact-name {
font-variant: small-caps;
/* font-variant: small-caps; */
}
#div.side-link {
@ -2540,7 +2540,7 @@ margin-left: 0px;
margin-bottom: 2px;
margin-top: 2px;
font-size: 0.9em;
font-variant: small-caps;
/* font-variant: small-caps; */
text-align: left;
}
@ -2606,7 +2606,7 @@ margin-left: 0px;
.event-list-date {
color: #626262;
margin-bottom: 10px;
font-variant:small-caps;
/* font-variant:small-caps; */
font-stretch:condensed;
}
@ -2642,7 +2642,7 @@ margin-left: 0px;
color: #ffffff;
font-weight: bold;
text-align:center;
font-variant:small-caps;
/* font-variant:small-caps; */
-moz-box-shadow: 5px 2px 8px #959494;
-webkit-box-shadow: 5px 2px 8px #959494;
box-shadow: 5px 2px 8px #959494;
@ -2720,13 +2720,13 @@ tr {
.directory-details {
font-size: 0.9em;
font-variant: small-caps;
/* font-variant: small-caps; */
width: 160px;
}
.directory-name {
font-size: 1em;
font-variant: small-caps;
/* font-variant: small-caps; */
width: 150px;
}
@ -3277,3 +3277,6 @@ ul.menu-popup {
opacity: 1.0;
filter:alpha(opacity=100);
}
.notify-seen {
background: #000;
}