mirror of
https://github.com/friendica/friendica
synced 2024-12-23 06:00:15 +00:00
Continued with coding convention:
- added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
parent
b6d11f2129
commit
af2909bf8f
18 changed files with 82 additions and 67 deletions
|
@ -222,15 +222,19 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
|
||||||
|
|
||||||
if (dbm::is_result($r)) {
|
if (dbm::is_result($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
if((is_array($preselected)) && in_array($rr['id'], $preselected))
|
if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
|
||||||
$selected = " selected=\"selected\" ";
|
$selected = " selected=\"selected\" ";
|
||||||
else
|
}
|
||||||
|
else {
|
||||||
$selected = '';
|
$selected = '';
|
||||||
|
}
|
||||||
|
|
||||||
if($privmail)
|
if ($privmail) {
|
||||||
$trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
|
$trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
|
||||||
else
|
}
|
||||||
|
else {
|
||||||
$trimmed = mb_substr($rr['name'],0,20);
|
$trimmed = mb_substr($rr['name'],0,20);
|
||||||
|
}
|
||||||
|
|
||||||
$receiverlist[] = $trimmed;
|
$receiverlist[] = $trimmed;
|
||||||
|
|
||||||
|
|
|
@ -98,10 +98,12 @@ function networks_widget($baseurl,$selected = '') {
|
||||||
if (dbm::is_result($r)) {
|
if (dbm::is_result($r)) {
|
||||||
require_once('include/contact_selectors.php');
|
require_once('include/contact_selectors.php');
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
if($rr['network'])
|
/// @TODO If 'network' is not there, this triggers an E_NOTICE
|
||||||
|
if ($rr['network']) {
|
||||||
$nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
|
$nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(count($nets) < 2)
|
if(count($nets) < 2)
|
||||||
return '';
|
return '';
|
||||||
|
|
|
@ -134,8 +134,9 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
||||||
$images = $match[1];
|
$images = $match[1];
|
||||||
if (count($images)) {
|
if (count($images)) {
|
||||||
foreach ($images as $image) {
|
foreach ($images as $image) {
|
||||||
if(! stristr($image,App::get_baseurl() . '/photo/'))
|
if (! stristr($image,App::get_baseurl() . '/photo/')) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
$image_uri = substr($image,strrpos($image,'/') + 1);
|
$image_uri = substr($image,strrpos($image,'/') + 1);
|
||||||
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
|
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
|
||||||
$r = q("UPDATE `photo` SET `allow_cid` = '%s'
|
$r = q("UPDATE `photo` SET `allow_cid` = '%s'
|
||||||
|
@ -152,22 +153,22 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
||||||
if ($post_id) {
|
if ($post_id) {
|
||||||
proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id);
|
proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id);
|
||||||
return intval($post_id);
|
return intval($post_id);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
return -3;
|
return -3;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
|
function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
|
||||||
|
|
||||||
if(! $recipient) return -1;
|
if (! $recipient) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
if(! strlen($subject))
|
if (! strlen($subject)) {
|
||||||
$subject = t('[no subject]');
|
$subject = t('[no subject]');
|
||||||
|
}
|
||||||
|
|
||||||
$guid = get_guid(32);
|
$guid = get_guid(32);
|
||||||
$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
|
$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
|
||||||
|
@ -179,8 +180,9 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
|
||||||
|
|
||||||
$me = probe_url($replyto);
|
$me = probe_url($replyto);
|
||||||
|
|
||||||
if(! $me['name'])
|
if (! $me['name']) {
|
||||||
return -2;
|
return -2;
|
||||||
|
}
|
||||||
|
|
||||||
$conv_guid = get_guid(32);
|
$conv_guid = get_guid(32);
|
||||||
|
|
||||||
|
@ -193,7 +195,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
|
||||||
|
|
||||||
$handles = $recip_handle . ';' . $sender_handle;
|
$handles = $recip_handle . ';' . $sender_handle;
|
||||||
|
|
||||||
$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
|
$r = q("INSERT INTO `conv` (`uid`,`guid`,`creator`,`created`,`updated`,`subject`,`recips`) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
|
||||||
intval($recipient['uid']),
|
intval($recipient['uid']),
|
||||||
dbesc($conv_guid),
|
dbesc($conv_guid),
|
||||||
dbesc($sender_handle),
|
dbesc($sender_handle),
|
||||||
|
@ -203,18 +205,19 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
|
||||||
dbesc($handles)
|
dbesc($handles)
|
||||||
);
|
);
|
||||||
|
|
||||||
$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
|
$r = q("SELECT * FROM `conv` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($conv_guid),
|
dbesc($conv_guid),
|
||||||
intval($recipient['uid'])
|
intval($recipient['uid'])
|
||||||
);
|
);
|
||||||
if (dbm::is_result($r))
|
|
||||||
$convid = $r[0]['id'];
|
|
||||||
|
|
||||||
if(! $convid) {
|
|
||||||
|
if (! dbm::is_result($r)) {
|
||||||
logger('send message: conversation not found.');
|
logger('send message: conversation not found.');
|
||||||
return -4;
|
return -4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$convid = $r[0]['id'];
|
||||||
|
|
||||||
$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
|
$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
|
||||||
`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
|
`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
|
||||||
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
|
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
|
||||||
|
|
|
@ -187,6 +187,7 @@ function load_hooks() {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$a->hooks = array();
|
$a->hooks = array();
|
||||||
$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
|
$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
|
||||||
|
|
||||||
if (dbm::is_result($r)) {
|
if (dbm::is_result($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
if(! array_key_exists($rr['hook'],$a->hooks))
|
if(! array_key_exists($rr['hook'],$a->hooks))
|
||||||
|
|
|
@ -76,16 +76,19 @@ function pubsubpublish_run(&$argv, &$argc){
|
||||||
load_config('system');
|
load_config('system');
|
||||||
|
|
||||||
// Don't check this stuff if the function is called by the poller
|
// Don't check this stuff if the function is called by the poller
|
||||||
if (App::callstack() != "poller_run")
|
if (App::callstack() != "poller_run") {
|
||||||
if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540))
|
if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540)) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$a->set_baseurl(get_config('system','url'));
|
$a->set_baseurl(get_config('system','url'));
|
||||||
|
|
||||||
load_hooks();
|
load_hooks();
|
||||||
|
|
||||||
if($argc > 1)
|
if ($argc > 1) {
|
||||||
$pubsubpublish_id = intval($argv[1]);
|
$pubsubpublish_id = intval($argv[1]);
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
// We'll push to each subscriber that has push > 0,
|
// We'll push to each subscriber that has push > 0,
|
||||||
// i.e. there has been an update (set in notifier.php).
|
// i.e. there has been an update (set in notifier.php).
|
||||||
|
@ -95,8 +98,9 @@ function pubsubpublish_run(&$argv, &$argc){
|
||||||
$interval = Config::get("system", "delivery_interval", 2);
|
$interval = Config::get("system", "delivery_interval", 2);
|
||||||
|
|
||||||
// If we are using the worker we don't need a delivery interval
|
// If we are using the worker we don't need a delivery interval
|
||||||
if (get_config("system", "worker"))
|
if (get_config("system", "worker")) {
|
||||||
$interval = false;
|
$interval = false;
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
|
logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
|
||||||
|
|
|
@ -62,8 +62,9 @@ function queue_run(&$argv, &$argc){
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
logger('queue: deliverq');
|
logger('queue: deliverq');
|
||||||
proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
|
proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
|
||||||
if($interval)
|
if($interval) {
|
||||||
@time_sleep_until(microtime(true) + (float) $interval);
|
time_sleep_until(microtime(true) + (float) $interval);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue