Page MenuHomeGitPull.it
Files F13209972

No OneTemporary
Actions

Size
13 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/index.php b/index.php
index 7b5de9fca..e793b73ae 100644
--- a/index.php
+++ b/index.php
@@ -1,139 +1,139 @@
<?php
global $global, $config;
ini_set('error_log', $global['systemRootPath'].'videos/youphptube.log');
require_once 'objects/simple-php-router/vendor/autoload.php';
require_once 'videos/configuration.php';
require_once 'objects/configuration.php';
$basePath = parse_url ($global['webSiteRootURL'], PHP_URL_PATH);
use Pecee\SimpleRouter\SimpleRouter;
$config = new Configuration();
// echo $global['webSiteRootURL'];
SimpleRouter::get($basePath, function() {
require_once "view/index.php";
});
SimpleRouter::get($basePath, function() {
require_once "view/index.php";
});
SimpleRouter::get($basePath."info", function() {
require_once "view/info.php";
});
SimpleRouter::get($basePath."signUp", function() {
require_once "view/signUp.php";
});
SimpleRouter::post($basePath."addNewAd", function() {
require_once "objects/video_adsAddNew.json.php";
});
SimpleRouter::post($basePath."createUser", function() {
require_once "objects/userCreate.json.php";
});
SimpleRouter::post($basePath."ads", function() {
require_once "view/managerAds.php";
});
SimpleRouter::get($basePath."about", function() {
require_once "view/about.php";
});
SimpleRouter::get($basePath."contact", function() {
require_once "view/contact.php";
});
SimpleRouter::get($basePath."user", function() {
require_once "view/user.php";
});
SimpleRouter::get($basePath."users", function() {
require_once "view/managerUsers.php";
});
SimpleRouter::get($basePath."mvideos", function() {
require_once "view/managerVideos.php";
});
SimpleRouter::get($basePath."videos.json", function() {
require_once "objects/videos.json.php";
});
SimpleRouter::get($basePath."videosAndroid.json", function() {
require_once "objects/videosAndroid.json.php";
});
SimpleRouter::get($basePath."videoAndroid.json", function() {
require_once "objects/videoAndroid.json.php";
});
SimpleRouter::post($basePath."updateUser", function() {
require_once "objects/userUpdate.json.php";
});
SimpleRouter::post($basePath."savePhoto", function() {
require_once "objects/userSavePhoto.php";
});
SimpleRouter::post($basePath."saveBackground", function() {
require_once "objects/userSaveBackground.php";
});
SimpleRouter::post($basePath."users.json", function() {
require_once "objects/users.json.php";
});
SimpleRouter::post($basePath."captcha", function() {
require_once "objects/getCaptcha.php";
});
SimpleRouter::post($basePath."login", function() {
require_once "objects/login.json.php";
});
SimpleRouter::get($basePath."logoff", function() {
require_once "objects/logoff.php";
});
SimpleRouter::get($basePath."charts", function() {
require_once "view/charts.php";
});
SimpleRouter::get($basePath."update", function() {
require_once "update/update.php";
});
SimpleRouter::get($basePath."comments", function() {
require_once "view/managerComments.php";
});
SimpleRouter::post($basePath."status", function() {
require_once "objects/status.json.php";
});
SimpleRouter::get($basePath."plugins", function() {
require_once "view/managerPlugins.php";
});
SimpleRouter::post($basePath."pluginsAvailable.json", function() {
require_once "objects/pluginsAvailable.json.php";
});
SimpleRouter::post($basePath."plugins.json", function() {
require_once "objects/plugins.json.php";
});
SimpleRouter::get($basePath."channels", function() {
require_once "view/channels.php";
});
SimpleRouter::get($basePath."like", function() {
$_GET['like']="1";
require_once "objects/like.json.php";
});
SimpleRouter::get($basePath."dislike", function() {
$_GET['like']="-1";
require_once "objects/like.json.php";
});
SimpleRouter::get($basePath."channel/{channelName?}", function ($channelName = '') {
$_GET['channelName'] = $channelName;
require_once 'view/channel.php';
});
SimpleRouter::get($basePath."cat/{catName?}", function ($catName = '') {
$_GET['catName'] = $catName;
require_once 'view/index.php';
});
SimpleRouter::get($basePath."upload", function () {
require_once 'view/mini-upload-form/index.php';
});
-SimpleRouter::get($basePath."fileUpload", function () {
+SimpleRouter::post($basePath."fileUpload", function () {
require_once 'view/mini-upload-form/upload.php';
});
SimpleRouter::get($basePath."cat/{catName?}", function ($catName = '') {
$_GET['catName'] = $catName;
require_once 'view/index.php';
});
SimpleRouter::get($basePath."video/{videoName?}", function ($videoName = '') {
$_GET['videoName'] = $videoName;
require_once 'view/index.php';
});
SimpleRouter::get($basePath."v/{videoName?}", function ($videoName = '') {
$_GET['v'] = $videoName;
require_once 'view/index.php';
});
SimpleRouter::start();
?>
\ No newline at end of file
diff --git a/view/mini-upload-form/index.php b/view/mini-upload-form/index.php
index 830df2cf9..91213fa28 100644
--- a/view/mini-upload-form/index.php
+++ b/view/mini-upload-form/index.php
@@ -1,98 +1,101 @@
<?php
-require_once '../../videos/configuration.php';
-require_once '../../objects/functions.php';
+global $global, $config;
+if(!isset($global['systemRootPath'])){
+ require_once '../../videos/configuration.php';
+}
+require_once $global['systemRootPath'] . 'objects/functions.php';
require_once $global['systemRootPath'] . 'objects/user.php';
if (!User::canUpload()) {
header("location: {$global['webSiteRootURL']}user");
exit;
}
?>
<!DOCTYPE html>
<html lang="<?php echo $_SESSION['language']; ?>">
<head>
<title><?php echo $config->getWebSiteTitle(); ?> :: <?php echo __("Upload your file"); ?></title>
<?php
include $global['systemRootPath'] . 'view/include/head.php';
?>
<!-- Google web fonts -->
<link href="http://fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700" rel='stylesheet' />
<!-- The main CSS file -->
<link href="view/mini-upload-form/assets/css/style.css" rel="stylesheet" />
</head>
<body>
<?php
include $global['systemRootPath'].'view/include/navbar.php';
?>
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-lg-9">
<form id="upload" method="post" action="fileUpload" enctype="multipart/form-data">
<div id="drop">
<?php echo __("Drop Here"); ?>
<a><?php echo __("Browse"); ?></a>
<input type="file" name="upl" multiple />
</div>
<ul>
<!-- The file uploads will be shown here -->
</ul>
</form>
</div>
<div class="col-xs-12 col-sm-12 col-lg-3">
<div class="alert alert-info">
<h1>
<span class="glyphicon glyphicon-info-sign" style="font-size:1em;"></span>
<?php echo __("Your maximum file size is:"), " ", "" . get_max_file_size() . ""; ?>
</h1>
</div>
<div class="alert alert-warning">
<h1>
<span class="glyphicon glyphicon-warning-sign" style="font-size:1em;"></span>
<?php echo __("This page works only with MP4,MP3 and OGG-files, 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"); ?>
</h1>
</div>
<?php
if (!empty($global['videoStorageLimitMinutes'])) {
$secondsTotal = getMinutesTotalVideosLength();
?>
<div class="alert alert-warning"><?php printf(__("You have about %s minutes left of video storage!"), ($global['videoStorageLimitMinutes']-$secondsTotal)); ?></div>
<?php
}
?>
</div>
</div>
</div><!--/.container-->
<?php
include $global['systemRootPath'].'view/include/footer.php';
?>
<!-- JavaScript Includes -->
<script src="view/mini-upload-form/assets/js/jquery.knob.js"></script>
<!-- jQuery File Upload Dependencies -->
<script src="view/mini-upload-form/assets/js/jquery.ui.widget.js"></script>
<script src="view/mini-upload-form/assets/js/jquery.iframe-transport.js"></script>
<script src="view/mini-upload-form/assets/js/jquery.fileupload.js"></script>
<!-- Our main JS file -->
<script src="view/mini-upload-form/assets/js/script.js"></script>
</body>
</html>
diff --git a/view/mini-upload-form/upload.php b/view/mini-upload-form/upload.php
index ed62d89ba..b6d359188 100644
--- a/view/mini-upload-form/upload.php
+++ b/view/mini-upload-form/upload.php
@@ -1,116 +1,111 @@
<?php
-$configFile = '../../videos/configuration.php';
-
-if (!file_exists($configFile))
-{
- $configFile = '../videos/configuration.php';
-}
-
+global $global, $config;
session_write_close();
$obj = new stdClass();
$obj->error = true;
-require_once $configFile;
-
+if(!isset($global['systemRootPath'])){
+ require_once '../../videos/configuration.php';
+}
if (!User::canUpload())
{
$obj->msg = "Only logged users can upload";
die(json_encode($obj));
}
header('Content-Type: application/json');
// A list of permitted file extensions
$allowed = array(
'mp4',
'ogg',
'mp3'
);
if (isset($_FILES['upl']) && $_FILES['upl']['error'] == 0)
{
$extension = pathinfo($_FILES['upl']['name'], PATHINFO_EXTENSION);
if (!in_array(strtolower($extension) , $allowed))
{
$obj->msg = "File extension error [{$_FILES['upl']['name']}], we allow only (" . implode(",", $allowed) . ")";
die(json_encode($obj));
}
require_once $global['systemRootPath'] . 'objects/video.php';
$duration = Video::getDurationFromFile($_FILES['upl']['tmp_name']);
$path_parts = pathinfo($_FILES['upl']['name']);
$mainName = preg_replace("/[^A-Za-z0-9]/", "", cleanString($path_parts['filename']));
$filename = uniqid($mainName . "_", true);
$video = new Video(substr(preg_replace("/_+/", " ", $_FILES['upl']['name']) , 0, -4) , $filename, @$_FILES['upl']['videoId']);
$video->setDuration($duration);
if(!empty($_POST['title'])){
$video->setTitle($_POST['title']);
}
if(!empty($_POST['description'])){
$video->setDescription($_POST['description']);
}
if ($extension == "mp4")
{
$video->setType("video");
}
else
if (($extension == "mp3") || ($extension == "ogg")){
$video->setType("audio");
}
$advancedCustom = YouPHPTubePlugin::getObjectDataIfEnabled("CustomizeAdvanced");
if (empty($advancedCustom->makeVideosInactiveAfterEncode))
{
// set active
$video->setStatus('a');
}
else
{
$video->setStatus('i');
}
$id = $video->save();
/**
* This is when is using in a non uploaded movie
*/
$aws_s3 = YouPHPTubePlugin::loadPluginIfEnabled('AWS_S3');
$tmp_name = $_FILES['upl']['tmp_name'];
$filenameMP4 = $filename . "." . $extension;
decideMoveUploadedToVideos($tmp_name, $filenameMP4);
if ((YouPHPTubePlugin::isEnabled("996c9afb-b90e-40ca-90cb-934856180bb9")) && ($extension == "mp4"))
{
require_once $global['systemRootPath'] . 'plugin/MP4ThumbsAndGif/MP4ThumbsAndGif.php';
$videoFileName = $video->getFilename();
MP4ThumbsAndGif::getImage($videoFileName, 'jpg');
MP4ThumbsAndGif::getImage($videoFileName, 'gif');
}
else
if ((YouPHPTubePlugin::isEnabled("916c9afb-css90e-26fa-97fd-864856180cc9")) && ($extension == "mp4"))
{
require_once $global['systemRootPath'] . 'plugin/MP4ThumbsAndGifLocal/MP4ThumbsAndGifLocal.php';
$videoFileName = $video->getFilename();
MP4ThumbsAndGifLocal::getImage($videoFileName, 'jpg');
MP4ThumbsAndGifLocal::getImage($videoFileName, 'gif');
}
// } else if(($extension=="mp3")||($extension=="ogg")){
// }
$obj->error = false;
$obj->filename = $filename;
$obj->duration = $duration;
YouPHPTubePlugin::afterNewVideo($video->getId());
die(json_encode($obj));
}
$obj->msg = "\$_FILES Error";
$obj->FILES = $_FILES;
die(json_encode($obj));
\ No newline at end of file

File Metadata

Mime Type
text/x-diff
Expires
Wed, Apr 22, 15:33 (1 d, 21 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1862845
Default Alt Text
(13 KB)

Event Timeline

Public contents are in Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) or GNU Free Documentation License (at your option) unless otherwise noted. · Contact / Register