Applied fixes from StyleCI
This commit is contained in:

committed by
StyleCI Bot

parent
be5df5334f
commit
d637c2b23f
File diff suppressed because it is too large
Load Diff
@@ -14,5 +14,5 @@ return [
|
||||
*/
|
||||
|
||||
'previous' => '« Previous',
|
||||
'next' => 'Next »',
|
||||
'next' => 'Next »',
|
||||
];
|
||||
|
@@ -13,9 +13,9 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
"password" => "Passwords must be at least six characters and match the confirmation.",
|
||||
"user" => "We can't find a user with that e-mail address.",
|
||||
"token" => "This password reset token is invalid.",
|
||||
"sent" => "We have e-mailed your password reset link!",
|
||||
"reset" => "Your password has been reset!",
|
||||
'password' => 'Passwords must be at least six characters and match the confirmation.',
|
||||
'user' => "We can't find a user with that e-mail address.",
|
||||
'token' => 'This password reset token is invalid.',
|
||||
'sent' => 'We have e-mailed your password reset link!',
|
||||
'reset' => 'Your password has been reset!',
|
||||
];
|
||||
|
@@ -13,66 +13,66 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
"accepted" => "The :attribute must be accepted.",
|
||||
"active_url" => "The :attribute is not a valid URL.",
|
||||
"after" => "The :attribute must be a date after :date.",
|
||||
"alpha" => "The :attribute may only contain letters.",
|
||||
"alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
|
||||
"alpha_num" => "The :attribute may only contain letters and numbers.",
|
||||
"array" => "The :attribute must be an array.",
|
||||
"before" => "The :attribute must be a date before :date.",
|
||||
"between" => [
|
||||
"numeric" => "The :attribute must be between :min and :max.",
|
||||
"file" => "The :attribute must be between :min and :max kilobytes.",
|
||||
"string" => "The :attribute must be between :min and :max characters.",
|
||||
"array" => "The :attribute must have between :min and :max items.",
|
||||
'accepted' => 'The :attribute must be accepted.',
|
||||
'active_url' => 'The :attribute is not a valid URL.',
|
||||
'after' => 'The :attribute must be a date after :date.',
|
||||
'alpha' => 'The :attribute may only contain letters.',
|
||||
'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
|
||||
'alpha_num' => 'The :attribute may only contain letters and numbers.',
|
||||
'array' => 'The :attribute must be an array.',
|
||||
'before' => 'The :attribute must be a date before :date.',
|
||||
'between' => [
|
||||
'numeric' => 'The :attribute must be between :min and :max.',
|
||||
'file' => 'The :attribute must be between :min and :max kilobytes.',
|
||||
'string' => 'The :attribute must be between :min and :max characters.',
|
||||
'array' => 'The :attribute must have between :min and :max items.',
|
||||
],
|
||||
"boolean" => "The :attribute field must be true or false.",
|
||||
"confirmed" => "The :attribute confirmation does not match.",
|
||||
"date" => "The :attribute is not a valid date.",
|
||||
"date_format" => "The :attribute does not match the format :format.",
|
||||
"different" => "The :attribute and :other must be different.",
|
||||
"digits" => "The :attribute must be :digits digits.",
|
||||
"digits_between" => "The :attribute must be between :min and :max digits.",
|
||||
"email" => "The :attribute must be a valid email address.",
|
||||
"filled" => "The :attribute field is required.",
|
||||
"exists" => "The selected :attribute is invalid.",
|
||||
"image" => "The :attribute must be an image.",
|
||||
"in" => "The selected :attribute is invalid.",
|
||||
"integer" => "The :attribute must be an integer.",
|
||||
"ip" => "The :attribute must be a valid IP address.",
|
||||
"max" => [
|
||||
"numeric" => "The :attribute may not be greater than :max.",
|
||||
"file" => "The :attribute may not be greater than :max kilobytes.",
|
||||
"string" => "The :attribute may not be greater than :max characters.",
|
||||
"array" => "The :attribute may not have more than :max items.",
|
||||
'boolean' => 'The :attribute field must be true or false.',
|
||||
'confirmed' => 'The :attribute confirmation does not match.',
|
||||
'date' => 'The :attribute is not a valid date.',
|
||||
'date_format' => 'The :attribute does not match the format :format.',
|
||||
'different' => 'The :attribute and :other must be different.',
|
||||
'digits' => 'The :attribute must be :digits digits.',
|
||||
'digits_between' => 'The :attribute must be between :min and :max digits.',
|
||||
'email' => 'The :attribute must be a valid email address.',
|
||||
'filled' => 'The :attribute field is required.',
|
||||
'exists' => 'The selected :attribute is invalid.',
|
||||
'image' => 'The :attribute must be an image.',
|
||||
'in' => 'The selected :attribute is invalid.',
|
||||
'integer' => 'The :attribute must be an integer.',
|
||||
'ip' => 'The :attribute must be a valid IP address.',
|
||||
'max' => [
|
||||
'numeric' => 'The :attribute may not be greater than :max.',
|
||||
'file' => 'The :attribute may not be greater than :max kilobytes.',
|
||||
'string' => 'The :attribute may not be greater than :max characters.',
|
||||
'array' => 'The :attribute may not have more than :max items.',
|
||||
],
|
||||
"mimes" => "The :attribute must be a file of type: :values.",
|
||||
"min" => [
|
||||
"numeric" => "The :attribute must be at least :min.",
|
||||
"file" => "The :attribute must be at least :min kilobytes.",
|
||||
"string" => "The :attribute must be at least :min characters.",
|
||||
"array" => "The :attribute must have at least :min items.",
|
||||
'mimes' => 'The :attribute must be a file of type: :values.',
|
||||
'min' => [
|
||||
'numeric' => 'The :attribute must be at least :min.',
|
||||
'file' => 'The :attribute must be at least :min kilobytes.',
|
||||
'string' => 'The :attribute must be at least :min characters.',
|
||||
'array' => 'The :attribute must have at least :min items.',
|
||||
],
|
||||
"not_in" => "The selected :attribute is invalid.",
|
||||
"numeric" => "The :attribute must be a number.",
|
||||
"regex" => "The :attribute format is invalid.",
|
||||
"required" => "The :attribute field is required.",
|
||||
"required_if" => "The :attribute field is required when :other is :value.",
|
||||
"required_with" => "The :attribute field is required when :values is present.",
|
||||
"required_with_all" => "The :attribute field is required when :values is present.",
|
||||
"required_without" => "The :attribute field is required when :values is not present.",
|
||||
"required_without_all" => "The :attribute field is required when none of :values are present.",
|
||||
"same" => "The :attribute and :other must match.",
|
||||
"size" => [
|
||||
"numeric" => "The :attribute must be :size.",
|
||||
"file" => "The :attribute must be :size kilobytes.",
|
||||
"string" => "The :attribute must be :size characters.",
|
||||
"array" => "The :attribute must contain :size items.",
|
||||
'not_in' => 'The selected :attribute is invalid.',
|
||||
'numeric' => 'The :attribute must be a number.',
|
||||
'regex' => 'The :attribute format is invalid.',
|
||||
'required' => 'The :attribute field is required.',
|
||||
'required_if' => 'The :attribute field is required when :other is :value.',
|
||||
'required_with' => 'The :attribute field is required when :values is present.',
|
||||
'required_with_all' => 'The :attribute field is required when :values is present.',
|
||||
'required_without' => 'The :attribute field is required when :values is not present.',
|
||||
'required_without_all' => 'The :attribute field is required when none of :values are present.',
|
||||
'same' => 'The :attribute and :other must match.',
|
||||
'size' => [
|
||||
'numeric' => 'The :attribute must be :size.',
|
||||
'file' => 'The :attribute must be :size kilobytes.',
|
||||
'string' => 'The :attribute must be :size characters.',
|
||||
'array' => 'The :attribute must contain :size items.',
|
||||
],
|
||||
"unique" => "The :attribute has already been taken.",
|
||||
"url" => "The :attribute format is invalid.",
|
||||
"timezone" => "The :attribute must be a valid zone.",
|
||||
'unique' => 'The :attribute has already been taken.',
|
||||
'url' => 'The :attribute format is invalid.',
|
||||
'timezone' => 'The :attribute must be a valid zone.',
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Custom Validation Language Lines
|
||||
|
@@ -5,4 +5,3 @@
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
|
@@ -1,24 +1,24 @@
|
||||
<?php
|
||||
|
||||
//Check if we are getting the image
|
||||
if (isset($_FILES['image'])) {
|
||||
//Get the image array of details
|
||||
$img = $_FILES['image'];
|
||||
//The new path of the uploaded image, rand is just used for the sake of it
|
||||
$path = "upload/" . rand() . $img["name"];
|
||||
//Move the file to our new path
|
||||
move_uploaded_file($img['tmp_name'], $path);
|
||||
//Get image info, reuiqred to biuld the JSON object
|
||||
$data = getimagesize($path);
|
||||
//The direct link to the uploaded image, this might varyu depending on your script location
|
||||
$link = "http://$_SERVER[HTTP_HOST]" . "/codex/" . $path;
|
||||
//Here we are constructing the JSON Object
|
||||
$res = array("upload" => array(
|
||||
"links" => array("original" => $link),
|
||||
"image" => array("width" => $data[0],
|
||||
"height" => $data[1],
|
||||
),
|
||||
));
|
||||
//echo out the response :)
|
||||
echo json_encode($res);
|
||||
//Get the image array of details
|
||||
$img = $_FILES['image'];
|
||||
//The new path of the uploaded image, rand is just used for the sake of it
|
||||
$path = 'upload/'.rand().$img['name'];
|
||||
//Move the file to our new path
|
||||
move_uploaded_file($img['tmp_name'], $path);
|
||||
//Get image info, reuiqred to biuld the JSON object
|
||||
$data = getimagesize($path);
|
||||
//The direct link to the uploaded image, this might varyu depending on your script location
|
||||
$link = "http://$_SERVER[HTTP_HOST]".'/codex/'.$path;
|
||||
//Here we are constructing the JSON Object
|
||||
$res = ['upload' => [
|
||||
'links' => ['original' => $link],
|
||||
'image' => ['width' => $data[0],
|
||||
'height' => $data[1],
|
||||
],
|
||||
]];
|
||||
//echo out the response :)
|
||||
echo json_encode($res);
|
||||
}
|
||||
?>
|
@@ -1,24 +1,24 @@
|
||||
<?php
|
||||
|
||||
//Check if we are getting the image
|
||||
if (isset($_FILES['image'])) {
|
||||
//Get the image array of details
|
||||
$img = $_FILES['image'];
|
||||
//The new path of the uploaded image, rand is just used for the sake of it
|
||||
$path = "upload/" . rand() . $img["name"];
|
||||
//Move the file to our new path
|
||||
move_uploaded_file($img['tmp_name'], $path);
|
||||
//Get image info, reuiqred to biuld the JSON object
|
||||
$data = getimagesize($path);
|
||||
//The direct link to the uploaded image, this might varyu depending on your script location
|
||||
$link = "http://$_SERVER[HTTP_HOST]" . "/codex/" . $path;
|
||||
//Here we are constructing the JSON Object
|
||||
$res = array("upload" => array(
|
||||
"links" => array("original" => $link),
|
||||
"image" => array("width" => $data[0],
|
||||
"height" => $data[1],
|
||||
),
|
||||
));
|
||||
//echo out the response :)
|
||||
echo json_encode($res);
|
||||
//Get the image array of details
|
||||
$img = $_FILES['image'];
|
||||
//The new path of the uploaded image, rand is just used for the sake of it
|
||||
$path = 'upload/'.rand().$img['name'];
|
||||
//Move the file to our new path
|
||||
move_uploaded_file($img['tmp_name'], $path);
|
||||
//Get image info, reuiqred to biuld the JSON object
|
||||
$data = getimagesize($path);
|
||||
//The direct link to the uploaded image, this might varyu depending on your script location
|
||||
$link = "http://$_SERVER[HTTP_HOST]".'/codex/'.$path;
|
||||
//Here we are constructing the JSON Object
|
||||
$res = ['upload' => [
|
||||
'links' => ['original' => $link],
|
||||
'image' => ['width' => $data[0],
|
||||
'height' => $data[1],
|
||||
],
|
||||
]];
|
||||
//echo out the response :)
|
||||
echo json_encode($res);
|
||||
}
|
||||
?>
|
Reference in New Issue
Block a user