diff --git a/.dependabot/config.yml b/.dependabot/config.yml new file mode 100644 index 000000000..7fd3c76df --- /dev/null +++ b/.dependabot/config.yml @@ -0,0 +1,31 @@ +version: 1 + +update_configs: + - package_manager: "php:composer" + directory: "/" + update_schedule: "daily" + # Supported update schedule: live daily weekly monthly + target_branch: "staging" + version_requirement_updates: "auto" + # Supported version requirements: auto widen_ranges increase_versions increase_versions_if_necessary + allowed_updates: + - match: + dependency_type: "all" + # Supported dependency types: all indirect direct production development + update_type: "all" + # Supported update types: all security + + - package_manager: "javascript" + directory: "/" + update_schedule: "daily" + # Supported update schedule: live daily weekly monthly + target_branch: "staging" + version_requirement_updates: "auto" + # Supported version requirements: auto widen_ranges increase_versions increase_versions_if_necessary + allowed_updates: + - match: + dependency_type: "all" + # Supported dependency types: all indirect direct production development + update_type: "all" + # Supported update types: all security + diff --git a/.env.docker b/.env.docker new file mode 100644 index 000000000..63b7fc5c5 --- /dev/null +++ b/.env.docker @@ -0,0 +1,143 @@ +## Crypto +APP_KEY= + +## General Settings +APP_NAME="Pixelfed Prod" +APP_ENV=production +APP_DEBUG=false +APP_URL=https://real.domain +APP_DOMAIN="real.domain" +ADMIN_DOMAIN="real.domain" +SESSION_DOMAIN="real.domain" + +OPEN_REGISTRATION=true +ENFORCE_EMAIL_VERIFICATION=false +PF_MAX_USERS=1000 +OAUTH_ENABLED=true + +APP_TIMEZONE=UTC +APP_LOCALE=en + +## Pixelfed Tweaks +LIMIT_ACCOUNT_SIZE=true +MAX_ACCOUNT_SIZE=1000000 +MAX_PHOTO_SIZE=15000 +MAX_AVATAR_SIZE=2000 +MAX_CAPTION_LENGTH=500 +MAX_BIO_LENGTH=125 +MAX_NAME_LENGTH=30 +MAX_ALBUM_LENGTH=4 +IMAGE_QUALITY=80 +PF_OPTIMIZE_IMAGES=true +PF_OPTIMIZE_VIDEOS=true +ADMIN_ENV_EDITOR=false +ACCOUNT_DELETION=true +ACCOUNT_DELETE_AFTER=false +MAX_LINKS_PER_POST=0 + +## Instance +#INSTANCE_DESCRIPTION= +INSTANCE_PUBLIC_HASHTAGS=false +#INSTANCE_CONTACT_EMAIL= +INSTANCE_PUBLIC_LOCAL_TIMELINE=false +#BANNED_USERNAMES= +STORIES_ENABLED=false +RESTRICTED_INSTANCE=false + +## Mail +MAIL_DRIVER=log +MAIL_HOST=smtp.mailtrap.io +MAIL_PORT=2525 +MAIL_FROM_ADDRESS="pixelfed@example.com" +MAIL_FROM_NAME="Pixelfed" +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null + +## Databases (MySQL) +DB_CONNECTION=mysql +DB_HOST=127.0.0.1 +DB_PORT=3306 +DB_DATABASE=pixelfed +DB_USERNAME=pixelfed +DB_PASSWORD=pixelfed + +## Databases (Postgres) +#DB_CONNECTION=pgsql +#DB_HOST=postgres +#DB_PORT=5432 +#DB_DATABASE=pixelfed +#DB_USERNAME=postgres +#DB_PASSWORD=postgres + +## Cache (Redis) +REDIS_CLIENT=phpredis +REDIS_SCHEME=tcp +REDIS_HOST=redis +REDIS_PASSWORD=null +REDIS_PORT=6379 +REDIS_DATABASE=0 + +## EXPERIMENTS +EXP_LC=false +EXP_REC=false +EXP_LOOPS=false + +## ActivityPub Federation +ACTIVITY_PUB=false +AP_REMOTE_FOLLOW=false +AP_SHAREDINBOX=false +AP_INBOX=false +AP_OUTBOX=false +ATOM_FEEDS=true +NODEINFO=true +WEBFINGER=true + +## S3 +FILESYSTEM_DRIVER=local +FILESYSTEM_CLOUD=s3 +PF_ENABLE_CLOUD=false +#AWS_ACCESS_KEY_ID= +#AWS_SECRET_ACCESS_KEY= +#AWS_DEFAULT_REGION= +#AWS_BUCKET= +#AWS_URL= +#AWS_ENDPOINT= +#AWS_USE_PATH_STYLE_ENDPOINT=false + +## Horizon +HORIZON_DARKMODE=false + +## COSTAR - Confirm Object Sentiment Transform and Reduce +PF_COSTAR_ENABLED=false + +# Media +MEDIA_EXIF_DATABASE=false + +## Logging +LOG_CHANNEL=stack + +## Image +IMAGE_DRIVER=imagick + +## Broadcasting +BROADCAST_DRIVER=log # log driver for local development + +## Cache +CACHE_DRIVER=redis + +## Purify +RESTRICT_HTML_TYPES=true + +## Queue +QUEUE_DRIVER=redis + +## Session +SESSION_DRIVER=redis + +## Trusted Proxy +TRUST_PROXIES="*" + +## Passport +#PASSPORT_PRIVATE_KEY= +#PASSPORT_PUBLIC_KEY= \ No newline at end of file diff --git a/.env.example.docker b/.env.example.docker deleted file mode 100644 index 9e34cb859..000000000 --- a/.env.example.docker +++ /dev/null @@ -1,52 +0,0 @@ -APP_NAME="Pixelfed Prod" -APP_ENV=production -APP_KEY= -APP_DEBUG=false - -APP_URL=http://localhost -APP_DOMAIN="localhost" -ADMIN_DOMAIN="localhost" -SESSION_DOMAIN="localhost" -TRUST_PROXIES="*" - -LOG_CHANNEL=stack - -DB_CONNECTION=mysql -DB_HOST=db -DB_PORT=3306 -DB_DATABASE=pixelfed -DB_USERNAME=pixelfed -DB_PASSWORD=pixelfed - -BROADCAST_DRIVER=log -CACHE_DRIVER=redis -SESSION_DRIVER=redis -QUEUE_DRIVER=redis - -REDIS_SCHEME=tcp -REDIS_HOST=redis -REDIS_PASSWORD=null -REDIS_PORT=6379 - -MAIL_DRIVER=log -MAIL_HOST=smtp.mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS="pixelfed@example.com" -MAIL_FROM_NAME="Pixelfed" - -OPEN_REGISTRATION=true -ENFORCE_EMAIL_VERIFICATION=true -PF_MAX_USERS=1000 - -MAX_PHOTO_SIZE=15000 -MAX_CAPTION_LENGTH=150 -MAX_ALBUM_LENGTH=4 - -ACTIVITY_PUB=false -AP_REMOTE_FOLLOW=false -AP_INBOX=false -PF_COSTAR_ENABLED=false - diff --git a/CHANGELOG.md b/CHANGELOG.md index 2642f52cd..b006fc7d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.8...dev) ### Added +- Added Profile Following Search ([e3280c11](https://github.com/pixelfed/pixelfed/commit/e3280c11)) +- Added Trusted Devices to Sudo Mode ([0c82c970](https://github.com/pixelfed/pixelfed/commit/0c82c970)) +- Added reply modal to posts and timelines ([974e6bda](https://github.com/pixelfed/pixelfed/commit/974e6bda)) +- Added remote posts and profiles ([95bce31e](https://github.com/pixelfed/pixelfed/commit/95bce31e)) +- Added Labs deprecation page ([9b215001](https://github.com/pixelfed/pixelfed/commit/9b215001)) +- Added new landing page ([84e203a9](https://github.com/pixelfed/pixelfed/commit/84e203a9)) ### Fixed - Stories on postgres instances ([5ffa71da](https://github.com/pixelfed/pixelfed/commit/5ffa71da)) @@ -23,8 +29,34 @@ - Updated AdminUserController, add moderation method ([a4cf21ea](https://github.com/pixelfed/pixelfed/commit/a4cf21ea)) - Updated BaseApiController, invalidate session after account deletion ([826978ce](https://github.com/pixelfed/pixelfed/commit/826978ce)) - Updated AdminUserController, add account deletion handler ([9be19ad8](https://github.com/pixelfed/pixelfed/commit/9be19ad8)) -- Updated ContactController, fixes #2042 ([c9057e87](https://github.com/pixelfed/pixelfed/commit/c9057e87)) +- Updated ContactController, fixes [#2042](https://github.com/pixelfed/pixelfed/issues/2042) ([c9057e87](https://github.com/pixelfed/pixelfed/commit/c9057e87)) - Updated Media model, fix remote media preview ([9947050b](https://github.com/pixelfed/pixelfed/commit/9947050b)) +- Updated PostComponent, improve likes modal ([664fd272](https://github.com/pixelfed/pixelfed/commit/664fd272)) +- Updated StoryViewer, preload media ([336571d0](https://github.com/pixelfed/pixelfed/commit/336571d0)) +- Updated StoryCompose, add expand label for lightbox preview ([fdf59753](https://github.com/pixelfed/pixelfed/commit/fdf59753)) +- Updated session config, increase session timeout from 2 days to 60 days ([b8795271](https://github.com/pixelfed/pixelfed/commit/b8795271)) +- Updated WebfingerService, cache lookup ([8b9faf31](https://github.com/pixelfed/pixelfed/commit/8b9faf31)) +- Updated v1 notifications api, fix optional params ([4e3c952c](https://github.com/pixelfed/pixelfed/commit/4e3c952c)) +- Updated ApiV1Controller, fix unfavourite bug [#2088](https://github.com/pixelfed/pixelfed/issues/2088) ([3a828522](https://github.com/pixelfed/pixelfed/commit/3a828522)) +- Updated SharePipeline, fix item relation bug ([b5899648](https://github.com/pixelfed/pixelfed/commit/b5899648)) +- Updated Profile.vue, add v-once to thumbnails to prevent re-render ([a54685f6](https://github.com/pixelfed/pixelfed/commit/a54685f6)) +- Updated SearchResults.vue, improve layout ([7e41b4ae](https://github.com/pixelfed/pixelfed/commit/7e41b4ae)) +- Updated PostMenu.vue, fix styling of list-group ([4c3b0b7d](https://github.com/pixelfed/pixelfed/commit/4c3b0b7d)) +- Updated PostComponent.vue, update styling ([844566b9](https://github.com/pixelfed/pixelfed/commit/844566b9)) +- Updated NotificationCard.vue, fix share notifications ([3cb676b1](https://github.com/pixelfed/pixelfed/commit/3cb676b1)) +- Updated PostComponent.vue, remove like count from title, fixes [#2091](https://github.com/pixelfed/pixelfed/issues/2091) ([6026998c](https://github.com/pixelfed/pixelfed/commit/6026998c)) +- Updated SearchController, add WebfingerService support ([869b4ff7](https://github.com/pixelfed/pixelfed/commit/869b4ff7)) +- Updated Profile model, use change_count for version ([0eae9f8b](https://github.com/pixelfed/pixelfed/commit/0eae9f8b)) +- Updated Timeline.vue, add remote post/profile links ([d4147083](https://github.com/pixelfed/pixelfed/commit/d4147083)) +- Updated StoryTimelineComponent, added list prop for new timeline layout ([1692a95a](https://github.com/pixelfed/pixelfed/commit/1692a95a)) +- Updated blank layout, add sharedData js ([4a293ed9](https://github.com/pixelfed/pixelfed/commit/4a293ed9)) +- Updated oauth api, allow multiple redirect_uris. Fixes #[2106](https://github.com/pixelfed/pixelfed/issues/2106) ([0540a28a](https://github.com/pixelfed/pixelfed/commit/0540a28a)) +- Updated ActivityPub Outbox, fixes #[2100](https://github.com/pixelfed/pixelfed/issues/2100) ([c84cee5a](https://github.com/pixelfed/pixelfed/commit/c84cee5a)) +- Updated ApiV1Controller, fixes #[2112](https://github.com/pixelfed/pixelfed/issues/2112) ([324ccd0a](https://github.com/pixelfed/pixelfed/commit/324ccd0a)) +- Updated StatusTransformer, fixes #[2113](https://github.com/pixelfed/pixelfed/issues/2113) ([eefa6e0d](https://github.com/pixelfed/pixelfed/commit/eefa6e0d)) +- Updated InternalApiController, limit remote profile ui to remote profiles ([d918a68e](https://github.com/pixelfed/pixelfed/commit/d918a68e)) +- Updated NotificationCard, fix pagination bug #[2019](https://github.com/pixelfed/pixelfed/issues/2019) ([32beaad5](https://github.com/pixelfed/pixelfed/commit/32beaad5)) + ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8) ### Added @@ -39,6 +71,7 @@ - Fixed TRUST_PROXIES configuration ([#1941](https://github.com/pixelfed/pixelfed/pull/1941)) - Fixed settings page default language ([4223a11e](https://github.com/pixelfed/pixelfed/commit/4223a11e)) - Fixed DeleteAccountPipeline bug that did not use proper media paths ([578d2f35](https://github.com/pixelfed/pixelfed/commit/578d2f35)) +- Fixed mastoapi StatusTransformer, fix in_reply_to_id cast to string instead of int ([6ed00c94](https://github.com/pixelfed/pixelfed/commit/6ed00c94)) ### Updated - Updated presenter components, load fallback image on errors ([273170c5](https://github.com/pixelfed/pixelfed/commit/273170c5)) diff --git a/app/Console/Commands/StoryGC.php b/app/Console/Commands/StoryGC.php index 82eda89f9..685714a75 100644 --- a/app/Console/Commands/StoryGC.php +++ b/app/Console/Commands/StoryGC.php @@ -54,7 +54,7 @@ class StoryGC extends Command { $day = now()->day; - if($day !== 3) { + if($day != 3) { return; } @@ -81,12 +81,12 @@ class StoryGC extends Command protected function deleteViews() { - StoryView::where('created_at', '<', now()->subDays(2))->delete(); + StoryView::where('created_at', '<', now()->subMinutes(1441))->delete(); } protected function deleteStories() { - $stories = Story::where('expires_at', '<', now())->take(50)->get(); + $stories = Story::where('created_at', '<', now()->subMinutes(1441))->take(50)->get(); if($stories->count() == 0) { exit; diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index dac8078a6..6f136c3ad 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -374,10 +374,13 @@ class AccountController extends Controller public function sudoModeVerify(Request $request) { $this->validate($request, [ - 'password' => 'required|string|max:500' + 'password' => 'required|string|max:500', + 'trustDevice' => 'nullable' ]); + $user = Auth::user(); $password = $request->input('password'); + $trustDevice = $request->input('trustDevice') == 'on'; $next = $request->session()->get('redirectNext', '/'); if($request->session()->has('sudoModeAttempts')) { $count = (int) $request->session()->get('sudoModeAttempts'); @@ -387,6 +390,9 @@ class AccountController extends Controller } if(password_verify($password, $user->password) === true) { $request->session()->put('sudoMode', time()); + if($trustDevice == true) { + $request->session()->put('sudoTrustDevice', 1); + } return redirect($next); } else { return redirect() diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 3d32630f9..1a9e4220f 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -70,11 +70,13 @@ class ApiV1Controller extends Controller 'website' => 'nullable' ]); + $uris = implode(',', explode('\n', $request->redirect_uris)); + $client = Passport::client()->forceFill([ 'user_id' => null, 'name' => e($request->client_name), 'secret' => Str::random(40), - 'redirect' => $request->redirect_uris, + 'redirect' => $uris, 'personal_access_client' => false, 'password_client' => false, 'revoked' => false, @@ -828,7 +830,7 @@ class ApiV1Controller extends Controller ->first(); if($like) { - $like->delete(); + $like->forceDelete(); $status->likes_count = $status->likes()->count(); $status->save(); } @@ -1226,7 +1228,9 @@ class ApiV1Controller extends Controller $min = $request->input('min_id'); $max = $request->input('max_id'); - abort_if(!$since && !$min && !$max, 400); + if(!$since && !$min && !$max) { + $min = 1; + } $dir = $since ? '>' : ($min ? '>=' : '<'); $id = $since ?? $min ?? $max; @@ -1238,6 +1242,9 @@ class ApiV1Controller extends Controller ->limit($limit) ->get(); + $minId = $notifications->min('id'); + $maxId = $notifications->max('id'); + $resource = new Fractal\Resource\Collection( $notifications, new NotificationTransformer() @@ -1247,7 +1254,33 @@ class ApiV1Controller extends Controller ->createData($resource) ->toArray(); - return response()->json($res); + $baseUrl = config('app.url') . '/api/v1/notifications?'; + + if($minId == $maxId) { + $minId = null; + } + + if($maxId) { + $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next"'; + } + + if($minId) { + $link = '<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; + } + + if($maxId && $minId) { + $link = '<'.$baseUrl.'max_id='.$maxId.'>; rel="next",<'.$baseUrl.'min_id='.$minId.'>; rel="prev"'; + } + + $res = response()->json($res); + + if(isset($link)) { + $res->withHeaders([ + 'Link' => $link, + ]); + } + + return $res; } /** @@ -1655,8 +1688,8 @@ class ApiV1Controller extends Controller $status = new Status; $status->caption = strip_tags($request->input('status')); - $status->scope = $request->input('visibility'); - $status->visibility = $request->input('visibility'); + $status->scope = $request->input('visibility', 'public'); + $status->visibility = $request->input('visibility', 'public'); $status->profile_id = $user->profile_id; $status->is_nsfw = $user->profile->cw == true ? true : $request->input('sensitive', false); $status->in_reply_to_id = $parent->id; @@ -1690,8 +1723,8 @@ class ApiV1Controller extends Controller abort(500, 'Invalid media ids'); } - $status->scope = $request->input('visibility'); - $status->visibility = $request->input('visibility'); + $status->scope = $request->input('visibility', 'public'); + $status->visibility = $request->input('visibility', 'public'); $status->type = StatusController::mimeTypeCheck($mimes); $status->save(); } @@ -1756,7 +1789,9 @@ class ApiV1Controller extends Controller $share = Status::firstOrCreate([ 'profile_id' => $user->profile_id, 'reblog_of_id' => $status->id, - 'in_reply_to_profile_id' => $status->profile_id + 'in_reply_to_profile_id' => $status->profile_id, + 'scope' => 'public', + 'visibility' => 'public' ]); if($share->wasRecentlyCreated == true) { diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php index a21f556d6..8b7292c07 100644 --- a/app/Http/Controllers/FederationController.php +++ b/app/Http/Controllers/FederationController.php @@ -80,9 +80,19 @@ class FederationController extends Controller abort_if(!config('federation.activitypub.enabled'), 404); abort_if(!config('federation.activitypub.outbox'), 404); - $res = Outbox::get($username); + $profile = Profile::whereNull('domain') + ->whereNull('status') + ->whereIsPrivate(false) + ->whereUsername($username) + ->firstOrFail(); - return response(json_encode($res))->header('Content-Type', 'application/activity+json'); + $key = 'ap:outbox:latest_10:pid:' . $profile->id; + $ttl = now()->addMinutes(15); + $res = Cache::remember($key, $ttl, function() use($profile) { + return Outbox::get($profile); + }); + + return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json'); } public function userInbox(Request $request, $username) diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php index 541988bf5..1706b73ce 100644 --- a/app/Http/Controllers/InternalApiController.php +++ b/app/Http/Controllers/InternalApiController.php @@ -343,27 +343,6 @@ class InternalApiController extends Controller return response()->json($res); } - public function remoteProfile(Request $request, $id) - { - $profile = Profile::whereNull('status') - ->whereNotNull('domain') - ->findOrFail($id); - - $settings = [ - 'crawlable' => false, - 'following' => [ - 'count' => true, - 'list' => false - ], - 'followers' => [ - 'count' => true, - 'list' => false - ] - ]; - - return view('profile.show', compact('profile', 'settings')); - } - public function accountStatuses(Request $request, $id) { $this->validate($request, [ @@ -440,6 +419,16 @@ class InternalApiController extends Controller return response()->json($res); } + public function remoteProfile(Request $request, $id) + { + $profile = Profile::whereNull('status') + ->whereNotNull('domain') + ->findOrFail($id); + $user = Auth::user(); + + return view('profile.remote', compact('profile', 'user')); + } + public function remoteStatus(Request $request, $profileId, $statusId) { $user = Profile::whereNull('status') @@ -450,7 +439,7 @@ class InternalApiController extends Controller ->whereNull('reblog_of_id') ->whereVisibility('public') ->findOrFail($statusId); - $template = $status->in_reply_to_id ? 'status.reply' : 'status.show'; + $template = $status->in_reply_to_id ? 'status.reply' : 'status.remote'; return view($template, compact('user', 'status')); } } diff --git a/app/Http/Controllers/LikeController.php b/app/Http/Controllers/LikeController.php index 139ecb5d7..fa3caaf7c 100644 --- a/app/Http/Controllers/LikeController.php +++ b/app/Http/Controllers/LikeController.php @@ -25,7 +25,7 @@ class LikeController extends Controller $user = Auth::user(); $profile = $user->profile; - $status = Status::withCount('likes')->findOrFail($request->input('item')); + $status = Status::findOrFail($request->input('item')); $count = $status->likes_count; @@ -36,14 +36,16 @@ class LikeController extends Controller $status->likes_count = $count; $status->save(); } else { - $like = new Like(); - $like->profile_id = $profile->id; - $like->status_id = $status->id; - $like->save(); - $count++; - $status->likes_count = $count; - $status->save(); - LikePipeline::dispatch($like); + $like = Like::firstOrCreate([ + 'profile_id' => $user->profile_id, + 'status_id' => $status->id + ]); + if($like->wasRecentlyCreated == true) { + $count++; + $status->likes_count = $count; + $status->save(); + LikePipeline::dispatch($like); + } } Cache::forget('status:'.$status->id.':likedby:userid:'.$user->id); diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index 7c7f19464..8ed3be375 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -20,7 +20,7 @@ use League\Fractal; use App\Transformer\Api\{ AccountTransformer, RelationshipTransformer, - StatusTransformer, + StatusTransformer }; use App\Services\{ AccountService, @@ -239,39 +239,6 @@ class PublicApiController extends Controller $max = $request->input('max_id'); $limit = $request->input('limit') ?? 3; - $private = Cache::remember('profiles:private', now()->addMinutes(1440), function() { - return Profile::whereIsPrivate(true) - ->orWhere('unlisted', true) - ->orWhere('status', '!=', null) - ->pluck('id') - ->toArray(); - }); - - // if(Auth::check()) { - // // $pid = Auth::user()->profile->id; - // // $filters = UserFilter::whereUserId($pid) - // // ->whereFilterableType('App\Profile') - // // ->whereIn('filter_type', ['mute', 'block']) - // // ->pluck('filterable_id')->toArray(); - // // $filtered = array_merge($private->toArray(), $filters); - // $filtered = UserFilterService::filters(Auth::user()->profile_id); - // } else { - // // $filtered = $private->toArray(); - // $filtered = []; - // } - - $filtered = Auth::check() ? array_merge($private, UserFilterService::filters(Auth::user()->profile_id)) : []; - // if($max == 0) { - // $res = PublicTimelineService::count(); - // if($res == 0) { - // PublicTimelineService::warmCache(); - // $res = PublicTimelineService::get(0,4); - // } else { - // $res = PublicTimelineService::get(0,4); - // } - // return response()->json($res); - // } - if($min || $max) { $dir = $min ? '>' : '<'; $id = $min ?? $max; @@ -295,15 +262,12 @@ class PublicApiController extends Controller 'created_at', 'updated_at' )->where('id', $dir, $id) - ->with('profile', 'hashtags', 'mentions') ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) ->whereLocal(true) - ->whereNotIn('profile_id', $filtered) ->whereVisibility('public') ->orderBy('created_at', 'desc') ->limit($limit) ->get(); - //->toSql(); } else { $timeline = Status::select( 'id', @@ -327,11 +291,9 @@ class PublicApiController extends Controller )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) ->with('profile', 'hashtags', 'mentions') ->whereLocal(true) - ->whereNotIn('profile_id', $filtered) ->whereVisibility('public') ->orderBy('created_at', 'desc') ->simplePaginate($limit); - //->toSql(); } $fractal = new Fractal\Resource\Collection($timeline, new StatusTransformer()); @@ -499,11 +461,31 @@ class PublicApiController extends Controller public function accountFollowing(Request $request, $id) { abort_unless(Auth::check(), 403); - $profile = Profile::with('user')->whereNull('status')->whereNull('domain')->findOrFail($id); - if(Auth::id() != $profile->user_id && $profile->is_private || !$profile->user->settings->show_profile_following) { - return response()->json([]); + + $profile = Profile::with('user') + ->whereNull('status') + ->whereNull('domain') + ->findOrFail($id); + + // filter by username + $search = $request->input('fbu'); + $owner = Auth::id() == $profile->user_id; + $filter = ($owner == true) && ($search != null); + + abort_if($owner == false && $profile->is_private == true && !$profile->followedBy(Auth::user()->profile), 404); + abort_if($profile->user->settings->show_profile_following == false && $owner == false, 404); + + if($search) { + abort_if(!$owner, 404); + $following = $profile->following() + ->where('profiles.username', 'like', '%'.$search.'%') + ->orderByDesc('followers.created_at') + ->paginate(10); + } else { + $following = $profile->following() + ->orderByDesc('followers.created_at') + ->paginate(10); } - $following = $profile->following()->orderByDesc('followers.created_at')->paginate(10); $resource = new Fractal\Resource\Collection($following, new AccountTransformer()); $res = $this->fractal->createData($resource)->toArray(); @@ -574,8 +556,6 @@ class PublicApiController extends Controller 'updated_at' )->whereProfileId($profile->id) ->whereIn('type', $scope) - ->whereLocal(true) - ->whereNull('uri') ->where('id', $dir, $id) ->whereIn('visibility', $visibility) ->latest() diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 064afd86f..be506ea4e 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -15,9 +15,15 @@ use App\Transformer\Api\{ HashtagTransformer, StatusTransformer, }; +use App\Services\WebfingerService; class SearchController extends Controller { + public $tokens = []; + public $term = ''; + public $hash = ''; + public $cacheKey = 'api:search:tag:'; + public function __construct() { $this->middleware('auth'); @@ -28,50 +34,98 @@ class SearchController extends Controller $this->validate($request, [ 'q' => 'required|string|min:3|max:120', 'src' => 'required|string|in:metro', - 'v' => 'required|integer|in:1' + 'v' => 'required|integer|in:1', + 'scope' => 'required|in:all,hashtag,profile,remote,webfinger' ]); - $tag = $request->input('q'); - $tag = e(urldecode($tag)); + $scope = $request->input('scope') ?? 'all'; + $this->term = e(urldecode($request->input('q'))); + $this->hash = hash('sha256', $this->term); + + switch ($scope) { + case 'all': + $this->getHashtags(); + $this->getPosts(); + $this->getProfiles(); + break; + + case 'hashtag': + $this->getHashtags(); + break; + + case 'profile': + $this->getProfiles(); + break; + + case 'webfinger': + $this->webfingerSearch(); + break; + + default: + break; + } + + return response()->json($this->tokens, 200, [], JSON_PRETTY_PRINT); + } + + protected function getPosts() + { + $tag = $this->term; $hash = hash('sha256', $tag); - $tokens = Cache::remember('api:search:tag:'.$hash, now()->addMinutes(5), function () use ($tag) { - $tokens = []; - if(Helpers::validateUrl($tag) != false && config('federation.activitypub.enabled') == true && config('federation.activitypub.remoteFollow') == true) { - abort_if(Helpers::validateLocalUrl($tag), 404); - $remote = Helpers::fetchFromUrl($tag); - if(isset($remote['type']) && in_array($remote['type'], ['Note', 'Person']) == true) { - $type = $remote['type']; - if($type == 'Person') { - $item = Helpers::profileFirstOrNew($tag); - $tokens['profiles'] = [[ - 'count' => 1, - 'url' => $item->url(), - 'type' => 'profile', - 'value' => $item->username, - 'tokens' => [$item->username], - 'name' => $item->name, - 'entity' => [ - 'id' => (string) $item->id, - 'following' => $item->followedBy(Auth::user()->profile), - 'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id), - 'thumb' => $item->avatarUrl(), - 'local' => (bool) !$item->domain - ] - ]]; - } else if ($type == 'Note') { - $item = Helpers::statusFetch($tag); - $tokens['posts'] = [[ - 'count' => 0, - 'url' => $item->url(), - 'type' => 'status', - 'value' => "by {$item->profile->username} {$item->created_at->diffForHumans(null, true, true)}", - 'tokens' => [$item->caption], - 'name' => $item->caption, - 'thumb' => $item->thumb(), - ]]; - } - } + if( Helpers::validateUrl($tag) != false && + Helpers::validateLocalUrl($tag) != true && + config('federation.activitypub.enabled') == true && + config('federation.activitypub.remoteFollow') == true + ) { + $remote = Helpers::fetchFromUrl($tag); + if( isset($remote['type']) && + $remote['type'] == 'Note') { + $item = Helpers::statusFetch($tag); + $this->tokens['posts'] = [[ + 'count' => 0, + 'url' => $item->url(), + 'type' => 'status', + 'value' => "by {$item->profile->username} {$item->created_at->diffForHumans(null, true, true)}", + 'tokens' => [$item->caption], + 'name' => $item->caption, + 'thumb' => $item->thumb(), + ]]; } + } else { + $posts = Status::select('id', 'profile_id', 'caption', 'created_at') + ->whereHas('media') + ->whereNull('in_reply_to_id') + ->whereNull('reblog_of_id') + ->whereProfileId(Auth::user()->profile_id) + ->where('caption', 'like', '%'.$tag.'%') + ->latest() + ->limit(10) + ->get(); + + if($posts->count() > 0) { + $posts = $posts->map(function($item, $key) { + return [ + 'count' => 0, + 'url' => $item->url(), + 'type' => 'status', + 'value' => "by {$item->profile->username} {$item->created_at->diffForHumans(null, true, true)}", + 'tokens' => [$item->caption], + 'name' => $item->caption, + 'thumb' => $item->thumb(), + 'filter' => $item->firstMedia()->filter_class + ]; + }); + $this->tokens['posts'] = $posts; + } + } + } + + protected function getHashtags() + { + $tag = $this->term; + $key = $this->cacheKey . 'hashtags:' . $this->hash; + $ttl = now()->addMinutes(1); + $tokens = Cache::remember($key, $ttl, function() use($tag) { $htag = Str::startsWith($tag, '#') == true ? mb_substr($tag, 1) : $tag; $hashtags = Hashtag::select('id', 'name', 'slug') ->where('slug', 'like', '%'.$htag.'%') @@ -89,72 +143,93 @@ class SearchController extends Controller 'name' => null, ]; }); - $tokens['hashtags'] = $tags; + return $tags; } - return $tokens; }); - $users = Profile::select('domain', 'username', 'name', 'id') - ->whereNull('status') - ->whereNull('domain') - ->where('id', '!=', Auth::user()->profile->id) - ->where('username', 'like', '%'.$tag.'%') - //->orWhere('remote_url', $tag) - ->limit(20) - ->get(); + $this->tokens['hashtags'] = $tokens; + } - if($users->count() > 0) { - $profiles = $users->map(function ($item, $key) { - return [ - 'count' => 0, - 'url' => $item->url(), - 'type' => 'profile', - 'value' => $item->username, - 'tokens' => [$item->username], - 'name' => $item->name, - 'avatar' => $item->avatarUrl(), - 'id' => $item->id, - 'entity' => [ - 'id' => (string) $item->id, - 'following' => $item->followedBy(Auth::user()->profile), - 'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id), - 'thumb' => $item->avatarUrl(), - 'local' => (bool) !$item->domain - ] - ]; - }); - if(isset($tokens['profiles'])) { - array_push($tokens['profiles'], $profiles); - } else { - $tokens['profiles'] = $profiles; + protected function getProfiles() + { + $tag = $this->term; + $remoteKey = $this->cacheKey . 'profiles:remote:' . $this->hash; + $key = $this->cacheKey . 'profiles:' . $this->hash; + $remoteTtl = now()->addMinutes(15); + $ttl = now()->addHours(2); + if( Helpers::validateUrl($tag) != false && + Helpers::validateLocalUrl($tag) != true && + config('federation.activitypub.enabled') == true && + config('federation.activitypub.remoteFollow') == true + ) { + $remote = Helpers::fetchFromUrl($tag); + if( isset($remote['type']) && + $remote['type'] == 'Person' + ) { + $this->tokens['profiles'] = Cache::remember($remoteKey, $remoteTtl, function() use($tag) { + $item = Helpers::profileFirstOrNew($tag); + $tokens = [[ + 'count' => 1, + 'url' => $item->url(), + 'type' => 'profile', + 'value' => $item->username, + 'tokens' => [$item->username], + 'name' => $item->name, + 'entity' => [ + 'id' => (string) $item->id, + 'following' => $item->followedBy(Auth::user()->profile), + 'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id), + 'thumb' => $item->avatarUrl(), + 'local' => (bool) !$item->domain + ] + ]]; + return $tokens; + }); } - } - $posts = Status::select('id', 'profile_id', 'caption', 'created_at') - ->whereHas('media') - ->whereNull('in_reply_to_id') - ->whereNull('reblog_of_id') - ->whereProfileId(Auth::user()->profile->id) - ->where('caption', 'like', '%'.$tag.'%') - ->latest() - ->limit(10) + } + // elseif( Str::containsAll($tag, ['@', '.']) + // config('federation.activitypub.enabled') == true && + // config('federation.activitypub.remoteFollow') == true + // ) { + // if(substr_count($tag, '@') == 2) { + // $domain = last(explode('@', sub_str($u, 1))); + // } else { + // $domain = last(explode('@', $u)); + // } + + // } + else { + $this->tokens['profiles'] = Cache::remember($key, $ttl, function() use($tag) { + $users = Profile::select('domain', 'username', 'name', 'id') + ->whereNull('status') + ->where('id', '!=', Auth::user()->profile->id) + ->where('username', 'like', '%'.$tag.'%') + ->limit(20) ->get(); - if($posts->count() > 0) { - $posts = $posts->map(function($item, $key) { - return [ - 'count' => 0, - 'url' => $item->url(), - 'type' => 'status', - 'value' => "by {$item->profile->username} {$item->created_at->diffForHumans(null, true, true)}", - 'tokens' => [$item->caption], - 'name' => $item->caption, - 'thumb' => $item->thumb(), - 'filter' => $item->firstMedia()->filter_class - ]; + if($users->count() > 0) { + return $users->map(function ($item, $key) { + return [ + 'count' => 0, + 'url' => $item->url(), + 'type' => 'profile', + 'value' => $item->username, + 'tokens' => [$item->username], + 'name' => $item->name, + 'avatar' => $item->avatarUrl(), + 'id' => (string) $item->id, + 'entity' => [ + 'id' => (string) $item->id, + 'following' => $item->followedBy(Auth::user()->profile), + 'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id), + 'thumb' => $item->avatarUrl(), + 'local' => (bool) !$item->domain, + 'post_count' => $item->statuses()->count() + ] + ]; + }); + } }); - $tokens['posts'] = $posts; } - - return response()->json($tokens); } public function results(Request $request) @@ -166,4 +241,31 @@ class SearchController extends Controller return view('search.results'); } -} + protected function webfingerSearch() + { + $wfs = WebfingerService::lookup($this->term); + + if(empty($wfs)) { + return; + } + + $this->tokens['profiles'] = [ + [ + 'count' => 1, + 'url' => $wfs['url'], + 'type' => 'profile', + 'value' => $wfs['username'], + 'tokens' => [$wfs['username']], + 'name' => $wfs['display_name'], + 'entity' => [ + 'id' => (string) $wfs['id'], + 'following' => null, + 'follow_request' => null, + 'thumb' => $wfs['avatar'], + 'local' => (bool) $wfs['local'] + ] + ] + ]; + return; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index b44a6761d..6e58999e5 100644 --- a/app/Http/Controllers/SiteController.php +++ b/app/Http/Controllers/SiteController.php @@ -22,7 +22,16 @@ class SiteController extends Controller public function homeGuest() { - return view('site.index'); + $data = Cache::remember('site:landing:data', now()->addHours(3), function() { + return [ + 'stats' => [ + 'posts' => App\Util\Lexer\PrettyNumber::convert(App\Status::count()), + 'likes' => App\Util\Lexer\PrettyNumber::convert(App\Like::count()), + 'hashtags' => App\Util\Lexer\PrettyNumber::convert(App\StatusHashtag::count()) + ], + ]; + }); + return view('site.index', compact('data')); } public function homeTimeline(Request $request) @@ -105,7 +114,7 @@ class SiteController extends Controller $this->validate($request, [ 'url' => 'required|url' ]); - $url = urldecode(request()->input('url')); + $url = request()->input('url'); return view('site.redirect', compact('url')); } diff --git a/app/Http/Middleware/DangerZone.php b/app/Http/Middleware/DangerZone.php index 5a43d6e6b..c74c90eeb 100644 --- a/app/Http/Middleware/DangerZone.php +++ b/app/Http/Middleware/DangerZone.php @@ -25,7 +25,7 @@ class DangerZone if(!Auth::check()) { return redirect(route('login')); } - if(!$request->is('i/auth/sudo')) { + if(!$request->is('i/auth/sudo') && $request->session()->get('sudoTrustDevice') != 1) { if( !$request->session()->has('sudoMode') ) { $request->session()->put('redirectNext', $request->url()); return redirect('/i/auth/sudo'); diff --git a/app/Jobs/SharePipeline/SharePipeline.php b/app/Jobs/SharePipeline/SharePipeline.php index f5669009f..a3cda16fe 100644 --- a/app/Jobs/SharePipeline/SharePipeline.php +++ b/app/Jobs/SharePipeline/SharePipeline.php @@ -80,7 +80,7 @@ class SharePipeline implements ShouldQueue $notification->action = 'share'; $notification->message = $status->shareToText(); $notification->rendered = $status->shareToHtml(); - $notification->item_id = $status->id; + $notification->item_id = $status->reblog_of_id ?? $status->id; $notification->item_type = "App\Status"; $notification->save(); diff --git a/app/Profile.php b/app/Profile.php index 7e6edcaea..e9907f710 100644 --- a/app/Profile.php +++ b/app/Profile.php @@ -137,8 +137,7 @@ class Profile extends Model $url = Cache::remember('avatar:'.$this->id, now()->addYears(1), function () { $avatar = $this->avatar; $path = $avatar->media_path; - $version = hash('sha256', $avatar->change_count); - $path = "{$path}?v={$version}"; + $path = "{$path}?v={$avatar->change_count}"; return config('app.url') . Storage::url($path); }); diff --git a/app/Services/WebfingerService.php b/app/Services/WebfingerService.php index a50eee19f..1269dd0eb 100644 --- a/app/Services/WebfingerService.php +++ b/app/Services/WebfingerService.php @@ -3,6 +3,7 @@ namespace App\Services; use Cache; +use App\Profile; use Illuminate\Support\Facades\Redis; use App\Util\Webfinger\WebfingerUrl; use Zttp\Zttp; @@ -21,6 +22,12 @@ class WebfingerService protected function run($query) { + if($profile = Profile::whereUsername($query)->first()) { + $fractal = new Fractal\Manager(); + $fractal->setSerializer(new ArraySerializer()); + $resource = new Fractal\Resource\Item($profile, new AccountTransformer()); + return $fractal->createData($resource)->toArray(); + } $url = WebfingerUrl::generateWebfingerUrl($query); if(!Helpers::validateUrl($url)) { return []; diff --git a/app/Transformer/Api/AccountTransformer.php b/app/Transformer/Api/AccountTransformer.php index 2c32e210d..0486495c8 100644 --- a/app/Transformer/Api/AccountTransformer.php +++ b/app/Transformer/Api/AccountTransformer.php @@ -33,7 +33,7 @@ class AccountTransformer extends Fractal\TransformerAbstract 'website' => $profile->website, 'local' => (bool) $local, 'is_admin' => (bool) $is_admin, - 'created_at' => $profile->created_at->timestamp, + 'created_at' => $profile->created_at->toJSON(), 'header_bg' => $profile->header_bg ]; } diff --git a/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php b/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php index 595ac17df..0282f2aab 100644 --- a/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php +++ b/app/Transformer/Api/Mastodon/v1/NotificationTransformer.php @@ -52,6 +52,7 @@ class NotificationTransformer extends Fractal\TransformerAbstract 'share' => 'reblog', 'like' => 'favourite', 'comment' => 'mention', + 'admin.user.modlog.comment' => 'modlog' ]; return $verbs[$verb]; } diff --git a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php index 6ca61a51b..f73f38101 100644 --- a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php +++ b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php @@ -19,33 +19,34 @@ class StatusTransformer extends Fractal\TransformerAbstract { return [ 'id' => (string) $status->id, - 'uri' => $status->url(), - 'url' => $status->url(), - 'in_reply_to_id' => $status->in_reply_to_id, - 'in_reply_to_account_id' => $status->in_reply_to_profile_id, - 'reblog' => null, - 'content' => $status->rendered ?? $status->caption ?? '', 'created_at' => $status->created_at->toJSON(), - 'emojis' => [], - 'replies_count' => 0, - 'reblogs_count' => $status->reblogs_count ?? 0, - 'favourites_count' => $status->likes_count ?? 0, - 'reblogged' => null, - 'favourited' => null, - 'muted' => null, + 'in_reply_to_id' => $status->in_reply_to_id ? (string) $status->in_reply_to_id : null, + 'in_reply_to_account_id' => $status->in_reply_to_profile_id, 'sensitive' => (bool) $status->is_nsfw, 'spoiler_text' => $status->cw_summary ?? '', 'visibility' => $status->visibility ?? $status->scope, - 'mentions' => [], - 'tags' => [], - 'card' => null, - 'poll' => null, + 'language' => 'en', + 'uri' => $status->url(), + 'url' => $status->url(), + 'replies_count' => 0, + 'reblogs_count' => $status->reblogs_count ?? 0, + 'favourites_count' => $status->likes_count ?? 0, + 'reblogged' => $status->shared(), + 'favourited' => $status->liked(), + 'muted' => false, + 'bookmarked' => false, + 'pinned' => false, + 'content' => $status->rendered ?? $status->caption ?? '', + 'reblog' => null, 'application' => [ 'name' => 'web', 'website' => null ], - 'language' => null, - 'pinned' => null, + 'mentions' => [], + 'tags' => [], + 'emojis' => [], + 'card' => null, + 'poll' => null, ]; } diff --git a/app/Util/ActivityPub/Outbox.php b/app/Util/ActivityPub/Outbox.php index b9a7d9657..630951334 100644 --- a/app/Util/ActivityPub/Outbox.php +++ b/app/Util/ActivityPub/Outbox.php @@ -3,30 +3,49 @@ namespace App\Util\ActivityPub; use App\Profile; +use App\Status; use League\Fractal; use App\Http\Controllers\ProfileController; use App\Transformer\ActivityPub\ProfileOutbox; +use App\Transformer\ActivityPub\Verb\CreateNote; class Outbox { - public static function get($username) + public static function get($profile) { abort_if(!config('federation.activitypub.enabled'), 404); abort_if(!config('federation.activitypub.outbox'), 404); - $profile = Profile::whereNull('remote_url')->whereUsername($username)->firstOrFail(); if($profile->status != null) { return ProfileController::accountCheck($profile); } + if($profile->is_private) { - return response()->json(['error'=>'403', 'msg' => 'private profile'], 403); + return ['error'=>'403', 'msg' => 'private profile']; } - $timeline = $profile->statuses()->whereVisibility('public')->orderBy('created_at', 'desc')->paginate(10); + + $timeline = $profile + ->statuses() + ->whereVisibility('public') + ->orderBy('created_at', 'desc') + ->take(10) + ->get(); + + $count = Status::whereProfileId($profile->id)->count(); + $fractal = new Fractal\Manager(); - $resource = new Fractal\Resource\Item($profile, new ProfileOutbox()); + $resource = new Fractal\Resource\Collection($timeline, new CreateNote()); $res = $fractal->createData($resource)->toArray(); - return $res['data']; + $outbox = [ + '@context' => 'https://www.w3.org/ns/activitystreams', + '_debug' => 'Outbox only supports latest 10 objects, pagination is not supported', + 'id' => $profile->permalink('/outbox'), + 'type' => 'OrderedCollection', + 'totalItems' => $count, + 'orderedItems' => $res['data'] + ]; + return $outbox; } } \ No newline at end of file diff --git a/composer.lock b/composer.lock index c6a6bfff7..c310bbfce 100644 --- a/composer.lock +++ b/composer.lock @@ -147,12 +147,12 @@ "version": "v0.11.4", "source": { "type": "git", - "url": "https://github.com/barryvdh/laravel-cors.git", + "url": "https://github.com/fruitcake/laravel-cors.git", "reference": "03492f1a3bc74a05de23f93b94ac7cc5c173eec9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-cors/zipball/03492f1a3bc74a05de23f93b94ac7cc5c173eec9", + "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/03492f1a3bc74a05de23f93b94ac7cc5c173eec9", "reference": "03492f1a3bc74a05de23f93b94ac7cc5c173eec9", "shasum": "" }, @@ -2706,6 +2706,7 @@ "bcmath", "math" ], + "abandoned": "brick/math", "time": "2017-02-16T16:54:46+00:00" }, { @@ -5135,16 +5136,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.1", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5" + "reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8bccc59e61b41963d14c3dbdb23181e5c932a1d5", - "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62f92509c9abfd1f73e17b8cf1b72c0bdac6611b", + "reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b", "shasum": "" }, "require": { @@ -5186,7 +5187,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-11-28T13:33:56+00:00" + "time": "2020-03-30T14:07:33+00:00" }, { "name": "symfony/http-kernel", @@ -5280,16 +5281,16 @@ }, { "name": "symfony/mime", - "version": "v5.0.1", + "version": "v5.0.7", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79" + "reference": "481b7d6da88922fb1e0d86a943987722b08f3955" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/0e6a4ced216e49d457eddcefb61132173a876d79", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79", + "url": "https://api.github.com/repos/symfony/mime/zipball/481b7d6da88922fb1e0d86a943987722b08f3955", + "reference": "481b7d6da88922fb1e0d86a943987722b08f3955", "shasum": "" }, "require": { @@ -5338,7 +5339,7 @@ "mime", "mime-type" ], - "time": "2019-11-30T14:12:50+00:00" + "time": "2020-03-27T16:56:45+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5459,22 +5460,22 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" + "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", + "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", "shasum": "" }, "require": { "php": ">=5.3.3", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.9" + "symfony/polyfill-php72": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -5482,7 +5483,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5517,20 +5518,20 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "shasum": "" }, "require": { @@ -5542,7 +5543,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5576,7 +5577,7 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-php56", @@ -5636,16 +5637,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" + "reference": "37b0976c78b94856543260ce09b460a7bc852747" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", + "reference": "37b0976c78b94856543260ce09b460a7bc852747", "shasum": "" }, "require": { @@ -5654,7 +5655,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5687,7 +5688,7 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/polyfill-php73", @@ -6477,6 +6478,7 @@ "psr", "psr-7" ], + "abandoned": "laminas/laminas-diactoros", "time": "2019-11-13T19:16:13+00:00" } ], @@ -6487,19 +6489,19 @@ "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "35638e4f5e714a12dec5ca062e68c625c1309c1c" + "reference": "7fa9ff7945f44f10c76d7bc46f508f4cf593f4c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/35638e4f5e714a12dec5ca062e68c625c1309c1c", - "reference": "35638e4f5e714a12dec5ca062e68c625c1309c1c", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/7fa9ff7945f44f10c76d7bc46f508f4cf593f4c5", + "reference": "7fa9ff7945f44f10c76d7bc46f508f4cf593f4c5", "shasum": "" }, "require": { - "illuminate/routing": "^5.5|^6", - "illuminate/session": "^5.5|^6", - "illuminate/support": "^5.5|^6", - "maximebf/debugbar": "^1.15", + "illuminate/routing": "^5.5|^6|^7", + "illuminate/session": "^5.5|^6|^7", + "illuminate/support": "^5.5|^6|^7", + "maximebf/debugbar": "^1.15.1", "php": ">=7.0", "symfony/debug": "^3|^4|^5", "symfony/finder": "^3|^4|^5" @@ -6547,7 +6549,7 @@ "profiler", "webprofiler" ], - "time": "2019-12-07T09:33:13+00:00" + "time": "2020-03-24T06:32:37+00:00" }, { "name": "composer/ca-bundle", @@ -7127,8 +7129,8 @@ "authors": [ { "name": "Filipe Dobreira", - "role": "Developer", - "homepage": "https://github.com/filp" + "homepage": "https://github.com/filp", + "role": "Developer" } ], "description": "php error handling for cool kids", diff --git a/config/partialcache.php b/config/partialcache.php deleted file mode 100644 index 7dce620b0..000000000 --- a/config/partialcache.php +++ /dev/null @@ -1,17 +0,0 @@ - true, - - // The name of the blade directive to register - 'directive' => 'cache', - - // The base key that used for cache items - 'key' => 'partialcache', - - // The default cache duration in minutes, set null to remember forever - 'default_duration' => null, - -]; diff --git a/config/session.php b/config/session.php index a99d32a7c..1b692e3a4 100644 --- a/config/session.php +++ b/config/session.php @@ -29,7 +29,7 @@ return [ | */ - 'lifetime' => env('SESSION_LIFETIME', 2880), + 'lifetime' => env('SESSION_LIFETIME', 86400), 'expire_on_close' => false, diff --git a/contrib/docker-nginx.conf b/contrib/docker-nginx.conf new file mode 100644 index 000000000..9d0a199e6 --- /dev/null +++ b/contrib/docker-nginx.conf @@ -0,0 +1,35 @@ +upstream fe { + server 127.0.0.1:8080; +} + +server { + server_name real.domain; + listen [::]:443 ssl ipv6only=on; + listen 443 ssl; + ssl_certificate /etc/letsencrypt/live/real.domain/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/real.domain/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $http_x_forwarded_host; + proxy_set_header X-Forwarded-Port $http_x_forwarded_port; + proxy_redirect off; + proxy_pass http://fe/; + } +} + +server { + if ($host = real.domain) { + return 301 https://$host$request_uri; + } + + listen 80; + listen [::]:80; + server_name real.domain; + return 404; +} \ No newline at end of file diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index aa3c3fd2b..b9e88ab0f 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -1,25 +1,79 @@ FROM php:7.4-apache-buster -ARG COMPOSER_VERSION="1.9.1" -ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111" +# Use the default production configuration +COPY contrib/docker/php.production.ini "$PHP_INI_DIR/php.ini" -RUN apt-get update \ - && apt-get install -y --no-install-recommends apt-utils \ - && apt-get install -y --no-install-recommends git gosu ffmpeg \ - optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \ - libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \ - libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client\ - && sed -i '/en_US/s/^#//g' /etc/locale.gen \ - && locale-gen && update-locale \ - && docker-php-source extract \ - && docker-php-ext-configure gd \ +# Install Composer +ENV COMPOSER_VERSION 1.9.2 +ENV COMPOSER_HOME /var/www/.composer +RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \ + && curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig \ + && php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" \ + && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer --version=${COMPOSER_VERSION} && rm -rf /tmp/composer-setup.php + +# Update OS Packages +RUN apt-get update + +# Install OS Packages +RUN apt-get install -y --no-install-recommends apt-utils +RUN apt-get install -y --no-install-recommends \ +## Standard + locales locales-all \ + git \ + gosu \ + zip \ + unzip \ + libzip-dev \ + libcurl4-openssl-dev \ +## Image Optimization + optipng \ + pngquant \ + jpegoptim \ + gifsicle \ +## Image Processing + libjpeg62-turbo-dev \ + libpng-dev \ +# Required for GD + libxpm4 \ + libxpm-dev \ + libwebp6 \ + libwebp-dev \ +## Video Processing + ffmpeg + +# Update Local data +RUN sed -i '/en_US/s/^#//g' /etc/locale.gen && locale-gen && update-locale + +# Install PHP extensions +RUN docker-php-source extract + +#PHP Imagemagick extensions +RUN apt-get install -y --no-install-recommends libmagickwand-dev +RUN pecl install imagick +RUN docker-php-ext-enable imagick + +# PHP GD extensions +RUN docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ --with-webp \ - --with-xpm \ - && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \ - && docker-php-ext-enable pcntl gd exif zip curl \ - && a2enmod rewrite remoteip \ + --with-xpm +RUN docker-php-ext-install "-j$(nproc) gd" + +#PHP Redis extensions +RUN pecl install redis +RUN docker-php-ext-enable redis + +#PHP Database extensions +RUN apt-get install -y --no-install-recommends libpq-dev libsqlite3-dev +RUN docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite + +#PHP extensions (dependencies) +RUN docker-php-ext-configure intl +RUN docker-php-ext-install "-j$(nproc) intl bcmath zip pcntl exif curl" + +#APACHE Bootstrap +RUN a2enmod rewrite remoteip \ && {\ echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ @@ -27,45 +81,26 @@ RUN apt-get update \ echo RemoteIPTrustedProxy 192.168.0.0/16 ;\ echo SetEnvIf X-Forwarded-Proto "https" HTTPS=on ;\ } > /etc/apache2/conf-available/remoteip.conf \ - && a2enconf remoteip \ - && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer \ - && echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - \ - && chmod 755 /usr/bin/composer \ - && apt-get autoremove --purge -y \ - libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \ - && rm -rf /var/cache/apt \ - && docker-php-source delete + && a2enconf remoteip + +#Cleanup +RUN docker-php-source delete +RUN apt-get autoremove --purge -y +RUN apt-get clean +RUN rm -rf /var/cache/apt +RUN rm -rf /var/lib/apt/lists/* ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}" COPY . /var/www/ - WORKDIR /var/www/ -RUN cp -r storage storage.skel \ - && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \ - && composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist \ - && composer install --prefer-dist --no-interaction \ - && composer global remove hirak/prestissimo \ - && rm -rf html && ln -s public html + +RUN cp -r storage storage.skel +RUN composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist +RUN composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader +RUN composer global remove hirak/prestissimo +RUN rm -rf html && ln -s public html VOLUME /var/www/storage /var/www/bootstrap -ENV APP_ENV=production \ - APP_DEBUG=false \ - LOG_CHANNEL=stderr \ - DB_CONNECTION=mysql \ - DB_PORT=3306 \ - DB_HOST=db \ - BROADCAST_DRIVER=log \ - QUEUE_DRIVER=redis \ - HORIZON_PREFIX=horizon-pixelfed \ - REDIS_HOST=redis \ - SESSION_SECURE_COOKIE=true \ - API_BASE="/api/1/" \ - API_SEARCH="/api/search" \ - OPEN_REGISTRATION=true \ - ENFORCE_EMAIL_VERIFICATION=true \ - REMOTE_FOLLOW=false \ - ACTIVITY_PUB=false - -CMD /var/www/contrib/docker/start.sh +CMD ["/var/www/contrib/docker/start.apache.sh"] diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index 44e85707b..4d15f14b8 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -1,66 +1,94 @@ FROM php:7.4-fpm-buster -ARG COMPOSER_VERSION="1.9.1" -ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111" -RUN apt-get update \ - && apt-get install -y --no-install-recommends apt-utils \ - && apt-get install -y --no-install-recommends git gosu ffmpeg \ - optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \ - libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \ - libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client\ - && sed -i '/en_US/s/^#//g' /etc/locale.gen \ - && locale-gen && update-locale \ - && docker-php-source extract \ - && docker-php-ext-configure gd \ +# Use the default production configuration +COPY contrib/docker/php.production.ini "$PHP_INI_DIR/php.ini" + +# Install Composer +ENV COMPOSER_VERSION 1.9.2 +ENV COMPOSER_HOME /var/www/.composer +RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \ + && curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig \ + && php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" \ + && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer --version=${COMPOSER_VERSION} && rm -rf /tmp/composer-setup.php + +# Update OS Packages +RUN apt-get update + +# Install OS Packages +RUN apt-get install -y --no-install-recommends apt-utils +RUN apt-get install -y --no-install-recommends \ +## Standard + locales locales-all \ + git \ + gosu \ + zip \ + unzip \ + libzip-dev \ + libcurl4-openssl-dev \ +## Image Optimization + optipng \ + pngquant \ + jpegoptim \ + gifsicle \ +## Image Processing + libjpeg62-turbo-dev \ + libpng-dev \ +# Required for GD + libxpm4 \ + libxpm-dev \ + libwebp6 \ + libwebp-dev \ +## Video Processing + ffmpeg + +# Update Local data +RUN sed -i '/en_US/s/^#//g' /etc/locale.gen && locale-gen && update-locale + +# Install PHP extensions +RUN docker-php-source extract + +#PHP Imagemagick extensions +RUN apt-get install -y --no-install-recommends libmagickwand-dev +RUN pecl install imagick +RUN docker-php-ext-enable imagick + +# PHP GD extensions +RUN docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ --with-webp \ - --with-xpm \ - && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \ - && docker-php-ext-enable pcntl gd exif zip curl \ - && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer \ - && echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - \ - && chmod 755 /usr/bin/composer \ - && apt-get autoremove --purge -y \ - libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \ - && rm -rf /var/cache/apt \ - && docker-php-source delete + --with-xpm +RUN docker-php-ext-install -j$(nproc) gd + +#PHP Redis extensions +RUN pecl install redis +RUN docker-php-ext-enable redis + +#PHP Database extensions +RUN apt-get install -y --no-install-recommends libpq-dev libsqlite3-dev +RUN docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite + +#PHP extensions (dependencies) +RUN docker-php-ext-configure intl +RUN docker-php-ext-install -j$(nproc) intl bcmath zip pcntl exif curl + +#Cleanup +RUN docker-php-source delete +RUN apt-get autoremove --purge -y +RUN rm -rf /var/cache/apt +RUN rm -rf /var/lib/apt/lists/* ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}" COPY . /var/www/ - WORKDIR /var/www/ -RUN cp -r storage storage.skel \ - && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \ - && composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist \ - && composer install --prefer-dist --no-interaction \ - && composer global remove hirak/prestissimo \ - && rm -rf html && ln -s public html + +RUN cp -r storage storage.skel +RUN composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist +RUN composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader +RUN composer global remove hirak/prestissimo +RUN rm -rf html && ln -s public html VOLUME /var/www/storage /var/www/bootstrap - -ENV APP_ENV=production \ - APP_DEBUG=false \ - LOG_CHANNEL=stderr \ - DB_CONNECTION=mysql \ - DB_PORT=3306 \ - DB_HOST=db \ - BROADCAST_DRIVER=log \ - QUEUE_DRIVER=redis \ - HORIZON_PREFIX=horizon-pixelfed \ - REDIS_HOST=redis \ - SESSION_SECURE_COOKIE=true \ - API_BASE="/api/1/" \ - API_SEARCH="/api/search" \ - OPEN_REGISTRATION=true \ - ENFORCE_EMAIL_VERIFICATION=true \ - REMOTE_FOLLOW=false \ - ACTIVITY_PUB=false - -CMD cp -r storage.skel/* storage/ \ - && chown -R www-data:www-data storage/ \ - && php artisan storage:link \ - && php artisan migrate --force \ - && php artisan update \ - && exec php-fpm + +CMD ["/var/www/contrib/docker/start.fpm.sh"] diff --git a/contrib/docker/php.ini b/contrib/docker/php.ini deleted file mode 100644 index 34afdce98..000000000 --- a/contrib/docker/php.ini +++ /dev/null @@ -1,5 +0,0 @@ -file_uploads = On -memory_limit = 128M -upload_max_filesize = 64M -post_max_size = 64M -max_execution_time = 600 diff --git a/contrib/docker/php.production.ini b/contrib/docker/php.production.ini new file mode 100644 index 000000000..b84839ff5 --- /dev/null +++ b/contrib/docker/php.production.ini @@ -0,0 +1,1916 @@ +[PHP] + +;;;;;;;;;;;;;;;;;;; +; About php.ini ; +;;;;;;;;;;;;;;;;;;; +; PHP's initialization file, generally called php.ini, is responsible for +; configuring many of the aspects of PHP's behavior. + +; PHP attempts to find and load this configuration from a number of locations. +; The following is a summary of its search order: +; 1. SAPI module specific location. +; 2. The PHPRC environment variable. (As of PHP 5.2.0) +; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) +; 4. Current working directory (except CLI) +; 5. The web server's directory (for SAPI modules), or directory of PHP +; (otherwise in Windows) +; 6. The directory from the --with-config-file-path compile time option, or the +; Windows directory (usually C:\windows) +; See the PHP docs for more specific information. +; http://php.net/configuration.file + +; The syntax of the file is extremely simple. Whitespace and lines +; beginning with a semicolon are silently ignored (as you probably guessed). +; Section headers (e.g. [Foo]) are also silently ignored, even though +; they might mean something in the future. + +; Directives following the section heading [PATH=/www/mysite] only +; apply to PHP files in the /www/mysite directory. Directives +; following the section heading [HOST=www.example.com] only apply to +; PHP files served from www.example.com. Directives set in these +; special sections cannot be overridden by user-defined INI files or +; at runtime. Currently, [PATH=] and [HOST=] sections only work under +; CGI/FastCGI. +; http://php.net/ini.sections + +; Directives are specified using the following syntax: +; directive = value +; Directive names are *case sensitive* - foo=bar is different from FOO=bar. +; Directives are variables used to configure PHP or PHP extensions. +; There is no name validation. If PHP can't find an expected +; directive because it is not set or is mistyped, a default value will be used. + +; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one +; of the INI constants (On, Off, True, False, Yes, No and None) or an expression +; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a +; previously set variable or directive (e.g. ${foo}) + +; Expressions in the INI file are limited to bitwise operators and parentheses: +; | bitwise OR +; ^ bitwise XOR +; & bitwise AND +; ~ bitwise NOT +; ! boolean NOT + +; Boolean flags can be turned on using the values 1, On, True or Yes. +; They can be turned off using the values 0, Off, False or No. + +; An empty string can be denoted by simply not writing anything after the equal +; sign, or by using the None keyword: + +; foo = ; sets foo to an empty string +; foo = None ; sets foo to an empty string +; foo = "None" ; sets foo to the string 'None' + +; If you use constants in your value, and these constants belong to a +; dynamically loaded extension (either a PHP extension or a Zend extension), +; you may only use these constants *after* the line that loads the extension. + +;;;;;;;;;;;;;;;;;;; +; About this file ; +;;;;;;;;;;;;;;;;;;; +; PHP comes packaged with two INI files. One that is recommended to be used +; in production environments and one that is recommended to be used in +; development environments. + +; php.ini-production contains settings which hold security, performance and +; best practices at its core. But please be aware, these settings may break +; compatibility with older or less security conscience applications. We +; recommending using the production ini in production and testing environments. + +; php.ini-development is very similar to its production variant, except it is +; much more verbose when it comes to errors. We recommend using the +; development version only in development environments, as errors shown to +; application users can inadvertently leak otherwise secure information. + +; This is the php.ini-production INI file. + +;;;;;;;;;;;;;;;;;;; +; Quick Reference ; +;;;;;;;;;;;;;;;;;;; +; The following are all the settings which are different in either the production +; or development versions of the INIs with respect to PHP's default behavior. +; Please see the actual settings later in the document for more details as to why +; we recommend these changes in PHP's behavior. + +; display_errors +; Default Value: On +; Development Value: On +; Production Value: Off + +; display_startup_errors +; Default Value: On +; Development Value: On +; Production Value: Off + +; error_reporting +; Default Value: E_ALL +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT + +; log_errors +; Default Value: Off +; Development Value: On +; Production Value: On + +; max_input_time +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) + +; output_buffering +; Default Value: Off +; Development Value: 4096 +; Production Value: 4096 + +; register_argc_argv +; Default Value: On +; Development Value: Off +; Production Value: Off + +; request_order +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" + +; session.gc_divisor +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 + +; session.sid_bits_per_character +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 + +; short_open_tag +; Default Value: On +; Development Value: Off +; Production Value: Off + +; variables_order +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS" + +;;;;;;;;;;;;;;;;;;;; +; php.ini Options ; +;;;;;;;;;;;;;;;;;;;; +; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini" +;user_ini.filename = ".user.ini" + +; To disable this feature set this option to an empty value +;user_ini.filename = + +; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) +;user_ini.cache_ttl = 300 + +;;;;;;;;;;;;;;;;;;;; +; Language Options ; +;;;;;;;;;;;;;;;;;;;; + +; Enable the PHP scripting language engine under Apache. +; http://php.net/engine +engine = On + +; This directive determines whether or not PHP will recognize code between +; tags as PHP source which should be processed as such. It is +; generally recommended that should be used and that this feature +; should be disabled, as enabling it may result in issues when generating XML +; documents, however this remains supported for backward compatibility reasons. +; Note that this directive does not control the would work. +; http://php.net/syntax-highlighting +;highlight.string = #DD0000 +;highlight.comment = #FF9900 +;highlight.keyword = #007700 +;highlight.default = #0000BB +;highlight.html = #000000 + +; If enabled, the request will be allowed to complete even if the user aborts +; the request. Consider enabling it if executing long requests, which may end up +; being interrupted by the user or a browser timing out. PHP's default behavior +; is to disable this feature. +; http://php.net/ignore-user-abort +;ignore_user_abort = On + +; Determines the size of the realpath cache to be used by PHP. This value should +; be increased on systems where PHP opens many files to reflect the quantity of +; the file operations performed. +; Note: if open_basedir is set, the cache is disabled +; http://php.net/realpath-cache-size +;realpath_cache_size = 4096k + +; Duration of time, in seconds for which to cache realpath information for a given +; file or directory. For systems with rarely changing files, consider increasing this +; value. +; http://php.net/realpath-cache-ttl +;realpath_cache_ttl = 120 + +; Enables or disables the circular reference collector. +; http://php.net/zend.enable-gc +zend.enable_gc = On + +; If enabled, scripts may be written in encodings that are incompatible with +; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such +; encodings. To use this feature, mbstring extension must be enabled. +; Default: Off +;zend.multibyte = Off + +; Allows to set the default encoding for the scripts. This value will be used +; unless "declare(encoding=...)" directive appears at the top of the script. +; Only affects if zend.multibyte is set. +; Default: "" +;zend.script_encoding = + +; Allows to include or exclude arguments from stack traces generated for exceptions +; Default: Off +; In production, it is recommended to turn this setting on to prohibit the output +; of sensitive information in stack traces +zend.exception_ignore_args = On + +;;;;;;;;;;;;;;;;; +; Miscellaneous ; +;;;;;;;;;;;;;;;;; + +; Decides whether PHP may expose the fact that it is installed on the server +; (e.g. by adding its signature to the Web server header). It is no security +; threat in any way, but it makes it possible to determine whether you use PHP +; on your server or not. +; http://php.net/expose-php +expose_php = On + +;;;;;;;;;;;;;;;;;;; +; Resource Limits ; +;;;;;;;;;;;;;;;;;;; + +; Maximum execution time of each script, in seconds +; http://php.net/max-execution-time +; Note: This directive is hardcoded to 0 for the CLI SAPI +max_execution_time = 600 + +; Maximum amount of time each script may spend parsing request data. It's a good +; idea to limit this time on productions servers in order to eliminate unexpectedly +; long running scripts. +; Note: This directive is hardcoded to -1 for the CLI SAPI +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) +; http://php.net/max-input-time +max_input_time = 60 + +; Maximum input variable nesting level +; http://php.net/max-input-nesting-level +;max_input_nesting_level = 64 + +; How many GET/POST/COOKIE input variables may be accepted +;max_input_vars = 1000 + +; Maximum amount of memory a script may consume (128MB) +; http://php.net/memory-limit +memory_limit = 128M + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Error handling and logging ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; This directive informs PHP of which errors, warnings and notices you would like +; it to take action for. The recommended way of setting values for this +; directive is through the use of the error level constants and bitwise +; operators. The error level constants are below here for convenience as well as +; some common settings and their meanings. +; By default, PHP is set to take action on all errors, notices and warnings EXCEPT +; those related to E_NOTICE and E_STRICT, which together cover best practices and +; recommended coding standards in PHP. For performance reasons, this is the +; recommend error reporting setting. Your production server shouldn't be wasting +; resources complaining about best practices and coding standards. That's what +; development servers and development settings are for. +; Note: The php.ini-development file has this setting as E_ALL. This +; means it pretty much reports everything which is exactly what you want during +; development and early testing. +; +; Error Level Constants: +; E_ALL - All errors and warnings (includes E_STRICT as of PHP 5.4.0) +; E_ERROR - fatal run-time errors +; E_RECOVERABLE_ERROR - almost fatal run-time errors +; E_WARNING - run-time warnings (non-fatal errors) +; E_PARSE - compile-time parse errors +; E_NOTICE - run-time notices (these are warnings which often result +; from a bug in your code, but it's possible that it was +; intentional (e.g., using an uninitialized variable and +; relying on the fact it is automatically initialized to an +; empty string) +; E_STRICT - run-time notices, enable to have PHP suggest changes +; to your code which will ensure the best interoperability +; and forward compatibility of your code +; E_CORE_ERROR - fatal errors that occur during PHP's initial startup +; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's +; initial startup +; E_COMPILE_ERROR - fatal compile-time errors +; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) +; E_USER_ERROR - user-generated error message +; E_USER_WARNING - user-generated warning message +; E_USER_NOTICE - user-generated notice message +; E_DEPRECATED - warn about code that will not work in future versions +; of PHP +; E_USER_DEPRECATED - user-generated deprecation warnings +; +; Common Values: +; E_ALL (Show all errors, warnings and notices including coding standards.) +; E_ALL & ~E_NOTICE (Show all errors, except for notices) +; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.) +; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) +; Default Value: E_ALL +; Development Value: E_ALL +; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT +; http://php.net/error-reporting +error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT + +; This directive controls whether or not and where PHP will output errors, +; notices and warnings too. Error output is very useful during development, but +; it could be very dangerous in production environments. Depending on the code +; which is triggering the error, sensitive information could potentially leak +; out of your application such as database usernames and passwords or worse. +; For production environments, we recommend logging errors rather than +; sending them to STDOUT. +; Possible Values: +; Off = Do not display any errors +; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) +; On or stdout = Display errors to STDOUT +; Default Value: On +; Development Value: On +; Production Value: Off +; http://php.net/display-errors +display_errors = Off + +; The display of errors which occur during PHP's startup sequence are handled +; separately from display_errors. We strongly recommend you set this to 'off' +; for production servers to avoid leaking configuration details. +; Default Value: On +; Development Value: On +; Production Value: Off +; http://php.net/display-startup-errors +display_startup_errors = Off + +; Besides displaying errors, PHP can also log errors to locations such as a +; server-specific log, STDERR, or a location specified by the error_log +; directive found below. While errors should not be displayed on productions +; servers they should still be monitored and logging is a great way to do that. +; Default Value: Off +; Development Value: On +; Production Value: On +; http://php.net/log-errors +log_errors = On + +; Set maximum length of log_errors. In error_log information about the source is +; added. The default is 1024 and 0 allows to not apply any maximum length at all. +; http://php.net/log-errors-max-len +log_errors_max_len = 1024 + +; Do not log repeated messages. Repeated errors must occur in same file on same +; line unless ignore_repeated_source is set true. +; http://php.net/ignore-repeated-errors +ignore_repeated_errors = Off + +; Ignore source of message when ignoring repeated messages. When this setting +; is On you will not log errors with repeated messages from different files or +; source lines. +; http://php.net/ignore-repeated-source +ignore_repeated_source = Off + +; If this parameter is set to Off, then memory leaks will not be shown (on +; stdout or in the log). This is only effective in a debug compile, and if +; error reporting includes E_WARNING in the allowed list +; http://php.net/report-memleaks +report_memleaks = On + +; This setting is on by default. +;report_zend_debug = 0 + +; Turn off normal error reporting and emit XML-RPC error XML +; http://php.net/xmlrpc-errors +;xmlrpc_errors = 0 + +; An XML-RPC faultCode +;xmlrpc_error_number = 0 + +; When PHP displays or logs an error, it has the capability of formatting the +; error message as HTML for easier reading. This directive controls whether +; the error message is formatted as HTML or not. +; Note: This directive is hardcoded to Off for the CLI SAPI +; http://php.net/html-errors +;html_errors = On + +; If html_errors is set to On *and* docref_root is not empty, then PHP +; produces clickable error messages that direct to a page describing the error +; or function causing the error in detail. +; You can download a copy of the PHP manual from http://php.net/docs +; and change docref_root to the base URL of your local copy including the +; leading '/'. You must also specify the file extension being used including +; the dot. PHP's default behavior is to leave these settings empty, in which +; case no links to documentation are generated. +; Note: Never use this feature for production boxes. +; http://php.net/docref-root +; Examples +;docref_root = "/phpmanual/" + +; http://php.net/docref-ext +;docref_ext = .html + +; String to output before an error message. PHP's default behavior is to leave +; this setting blank. +; http://php.net/error-prepend-string +; Example: +;error_prepend_string = "" + +; String to output after an error message. PHP's default behavior is to leave +; this setting blank. +; http://php.net/error-append-string +; Example: +;error_append_string = "" + +; Log errors to specified file. PHP's default behavior is to leave this value +; empty. +; http://php.net/error-log +; Example: +;error_log = php_errors.log +; Log errors to syslog (Event Log on Windows). +;error_log = syslog + +; The syslog ident is a string which is prepended to every message logged +; to syslog. Only used when error_log is set to syslog. +;syslog.ident = php + +; The syslog facility is used to specify what type of program is logging +; the message. Only used when error_log is set to syslog. +;syslog.facility = user + +; Set this to disable filtering control characters (the default). +; Some loggers only accept NVT-ASCII, others accept anything that's not +; control characters. If your logger accepts everything, then no filtering +; is needed at all. +; Allowed values are: +; ascii (all printable ASCII characters and NL) +; no-ctrl (all characters except control characters) +; all (all characters) +; raw (like "all", but messages are not split at newlines) +; http://php.net/syslog.filter +;syslog.filter = ascii + +;windows.show_crt_warning +; Default value: 0 +; Development value: 0 +; Production value: 0 + +;;;;;;;;;;;;;;;;; +; Data Handling ; +;;;;;;;;;;;;;;;;; + +; The separator used in PHP generated URLs to separate arguments. +; PHP's default setting is "&". +; http://php.net/arg-separator.output +; Example: +;arg_separator.output = "&" + +; List of separator(s) used by PHP to parse input URLs into variables. +; PHP's default setting is "&". +; NOTE: Every character in this directive is considered as separator! +; http://php.net/arg-separator.input +; Example: +;arg_separator.input = ";&" + +; This directive determines which super global arrays are registered when PHP +; starts up. G,P,C,E & S are abbreviations for the following respective super +; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty +; paid for the registration of these arrays and because ENV is not as commonly +; used as the others, ENV is not recommended on productions servers. You +; can still get access to the environment variables through getenv() should you +; need to. +; Default Value: "EGPCS" +; Development Value: "GPCS" +; Production Value: "GPCS"; +; http://php.net/variables-order +variables_order = "GPCS" + +; This directive determines which super global data (G,P & C) should be +; registered into the super global array REQUEST. If so, it also determines +; the order in which that data is registered. The values for this directive +; are specified in the same manner as the variables_order directive, +; EXCEPT one. Leaving this value empty will cause PHP to use the value set +; in the variables_order directive. It does not mean it will leave the super +; globals array REQUEST empty. +; Default Value: None +; Development Value: "GP" +; Production Value: "GP" +; http://php.net/request-order +request_order = "GP" + +; This directive determines whether PHP registers $argv & $argc each time it +; runs. $argv contains an array of all the arguments passed to PHP when a script +; is invoked. $argc contains an integer representing the number of arguments +; that were passed when the script was invoked. These arrays are extremely +; useful when running scripts from the command line. When this directive is +; enabled, registering these variables consumes CPU cycles and memory each time +; a script is executed. For performance reasons, this feature should be disabled +; on production servers. +; Note: This directive is hardcoded to On for the CLI SAPI +; Default Value: On +; Development Value: Off +; Production Value: Off +; http://php.net/register-argc-argv +register_argc_argv = Off + +; When enabled, the ENV, REQUEST and SERVER variables are created when they're +; first used (Just In Time) instead of when the script starts. If these +; variables are not used within a script, having this directive on will result +; in a performance gain. The PHP directive register_argc_argv must be disabled +; for this directive to have any effect. +; http://php.net/auto-globals-jit +auto_globals_jit = On + +; Whether PHP will read the POST data. +; This option is enabled by default. +; Most likely, you won't want to disable this option globally. It causes $_POST +; and $_FILES to always be empty; the only way you will be able to read the +; POST data will be through the php://input stream wrapper. This can be useful +; to proxy requests or to process the POST data in a memory efficient fashion. +; http://php.net/enable-post-data-reading +;enable_post_data_reading = Off + +; Maximum size of POST data that PHP will accept. +; Its value may be 0 to disable the limit. It is ignored if POST data reading +; is disabled through enable_post_data_reading. +; http://php.net/post-max-size +post_max_size = 64M + +; Automatically add files before PHP document. +; http://php.net/auto-prepend-file +auto_prepend_file = + +; Automatically add files after PHP document. +; http://php.net/auto-append-file +auto_append_file = + +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. +; +; PHP's built-in default media type is set to text/html. +; http://php.net/default-mimetype +default_mimetype = "text/html" + +; PHP's default character set is set to UTF-8. +; http://php.net/default-charset +default_charset = "UTF-8" + +; PHP internal character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/internal-encoding +;internal_encoding = + +; PHP input character encoding is set to empty. +; If empty, default_charset is used. +; http://php.net/input-encoding +;input_encoding = + +; PHP output character encoding is set to empty. +; If empty, default_charset is used. +; See also output_buffer. +; http://php.net/output-encoding +;output_encoding = + +;;;;;;;;;;;;;;;;;;;;;;;;; +; Paths and Directories ; +;;;;;;;;;;;;;;;;;;;;;;;;; + +; UNIX: "/path1:/path2" +;include_path = ".:/php/includes" +; +; Windows: "\path1;\path2" +;include_path = ".;c:\php\includes" +; +; PHP's default setting for include_path is ".;/path/to/php/pear" +; http://php.net/include-path + +; The root of the PHP pages, used only if nonempty. +; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root +; if you are running php as a CGI under any web server (other than IIS) +; see documentation for security issues. The alternate is to use the +; cgi.force_redirect configuration below +; http://php.net/doc-root +doc_root = + +; The directory under which PHP opens the script using /~username used only +; if nonempty. +; http://php.net/user-dir +user_dir = + +; Directory in which the loadable extensions (modules) reside. +; http://php.net/extension-dir +;extension_dir = "./" +; On windows: +;extension_dir = "ext" + +; Directory where the temporary files should be placed. +; Defaults to the system default (see sys_get_temp_dir) +;sys_temp_dir = "/tmp" + +; Whether or not to enable the dl() function. The dl() function does NOT work +; properly in multithreaded servers, such as IIS or Zeus, and is automatically +; disabled on them. +; http://php.net/enable-dl +enable_dl = Off + +; cgi.force_redirect is necessary to provide security running PHP as a CGI under +; most web servers. Left undefined, PHP turns this on by default. You can +; turn it off here AT YOUR OWN RISK +; **You CAN safely turn this off for IIS, in fact, you MUST.** +; http://php.net/cgi.force-redirect +;cgi.force_redirect = 1 + +; if cgi.nph is enabled it will force cgi to always sent Status: 200 with +; every request. PHP's default behavior is to disable this feature. +;cgi.nph = 1 + +; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape +; (iPlanet) web servers, you MAY need to set an environment variable name that PHP +; will look for to know it is OK to continue execution. Setting this variable MAY +; cause security issues, KNOW WHAT YOU ARE DOING FIRST. +; http://php.net/cgi.redirect-status-env +;cgi.redirect_status_env = + +; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's +; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok +; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting +; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting +; of zero causes PHP to behave as before. Default is 1. You should fix your scripts +; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. +; http://php.net/cgi.fix-pathinfo +;cgi.fix_pathinfo=1 + +; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside +; of the web tree and people will not be able to circumvent .htaccess security. +;cgi.discard_path=1 + +; FastCGI under IIS supports the ability to impersonate +; security tokens of the calling client. This allows IIS to define the +; security context that the request runs under. mod_fastcgi under Apache +; does not currently support this feature (03/17/2002) +; Set to 1 if running under IIS. Default is zero. +; http://php.net/fastcgi.impersonate +;fastcgi.impersonate = 1 + +; Disable logging through FastCGI connection. PHP's default behavior is to enable +; this feature. +;fastcgi.logging = 0 + +; cgi.rfc2616_headers configuration option tells PHP what type of headers to +; use when sending HTTP response code. If set to 0, PHP sends Status: header that +; is supported by Apache. When this option is set to 1, PHP will send +; RFC2616 compliant header. +; Default is zero. +; http://php.net/cgi.rfc2616-headers +;cgi.rfc2616_headers = 0 + +; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #! +; (shebang) at the top of the running script. This line might be needed if the +; script support running both as stand-alone script and via PHP CGI<. PHP in CGI +; mode skips this line and ignores its content if this directive is turned on. +; http://php.net/cgi.check-shebang-line +;cgi.check_shebang_line=1 + +;;;;;;;;;;;;;;;; +; File Uploads ; +;;;;;;;;;;;;;;;; + +; Whether to allow HTTP file uploads. +; http://php.net/file-uploads +file_uploads = On + +; Temporary directory for HTTP uploaded files (will use system default if not +; specified). +; http://php.net/upload-tmp-dir +;upload_tmp_dir = + +; Maximum allowed size for uploaded files. +; http://php.net/upload-max-filesize +upload_max_filesize = 64M + +; Maximum number of files that can be uploaded via a single request +max_file_uploads = 20 + +;;;;;;;;;;;;;;;;;; +; Fopen wrappers ; +;;;;;;;;;;;;;;;;;; + +; Whether to allow the treatment of URLs (like http:// or ftp://) as files. +; http://php.net/allow-url-fopen +allow_url_fopen = On + +; Whether to allow include/require to open URLs (like http:// or ftp://) as files. +; http://php.net/allow-url-include +allow_url_include = Off + +; Define the anonymous ftp password (your email address). PHP's default setting +; for this is empty. +; http://php.net/from +;from="john@doe.com" + +; Define the User-Agent string. PHP's default setting for this is empty. +; http://php.net/user-agent +;user_agent="PHP" + +; Default timeout for socket based streams (seconds) +; http://php.net/default-socket-timeout +default_socket_timeout = 60 + +; If your scripts have to deal with files from Macintosh systems, +; or you are running on a Mac and need to deal with files from +; unix or win32 systems, setting this flag will cause PHP to +; automatically detect the EOL character in those files so that +; fgets() and file() will work regardless of the source of the file. +; http://php.net/auto-detect-line-endings +;auto_detect_line_endings = Off + +;;;;;;;;;;;;;;;;;;;;;; +; Dynamic Extensions ; +;;;;;;;;;;;;;;;;;;;;;; + +; If you wish to have an extension loaded automatically, use the following +; syntax: +; +; extension=modulename +; +; For example: +; +; extension=mysqli +; +; When the extension library to load is not located in the default extension +; directory, You may specify an absolute path to the library file: +; +; extension=/path/to/extension/mysqli.so +; +; Note : The syntax used in previous PHP versions ('extension=.so' and +; 'extension='php_.dll') is supported for legacy reasons and may be +; deprecated in a future PHP major version. So, when it is possible, please +; move to the new ('extension=) syntax. +; +; Notes for Windows environments : +; +; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+) +; extension folders as well as the separate PECL DLL download (PHP 5+). +; Be sure to appropriately set the extension_dir directive. +; +;extension=bz2 +;extension=curl +;extension=ffi +;extension=ftp +;extension=fileinfo +;extension=gd2 +;extension=gettext +;extension=gmp +;extension=intl +;extension=imap +;extension=ldap +;extension=mbstring +;extension=exif ; Must be after mbstring as it depends on it +;extension=mysqli +;extension=oci8_12c ; Use with Oracle Database 12c Instant Client +;extension=odbc +;extension=openssl +;extension=pdo_firebird +;extension=pdo_mysql +;extension=pdo_oci +;extension=pdo_odbc +;extension=pdo_pgsql +;extension=pdo_sqlite +;extension=pgsql +;extension=shmop + +; The MIBS data available in the PHP distribution must be installed. +; See http://www.php.net/manual/en/snmp.installation.php +;extension=snmp + +;extension=soap +;extension=sockets +;extension=sodium +;extension=sqlite3 +;extension=tidy +;extension=xmlrpc +;extension=xsl + +;;;;;;;;;;;;;;;;;;; +; Module Settings ; +;;;;;;;;;;;;;;;;;;; + +[CLI Server] +; Whether the CLI web server uses ANSI color coding in its terminal output. +cli_server.color = On + +[Date] +; Defines the default timezone used by the date functions +; http://php.net/date.timezone +;date.timezone = + +; http://php.net/date.default-latitude +;date.default_latitude = 31.7667 + +; http://php.net/date.default-longitude +;date.default_longitude = 35.2333 + +; http://php.net/date.sunrise-zenith +;date.sunrise_zenith = 90.833333 + +; http://php.net/date.sunset-zenith +;date.sunset_zenith = 90.833333 + +[filter] +; http://php.net/filter.default +;filter.default = unsafe_raw + +; http://php.net/filter.default-flags +;filter.default_flags = + +[iconv] +; Use of this INI entry is deprecated, use global input_encoding instead. +; If empty, default_charset or input_encoding or iconv.input_encoding is used. +; The precedence is: default_charset < input_encoding < iconv.input_encoding +;iconv.input_encoding = + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;iconv.internal_encoding = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; If empty, default_charset or output_encoding or iconv.output_encoding is used. +; The precedence is: default_charset < output_encoding < iconv.output_encoding +; To use an output encoding conversion, iconv's output handler must be set +; otherwise output encoding conversion cannot be performed. +;iconv.output_encoding = + +[imap] +; rsh/ssh logins are disabled by default. Use this INI entry if you want to +; enable them. Note that the IMAP library does not filter mailbox names before +; passing them to rsh/ssh command, thus passing untrusted data to this function +; with rsh/ssh enabled is insecure. +;imap.enable_insecure_rsh=0 + +[intl] +;intl.default_locale = +; This directive allows you to produce PHP errors when some error +; happens within intl functions. The value is the level of the error produced. +; Default is 0, which does not produce any errors. +;intl.error_level = E_WARNING +;intl.use_exceptions = 0 + +[sqlite3] +; Directory pointing to SQLite3 extensions +; http://php.net/sqlite3.extension-dir +;sqlite3.extension_dir = + +; SQLite defensive mode flag (only available from SQLite 3.26+) +; When the defensive flag is enabled, language features that allow ordinary +; SQL to deliberately corrupt the database file are disabled. This forbids +; writing directly to the schema, shadow tables (eg. FTS data tables), or +; the sqlite_dbpage virtual table. +; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html +; (for older SQLite versions, this flag has no use) +;sqlite3.defensive = 1 + +[Pcre] +; PCRE library backtracking limit. +; http://php.net/pcre.backtrack-limit +;pcre.backtrack_limit=100000 + +; PCRE library recursion limit. +; Please note that if you set this value to a high number you may consume all +; the available process stack and eventually crash PHP (due to reaching the +; stack size limit imposed by the Operating System). +; http://php.net/pcre.recursion-limit +;pcre.recursion_limit=100000 + +; Enables or disables JIT compilation of patterns. This requires the PCRE +; library to be compiled with JIT support. +;pcre.jit=1 + +[Pdo] +; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off" +; http://php.net/pdo-odbc.connection-pooling +;pdo_odbc.connection_pooling=strict + +[Pdo_mysql] +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +pdo_mysql.default_socket= + +[Phar] +; http://php.net/phar.readonly +;phar.readonly = On + +; http://php.net/phar.require-hash +;phar.require_hash = On + +;phar.cache_list = + +[mail function] +; For Win32 only. +; http://php.net/smtp +SMTP = localhost +; http://php.net/smtp-port +smtp_port = 25 + +; For Win32 only. +; http://php.net/sendmail-from +;sendmail_from = me@example.com + +; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). +; http://php.net/sendmail-path +;sendmail_path = + +; Force the addition of the specified parameters to be passed as extra parameters +; to the sendmail binary. These parameters will always replace the value of +; the 5th parameter to mail(). +;mail.force_extra_parameters = + +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename +mail.add_x_header = Off + +; The path to a log file that will log all mail() calls. Log entries include +; the full path of the script, line number, To address and headers. +;mail.log = +; Log mail to syslog (Event Log on Windows). +;mail.log = syslog + +[ODBC] +; http://php.net/odbc.default-db +;odbc.default_db = Not yet implemented + +; http://php.net/odbc.default-user +;odbc.default_user = Not yet implemented + +; http://php.net/odbc.default-pw +;odbc.default_pw = Not yet implemented + +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + +; Allow or prevent persistent links. +; http://php.net/odbc.allow-persistent +odbc.allow_persistent = On + +; Check that a connection is still valid before reuse. +; http://php.net/odbc.check-persistent +odbc.check_persistent = On + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/odbc.max-persistent +odbc.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +; http://php.net/odbc.max-links +odbc.max_links = -1 + +; Handling of LONG fields. Returns number of bytes to variables. 0 means +; passthru. +; http://php.net/odbc.defaultlrl +odbc.defaultlrl = 4096 + +; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. +; See the documentation on odbc_binmode and odbc_longreadlen for an explanation +; of odbc.defaultlrl and odbc.defaultbinmode +; http://php.net/odbc.defaultbinmode +odbc.defaultbinmode = 1 + +[MySQLi] + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysqli.allow_local_infile +;mysqli.allow_local_infile = On + +; Allow or prevent persistent links. +; http://php.net/mysqli.allow-persistent +mysqli.allow_persistent = On + +; Maximum number of links. -1 means no limit. +; http://php.net/mysqli.max-links +mysqli.max_links = -1 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +; http://php.net/mysqli.default-port +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/mysqli.default-socket +mysqli.default_socket = + +; Default host for mysqli_connect() (doesn't apply in safe mode). +; http://php.net/mysqli.default-host +mysqli.default_host = + +; Default user for mysqli_connect() (doesn't apply in safe mode). +; http://php.net/mysqli.default-user +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +; http://php.net/mysqli.default-pw +mysqli.default_pw = + +; Allow or prevent reconnect +mysqli.reconnect = Off + +[mysqlnd] +; Enable / Disable collection of general statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statistics by mysqlnd which can be +; used to tune and monitor MySQL operations. +mysqlnd.collect_memory_statistics = Off + +; Records communication from all extensions using mysqlnd to the specified log +; file. +; http://php.net/mysqlnd.debug +;mysqlnd.debug = + +; Defines which queries will be logged. +;mysqlnd.log_mask = 0 + +; Default size of the mysqlnd memory pool, which is used by result sets. +;mysqlnd.mempool_default_size = 16000 + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +;mysqlnd.net_read_buffer_size = 32768 + +; Timeout for network requests in seconds. +;mysqlnd.net_read_timeout = 31536000 + +; SHA-256 Authentication Plugin related. File with the MySQL server public RSA +; key. +;mysqlnd.sha256_server_public_key = + +[OCI8] + +; Connection: Enables privileged connections using external +; credentials (OCI_SYSOPER, OCI_SYSDBA) +; http://php.net/oci8.privileged-connect +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +; http://php.net/oci8.max-persistent +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +; http://php.net/oci8.persistent-timeout +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +; http://php.net/oci8.ping-interval +;oci8.ping_interval = 60 + +; Connection: Set this to a user chosen connection class to be used +; for all pooled server requests with Oracle 11g Database Resident +; Connection Pooling (DRCP). To use DRCP, this value should be set to +; the same string for all web servers running the same application, +; the database pool must be configured, and the connection string must +; specify to use a pooled server. +;oci8.connection_class = + +; High Availability: Using On lets PHP receive Fast Application +; Notification (FAN) events generated when a database node fails. The +; database must also be configured to post FAN events. +;oci8.events = Off + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +; http://php.net/oci8.statement-cache-size +;oci8.statement_cache_size = 20 + +; Tuning: Enables statement prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +; http://php.net/oci8.default-prefetch +;oci8.default_prefetch = 100 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +; http://php.net/oci8.old-oci-close-semantics +;oci8.old_oci_close_semantics = Off + +[PostgreSQL] +; Allow or prevent persistent links. +; http://php.net/pgsql.allow-persistent +pgsql.allow_persistent = On + +; Detect broken persistent links always with pg_pconnect(). +; Auto reset feature requires a little overheads. +; http://php.net/pgsql.auto-reset-persistent +pgsql.auto_reset_persistent = Off + +; Maximum number of persistent links. -1 means no limit. +; http://php.net/pgsql.max-persistent +pgsql.max_persistent = -1 + +; Maximum number of links (persistent+non persistent). -1 means no limit. +; http://php.net/pgsql.max-links +pgsql.max_links = -1 + +; Ignore PostgreSQL backends Notice message or not. +; Notice message logging require a little overheads. +; http://php.net/pgsql.ignore-notice +pgsql.ignore_notice = 0 + +; Log PostgreSQL backends Notice message or not. +; Unless pgsql.ignore_notice=0, module cannot log notice message. +; http://php.net/pgsql.log-notice +pgsql.log_notice = 0 + +[bcmath] +; Number of decimal digits for all bcmath functions. +; http://php.net/bcmath.scale +bcmath.scale = 0 + +[browscap] +; http://php.net/browscap +;browscap = extra/browscap.ini + +[Session] +; Handler used to store/retrieve data. +; http://php.net/session.save-handler +session.save_handler = files + +; Argument passed to save_handler. In the case of files, this is the path +; where data files are stored. Note: Windows users have to change this +; variable in order to use PHP's session functions. +; +; The path can be defined as: +; +; session.save_path = "N;/path" +; +; where N is an integer. Instead of storing all the session files in +; /path, what this will do is use subdirectories N-levels deep, and +; store the session data in those directories. This is useful if +; your OS has problems with many files in one directory, and is +; a more efficient layout for servers that handle many sessions. +; +; NOTE 1: PHP will not create this directory structure automatically. +; You can use the script in the ext/session dir for that purpose. +; NOTE 2: See the section on garbage collection below if you choose to +; use subdirectories for session storage +; +; The file storage module creates files using mode 600 by default. +; You can change that by using +; +; session.save_path = "N;MODE;/path" +; +; where MODE is the octal representation of the mode. Note that this +; does not overwrite the process's umask. +; http://php.net/session.save-path +;session.save_path = "/tmp" + +; Whether to use strict session mode. +; Strict session mode does not accept an uninitialized session ID, and +; regenerates the session ID if the browser sends an uninitialized session ID. +; Strict mode protects applications from session fixation via a session adoption +; vulnerability. It is disabled by default for maximum compatibility, but +; enabling it is encouraged. +; https://wiki.php.net/rfc/strict_sessions +session.use_strict_mode = 0 + +; Whether to use cookies. +; http://php.net/session.use-cookies +session.use_cookies = 1 + +; http://php.net/session.cookie-secure +;session.cookie_secure = + +; This option forces PHP to fetch and use a cookie for storing and maintaining +; the session id. We encourage this operation as it's very helpful in combating +; session hijacking when not specifying and managing your own session id. It is +; not the be-all and end-all of session hijacking defense, but it's a good start. +; http://php.net/session.use-only-cookies +session.use_only_cookies = 1 + +; Name of the session (used as cookie name). +; http://php.net/session.name +session.name = PHPSESSID + +; Initialize session on request startup. +; http://php.net/session.auto-start +session.auto_start = 0 + +; Lifetime in seconds of cookie or, if 0, until browser is restarted. +; http://php.net/session.cookie-lifetime +session.cookie_lifetime = 0 + +; The path for which the cookie is valid. +; http://php.net/session.cookie-path +session.cookie_path = / + +; The domain for which the cookie is valid. +; http://php.net/session.cookie-domain +session.cookie_domain = + +; Whether or not to add the httpOnly flag to the cookie, which makes it +; inaccessible to browser scripting languages such as JavaScript. +; http://php.net/session.cookie-httponly +session.cookie_httponly = + +; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF) +; Current valid values are "Lax" or "Strict" +; https://tools.ietf.org/html/draft-west-first-party-cookies-07 +session.cookie_samesite = + +; Handler used to serialize data. php is the standard serializer of PHP. +; http://php.net/session.serialize-handler +session.serialize_handler = php + +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts on each request. +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; http://php.net/session.gc-probability +session.gc_probability = 1 + +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts on each request. +; For high volume production servers, using a value of 1000 is a more efficient approach. +; Default Value: 100 +; Development Value: 1000 +; Production Value: 1000 +; http://php.net/session.gc-divisor +session.gc_divisor = 1000 + +; After this number of seconds, stored data will be seen as 'garbage' and +; cleaned up by the garbage collection process. +; http://php.net/session.gc-maxlifetime +session.gc_maxlifetime = 1440 + +; NOTE: If you are using the subdirectory option for storing session files +; (see session.save_path above), then garbage collection does *not* +; happen automatically. You will need to do your own garbage +; collection through a shell script, cron entry, or some other method. +; For example, the following script would is the equivalent of +; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; find /path/to/sessions -cmin +24 -type f | xargs rm + +; Check HTTP Referer to invalidate externally stored URLs containing ids. +; HTTP_REFERER has to contain this substring for the session to be +; considered as valid. +; http://php.net/session.referer-check +session.referer_check = + +; Set to {nocache,private,public,} to determine HTTP caching aspects +; or leave this empty to avoid sending anti-caching headers. +; http://php.net/session.cache-limiter +session.cache_limiter = nocache + +; Document expires after n minutes. +; http://php.net/session.cache-expire +session.cache_expire = 180 + +; trans sid support is disabled by default. +; Use of trans sid may risk your users' security. +; Use this option with caution. +; - User may send URL contains active session ID +; to other person via. email/irc/etc. +; - URL that contains active session ID may be stored +; in publicly accessible computer. +; - User may access your site with the same session ID +; always using URL stored in browser's history or bookmarks. +; http://php.net/session.use-trans-sid +session.use_trans_sid = 0 + +; Set session ID character length. This value could be between 22 to 256. +; Shorter length than default is supported only for compatibility reason. +; Users should use 32 or more chars. +; http://php.net/session.sid-length +; Default Value: 32 +; Development Value: 26 +; Production Value: 26 +session.sid_length = 26 + +; The URL rewriter will look for URLs in a defined set of HTML tags. +;
is special; if you include them here, the rewriter will +; add a hidden field with the info which is otherwise appended +; to URLs. tag's action attribute URL will not be modified +; unless it is specified. +; Note that all valid entries require a "=", even if no value follows. +; Default Value: "a=href,area=href,frame=src,form=" +; Development Value: "a=href,area=href,frame=src,form=" +; Production Value: "a=href,area=href,frame=src,form=" +; http://php.net/url-rewriter.tags +session.trans_sid_tags = "a=href,area=href,frame=src,form=" + +; URL rewriter does not rewrite absolute URLs by default. +; To enable rewrites for absolute paths, target hosts must be specified +; at RUNTIME. i.e. use ini_set() +; tags is special. PHP will check action attribute's URL regardless +; of session.trans_sid_tags setting. +; If no host is defined, HTTP_HOST will be used for allowed host. +; Example value: php.net,www.php.net,wiki.php.net +; Use "," for multiple hosts. No spaces are allowed. +; Default Value: "" +; Development Value: "" +; Production Value: "" +;session.trans_sid_hosts="" + +; Define how many bits are stored in each character when converting +; the binary hash data to something readable. +; Possible values: +; 4 (4 bits: 0-9, a-f) +; 5 (5 bits: 0-9, a-v) +; 6 (6 bits: 0-9, a-z, A-Z, "-", ",") +; Default Value: 4 +; Development Value: 5 +; Production Value: 5 +; http://php.net/session.hash-bits-per-character +session.sid_bits_per_character = 5 + +; Enable upload progress tracking in $_SESSION +; Default Value: On +; Development Value: On +; Production Value: On +; http://php.net/session.upload-progress.enabled +;session.upload_progress.enabled = On + +; Cleanup the progress information as soon as all POST data has been read +; (i.e. upload completed). +; Default Value: On +; Development Value: On +; Production Value: On +; http://php.net/session.upload-progress.cleanup +;session.upload_progress.cleanup = On + +; A prefix used for the upload progress key in $_SESSION +; Default Value: "upload_progress_" +; Development Value: "upload_progress_" +; Production Value: "upload_progress_" +; http://php.net/session.upload-progress.prefix +;session.upload_progress.prefix = "upload_progress_" + +; The index name (concatenated with the prefix) in $_SESSION +; containing the upload progress information +; Default Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Development Value: "PHP_SESSION_UPLOAD_PROGRESS" +; Production Value: "PHP_SESSION_UPLOAD_PROGRESS" +; http://php.net/session.upload-progress.name +;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS" + +; How frequently the upload progress should be updated. +; Given either in percentages (per-file), or in bytes +; Default Value: "1%" +; Development Value: "1%" +; Production Value: "1%" +; http://php.net/session.upload-progress.freq +;session.upload_progress.freq = "1%" + +; The minimum delay between updates, in seconds +; Default Value: 1 +; Development Value: 1 +; Production Value: 1 +; http://php.net/session.upload-progress.min-freq +;session.upload_progress.min_freq = "1" + +; Only write session data when session data is changed. Enabled by default. +; http://php.net/session.lazy-write +;session.lazy_write = On + +[Assertion] +; Switch whether to compile assertions at all (to have no overhead at run-time) +; -1: Do not compile at all +; 0: Jump over assertion at run-time +; 1: Execute assertions +; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1) +; Default Value: 1 +; Development Value: 1 +; Production Value: -1 +; http://php.net/zend.assertions +zend.assertions = -1 + +; Assert(expr); active by default. +; http://php.net/assert.active +;assert.active = On + +; Throw an AssertionError on failed assertions +; http://php.net/assert.exception +;assert.exception = On + +; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active) +; http://php.net/assert.warning +;assert.warning = On + +; Don't bail out by default. +; http://php.net/assert.bail +;assert.bail = Off + +; User-function to be called if an assertion fails. +; http://php.net/assert.callback +;assert.callback = 0 + +[COM] +; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs +; http://php.net/com.typelib-file +;com.typelib_file = + +; allow Distributed-COM calls +; http://php.net/com.allow-dcom +;com.allow_dcom = true + +; autoregister constants of a component's typlib on com_load() +; http://php.net/com.autoregister-typelib +;com.autoregister_typelib = true + +; register constants casesensitive +; http://php.net/com.autoregister-casesensitive +;com.autoregister_casesensitive = false + +; show warnings on duplicate constant registrations +; http://php.net/com.autoregister-verbose +;com.autoregister_verbose = true + +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + +[mbstring] +; language for internal character representation. +; This affects mb_send_mail() and mbstring.detect_order. +; http://php.net/mbstring.language +;mbstring.language = Japanese + +; Use of this INI entry is deprecated, use global internal_encoding instead. +; internal/script encoding. +; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) +; If empty, default_charset or internal_encoding or iconv.internal_encoding is used. +; The precedence is: default_charset < internal_encoding < iconv.internal_encoding +;mbstring.internal_encoding = + +; Use of this INI entry is deprecated, use global input_encoding instead. +; http input encoding. +; mbstring.encoding_translation = On is needed to use this setting. +; If empty, default_charset or input_encoding or mbstring.input is used. +; The precedence is: default_charset < input_encoding < mbsting.http_input +; http://php.net/mbstring.http-input +;mbstring.http_input = + +; Use of this INI entry is deprecated, use global output_encoding instead. +; http output encoding. +; mb_output_handler must be registered as output buffer to function. +; If empty, default_charset or output_encoding or mbstring.http_output is used. +; The precedence is: default_charset < output_encoding < mbstring.http_output +; To use an output encoding conversion, mbstring's output handler must be set +; otherwise output encoding conversion cannot be performed. +; http://php.net/mbstring.http-output +;mbstring.http_output = + +; enable automatic encoding translation according to +; mbstring.internal_encoding setting. Input chars are +; converted to internal encoding by setting this to On. +; Note: Do _not_ use automatic encoding translation for +; portable libs/applications. +; http://php.net/mbstring.encoding-translation +;mbstring.encoding_translation = Off + +; automatic encoding detection order. +; "auto" detect order is changed according to mbstring.language +; http://php.net/mbstring.detect-order +;mbstring.detect_order = auto + +; substitute_character used when character cannot be converted +; one from another +; http://php.net/mbstring.substitute-character +;mbstring.substitute_character = none + +; enable strict encoding detection. +; Default: Off +;mbstring.strict_detection = On + +; This directive specifies the regex pattern of content types for which mb_output_handler() +; is activated. +; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml) +;mbstring.http_output_conv_mimetype= + +; This directive specifies maximum stack depth for mbstring regular expressions. It is similar +; to the pcre.recursion_limit for PCRE. +; Default: 100000 +;mbstring.regex_stack_limit=100000 + +; This directive specifies maximum retry count for mbstring regular expressions. It is similar +; to the pcre.backtrack_limit for PCRE. +; Default: 1000000 +;mbstring.regex_retry_limit=1000000 + +[gd] +; Tell the jpeg decode to ignore warnings and try to create +; a gd image. The warning will then be displayed as notices +; disabled by default +; http://php.net/gd.jpeg-ignore-warning +;gd.jpeg_ignore_warning = 1 + +[exif] +; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. +; With mbstring support this will automatically be converted into the encoding +; given by corresponding encode setting. When empty mbstring.internal_encoding +; is used. For the decode settings you can distinguish between motorola and +; intel byte order. A decode setting cannot be empty. +; http://php.net/exif.encode-unicode +;exif.encode_unicode = ISO-8859-15 + +; http://php.net/exif.decode-unicode-motorola +;exif.decode_unicode_motorola = UCS-2BE + +; http://php.net/exif.decode-unicode-intel +;exif.decode_unicode_intel = UCS-2LE + +; http://php.net/exif.encode-jis +;exif.encode_jis = + +; http://php.net/exif.decode-jis-motorola +;exif.decode_jis_motorola = JIS + +; http://php.net/exif.decode-jis-intel +;exif.decode_jis_intel = JIS + +[Tidy] +; The path to a default tidy configuration file to use when using tidy +; http://php.net/tidy.default-config +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +; http://php.net/tidy.clean-output +tidy.clean_output = Off + +[soap] +; Enables or disables WSDL caching feature. +; http://php.net/soap.wsdl-cache-enabled +soap.wsdl_cache_enabled=1 + +; Sets the directory name where SOAP extension will put cache files. +; http://php.net/soap.wsdl-cache-dir +soap.wsdl_cache_dir="/tmp" + +; (time to live) Sets the number of second while cached file will be used +; instead of original one. +; http://php.net/soap.wsdl-cache-ttl +soap.wsdl_cache_ttl=86400 + +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + +[sysvshm] +; A default size of the shared memory segment +;sysvshm.init_mem = 10000 + +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + +[dba] +;dba.default_handler= + +[opcache] +; Determines if Zend OPCache is enabled +;opcache.enable=1 + +; Determines if Zend OPCache is enabled for the CLI version of PHP +;opcache.enable_cli=0 + +; The OPcache shared memory storage size. +;opcache.memory_consumption=128 + +; The amount of memory for interned strings in Mbytes. +;opcache.interned_strings_buffer=8 + +; The maximum number of keys (scripts) in the OPcache hash table. +; Only numbers between 200 and 1000000 are allowed. +;opcache.max_accelerated_files=10000 + +; The maximum percentage of "wasted" memory until a restart is scheduled. +;opcache.max_wasted_percentage=5 + +; When this directive is enabled, the OPcache appends the current working +; directory to the script key, thus eliminating possible collisions between +; files with the same name (basename). Disabling the directive improves +; performance, but may break existing applications. +;opcache.use_cwd=1 + +; When disabled, you must reset the OPcache manually or restart the +; webserver for changes to the filesystem to take effect. +;opcache.validate_timestamps=1 + +; How often (in seconds) to check file timestamps for changes to the shared +; memory storage allocation. ("1" means validate once per second, but only +; once per request. "0" means always validate) +;opcache.revalidate_freq=2 + +; Enables or disables file search in include_path optimization +;opcache.revalidate_path=0 + +; If disabled, all PHPDoc comments are dropped from the code to reduce the +; size of the optimized code. +;opcache.save_comments=1 + +; Allow file existence override (file_exists, etc.) performance feature. +;opcache.enable_file_override=0 + +; A bitmask, where each bit enables or disables the appropriate OPcache +; passes +;opcache.optimization_level=0x7FFFBFFF + +;opcache.dups_fix=0 + +; The location of the OPcache blacklist file (wildcards allowed). +; Each OPcache blacklist file is a text file that holds the names of files +; that should not be accelerated. The file format is to add each filename +; to a new line. The filename may be a full path or just a file prefix +; (i.e., /var/www/x blacklists all the files and directories in /var/www +; that start with 'x'). Line starting with a ; are ignored (comments). +;opcache.blacklist_filename= + +; Allows exclusion of large files from being cached. By default all files +; are cached. +;opcache.max_file_size=0 + +; Check the cache checksum each N requests. +; The default value of "0" means that the checks are disabled. +;opcache.consistency_checks=0 + +; How long to wait (in seconds) for a scheduled restart to begin if the cache +; is not being accessed. +;opcache.force_restart_timeout=180 + +; OPcache error_log file name. Empty string assumes "stderr". +;opcache.error_log= + +; All OPcache errors go to the Web server log. +; By default, only fatal errors (level 0) or errors (level 1) are logged. +; You can also enable warnings (level 2), info messages (level 3) or +; debug messages (level 4). +;opcache.log_verbosity_level=1 + +; Preferred Shared Memory back-end. Leave empty and let the system decide. +;opcache.preferred_memory_model= + +; Protect the shared memory from unexpected writing during script execution. +; Useful for internal debugging only. +;opcache.protect_memory=0 + +; Allows calling OPcache API functions only from PHP scripts which path is +; started from specified string. The default "" means no restriction +;opcache.restrict_api= + +; Mapping base of shared memory segments (for Windows only). All the PHP +; processes have to map shared memory into the same address space. This +; directive allows to manually fix the "Unable to reattach to base address" +; errors. +;opcache.mmap_base= + +; Facilitates multiple OPcache instances per user (for Windows only). All PHP +; processes with the same cache ID and user share an OPcache instance. +;opcache.cache_id= + +; Enables and sets the second level cache directory. +; It should improve performance when SHM memory is full, at server restart or +; SHM reset. The default "" disables file based caching. +;opcache.file_cache= + +; Enables or disables opcode caching in shared memory. +;opcache.file_cache_only=0 + +; Enables or disables checksum validation when script loaded from file cache. +;opcache.file_cache_consistency_checks=1 + +; Implies opcache.file_cache_only=1 for a certain process that failed to +; reattach to the shared memory (for Windows only). Explicitly enabled file +; cache is required. +;opcache.file_cache_fallback=1 + +; Enables or disables copying of PHP code (text segment) into HUGE PAGES. +; This should improve performance, but requires appropriate OS configuration. +;opcache.huge_code_pages=1 + +; Validate cached file permissions. +;opcache.validate_permission=0 + +; Prevent name collisions in chroot'ed environment. +;opcache.validate_root=0 + +; If specified, it produces opcode dumps for debugging different stages of +; optimizations. +;opcache.opt_debug_level=0 + +; Specifies a PHP script that is going to be compiled and executed at server +; start-up. +; http://php.net/opcache.preload +;opcache.preload= + +; Preloading code as root is not allowed for security reasons. This directive +; facilitates to let the preloading to be run as another user. +; http://php.net/opcache.preload_user +;opcache.preload_user= + +; Prevents caching files that are less than this number of seconds old. It +; protects from caching of incompletely updated files. In case all file updates +; on your site are atomic, you may increase performance by setting it to "0". +;opcache.file_update_protection=2 + +; Absolute path used to store shared lockfiles (for *nix only). +;opcache.lockfile_path=/tmp + +[curl] +; A default value for the CURLOPT_CAINFO option. This is required to be an +; absolute path. +;curl.cainfo = + +[openssl] +; The location of a Certificate Authority (CA) file on the local filesystem +; to use when verifying the identity of SSL/TLS peers. Most users should +; not specify a value for this directive as PHP will attempt to use the +; OS-managed cert stores in its absence. If specified, this value may still +; be overridden on a per-stream basis via the "cafile" SSL stream context +; option. +;openssl.cafile= + +; If openssl.cafile is not specified or if the CA file is not found, the +; directory pointed to by openssl.capath is searched for a suitable +; certificate. This value must be a correctly hashed certificate directory. +; Most users should not specify a value for this directive as PHP will +; attempt to use the OS-managed cert stores in its absence. If specified, +; this value may still be overridden on a per-stream basis via the "capath" +; SSL stream context option. +;openssl.capath= + +[ffi] +; FFI API restriction. Possible values: +; "preload" - enabled in CLI scripts and preloaded files (default) +; "false" - always disabled +; "true" - always enabled +;ffi.enable=preload + +; List of headers files to preload, wildcard patterns allowed. +;ffi.preload= diff --git a/contrib/docker/start.apache.sh b/contrib/docker/start.apache.sh new file mode 100644 index 000000000..458d25616 --- /dev/null +++ b/contrib/docker/start.apache.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Create the storage tree if needed and fix permissions +cp -r storage.skel/* storage/ +chown -R www-data:www-data storage/ bootstrap/ + +# Refresh the environment +php artisan storage:link +php artisan horizon:assets +php artisan route:cache +php artisan view:cache +php artisan config:cache + +# Finally run Apache +exec apache2-foreground \ No newline at end of file diff --git a/contrib/docker/start.fpm.sh b/contrib/docker/start.fpm.sh new file mode 100644 index 000000000..2f228ecfe --- /dev/null +++ b/contrib/docker/start.fpm.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Create the storage tree if needed and fix permissions +cp -r storage.skel/* storage/ +chown -R www-data:www-data storage/ bootstrap/ + +# Refresh the environment +php artisan storage:link +php artisan horizon:assets +php artisan route:cache +php artisan view:cache +php artisan config:cache + +# Finally run FPM +exec php-fpm \ No newline at end of file diff --git a/contrib/docker/start.sh b/contrib/docker/start.sh deleted file mode 100755 index 2e0d99e60..000000000 --- a/contrib/docker/start.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# Create the storage tree if needed and fix permissions -cp -r storage.skel/* storage/ -chown -R www-data:www-data storage/ bootstrap/ - -# Refresh the environment -php artisan storage:link -php artisan horizon:assets -php artisan route:cache -php artisan view:cache -php artisan config:cache - -# Migrate database if the app was upgraded -# gosu www-data:www-data php artisan migrate --force - -# Run other specific migratins if required -# gosu www-data:www-data php artisan update - -# Run a worker if it is set as embedded -if [ "$HORIZON_EMBED" = "true" ]; then - gosu www-data:www-data php artisan horizon & -fi - -# Finally run Apache -exec apache2-foreground diff --git a/database/migrations/2020_04_11_045459_add_fetched_at_to_profiles_table.php b/database/migrations/2020_04_11_045459_add_fetched_at_to_profiles_table.php new file mode 100644 index 000000000..de4ce0dcb --- /dev/null +++ b/database/migrations/2020_04_11_045459_add_fetched_at_to_profiles_table.php @@ -0,0 +1,44 @@ +timestamp('last_fetched_at')->nullable(); + $table->unsignedInteger('status_count')->default(0)->nullable(); + $table->unsignedInteger('followers_count')->default(0)->nullable(); + $table->unsignedInteger('following_count')->default(0)->nullable(); + $table->string('webfinger')->unique()->nullable()->index(); + $table->string('avatar_url')->nullable(); + $table->dropColumn('keybase_proof'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('profiles', function (Blueprint $table) { + $table->dropColumn('last_fetched_at'); + $table->dropColumn('status_count'); + $table->dropColumn('followers_count'); + $table->dropColumn('following_count'); + $table->dropColumn('webfinger'); + $table->dropColumn('avatar_url'); + $table->text('keybase_proof')->nullable()->after('post_layout'); + }); + } +} diff --git a/docker-compose.yml b/docker-compose.yml index b0cfc8b19..772fd7c2f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,50 +12,49 @@ version: '3' services: +## App and Worker app: # Comment to use dockerhub image build: context: . dockerfile: contrib/docker/Dockerfile.apache - #dockerfile: contrib/docker/Dockerfile.fpm image: pixelfed restart: unless-stopped - ## If you have a traefik running, uncomment this to expose Pixelfed - # labels: - # - traefik.enable=true - # - traefik.frontend.rule=Host:your.url - # - traefik.port=80 - ## If you have a standard reverse proxy, uncommit this to expose Pixelfed - # ports: - # - "127.0.0.1:8080:80" env_file: - - ./.env + - ./.env.docker volumes: - "app-storage:/var/www/storage" - "app-bootstrap:/var/www/bootstrap" - - "./.env:/var/www/.env" + - "./.env.docker:/var/www/.env" networks: - external - internal + ports: + - "8080:80" + depends_on: + - db + - redis - worker: # Comment this whole block if HORIZON_EMBED is true. - # Comment to use dockerhub image + worker: build: context: . dockerfile: contrib/docker/Dockerfile.apache - #dockerfile: contrib/docker/Dockerfile.fpm image: pixelfed restart: unless-stopped env_file: - - ./.env + - ./.env.docker volumes: - "app-storage:/var/www/storage" - "app-bootstrap:/var/www/bootstrap" networks: - - external # Required for ActivityPub + - external - internal command: gosu www-data php artisan horizon - + depends_on: + - db + - redis + +## DB and Cache db: image: mysql:8.0 restart: unless-stopped @@ -78,12 +77,11 @@ services: networks: - internal -# Adjust your volume data in order to store data where you wish volumes: - redis-data: db-data: + redis-data: app-storage: - app-bootstrap: + app-bootstrap: networks: internal: diff --git a/package-lock.json b/package-lock.json index 4824dc1c4..b4f697680 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1080,9 +1080,9 @@ } }, "acorn": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==" + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==" }, "adjust-sourcemap-loader": { "version": "1.2.0", @@ -1306,7 +1306,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "requires": { "inherits": "2.0.1" @@ -1430,7 +1430,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -1447,7 +1447,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" } } @@ -2497,12 +2497,12 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" }, "regexpu-core": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "requires": { "regenerate": "^1.2.1", @@ -2512,12 +2512,12 @@ }, "regjsgen": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" }, "regjsparser": { "version": "0.1.5", - "resolved": "http://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "requires": { "jsesc": "~0.5.0" @@ -2758,7 +2758,7 @@ "dependencies": { "globby": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "requires": { "array-union": "^1.0.1", @@ -2770,7 +2770,7 @@ "dependencies": { "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } @@ -3263,7 +3263,7 @@ "dependencies": { "array-flatten": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "debug": { @@ -3606,7 +3606,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { "ansi-styles": "^2.2.1", @@ -3618,7 +3618,7 @@ }, "supports-color": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" } } @@ -4833,7 +4833,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" @@ -4887,7 +4887,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" @@ -7309,7 +7309,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", @@ -7430,7 +7430,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" } } @@ -7611,7 +7611,7 @@ "dependencies": { "convert-source-map": { "version": "0.3.5", - "resolved": "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz", "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=", "dev": true } diff --git a/public/_landing/1.jpeg b/public/_landing/1.jpeg new file mode 100644 index 000000000..322400971 Binary files /dev/null and b/public/_landing/1.jpeg differ diff --git a/public/_landing/2.jpeg b/public/_landing/2.jpeg new file mode 100644 index 000000000..0f79791c7 Binary files /dev/null and b/public/_landing/2.jpeg differ diff --git a/public/_landing/3.jpeg b/public/_landing/3.jpeg new file mode 100644 index 000000000..6e8bf1227 Binary files /dev/null and b/public/_landing/3.jpeg differ diff --git a/public/_landing/4.jpeg b/public/_landing/4.jpeg new file mode 100644 index 000000000..e6ee63e98 Binary files /dev/null and b/public/_landing/4.jpeg differ diff --git a/public/_landing/5.jpeg b/public/_landing/5.jpeg new file mode 100644 index 000000000..c0ed43562 Binary files /dev/null and b/public/_landing/5.jpeg differ diff --git a/public/_landing/6.jpeg b/public/_landing/6.jpeg new file mode 100644 index 000000000..6c727c447 Binary files /dev/null and b/public/_landing/6.jpeg differ diff --git a/public/_landing/7.jpeg b/public/_landing/7.jpeg new file mode 100644 index 000000000..a81825b10 Binary files /dev/null and b/public/_landing/7.jpeg differ diff --git a/public/_landing/8.jpeg b/public/_landing/8.jpeg new file mode 100644 index 000000000..646cacd4f Binary files /dev/null and b/public/_landing/8.jpeg differ diff --git a/public/_landing/9.jpeg b/public/_landing/9.jpeg new file mode 100644 index 000000000..cebaa1be5 Binary files /dev/null and b/public/_landing/9.jpeg differ diff --git a/public/css/landing.css b/public/css/landing.css index e2974cc95..d22cbdab9 100644 Binary files a/public/css/landing.css and b/public/css/landing.css differ diff --git a/public/js/profile.js b/public/js/profile.js index 806e83459..eff773157 100644 Binary files a/public/js/profile.js and b/public/js/profile.js differ diff --git a/public/js/rempos.js b/public/js/rempos.js new file mode 100644 index 000000000..70817e0b0 Binary files /dev/null and b/public/js/rempos.js differ diff --git a/public/js/rempro.js b/public/js/rempro.js new file mode 100644 index 000000000..b4de8b4fd Binary files /dev/null and b/public/js/rempro.js differ diff --git a/public/js/search.js b/public/js/search.js index 5c0bf03f9..acfbfdd18 100644 Binary files a/public/js/search.js and b/public/js/search.js differ diff --git a/public/js/status.js b/public/js/status.js index 2cce0091d..1be968cb8 100644 Binary files a/public/js/status.js and b/public/js/status.js differ diff --git a/public/js/story-compose.js b/public/js/story-compose.js index 71e2ab7f3..6d3acbdff 100644 Binary files a/public/js/story-compose.js and b/public/js/story-compose.js differ diff --git a/public/js/theme-monokai.js b/public/js/theme-monokai.js index 842203af1..c8ed1e390 100644 Binary files a/public/js/theme-monokai.js and b/public/js/theme-monokai.js differ diff --git a/public/js/timeline.js b/public/js/timeline.js index c551de0f6..8f71e86b8 100644 Binary files a/public/js/timeline.js and b/public/js/timeline.js differ diff --git a/public/js/vendor.js b/public/js/vendor.js index 2b86c0009..28945f655 100644 Binary files a/public/js/vendor.js and b/public/js/vendor.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 11a65a8bc..f671dabb5 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue index 1128178b6..b82d98770 100644 --- a/resources/assets/js/components/NotificationCard.vue +++ b/resources/assets/js/components/NotificationCard.vue @@ -40,7 +40,7 @@

- {{truncate(n.account.username)}} shared your post. + {{truncate(n.account.username)}} shared your post.

@@ -88,14 +88,9 @@ methods: { fetchNotifications() { - axios.get('/api/pixelfed/v1/notifications') + axios.get('/api/pixelfed/v1/notifications?pg=true') .then(res => { - let data = res.data.filter(n => { - if(n.type == 'share' && !status) { - return false; - } - return true; - }); + let data = res.data; let ids = res.data.map(n => n.id); this.notificationMaxId = Math.min(...ids); this.notifications = data; diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 9edc8ba86..52969d83a 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -137,60 +137,70 @@
-
+
-

Load more comments

+

+ + + +

-
-
- - {{truncate(reply.account.username,15)}} - - This comment may contain sensitive material - Show - - -
-
-

- +

+ +
+
+ {{truncate(reply.account.username,15)}} - + + This comment may contain sensitive material + Show + - - - - -

-

- - {{reply.favourites_count == 1 ? '1 like' : reply.favourites_count + ' likes'}} - Reply -

-
- - {{reply.thread ? 'Hide' : 'View'}} Replies ({{reply.reply_count}})
-
-
-

- - {{s.account.username}} - - - - - - -

-

- - {{s.favourites_count == 1 ? '1 like' : s.favourites_count + ' likes'}} -

+
+

+ + {{truncate(reply.account.username,15)}} + + + + + + +

+

+ + {{reply.favourites_count == 1 ? '1 like' : reply.favourites_count + ' likes'}} + Reply +

+
+ + {{reply.thread ? 'Hide' : 'View'}} Replies ({{reply.reply_count}}) +
+
+
+ +
+

+ + {{s.account.username}} + + + + + + +

+

+ + {{s.favourites_count == 1 ? '1 like' : s.favourites_count + ' likes'}} +

+
+
@@ -225,7 +235,7 @@
-
+
  • {{e}}
@@ -405,9 +415,9 @@ hide-footer centered title="Likes" - body-class="list-group-flush p-0"> + body-class="list-group-flush py-3 px-0">
-
+
@@ -418,9 +428,11 @@ {{user.username}}

-

- {{user.display_name}} - +

+ {{user.acct.split('@')[0]}}@{{user.acct.split('@')[1]}} +

+

+ {{user.display_name}}

@@ -465,9 +477,8 @@
-
- \ No newline at end of file diff --git a/resources/assets/js/components/RemoteProfile.vue b/resources/assets/js/components/RemoteProfile.vue new file mode 100644 index 000000000..6ca1ea1d5 --- /dev/null +++ b/resources/assets/js/components/RemoteProfile.vue @@ -0,0 +1,447 @@ + + + + + \ No newline at end of file diff --git a/resources/assets/js/components/SearchResults.vue b/resources/assets/js/components/SearchResults.vue index add955a89..9922ef131 100644 --- a/resources/assets/js/components/SearchResults.vue +++ b/resources/assets/js/components/SearchResults.vue @@ -9,86 +9,192 @@

An error occured, results could not be loaded.
Please try again later.

-
- -
-
-

Filters

-
- - -
-
- - -
-
- - -
+
+
+
+

Showing results for {{query}}

+
-
-
-

Showing results for {{query}}

-
- -
-

Hashtags

- -
-

- #{{hashtag.value}} -

-

- {{hashtag.count}} posts -

-
- -
- -
-

Profiles

- -
-

- -

-

- {{profile.value}} -

-

- - - -

-
- -
- -
-

Statuses

-
- -
-
+
+
+

HASHTAGS ({{results.hashtags.length}})

+
+ +
+
No results found
+
- -
-

No results found!

+
+
+

PROFILES ({{results.profiles.length}})

+
+ +
+
No results found
+
+
+
+
+

STATUSES ({{results.statuses.length}})

+
+
+ + + +
+
+
No results found
+
-
- +
+
+

Showing results for {{query}}

+
+
+
+
+

HASHTAGS ({{results.hashtags.length}})

+
+ +
+
No results found
+
+
+
+
+
+

Showing results for {{query}}

+
+
+
+
+

PROFILES ({{results.profiles.length}})

+
+
+
+
+
+
+
+
+ +
+

{{profile.value}}

+

+
+ + View Profile +
+
+
+
+
+
No results found
+
+
+
+
+
+

Showing results for {{query}}

+
+
+
+
+
+
+
+
+ +
+

{{profile.value}}

+

+
+ + + View Profile +
+
+
+
+
+
+
+

No results found

+
+ - -
+ +
@yield('content')
diff --git a/resources/views/profile/remote.blade.php b/resources/views/profile/remote.blade.php new file mode 100644 index 000000000..106286b3e --- /dev/null +++ b/resources/views/profile/remote.blade.php @@ -0,0 +1,16 @@ +@extends('layouts.app') + +@section('content') + +@endsection + +@push('meta') + +@endpush + +@push('scripts') + + +@endpush diff --git a/resources/views/profile/story.blade.php b/resources/views/profile/story.blade.php index 93d3a6966..c4b61d047 100644 --- a/resources/views/profile/story.blade.php +++ b/resources/views/profile/story.blade.php @@ -1,7 +1,7 @@ @extends('layouts.app') @section('content') - + @endsection @push('scripts') diff --git a/resources/views/search/results.blade.php b/resources/views/search/results.blade.php index ca0aade32..46843f8c9 100644 --- a/resources/views/search/results.blade.php +++ b/resources/views/search/results.blade.php @@ -4,12 +4,9 @@ @endsection + @push('scripts') - + @endpush \ No newline at end of file diff --git a/resources/views/settings/labs.blade.php b/resources/views/settings/labs.blade.php index 7afcda74d..9a74b1b9f 100644 --- a/resources/views/settings/labs.blade.php +++ b/resources/views/settings/labs.blade.php @@ -9,6 +9,9 @@
Warning: Some experimental features may contain bugs or missing functionality
+
+ We are deprecating Labs in a future version. Some features will no longer be supported. For more information, click here. +

UI

diff --git a/resources/views/settings/privacy.blade.php b/resources/views/settings/privacy.blade.php index 584529f49..a29574fef 100644 --- a/resources/views/settings/privacy.blade.php +++ b/resources/views/settings/privacy.blade.php @@ -10,8 +10,6 @@

Muted Users Blocked Users - Blocked keywords - Blocked instances

diff --git a/resources/views/site/help/discover.blade.php b/resources/views/site/help/discover.blade.php index 2235b8b59..8d2666f93 100644 --- a/resources/views/site/help/discover.blade.php +++ b/resources/views/site/help/discover.blade.php @@ -23,7 +23,7 @@
-
Discover Tips
+
Discover Tips
  • To make your posts more discoverable, add hashtags to your posts.
    • diff --git a/resources/views/site/help/hashtags.blade.php b/resources/views/site/help/hashtags.blade.php index 13733e4ac..2aa619679 100644 --- a/resources/views/site/help/hashtags.blade.php +++ b/resources/views/site/help/hashtags.blade.php @@ -54,7 +54,7 @@
-
Hashtag Tips
+
Hashtag Tips
  • You cannot add spaces or punctuation in a hashtag, or it will not work properly.
    • diff --git a/resources/views/site/help/labs-deprecation.blade.php b/resources/views/site/help/labs-deprecation.blade.php new file mode 100644 index 000000000..65f792200 --- /dev/null +++ b/resources/views/site/help/labs-deprecation.blade.php @@ -0,0 +1,21 @@ +@extends('site.help.partial.template', ['breadcrumb'=>'Labs Deprecation']) + +@section('section') + +
    +

    Labs Deprecation

    +
    +
    +

    We are deprecating Labs in a future version. No new experiments will be released. We will give 6 months notice before removing Labs.

    +
    +

    When will labs be deprecated?

    +

    TBA

    +
    +

    What features will be deprecated?

    +

    TBA

    +
    +

    Why is Labs being deprecated?

    +

    Labs was started in early 2019 to test experimental designs and features. Now the project is more mature, we are outgrowing some of these experiments.

    +
    +

    Last Updated: April 10/2020

    +@endsection \ No newline at end of file diff --git a/resources/views/site/help/partial/template.blade.php b/resources/views/site/help/partial/template.blade.php index 3d309998b..72646709b 100644 --- a/resources/views/site/help/partial/template.blade.php +++ b/resources/views/site/help/partial/template.blade.php @@ -3,12 +3,6 @@ @section('content')
    -
    -
    -

    Some sections may contain out of date information

    -

    We apologize for any inconvenience, we are working on updating the Help Center.

    -
    -
    diff --git a/resources/views/site/help/timelines.blade.php b/resources/views/site/help/timelines.blade.php index e3d5bffc0..ff200925f 100644 --- a/resources/views/site/help/timelines.blade.php +++ b/resources/views/site/help/timelines.blade.php @@ -28,7 +28,7 @@
-
Timeline Tips
+
Timeline Tips
  • You can mute or block accounts to prevent them from appearing in timelines.
    • diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php index d623792da..4583ae939 100644 --- a/resources/views/site/index.blade.php +++ b/resources/views/site/index.blade.php @@ -23,161 +23,281 @@ - +
    -
    +
    +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - +
    +

    Photo Sharing

    +

    For Everyone.

    +
    +
    +
    +
    +
    + + Pixelfed +
    +
    +

    Photo Sharing. For Everyone

    +
    +
    +
    +
    +

    Account Login

    +
    +
    + + @csrf +
    + +
    + + + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
    +
    + +
    + +
    + + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    + + +
    +
    + +
    -
    -
    -
    -
    +
    +

    + @if(config('pixelfed.open_registration')) + Register + · + @endif + Password Reset +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    +
    + +
    -
    -
    -
    - - - - +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    -
    -
    -
    -
    - -
    -
    -

    Pixelfed

    -

    Photo sharing for everyone

    -
    -
    - @if(true === config('pixelfed.open_registration')) -
    - @csrf -
    -
    - - - @if ($errors->has('name')) - - {{ $errors->first('name') }} - - @endif -
    -
    - -
    -
    - - - @if ($errors->has('username')) - - {{ $errors->first('username') }} - - @endif -
    -
    - -
    -
    - - - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
    -
    - -
    -
    - - - @if ($errors->has('password')) - - {{ $errors->first('password') }} - - @endif -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - -
    -
    -

    By signing up, you agree to our Terms of Use and Privacy Policy.

    -
    - @else -
    -
    -

    Registrations are closed.

    -

    You can find a list of other instances on the-federation.info/pixelfed or fediverse.network/pixelfed

    -
    -
    - @endif -
    -
    -
    -
    -

    Have an account? Log in

    +
    +
    +

    Simple. Powerful.

    +
    +
    +
    + + {{$data['stats']['posts']}} + Posts + + + {{$data['stats']['likes']}} + Likes + + + {{$data['stats']['hashtags']}} + Hashtags Used +
    +
    +

    A free and ethical photo sharing platform.

    +
    +
    +
    +
    +
    +
    +
    +

    Feature Packed.

    +
    +
    +

    The best for the brightest.

    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +

    Albums

    + Create an album with up to {{config('pixelfed.max_album_length')}} photos +
    +
    +
    +
    +
    +
    + +
    +
    +

    Collections

    + Organize your posts +
    +
    +
    +
    +
    +
    + +
    +
    +

    Filters

    + Add a filter to your photos +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +

    Comments

    + Comment on a post, or send a reply +
    +
    +
    +
    +
    +
    + +
    +
    +

    Discover

    + Explore categories, hashtags and topics +
    +
    +
    + @if(config('instance.stories.enabled')) +
    +
    +
    + +
    +
    +

    Stories

    + Share posts that disappear after 24h +
    +
    +
    + @endif
    -
    @include('layouts.partial.footer') diff --git a/resources/views/status/remote.blade.php b/resources/views/status/remote.blade.php new file mode 100644 index 000000000..f36a2f4be --- /dev/null +++ b/resources/views/status/remote.blade.php @@ -0,0 +1,17 @@ +@extends('layouts.app') + +@section('content') +
    + + + +@endsection + +@push('meta') + +@endpush + +@push('scripts') + + +@endpush diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index 73bf82309..11362b81f 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app',['title' => "A post by " . $user->username]) +@extends('layouts.app',['title' => "{$user->username} shared a post"]) @section('content')