Skip to content

L
Liman MYS - Çekirdek
Kaydet (Commit) 87973540 authored tarafından mertcelen's avatar mertcelen
Dosyalara gözat
Seçenekler

-Extension 0 bug fixed. 

-Certificate lowercase problem resolved.
-Liman restricted mode version fixed
-Hide extension button if it's only one in extension page.
-Extension page navigation simplified
-Extension page header fixed
-Unknown sandbox api fixed.
-Extension required version liman disabled for now.
üst 2fec603d
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 86 deletions
app/Http/Controllers/Certificate/MainController.php
Dosyayı görüntüle @ 87973540
......@@ -37,7 +37,10 @@ class MainController extends Controller
shell_exec("sudo update-ca-certificates");
// Create Certificate Object.
$cert = Certificate::create(request()->all());
$cert = Certificate::create([
"server_hostname" => strtolower(request('server_hostname')),
"origin" => request('origin')
]);
// Update Admin Notification
AdminNotification::where('id', request('notification_id'))->update([
......
app/Http/Controllers/Extension/MainController.php
Dosyayı görüntüle @ 87973540
......@@ -168,9 +168,9 @@ class MainController extends Controller
$json = json_decode($file, true);
if(array_key_exists("supportedLiman",$json) && version_compare(getVersion(),$json["supportedLiman"]) < 0){
return respond("Bu eklentiyi yükleyebilmek için Liman'ı güncellemelisiniz, gerekli minimum sürüm " . $json["supportedLiman"],201);
}
// if(array_key_exists("supportedLiman",$json) && version_compare(getVersion(),$json["supportedLiman"]) < 0){
// return respond("Bu eklentiyi yükleyebilmek için Liman'ı güncellemelisiniz, gerekli minimum sürüm " . $json["supportedLiman"],201);
// }
if (isset($verify)) {
$json["issuer"] = explode(" ", $verify, 4)[3];
......
app/Http/Helpers.php
Dosyayı görüntüle @ 87973540
......@@ -328,10 +328,10 @@ if (!function_exists('addCertificate')) {
"echo '$cert'| sudo tee /usr/local/share/ca-certificates/" . strtolower($file)
);
shell_exec("sudo update-ca-certificates");
// Create Certificate Object.
return Certificate::create([
"server_hostname" => $hostname,
"server_hostname" => strtolower($hostname),
"origin" => $port,
]);
}
......@@ -779,6 +779,19 @@ if (!function_exists('lDecrypt')) {
return base64_decode($stringToDecode);
}
}
if (!function_exists('getExtensionViewCount')) {
function getExtensionViewCount()
{
$count = intval(env('NAV_EXTENSION_HIDE_COUNT'));
if($count == null){
setEnv(['NAV_EXTENSION_HIDE_COUNT' => 10]);
return 10;
}
return $count;
}
}
if (!function_exists('setBaseDn')) {
function setBaseDn($ldap_host = null)
{
......
app/Http/Middleware/Server.php
Dosyayı görüntüle @ 87973540
......@@ -16,7 +16,7 @@ class Server
'origin' => server()->control_port,
])->exists()
) {
$message = __(":server_name isimli sunucu için gerekli SSL sertifikası henüz onaylanmamış!", [
$message = __(":server_name isimli sunucu için gerekli SSL sertifikası henüz eklenmemiş!", [
"server_name" =>
server()->name . "(" . server()->ip_address . ")",
]);
......
composer.json
Dosyayı görüntüle @ 87973540
......@@ -15,6 +15,7 @@
"ext-zip": "*",
"ankitpokhrel/tus-php": "^1.0",
"beyondcode/laravel-websockets": "^1.3",
"composer/semver": "1.5.1",
"doctrine/dbal": "^2.10",
"guzzlehttp/guzzle": "^6.3",
"icewind/smb": "^3.1",
......
composer.lock
Dosyayı görüntüle @ 87973540
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "48b0bb6e6123b4392e7c453f7068fa83",
"content-hash": "db3fcb58fe33c961a309456a2f624e4e",
"packages": [
{
"name": "ankitpokhrel/tus-php",
......@@ -251,6 +251,67 @@
],
"time": "2020-02-26T12:05:32+00:00"
},
{
"name": "composer/semver",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
"reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
"reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Composer\\Semver\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nils Adermann",
"email": "naderman@naderman.de",
"homepage": "http://www.naderman.de"
},
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
"homepage": "http://seld.be"
},
{
"name": "Rob Bast",
"email": "rob.bast@gmail.com",
"homepage": "http://robbast.nl"
}
],
"description": "Semver library that offers utilities, version constraint parsing and validation.",
"keywords": [
"semantic",
"semver",
"validation",
"versioning"
],
"time": "2020-01-13T12:06:48+00:00"
},
{
"name": "doctrine/cache",
"version": "1.10.0",
......@@ -4806,67 +4867,6 @@
],
"time": "2020-04-10T09:44:22+00:00"
},
{
"name": "composer/semver",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
"reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
"reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Composer\\Semver\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nils Adermann",
"email": "naderman@naderman.de",
"homepage": "http://www.naderman.de"
},
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
"homepage": "http://seld.be"
},
{
"name": "Rob Bast",
"email": "rob.bast@gmail.com",
"homepage": "http://robbast.nl"
}
],
"description": "Semver library that offers utilities, version constraint parsing and validation.",
"keywords": [
"semantic",
"semver",
"validation",
"versioning"
],
"time": "2020-01-13T12:06:48+00:00"
},
{
"name": "composer/spdx-licenses",
"version": "1.5.3",
......@@ -7510,5 +7510,6 @@
"ext-xml": "*",
"ext-zip": "*"
},
"platform-dev": []
"platform-dev": [],
"plugin-api-version": "1.1.0"
}
resources/lang/en.json
Dosyayı görüntüle @ 87973540
......@@ -250,7 +250,7 @@
"Birden fazla port yazmak için aralarında virgül bırakabilirsiniz.": "Birden fazla port yazmak için aralarında virgül bırakabilirsiniz.",
"Parametreyi silmek istediğinizden emin misiniz?": "Parametreyi silmek istediğinizden emin misiniz?",
":server_name isimli sunucuya erişim sağlanamadı!": ":server_name isimli sunucuya erişim sağlanamadı!",
":server_name isimli sunucu için gerekli SSL sertifikası henüz onaylanmamış!": ":server_name isimli sunucu için gerekli SSL sertifikası henüz onaylanmamış!",
":server_name isimli sunucu için gerekli SSL sertifikası henüz eklenmemiş!": ":server_name isimli sunucu için gerekli SSL sertifikası henüz eklenmemiş!",
"Başarılı": "Success",
"Kaydedildi!": "Kaydedildi!",
"Parola alanları uyuşmuyor!": "Parola alanları uyuşmuyor!",
......
resources/views/extension_pages/manager.blade.php
Dosyayı görüntüle @ 87973540
......@@ -142,7 +142,7 @@
])
<script>
$('input[name=ext_count]').val('{{intval(env('NAV_EXTENSION_HIDE_COUNT'))}}');
$('input[name=ext_count]').val('{{getExtensionViewCount()}}');
function downloadFile(form){
window.location.assign('/indir/eklenti/' + form.getElementsByTagName('select')[0].value);
setTimeout(function(){
......
resources/views/extension_pages/server.blade.php
Dosyayı görüntüle @ 87973540
......@@ -3,15 +3,7 @@
@section('content')
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{{route('home')}}">{{__("Ana Sayfa")}}</a></li>
<li class="breadcrumb-item"><a href="/l/{{extension()->id}}">{{extension()->display_name}} {{ __('Sunucuları') }}</a>
</li>
<li class="breadcrumb-item"><a href="/l/{{extension()->id}}/{{request('city')}}">{{cities(request('city'))}}</a></li>
@if($viewName === "index")
<li class="breadcrumb-item active" aria-current="page">{{server()->name}} - {{extension()->display_name}}</li>
@else
<li class="breadcrumb-item"><a href="/l/{{extension()->id}}/{{request('city')}}/{{server()->id}}">{{server()->name}} - {{extension()->display_name}}</a></li>
<li class="breadcrumb-item active" aria-current="page">{{__($viewName)}}</li>
@endif
<li class="breadcrumb-item active"><a href="/l/{{extension()->id}}/{{request('city')}}/{{server()->id}}">{{extension()->display_name . __(" - Ana Sayfa")}}</a></li>
</ol>
<div class="right" id="ext_menu" style="float:right;margin-top:-55px">
<button data-toggle="tooltip" title="Eklenti Ayarları" class="btn btn-primary" onclick="location.href = '{{route('extension_server_settings_page',[
......@@ -24,9 +16,12 @@
<button data-toggle="tooltip" title="Destek Al" class="btn btn-primary" onclick="location.href = 'mailto:{{env('APP_NOTIFICATION_EMAIL')}}?subject={{env('BRAND_NAME')}} {{extension()->display_name}} {{extension()->version}}'"><i class="fas fa-headset"></i></button>
</div>
@include('errors')
<div class="card">
@if(count($last) > 1)
<div class="card-header">
<ul id="quickNavBar" class="nav nav-tabs" role="tablist">
@foreach ($last as $extension=>$servers)
@php(list($extension_id,$extension_name) = explode(":",$extension))
@if(count($servers) == 1)
......@@ -54,9 +49,11 @@
@endif
@endforeach
</ul>
</div>
@endif
<div class="card-body">
<div class="tab-content">
<div class="tab-pane fade show active" role="tabpanel">
......@@ -65,6 +62,7 @@
</div>
</div>
</div>
<script>
$(function(){
let list = [];
......
resources/views/layouts/header.blade.php
Dosyayı görüntüle @ 87973540
......@@ -52,7 +52,7 @@
@if(count(extensions()))
<li class="nav-header">{{__("Eklentiler")}}</li>
@foreach(extensions() as $extension)
<li class="nav-item ext_nav" @if($loop->iteration > intval(env('NAV_EXTENSION_HIDE_COUNT')))style="display:none;"@endif>
<li class="nav-item ext_nav" @if($loop->iteration > getExtensionViewCount())style="display:none;"@endif>
<a href="/l/{{$extension->id}}" class="nav-link @if(request('extension_id') == $extension->id) active @endif">
@if(empty($extension->icon))
<i class="nav-icon fab fa-etsy"></i>
......@@ -65,7 +65,7 @@
</a>
</li>
@endforeach
@if(count(extensions()) > intval(env('NAV_EXTENSION_HIDE_COUNT')))
@if(count(extensions()) > getExtensionViewCount())
<li class="nav-item ext_nav_more_less">
<a href="javascript:void(0)" class="nav-link">
<p>{{__('...daha fazla')}}</p>
......
resources/views/layouts/master.blade.php
Dosyayı görüntüle @ 87973540
......@@ -134,11 +134,11 @@
checkNotifications();
@endif
$('.ext_nav').slice({{intval(env('NAV_EXTENSION_HIDE_COUNT'))}}, $('.ext_nav').length).hide();
$('.ext_nav').slice({{getExtensionViewCount()}}, $('.ext_nav').length).hide();
$('.ext_nav_more_less').click(function(){
if ($('.ext_nav').length == $('.ext_nav:visible').length) {
$('.ext_nav_more_less').find('p').text("{{__('...daha fazla')}}");
$('.ext_nav').slice({{intval(env('NAV_EXTENSION_HIDE_COUNT'))}}, $('.ext_nav').length).hide();
$('.ext_nav').slice({{getExtensionViewCount()}}, $('.ext_nav').length).hide();
}else{
$('.ext_nav_more_less').find('p').text("{{__('daha az...')}}");
$('.ext_nav:hidden').show();
......
resources/views/layouts/navbar.blade.php
Dosyayı görüntüle @ 87973540
......@@ -3,7 +3,7 @@
<ul class="navbar-nav" style="line-height:45px;">
<a href="/" class="brand-link">
<img src="/images/liman_logo-white.svg" height="30" style="opacity: .8;margin-left: 0.3rem;">
<span class="right badge badge-success" style="margin-left:10px;">1.0-RC6</span>
<span class="right badge badge-success" style="margin-left:10px;">{{getVersion()}}</span>
</a>
<li class="nav-item d-none d-sm-inline-block">
<a href="/" class="nav-link">{{__("Ana Sayfa")}}</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment