Renames

.gitignore

@@ -1,7 +1,7 @@
 countdown
-mailhash
+accounts
 vars
 mailer.log
-web.log
 process.log
-uploadpage/streams/*
+upload.log
+web/streams/*

Caddyfile

@@ -4,10 +4,9 @@
 
 %interface% {
 	log {
-		output file /var/www/web.log
+		output file /var/www/upload.log
-		format console
 	}
 	php_fastcgi 127.0.0.1:9000
-	root * /var/www/uploadpage
+	root * /var/www/web
 	file_server
 }

Dockerfile

@@ -1,8 +1,8 @@
 # Build image: 
 #   docker build -t streamupload .
 # Run container, one of:
-#   docker run -d --name stream -p 8080:80 -v $PWD/uploadpage:/var/www/uploadpage streamupload
+#   docker run -d --name stream -p 8080:80 -v $PWD/web:/var/www/web streamupload
-#   docker run -d --name stream -p 443:443 -v $PWD/uploadpage:/var/www/uploadpage streamupload
+#   docker run -d --name stream -p 443:443 -v $PWD/web:/var/www/web streamupload
 # Access shell in container:
 #   docker exec -ti stream /bin/bash
 # Destroy container and image:
@@ -16,5 +16,5 @@ ADD https://good4.eu/mailer /usr/local/bin/mailer
 ADD https://good4.eu/caddy /usr/local/bin/caddy
 COPY Caddyfile Dockerfile /root/
 WORKDIR /var/www
-COPY encode init stream vars mailhash ./
+COPY encode init stream vars accounts ./
 ENTRYPOINT ./init

README.md

@@ -13,18 +13,18 @@
 * Move the `streamupload` directory to a place that is accessible to the web
   server, like: `mv streamupload /var/www` and `cd` to that place. Now the
   output of `pwd` is the value for `$repopath`.
-* do `mkdir "$repopath/uploadpage/streams"` and
+* do `mkdir "$repopath/web/streams"` and
-  `chmod 777 "$repopath/uploadpage/streams"`.
+  `chmod 777 "$repopath/web/streams"`.
-* Copy `_vars` to `vars`, `_mailhash` to `mailhash` and `_countdown` to
+* Copy `_vars` to `vars`, `_accounts` to `accounts` and `_countdown` to
   `countdown` and set the variables in `vars` (webserver, SMTP-server),
-  `mailhash` (usernames, emails and bcrypt-password-hashes) and `countdown`
+  `accounts` (usernames, emails and bcrypt-password-hashes) and `countdown`
   (if any countdown-files can be used).
 * Make a crontab-entry: "* * * * *  $repopath/encode" (replace `$repopath`!).
 * Install the `mailer` binary by downloading it from the repo at
   https://https://github.com/pepa65/mailer/releases/latest and moving it to
   `/usr/local/bin` and make it executable: `chmod +x /usr/local/bin/mailer`.
   If it's not installed, everything (except the emails) will still work.
-* Run a php/webserver on `$repopath/uploadpage`:
+* Run a php/webserver on `$repopath/web`:
   - Get it to restart on reboot.
   - Change the relevant `php.ini` to allow large file uploads:
     * `post_max_size` - Upper limit of uploaded video sizes, say `10G`.
@@ -42,10 +42,10 @@ Make the config file `/root/Caddyfile` like:
 
 :80 {
 	log {
-		output file $repopath/web.log
+		output file $repopath/upload.log
 	}
 	php_fastcgi unix//run/php/php-fpm.sock
-	root * $repopath/uploadpage
+	root * $repopath/web
 	file_server
 }
 ```
@@ -75,10 +75,10 @@ killall -9 caddy &>/dev/null
 
 ### Docker
 After cloning this repo, `cd streamupload`, and setting the variables in `vars` and
-`mailhash`, a docker image can be built from the included `Dockerfile` by:
+`accounts`, a docker image can be built from the included `Dockerfile` by:
 `docker build -t streamupload .`. In the case of running on a LAN and not having a
 DNS A record, start it with:
-`docker run -d -p 8080:80 -v $PWD/uploadpage:/var/www/uploadpage streamupload`.
+`docker run -d -p 8080:80 -v $PWD/web:/var/www/web streamupload`.
 In case of a domainname, replace `8080:80` by `443:443`.
 
 ## Usage
@@ -86,5 +86,5 @@ In case of a domainname, replace `8080:80` by `443:443`.
   (supported are: Restream.io, YouTube.com, Facebook.com).
 * Go to the server's URL in the browser: `http://$ipaddress:80` or for docker:
   `http://$ipaddress:80` or in case of a domainname: `https://$domainname`.
-* Log in with the username and passwors as prepared in `mailhash`.
+* Log in with the username and passwors as prepared in `accounts`.
 * Fill in the form, and click "Schedule Stream".

encode

@@ -2,16 +2,16 @@
 set +vx
 # encode - Encode for streaming and schedule cron job
 # Usage:  encode
-#   Called by cron every minute; process oldest .upload file in ./uploadpage/streams)
+#   Called by cron every minute; process oldest .upload file in ./web/streams)
 # Required: file coreutils(readlink ls head mv tail rm) cron(crontab) date ffmpeg
 #   mailer[gitlab.com/pepa65/mailer]
 
 # Check for oldest uploaded file
 _=$(readlink -f -- "${BASH_SOURCE:-$0}") repopath=${_%/*}
-log=$repopath/process.log dir=$repopath/uploadpage/streams
+log=$repopath/process.log dir=$repopath/web/streams
 upload=$(ls -Atr "$dir"/*.upload 2>/dev/null |head -1)
 
-# Finished if no uploadpage/streams/*.upload files found
+# Finished if no web/streams/*.upload files found
 [[ $upload ]] || exit 0
 
 Log(){ # 1:message 2:returncode(empty: no exit) I:file
@@ -22,7 +22,7 @@ Log(){ # 1:message 2:returncode(empty: no exit) I:file
 Mail(){ # 1:kind(0:done, 1:wrong type, 2:encoding error) 2:logline I:repopath,email,username,name,type,start,finish
 	local lines line message sbj msg to from="Stream Upload server" user password smtp port ssltls bcc
 	source "$repopath/vars"  # I:user,password,smtp,port,ssltls,bcc
-	mapfile -t lines <"$repopath/mailhash"
+	mapfile -t lines <"$repopath/accounts"
 	for line in "${lines[@]}"
 	do [[ ${line:0:1} = '#' ]] && continue
 		[[ $username = ${line%%$'\t'*} ]] && _=${line#*$'\t'} to=${_%$'\t'*} && break

stream

@@ -2,7 +2,7 @@
 
 # stream - Stream video when called from crontab
 # Usage:  stream <tag>
-#   The tag refers to video files in ./uploadpage/streams without the
+#   The tag refers to video files in ./web/streams without the
 #   '.mp4', that should have been re-encoded by `encode`. The tag has no path
 #   information, has the "streamkey" at the start before the first dot (there
 #   has to be a dot!) and the "target" at the very end, after the last '@'.
@@ -11,7 +11,7 @@
 
 _=$(readlink -f -- "${BASH_SOURCE:-$0}") repopath=${_%/*}
 log=$repopath/process.log
-in=$repopath/uploadpage/streams/$1.mp4 key=${1%%.*} target=${1##*@}
+in=$repopath/web/streams/$1.mp4 key=${1%%.*} target=${1##*@}
 case $target in
 Facebook) rtmp=rtmps://live-api-s.facebook.com:443/rtmp/$key ;;
 YouTube) rtmp=rtmp://a.rtmp.youtube.com/live2/$key ;;
@@ -25,7 +25,7 @@ set -o pipefail  # to get ffmpeg's returncode
 if ffmpeg -re -y -i "$in" -c:v copy -c:a copy -f flv "$rtmp" 2>&1 |tail -n 20 >"$in.log"
 then
 	rm "$in.log" "${in%.mp4}"
-	[[ $savedir && -f $savedir ]] && mv "$in" "$savedir" || rm "$in"
+	[[ $savedir && -d $savedir ]] && mv "$in" "$savedir" || rm "$in"
 else
 	echo "Error while streaming $1" >>"$log"
 fi

web/index.php

@@ -34,6 +34,7 @@ function filename(){
 				<input class="abs" id="fakeinput" tabindex="-1">
 				<p class="abs" id="name">Click to select the video</p>
 			</div>');
+if($user!=='library' && $user!=='pp'){ ///////////////////////////////
 // Check countdown options
 $cf=file(__DIR__.'/../countdown',FILE_IGNORE_NEW_LINES & FILE_SKIP_EMPTY_LINES);
 $n=0;
@@ -65,6 +66,9 @@ print('			<select name="target" required title="Click to select where to stream
 				<input type="time" name="time" title="Enter the time" required></div>
 			<input type="email" name="email" placeholder="Email to notify" title="Not required">
 			<input type="submit" value="Schedule Stream" name="schedule">');
+}else{ //////////////////////////////////
+print('			<input type="submit" value="Upload" name="schedule">'); ///////////////////////
+} ////////////////////////////////////
 print('			<p id="response">&nbsp;</p>
 		</form>
 	</div>

web/login.php

@@ -3,7 +3,7 @@ session_start();
 $user=@$_POST['user'];
 if(!empty($user) && preg_match('/[A-Za-z0-9]+/', $user)!==false){ // Login attempt and valid input
 	// Read hash and check password
-	$mh=file(__DIR__.'/../mailhash',FILE_IGNORE_NEW_LINES & FILE_SKIP_EMPTY_LINES);
+	$mh=file(__DIR__.'/../accounts',FILE_IGNORE_NEW_LINES & FILE_SKIP_EMPTY_LINES);
 	foreach($mh as $line){
 		if(substr($line, 0, 1)!='#'){
 			$field=explode("\t", trim($line, "\n"));

web/upload.php

@@ -7,18 +7,21 @@ if(!isset($_POST['schedule']) || empty($user)){ // If not post: start again
 
 function Back($msg){
 	if(empty($msg)){
-		print('<p style="padding:5px;background-color:green;color:white"><b>File successfully uploaded, encoding started</b></p>');
+		print('
+	<p style="padding:5px;background-color:green;color:white"><b>File successfully uploaded, encoding started</b></p>');
 	}else{
-		print('<p style="padding:5px;background-color:red;color:white"><b>ERROR: '.$msg.'</b></p>');
+		print('
+	<p style="padding:5px;background-color:red;color:white"><b>ERROR: '.$msg.'</b></p>');
 	}
-	print('<form action="index.php" method="post">
+	print('
+	<form action="index.php" method="post">
 		<input type="submit" value="Upload another file" name="submit" autofocus>
 	</form></div>');
 	exit;
 }
 
 // Get mails
-$mh=file(__DIR__.'/../mailhash',FILE_IGNORE_NEW_LINES & FILE_SKIP_EMPTY_LINES);
+$mh=file(__DIR__.'/../accounts',FILE_IGNORE_NEW_LINES & FILE_SKIP_EMPTY_LINES);
 foreach($mh as $line){
 	if(substr($line, 0, 1)!='#'){
 		$field=explode("\t", $line);
@@ -50,6 +53,12 @@ $min=substr($time, 3, 2);
 $tme=$hour.$min;
 $dir='streams/';
 $name=$key.'.'.$date.'_'.$tme.$id.$user.$email.'@'.$target;
+if($user=='library' || $user=='pp'){ ////////////////////////
+move_uploaded_file($_FILES['file']['tmp_name'], $dir.'video.'.$user);
+sleep(15);
+session_unset();
+header('Location: login.php');
+} ///////////////////////
 $file=$dir.$name.'.upload';
 print('<!DOCTYPE html>
 <meta charset="utf-8">
@@ -59,7 +68,8 @@ print('<!DOCTYPE html>
 <div class="user"><p class="user">User:&nbsp;<b>'.$user.'</b></p>
 	<form action="login.php" method="post">
 		<input id="logoff" type="submit" name="logoff" value="Logoff">
-	</form></div><div class="container">
+	</form></div>
+<div class="container">
 	<h1>Encoding</h1>
 	<p>Uploaded <b>'.$upload.'</b></p>');
 if(preg_match('/20[0-9][0-9]-[0-1][0-9]-[0-3][0-9]/', $date)===false){
@@ -83,11 +93,14 @@ if(!move_uploaded_file($_FILES['file']['tmp_name'], $file)){
 	Back('Error moving the file');
 }
 
-print('<p>Streaming <b>'.$name.'.mp4</b>');
+print('
+	<p>Streaming <b>'.$name.'.mp4</b>');
 if(isset($countdown)){
-	print('<br><br>using <b>'.$countdown.'</b>');
+	print('
+		<br><br>using <b>'.$countdown.'</b>');
 }
-print('</p>
+print('
+	</p>
 	<p>When done encoding, email <b>'.$to.'</b></p>
 	<p>Streaming on <b>'.$date.'</b> at <b>'.$time.'</b>h on <b>'.$target.'</b></p>');
 Back('');