Merge pull request #75 from DanielnetoDotCom/master

update unstable

locale/tr.php

@@ -22,6 +22,7 @@
 $t['Advertising Manager'] = "Reklam Yönetimi";
 $t['Advertising Title'] = "Reklam Başlığı";
 $t['Alert'] = "Uyarı";
+$t['All'] = "Hepsi";
 $t['Amount'] = "Bakiye";
 $t['An client error occurred: %s'] = "Bir istemci hatası oluştu: %s";
 $t['Anyone with this key can watch your live stream.'] = "Bu anahtara sahip olan herkes canlı yayınınızı izleyebilir.";
@@ -93,11 +94,8 @@
 $t['Dashboard'] = "Kontrol Paneli";
 $t['Database-update needed'] = "Veritabanı güncellemesi gerekli";
 $t['Date'] = "Tarih";
-$t['Date Added (".$info[2].")'] = "Tarih Eklendi (".$info[2].")";
-$t['Date added (".$info[2].")'] = "Tarih Eklendi (".$info[2].")";
-$t['Date Added (newest)'] = "Eklenme Tarihi (en yeni)";
+$t['Date added'] = "En Son Yüklenen";
 $t['Date added (newest)'] = "Eklenme Tarihi (en yeni)";
-$t['Date Added (oldest)'] = "Eklenme Tarihi (en eski)";
 $t['Date added (oldest)'] = "Eklenme Tarihi (en eski)";
 $t['Default'] = "Varsayılan";
 $t['Delete'] = "Sil";
@@ -109,9 +107,7 @@
 $t['Disable right-click-prevention on video and allow downloading'] = "Videoda sağ tıklama önleme özelliğini devre dışı bırakın ve indirmeye izin verin";
 $t['Do not forget to save after choose your theme'] = "Temanızı seçtikten sonra kaydetmeyi unutmayın.";
 $t['Don´t like this video? Sign in to make your opinion count.'] = "Bu videoyu beğenmedim mi? Fikrinizi bildirmek için giriş yapın.";
-$t['Down'] = "Aşağı";
 $t['Download'] = "İndir";
-$t['Download Video'] = "Video İndir";
 $t['Download video'] = "Video indir";
 $t['Downloading'] = "İndiriliyor";
 $t['Drag and drop to sort'] = "Sıralamak için sürükle ve bırak";
@@ -124,13 +120,13 @@
 $t['Edit Video'] = "Videoyu Düzenle";
 $t['Email can not be blank'] = "Email boş bırakılamaz";
 $t['Embed'] = "Embed";
-$t['Embed a video link'] = "Video bağlantısı ekle";
+$t['Embed a video link'] = "Video Bağlantısı Ekle";
 $t['Embeded'] = "Embeded";
 $t['Embed Stream'] = "Yayın Embed Kodu";
-$t['Enable WebCam Stream'] = "WebCam Yayınını Etkinleştir";
+$t['Enable WebCam Stream'] = "WebCam ile Canlı Yayın başlat";
 $t['Enable SMTP'] = "SMTP Etkinleştir";
 $t['Enable SMTP Auth'] = "SMTP Yetkisini Etkinleştir";
-$t['Encode video and audio'] = "Video ve Ses Kodlama";
+$t['Encode video and audio'] = "Bilgisayardan Video Yükle";
 $t['Encoder Network'] = "Encoder Ağı";
 $t['Encoder URL'] = "Encoder URL";
 $t['Encoding'] = "Kodlanıyor";
@@ -147,6 +143,8 @@
 $t['For of Him, and through Him, and to Him, are all things: to whom be glory for ever. Amen.'] = "Rahmân ve Rahîm olan Allah´ın adıyla. De ki: O, Allah birdir. Allah sameddir. O, doğurmamış ve doğmamıştır. Onun hiçbir dengi yoktur.";
 $t['From'] = "From";
 $t['Get imgage error'] = "Get imgage error";
+$t['Go Back']  = "Geri Dön";
+$t['Go back to the main page'] = "Ana sayfaya geri dön";
 $t['Go to manager videos page!']  = "Video yöneticisi sayfasına git!";
 $t['Google Ad Sense']  = "Google Ad Sense";
 $t['Group']  = "Grup";
@@ -179,9 +177,11 @@
 $t['Left Menu'] = "Sol Menü";
 $t['Like this video? Sign in to make your opinion count.']  = "Bu videoyu beğendin mi? Beğenmek için giriş yap.";
 $t['Listed Transmition']  = "Listed Transmition";
-$t['Live']  = "Canlı";
+$t['Live']  = "Canlı Yayın";
 $t['Live Chat']  = "Canlı Sohbet";
-$t['LIVE NOW']  = "CANLI YAYINDA";
+$t['LIVE NOW']  = "CANLI";
+$t['Live Video'] = "Canlı Video";
+$t['Loading...'] = "Yükleniyor...";
 $t['Local File']  = "Yerel Dosya";
 $t['Login']  = "Oturum Aç";
 $t['Logoff']  = "Oturumu Kapat";
@@ -207,7 +207,6 @@
 $t['New Password']  = "Yeni Şifre";
 $t['New User']  = "Yeni Kullanıcı";
 $t['New User Groups']  = "Yeni Kullanıcı Grupları";
-$t['Next video order']  = "Sonraki video sırası";
 $t['No']  = "Hayır";
 $t['None (Parent)'] = "Hiçbiri (Ana)";
 $t['No results found!']  = "Sonuç bulunamadı";
@@ -291,8 +290,6 @@
 $t['Sorry you not able to download videos right now!']  = "Maalesef şu anda video indirmek mümkün değil!";
 $t['Sorry!'] = "Afedersiniz!";
 $t['Sort by name'] = "Ada göre sırala";
-$t['Sort by name (".$info[2].'] = "Ada göre sırala (".$info[2].")";
-$t['Sort by name (abc)']  = "Ada göre sırala (abc)";
 $t['Source']  = "Kaynak";
 $t['Starts on']  = "Başlat";
 $t['Status']  = "Durum";
@@ -327,7 +324,7 @@
 $t['This creates a download-button under your video, suggest you title.mp4 as download-name.']  = "Bu, videonuzun altında bir indirme düğmesi oluşturur, indirme-adı olarak title.mp4 önerir.";
 $t['This e-mail will be used for this web site notifications']  = "Bu e-posta, bu web sitesi bildirimleri için kullanılacaktır.";
 $t['This help us to track and dettect errors']  = "Bu, hataları izlememize ve düzenlememize yardımcı oluyor";
-$t['This is an experimental resource'] = "Bu deneysel bir kaynaktır";
+$t['This is an experimental resource'] = "Bu özellik henüz deneme aşamasındadır";
 $t['This page works only with a MP4 File, if you have or need any other format, try to install your own <a href=\'https://github.com/DanielnetoDotCom/YouPHPTube-Encoder\' class=\'btn btn-warning btn-xs\'>encoder</a> or use the <a href=\'https://encoder.youphptube.com/\' class=\'btn btn-warning btn-xs\'>public</a> one'] = "Bu sayfa sadece bir MP4 Dosyası ile çalışır, eğer başka bir formata sahipseniz veya başka bir formata ihtiyacınız varsa, kendi <a href='https://github.com/DanielnetoDotCom/YouPHPTube-Encoder' class='btn btn-warning btn-xs'>Kodlayıcınız</a> ya da <a href='https://encoder.youphptube.com/' class='btn btn-warning btn-xs'>Genel</a>'i kullanın.";
 $t['This plugin is not available for you'] = "Bu eklenti sizin için kullanılamaz";
 $t['This value must match with the language files on']  = "Bu değer, dil dosyaları ile eşleşmelidir.";
@@ -367,7 +364,6 @@
 $t['Unique Users']  = "Tekil Kullanıcılar";
 $t['Unknown User']  = "Bilinmeyen kullanıcı";
 $t['Unsuggest']  = "Unsuggest";
-$t['Up']  = "Yukarı";
 $t['Up Next']  = "Bir sonraki";
 $t['Update Now']  = "Şimdi Güncelle";
 $t['Update YouPHPTube System']  = "YouPHPTube Sistemini Güncelle";
@@ -415,7 +411,7 @@
 $t['Views']  = "Görüntüleme";
 $t['Warning']  = "Uyarı";
 $t['Watch on YouTube']  = "YouTube'da izle";
-$t['Watching Now']  = "Update Now";
+$t['Watching Now']  = "Anlık İzleyici";
 $t['We detected a total of %s pending updates, if you want to do it now click (Update Now) button']  = "%s Toplam güncelleme tespit edildi, güncellemek için (Şimdi Güncelle";
 $t['We have not found any videos or audios to show']  = "Gösterilecek hiçbir video veya ses dosyası bulunamadı";
 $t['We sent you an e-mail with instructions']  = "Size talimatlar içeren bir e-posta gönderdik";
@@ -439,8 +435,8 @@
 $t['You are hosting %d minutes and %d seconds of video']  = "%d dakika ve %d saniye süresi kadar video barındırıyorsunuz";
 $t['You are not allowed see this streaming']  = "Bu yayını görme izniniz yok";
 $t['You are not logged'] = "Giriş yapmadınız";
-$t['You are not online, loading webcam...'] = "Çevrimiçi değilsiniz, web kamerası yükleniyor ...";
-$t['You are online now, web cam is disabled'] = "Zaten çevrimiçi durumdasınız, web kamerası devre dışı";
+$t['You are not online, loading webcam...'] = "WebCam yükleniyor, henüz yayında değilsiniz...";
+$t['You are online now, web cam is disabled'] = "WebCam ile yayın başlatılamıyor, zaten canlı yayındasınız.";
 $t['You are running YouPHPTube version %s!']  = "YouPHPTube %s sürümünü kullanıyorsunuz!";
 $t['You asked for a recover link, click on the provided link']  = "Bir kurtarma bağlantısı istediniz, sağlanan bağlantıya tıklayın";
 $t['You can not Manage This Video']  = "Bu Videoyu Yönetemezsiniz";
@@ -467,7 +463,6 @@
 $t['You can upload max of %s!']  = "Maksimum %s yükleyebilirsiniz!";
 $t['You can use our public encoder on']  = "Ortak kodlayıcımızı kullanabilirsiniz.";
 $t['You cannot comment on videos']  = "Videolara yorum yapamazsınız";
-$t['You cannot comment on videos']  = "Videolara yorum yapamazsınız";
 $t['You could not use your balance to watch this video'] = "You could not use your balance to watch this video";
 $t['You do not have an e-mail']  = "E-posta adresiniz yok";
 $t['You don\'t have balance'] = "You don't have balance";
@@ -543,7 +538,7 @@
 $t['Your user has been deleted!']  = "Kullanıcınız silindi!";
 $t['Your user has been saved!']  = "Kullanıcınız kaydedildi!";
 $t['Your user or password is wrong!']  = "Kullanıcı veya şifreniz yanlış!";
-$t['Your video <a href=\'https://youtu.be/%s\' target=\'_blank\' class=\'btn btn-default\'><span class=\'fab fa-youtube\'></span> %s</a> was uploaded to your <a href=\'https://www.youtube.com/my_videos\' class=\'btn btn-default\' target=\'_blank\'><span class=\'fab fa-youtube-square\'></span> YouTube Account</a><br> '] = "Videonuz <a href='https://youtu.be/%s' target='_blank' class='btn btn-default'><span class='fab fa-youtube'></span> %s</a>, <a href='https://www.youtube.com/my_videos' class='btn btn-default' target='_blank'><span class='fab fa-youtube-square'></span> YouTube Hesabınıza</a> yüklendi<br> ";
+$t['Your video <a href=\'https://youtu.be/%s\' target=\'_blank\' class=\'btn btn-default\'><span class=\'fa fa-youtube-play\'></span> %s</a> was uploaded to your <a href=\'https://www.youtube.com/my_videos\' class=\'btn btn-default\' target=\'_blank\'><span class=\'fa fa-youtube\'></span> YouTube Account</a><br> '] = "Videonuz <a href='https://youtu.be/%s' target='_blank' class='btn btn-default'><span class='fa fa-youtube-play'></span> %s</a>, <a href='https://www.youtube.com/my_videos' class='btn btn-default' target='_blank'><span class='fa fa-youtube'></span> YouTube Hesabınıza</a> yüklendi<br> ";
 $t['Your video download is complete, it is encoding now']  = "Video indirme işleminiz tamamlandı, artık kodlanıyor";
 $t['Your video has NOT been deleted!']  = "Videonuz silinmemiş!";
 $t['Your video has NOT been saved!']  = "Videonuz kaydedilmedi!";
@@ -556,7 +551,6 @@
 $t['description']  = "Açıklama";
 $t['hour']  = "saat";
 $t['hours']  = "saat";
-$t['installed , but your database is not up to date. This could lead to bugs. Please go to the update-site.']  = "yüklü, ancak veritabanınız güncel değil. Bu, hatalara neden olabilir. Lütfen güncelleme sitesine gidin.";
 $t['is Active']  = "Aktif";
 $t['is Admin']  = "Yönetici";
 $t['minute']  = "dakika";
@@ -571,3 +565,5 @@
 $t['year']  = "yıl";
 $t['years']  = "yıl";
 $t['youtube-dl uses Python and some servers does not came with python as dafault, to install Python type:'] = "youtube-dl uses Python and some servers does not came with python as dafault, to install Python type:";
+$t['installed , but your database is not up to date. This could lead to bugs. Please go to the update-site.']  = "yüklü, ancak veritabanınız güncel değil. Bu, hatalara neden olabilir. Lütfen güncelleme sitesine gidin.";
+$t['Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries']  = "Toplam {{ctx.total}} sonuçtan {{ctx.start}} ila {{ctx.end}} arası gösteriliyor";

locale/us.php

@@ -22,6 +22,7 @@
 $t['Advertising Manager'] = "Advertising Manager";
 $t['Advertising Title'] = "Advertising Title";
 $t['Alert'] = "Alert";
+$t['All'] = "All";
 $t['Amount'] = "Amount";
 $t['An client error occurred: %s'] = "An client error occurred: %s";
 $t['Anyone with this key can watch your live stream.'] = "Anyone with this key can watch your live stream.";
@@ -37,6 +38,8 @@
 $t['Autoplay Next Video'] = "Autoplay Next Video";
 $t['Autoplay Next Video URL'] = "Autoplay Next Video URL";
 $t['Autoplay Video on Load Page'] = "Autoplay Video on Load Page";
+$t['Autoplay ended'] = "Autoplay ended";
+$t['Autoplay next-video-order'] = "Autoplay next-video-order";
 $t['Balance'] = "Balance";
 $t['Balance Form'] = "Balance Form";
 $t['Both'] = "Both";
@@ -46,13 +49,15 @@
 $t['Browse Channels'] = "Browse Channels";
 $t['By associating groups with this user, they will be able to see all the videos that are related to this group'] = "By associating groups with this user, they will be able to see all the videos that are related to this group";
 $t['By linking groups to this video, it will no longer be public and only users in the same group will be able to watch this video'] = "By linking groups to this video, it will no longer be public and only users in the same group will be able to watch this video";
+$t['By name'] = "By name";
 $t['Can Stream Videos'] = "Can Stream Videos";
 $t['Can Upload Videos'] = "Can Upload Videos";
 $t['Categories'] = "Categories";
 $t['Category'] = "Category";
 $t['Category Form'] = "Category Form";
 $t['Category to display this Ad'] = "Category to display this Ad";
 $t['Center'] = "Center";
+$t['Category-Gallery'] = "Category-Gallery";
 $t['Change Playlist Name'] = "Change Playlist Name";
 $t['Change Style'] = "Change Style";
 $t['Channel'] = "Channel";
@@ -87,19 +92,23 @@
 $t['Created'] = "Created";
 $t['Current Style & Theme'] = "Current Style & Theme";
 $t['Dashboard'] = "Dashboard";
+$t['Database-update needed'] = "Database-update needed";
 $t['Date'] = "Date";
-$t['Date Added (newest)'] = "Date Added (newest)";
-$t['Date Added (oldest)'] = "Date Added (oldest)";
+$t['Date added'] = "Date added";
+$t['Date added (newest)'] = "Date Added (newest)";
+$t['Date added (oldest)'] = "Date Added (oldest)";
 $t['Default'] = "Default";
 $t['Delete'] = "Delete";
 $t['Devices Stream Info'] = "Devices Stream Info";
 $t['Description'] = "Description";
 $t['Direct upload']  = "Direct upload";
 $t['Disable YouPHPTube Google Analytics'] = "Disable YouPHPTube Google Analytics";
+$t['Disable Youtube-Upload'] = "Disable Youtube-Upload";
+$t['Disable right-click-prevention on video and allow downloading'] = "Disable right-click-prevention on video and allow downloading";
 $t['Do not forget to save after choose your theme'] = "Do not forget to save after choose your theme";
 $t['Don´t like this video? Sign in to make your opinion count.'] = "Don´t like this video? Sign in to make your opinion count.";
 $t['Download'] = "Download";
-$t['Download Video'] = "Download Video";
+$t['Download video'] = "Download video";
 $t['Downloading'] = "Downloading";
 $t['Drag and drop to sort'] = "Drag and drop to sort";
 $t['Drop Here'] = "Drop Here";
@@ -134,6 +143,8 @@
 $t['For of Him, and through Him, and to Him, are all things: to whom be glory for ever. Amen.'] = "For of Him, and through Him, and to Him, are all things: to whom be glory for ever. Amen.";
 $t['From'] = "From";
 $t['Get imgage error'] = "Get imgage error";
+$t['Go Back']  = "Go Back";
+$t['Go back to the main page'] = "Go back to the main page";
 $t['Go to manager videos page!'] = "Go to manager videos page!";
 $t['Google Ad Sense'] = "Google Ad Sense";
 $t['Group'] = "Group";
@@ -169,6 +180,8 @@
 $t['Live'] = "Live";
 $t['Live Chat']  = "Live Chat";
 $t['LIVE NOW']  = "LIVE NOW";
+$t['Live Video'] = "Live Video";
+$t['Loading...'] = "Loading...";
 $t['Local File'] = "Local File";
 $t['Login'] = "Login";
 $t['Logoff'] = "Logoff";
@@ -186,6 +199,7 @@
 $t['Most watched'] = "Most watched";
 $t['My Account'] = "My Account";
 $t['My Channel'] = "My Channel";
+$t['My list']  = "My list";
 $t['My videos'] = "My videos";
 $t['Name'] = "Name";
 $t['Name can\'t be blank'] = "Name can't be blank";
@@ -195,6 +209,7 @@
 $t['New User Groups'] = "New User Groups";
 $t['No'] = "No";
 $t['None (Parent)'] = "None (Parent)";
+$t['No results found!']  = "No results found!";
 $t['Notify Subscribers'] = "Notify Subscribers";
 $t['Off']  = "Off";
 $t['On']  = "On";
@@ -209,6 +224,7 @@
 $t['Permanent Link'] = "Permanent Link";
 $t['Permission denied'] = "Permission denied";
 $t['Permition denied'] = "Permition denied";
+$t['Play']  = "Play";
 $t['Play All'] = "Play All";
 $t['Player URL'] = "Player URL";
 $t['Playlist name?'] = "Playlist name?";
@@ -222,6 +238,7 @@
 $t['Public'] = "Public";
 $t['Public Video'] = "Public Video";
 $t['Queue Position'] = "Queue Position";
+$t['Random']  = "Random";
 $t['Recover Password'] = "Recover Password";
 $t['Recover password could not be saved!'] = "Recover password could not be saved!";
 $t['Recover password does not match'] = "Recover password does not match";
@@ -304,6 +321,7 @@
 $t['Themes'] = "Themes";
 $t['There is missing data to recover your password'] = "There is missing data to recover your password";
 $t['There is no streaming now'] = "There is no streaming now";
+$t['This creates a download-button under your video, suggest you title.mp4 as download-name.']  = "This creates a download-button under your video, suggest you title.mp4 as download-name.";
 $t['This e-mail will be used for this web site notifications'] = "This e-mail will be used for this web site notifications";
 $t['This help us to track and dettect errors'] = "This help us to track and dettect errors";
 $t['This is an experimental resource'] = "This is an experimental resource";
@@ -451,6 +469,7 @@
 $t['You have %s minutes of videos!'] = "You have %s minutes of videos!";
 $t['You have about %s minutes left of video storage!'] = "You have about %s minutes left of video storage!";
 $t['You have sent the notification'] = "You have sent the notification";
+$t['You have version ']  = "You have version ";
 $t['You must be logged'] = "You must be logged";
 $t['You must fill all fields'] = "You must fill all fields";
 $t['You must login to be able to comment on videos'] = "You must login to be able to comment on videos";
@@ -546,3 +565,5 @@
 $t['year'] = "year";
 $t['years'] = "years";
 $t['youtube-dl uses Python and some servers does not came with python as dafault, to install Python type:'] = "youtube-dl uses Python and some servers does not came with python as dafault, to install Python type:";
+$t['installed , but your database is not up to date. This could lead to bugs. Please go to the update-site.']  = "installed , but your database is not up to date. This could lead to bugs. Please go to the update-site.";
+$t['Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries']  = "Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries";

objects/user.php

@@ -142,6 +142,14 @@ static function getUserName() {
 
     static function getUserChannelName() {
         if (self::isLogged()) {
+
+            if(empty($_SESSION['user']['channelName'])){
+                $_SESSION['user']['channelName'] = uniqid();
+                $user = new User(User::getId());
+                $user->setChannelName($_SESSION['user']['channelName']);
+                $user->save();
+            }
+
             return $_SESSION['user']['channelName'];
         } else {
             return false;

plugin/Live/index.php

@@ -56,7 +56,7 @@
 <!DOCTYPE html>
 <html lang="<?php echo $_SESSION['language']; ?>">
     <head>
-        <title>Live - <?php echo $config->getWebSiteTitle(); ?></title>
+        <title><?php echo __("Live"); ?> - <?php echo $config->getWebSiteTitle(); ?></title>
         <?php
         include $global['systemRootPath'] . 'view/include/head.php';
         ?>

plugin/Live/view/modeYoutubeLive.php

@@ -29,7 +29,7 @@
 <!DOCTYPE html>
 <html lang="<?php echo $_SESSION['language']; ?>">
     <head>
-        <title><?php echo $t['title']; ?> - Live Video - <?php echo $config->getWebSiteTitle(); ?></title>
+        <title><?php echo $t['title']; ?> - <?php echo __("Live Video"); ?> - <?php echo $config->getWebSiteTitle(); ?></title>
         <?php
         include $global['systemRootPath'] . 'view/include/head.php';
         ?>

plugin/YPTWallet/view/manualAddFunds.json.php

@@ -35,7 +35,8 @@
 $message = "<strong style='color:#0A0;'>".YPTWallet::MANUAL_ADD."</strong> user <strong><a href='{$url}'>[". User::getId()."]". User::getNameIdentification()."</a></strong> value of {$value}";
 $emailMessage = "The user <a href='{$url}'>[". User::getId()."]<strong>". User::getNameIdentification()."</strong></a> request a <strong style='color:#0A0;'>".YPTWallet::MANUAL_ADD."</strong> value of <strong>{$value}</strong>"
 . "<hr><strong>Date: </strong>".  date("Y-m-d h:i:s")
-. "<br><strong>Informations: </strong>".  nl2br($_POST['informations']);
+. "<br><strong>Informations: </strong>".  nl2br($_POST['informations'])
+. "<br><strong>{$dataObj->CryptoWalletName}: </strong>".  $wallet->getCrypto_wallet_address();
 
 if(WalletLog::addLog($wallet_id, $value, $message, "{}", "pending",  YPTWallet::MANUAL_ADD)){
     $plugin->sendEmails($emailsArray, $subject, $emailMessage."");