Skip to content

Commit

Permalink
Rebranding
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel authored and daniel committed Dec 2, 2019
1 parent 0421f5a commit 400ab5d
Show file tree
Hide file tree
Showing 254 changed files with 707 additions and 698 deletions.
8 changes: 4 additions & 4 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Deny from all
Order Allow,Deny
Deny from all
</Files>
<Files youphptube.log>
<Files avideo.log>
Order Allow,Deny
Deny from all
</Files>
<Files youphptube.js.log>
<Files avideo.js.log>
Order Allow,Deny
Deny from all
</Files>
Expand Down Expand Up @@ -188,8 +188,8 @@ Options All -Indexes
RewriteRule ^notifySubscribers.json$ objects/notifySubscribers.json.php [NC,L]


RewriteRule ^youPHPTubeQueueEncoder.json$ objects/youPHPTubeQueueEncoder.json.php [NC,L]
RewriteRule ^youPHPTubeEncoder.json$ objects/youPHPTubeEncoder.json.php [NC,L]
RewriteRule ^aVideoQueueEncoder.json$ objects/aVideoQueueEncoder.json.php [NC,L]
RewriteRule ^aVideoEncoder.json$ objects/aVideoEncoder.json.php [NC,L]

#comment
RewriteRule ^comments$ view/managerComments.php [NC,L]
Expand Down
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
git.youphptube.com
git.avideo.com
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Based on the work of @hannah98, thanks for that!
# https://github.com/hannah98/youphptube-docker
# https://github.com/hannah98/avideo-docker
# Licensed under the terms of the CC-0 license, see
# https://creativecommons.org/publicdomain/zero/1.0/deed

Expand Down
48 changes: 24 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
### If you are not sure what is YouPHPTube, go to our <a href="https://demo.youphptube.com/" target="_blank">demo</a> page or visit our <a href="https://www.youphptube.com/" target="_blank">official site</a>
### If you are not sure what is AVideo, go to our <a href="https://demo.avideo.com/" target="_blank">demo</a> page or visit our <a href="https://www.avideo.com/" target="_blank">official site</a>

* <a href="https://netflix.youphptube.com/" target="_blank">Netflix demo page</a>
* <a href="https://netflix.avideo.com/" target="_blank">Netflix demo page</a>
- We provide you a Netflix site sample. On this site you can subscribe (with real money on PayPal). this subscription will allow you to watch our private videos. There is an user that you can use to see how it works. user: test and pass: test.
* <a href="https://tutorials.youphptube.com/" target="_blank">Gallery demo page</a>
* <a href="https://tutorials.avideo.com/" target="_blank">Gallery demo page</a>
- We've provided a sample Video Gallery site, which is also our tutorials site. On this sample you can login, subscribe, like, dislike and comment. but you can not upload videos.
* <a href="http:https://demo.youphptube.com/" target="_blank">Full access demo site</a>
* <a href="http:https://demo.avideo.com/" target="_blank">Full access demo site</a>
- We provide you a Demo site sample with full access to the admin account. You will need an admin password to upload and manage videos, it is by default. user: admin and pass: 123. Also there is a non admin user and password (Only for comments). user: test and pass: test.

# First thing...
Expand All @@ -13,7 +13,7 @@ I would humbly like to thank God for giving me the necessary knowledge, motivati
**For of Him, and through Him, and to Him, are all things: to whom be glory for ever. Amen.**
`Apostle Paul in Romans 11:36`

# This Software must be used for Good, never Evil. It is expressly forbidden to use YouPHPTube to build porn sites, violence, racism or anything else that affects human integrity or denigrates the image of anyone.
# This Software must be used for Good, never Evil. It is expressly forbidden to use AVideo to build porn sites, violence, racism or anything else that affects human integrity or denigrates the image of anyone.

# Now you can read the rest...

Expand All @@ -24,34 +24,34 @@ I would humbly like to thank God for giving me the necessary knowledge, motivati
I don´t want to read I just want you to show me how to install!!

Ok, check this out! https://tutorials.youphptube.com/video/streamer-and-encoder
Ok, check this out! https://tutorials.avideo.com/video/streamer-and-encoder

For text-based tutorials and the manual, look here: https://github.com/DanielnetoDotCom/YouPHPTube/wiki/Admin-manual
For text-based tutorials and the manual, look here: https://github.com/WWBN/AVideo/wiki/Admin-manual

There, you can find some hints for troubleshooting as well.


### Mobile APP
Android: https://play.google.com/store/apps/details?id=mobile.youphptube.com
Android: https://play.google.com/store/apps/details?id=mobile.avideo.com

### Are you having a hard time to configure or install YouPHPTube or any of its resources? feel free to ask us for help:
### Are you having a hard time to configure or install AVideo or any of its resources? feel free to ask us for help:

https://www.youphptube.com/services
https://www.avideo.com/services

# YouPHPTube - Streamer
YouPHPTube! is an video-sharing website, It is an open source solution that is freely available to everyone. With YouPHPTube you can create your own video sharing site, YouPHPTube will help you import and encode videos from other sites like Youtube, Vimeo, etc. and you can share directly on your website. In addition, you can use Facebook or Google login to register users on your site. The service was created in march 2017.
# AVideo - Streamer
AVideo! is an video-sharing website, It is an open source solution that is freely available to everyone. With AVideo you can create your own video sharing site, AVideo will help you import and encode videos from other sites like Youtube, Vimeo, etc. and you can share directly on your website. In addition, you can use Facebook or Google login to register users on your site. The service was created in march 2017.

<div align="center">
<img src="http:https://www.youphptube.com/img/prints/prints13.png">
<a href="http:https://demo.youphptube.com/" target="_blank">View Demo</a>
<img src="http:https://www.avideo.com/img/prints/prints13.png">
<a href="http:https://demo.avideo.com/" target="_blank">View Demo</a>
</div>

# YouPHPTube - Encoder
Go get it <a href="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/DanielnetoDotCom/YouPHPTube-Encoder" target="_blank">here</a>
# AVideo - Encoder
Go get it <a href="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/WWBN/AVideo-Encoder" target="_blank">here</a>

<div align="center">
<img src="https://youphptube.com/img/prints/encoder.png">
<a href="https://encoder.youphptube.com/" target="_blank">View Public Encoder</a>
<img src="https://avideo.com/img/prints/encoder.png">
<a href="https://encoder.avideo.com/" target="_blank">View Public Encoder</a>
</div>

# Why do I need the Encoder?
Expand All @@ -69,7 +69,7 @@ Surely you need to install an encoder

# Server Requirements

In order for you to be able to run YouPHPTube, there are certain tools that need to be installed on your server. Don't worry, they are all FREE. To have a look at complete list of required tools, click the link below.
In order for you to be able to run AVideo, there are certain tools that need to be installed on your server. Don't worry, they are all FREE. To have a look at complete list of required tools, click the link below.

- PHP 5.6+
- MySQL 5.0+
Expand Down Expand Up @@ -134,22 +134,22 @@ In order for you to be able to run YouPHPTube, there are certain tools that need
- Play List Sortable

# Version 4.3
In this version registered users need the YouPHPTube administrator to grant them permission to transmit streams
In this version registered users need the AVideo administrator to grant them permission to transmit streams

# Version 4.2
In this version you can embed Youtube and Vimeo Links

# What is new on this version 4.0?
Since version 4.x+ we separate the streamer website from the encoder website, so that we can distribute the application on different servers.
- The Streamer site, is the main front end and has as main function to attend the visitors of the site, through a layout based on the youtube experience, you can host the streamer site in any common internet host can host it (Windows or Linux).
- The Encoder site, will be better than the original encoder, the new encoder will be in charge of managing a media encoding queue. You can Donwload the encoder here: https://github.com/DanielnetoDotCom/YouPHPTube-Encoder. but to install it you will need ssh access to your server, usually only VPS servers give you that kind of access, that code uses commands that use the Linux shell and consume more CPU.
- The Encoder site, will be better than the original encoder, the new encoder will be in charge of managing a media encoding queue. You can Donwload the encoder here: https://github.com/WWBN/AVideo-Encoder. but to install it you will need ssh access to your server, usually only VPS servers give you that kind of access, that code uses commands that use the Linux shell and consume more CPU.
- I will have to install the encoder and the streamer?
No. We will be providing a public encoder, we will build the encoder in such a way that several streamers can use the same encoder. We are also providing source code for this, so you can install it internally and manage your own encoding priority.

<div align="center">
<img src="https://www.youphptube.com/img/architecture/SchemeV4.0.jpg">
<a href="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/DanielnetoDotCom/YouPHPTube-Encoder" target="_blank">Download Encoder</a>
<img src="https://www.avideo.com/img/architecture/SchemeV4.0.jpg">
<a href="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/WWBN/AVideo-Encoder" target="_blank">Download Encoder</a>
</div>

# Older version
If you want the old version with Streamer and Encoder together (Version 3.4.1) download it <a href="https://github.com/DanielnetoDotCom/YouPHPTube/releases/tag/3.4.1">here</a>
If you want the old version with Streamer and Encoder together (Version 3.4.1) download it <a href="https://github.com/WWBN/AVideo/releases/tag/3.4.1">here</a>
6 changes: 3 additions & 3 deletions admin/backup.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="panel-heading"><i class="fas fa-undo"></i> Backup Files and Database <div class="pull-right"><?php echo getPluginSwitch('Backup'); ?></div></div>
<div class="panel-body" style="overflow: hidden;">
<?php
if (YouPHPTubePlugin::exists('Backup')) {
if (AVideoPlugin::exists('Backup')) {
include $global['systemRootPath'] . 'plugin/Backup/backupEditor_head.php';
include $global['systemRootPath'] . 'plugin/Backup/backupEditor_body.php';
?>
Expand All @@ -19,7 +19,7 @@
<h2><i class="fas fa-undo"></i> Prevent Data Loss</h2>
Backing up your video files and databases, running test restores procedures on your backups, and storing copies of backups in a safe, off-site location protects you from potentially catastrophic data loss. Backing up is the only way to protect your data.
<br> We can help you with this task,
<a class="btn btn-info btn-sm btn-xs" href="https://www.youphptube.com/plugins/">Buy our Backup Plugin Now</a>
<a class="btn btn-info btn-sm btn-xs" href="https://www.avideo.com/plugins/">Buy our Backup Plugin Now</a>
</div>
<?php
}
Expand All @@ -33,7 +33,7 @@
<div class="panel-body" style="overflow: hidden;">
<div class="alert alert-info">
<i class="fas fa-info-circle"></i> This Plugin helps you to clone your video site, it is really helpful for backup routines, load balance, etc.<br>
You May find some help how to use Clone Plugin <a target="_blank" href="https://github.com/DanielnetoDotCom/YouPHPTube/wiki/Clone-Site-Plugin">here</a>
You May find some help how to use Clone Plugin <a target="_blank" href="https://github.com/WWBN/AVideo/wiki/Clone-Site-Plugin">here</a>
</div>
<?php
$filter = array(
Expand Down
6 changes: 3 additions & 3 deletions admin/customize_settings_plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<div class="panel-heading">Customize Footer, About and Meta Description <div class="pull-right"><?php echo getPluginSwitch('Customize'); ?></div></div>
<div class="panel-body">
<?php
if (!YouPHPTubePlugin::exists('Customize')) {
if (!AVideoPlugin::exists('Customize')) {
?>
<div class="alert alert-info">
Truly customize your YouPHPTube and create a more professional video sharing site experience for your visitors by removing or replacing the footer, about page and Meta Description with your own.
<a class="btn btn-info btn-sm btn-xs" href="https://www.youphptube.com/plugins/">Buy the Customize plugin now</a>
Truly customize your AVideo and create a more professional video sharing site experience for your visitors by removing or replacing the footer, about page and Meta Description with your own.
<a class="btn btn-info btn-sm btn-xs" href="https://www.avideo.com/plugins/">Buy the Customize plugin now</a>
</div>
<?php
return false;
Expand Down
2 changes: 1 addition & 1 deletion admin/design_player.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
$obj = YouPHPTubePlugin::getObjectDataIfEnabled('PlayerSkins');
$obj = AVideoPlugin::getObjectDataIfEnabled('PlayerSkins');
$dir = $global['systemRootPath'] . 'plugin/PlayerSkins/skins/';
?>
<div class="row">
Expand Down
12 changes: 6 additions & 6 deletions admin/functions.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

function createTable($pluginName, $filter = array()){
$plugin = YouPHPTubePlugin::getObjectData($pluginName);
$plugin = AVideoPlugin::getObjectData($pluginName);
if(empty($filter)){
foreach ($plugin as $keyJson => $valueJson) {
$filter[$keyJson] = "&nbsp;";
Expand All @@ -13,7 +13,7 @@ function createTable($pluginName, $filter = array()){
echo '<input type="hidden" value="'.implode("|", array_keys($filter)).'" name="pluginsList"/>';
echo '<table class="table table-hover">';
$pluginsList = array();
if (!YouPHPTubePlugin::exists($pluginName)) {
if (!AVideoPlugin::exists($pluginName)) {
echo "<tr><td colspan='2'> Sorry you do not have the plugin </td></tr>";
}else{
if(!empty($plugin)){
Expand Down Expand Up @@ -63,11 +63,11 @@ function jsonToFormElements($json, $filter = array()) {
}

function getPluginSwitch($pluginName) {
if(!YouPHPTubePlugin::exists($pluginName)){
$input = '<a href="https://www.youphptube.com/plugins/" class="btn btn-danger btn-sm btn-xs">Buy this plugin now</a>';
if(!AVideoPlugin::exists($pluginName)){
$input = '<a href="https://www.avideo.com/plugins/" class="btn btn-danger btn-sm btn-xs">Buy this plugin now</a>';
}else{
$plugin = YouPHPTubePlugin::loadPluginIfEnabled($pluginName);
$pluginForced = YouPHPTubePlugin::loadPlugin($pluginName);
$plugin = AVideoPlugin::loadPluginIfEnabled($pluginName);
$pluginForced = AVideoPlugin::loadPlugin($pluginName);
$id = uniqid();
$uuid = $pluginForced->getUUID();
$input = '<div class="material-switch">
Expand Down
2 changes: 1 addition & 1 deletion admin/general_settings_upload.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
$filter = array(
'encoderNetwork'=>'The <a target="_blank" href="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/DanielnetoDotCom/YouPHPTube-Encoder-Network">Encoder Network</a> URL ',
'encoderNetwork'=>'The <a target="_blank" href="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/WWBN/AVideo-Encoder-Network">Encoder Network</a> URL ',
'useEncoderNetworkRecomendation'=>'Let the encoder network (If configured) choose what is the best encoder to use',
'doNotShowUploadMP4Button'=>'Users will not be able to direct upload, only use the encoder',
'doNotShowImportMP4Button'=>'Disable the option to import MP4 videos from your local (Server) storage',
Expand Down
6 changes: 3 additions & 3 deletions admin/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function addItem(MenuAdmin $menu) {


$menu = new MenuAdmin(__("Contents"), "fas fa-list-ul");
$menu->addItem(new MenuAdmin(__("Videos"), "fab fa-youtube", "videos"));
$menu->addItem(new MenuAdmin(__("Videos"), "fas fa-play-circle", "videos"));
$menu->addItem(new MenuAdmin(__("Live Stuff"), "fas fa-broadcast-tower", "live"));
$menu->addItem(new MenuAdmin(__("Users"), "glyphicon glyphicon-user", "users"));
$menu->addItem(new MenuAdmin(__("Users Groups"), "fa fa-users", "usersGroups"));
Expand Down Expand Up @@ -265,7 +265,7 @@ function addItem(MenuAdmin $menu) {
?>
<div class="alert alert-danger">
Please forgive us for bothering you, but unfortunately you do not have this plugin yet. But do not hesitate to purchase it in our online store
<a class="btn btn-danger" href="https://www.youphptube.com/plugins/">Plugin Store</a>
<a class="btn btn-danger" href="https://www.avideo.com/plugins/">Plugin Store</a>
</div>
<?php
}
Expand All @@ -277,7 +277,7 @@ function addItem(MenuAdmin $menu) {
?>
<div class="alert alert-danger">
Please forgive us for bothering you, but unfortunately you do not have this plugin yet. But do not hesitate to purchase it in our online store
<a class="btn btn-danger" href="https://www.youphptube.com/plugins/">Plugin Store</a>
<a class="btn btn-danger" href="https://www.avideo.com/plugins/">Plugin Store</a>
</div>
<?php
}
Expand Down
2 changes: 1 addition & 1 deletion admin/playerUpdate.json.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

$pluginName = 'PlayerSkins';

$pluginDO = YouPHPTubePlugin::getObjectData($pluginName);
$pluginDO = AVideoPlugin::getObjectData($pluginName);
$pluginDB = Plugin::getOrCreatePluginByName($pluginName, 'active');

$pluginDO->skin = $_POST['skin'];
Expand Down
2 changes: 1 addition & 1 deletion admin/save.json.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}
}

$pluginDO = YouPHPTubePlugin::getObjectData($pluginName);
$pluginDO = AVideoPlugin::getObjectData($pluginName);
$pluginDB = Plugin::getPluginByName($pluginName);

foreach ($pluginDO as $key => $value) {
Expand Down
2 changes: 1 addition & 1 deletion admin/socialLogin_settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
createTable("LoginLDAP");
?>
<small class="form-text text-muted">
<a href="https://github.com/DanielnetoDotCom/YouPHPTube/wiki/Configure-LDAP-Plugin">Help Page</a>
<a href="https://github.com/WWBN/AVideo/wiki/Configure-LDAP-Plugin">Help Page</a>
</small>

</div>
Expand Down
4 changes: 2 additions & 2 deletions classic.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@
RewriteRule ^notifySubscribers.json$ objects/notifySubscribers.json.php [NC,L]


RewriteRule ^youPHPTubeQueueEncoder.json$ objects/youPHPTubeQueueEncoder.json.php [NC,L]
RewriteRule ^youPHPTubeEncoder.json$ objects/youPHPTubeEncoder.json.php [NC,L]
RewriteRule ^aVideoQueueEncoder.json$ objects/aVideoQueueEncoder.json.php [NC,L]
RewriteRule ^aVideoEncoder.json$ objects/aVideoEncoder.json.php [NC,L]

#comment
RewriteRule ^comments$ view/managerComments.php [NC,L]
Expand Down
2 changes: 1 addition & 1 deletion feed/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<link><?php echo $link; ?></link>
<width>144</width>
<height>40</height>
<description>YouPHPTube version rss</description>
<description>AVideo version rss</description>
</image>

<?php
Expand Down
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
</body>
</html>
<?php exit; } // if .htaccess not exist
ini_set('error_log', $global['systemRootPath'].'videos/youphptube.log');
ini_set('error_log', $global['systemRootPath'].'videos/avideo.log');
// it is needed for installation
if (!file_exists('videos/configuration.php')) {
if (!file_exists('install/index.php')) {
Expand Down
2 changes: 1 addition & 1 deletion install/checkConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@

$sql = "INSERT INTO configurations (id, video_resolution, users_id, version, webSiteTitle, language, contactEmail, encoderURL, created, modified) "
. " VALUES "
. " (1, '858:480', 1,'{$installationVersion}', '{$_POST['webSiteTitle']}', '{$_POST['mainLanguage']}', '{$_POST['contactEmail']}', 'https://encoder.youphptube.com/', now(), now())";
. " (1, '858:480', 1,'{$installationVersion}', '{$_POST['webSiteTitle']}', '{$_POST['mainLanguage']}', '{$_POST['contactEmail']}', 'https://encoder.avideo.com/', now(), now())";
if ($mysqli->query($sql) !== TRUE) {
$obj->error = "Error creating configuration: " . $mysqli->error;
echo json_encode($obj);
Expand Down
Loading

0 comments on commit 400ab5d

Please sign in to comment.