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

Merge pull request #2029 from tugelbend/develop

Browse source 
changed syntax to work with PHP 5.3 #2027
This commit is contained in:
Tobias Diekershoff 2015-11-07 16:34:13 +01:00
commit 83c45d8d4b
3 changed files with 63 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/videos.php
View file

@ -113,10 +113,10 @@ function videos_post(&$a) {
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array( $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
'$method' => 'post', '$method' => 'post',
'$message' => t('Do you really want to delete this video?'), '$message' => t('Do you really want to delete this video?'),
'$extra_inputs' => [ '$extra_inputs' => array(
['name'=>'id', 'value'=> $_POST['id']], array('name'=>'id', 'value'=> $_POST['id']),
['name'=>'delete', 'value'=>'x'] array('name'=>'delete', 'value'=>'x')
], ),
'$confirm' => t('Delete Video'), '$confirm' => t('Delete Video'),
'$confirm_url' => $drop_url, '$confirm_url' => $drop_url,
'$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement '$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement

34
mod/wall_attach.php
View file

@ -13,12 +13,18 @@ function wall_attach_post(&$a) {
dbesc($nick) dbesc($nick)
); );
if(! count($r)){ if(! count($r)){
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Invalid request.')));
killme();
}
return; return;
} }
} else { } else {
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Invalid request.')));
killme();
}
return; return;
} }
@ -57,13 +63,18 @@ function wall_attach_post(&$a) {
} }
} }
if(! $can_post) { if(! $can_post) {
if ($r_json) { echo json_encode(['error'=>t('Permission denied.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Permission denied.')));
killme();
}
notice( t('Permission denied.') . EOL ); notice( t('Permission denied.') . EOL );
killme(); killme();
} }
if(! x($_FILES,'userfile')) { if(! x($_FILES,'userfile')) {
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Invalid request.')));
}
killme(); killme();
} }
@ -82,7 +93,7 @@ function wall_attach_post(&$a) {
if($filesize <=0) { if($filesize <=0) {
$msg = t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?')); $msg = t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?'));
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
notice( $msg. EOL ); notice( $msg. EOL );
} }
@ -93,7 +104,7 @@ function wall_attach_post(&$a) {
if(($maxfilesize) && ($filesize > $maxfilesize)) { if(($maxfilesize) && ($filesize > $maxfilesize)) {
$msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize)); $msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize));
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
echo $msg. EOL ; echo $msg. EOL ;
} }
@ -110,7 +121,7 @@ function wall_attach_post(&$a) {
if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
$msg = upgrade_message(true); $msg = upgrade_message(true);
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
echo $msg. EOL ; echo $msg. EOL ;
} }
@ -144,7 +155,7 @@ function wall_attach_post(&$a) {
if(! $r) { if(! $r) {
$msg = t('File upload failed.'); $msg = t('File upload failed.');
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
echo $msg. EOL ; echo $msg. EOL ;
} }
@ -160,14 +171,17 @@ function wall_attach_post(&$a) {
if(! count($r)) { if(! count($r)) {
$msg = t('File upload failed.'); $msg = t('File upload failed.');
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
echo $msg. EOL ; echo $msg. EOL ;
} }
killme(); killme();
} }
if ($r_json) { echo json_encode(['ok'=>true]); killme(); } if ($r_json) {
echo json_encode(array('ok'=>true));
killme();
}
$lf = "\n"; $lf = "\n";

47
mod/wall_upload.php
View file

@ -16,7 +16,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
); );
if(! count($r)){ if(! count($r)){
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Invalid request.')));
killme();
}
return; return;
} }
} else { } else {
@ -26,7 +29,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
); );
} }
} else { } else {
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Invalid request.')));
killme();
}
return; return;
} }
@ -67,13 +73,18 @@ function wall_upload_post(&$a, $desktopmode = true) {
if(! $can_post) { if(! $can_post) {
if ($r_json) { echo json_encode(['error'=>t('Permission denied.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Permission denied.')));
killme();
}
notice( t('Permission denied.') . EOL ); notice( t('Permission denied.') . EOL );
killme(); killme();
} }
if(! x($_FILES,'userfile') && ! x($_FILES,'media')){ if(! x($_FILES,'userfile') && ! x($_FILES,'media')){
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Invalid request.')));
}
killme(); killme();
} }
@ -107,7 +118,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
} }
if ($src=="") { if ($src=="") {
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); } if ($r_json) {
echo json_encode(array('error'=>t('Invalid request.')));
killme();
}
notice(t('Invalid request.').EOL); notice(t('Invalid request.').EOL);
killme(); killme();
} }
@ -136,7 +150,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
if(($maximagesize) && ($filesize > $maximagesize)) { if(($maximagesize) && ($filesize > $maximagesize)) {
$msg = sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize)); $msg = sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize));
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
echo $msg. EOL; echo $msg. EOL;
} }
@ -153,7 +167,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
$msg = upgrade_message(true); $msg = upgrade_message(true);
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
echo $msg. EOL; echo $msg. EOL;
} }
@ -168,7 +182,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
if(! $ph->is_valid()) { if(! $ph->is_valid()) {
$msg = t('Unable to process image.'); $msg = t('Unable to process image.');
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
echo $msg. EOL; echo $msg. EOL;
} }
@ -201,7 +215,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
if(! $r) { if(! $r) {
$msg = t('Image upload failed.'); $msg = t('Image upload failed.');
if ($r_json) { if ($r_json) {
echo json_encode(['error'=>$msg]); echo json_encode(array('error'=>$msg));
} else { } else {
echo $msg. EOL; echo $msg. EOL;
} }
@ -228,7 +242,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
$r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo` WHERE `resource-id` = '%s' ORDER BY `width` DESC LIMIT 1", $hash); $r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo` WHERE `resource-id` = '%s' ORDER BY `width` DESC LIMIT 1", $hash);
if (!$r){ if (!$r){
if ($r_json) { echo json_encode(['error'=>'']); killme(); } if ($r_json) {
echo json_encode(array('error'=>''));
killme();
}
return false; return false;
} }
$picture = array(); $picture = array();
@ -242,11 +259,17 @@ function wall_upload_post(&$a, $desktopmode = true) {
$picture["picture"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt(); $picture["picture"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
$picture["preview"] = $a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt(); $picture["preview"] = $a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt();
if ($r_json) { echo json_encode(['picture'=>$picture]); killme(); } if ($r_json) {
echo json_encode(array('picture'=>$picture));
killme();
}
return $picture; return $picture;
} }
if ($r_json) { echo json_encode(['ok'=>true]); killme(); } if ($r_json) {
echo json_encode(array('ok'=>true));
killme();
}
/* mod Waitman Gobble NO WARRANTY */ /* mod Waitman Gobble NO WARRANTY */