MrPetovan/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #185 from annando/master

Browse source 
"Settings" aren't called "Settings" anymore
This commit is contained in:
fabrixxm 2014-03-23 08:30:26 +01:00
commit 7fb604f0ff
26 changed files with 131 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appnetpost/appnetpost.php
View file

@ -53,11 +53,11 @@ function appnetpost_settings(&$a,&$s) {
$def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
$s .= '<span id="settings_appnetpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">'; $s .= '<span id="settings_appnetpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
$s .= '<h3>' . t('App.net Post Settings') . '</h3>'; $s .= '<h3>' . t('App.net') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_appnetpost_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_appnetpost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
$s .= '<h3>' . t('App.net Post Settings') . '</h3>'; $s .= '<h3>' . t('App.net') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="appnetpost-enable-wrapper">'; $s .= '<div id="appnetpost-enable-wrapper">';

4
blockem/blockem.php
View file

@ -50,11 +50,11 @@ function blockem_addon_settings(&$a,&$s) {
$words = ''; $words = '';
$s .= '<span id="settings_blockem_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">'; $s .= '<span id="settings_blockem_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
$s .= '<h3>' . t('"Blockem" Settings') . '</h3>'; $s .= '<h3>' . t('"Blockem"') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_blockem_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_blockem_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
$s .= '<h3>' . t('"Blockem" Settings') . '</h3>'; $s .= '<h3>' . t('"Blockem"') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="blockem-wrapper">'; $s .= '<div id="blockem-wrapper">';

4
blogger/blogger.php
View file

@ -71,11 +71,11 @@ function blogger_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">'; $s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
$s .= '<h3>' . t('Blogger Post Settings') . '</h3>'; $s .= '<h3>' . t('Blogger') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
$s .= '<h3>' . t('Blogger Post Settings') . '</h3>'; $s .= '<h3>' . t('Blogger') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="blogger-enable-wrapper">'; $s .= '<div id="blogger-enable-wrapper">';

4
communityhome/communityhome.php
View file

@ -75,8 +75,8 @@ function communityhome_home(&$a, &$o){
// this query don't work on some mysql versions // this query don't work on some mysql versions
if (get_config('communityhome','showactiveusers')===true){ if (get_config('communityhome','showactiveusers')===true){
$r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM $r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM
(SELECT COUNT(`id`) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`, (SELECT COUNT(*) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`,
(SELECT COUNT(`id`) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`, (SELECT COUNT(*) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`,
( (
SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid`
UNION ALL UNION ALL

46
convpath/convpath.php
View file

@ -10,12 +10,22 @@
function convpath_install() { function convpath_install() {
register_hook('page_end', 'addon/convpath/convpath.php', 'convpath_page_end'); register_hook('page_end', 'addon/convpath/convpath.php', 'convpath_page_end');
register_hook('page_header', 'addon/convpath/convpath.php', 'convpath_page_header'); register_hook('page_header', 'addon/convpath/convpath.php', 'convpath_page_header');
register_hook('ping_xmlize', 'addon/convpath/convpath.php', 'convpath_ping_xmlize_hook');
register_hook('prepare_body', 'addon/convpath/convpath.php', 'convpath_prepare_body_hook');
register_hook('display_item', 'addon/convpath/convpath.php', 'convpath_display_item_hook');
} }
function convpath_uninstall() { function convpath_uninstall() {
unregister_hook('page_end', 'addon/convpath/convpath.php', 'convpath_page_end'); unregister_hook('page_end', 'addon/convpath/convpath.php', 'convpath_page_end');
unregister_hook('page_header', 'addon/convpath/convpath.php', 'convpath_page_header'); unregister_hook('page_header', 'addon/convpath/convpath.php', 'convpath_page_header');
unregister_hook('ping_xmlize', 'addon/convpath/convpath.php', 'convpath_ping_xmlize_hook');
unregister_hook('prepare_body', 'addon/convpath/convpath.php', 'convpath_prepare_body_hook');
unregister_hook('display_item', 'addon/convpath/convpath.php', 'convpath_display_item_hook');
}
function convpath_ping_xmlize_hook(&$a, &$o) {
$o["photo"] = convpath_url($a, $o["photo"]);
} }
function convpath_page_header(&$a, &$o){ function convpath_page_header(&$a, &$o){
@ -27,6 +37,42 @@ function convpath_page_end(&$a, &$o){
$a->page['aside'] = convpath_convert($a->page['aside']); $a->page['aside'] = convpath_convert($a->page['aside']);
} }
function convpath_prepare_body_hook(&$a, &$o) {
$o["html"] = convpath_convert($o["html"]);
}
function convpath_display_item_hook(&$a, &$o) {
if (isset($o["output"])) {
if (isset($o["output"]["thumb"]))
$o["output"]["thumb"] = convpath_url($a, $o["output"]["thumb"]);
if (isset($o["output"]["author-avatar"]))
$o["output"]["author-avatar"] = convpath_url($a, $o["output"]["author-avatar"]);
if (isset($o["output"]["owner-avatar"]))
$o["output"]["owner-avatar"] = convpath_url($a, $o["output"]["owner-avatar"]);
if (isset($o["output"]["owner_photo"]))
$o["output"]["owner_photo"] = convpath_url($a, $o["output"]["owner_photo"]);
}
}
function convpath_url($a, $path) {
if ($path == "")
return("");
$ssl = (substr($a->get_baseurl(), 0, 8) == "https://");
if ($ssl) {
$search = "http://".$a->get_hostname();
$replace = "https://".$a->get_hostname();
} else {
$search = "https://".$a->get_hostname();
$replace = "http://".$a->get_hostname();
}
$path = str_replace($search, $replace, $path);
return($path);
}
/* /*
Converts a given path according to the current scheme Converts a given path according to the current scheme
*/ */

2
curweather/curweather.php
View file

@ -87,7 +87,7 @@ function curweather_plugin_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<div class="settings-block">'; $s .= '<div class="settings-block">';
$s .= '<h3>' . t('Current Weather Settings') . '</h3>'; $s .= '<h3>' . t('Current Weather') . '</h3>';
$s .= '<div id="curweather-settings-wrapper">'; $s .= '<div id="curweather-settings-wrapper">';
$s .= '<p>Find the location code for the airport/weather station nearest you <a href="http://en.wikipedia.org/wiki/International_Air_Transport_Association_airport_code" target="_blank">here</a>.</p>'; $s .= '<p>Find the location code for the airport/weather station nearest you <a href="http://en.wikipedia.org/wiki/International_Air_Transport_Association_airport_code" target="_blank">here</a>.</p>';
$s .= '<label id="curweather-location-label" for="curweather_loc">' . t('Weather Location: ') . '</label>'; $s .= '<label id="curweather-location-label" for="curweather_loc">' . t('Weather Location: ') . '</label>';

8
facebook/facebook.php
View file

@ -289,7 +289,7 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
`name-date` = '%s', `name-date` = '%s',
`uri-date` = '%s', `uri-date` = '%s',
`avatar-date` = '%s' `avatar-date` = '%s'
WHERE `id` = %d LIMIT 1 WHERE `id` = %d
", ",
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
@ -356,7 +356,7 @@ function fb_get_friends_sync_parsecontact($uid, $contact) {
`name-date` = '%s', `name-date` = '%s',
`uri-date` = '%s', `uri-date` = '%s',
`avatar-date` = '%s' `avatar-date` = '%s'
WHERE `id` = %d LIMIT 1 WHERE `id` = %d
", ",
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
@ -1171,7 +1171,7 @@ function facebook_post_hook(&$a,&$b) {
$retj = json_decode($x); $retj = json_decode($x);
if($retj->id) { if($retj->id) {
q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1", q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
dbesc('fb::' . $retj->id), dbesc('fb::' . $retj->id),
intval($b['id']) intval($b['id'])
); );
@ -1307,7 +1307,7 @@ function fb_queue_hook(&$a,&$b) {
$retj = json_decode($j); $retj = json_decode($j);
if($retj->id) { if($retj->id) {
q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1", q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
dbesc('fb::' . $retj->id), dbesc('fb::' . $retj->id),
intval($item) intval($item)
); );

7
fbpost/fbpost.php
View file

@ -207,7 +207,7 @@ function fbpost_content(&$a) {
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
. $a->get_baseurl() . '/addon/fbpost/fbpost.css' . '" media="all" />' . "\r\n"; . $a->get_baseurl() . '/addon/fbpost/fbpost.css' . '" media="all" />' . "\r\n";
$o .= '<h3>' . t('Facebook Post') . '</h3>'; $o .= '<h3>' . t('Facebook') . '</h3>';
if(! $fb_installed) { if(! $fb_installed) {
$o .= '<div id="fbpost-enable-wrapper">'; $o .= '<div id="fbpost-enable-wrapper">';
@ -293,8 +293,7 @@ function fbpost_content(&$a) {
function fbpost_plugin_settings(&$a,&$b) { function fbpost_plugin_settings(&$a,&$b) {
$b .= '<div class="settings-block">'; $b .= '<div class="settings-block">';
//$b .= '<h3>' . t('Facebook Post Settings') . '</h3>'; $b .= '<a href="fbpost"><h3>' . t('Facebook') . '</a></h3>';
$b .= '<a href="fbpost"><h3>' . t('Facebook Post Settings') . '</a></h3>';
$b .= '</div>'; $b .= '</div>';
} }
@ -1173,7 +1172,7 @@ function fbpost_get_photo($uid,$link) {
function fpost_cleanpicture($image) { function fpost_cleanpicture($image) {
if (strpos($image, ".fbcdn.net/") and (substr($image, -6) == "_s.jpg")) if ((strpos($image, ".fbcdn.net/") OR strpos($image, "/fbcdn-photos-")) and (substr($image, -6) == "_s.jpg"))
$image = substr($image, 0, -6)."_n.jpg"; $image = substr($image, 0, -6)."_n.jpg";
$queryvar = fbpost_parse_query($image); $queryvar = fbpost_parse_query($image);

4
fbsync/fbsync.php
View file

@ -120,11 +120,11 @@ function fbsync_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_fbsync_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">'; $s .= '<span id="settings_fbsync_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
$s .= '<h3>' . t('Facebook Import Settings') . '</h3>'; $s .= '<h3>' . t('Facebook Import') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_fbsync_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_fbsync_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
$s .= '<h3>' . t('Facebook Import Settings') . '</h3>'; $s .= '<h3>' . t('Facebook Import') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="fbsync-enable-wrapper">'; $s .= '<div id="fbsync-enable-wrapper">';

4
forumlist/forumlist.php
View file

@ -158,11 +158,11 @@ function forumlist_plugin_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_forumlist_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">'; $s .= '<span id="settings_forumlist_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">';
$s .= '<h3>' . t('Forumlist Settings') . '</h3>'; $s .= '<h3>' . t('Forumlist') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_forumlist_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_forumlist_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">';
$s .= '<h3>' . t('Forumlist Settings') . '</h3>'; $s .= '<h3>' . t('Forumlist') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="forumlist-settings-wrapper">'; $s .= '<div id="forumlist-settings-wrapper">';

4
fromgplus/fromgplus.php
View file

@ -34,11 +34,11 @@ function fromgplus_addon_settings(&$a,&$s) {
$account = get_pconfig(local_user(),'fromgplus','account'); $account = get_pconfig(local_user(),'fromgplus','account');
$s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">'; $s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
$s .= '<h3>' . t('Google+ Import Settings').'</h3>'; $s .= '<h3>' . t('Google+ Mirroring').'</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
$s .= '<h3>' . t('Google+ Import Settings').'</h3>'; $s .= '<h3>' . t('Google+ Mirroring').'</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="fromgplus-wrapper">'; $s .= '<div id="fromgplus-wrapper">';

4
gpluspost/gpluspost.php
View file

@ -59,11 +59,11 @@ function gpluspost_settings(&$a,&$s) {
$skip_checked = (($skip_enabled) ? ' checked="checked" ' : ''); $skip_checked = (($skip_enabled) ? ' checked="checked" ' : '');
$s .= '<span id="settings_gpluspost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">'; $s .= '<span id="settings_gpluspost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
$s .= '<h3>' . t('Google+ Post Settings') . '</h3>'; $s .= '<h3>' . t('Google+') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_gpluspost_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_gpluspost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
$s .= '<h3>' . t('Google+ Post Settings') . '</h3>'; $s .= '<h3>' . t('Google+') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="gpluspost-enable-wrapper">'; $s .= '<div id="gpluspost-enable-wrapper">';

4
jappixmini/jappixmini.php
View file

@ -295,11 +295,11 @@ function jappixmini_settings(&$a, &$s) {
} }
$s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">'; $s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
$s .= '<h3>'.t('Jappix Mini addon settings').'</h3>'; $s .= '<h3>'.t('Jappix Mini').'</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
$s .= '<h3>'.t('Jappix Mini addon settings').'</h3>'; $s .= '<h3>'.t('Jappix Mini').'</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>'; $s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';

4
libertree/libertree.php
View file

@ -64,11 +64,11 @@ function libertree_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">'; $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
$s .= '<h3>' . t('libertree Post Settings') . '</h3>'; $s .= '<h3>' . t('libertree') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
$s .= '<h3>' . t('libertree Post Settings') . '</h3>'; $s .= '<h3>' . t('libertree') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="libertree-enable-wrapper">'; $s .= '<div id="libertree-enable-wrapper">';

4
nsfw/nsfw.php
View file

@ -75,11 +75,11 @@ function nsfw_addon_settings(&$a,&$s) {
$words = 'nsfw,'; $words = 'nsfw,';
$s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">'; $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
$s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>'; $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
$s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>'; $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="nsfw-wrapper">'; $s .= '<div id="nsfw-wrapper">';

12
public_server/public_server.php
View file

@ -36,7 +36,7 @@ function public_server_register_account($a,$b) {
if(! $days) if(! $days)
return; return;
$r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d limit 1", $r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d",
dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')), dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
intval($days_posts), intval($days_posts),
intval($uid) intval($uid)
@ -66,7 +66,7 @@ function public_server_cron($a,$b) {
'source_photo' => $a->get_baseurl() . '/images/person-80.jpg', 'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
)); ));
q("update user set expire_notification_sent = '%s' where uid = %d limit 1", q("update user set expire_notification_sent = '%s' where uid = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($rr['uid']) intval($rr['uid'])
); );
@ -85,7 +85,7 @@ function public_server_cron($a,$b) {
$r = q("select uid from user where account_expired = 0 and login_date = '0000-00-00 00:00:00' and register_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00'",intval($nologin)); $r = q("select uid from user where account_expired = 0 and login_date = '0000-00-00 00:00:00' and register_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00'",intval($nologin));
if(count($r)) { if(count($r)) {
foreach($r as $rr) foreach($r as $rr)
q("update user set account_expires_on = '%s' where uid = %d limit 1", q("update user set account_expires_on = '%s' where uid = %d",
dbesc(datetime_convert('UTC','UTC','now +' . '6 days')), dbesc(datetime_convert('UTC','UTC','now +' . '6 days')),
intval($rr['uid']) intval($rr['uid'])
); );
@ -98,7 +98,7 @@ function public_server_cron($a,$b) {
$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and `page-flags` = 0",intval($flagusers)); $r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and `page-flags` = 0",intval($flagusers));
if(count($r)) { if(count($r)) {
foreach($r as $rr) foreach($r as $rr)
q("update user set account_expires_on = '%s' where uid = %d limit 1", q("update user set account_expires_on = '%s' where uid = %d",
dbesc(datetime_convert('UTC','UTC','now +' . '6 days')), dbesc(datetime_convert('UTC','UTC','now +' . '6 days')),
intval($rr['uid']) intval($rr['uid'])
); );
@ -111,7 +111,7 @@ function public_server_cron($a,$b) {
$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and `page-flags` = 0",intval($flagposts)); $r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and `page-flags` = 0",intval($flagposts));
if(count($r)) { if(count($r)) {
foreach($r as $rr) foreach($r as $rr)
q("update user set expire = %d where uid = %d limit 1", q("update user set expire = %d where uid = %d",
intval($flagpostsexpire), intval($flagpostsexpire),
intval($rr['uid']) intval($rr['uid'])
); );
@ -136,7 +136,7 @@ function public_server_login($a,$b) {
$days = get_config('public_server','expiredays'); $days = get_config('public_server','expiredays');
if(! $days) if(! $days)
return; return;
$r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00' limit 1", $r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'",
dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')), dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
local_user() local_user()
); );

5
pumpio/pumpio.php
View file

@ -219,11 +219,11 @@ function pumpio_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">'; $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
$s .= '<h3>' . t('Pump.io Post Settings') . '</h3>'; $s .= '<h3>' . t('Pump.io') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
$s .= '<h3>' . t('Pump.io Post Settings') . '</h3>'; $s .= '<h3>' . t('Pump.io') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="pumpio-username-wrapper">'; $s .= '<div id="pumpio-username-wrapper">';
@ -1022,6 +1022,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = false) { function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = false) {
require_once('include/items.php'); require_once('include/items.php');
require_once('include/html2bbcode.php');
if (($post->verb == "like") OR ($post->verb == "favorite")) if (($post->verb == "like") OR ($post->verb == "favorite"))
return pumpio_dolike($a, $uid, $self, $post, $own_id); return pumpio_dolike($a, $uid, $self, $post, $own_id);

4
snautofollow/snautofollow.php
View file

@ -53,11 +53,11 @@ function snautofollow_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_snautofollow_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">'; $s .= '<span id="settings_snautofollow_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">';
$s .= '<h3>' . t('StatusNet AutoFollow Settings') . '</h3>'; $s .= '<h3>' . t('StatusNet AutoFollow') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_snautofollow_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_snautofollow_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">';
$s .= '<h3>' . t('StatusNet AutoFollow Settings') . '</h3>'; $s .= '<h3>' . t('StatusNet AutoFollow') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="snautofollow-wrapper">'; $s .= '<div id="snautofollow-wrapper">';

4
startpage/startpage.php
View file

@ -80,11 +80,11 @@ function startpage_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_startpage_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">'; $s .= '<span id="settings_startpage_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
$s .= '<h3>' . t('Startpage Settings') . '</h3>'; $s .= '<h3>' . t('Startpage') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_startpage_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_startpage_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
$s .= '<h3>' . t('Startpage Settings') . '</h3>'; $s .= '<h3>' . t('Startpage') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="startpage-page-wrapper">'; $s .= '<div id="startpage-page-wrapper">';
$s .= '<label id="startpage-page-label" for="startpage-page">' . t('Home page to load after login - leave blank for profile wall') . '</label>'; $s .= '<label id="startpage-page-label" for="startpage-page">' . t('Home page to load after login - leave blank for profile wall') . '</label>';

4
statusnet/statusnet.php
View file

@ -279,11 +279,11 @@ function statusnet_settings(&$a,&$s) {
$shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : ''); $shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">'; $s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>'; $s .= '<h3>'. t('StatusNet').'</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>'; $s .= '<h3>'. t('StatusNet').'</h3>';
$s .= '</span>'; $s .= '</span>';
if ( (!$ckey) && (!$csecret) ) { if ( (!$ckey) && (!$csecret) ) {

4
testdrive/testdrive.php
View file

@ -41,7 +41,7 @@ function testdrive_register_account($a,$b) {
if(! $days) if(! $days)
return; return;
$r = q("UPDATE user set account_expires_on = '%s' where uid = %d limit 1", $r = q("UPDATE user set account_expires_on = '%s' where uid = %d",
dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')), dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
intval($uid) intval($uid)
); );
@ -69,7 +69,7 @@ function testdrive_cron($a,$b) {
'source_photo' => $a->get_baseurl() . '/images/person-80.jpg', 'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
)); ));
q("update user set expire_notification_sent = '%s' where uid = %d limit 1", q("update user set expire_notification_sent = '%s' where uid = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($rr['uid']) intval($rr['uid'])
); );

4
tumblr/tumblr.php
View file

@ -182,11 +182,11 @@ function tumblr_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">'; $s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
$s .= '<h3>' . t('Tumblr Post Settings') . '</h3>'; $s .= '<h3>' . t('Tumblr') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
$s .= '<h3>' . t('Tumblr Post Settings') . '</h3>'; $s .= '<h3>' . t('Tumblr') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="tumblr-username-wrapper">'; $s .= '<div id="tumblr-username-wrapper">';

4
twitter/twitter.php
View file

@ -231,11 +231,11 @@ function twitter_settings(&$a,&$s) {
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : ''); $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">'; $s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
$s .= '<h3>'. t('Twitter Settings') .'</h3>'; $s .= '<h3>'. t('Twitter') .'</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
$s .= '<h3>'. t('Twitter Settings') .'</h3>'; $s .= '<h3>'. t('Twitter') .'</h3>';
$s .= '</span>'; $s .= '</span>';
if ( (!$ckey) && (!$csecret) ) { if ( (!$ckey) && (!$csecret) ) {

4
wppost/wppost.php
View file

@ -73,11 +73,11 @@ function wppost_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">'; $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
$s .= '<h3>' . t('WordPress Post Settings') . '</h3>'; $s .= '<h3>' . t('WordPress') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
$s .= '<h3>' . t('WordPress Post Settings') . '</h3>'; $s .= '<h3>' . t('WordPress') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="wppost-enable-wrapper">'; $s .= '<div id="wppost-enable-wrapper">';
$s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>'; $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';

4
yourls/yourls.php
View file

@ -52,11 +52,11 @@ function yourls_addon_settings(&$a,&$s) {
$yourls_ssl = get_config('yourls', 'ssl1'); $yourls_ssl = get_config('yourls', 'ssl1');
$s .= '<span id="settings_yourls_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">'; $s .= '<span id="settings_yourls_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
$s .= '<h3>' . t('YourLS Settings') . '</h3>'; $s .= '<h3>' . t('YourLS') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="settings_yourls_expanded" class="settings-block" style="display: none;">'; $s .= '<div id="settings_yourls_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">'; $s .= '<span class="fakelink" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
$s .= '<h3>' . t('YourLS Settings') . '</h3>'; $s .= '<h3>' . t('YourLS') . '</h3>';
$s .= '</span>'; $s .= '</span>';
$s .= '<div id="yourls-url-wrapper">'; $s .= '<div id="yourls-url-wrapper">';