mirror of
https://github.com/DanielnetoDotCom/YouPHPTube
synced 2025-10-06 03:50:04 +02:00
add a function to read tail
This commit is contained in:
parent
780722aa03
commit
49e7d45af5
6 changed files with 133 additions and 74 deletions
|
@ -39,6 +39,7 @@ class CustomizeAdvanced extends PluginAbstract {
|
||||||
$obj->doNotShowLeftMenuAudioAndVideoButtons = false;
|
$obj->doNotShowLeftMenuAudioAndVideoButtons = false;
|
||||||
$obj->disableNativeSignUp = false;
|
$obj->disableNativeSignUp = false;
|
||||||
$obj->disableNativeSignIn = false;
|
$obj->disableNativeSignIn = false;
|
||||||
|
$obj->disablePersonalInfo = true;
|
||||||
$obj->doNotShowWebsiteOnContactForm = false;
|
$obj->doNotShowWebsiteOnContactForm = false;
|
||||||
$obj->newUsersCanStream = false;
|
$obj->newUsersCanStream = false;
|
||||||
$obj->doNotIndentifyByEmail = false;
|
$obj->doNotIndentifyByEmail = false;
|
||||||
|
|
|
@ -567,17 +567,12 @@ require_once $global['systemRootPath'] . 'objects/functions.php';
|
||||||
</div>
|
</div>
|
||||||
<!-- Button -->
|
<!-- Button -->
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-md-4 control-label"></label>
|
<div class="col-md-12">
|
||||||
<div class="col-md-8">
|
<button type="submit" class="btn btn-block btn-primary btn-lg" ><?php echo __("Save"); ?> <span class="fa fa-save"></span></button>
|
||||||
<button type="submit" class="btn btn-primary" ><?php echo __("Save"); ?> <span class="glyphicon glyphicon-save"></span></button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
|
|
|
@ -34,6 +34,7 @@ function clean_name(str) {
|
||||||
str = str.stripAccents().toLowerCase();
|
str = str.stripAccents().toLowerCase();
|
||||||
return str.replace(/\W+/g, "-");
|
return str.replace(/\W+/g, "-");
|
||||||
}
|
}
|
||||||
|
var pleaseWaitIsINUse = false;
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
modal = modal || (function () {
|
modal = modal || (function () {
|
||||||
var pleaseWaitDiv = $("#pleaseWaitDialog");
|
var pleaseWaitDiv = $("#pleaseWaitDialog");
|
||||||
|
@ -43,10 +44,15 @@ $(document).ready(function () {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
showPleaseWait: function () {
|
showPleaseWait: function () {
|
||||||
|
if(pleaseWaitIsINUse){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
pleaseWaitIsINUse = true;
|
||||||
pleaseWaitDiv.modal();
|
pleaseWaitDiv.modal();
|
||||||
},
|
},
|
||||||
hidePleaseWait: function () {
|
hidePleaseWait: function () {
|
||||||
pleaseWaitDiv.modal('hide');
|
pleaseWaitDiv.modal('hide');
|
||||||
|
pleaseWaitIsINUse = false;
|
||||||
},
|
},
|
||||||
setProgress: function (valeur) {
|
setProgress: function (valeur) {
|
||||||
pleaseWaitDiv.find('.progress-bar').css('width', valeur + '%').attr('aria-valuenow', valeur);
|
pleaseWaitDiv.find('.progress-bar').css('width', valeur + '%').attr('aria-valuenow', valeur);
|
||||||
|
|
|
@ -45,7 +45,10 @@ $advancedCustom = json_decode($json_file);
|
||||||
</legend>
|
</legend>
|
||||||
<ul class="nav nav-tabs">
|
<ul class="nav nav-tabs">
|
||||||
<li class="active"><a data-toggle="tab" href="#basicInfo" id="aBasicInfo"><?php echo __("Basic Info") ?></a></li>
|
<li class="active"><a data-toggle="tab" href="#basicInfo" id="aBasicInfo"><?php echo __("Basic Info") ?></a></li>
|
||||||
|
|
||||||
|
<?php if (empty($advancedCustom->disablePersonalInfo)) { ?>
|
||||||
<li><a data-toggle="tab" href="#personalInfo" id="aPersonalInfo"><?php echo __("Personal Info") ?></a></li>
|
<li><a data-toggle="tab" href="#personalInfo" id="aPersonalInfo"><?php echo __("Personal Info") ?></a></li>
|
||||||
|
<?php } ?>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
|
@ -54,11 +57,14 @@ $advancedCustom = json_decode($json_file);
|
||||||
include './userBasicInfo.php';
|
include './userBasicInfo.php';
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<?php if (empty($advancedCustom->disablePersonalInfo)) { ?>
|
||||||
<div id="personalInfo" class="tab-pane fade" style="padding: 10px 0;">
|
<div id="personalInfo" class="tab-pane fade" style="padding: 10px 0;">
|
||||||
<?php
|
<?php
|
||||||
include './userPersonalInfo.php';
|
include './userPersonalInfo.php';
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
<?php } ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Button -->
|
<!-- Button -->
|
||||||
|
|
|
@ -157,6 +157,67 @@
|
||||||
swal("Sorry - you're browser doesn't support the FileReader API");
|
swal("Sorry - you're browser doesn't support the FileReader API");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateUserFormSubmit() {
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: '<?php echo $global['webSiteRootURL']; ?>objects/userUpdate.json.php',
|
||||||
|
data: {
|
||||||
|
"user": $('#inputUser').val(),
|
||||||
|
"pass": $('#inputPassword').val(),
|
||||||
|
"email": $('#inputEmail').val(),
|
||||||
|
"name": $('#inputName').val(),
|
||||||
|
"about": $('#textAbout').val(),
|
||||||
|
"channelName": $('#channelName').val(),
|
||||||
|
"analyticsCode": $('#analyticsCode').val()
|
||||||
|
},
|
||||||
|
type: 'post',
|
||||||
|
success: function (response) {
|
||||||
|
if (response.status > "0") {
|
||||||
|
uploadCrop.croppie('result', {
|
||||||
|
type: 'canvas',
|
||||||
|
size: 'viewport'
|
||||||
|
}).then(function (resp) {
|
||||||
|
console.log("userSavePhoto");
|
||||||
|
$.ajax({
|
||||||
|
type: "POST",
|
||||||
|
url: "<?php echo $global['webSiteRootURL']; ?>objects/userSavePhoto.php",
|
||||||
|
data: {
|
||||||
|
imgBase64: resp
|
||||||
|
},
|
||||||
|
success: function () {
|
||||||
|
console.log("userSaveBackground");
|
||||||
|
uploadCropBg.croppie('result', {
|
||||||
|
type: 'canvas',
|
||||||
|
size: 'viewport'
|
||||||
|
}).then(function (resp) {
|
||||||
|
$.ajax({
|
||||||
|
type: "POST",
|
||||||
|
url: "<?php echo $global['webSiteRootURL']; ?>objects/userSaveBackground.php",
|
||||||
|
data: {
|
||||||
|
imgBase64: resp
|
||||||
|
}, success: function (response) {
|
||||||
|
console.log("SavePersonal");
|
||||||
|
modal.hidePleaseWait();
|
||||||
|
<?php if(empty($advancedCustom->disablePersonalInfo)){ ?>
|
||||||
|
savePersonalInfo();
|
||||||
|
<?php } ?>
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else if (response.error) {
|
||||||
|
swal("<?php echo __("Sorry!"); ?>", response.error, "error");
|
||||||
|
modal.hidePleaseWait();
|
||||||
|
} else {
|
||||||
|
swal("<?php echo __("Sorry!"); ?>", "<?php echo __("Your user has NOT been updated!"); ?>", "error");
|
||||||
|
modal.hidePleaseWait();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$('#upload').on('change', function () {
|
$('#upload').on('change', function () {
|
||||||
readFile(this, uploadCrop);
|
readFile(this, uploadCrop);
|
||||||
|
@ -200,7 +261,6 @@
|
||||||
height: 250
|
height: 250
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#updateUserForm').submit(function (evt) {
|
$('#updateUserForm').submit(function (evt) {
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
if (!isAnalytics()) {
|
if (!isAnalytics()) {
|
||||||
|
@ -218,57 +278,9 @@
|
||||||
swal("<?php echo __("Sorry!"); ?>", "<?php echo __("Your password does not match!"); ?>", "error");
|
swal("<?php echo __("Sorry!"); ?>", "<?php echo __("Your password does not match!"); ?>", "error");
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
$.ajax({
|
setTimeout(function () {
|
||||||
url: '<?php echo $global['webSiteRootURL']; ?>objects/userUpdate.json.php',
|
updateUserFormSubmit();
|
||||||
data: {
|
}, 1000);
|
||||||
"user": $('#inputUser').val(),
|
|
||||||
"pass": $('#inputPassword').val(),
|
|
||||||
"email": $('#inputEmail').val(),
|
|
||||||
"name": $('#inputName').val(),
|
|
||||||
"about": $('#textAbout').val(),
|
|
||||||
"channelName": $('#channelName').val(),
|
|
||||||
"analyticsCode": $('#analyticsCode').val()
|
|
||||||
},
|
|
||||||
type: 'post',
|
|
||||||
success: function (response) {
|
|
||||||
if (response.status > "0") {
|
|
||||||
uploadCrop.croppie('result', {
|
|
||||||
type: 'canvas',
|
|
||||||
size: 'viewport'
|
|
||||||
}).then(function (resp) {
|
|
||||||
$.ajax({
|
|
||||||
type: "POST",
|
|
||||||
url: "<?php echo $global['webSiteRootURL']; ?>objects/userSavePhoto.php",
|
|
||||||
data: {
|
|
||||||
imgBase64: resp
|
|
||||||
}
|
|
||||||
}).done(function (o) {
|
|
||||||
uploadCropBg.croppie('result', {
|
|
||||||
type: 'canvas',
|
|
||||||
size: 'viewport'
|
|
||||||
}).then(function (resp) {
|
|
||||||
$.ajax({
|
|
||||||
type: "POST",
|
|
||||||
url: "<?php echo $global['webSiteRootURL']; ?>objects/userSaveBackground.php",
|
|
||||||
data: {
|
|
||||||
imgBase64: resp
|
|
||||||
}
|
|
||||||
}).done(function (o) {
|
|
||||||
modal.hidePleaseWait();
|
|
||||||
savePersonalInfo();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
} else if (response.error) {
|
|
||||||
swal("<?php echo __("Sorry!"); ?>", response.error, "error");
|
|
||||||
modal.hidePleaseWait();
|
|
||||||
} else {
|
|
||||||
swal("<?php echo __("Sorry!"); ?>", "<?php echo __("Your user has NOT been updated!"); ?>", "error");
|
|
||||||
modal.hidePleaseWait();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
<?php
|
<?php
|
||||||
|
if(!empty($advancedCustom->disablePersonalInfo)){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$text = "-- " . __('Select one Option') . " --";
|
$text = "-- " . __('Select one Option') . " --";
|
||||||
|
$myCountry = $user->getCountry();
|
||||||
|
$myRegion = $user->getRegion();
|
||||||
|
$myCity = $user->getCity();
|
||||||
?>
|
?>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-md-4 control-label"><?php echo __("First Name"); ?></label>
|
<label class="col-md-4 control-label"><?php echo __("First Name"); ?></label>
|
||||||
|
@ -54,7 +61,11 @@ $countries = IP2Location::getCountries();
|
||||||
<option><?php echo $text; ?></option>
|
<option><?php echo $text; ?></option>
|
||||||
<?php
|
<?php
|
||||||
foreach ($countries as $key => $value) {
|
foreach ($countries as $key => $value) {
|
||||||
echo '<option>' . $value . '</option>';
|
$selected = "";
|
||||||
|
if ($myCountry === $value) {
|
||||||
|
$selected = 'selected';
|
||||||
|
}
|
||||||
|
echo '<option ' . $selected . '>' . $value . '</option>';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
|
@ -106,6 +117,11 @@ $countries = IP2Location::getCountries();
|
||||||
var uploadCropDocument;
|
var uploadCropDocument;
|
||||||
function savePersonalInfo() {
|
function savePersonalInfo() {
|
||||||
$('#aPersonalInfo').tab('show');
|
$('#aPersonalInfo').tab('show');
|
||||||
|
setTimeout(function(){savePersonalInfoAjax(); }, 1000);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
function savePersonalInfoAjax(){
|
||||||
modal.showPleaseWait();
|
modal.showPleaseWait();
|
||||||
|
|
||||||
uploadCropDocument.croppie('result', {
|
uploadCropDocument.croppie('result', {
|
||||||
|
@ -130,7 +146,6 @@ $countries = IP2Location::getCountries();
|
||||||
modal.hidePleaseWait();
|
modal.hidePleaseWait();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -160,7 +175,7 @@ $countries = IP2Location::getCountries();
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#country").on("change", function (e) {
|
$("#country").on("change", function (e) {
|
||||||
modal.showPleaseWait();
|
//modal.showPleaseWait();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: '<?php echo $global['webSiteRootURL']; ?>plugin/User_Location/regions.json.php?country=' + $('#country').val(),
|
url: '<?php echo $global['webSiteRootURL']; ?>plugin/User_Location/regions.json.php?country=' + $('#country').val(),
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
@ -168,27 +183,51 @@ $countries = IP2Location::getCountries();
|
||||||
$('#region').append($("<option></option>").text('<?php echo $text; ?>'));
|
$('#region').append($("<option></option>").text('<?php echo $text; ?>'));
|
||||||
$('#city').empty();
|
$('#city').empty();
|
||||||
$('#city').append($("<option></option>").text('<?php echo $text; ?>'));
|
$('#city').append($("<option></option>").text('<?php echo $text; ?>'));
|
||||||
|
var found = false;
|
||||||
$.each(response, function (key, value) {
|
$.each(response, function (key, value) {
|
||||||
$('#region').append($("<option></option>").attr("value", value).text(value));
|
var selected = '';
|
||||||
|
if (value === '<?php echo $myRegion; ?>') {
|
||||||
|
selected = 'selected';
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
$('#region').append($("<option " + selected + "></option>").attr("value", value).text(value));
|
||||||
});
|
});
|
||||||
modal.hidePleaseWait();
|
//modal.hidePleaseWait();
|
||||||
|
if (found) {
|
||||||
|
$("#region").trigger('change');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#region").on("change", function (e) {
|
$("#region").on("change", function (e) {
|
||||||
modal.showPleaseWait();
|
//modal.showPleaseWait();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: '<?php echo $global['webSiteRootURL']; ?>plugin/User_Location/cities.json.php?country=' + $('#country').val() + '®ion=' + $('#region').val(),
|
url: '<?php echo $global['webSiteRootURL']; ?>plugin/User_Location/cities.json.php?country=' + $('#country').val() + '®ion=' + $('#region').val(),
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
$('#city').empty();
|
$('#city').empty();
|
||||||
$('#city').append($("<option></option>").text('<?php echo $text; ?>'));
|
$('#city').append($("<option></option>").text('<?php echo $text; ?>'));
|
||||||
$.each(response, function (key, value) {
|
$.each(response, function (key, value) {
|
||||||
$('#city').append($("<option></option>").attr("value", value).text(value));
|
var selected = '';
|
||||||
|
if (value === '<?php echo $myCity; ?>') {
|
||||||
|
selected = 'selected';
|
||||||
|
}
|
||||||
|
$('#city').append($("<option " + selected + "></option>").attr("value", value).text(value));
|
||||||
});
|
});
|
||||||
modal.hidePleaseWait();
|
//modal.hidePleaseWait();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
<?php
|
||||||
|
if (!empty($myCountry)) {
|
||||||
|
?>
|
||||||
|
setTimeout(function () {
|
||||||
|
$("#country").trigger('change');
|
||||||
|
}, 1000);
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
Loading…
Add table
Add a link
Reference in a new issue