From f3eebda4fa9e308eb00bb212a537632c4cbb85cb Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 7 Nov 2015 16:24:59 +0100 Subject: [PATCH] changed syntax to work with PHP 5.3 #2027 --- mod/videos.php | 8 ++++---- mod/wall_attach.php | 34 ++++++++++++++++++++++---------- mod/wall_upload.php | 47 +++++++++++++++++++++++++++++++++------------ 3 files changed, 63 insertions(+), 26 deletions(-) diff --git a/mod/videos.php b/mod/videos.php index a7d48cb751..4f5d7cd22d 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -113,10 +113,10 @@ function videos_post(&$a) { $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array( '$method' => 'post', '$message' => t('Do you really want to delete this video?'), - '$extra_inputs' => [ - ['name'=>'id', 'value'=> $_POST['id']], - ['name'=>'delete', 'value'=>'x'] - ], + '$extra_inputs' => array( + array('name'=>'id', 'value'=> $_POST['id']), + array('name'=>'delete', 'value'=>'x') + ), '$confirm' => t('Delete Video'), '$confirm_url' => $drop_url, '$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement diff --git a/mod/wall_attach.php b/mod/wall_attach.php index e11d749a3d..68752a0e1f 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -13,12 +13,18 @@ function wall_attach_post(&$a) { dbesc($nick) ); 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; } } 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; } @@ -57,13 +63,18 @@ function wall_attach_post(&$a) { } } 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 ); killme(); } 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(); } @@ -82,7 +93,7 @@ function wall_attach_post(&$a) { 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?')); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { notice( $msg. EOL ); } @@ -93,7 +104,7 @@ function wall_attach_post(&$a) { if(($maxfilesize) && ($filesize > $maxfilesize)) { $msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize)); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { echo $msg. EOL ; } @@ -110,7 +121,7 @@ function wall_attach_post(&$a) { if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { $msg = upgrade_message(true); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { echo $msg. EOL ; } @@ -144,7 +155,7 @@ function wall_attach_post(&$a) { if(! $r) { $msg = t('File upload failed.'); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { echo $msg. EOL ; } @@ -160,14 +171,17 @@ function wall_attach_post(&$a) { if(! count($r)) { $msg = t('File upload failed.'); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { echo $msg. EOL ; } killme(); } - if ($r_json) { echo json_encode(['ok'=>true]); killme(); } + if ($r_json) { + echo json_encode(array('ok'=>true)); + killme(); + } $lf = "\n"; diff --git a/mod/wall_upload.php b/mod/wall_upload.php index fce28c47d4..8e7eaa027f 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -16,7 +16,10 @@ function wall_upload_post(&$a, $desktopmode = true) { ); 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; } } else { @@ -26,7 +29,10 @@ function wall_upload_post(&$a, $desktopmode = true) { ); } } 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; } @@ -67,13 +73,18 @@ function wall_upload_post(&$a, $desktopmode = true) { 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 ); killme(); } 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(); } @@ -107,7 +118,10 @@ function wall_upload_post(&$a, $desktopmode = true) { } 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); killme(); } @@ -136,7 +150,7 @@ function wall_upload_post(&$a, $desktopmode = true) { if(($maximagesize) && ($filesize > $maximagesize)) { $msg = sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize)); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { echo $msg. EOL; } @@ -153,7 +167,7 @@ function wall_upload_post(&$a, $desktopmode = true) { if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { $msg = upgrade_message(true); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { echo $msg. EOL; } @@ -168,7 +182,7 @@ function wall_upload_post(&$a, $desktopmode = true) { if(! $ph->is_valid()) { $msg = t('Unable to process image.'); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { echo $msg. EOL; } @@ -201,7 +215,7 @@ function wall_upload_post(&$a, $desktopmode = true) { if(! $r) { $msg = t('Image upload failed.'); if ($r_json) { - echo json_encode(['error'=>$msg]); + echo json_encode(array('error'=>$msg)); } else { 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); if (!$r){ - if ($r_json) { echo json_encode(['error'=>'']); killme(); } + if ($r_json) { + echo json_encode(array('error'=>'')); + killme(); + } return false; } $picture = array(); @@ -242,11 +259,17 @@ function wall_upload_post(&$a, $desktopmode = true) { $picture["picture"] = $a->get_baseurl()."/photo/{$hash}-0.".$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; } - if ($r_json) { echo json_encode(['ok'=>true]); killme(); } + if ($r_json) { + echo json_encode(array('ok'=>true)); + killme(); + } /* mod Waitman Gobble NO WARRANTY */ -- 2.39.5