Making function depending on the id of the element

pull/2487/head
jmontoyaa 9 years ago
parent af164930aa
commit f0eaac4247
  1. 2
      main/admin/user_add.php
  2. 2
      main/admin/user_edit.php
  3. 2
      main/auth/profile.php
  4. 2
      main/course_info/infocours.php
  5. 20
      main/inc/lib/formvalidator/FormValidator.class.php
  6. 16
      main/inc/lib/pear/HTML/QuickForm/file.php
  7. 4
      main/session/session_add.php
  8. 4
      main/session/session_edit.php

@ -407,7 +407,7 @@ if ($form->validate()) {
$user_id, $user_id,
$_FILES['picture']['name'], $_FILES['picture']['name'],
$_FILES['picture']['tmp_name'], $_FILES['picture']['tmp_name'],
$user['cropResult'] $user['picture_crop_result']
); );
UserManager::update_user( UserManager::update_user(
$user_id, $user_id,

@ -490,7 +490,7 @@ if ($form->validate()) {
$user_id, $user_id,
$_FILES['picture']['name'], $_FILES['picture']['name'],
$_FILES['picture']['tmp_name'], $_FILES['picture']['tmp_name'],
$user['cropResult'] $user['picture_crop_result']
); );
} }

@ -634,7 +634,7 @@ if ($form->validate()) {
api_get_user_id(), api_get_user_id(),
$_FILES['picture']['name'], $_FILES['picture']['name'],
$_FILES['picture']['tmp_name'], $_FILES['picture']['tmp_name'],
$user_data['cropResult'] $user_data['picture_crop_result']
); );
if ($new_picture) { if ($new_picture) {

@ -485,7 +485,7 @@ if ($form->validate() && is_settings_editable()) {
$course_code, $course_code,
$picture['name'], $picture['name'],
$picture['tmp_name'], $picture['tmp_name'],
$updateValues['cropResult'] $updateValues['picture_crop_result']
); );
} }

@ -808,23 +808,29 @@ EOT;
*/ */
public function addFile($name, $label, $attributes = array()) public function addFile($name, $label, $attributes = array())
{ {
$this->addElement('file', $name, $label, $attributes); $element = $this->addElement('file', $name, $label, $attributes);
if (isset($attributes['crop_image'])) { if (isset($attributes['crop_image'])) {
$id = $element->getAttribute('id');
if (empty($id)) {
throw new Exception('If you use the crop functionality the element must have an id');
}
$this->addHtml(' $this->addHtml('
<div class="form-group"> <div class="form-group">
<label for="cropImage" id="labelCropImage" class="col-sm-2 control-label"></label> <label for="cropImage" id="'.$id.'_label_crop_image" class="col-sm-2 control-label"></label>
<div class="col-sm-8"> <div class="col-sm-8">
<div id="cropImage" class="cropCanvas"> <div id="'.$id.'_crop_image" class="cropCanvas">
<img id="previewImage"> <img id="'.$id.'_preview_image">
</div> </div>
<div> <div>
<button class="btn btn-primary hidden" name="cropButton" id="cropButton" ><em class="fa fa-crop"></em> '. <button class="btn btn-primary hidden" name="cropButton" id="'.$id.'_crop_button" >
get_lang('CropYourPicture').'</button> <em class="fa fa-crop"></em> '.
get_lang('CropYourPicture').'
</button>
</div> </div>
</div> </div>
</div>' </div>'
); );
$this->addHidden('cropResult', ''); $this->addHidden($id.'_crop_result', '');
} }
} }

@ -61,6 +61,8 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
{ {
parent::__construct($elementName, $elementLabel, $attributes); parent::__construct($elementName, $elementLabel, $attributes);
$this->setType('file'); $this->setType('file');
} //end constructor } //end constructor
// }}} // }}}
@ -275,21 +277,21 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
$id = $this->getAttribute('id'); $id = $this->getAttribute('id');
return '<script> return '<script>
$(document).ready(function() { $(document).ready(function() {
var $image = $("#previewImage"); var $image = $("#'.$id.'_preview_image");
var $input = $("[name=\'cropResult\']"); var $input = $("[name=\''.$id.'_crop_result\']");
var $cropButton = $("#cropButton"); var $cropButton = $("#'.$id.'_crop_button");
var canvas = ""; var canvas = "";
var imageWidth = ""; var imageWidth = "";
var imageHeight = ""; var imageHeight = "";
$("input:file").change(function() { $("#'.$id.'").change(function() {
var oFReader = new FileReader(); var oFReader = new FileReader();
oFReader.readAsDataURL(document.getElementById("'.$id.'").files[0]); oFReader.readAsDataURL(document.getElementById("'.$id.'").files[0]);
oFReader.onload = function (oFREvent) { oFReader.onload = function (oFREvent) {
$image.attr("src", this.result); $image.attr("src", this.result);
$("#labelCropImage").html("'.get_lang('Preview').'"); $("#'.$id.'_label_crop_image").html("'.get_lang('Preview').'");
$("#cropImage").addClass("thumbnail"); $("#'.$id.'_crop_image").addClass("thumbnail");
$cropButton.removeClass("hidden"); $cropButton.removeClass("hidden");
// Destroy cropper // Destroy cropper
$image.cropper("destroy"); $image.cropper("destroy");
@ -311,7 +313,7 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
}; };
}); });
$("#cropButton").on("click", function() { $("#'.$id.'_crop_button").on("click", function() {
var canvas = $image.cropper("getCroppedCanvas"); var canvas = $image.cropper("getCroppedCanvas");
var dataUrl = canvas.toDataURL(); var dataUrl = canvas.toDataURL();
$image.attr("src", dataUrl); $image.attr("src", dataUrl);

@ -174,7 +174,7 @@ if ($form->validate()) {
$description = $params['description']; $description = $params['description'];
$showDescription = isset($params['show_description']) ? 1: 0; $showDescription = isset($params['show_description']) ? 1: 0;
$sendSubscriptionNotification = isset($params['send_subscription_notification']); $sendSubscriptionNotification = isset($params['send_subscription_notification']);
$isThisImageCropped = isset($params['cropResult']); $isThisImageCropped = isset($params['picture_crop_result']);
$extraFields = []; $extraFields = [];
foreach ($params as $key => $value) { foreach ($params as $key => $value) {
@ -184,7 +184,7 @@ if ($form->validate()) {
} }
if (isset($extraFields['extra_image']) && $isThisImageCropped) { if (isset($extraFields['extra_image']) && $isThisImageCropped) {
$extraFields['extra_image']['crop_parameters'] = $params['cropResult']; $extraFields['extra_image']['crop_parameters'] = $params['picture_crop_result'];
} }
$return = SessionManager::create_session( $return = SessionManager::create_session(

@ -160,7 +160,7 @@ if ($form->validate()) {
$description = $params['description']; $description = $params['description'];
$showDescription = isset($params['show_description']) ? 1: 0; $showDescription = isset($params['show_description']) ? 1: 0;
$sendSubscriptionNotification = isset($params['send_subscription_notification']); $sendSubscriptionNotification = isset($params['send_subscription_notification']);
$isThisImageCropped = isset($params['cropResult']); $isThisImageCropped = isset($params['picture_crop_result']);
$extraFields = []; $extraFields = [];
foreach ($params as $key => $value) { foreach ($params as $key => $value) {
@ -170,7 +170,7 @@ if ($form->validate()) {
} }
if (isset($extraFields['extra_image']) && $isThisImageCropped) { if (isset($extraFields['extra_image']) && $isThisImageCropped) {
$extraFields['extra_image']['crop_parameters'] = $params['cropResult']; $extraFields['extra_image']['crop_parameters'] = $params['picture_crop_result'];
} }
$return = SessionManager::edit_session( $return = SessionManager::edit_session(

Loading…
Cancel
Save