Merge branch 'master' into calendar_sharing
This commit is contained in:
Georg Ehrke
commit
a8b7ae515c
|
|
@ -769,8 +769,18 @@ $(document).ready(function(){
|
|||
agenda: agendatime,
|
||||
'': defaulttime
|
||||
},
|
||||
columnFormat: {
|
||||
month: t('calendar', 'ddd'), // Mon
|
||||
week: t('calendar', 'ddd M/d'), // Mon 9/7
|
||||
day: t('calendar', 'dddd M/d') // Monday 9/7
|
||||
},
|
||||
titleFormat: {
|
||||
list: 'yyyy/MMM/d dddd'
|
||||
month: t('calendar', 'MMMM yyyy'),
|
||||
// September 2009
|
||||
week: t('calendar', "MMM d[ yyyy]{ '—'[ MMM] d yyyy}"),
|
||||
// Sep 7 - 13 2009
|
||||
day: t('calendar', 'dddd, MMM d, yyyy'),
|
||||
// Tuesday, Sep 8, 2009
|
||||
},
|
||||
axisFormat: defaulttime,
|
||||
monthNames: monthNames,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
// Init owncloud
|
||||
require_once('../../../lib/base.php');
|
||||
function bailOut($msg) {
|
||||
OC_JSON::error(array('data' => array('message' => $msg)));
|
||||
OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
|
||||
exit();
|
||||
}
|
||||
function debug($msg) {
|
||||
OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);
|
||||
}
|
||||
foreach ($_POST as $key=>$element) {
|
||||
debug('_POST: '.$key.'=>'.$element);
|
||||
}
|
||||
|
||||
// Check if we are a user
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
$l=new OC_L10N('contacts');
|
||||
|
||||
$aid = $_POST['aid'];
|
||||
$addressbook = OC_Contacts_App::getAddressbook( $aid );
|
||||
|
||||
$fn = trim($_POST['fn']);
|
||||
$n = trim($_POST['n']);
|
||||
debug('N: '.$n);
|
||||
debug('FN: '.$fn);
|
||||
|
||||
$vcard = new OC_VObject('VCARD');
|
||||
$vcard->setUID();
|
||||
$vcard->setString('FN',$fn);
|
||||
$vcard->setString('N',$n);
|
||||
|
||||
$id = OC_Contacts_VCard::add($aid,$vcard->serialize());
|
||||
if(!$id) {
|
||||
OC_JSON::error(array('data' => array('message' => $l->t('There was an error adding the contact.'))));
|
||||
OC_Log::write('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OC_Log::ERROR);
|
||||
exit();
|
||||
}
|
||||
|
||||
OC_JSON::success(array('data' => array( 'id' => $id )));
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
// Init owncloud
|
||||
require_once('../../../lib/base.php');
|
||||
function bailOut($msg) {
|
||||
OC_JSON::error(array('data' => array('message' => $msg)));
|
||||
OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);
|
||||
exit();
|
||||
}
|
||||
function debug($msg) {
|
||||
OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);
|
||||
}
|
||||
|
||||
// Check if we are a user
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
$l=new OC_L10N('contacts');
|
||||
|
||||
$id = isset($_GET['id'])?$_GET['id']:null;
|
||||
if(is_null($id)) {
|
||||
bailOut($l->t('Missing ID'));
|
||||
}
|
||||
$vcard = OC_Contacts_App::getContactVCard( $id );
|
||||
if(is_null($vcard)) {
|
||||
bailOut($l->t('Error parsing VCard for ID: "'.$id.'"'));
|
||||
}
|
||||
$details = OC_Contacts_VCard::structureContact($vcard);
|
||||
|
||||
// Some Google exported files have no FN field.
|
||||
if(!isset($details['FN'])) {
|
||||
$fn = '';
|
||||
if(isset($details['N'])) {
|
||||
$details['FN'] = array(implode(' ', $details['N'][0]['value']));
|
||||
} elseif(isset($details['EMAIL'])) {
|
||||
$details['FN'] = array('value' => $details['EMAIL'][0]['value']);
|
||||
} else {
|
||||
$details['FN'] = array('value' => $l->t('Unknown'));
|
||||
}
|
||||
}
|
||||
|
||||
// Make up for not supporting the 'N' field in earlier version.
|
||||
if(!isset($details['N'])) {
|
||||
$details['N'] = array();
|
||||
$details['N'][0] = array($details['FN'][0]['value'],'','','','');
|
||||
}
|
||||
|
||||
// Don't wanna transfer the photo in a json string.
|
||||
if(isset($details['PHOTO'])) {
|
||||
$details['PHOTO'] = true;
|
||||
//unset($details['PHOTO']);
|
||||
} else {
|
||||
$details['PHOTO'] = false;
|
||||
}
|
||||
$details['id'] = $id;
|
||||
|
||||
OC_JSON::success(array('data' => $details));
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
// Init owncloud
|
||||
require_once('../../../lib/base.php');
|
||||
|
||||
// Check if we are a user
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
|
||||
$tmp_path = $_GET['tmp_path'];
|
||||
$id = $_GET['id'];
|
||||
OC_Log::write('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
|
||||
$tmpl = new OC_TEMPLATE("contacts", "part.cropphoto");
|
||||
$tmpl->assign('tmp_path', $tmp_path);
|
||||
$tmpl->assign('id', $id);
|
||||
$page = $tmpl->fetchPage();
|
||||
|
||||
OC_JSON::success(array('data' => array( 'page' => $page )));
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
<?php
|
||||
/**
|
||||
* Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later.
|
||||
* See the COPYING-README file.
|
||||
*/
|
||||
|
||||
require_once('../../../lib/base.php');
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
|
||||
$id = $_GET['id'];
|
||||
$checksum = isset($_GET['checksum'])?$_GET['checksum']:'';
|
||||
$vcard = OC_Contacts_App::getContactVCard($id);
|
||||
$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
|
||||
|
||||
$tmpl = new OC_TEMPLATE("contacts", "part.edit_address_dialog");
|
||||
if($checksum) {
|
||||
$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
|
||||
$element = $vcard->children[$line];
|
||||
$adr = OC_Contacts_VCard::structureProperty($element);
|
||||
$tmpl->assign('adr',$adr);
|
||||
}
|
||||
|
||||
$tmpl->assign('id',$id);
|
||||
$tmpl->assign('adr_types',$adr_types);
|
||||
|
||||
$tmpl->printpage();
|
||||
|
||||
?>
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
<?php
|
||||
/**
|
||||
* Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later.
|
||||
* See the COPYING-README file.
|
||||
*/
|
||||
|
||||
require_once('../../../lib/base.php');
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
function bailOut($msg) {
|
||||
OC_JSON::error(array('data' => array('message' => $msg)));
|
||||
OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
|
||||
exit();
|
||||
}
|
||||
function debug($msg) {
|
||||
OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG);
|
||||
}
|
||||
|
||||
$tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog");
|
||||
|
||||
$id = isset($_GET['id'])?$_GET['id']:'';
|
||||
if($id) {
|
||||
$vcard = OC_Contacts_App::getContactVCard($id);
|
||||
$name = array('', '', '', '', '');
|
||||
if($vcard->__isset('N')) {
|
||||
$property = $vcard->__get('N');
|
||||
if($property) {
|
||||
$name = OC_Contacts_VCard::structureProperty($property);
|
||||
}
|
||||
}
|
||||
$tmpl->assign('name',$name);
|
||||
$tmpl->assign('id',$id);
|
||||
} else {
|
||||
$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
|
||||
$tmpl->assign('addressbooks', $addressbooks);
|
||||
}
|
||||
$tmpl->printpage();
|
||||
|
||||
?>
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* TODO: Translatable strings.
|
||||
* Remember to delete tmp file at some point.
|
||||
*/
|
||||
// Init owncloud
|
||||
require_once('../../../lib/base.php');
|
||||
// Check if we are a user
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
$l=new OC_L10N('contacts');
|
||||
|
||||
// foreach ($_POST as $key=>$element) {
|
||||
// OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
|
||||
// }
|
||||
|
||||
function bailOut($msg) {
|
||||
OC_JSON::error(array('data' => array('message' => $msg)));
|
||||
OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
|
||||
exit();
|
||||
}
|
||||
|
||||
$image = null;
|
||||
|
||||
$id = isset($_GET['id']) ? $_GET['id'] : '';
|
||||
|
||||
if($id == '') {
|
||||
bailOut('Missing contact id.');
|
||||
}
|
||||
|
||||
$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");
|
||||
$tmpl->assign('id', $id);
|
||||
$page = $tmpl->fetchPage();
|
||||
OC_JSON::success(array('data' => array('page'=>$page)));
|
||||
?>
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
// Init owncloud
|
||||
require_once('../../../lib/base.php');
|
||||
function bailOut($msg) {
|
||||
OC_JSON::error(array('data' => array('message' => $msg)));
|
||||
OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
|
||||
exit();
|
||||
}
|
||||
function debug($msg) {
|
||||
OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);
|
||||
}
|
||||
foreach ($_POST as $key=>$element) {
|
||||
debug('_POST: '.$key.'=>'.$element);
|
||||
}
|
||||
|
||||
// Check if we are a user
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
|
||||
$addressbooks = OC_Contacts_Addressbook::all(OC_USER::getUser());
|
||||
|
||||
$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
|
||||
$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
|
||||
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
|
||||
|
||||
$freeSpace=OC_Filesystem::free_space('/');
|
||||
$freeSpace=max($freeSpace,0);
|
||||
$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
|
||||
$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
|
||||
$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
|
||||
|
||||
$tmpl = new OC_Template('contacts','part.contact');
|
||||
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
|
||||
$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
|
||||
$tmpl->assign('adr_types',$adr_types);
|
||||
$tmpl->assign('phone_types',$phone_types);
|
||||
$tmpl->assign('addressbooks',$addressbooks);
|
||||
$tmpl->assign('id','');
|
||||
$page = $tmpl->fetchPage();
|
||||
|
||||
OC_JSON::success(array('data' => array( 'page' => $page )));
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* TODO: Translatable strings.
|
||||
* Remember to delete tmp file at some point.
|
||||
*/
|
||||
// Init owncloud
|
||||
require_once('../../../lib/base.php');
|
||||
OC_Log::write('contacts','ajax/savecrop.php: Huzzah!!!', OC_Log::DEBUG);
|
||||
|
||||
// Check if we are a user
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
$l=new OC_L10N('contacts');
|
||||
|
||||
// foreach ($_POST as $key=>$element) {
|
||||
// OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG);
|
||||
// }
|
||||
|
||||
// Firefox and Konqueror tries to download application/json for me. --Arthur
|
||||
OC_JSON::setContentTypeHeader('text/plain');
|
||||
|
||||
function bailOut($msg) {
|
||||
OC_JSON::error(array('data' => array('message' => $msg)));
|
||||
OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG);
|
||||
exit();
|
||||
}
|
||||
|
||||
$image = null;
|
||||
|
||||
$x1 = (isset($_POST['x1']) && $_POST['x1']) ? $_POST['x1'] : -1;
|
||||
//$x2 = isset($_POST['x2']) ? $_POST['x2'] : -1;
|
||||
$y1 = (isset($_POST['y1']) && $_POST['y1']) ? $_POST['y1'] : -1;
|
||||
//$y2 = isset($_POST['y2']) ? $_POST['y2'] : -1;
|
||||
$w = (isset($_POST['w']) && $_POST['w']) ? $_POST['w'] : -1;
|
||||
$h = (isset($_POST['h']) && $_POST['h']) ? $_POST['h'] : -1;
|
||||
$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
|
||||
$id = isset($_POST['id']) ? $_POST['id'] : '';
|
||||
|
||||
if(in_array(-1, array($x1, $y1, $w, $h))) {
|
||||
bailOut('Wrong crop dimensions: '.implode(', ', array($x1, $y1, $w, $h)));
|
||||
}
|
||||
|
||||
if($tmp_path == '') {
|
||||
bailOut('Missing path to temporary file.');
|
||||
}
|
||||
|
||||
if($id == '') {
|
||||
bailOut('Missing contact id.');
|
||||
}
|
||||
|
||||
OC_Log::write('contacts','savecrop.php: files: '.$tmp_path.' exists: '.file_exists($tmp_path), OC_Log::DEBUG);
|
||||
|
||||
if(file_exists($tmp_path)) {
|
||||
$image = new OC_Image();
|
||||
if($image->loadFromFile($tmp_path)) {
|
||||
if($image->crop($x1, $y1, $w, $h)) {
|
||||
if($image->resize(200)) {
|
||||
$tmpfname = tempnam("/tmp", "occCropped"); // create a new file because of caching issues.
|
||||
if($image->save($tmpfname)) {
|
||||
unlink($tmp_path);
|
||||
$card = OC_Contacts_App::getContactVCard($id);
|
||||
if(!$card) {
|
||||
unlink($tmpfname);
|
||||
bailOut('Error getting contact object.');
|
||||
}
|
||||
if($card->__isset('PHOTO')) {
|
||||
OC_Log::write('contacts','savecrop.php: files: PHOTO property exists.', OC_Log::DEBUG);
|
||||
$property = $card->__get('PHOTO');
|
||||
if(!$property) {
|
||||
unlink($tmpfname);
|
||||
bailOut('Error getting PHOTO property.');
|
||||
}
|
||||
$property->setValue($image->__toString());
|
||||
$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
|
||||
$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
|
||||
$card->__set('PHOTO', $property);
|
||||
} else {
|
||||
OC_Log::write('contacts','savecrop.php: files: Adding PHOTO property.', OC_Log::DEBUG);
|
||||
$card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType()));
|
||||
}
|
||||
if(!OC_Contacts_VCard::edit($id,$card->serialize())) {
|
||||
bailOut('Error saving contact.');
|
||||
}
|
||||
unlink($tmpfname);
|
||||
//$result=array( "status" => "success", 'mime'=>$image->mimeType(), 'tmp'=>$tmp_path);
|
||||
$tmpl = new OC_TEMPLATE("contacts", "part.contactphoto");
|
||||
$tmpl->assign('tmp_path', $tmpfname);
|
||||
$tmpl->assign('mime', $image->mimeType());
|
||||
$tmpl->assign('id', $id);
|
||||
$tmpl->assign('width', $image->width());
|
||||
$tmpl->assign('height', $image->height());
|
||||
$page = $tmpl->fetchPage();
|
||||
OC_JSON::success(array('data' => array('page'=>$page, 'tmp'=>$tmpfname)));
|
||||
exit();
|
||||
} else {
|
||||
if(file_exists($tmpfname)) {
|
||||
unlink($tmpfname);
|
||||
}
|
||||
bailOut('Error saving temporary image');
|
||||
}
|
||||
} else {
|
||||
bailOut('Error resizing image');
|
||||
}
|
||||
} else {
|
||||
bailOut('Error cropping image');
|
||||
}
|
||||
} else {
|
||||
bailOut('Error creating temporary image');
|
||||
}
|
||||
} else {
|
||||
bailOut('Error finding image: '.$tmp_path);
|
||||
}
|
||||
|
||||
if($tmp_path != '' && file_exists($tmp_path)) {
|
||||
unlink($tmp_path);
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -0,0 +1,134 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
// Init owncloud
|
||||
require_once('../../../lib/base.php');
|
||||
|
||||
// Check if we are a user
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
$l=new OC_L10N('contacts');
|
||||
|
||||
function bailOut($msg) {
|
||||
OC_JSON::error(array('data' => array('message' => $msg)));
|
||||
OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
|
||||
exit();
|
||||
}
|
||||
function debug($msg) {
|
||||
OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG);
|
||||
}
|
||||
foreach ($_POST as $key=>$element) {
|
||||
debug('_POST: '.$key.'=>'.$element);
|
||||
}
|
||||
|
||||
$id = isset($_POST['id'])?$_POST['id']:null;
|
||||
$name = isset($_POST['name'])?$_POST['name']:null;
|
||||
$value = isset($_POST['value'])?$_POST['value']:null;
|
||||
$parameters = isset($_POST['parameters'])?$_POST['parameters']:null;
|
||||
$checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
|
||||
// if(!is_null($parameters)) {
|
||||
// debug('parameters: '.count($parameters));
|
||||
// foreach($parameters as $key=>$val ) {
|
||||
// debug('parameter: '.$key.'=>'.implode('/',$val));
|
||||
// }
|
||||
// }
|
||||
|
||||
if(is_array($value)){ // FIXME: How to strip_tags for compound values?
|
||||
ksort($value); // NOTE: Important, otherwise the compound value will be set in the order the fields appear in the form!
|
||||
$value = OC_VObject::escapeSemicolons($value);
|
||||
} else {
|
||||
$value = trim(strip_tags($value));
|
||||
}
|
||||
if(!$id) {
|
||||
bailOut($l->t('id is not set.'));
|
||||
}
|
||||
if(!$checksum) {
|
||||
bailOut($l->t('checksum is not set.'));
|
||||
}
|
||||
if(!$name) {
|
||||
bailOut($l->t('element name is not set.'));
|
||||
}
|
||||
|
||||
$vcard = OC_Contacts_App::getContactVCard( $id );
|
||||
$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
|
||||
if(is_null($line)) {
|
||||
bailOut($l->t('Information about vCard is incorrect. Please reload the page.'.$checksum.' "'.$line.'"'));
|
||||
}
|
||||
$element = $vcard->children[$line]->name;
|
||||
|
||||
if($element != $name) {
|
||||
bailOut($l->t('Something went FUBAR. ').$name.' != '.$element);
|
||||
}
|
||||
|
||||
switch($element) {
|
||||
case 'BDAY':
|
||||
$date = New DateTime($value);
|
||||
//$vcard->setDateTime('BDAY', $date, Sabre_VObject_Element_DateTime::DATE);
|
||||
$value = $date->format(DateTime::ATOM);
|
||||
case 'FN':
|
||||
if(!$value) {
|
||||
// create a method thats returns an alternative for FN.
|
||||
//$value = getOtherValue();
|
||||
}
|
||||
case 'N':
|
||||
case 'ORG':
|
||||
case 'NICKNAME':
|
||||
debug('Setting string:'.$name.' '.$value);
|
||||
$vcard->setString($name, $value);
|
||||
break;
|
||||
case 'EMAIL':
|
||||
$value = strtolower($value);
|
||||
case 'TEL':
|
||||
case 'ADR': // should I delete the property if empty or throw an error?
|
||||
debug('Setting element: (EMAIL/TEL/ADR)'.$element);
|
||||
if(!$value) {
|
||||
unset($vcard->children[$line]); // Should never happen...
|
||||
} else {
|
||||
$vcard->children[$line]->setValue($value);
|
||||
$vcard->children[$line]->parameters = array();
|
||||
if(!is_null($parameters)) {
|
||||
debug('Setting parameters: '.$parameters);
|
||||
foreach($parameters as $key => $parameter) {
|
||||
debug('Adding parameter: '.$key);
|
||||
foreach($parameter as $val) {
|
||||
debug('Adding parameter: '.$key.'=>'.$val);
|
||||
$vcard->children[$line]->add(new Sabre_VObject_Parameter($key, strtoupper($val)));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
// Do checksum and be happy
|
||||
$checksum = md5($vcard->children[$line]->serialize());
|
||||
debug('New checksum: '.$checksum);
|
||||
|
||||
if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) {
|
||||
OC_JSON::error(array('data' => array('message' => $l->t('Error updating contact property.'))));
|
||||
OC_Log::write('contacts','ajax/setproperty.php: Error updating contact property: '.$value, OC_Log::ERROR);
|
||||
exit();
|
||||
}
|
||||
|
||||
//$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
|
||||
//$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
|
||||
|
||||
OC_JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] )));
|
||||
|
|
@ -0,0 +1,133 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
// Init owncloud
|
||||
require_once('../../../lib/base.php');
|
||||
|
||||
// Check if we are a user
|
||||
// Firefox and Konqueror tries to download application/json for me. --Arthur
|
||||
OC_JSON::setContentTypeHeader('text/plain');
|
||||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('contacts');
|
||||
function bailOut($msg) {
|
||||
OC_JSON::error(array('data' => array('message' => $msg)));
|
||||
OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG);
|
||||
exit();
|
||||
}
|
||||
function debug($msg) {
|
||||
OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG);
|
||||
}
|
||||
|
||||
// foreach ($_SERVER as $key=>$element) {
|
||||
// debug('$_SERVER: '.$key.'=>'.$element);
|
||||
// }
|
||||
// foreach ($_GET as $key=>$element) {
|
||||
// debug('_GET: '.$key.'=>'.$element);
|
||||
// }
|
||||
// foreach ($_POST as $key=>$element) {
|
||||
// debug('_POST: '.$key.'=>'.$element);
|
||||
// }
|
||||
// foreach ($_FILES as $key=>$element) {
|
||||
// debug('_FILES: '.$key.'=>'.$element);
|
||||
// }
|
||||
|
||||
// If it is a Drag'n'Drop transfer it's handled here.
|
||||
$fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
|
||||
if ($fn) {
|
||||
// AJAX call
|
||||
if (!isset($_GET['id'])) {
|
||||
OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG);
|
||||
OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
|
||||
exit();
|
||||
}
|
||||
$id = $_GET['id'];
|
||||
$tmpfname = tempnam('/tmp', 'occOrig');
|
||||
file_put_contents($tmpfname, file_get_contents('php://input'));
|
||||
debug($tmpfname.' uploaded');
|
||||
$image = new OC_Image();
|
||||
if($image->loadFromFile($tmpfname)) {
|
||||
if($image->width() > 400 || $image->height() > 400) {
|
||||
$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
|
||||
}
|
||||
if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
|
||||
debug('Couldn\'t save correct image orientation: '.$tmpfname);
|
||||
}
|
||||
if($image->save($tmpfname)) {
|
||||
OC_JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpfname)));
|
||||
exit();
|
||||
} else {
|
||||
bailOut('Couldn\'t save temporary image: '.$tmpfname);
|
||||
}
|
||||
} else {
|
||||
bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!isset($_POST['id'])) {
|
||||
OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG);
|
||||
OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
|
||||
exit();
|
||||
}
|
||||
if (!isset($_FILES['imagefile'])) {
|
||||
OC_Log::write('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OC_Log::DEBUG);
|
||||
OC_JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
|
||||
exit();
|
||||
}
|
||||
$error = $_FILES['imagefile']['error'];
|
||||
if($error !== UPLOAD_ERR_OK) {
|
||||
$l=new OC_L10N('contacts');
|
||||
$errors = array(
|
||||
0=>$l->t("There is no error, the file uploaded with success"),
|
||||
1=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
|
||||
2=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
|
||||
3=>$l->t("The uploaded file was only partially uploaded"),
|
||||
4=>$l->t("No file was uploaded"),
|
||||
6=>$l->t("Missing a temporary folder")
|
||||
);
|
||||
bailOut($errors[$error]);
|
||||
}
|
||||
$file=$_FILES['imagefile'];
|
||||
|
||||
$tmpfname = tempnam("/tmp", "occOrig");
|
||||
if(file_exists($file['tmp_name'])) {
|
||||
$image = new OC_Image();
|
||||
if($image->loadFromFile($file['tmp_name'])) {
|
||||
if($image->width() > 400 || $image->height() > 400) {
|
||||
$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
|
||||
}
|
||||
if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
|
||||
debug('Couldn\'t save correct image orientation: '.$tmpfname);
|
||||
}
|
||||
if($image->save($tmpfname)) {
|
||||
OC_JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpfname)));
|
||||
exit();
|
||||
} else {
|
||||
bailOut('Couldn\'t save temporary image: '.$tmpfname);
|
||||
}
|
||||
} else {
|
||||
bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
|
||||
}
|
||||
} else {
|
||||
bailOut('Temporary file: \''.$file['tmp_name'].'\' has gone AWOL?');
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
<?php
|
||||
require_once('../../lib/base.php');
|
||||
|
||||
// Check if we are a user
|
||||
OC_Util::checkLoggedIn();
|
||||
// Get active address books. This creates a default one if none exists.
|
||||
$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
|
||||
$contacts = OC_Contacts_VCard::all($ids);
|
||||
|
||||
$addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
|
||||
|
||||
// Load the files we need
|
||||
OC_App::setActiveNavigationEntry( 'contacts_index' );
|
||||
|
||||
// Load a specific user?
|
||||
$id = isset( $_GET['id'] ) ? $_GET['id'] : null;
|
||||
$details = array();
|
||||
|
||||
// FIXME: This cannot work..?
|
||||
if(is_null($id) && count($contacts) > 0) {
|
||||
$id = $contacts[0]['id'];
|
||||
}
|
||||
if(!is_null($id)) {
|
||||
$vcard = OC_Contacts_App::getContactVCard($id);
|
||||
$details = OC_Contacts_VCard::structureContact($vcard);
|
||||
}
|
||||
$property_types = OC_Contacts_App::getAddPropertyOptions();
|
||||
$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
|
||||
|
||||
$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
|
||||
$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
|
||||
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
|
||||
|
||||
$freeSpace=OC_Filesystem::free_space('/');
|
||||
$freeSpace=max($freeSpace,0);
|
||||
$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
|
||||
|
||||
OC_Util::addScript('','jquery.multiselect');
|
||||
//OC_Util::addScript('contacts','interface');
|
||||
OC_Util::addScript('contacts','contacts');
|
||||
OC_Util::addScript('contacts','jquery.combobox');
|
||||
OC_Util::addScript('contacts','jquery.inview');
|
||||
OC_Util::addScript('contacts','jquery.Jcrop');
|
||||
OC_Util::addScript('contacts','jquery.jec-1.3.3');
|
||||
OC_Util::addStyle('','jquery.multiselect');
|
||||
//OC_Util::addStyle('contacts','styles');
|
||||
OC_Util::addStyle('contacts','jquery.combobox');
|
||||
OC_Util::addStyle('contacts','jquery.Jcrop');
|
||||
OC_Util::addStyle('contacts','contacts');
|
||||
|
||||
$tmpl = new OC_Template( "contacts", "index2", "user" );
|
||||
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
|
||||
$tmpl->assign('uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
|
||||
$tmpl->assign('property_types',$property_types);
|
||||
$tmpl->assign('phone_types',$phone_types);
|
||||
$tmpl->assign('addressbooks', $addressbooks);
|
||||
$tmpl->assign('contacts', $contacts);
|
||||
$tmpl->assign('details', $details );
|
||||
$tmpl->assign('id',$id);
|
||||
$tmpl->printPage();
|
||||
|
||||
?>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 329 B |
|
|
@ -0,0 +1,213 @@
|
|||
/*dl > dt {
|
||||
font-weight: bold;
|
||||
}*/
|
||||
|
||||
#contacts { padding-left:2px; padding-top: 5px; background: #fff; }
|
||||
#leftcontent a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
|
||||
#chooseaddressbook {margin-right: 170px; float: right;}
|
||||
#contacts_deletecard {position:absolute;top:15px;right:25px;}
|
||||
#contacts_downloadcard {position:absolute;top:15px;right:50px;}
|
||||
#contacts_propertymenu_button { position:absolute;top:15px;right:150px; height: 20px; width: 150px; background:url('../../../core/img/actions/add.svg') no-repeat center; }
|
||||
#contacts_propertymenu { position:absolute;top:40px;right:150px; overflow:hidden; text-overflow:ellipsis; /*border: thin solid #1d2d44;*/ -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000; box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; }
|
||||
#contacts_propertymenu li { display: block; font-weight: bold; height: 20px; width: 100px; }
|
||||
/*#contacts_propertymenu li:first-child { border-top: thin solid #1d2d44; -moz-border-radius-topleft:0.5em; -webkit-border-top-left-radius:0.5em; border-top-left-radius:0.5em; -moz-border-radius-topright:0.5em; -webkit-border-top-right-radius:0.5em; border-top-right-radius:0.5em; }
|
||||
#contacts_propertymenu li:last-child { border-bottom: thin solid #1d2d44; -moz-border-radius-bottomleft:0.5em; -webkit-border-bottom-left-radius:0.5em; border-bottom-left-radius:0.5em; -moz-border-radius-bottomright:0.5em; -webkit-border-bottom-right-radius:0.5em; border-bottom-right-radius:0.5em; }*/
|
||||
#contacts_propertymenu li a { padding: 3px; display: block }
|
||||
#contacts_propertymenu li:hover { background-color: #1d2d44; }
|
||||
#contacts_propertymenu li a:hover { color: #fff }
|
||||
#actionbar { height: 30px; width: 200px; position: fixed; right: 0px; top: 75px; margin: 0 0 0 0; padding: 0 0 0 0;}
|
||||
#card { /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
|
||||
#firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em; color:#777;}
|
||||
#firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em; width: 100%; margin: 2em auto auto auto; clear: both; }
|
||||
|
||||
#card input[type="text"],input[type="email"],input[type="tel"],input[type="date"], select { background-color: #f8f8f8; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
|
||||
#card input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,input[type="email"]:hover,input[type="tel"]:hover,input[type="date"]:hover,input[type="date"],input[type="date"]:hover,input[type="date"]:active,input[type="date"]:active,input[type="date"]:active,input[type="email"]:active,input[type="tel"]:active, select:hover, select:focus, select:active { border: 0 !important; -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; float: left; }
|
||||
input[type="text"]:invalid,input[type="email"]:invalid,input[type="tel"]:invalid,input[type="date"]:invalid { background-color: #ffc0c0 !important; }
|
||||
/*input[type="text"]:valid,input[type="email"]:valid,input[type="tel"]:valid,input[type="date"]:valid { background-color: #b1d28f !important; }*/
|
||||
dl.form
|
||||
{
|
||||
width: 100%;
|
||||
float: left;
|
||||
clear: right;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.form dt
|
||||
{
|
||||
display: table-cell;
|
||||
clear: left;
|
||||
float: left;
|
||||
width: 7em;
|
||||
/*overflow: hidden;*/
|
||||
margin: 0;
|
||||
padding: 0.8em 0.5em 0 0;
|
||||
font-weight: bold;
|
||||
text-align:right;
|
||||
text-overflow:ellipsis;
|
||||
o-text-overflow: ellipsis;
|
||||
vertical-align: text-bottom;
|
||||
/*
|
||||
white-space: pre-wrap;
|
||||
white-space: -moz-pre-wrap !important;
|
||||
white-space: -pre-wrap;
|
||||
white-space: -o-pre-wrap;*/
|
||||
}
|
||||
|
||||
.form dd
|
||||
{
|
||||
display: table-cell;
|
||||
clear: right;
|
||||
float: left;
|
||||
margin: 0;
|
||||
padding: 0px;
|
||||
white-space: nowrap;
|
||||
vertical-align: text-bottom;
|
||||
/*min-width: 20em;*/
|
||||
/*background-color: yellow;*/
|
||||
}
|
||||
|
||||
.loading { background: url('../../../core/img/loading.gif') no-repeat center !important;}
|
||||
|
||||
/*.add { cursor: pointer; width: 25px; height: 25px; margin: 0px; float: right; position:relative; content: "\+"; font-weight: bold; color: #666; font-size: large; bottom: 0px; right: 0px; clear: both; text-align: center; vertical-align: bottom; display: none; }*/
|
||||
|
||||
.listactions { height: 1em; width:60px; float: left; clear: right; }
|
||||
.add,.edit,.delete,.mail, .globe { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; display: none; }
|
||||
.add { background:url('../../../core/img/actions/add.svg') no-repeat center; clear: both; }
|
||||
.delete { background:url('../../../core/img/actions/delete.svg') no-repeat center; }
|
||||
.edit { background:url('../../../core/img/actions/rename.svg') no-repeat center; }
|
||||
.mail { background:url('../../../core/img/actions/mail.svg') no-repeat center; }
|
||||
.globe { background:url('../img/globe.svg') no-repeat center; }
|
||||
|
||||
#messagebox_msg { font-weight: bold; font-size: 1.2em; }
|
||||
|
||||
/* Name editor */
|
||||
#edit_name_dialog {
|
||||
/*width: 25em;*/
|
||||
padding:0;
|
||||
}
|
||||
#edit_name_dialog > input {
|
||||
width: 15em;
|
||||
}
|
||||
/* Address editor */
|
||||
#edit_address_dialog {
|
||||
/*width: 30em;*/
|
||||
}
|
||||
#edit_address_dialog > input {
|
||||
width: 15em;
|
||||
}
|
||||
#edit_photo_dialog_img {
|
||||
display: block;
|
||||
width: 150;
|
||||
height: 200;
|
||||
border: thin solid black;
|
||||
}
|
||||
#fn {
|
||||
float: left;
|
||||
}
|
||||
.jecEditableOption {
|
||||
margin: 2px;
|
||||
border-radius: 0.5em;
|
||||
border: thin solid #bbb;
|
||||
content: 'Custom';
|
||||
}
|
||||
/**
|
||||
* Create classes form, floateven and floatodd which flows left and right respectively.
|
||||
*/
|
||||
.contactsection {
|
||||
float: left;
|
||||
min-width: 30em;
|
||||
max-width: 40em;
|
||||
margin: 0.5em;
|
||||
border: thin solid lightgray;
|
||||
-webkit-border-radius: 0.5em;
|
||||
-moz-border-radius: 0.5em;
|
||||
border-radius: 0.5em;
|
||||
background-color: #f8f8f8;
|
||||
}
|
||||
|
||||
.contactpart legend {
|
||||
/*background: #fff;
|
||||
font-weight: bold;
|
||||
left: 1em;
|
||||
border: thin solid gray;
|
||||
-webkit-border-radius: 0.5em;
|
||||
-moz-border-radius: 0.5em;
|
||||
border-radius: 0.5em;
|
||||
padding: 3px;*/
|
||||
width:auto; padding:.3em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
|
||||
}
|
||||
/*#contacts_details_photo {
|
||||
cursor: pointer;
|
||||
z-index:1;
|
||||
margin: auto;
|
||||
}
|
||||
*/
|
||||
#cropbox {
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
/* Photo editor */
|
||||
/*#contacts_details_photo_wrapper {
|
||||
z-index: 1000;
|
||||
}*/
|
||||
#contacts_details_photo {
|
||||
border-radius: 0.5em;
|
||||
border: thin solid #bbb;
|
||||
padding: 0.5em;
|
||||
margin: 1em 1em 1em 7em;
|
||||
cursor: pointer;
|
||||
/*background: #f8f8f8;*/
|
||||
background: url(../../../core/img/loading.gif) no-repeat center center;
|
||||
clear: right;
|
||||
}
|
||||
#contacts_details_photo:hover {
|
||||
background: #fff;
|
||||
}
|
||||
#contacts_details_photo_progress {
|
||||
margin: 0.3em 0.3em 0.3em 7em;
|
||||
clear: left;
|
||||
}
|
||||
/* Address editor */
|
||||
#addressdisplay { padding: 0.5em; }
|
||||
dl.addresscard { background-color: #fff; float: left; width: 45%; margin: 0 0.3em 0.3em 0.3em; padding: 0; border: thin solid lightgray; }
|
||||
dl.addresscard dd {}
|
||||
dl.addresscard dt { padding: 0.3em; border-bottom: thin solid lightgray; font-weight: bold; clear: both;}
|
||||
dl.addresscard dd > ul { margin: 0.3em; padding: 0.3em; }
|
||||
#adr_type {} /* Select */
|
||||
#adr_pobox {}
|
||||
#adr_extended {}
|
||||
#adr_street {}
|
||||
#adr_city {}
|
||||
#adr_region {}
|
||||
#adr_zipcode {}
|
||||
#adr_country {}
|
||||
|
||||
.delimiter {
|
||||
height: 10px;
|
||||
clear: both;
|
||||
}
|
||||
.updatebar {
|
||||
height: 30px;
|
||||
clear: both;
|
||||
padding-right: 170px;
|
||||
border: thin solid lightgray;
|
||||
}
|
||||
.updatebar button {
|
||||
float: left; margin: 1em;
|
||||
}
|
||||
|
||||
/*input[type="text"] { float: left; max-width: 15em; }
|
||||
input[type="radio"] { float: left; -khtml-appearance: none; width: 20px; height: 20px; vertical-align: middle; }*/
|
||||
#file_upload_target, #crop_target { display:none; }
|
||||
|
||||
#file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; cursor:pointer; width:0; height:0;}
|
||||
input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
|
||||
.propertycontainer dd { float: left; width: 25em; }
|
||||
.propertylist { clear: none; max-width: 28em; }
|
||||
.propertylist li { /*background-color: cyan; */ min-width: 25em; /*max-width: 30em;*/ display: block; clear: right; }
|
||||
.propertylist li > input[type="text"],input[type="email"],input[type="tel"] { float: left; max-width: 15em; }
|
||||
.propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 20px; height: 20px; vertical-align: middle; }
|
||||
.propertylist li > select { float: left; max-width: 8em; }
|
||||
.typelist { float: left; max-width: 10em; } /* for multiselect */
|
||||
.addresslist { clear: both; }
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
/* jquery.Jcrop.css
|
||||
The code contained in this file is free software under MIT License
|
||||
Copyright (c)2008-2011 Tapmodo Interactive LLC
|
||||
*/
|
||||
|
||||
/*
|
||||
The outer-most container in a typical Jcrop instance
|
||||
If you are having difficulty with formatting related to styles
|
||||
on a parent element, place any fixes here or in a like selector
|
||||
*/
|
||||
.jcrop-holder {
|
||||
direction: ltr;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.jcrop-vline, .jcrop-hline {
|
||||
background: white url('Jcrop.gif') top left repeat;
|
||||
font-size: 0px;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.jcrop-vline {
|
||||
height: 100%;
|
||||
width: 1px !important;
|
||||
}
|
||||
|
||||
.jcrop-hline {
|
||||
width: 100%;
|
||||
height: 1px !important;
|
||||
}
|
||||
|
||||
.jcrop-vline.right {
|
||||
right: 0px;
|
||||
}
|
||||
|
||||
.jcrop-hline.bottom {
|
||||
bottom: 0px;
|
||||
}
|
||||
|
||||
.jcrop-handle {
|
||||
background-color: #333;
|
||||
border: 1px #eee solid;
|
||||
font-size: 1px;
|
||||
}
|
||||
|
||||
.jcrop-tracker {
|
||||
height: 100%;
|
||||
-webkit-tap-highlight-color: transparent; /* "turn off" link highlight */
|
||||
-webkit-touch-callout: none; /* disable callout, image save panel */
|
||||
-webkit-user-select: none; /* disable cut copy paste */
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
|
||||
.jcrop-light .jcrop-vline, .jcrop-light .jcrop-hline {
|
||||
background: white;
|
||||
filter: Alpha(opacity=70) !important;
|
||||
opacity: .70 !important;
|
||||
}
|
||||
|
||||
.jcrop-light .jcrop-handle {
|
||||
background-color: black;
|
||||
border-color: white;
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
}
|
||||
|
||||
.jcrop-dark .jcrop-vline, .jcrop-dark .jcrop-hline {
|
||||
background: black;
|
||||
filter: Alpha(opacity=70) !important;
|
||||
opacity: 0.70 !important;
|
||||
}
|
||||
|
||||
.jcrop-dark .jcrop-handle {
|
||||
background-color: white;
|
||||
border-color: black;
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
.combo-button { background:url('../../../core/img/actions/triangle-s.svg') no-repeat center; margin-left: -1px; float: left; border: none; }
|
||||
.ui-button-icon-only .ui-button-text { padding: 0.35em; }
|
||||
.ui-autocomplete-input { margin: 0; padding: 0.48em 0 0.47em 0.45em; }
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Image generator for contacts.
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
// Init owncloud
|
||||
require_once('../../lib/base.php');
|
||||
$tmp_path = $_GET['tmp_path'];
|
||||
$maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
|
||||
header("Cache-Control: no-cache, no-store, must-revalidate");
|
||||
|
||||
OC_Log::write('contacts','dynphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
|
||||
|
||||
$image = new OC_Image($tmp_path);
|
||||
if($maxsize != -1) {
|
||||
$image->resize($maxsize);
|
||||
}
|
||||
$image();
|
||||
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,255 @@
|
|||
/**
|
||||
* jquery.Jcrop.min.js v0.9.9 {{{ (build:20120102)
|
||||
* jQuery Image Cropping Plugin - released under MIT License
|
||||
* Copyright (c) 2008-2012 Tapmodo Interactive LLC
|
||||
* https://github.com/tapmodo/Jcrop
|
||||
*/
|
||||
|
||||
(function($){$.Jcrop=function(obj,opt){var options=$.extend({},$.Jcrop.defaults),docOffset,lastcurs,ie6mode=false;function px(n){return parseInt(n,10)+'px';}
|
||||
function cssClass(cl){return options.baseClass+'-'+cl;}
|
||||
function supportsColorFade(){return $.fx.step.hasOwnProperty('backgroundColor');}
|
||||
function getPos(obj)
|
||||
{var pos=$(obj).offset();return[pos.left,pos.top];}
|
||||
function mouseAbs(e)
|
||||
{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];}
|
||||
function setOptions(opt)
|
||||
{if(typeof(opt)!=='object')opt={};options=$.extend(options,opt);$.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e){if(typeof(options[e])!=='function')options[e]=function(){};});}
|
||||
function startDragMode(mode,pos)
|
||||
{docOffset=getPos($img);Tracker.setCursor(mode==='move'?mode:mode+'-resize');if(mode==='move'){return Tracker.activateHandlers(createMover(pos),doneSelect);}
|
||||
var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);}
|
||||
function dragmodeHandler(mode,f)
|
||||
{return function(pos){if(!options.aspectRatio){switch(mode){case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}}else{switch(mode){case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}}
|
||||
Coords.setCurrent(pos);Selection.update();};}
|
||||
function createMover(pos)
|
||||
{var lloc=pos;KeyManager.watchKeys();return function(pos){Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};}
|
||||
function oppLockCorner(ord)
|
||||
{switch(ord){case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';}}
|
||||
function createDragger(ord)
|
||||
{return function(e){if(options.disabled){return false;}
|
||||
if((ord==='move')&&!options.allowMove){return false;}
|
||||
docOffset=getPos($img);btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};}
|
||||
function presize($obj,w,h)
|
||||
{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0){nw=w;nh=(w/$obj.width())*$obj.height();}
|
||||
if((nh>h)&&h>0){nh=h;nw=(h/$obj.height())*$obj.width();}
|
||||
xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);}
|
||||
function unscale(c)
|
||||
{return{x:parseInt(c.x*xscale,10),y:parseInt(c.y*yscale,10),x2:parseInt(c.x2*xscale,10),y2:parseInt(c.y2*yscale,10),w:parseInt(c.w*xscale,10),h:parseInt(c.h*yscale,10)};}
|
||||
function doneSelect(pos)
|
||||
{var c=Coords.getFixed();if((c.w>options.minSelect[0])&&(c.h>options.minSelect[1])){Selection.enableHandles();Selection.done();}else{Selection.release();}
|
||||
Tracker.setCursor(options.allowSelect?'crosshair':'default');}
|
||||
function newSelection(e)
|
||||
{if(options.disabled){return false;}
|
||||
if(!options.allowSelect){return false;}
|
||||
btndown=true;docOffset=getPos($img);Selection.disableHandles();Tracker.setCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Selection.update();Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();e.stopPropagation();e.preventDefault();return false;}
|
||||
function selectDrag(pos)
|
||||
{Coords.setCurrent(pos);Selection.update();}
|
||||
function newTracker()
|
||||
{var trk=$('<div></div>').addClass(cssClass('tracker'));if($.browser.msie){trk.css({opacity:0,backgroundColor:'white'});}
|
||||
return trk;}
|
||||
if($.browser.msie&&($.browser.version.split('.')[0]==='6')){ie6mode=true;}
|
||||
if(typeof(obj)!=='object'){obj=$(obj)[0];}
|
||||
if(typeof(opt)!=='object'){opt={};}
|
||||
setOptions(opt);var img_css={border:'none',visibility:'visible',margin:0,padding:0,position:'absolute',top:0,left:0};var $origimg=$(obj),img_mode=true;if(obj.tagName=='IMG'){if($origimg[0].width!=0&&$origimg[0].height!=0){$origimg.width($origimg[0].width);$origimg.height($origimg[0].height);}else{var tempImage=new Image();tempImage.src=$origimg[0].src;$origimg.width(tempImage.width);$origimg.height(tempImage.height);}
|
||||
var $img=$origimg.clone().removeAttr('id').css(img_css).show();$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();}else{$img=$origimg.css(img_css).show();img_mode=false;if(options.shade===null){options.shade=true;}}
|
||||
presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);if(options.addClass){$div.addClass(options.addClass);}
|
||||
var $img2=$('<div />'),$img_holder=$('<div />').width('100%').height('100%').css({zIndex:310,position:'absolute',overflow:'hidden'}),$hdl_holder=$('<div />').width('100%').height('100%').css('zIndex',320),$sel=$('<div />').css({position:'absolute',zIndex:600}).dblclick(function(){var c=Coords.getFixed();options.onDblClick.call(api,c);}).insertBefore($img).append($img_holder,$hdl_holder);if(img_mode){$img2=$('<img />').attr('src',$img.attr('src')).css(img_css).width(boundx).height(boundy),$img_holder.append($img2);}
|
||||
if(ie6mode){$sel.css({overflowY:'hidden'});}
|
||||
var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var bgcolor=options.bgColor,bgopacity=options.bgOpacity,xlimit,ylimit,xmin,ymin,xscale,yscale,enabled=true,btndown,animating,shift_down;docOffset=getPos($img);var Touch=(function(){function hasTouchSupport(){var support={},events=['touchstart','touchmove','touchend'],el=document.createElement('div'),i;try{for(i=0;i<events.length;i++){var eventName=events[i];eventName='on'+eventName;var isSupported=(eventName in el);if(!isSupported){el.setAttribute(eventName,'return;');isSupported=typeof el[eventName]=='function';}
|
||||
support[events[i]]=isSupported;}
|
||||
return support.touchstart&&support.touchend&&support.touchmove;}
|
||||
catch(err){return false;}}
|
||||
function detectSupport(){if((options.touchSupport===true)||(options.touchSupport===false))return options.touchSupport;else return hasTouchSupport();}
|
||||
return{createDragger:function(ord){return function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;if(options.disabled){return false;}
|
||||
if((ord==='move')&&!options.allowMove){return false;}
|
||||
btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};},newSelection:function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return newSelection(e);},isSupported:hasTouchSupport,support:detectSupport()};}());var Coords=(function(){var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
|
||||
{pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];}
|
||||
function setCurrent(pos)
|
||||
{pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];}
|
||||
function getOffset()
|
||||
{return[ox,oy];}
|
||||
function moveOffset(offset)
|
||||
{var ox=offset[0],oy=offset[1];if(0>x1+ox){ox-=ox+x1;}
|
||||
if(0>y1+oy){oy-=oy+y1;}
|
||||
if(boundy<y2+oy){oy+=boundy-(y2+oy);}
|
||||
if(boundx<x2+ox){ox+=boundx-(x2+ox);}
|
||||
x1+=ox;x2+=ox;y1+=oy;y2+=oy;}
|
||||
function getCorner(ord)
|
||||
{var c=getFixed();switch(ord){case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}}
|
||||
function getFixed()
|
||||
{if(!options.aspectRatio){return getRect();}
|
||||
var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy,w,h;if(max_x===0){max_x=boundx*10;}
|
||||
if(max_y===0){max_y=boundy*10;}
|
||||
if(real_ratio<aspect){yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0){xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}else if(xx>boundx){xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}else{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0){yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}else if(yy>boundy){yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
|
||||
if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
|
||||
if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x;}else if(x1-xx>max_x){xx=x1-max_x;}
|
||||
if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
|
||||
if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
|
||||
if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
|
||||
return makeObj(flipCoords(x1,y1,xx,yy));}
|
||||
function rebound(p)
|
||||
{if(p[0]<0){p[0]=0;}
|
||||
if(p[1]<0){p[1]=0;}
|
||||
if(p[0]>boundx){p[0]=boundx;}
|
||||
if(p[1]>boundy){p[1]=boundy;}
|
||||
return[p[0],p[1]];}
|
||||
function flipCoords(x1,y1,x2,y2)
|
||||
{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1){xa=x2;xb=x1;}
|
||||
if(y2<y1){ya=y2;yb=y1;}
|
||||
return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];}
|
||||
function getRect()
|
||||
{var xsize=x2-x1,ysize=y2-y1,delta;if(xlimit&&(Math.abs(xsize)>xlimit)){x2=(xsize>0)?(x1+xlimit):(x1-xlimit);}
|
||||
if(ylimit&&(Math.abs(ysize)>ylimit)){y2=(ysize>0)?(y1+ylimit):(y1-ylimit);}
|
||||
if(ymin/yscale&&(Math.abs(ysize)<ymin/yscale)){y2=(ysize>0)?(y1+ymin/yscale):(y1-ymin/yscale);}
|
||||
if(xmin/xscale&&(Math.abs(xsize)<xmin/xscale)){x2=(xsize>0)?(x1+xmin/xscale):(x1-xmin/xscale);}
|
||||
if(x1<0){x2-=x1;x1-=x1;}
|
||||
if(y1<0){y2-=y1;y1-=y1;}
|
||||
if(x2<0){x1-=x2;x2-=x2;}
|
||||
if(y2<0){y1-=y2;y2-=y2;}
|
||||
if(x2>boundx){delta=x2-boundx;x1-=delta;x2-=delta;}
|
||||
if(y2>boundy){delta=y2-boundy;y1-=delta;y2-=delta;}
|
||||
if(x1>boundx){delta=x1-boundy;y2-=delta;y1-=delta;}
|
||||
if(y1>boundy){delta=y1-boundy;y2-=delta;y1-=delta;}
|
||||
return makeObj(flipCoords(x1,y1,x2,y2));}
|
||||
function makeObj(a)
|
||||
{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};}
|
||||
return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}());var Shade=(function(){var enabled=false,holder=$('<div />').css({position:'absolute',zIndex:240,opacity:0}),shades={top:createShade(),left:createShade().height(boundy),right:createShade().height(boundy),bottom:createShade()};function resizeShades(w,h){shades.left.css({height:px(h)});shades.right.css({height:px(h)});}
|
||||
function updateAuto()
|
||||
{return updateShade(Coords.getFixed());}
|
||||
function updateShade(c)
|
||||
{shades.top.css({left:px(c.x),width:px(c.w),height:px(c.y)});shades.bottom.css({top:px(c.y2),left:px(c.x),width:px(c.w),height:px(boundy-c.y2)});shades.right.css({left:px(c.x2),width:px(boundx-c.x2)});shades.left.css({width:px(c.x)});}
|
||||
function createShade(){return $('<div />').css({position:'absolute',backgroundColor:options.shadeColor||options.bgColor}).appendTo(holder);}
|
||||
function enableShade(){if(!enabled){enabled=true;holder.insertBefore($img);updateAuto();Selection.setBgOpacity(1,0,1);$img2.hide();setBgColor(options.shadeColor||options.bgColor,1);if(Selection.isAwake())
|
||||
{setOpacity(options.bgOpacity,1);}
|
||||
else setOpacity(1,1);}}
|
||||
function setBgColor(color,now){colorChangeMacro(getShades(),color,now);}
|
||||
function disableShade(){if(enabled){holder.remove();$img2.show();enabled=false;if(Selection.isAwake()){Selection.setBgOpacity(options.bgOpacity,1,1);}else{Selection.setBgOpacity(1,1,1);Selection.disableHandles();}
|
||||
colorChangeMacro($div,0,1);}}
|
||||
function setOpacity(opacity,now){if(enabled){if(options.bgFade&&!now){holder.animate({opacity:1-opacity},{queue:false,duration:options.fadeTime});}
|
||||
else holder.css({opacity:1-opacity});}}
|
||||
function refreshAll(){options.shade?enableShade():disableShade();if(Selection.isAwake())setOpacity(options.bgOpacity);}
|
||||
function getShades(){return holder.children();}
|
||||
return{update:updateAuto,updateRaw:updateShade,getShades:getShades,setBgColor:setBgColor,enable:enableShade,disable:disableShade,resize:resizeShades,refresh:refreshAll,opacity:setOpacity};}());var Selection=(function(){var awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;function insertBorder(type)
|
||||
{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;}
|
||||
function dragDiv(ord,zi)
|
||||
{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi}).addClass('ord-'+ord);if(Touch.support){jq.bind('touchstart.jcrop',Touch.createDragger(ord));}
|
||||
$hdl_holder.append(jq);return jq;}
|
||||
function insertHandle(ord)
|
||||
{var hs=options.handleSize;return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).width(hs).height(hs).addClass(cssClass('handle'));}
|
||||
function insertDragbar(ord)
|
||||
{var s=options.handleSize,h=s,w=s,t=hhs,l=hhs;switch(ord){case'n':case's':w='100%';break;case'e':case'w':h='100%';break;}
|
||||
return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});}
|
||||
function createHandles(li)
|
||||
{var i;for(i=0;i<li.length;i++){handle[li[i]]=insertHandle(li[i]);}}
|
||||
function moveHandles(c)
|
||||
{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=-hhs+1,west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;if(handle.e){handle.e.css({top:px(midvert),left:px(east)});handle.w.css({top:px(midvert)});handle.s.css({top:px(south),left:px(midhoriz)});handle.n.css({left:px(midhoriz)});}
|
||||
if(handle.ne){handle.ne.css({left:px(east)});handle.se.css({top:px(south),left:px(east)});handle.sw.css({top:px(south)});}
|
||||
if(handle.b){handle.b.css({top:px(south)});handle.r.css({left:px(east)});}}
|
||||
function moveto(x,y)
|
||||
{if(!options.shade){$img2.css({top:px(-y),left:px(-x)});}
|
||||
$sel.css({top:px(y),left:px(x)});}
|
||||
function resize(w,h)
|
||||
{$sel.width(w).height(h);}
|
||||
function refresh()
|
||||
{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();}
|
||||
function updateVisible(select)
|
||||
{if(awake){return update(select);}}
|
||||
function update(select)
|
||||
{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);if(options.shade)Shade.updateRaw(c);if(seehandles){moveHandles(c);}
|
||||
if(!awake){show();}
|
||||
if(select){options.onSelect.call(api,unscale(c));}else{options.onChange.call(api,unscale(c));}}
|
||||
function setBgOpacity(opacity,force,now)
|
||||
{if(!awake&&!force)return;if(options.bgFade&&!now){$img.animate({opacity:opacity},{queue:false,duration:options.fadeTime});}else{$img.css('opacity',opacity);}}
|
||||
function show()
|
||||
{$sel.show();if(options.shade)Shade.opacity(bgopacity);else setBgOpacity(bgopacity,true);awake=true;}
|
||||
function release()
|
||||
{disableHandles();$sel.hide();if(options.shade)Shade.opacity(1);else setBgOpacity(1);awake=false;options.onRelease.call(api);}
|
||||
function showHandles()
|
||||
{if(seehandles){moveHandles(Coords.getFixed());$hdl_holder.show();}}
|
||||
function enableHandles()
|
||||
{seehandles=true;if(options.allowResize){moveHandles(Coords.getFixed());$hdl_holder.show();return true;}}
|
||||
function disableHandles()
|
||||
{seehandles=false;$hdl_holder.hide();}
|
||||
function animMode(v)
|
||||
{if(animating===v){disableHandles();}else{enableHandles();}}
|
||||
function done()
|
||||
{animMode(false);refresh();}
|
||||
if(options.drawBorders){borders={top:insertBorder('hline'),bottom:insertBorder('hline bottom'),left:insertBorder('vline'),right:insertBorder('vline right')};}
|
||||
if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
|
||||
if(options.sideHandles){createHandles(['n','s','e','w']);}
|
||||
if(options.cornerHandles){createHandles(['sw','nw','ne','se']);}
|
||||
$(document).bind('touchstart.jcrop-ios',function(e){if($(e.currentTarget).hasClass('jcrop-tracker'))e.stopPropagation();});var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360});if(Touch.support){$track.bind('touchstart.jcrop',Touch.createDragger('move'));}
|
||||
$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,isAwake:function(){return awake;},setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,setBgOpacity:setBgOpacity,done:done};}());var Tracker=(function(){var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;function toFront()
|
||||
{$trk.css({zIndex:450});if(Touch.support){$(document).bind('touchmove.jcrop',trackTouchMove).bind('touchend.jcrop',trackTouchEnd);}
|
||||
if(trackDoc){$(document).bind('mousemove.jcrop',trackMove).bind('mouseup.jcrop',trackUp);}}
|
||||
function toBack()
|
||||
{$trk.css({zIndex:290});$(document).unbind('.jcrop');}
|
||||
function trackMove(e)
|
||||
{onMove(mouseAbs(e));return false;}
|
||||
function trackUp(e)
|
||||
{e.preventDefault();e.stopPropagation();if(btndown){btndown=false;onDone(mouseAbs(e));if(Selection.isAwake()){options.onSelect.call(api,unscale(Coords.getFixed()));}
|
||||
toBack();onMove=function(){};onDone=function(){};}
|
||||
return false;}
|
||||
function activateHandlers(move,done)
|
||||
{btndown=true;onMove=move;onDone=done;toFront();return false;}
|
||||
function trackTouchMove(e)
|
||||
{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackMove(e);}
|
||||
function trackTouchEnd(e)
|
||||
{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackUp(e);}
|
||||
function setCursor(t)
|
||||
{$trk.css('cursor',t);}
|
||||
if(!trackDoc){$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
|
||||
$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}());var KeyManager=(function(){var $keymgr=$('<input type="radio" />').css({position:'fixed',left:'-120px',width:'12px'}),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
|
||||
{if(options.keySupport){$keymgr.show();$keymgr.focus();}}
|
||||
function onBlur(e)
|
||||
{$keymgr.hide();}
|
||||
function doNudge(e,x,y)
|
||||
{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible(true);}
|
||||
e.preventDefault();e.stopPropagation();}
|
||||
function parseKey(e)
|
||||
{if(e.ctrlKey||e.metaKey){return true;}
|
||||
shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode){case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:if(options.allowSelect)Selection.release();break;case 9:return true;}
|
||||
return false;}
|
||||
if(options.keySupport){$keymgr.keydown(parseKey).blur(onBlur);if(ie6mode||!options.fixedSupport){$keymgr.css({position:'absolute',left:'-20px'});$keywrap.append($keymgr).insertBefore($img);}else{$keymgr.insertBefore($img);}}
|
||||
return{watchKeys:watchKeys};}());function setClass(cname)
|
||||
{$div.removeClass().addClass(cssClass('holder')).addClass(cname);}
|
||||
function animateTo(a,callback)
|
||||
{var x1=parseInt(a[0],10)/xscale,y1=parseInt(a[1],10)/yscale,x2=parseInt(a[2],10)/xscale,y2=parseInt(a[3],10)/yscale;if(animating){return;}
|
||||
var animto=Coords.flipCoords(x1,y1,x2,y2),c=Coords.getFixed(),initcr=[c.x,c.y,c.x2,c.y2],animat=initcr,interv=options.animationDelay,ix1=animto[0]-initcr[0],iy1=animto[1]-initcr[1],ix2=animto[2]-initcr[2],iy2=animto[3]-initcr[3],pcent=0,velocity=options.swingSpeed;x=animat[0];y=animat[1];x2=animat[2];y2=animat[3];Selection.animMode(true);var anim_timer;function queueAnimator(){window.setTimeout(animator,interv);}
|
||||
var animator=(function(){return function(){pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent>=99.8){pcent=100;}
|
||||
if(pcent<100){setSelectRaw(animat);queueAnimator();}else{Selection.done();if(typeof(callback)==='function'){callback.call(api);}}};}());queueAnimator();}
|
||||
function setSelect(rect)
|
||||
{setSelectRaw([parseInt(rect[0],10)/xscale,parseInt(rect[1],10)/yscale,parseInt(rect[2],10)/xscale,parseInt(rect[3],10)/yscale]);options.onSelect.call(api,unscale(Coords.getFixed()));Selection.enableHandles();}
|
||||
function setSelectRaw(l)
|
||||
{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();}
|
||||
function tellSelect()
|
||||
{return unscale(Coords.getFixed());}
|
||||
function tellScaled()
|
||||
{return Coords.getFixed();}
|
||||
function setOptionsNew(opt)
|
||||
{setOptions(opt);interfaceUpdate();}
|
||||
function disableCrop()
|
||||
{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');}
|
||||
function enableCrop()
|
||||
{options.disabled=false;interfaceUpdate();}
|
||||
function cancelCrop()
|
||||
{Selection.done();Tracker.activateHandlers(null,null);}
|
||||
function destroy()
|
||||
{$div.remove();$origimg.show();$(obj).removeData('Jcrop');}
|
||||
function setImage(src,callback)
|
||||
{Selection.release();disableCrop();var img=new Image();img.onload=function(){var iw=img.width;var ih=img.height;var bw=options.boxWidth;var bh=options.boxHeight;$img.width(iw).height(ih);$img.attr('src',src);$img2.attr('src',src);presize($img,bw,bh);boundx=$img.width();boundy=$img.height();$img2.width(boundx).height(boundy);$trk.width(boundx+(bound*2)).height(boundy+(bound*2));$div.width(boundx).height(boundy);Shade.resize(boundx,boundy);enableCrop();if(typeof(callback)==='function'){callback.call(api);}};img.src=src;}
|
||||
function colorChangeMacro($obj,color,now){var mycolor=color||options.bgColor;if(options.bgFade&&supportsColorFade()&&options.fadeTime&&!now){$obj.animate({backgroundColor:mycolor},{queue:false,duration:options.fadeTime});}else{$obj.css('backgroundColor',mycolor);}}
|
||||
function interfaceUpdate(alt)
|
||||
{if(options.allowResize){if(alt){Selection.enableOnly();}else{Selection.enableHandles();}}else{Selection.disableHandles();}
|
||||
Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');if(options.hasOwnProperty('trueSize')){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
|
||||
if(options.hasOwnProperty('setSelect')){setSelect(options.setSelect);Selection.done();delete(options.setSelect);}
|
||||
Shade.refresh();if(options.bgColor!=bgcolor){colorChangeMacro(options.shade?Shade.getShades():$div,options.shade?(options.shadeColor||options.bgColor):options.bgColor);bgcolor=options.bgColor;}
|
||||
if(bgopacity!=options.bgOpacity){bgopacity=options.bgOpacity;if(options.shade)Shade.refresh();else Selection.setBgOpacity(bgopacity);}
|
||||
xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if(options.hasOwnProperty('outerImage')){$img.attr('src',options.outerImage);delete(options.outerImage);}
|
||||
Selection.refresh();}
|
||||
if(Touch.support)$trk.bind('touchstart.jcrop',Touch.newSelection);$hdl_holder.hide();interfaceUpdate(true);var api={setImage:setImage,animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,setClass:setClass,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,release:Selection.release,destroy:destroy,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},getScaleFactor:function(){return[xscale,yscale];},ui:{holder:$div,selection:$sel}};if($.browser.msie){$div.bind('selectstart',function(){return false;});}
|
||||
$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options,callback)
|
||||
{var api;this.each(function(){if($(this).data('Jcrop')){if(options==='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
|
||||
else{if(this.tagName=='IMG')
|
||||
$.Jcrop.Loader(this,function(){$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);});else{$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);}}});return this;};$.Jcrop.Loader=function(imgobj,success,error){var $img=$(imgobj),img=$img[0];function completeCheck(){if(img.complete){$img.unbind('.jcloader');if($.isFunction(success))success.call(img);}
|
||||
else window.setTimeout(completeCheck,50);}
|
||||
$img.bind('load.jcloader',completeCheck).bind('error.jcloader',function(e){$img.unbind('.jcloader');if($.isFunction(error))error.call(img);});if(img.complete&&$.isFunction(success)){$img.unbind('.jcloader');success.call(img);}};$.Jcrop.defaults={allowSelect:true,allowMove:true,allowResize:true,trackDocument:true,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:0.6,bgFade:false,borderOpacity:0.4,handleOpacity:0.5,handleSize:7,handleOffset:5,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,fixedSupport:true,touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}};}(jQuery));
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
/**
|
||||
* Inspired by http://jqueryui.com/demos/autocomplete/#combobox
|
||||
*/
|
||||
|
||||
(function( $ ) {
|
||||
$.widget('ui.combobox', {
|
||||
_create: function() {
|
||||
//console.log('_create: ' + this.options['id']);
|
||||
var self = this,
|
||||
select = this.element.hide(),
|
||||
selected = select.children(':selected'),
|
||||
value = selected.val() ? selected.text() : '';
|
||||
var input = this.input = $('<input type="text">')
|
||||
.insertAfter( select )
|
||||
.val( value )
|
||||
.autocomplete({
|
||||
delay: 0,
|
||||
minLength: 0,
|
||||
source: function( request, response ) {
|
||||
var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
|
||||
response( select.children( "option" ).map(function() {
|
||||
var text = $( this ).text();
|
||||
if ( this.value && ( !request.term || matcher.test(text) ) )
|
||||
return {
|
||||
label: text.replace(
|
||||
new RegExp(
|
||||
"(?![^&;]+;)(?!<[^<>]*)(" +
|
||||
$.ui.autocomplete.escapeRegex(request.term) +
|
||||
")(?![^<>]*>)(?![^&;]+;)", "gi"
|
||||
), "<strong>$1</strong>" ),
|
||||
value: text,
|
||||
option: this
|
||||
};
|
||||
}) );
|
||||
},
|
||||
select: function( event, ui ) {
|
||||
self.input.val($(ui.item.option).text());
|
||||
self.input.trigger('change');
|
||||
ui.item.option.selected = true;
|
||||
self._trigger( "selected", event, {
|
||||
item: ui.item.option
|
||||
});
|
||||
},
|
||||
change: function( event, ui ) {
|
||||
if ( !ui.item ) {
|
||||
var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
|
||||
valid = false;
|
||||
self.input.val($(this).val());
|
||||
//self.input.trigger('change');
|
||||
select.children( "option" ).each(function() {
|
||||
if ( $( this ).text().match( matcher ) ) {
|
||||
this.selected = valid = true;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
/*if ( !valid ) {
|
||||
// remove invalid value, as it didn't match anything
|
||||
$( this ).val( "" );
|
||||
select.val( "" );
|
||||
input.data( "autocomplete" ).term = "";
|
||||
return false;
|
||||
}*/
|
||||
}
|
||||
}
|
||||
})
|
||||
.addClass( "ui-widget ui-widget-content ui-corner-left" );
|
||||
|
||||
input.data( "autocomplete" )._renderItem = function( ul, item ) {
|
||||
return $( "<li></li>" )
|
||||
.data( "item.autocomplete", item )
|
||||
.append( "<a>" + item.label + "</a>" )
|
||||
.appendTo( ul );
|
||||
};
|
||||
|
||||
this.button = $( "<button type='button'> </button>" )
|
||||
.attr( "tabIndex", -1 )
|
||||
.attr( "title", "Show All Items" )
|
||||
.insertAfter( input )
|
||||
/*.button({
|
||||
icons: {
|
||||
primary: "ui-icon-triangle-1-s"
|
||||
},
|
||||
text: false
|
||||
})
|
||||
.removeClass( "ui-corner-all" )*/
|
||||
.addClass('svg')
|
||||
.addClass('action')
|
||||
.addClass('combo-button')
|
||||
.click(function() {
|
||||
// close if already visible
|
||||
if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
|
||||
input.autocomplete( "close" );
|
||||
return;
|
||||
}
|
||||
|
||||
// work around a bug (likely same cause as #5265)
|
||||
$( this ).blur();
|
||||
|
||||
// pass empty string as value to search for, displaying all results
|
||||
input.autocomplete( "search", "" );
|
||||
input.focus();
|
||||
});
|
||||
$.each(this.options, function(key, value) {
|
||||
self._setOption(key, value);
|
||||
});
|
||||
},
|
||||
destroy: function() {
|
||||
this.input.remove();
|
||||
this.button.remove();
|
||||
this.element.show();
|
||||
$.Widget.prototype.destroy.call( this );
|
||||
},
|
||||
value: function(val) {
|
||||
console.log('combobox.value: ' + val);
|
||||
if(val != undefined) {
|
||||
this.input.val(val);
|
||||
} else {
|
||||
return this.input.val();
|
||||
}
|
||||
},
|
||||
_setOption: function( key, value ) {
|
||||
switch( key ) {
|
||||
case "id":
|
||||
this.options['id'] = value;
|
||||
this.input.attr('id', value);
|
||||
break;
|
||||
case "name":
|
||||
this.options['name'] = value;
|
||||
this.input.attr('name', value);
|
||||
break;
|
||||
case "classes":
|
||||
var input = this.input;
|
||||
$.each(this.options['classes'], function(key, value) {
|
||||
input.addClass(value);
|
||||
});
|
||||
break;
|
||||
}
|
||||
// In jQuery UI 1.8, you have to manually invoke the _setOption method from the base widget
|
||||
$.Widget.prototype._setOption.apply( this, arguments );
|
||||
// In jQuery UI 1.9 and above, you use the _super method instead
|
||||
//this._super( "_setOption", key, value );
|
||||
},
|
||||
options: {
|
||||
id: null,
|
||||
name: null
|
||||
},
|
||||
});
|
||||
})( jQuery );
|
||||
|
|
@ -0,0 +1,863 @@
|
|||
/**
|
||||
* jQuery jEC (jQuery Editable Combobox) 1.3.3
|
||||
* http://code.google.com/p/jquery-jec
|
||||
*
|
||||
* Copyright (c) 2008-2009 Lukasz Rajchel (lukasz@rajchel.pl | http://rajchel.pl)
|
||||
* Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
|
||||
* and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
|
||||
*
|
||||
* Documentation : http://code.google.com/p/jquery-jec/wiki/Documentation
|
||||
* Changelog : http://code.google.com/p/jquery-jec/wiki/Changelog
|
||||
*
|
||||
* Contributors : Lukasz Rajchel, Artem Orlov
|
||||
*/
|
||||
|
||||
/*jslint maxerr: 50, indent: 4, maxlen: 120*/
|
||||
/*global Array, Math, String, clearInterval, document, jQuery, setInterval*/
|
||||
/*members ':', Handle, Remove, Set, acceptedKeys, addClass, all, append, appendTo, array, attr, before, bind,
|
||||
blinkingCursor, blinkingCursorInterval, blur, bool, browser, ceil, change, charCode, classes, clearCursor, click, css,
|
||||
cursorState, data, destroy, disable, each, editable, enable, eq, expr, extend, filter, find, floor, fn, focus,
|
||||
focusOnNewOption, fromCharCode, get, getId, handleCursor, ignoredKeys, ignoreOptGroups, inArray, init, initJS, integer,
|
||||
isArray, isPlainObject, jEC, jECTimer, jec, jecKill, jecOff, jecOn, jecPref, jecValue, keyCode, keyDown, keyPress,
|
||||
keyRange, keyUp, keys, length, max, maxLength, min, msie, object, openedState, optionClasses, optionStyles, parent,
|
||||
position, pref, prop, push, random, remove, removeAttr, removeClass, removeData, removeProp, safari, setEditableOption,
|
||||
styles, substring, text, trigger, triggerChangeEvent, unbind, uneditable, useExistingOptions, val, value,
|
||||
valueIsEditable, which*/
|
||||
(function ($) {
|
||||
'use strict';
|
||||
|
||||
$.jEC = (function () {
|
||||
var pluginClass = 'jecEditableOption', cursorClass = 'hasCursor', options = {}, values = {}, lastKeyCode,
|
||||
defaults, Validators, EventHandlers, Combobox, activeCombobox;
|
||||
|
||||
if ($.fn.prop === undefined) {
|
||||
$.fn.extend({
|
||||
'prop': function (key, valueSet) {
|
||||
if (valueSet) {
|
||||
$(this).attr(key, key);
|
||||
} else {
|
||||
$(this).removeAttr(key);
|
||||
}
|
||||
},
|
||||
'removeProp': function (key) {
|
||||
$(this).removeAttr(key);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
defaults = {
|
||||
position: 0,
|
||||
ignoreOptGroups: false,
|
||||
maxLength: 255,
|
||||
classes: [],
|
||||
styles: {},
|
||||
optionClasses: [],
|
||||
optionStyles: {},
|
||||
triggerChangeEvent: false,
|
||||
focusOnNewOption: false,
|
||||
useExistingOptions: false,
|
||||
blinkingCursor: false,
|
||||
blinkingCursorInterval: 1000,
|
||||
ignoredKeys: [],
|
||||
acceptedKeys: [[32, 126], [191, 382]]
|
||||
};
|
||||
|
||||
Validators = (function () {
|
||||
return {
|
||||
integer: function (value) {
|
||||
return typeof value === 'number' && Math.ceil(value) === Math.floor(value);
|
||||
},
|
||||
|
||||
keyRange: function (value) {
|
||||
var min, max;
|
||||
if ($.isPlainObject(value)) {
|
||||
min = value.min;
|
||||
max = value.max;
|
||||
} else if ($.isArray(value) && value.length === 2) {
|
||||
min = value[0];
|
||||
max = value[1];
|
||||
}
|
||||
return Validators.integer(min) && Validators.integer(max) && min <= max;
|
||||
}
|
||||
};
|
||||
}());
|
||||
|
||||
EventHandlers = (function () {
|
||||
var getKeyCode;
|
||||
|
||||
getKeyCode = function (event) {
|
||||
var charCode = event.charCode;
|
||||
if (charCode !== undefined && charCode !== 0) {
|
||||
return charCode;
|
||||
} else {
|
||||
return event.keyCode;
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
// focus event handler
|
||||
// enables blinking cursor
|
||||
focus: function () {
|
||||
var opt = options[Combobox.getId($(this))];
|
||||
if (opt.blinkingCursor && $.jECTimer === undefined) {
|
||||
activeCombobox = $(this);
|
||||
$.jECTimer = setInterval($.jEC.handleCursor, opt.blinkingCursorInterval);
|
||||
}
|
||||
},
|
||||
|
||||
// blur event handler
|
||||
// disables blinking cursor
|
||||
blur: function () {
|
||||
if ($.jECTimer !== undefined) {
|
||||
clearInterval($.jECTimer);
|
||||
$.jECTimer = undefined;
|
||||
activeCombobox = undefined;
|
||||
Combobox.clearCursor($(this));
|
||||
}
|
||||
Combobox.openedState($(this), false);
|
||||
},
|
||||
|
||||
// keydown event handler
|
||||
// handles keys pressed on select (backspace and delete must be handled
|
||||
// in keydown event in order to work in IE)
|
||||
keyDown: function (event) {
|
||||
var keyCode = getKeyCode(event), option, value;
|
||||
|
||||
lastKeyCode = keyCode;
|
||||
|
||||
switch (keyCode) {
|
||||
case 8: // backspace
|
||||
case 46: // delete
|
||||
option = $(this).find('option.' + pluginClass);
|
||||
if (option.val().length >= 1) {
|
||||
value = option.text().substring(0, option.text().length - 1);
|
||||
option.val(value).text(value).prop('selected', true);
|
||||
}
|
||||
return (keyCode !== 8);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
// keypress event handler
|
||||
// handles the rest of the keys (keypress event gives more informations
|
||||
// about pressed keys)
|
||||
keyPress: function (event) {
|
||||
var keyCode = getKeyCode(event), opt = options[Combobox.getId($(this))],
|
||||
option, value, specialKeys, exit = false, text;
|
||||
|
||||
Combobox.clearCursor($(this));
|
||||
if (keyCode !== 9 && keyCode !== 13 && keyCode !== 27) {
|
||||
// special keys codes
|
||||
specialKeys = [37, 38, 39, 40, 46];
|
||||
// handle special keys
|
||||
$.each(specialKeys, function (i, val) {
|
||||
if (keyCode === val && keyCode === lastKeyCode) {
|
||||
exit = true;
|
||||
}
|
||||
});
|
||||
|
||||
// don't handle ignored keys
|
||||
if (!exit && $.inArray(keyCode, opt.ignoredKeys) === -1) {
|
||||
// remove selection from all options
|
||||
$(this).find('option:selected').removeProp('selected');
|
||||
|
||||
if ($.inArray(keyCode, opt.acceptedKeys) !== -1) {
|
||||
option = $(this).find('option.' + pluginClass);
|
||||
text = option.text();
|
||||
|
||||
if (text.length < opt.maxLength) {
|
||||
value = text + String.fromCharCode(getKeyCode(event));
|
||||
option.val(value).text(value);
|
||||
}
|
||||
|
||||
option.prop('selected', true);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
||||
keyUp: function () {
|
||||
var opt = options[Combobox.getId($(this))];
|
||||
if (opt.triggerChangeEvent) {
|
||||
$(this).trigger('change');
|
||||
}
|
||||
},
|
||||
|
||||
// change event handler
|
||||
// handles editable option changing based on a pre-existing values
|
||||
change: function () {
|
||||
var opt = options[Combobox.getId($(this))];
|
||||
if (opt.useExistingOptions) {
|
||||
Combobox.setEditableOption($(this));
|
||||
}
|
||||
},
|
||||
|
||||
click: function () {
|
||||
if (!$.browser.safari) {
|
||||
Combobox.openedState($(this), !Combobox.openedState($(this)));
|
||||
}
|
||||
}
|
||||
};
|
||||
}());
|
||||
|
||||
// Combobox
|
||||
Combobox = (function () {
|
||||
var Parameters, EditableOption, generateId, setup;
|
||||
|
||||
// validates and set combobox parameters
|
||||
Parameters = (function () {
|
||||
var Set, Remove, Handle;
|
||||
|
||||
Set = (function () {
|
||||
var parseKeys, Handles;
|
||||
|
||||
parseKeys = function (value) {
|
||||
var keys = [];
|
||||
if ($.isArray(value)) {
|
||||
$.each(value, function (i, val) {
|
||||
var j, min, max;
|
||||
if (Validators.keyRange(val)) {
|
||||
if ($.isArray(val)) {
|
||||
min = val[0];
|
||||
max = val[1];
|
||||
} else {
|
||||
min = val.min;
|
||||
max = val.max;
|
||||
}
|
||||
for (j = min; j <= max; j += 1) {
|
||||
keys.push(j);
|
||||
}
|
||||
} else if (typeof val === 'number' && Validators.integer(val)) {
|
||||
keys.push(val);
|
||||
}
|
||||
});
|
||||
}
|
||||
return keys;
|
||||
};
|
||||
|
||||
Handles = (function () {
|
||||
return {
|
||||
integer: function (elem, name, value) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined && Validators.integer(value)) {
|
||||
opt[name] = value;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
bool: function (elem, name, value) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined && typeof value === 'boolean') {
|
||||
opt[name] = value;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
array: function (elem, name, value) {
|
||||
if (typeof value === 'string') {
|
||||
value = [value];
|
||||
}
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined && $.isArray(value)) {
|
||||
opt[name] = value;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
object: function (elem, name, value) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined && value !== null && $.isPlainObject(value)) {
|
||||
opt[name] = value;
|
||||
}
|
||||
},
|
||||
keys: function (elem, name, value) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined && $.isArray(value)) {
|
||||
opt[name] = parseKeys(value);
|
||||
}
|
||||
}
|
||||
};
|
||||
}());
|
||||
|
||||
return {
|
||||
position: function (elem, value) {
|
||||
if (Handles.integer(elem, 'position', value)) {
|
||||
var id = Combobox.getId(elem), opt = options[id], optionsCount;
|
||||
optionsCount =
|
||||
elem.find('option:not(.' + pluginClass + ')').length;
|
||||
if (value > optionsCount) {
|
||||
opt.position = optionsCount;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
ignoreOptGroups: function (elem, value) {
|
||||
Handles.bool(elem, 'ignoreOptGroups', value);
|
||||
},
|
||||
|
||||
maxLength: function (elem, value) {
|
||||
if (Handles.integer(elem, 'maxLength', value)) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (value < 0 || value > 255) {
|
||||
opt.maxLength = 255;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
classes: function (elem, value) {
|
||||
Handles.array(elem, 'classes', value);
|
||||
},
|
||||
|
||||
optionClasses: function (elem, value) {
|
||||
Handles.array(elem, 'optionClasses', value);
|
||||
},
|
||||
|
||||
styles: function (elem, value) {
|
||||
Handles.object(elem, 'styles', value);
|
||||
},
|
||||
|
||||
optionStyles: function (elem, value) {
|
||||
Handles.object(elem, 'optionStyles', value);
|
||||
},
|
||||
|
||||
triggerChangeEvent: function (elem, value) {
|
||||
Handles.bool(elem, 'triggerChangeEvent', value);
|
||||
},
|
||||
|
||||
focusOnNewOption: function (elem, value) {
|
||||
Handles.bool(elem, 'focusOnNewOption', value);
|
||||
},
|
||||
|
||||
useExistingOptions: function (elem, value) {
|
||||
Handles.bool(elem, 'useExistingOptions', value);
|
||||
},
|
||||
|
||||
blinkingCursor: function (elem, value) {
|
||||
Handles.bool(elem, 'blinkingCursor', value);
|
||||
},
|
||||
|
||||
blinkingCursorInterval: function (elem, value) {
|
||||
Handles.integer(elem, 'blinkingCursorInterval', value);
|
||||
},
|
||||
|
||||
ignoredKeys: function (elem, value) {
|
||||
Handles.keys(elem, 'ignoredKeys', value);
|
||||
},
|
||||
|
||||
acceptedKeys: function (elem, value) {
|
||||
Handles.keys(elem, 'acceptedKeys', value);
|
||||
}
|
||||
};
|
||||
}());
|
||||
|
||||
Remove = (function () {
|
||||
var removeClasses, removeStyles;
|
||||
|
||||
removeClasses = function (elem, classes) {
|
||||
$.each(classes, function (i, val) {
|
||||
elem.removeClass(val);
|
||||
});
|
||||
};
|
||||
|
||||
removeStyles = function (elem, styles) {
|
||||
$.each(styles, function (key) {
|
||||
elem.css(key, '');
|
||||
});
|
||||
};
|
||||
|
||||
return {
|
||||
classes: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined) {
|
||||
removeClasses(elem, opt.classes);
|
||||
}
|
||||
},
|
||||
|
||||
optionClasses: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined) {
|
||||
removeClasses(elem.find('option.' + pluginClass),
|
||||
opt.optionClasses);
|
||||
}
|
||||
},
|
||||
|
||||
styles: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined) {
|
||||
removeStyles(elem, opt.styles);
|
||||
}
|
||||
},
|
||||
|
||||
optionStyles: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined) {
|
||||
removeStyles(elem.find('option.' + pluginClass),
|
||||
opt.optionStyles);
|
||||
}
|
||||
},
|
||||
|
||||
all: function (elem) {
|
||||
Remove.classes(elem);
|
||||
Remove.optionClasses(elem);
|
||||
Remove.styles(elem);
|
||||
Remove.optionStyles(elem);
|
||||
}
|
||||
};
|
||||
}());
|
||||
|
||||
Handle = (function () {
|
||||
var setClasses, setStyles;
|
||||
|
||||
setClasses = function (elem, classes) {
|
||||
$.each(classes, function (i, val) {
|
||||
elem.addClass(String(val));
|
||||
});
|
||||
};
|
||||
|
||||
setStyles = function (elem, styles) {
|
||||
$.each(styles, function (key, val) {
|
||||
elem.css(key, val);
|
||||
});
|
||||
};
|
||||
|
||||
return {
|
||||
position: function (elem) {
|
||||
var opt = options[Combobox.getId(elem)], option, uneditableOptions, container;
|
||||
option = elem.find('option.' + pluginClass);
|
||||
|
||||
uneditableOptions = elem.find('option:not(.' + pluginClass + ')');
|
||||
if (opt.position < uneditableOptions.length) {
|
||||
container = uneditableOptions.eq(opt.position);
|
||||
|
||||
if (!opt.ignoreOptGroups && container.parent('optgroup').length > 0) {
|
||||
uneditableOptions.eq(opt.position).parent().before(option);
|
||||
} else {
|
||||
uneditableOptions.eq(opt.position).before(option);
|
||||
}
|
||||
} else {
|
||||
elem.append(option);
|
||||
}
|
||||
},
|
||||
|
||||
classes: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined) {
|
||||
setClasses(elem, opt.classes);
|
||||
}
|
||||
},
|
||||
|
||||
optionClasses: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined) {
|
||||
setClasses(elem.find('option.' + pluginClass), opt.optionClasses);
|
||||
}
|
||||
},
|
||||
|
||||
styles: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined) {
|
||||
setStyles(elem, opt.styles);
|
||||
}
|
||||
},
|
||||
|
||||
optionStyles: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined) {
|
||||
setStyles(elem.find('option.' + pluginClass), opt.optionStyles);
|
||||
}
|
||||
},
|
||||
|
||||
focusOnNewOption: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined && opt.focusOnNewOption) {
|
||||
elem.find(':not(option.' + pluginClass + ')').removeProp('selected');
|
||||
elem.find('option.' + pluginClass).prop('selected', true);
|
||||
}
|
||||
},
|
||||
|
||||
useExistingOptions: function (elem) {
|
||||
var id = Combobox.getId(elem), opt = options[id];
|
||||
if (opt !== undefined && opt.useExistingOptions) {
|
||||
Combobox.setEditableOption(elem);
|
||||
}
|
||||
},
|
||||
|
||||
all: function (elem) {
|
||||
Handle.position(elem);
|
||||
Handle.classes(elem);
|
||||
Handle.optionClasses(elem);
|
||||
Handle.styles(elem);
|
||||
Handle.optionStyles(elem);
|
||||
Handle.focusOnNewOption(elem);
|
||||
Handle.useExistingOptions(elem);
|
||||
}
|
||||
};
|
||||
}());
|
||||
|
||||
return {
|
||||
Set: Set,
|
||||
Remove: Remove,
|
||||
Handle: Handle
|
||||
};
|
||||
}());
|
||||
|
||||
EditableOption = (function () {
|
||||
return {
|
||||
init: function (elem) {
|
||||
if (!elem.find('option.' + pluginClass).length) {
|
||||
var editableOption = $('<option>');
|
||||
editableOption.addClass(pluginClass);
|
||||
elem.append(editableOption);
|
||||
}
|
||||
|
||||
elem.bind('keydown', EventHandlers.keyDown);
|
||||
elem.bind('keypress', EventHandlers.keyPress);
|
||||
elem.bind('keyup', EventHandlers.keyUp);
|
||||
elem.bind('change', EventHandlers.change);
|
||||
elem.bind('focus', EventHandlers.focus);
|
||||
elem.bind('blur', EventHandlers.blur);
|
||||
elem.bind('click', EventHandlers.click);
|
||||
},
|
||||
|
||||
destroy: function (elem) {
|
||||
elem.find('option.' + pluginClass).remove();
|
||||
|
||||
elem.unbind('keydown', EventHandlers.keyDown);
|
||||
elem.unbind('keypress', EventHandlers.keyPress);
|
||||
elem.unbind('keyup', EventHandlers.keyUp);
|
||||
elem.unbind('change', EventHandlers.change);
|
||||
elem.unbind('focus', EventHandlers.focus);
|
||||
elem.unbind('blur', EventHandlers.blur);
|
||||
elem.unbind('click', EventHandlers.click);
|
||||
}
|
||||
};
|
||||
}());
|
||||
|
||||
// generates unique identifier
|
||||
generateId = function () {
|
||||
while (true) {
|
||||
var random = Math.floor(Math.random() * 100000);
|
||||
|
||||
if (options[random] === undefined) {
|
||||
return random;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// sets combobox
|
||||
setup = function (elem) {
|
||||
EditableOption.init(elem);
|
||||
Parameters.Handle.all(elem);
|
||||
};
|
||||
|
||||
// Combobox public members
|
||||
return {
|
||||
// create editable combobox
|
||||
init: function (settings) {
|
||||
return $(this).filter(':uneditable').each(function () {
|
||||
var id = generateId(), elem = $(this);
|
||||
|
||||
elem.data('jecId', id);
|
||||
|
||||
// override passed default options
|
||||
options[id] = $.extend(true, {}, defaults);
|
||||
|
||||
// parse keys
|
||||
Parameters.Set.ignoredKeys(elem, options[id].ignoredKeys);
|
||||
Parameters.Set.acceptedKeys(elem, options[id].acceptedKeys);
|
||||
|
||||
if ($.isPlainObject(settings)) {
|
||||
$.each(settings, function (key, val) {
|
||||
if (val !== undefined) {
|
||||
switch (key) {
|
||||
case 'position':
|
||||
Parameters.Set.position(elem, val);
|
||||
break;
|
||||
case 'ignoreOptGroups':
|
||||
Parameters.Set.ignoreOptGroups(elem, val);
|
||||
break;
|
||||
case 'maxLength':
|
||||
Parameters.Set.maxLength(elem, val);
|
||||
break;
|
||||
case 'classes':
|
||||
Parameters.Set.classes(elem, val);
|
||||
break;
|
||||
case 'optionClasses':
|
||||
Parameters.Set.optionClasses(elem, val);
|
||||
break;
|
||||
case 'styles':
|
||||
Parameters.Set.styles(elem, val);
|
||||
break;
|
||||
case 'optionStyles':
|
||||
Parameters.Set.optionStyles(elem, val);
|
||||
break;
|
||||
case 'triggerChangeEvent':
|
||||
Parameters.Set.triggerChangeEvent(elem, val);
|
||||
break;
|
||||
case 'focusOnNewOption':
|
||||
Parameters.Set.focusOnNewOption(elem, val);
|
||||
break;
|
||||
case 'useExistingOptions':
|
||||
Parameters.Set.useExistingOptions(elem, val);
|
||||
break;
|
||||
case 'blinkingCursor':
|
||||
Parameters.Set.blinkingCursor(elem, val);
|
||||
break;
|
||||
case 'blinkingCursorInterval':
|
||||
Parameters.Set.blinkingCursorInterval(elem, val);
|
||||
break;
|
||||
case 'ignoredKeys':
|
||||
Parameters.Set.ignoredKeys(elem, val);
|
||||
break;
|
||||
case 'acceptedKeys':
|
||||
Parameters.Set.acceptedKeys(elem, val);
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
setup($(this));
|
||||
});
|
||||
},
|
||||
|
||||
// creates editable combobox without using existing select elements
|
||||
initJS: function (options, settings) {
|
||||
var select, addOptions;
|
||||
|
||||
select = $('<select>');
|
||||
|
||||
addOptions = function (elem, options) {
|
||||
if ($.isArray(options)) {
|
||||
$.each(options, function (i, val) {
|
||||
if ($.isPlainObject(val)) {
|
||||
$.each(val, function (key, value) {
|
||||
if ($.isArray(value)) {
|
||||
var og = $('<optgroup>').attr('label', key);
|
||||
addOptions(og, value);
|
||||
og.appendTo(select);
|
||||
} else if (typeof value === 'number' || typeof value === 'string') {
|
||||
$('<option>').text(value).attr('value', key)
|
||||
.appendTo(elem);
|
||||
}
|
||||
});
|
||||
} else if (typeof val === 'string' || typeof val === 'number') {
|
||||
$('<option>').text(val).attr('value', val).appendTo(elem);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
addOptions(select, options);
|
||||
|
||||
return select.jec(settings);
|
||||
},
|
||||
|
||||
// destroys editable combobox
|
||||
destroy: function () {
|
||||
return $(this).filter(':editable').each(function () {
|
||||
$(this).jecOff();
|
||||
$.removeData($(this).get(0), 'jecId');
|
||||
$.removeData($(this).get(0), 'jecCursorState');
|
||||
$.removeData($(this).get(0), 'jecOpenedState');
|
||||
});
|
||||
},
|
||||
|
||||
// enable editablecombobox
|
||||
enable: function () {
|
||||
return $(this).filter(':editable').each(function () {
|
||||
var id = Combobox.getId($(this)), value = values[id];
|
||||
|
||||
setup($(this));
|
||||
|
||||
if (value !== undefined) {
|
||||
$(this).jecValue(value);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
// disable editable combobox
|
||||
disable: function () {
|
||||
return $(this).filter(':editable').each(function () {
|
||||
var val = $(this).find('option.' + pluginClass).val();
|
||||
values[Combobox.getId($(this))] = val;
|
||||
Parameters.Remove.all($(this));
|
||||
EditableOption.destroy($(this));
|
||||
});
|
||||
},
|
||||
|
||||
// gets or sets editable option's value
|
||||
value: function (value, setFocus) {
|
||||
if ($(this).filter(':editable').length > 0) {
|
||||
if (value === null || value === undefined) {
|
||||
// get value
|
||||
return $(this).find('option.' + pluginClass).val();
|
||||
} else if (typeof value === 'string' || typeof value === 'number') {
|
||||
// set value
|
||||
return $(this).filter(':editable').each(function () {
|
||||
var option = $(this).find('option.' + pluginClass);
|
||||
option.val(value).text(value);
|
||||
if (typeof setFocus !== 'boolean' || setFocus) {
|
||||
option.prop('selected', true);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
// gets or sets editable option's preference
|
||||
pref: function (name, value) {
|
||||
if ($(this).filter(':editable').length > 0) {
|
||||
if (typeof name === 'string') {
|
||||
if (value === null || value === undefined) {
|
||||
// get preference
|
||||
return options[Combobox.getId($(this))][name];
|
||||
} else {
|
||||
// set preference
|
||||
return $(this).filter(':editable').each(function () {
|
||||
switch (name) {
|
||||
case 'position':
|
||||
Parameters.Set.position($(this), value);
|
||||
Parameters.Handle.position($(this));
|
||||
break;
|
||||
case 'classes':
|
||||
Parameters.Remove.classes($(this));
|
||||
Parameters.Set.classes($(this), value);
|
||||
Parameters.Handle.position($(this));
|
||||
break;
|
||||
case 'optionClasses':
|
||||
Parameters.Remove.optionClasses($(this));
|
||||
Parameters.Set.optionClasses($(this), value);
|
||||
Parameters.Set.optionClasses($(this));
|
||||
break;
|
||||
case 'styles':
|
||||
Parameters.Remove.styles($(this));
|
||||
Parameters.Set.styles($(this), value);
|
||||
Parameters.Set.styles($(this));
|
||||
break;
|
||||
case 'optionStyles':
|
||||
Parameters.Remove.optionStyles($(this));
|
||||
Parameters.Set.optionStyles($(this), value);
|
||||
Parameters.Handle.optionStyles($(this));
|
||||
break;
|
||||
case 'focusOnNewOption':
|
||||
Parameters.Set.focusOnNewOption($(this), value);
|
||||
Parameters.Handle.focusOnNewOption($(this));
|
||||
break;
|
||||
case 'useExistingOptions':
|
||||
Parameters.Set.useExistingOptions($(this), value);
|
||||
Parameters.Handle.useExistingOptions($(this));
|
||||
break;
|
||||
case 'blinkingCursor':
|
||||
Parameters.Set.blinkingCursor($(this), value);
|
||||
break;
|
||||
case 'blinkingCursorInterval':
|
||||
Parameters.Set.blinkingCursorInterval($(this), value);
|
||||
break;
|
||||
case 'ignoredKeys':
|
||||
Parameters.Set.ignoredKeys($(this), value);
|
||||
break;
|
||||
case 'acceptedKeys':
|
||||
Parameters.Set.acceptedKeys($(this), value);
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
// sets editable option to the value of currently selected option
|
||||
setEditableOption: function (elem) {
|
||||
var value = elem.find('option:selected').text();
|
||||
elem.find('option.' + pluginClass).attr('value', elem.val()).text(value).prop('selected', true);
|
||||
},
|
||||
|
||||
// get combobox id
|
||||
getId: function (elem) {
|
||||
return elem.data('jecId');
|
||||
},
|
||||
|
||||
valueIsEditable: function (elem) {
|
||||
return elem.find('option.' + pluginClass).get(0) === elem.find('option:selected').get(0);
|
||||
},
|
||||
|
||||
clearCursor: function (elem) {
|
||||
$(elem).find('option.' + cursorClass).each(function () {
|
||||
var text = $(this).text();
|
||||
$(this).removeClass(cursorClass).text(text.substring(0, text.length - 1));
|
||||
});
|
||||
},
|
||||
|
||||
cursorState: function (elem, state) {
|
||||
return elem.data('jecCursorState', state);
|
||||
},
|
||||
|
||||
openedState: function (elem, state) {
|
||||
return elem.data('jecOpenedState', state);
|
||||
},
|
||||
|
||||
//handles editable cursor
|
||||
handleCursor: function () {
|
||||
if (activeCombobox !== undefined && activeCombobox !== null) {
|
||||
if ($.browser.msie && Combobox.openedState(activeCombobox)) {
|
||||
return;
|
||||
}
|
||||
|
||||
var state = Combobox.cursorState(activeCombobox), elem;
|
||||
if (state) {
|
||||
Combobox.clearCursor(activeCombobox);
|
||||
} else if (Combobox.valueIsEditable(activeCombobox)) {
|
||||
elem = activeCombobox.find('option:selected');
|
||||
elem.addClass(cursorClass).text(elem.text() + '|');
|
||||
}
|
||||
Combobox.cursorState(activeCombobox, !state);
|
||||
}
|
||||
}
|
||||
};
|
||||
}());
|
||||
|
||||
// jEC public members
|
||||
return {
|
||||
init: Combobox.init,
|
||||
enable: Combobox.enable,
|
||||
disable: Combobox.disable,
|
||||
destroy: Combobox.destroy,
|
||||
value: Combobox.value,
|
||||
pref: Combobox.pref,
|
||||
initJS: Combobox.initJS,
|
||||
handleCursor: Combobox.handleCursor
|
||||
};
|
||||
}());
|
||||
|
||||
// register functions
|
||||
$.fn.extend({
|
||||
jec: $.jEC.init,
|
||||
jecOn: $.jEC.enable,
|
||||
jecOff: $.jEC.disable,
|
||||
jecKill: $.jEC.destroy,
|
||||
jecValue: $.jEC.value,
|
||||
jecPref: $.jEC.pref
|
||||
});
|
||||
|
||||
$.extend({
|
||||
jec: $.jEC.initJS
|
||||
});
|
||||
|
||||
// register selectors
|
||||
$.extend($.expr[':'], {
|
||||
editable: function (a) {
|
||||
var data = $(a).data('jecId');
|
||||
return data !== null && data !== undefined;
|
||||
},
|
||||
|
||||
uneditable: function (a) {
|
||||
var data = $(a).data('jecId');
|
||||
return data === null || data === undefined;
|
||||
}
|
||||
});
|
||||
|
||||
}(jQuery));
|
||||
|
|
@ -58,7 +58,7 @@ class OC_Contacts_App{
|
|||
public static function getContactObject($id){
|
||||
$card = OC_Contacts_VCard::find( $id );
|
||||
if( $card === false ){
|
||||
OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.'))));
|
||||
OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.$id)));
|
||||
exit();
|
||||
}
|
||||
|
||||
|
|
@ -67,13 +67,29 @@ class OC_Contacts_App{
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief Gets the VCard as text
|
||||
* @brief Gets the VCard as an OC_VObject
|
||||
* @returns The card or null if the card could not be parsed.
|
||||
*/
|
||||
public static function getContactVCard($id){
|
||||
$card = self::getContactObject( $id );
|
||||
|
||||
$vcard = OC_VObject::parse($card['carddata']);
|
||||
// Try to fix cards with missing 'N' field from pre ownCloud 4. Hot damn, this is ugly...
|
||||
if(!is_null($vcard) && !$vcard->__isset('N')){
|
||||
$appinfo = $info=OC_App::getAppInfo('contacts');
|
||||
if($appinfo['version'] >= 5) {
|
||||
OC_Log::write('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OC_Log::DEBUG);
|
||||
}
|
||||
OC_Log::write('contacts','getContactVCard, Missing N field', OC_Log::DEBUG);
|
||||
if($vcard->__isset('FN')) {
|
||||
OC_Log::write('contacts','getContactVCard, found FN field: '.$vcard->__get('FN'), OC_Log::DEBUG);
|
||||
$n = implode(';', array_reverse(array_slice(explode(' ', $vcard->__get('FN')), 0, 2))).';;;';
|
||||
OC_Contacts_VCard::edit( $id, $vcard->serialize());
|
||||
} else { // Else just add an empty 'N' field :-P
|
||||
$vcard->setString('N', 'Unknown;Name;;;');
|
||||
}
|
||||
$vcard->setString('N', $n);
|
||||
}
|
||||
return $vcard;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ class OC_Contacts_VCard{
|
|||
* @brief Adds a card
|
||||
* @param integer $id Addressbook id
|
||||
* @param string $data vCard file
|
||||
* @return insertid
|
||||
* @return insertid on success or null if card is not parseable.
|
||||
*/
|
||||
public static function add($id,$data){
|
||||
$fn = null;
|
||||
|
|
@ -107,6 +107,22 @@ class OC_Contacts_VCard{
|
|||
$card = OC_VObject::parse($data);
|
||||
if(!is_null($card)){
|
||||
$fn = $card->getAsString('FN');
|
||||
if(!$fn){ // Fix missing 'FN' field.
|
||||
$n = $card->getAsString('N');
|
||||
if(!is_null($n)){
|
||||
$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
|
||||
$card->setString('FN', $fn);
|
||||
OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'FN\' field: '.$fn,OC_Log::DEBUG);
|
||||
} else {
|
||||
$fn = 'Unknown Name';
|
||||
}
|
||||
}
|
||||
$n = $card->getAsString('N');
|
||||
if(!$n){ // Fix missing 'N' field.
|
||||
$n = implode(';', array_reverse(array_slice(explode(' ', $fn), 0, 2))).';;;';
|
||||
$card->setString('N', $n);
|
||||
OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
|
||||
}
|
||||
$uid = $card->getAsString('UID');
|
||||
if(is_null($uid)){
|
||||
$card->setUID();
|
||||
|
|
@ -118,8 +134,8 @@ class OC_Contacts_VCard{
|
|||
// Add product ID.
|
||||
$prodid = trim($card->getAsString('PRODID'));
|
||||
if(!$prodid) {
|
||||
$appinfo = $info=OC_App::getAppInfo('contacts');
|
||||
$prodid = 'PRODID:-//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
|
||||
$appinfo = OC_App::getAppInfo('contacts');
|
||||
$prodid = '//ownCloud//NONSGML '.$appinfo['name'].' '.$appinfo['version'].'//EN';
|
||||
$card->setString('PRODID', $prodid);
|
||||
}
|
||||
// VCARD must have a version
|
||||
|
|
@ -137,8 +153,10 @@ class OC_Contacts_VCard{
|
|||
}
|
||||
else{
|
||||
// that's hard. Creating a UID and not saving it
|
||||
$uid = self::createUID();
|
||||
$uri = $uid.'.vcf';
|
||||
OC_Log::write('contacts','OC_Contacts_VCard::add. Error parsing VCard: '.$data,OC_Log::ERROR);
|
||||
return null; // Ditch cards that can't be parsed by Sabre.
|
||||
//$uid = self::createUID();
|
||||
//$uri = $uid.'.vcf';
|
||||
};
|
||||
|
||||
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
|
||||
|
|
@ -158,7 +176,7 @@ class OC_Contacts_VCard{
|
|||
* @return insertid
|
||||
*/
|
||||
public static function addFromDAVData($id,$uri,$data){
|
||||
$fn = null;
|
||||
$fn = $n = null;
|
||||
$email = null;
|
||||
$card = OC_VObject::parse($data);
|
||||
if(!is_null($card)){
|
||||
|
|
@ -166,19 +184,31 @@ class OC_Contacts_VCard{
|
|||
if($property->name == 'FN'){
|
||||
$fn = $property->value;
|
||||
}
|
||||
if($property->name == 'N'){
|
||||
$n = $property->value;
|
||||
}
|
||||
if($property->name == 'EMAIL' && is_null($email)){
|
||||
$email = $property->value;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!$fn) {
|
||||
if($email) {
|
||||
if($n){
|
||||
$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
|
||||
} elseif($email) {
|
||||
$fn = $email;
|
||||
} else {
|
||||
$fn = 'Unknown';
|
||||
$fn = 'Unknown Name';
|
||||
}
|
||||
$card->addProperty('EMAIL', $email);
|
||||
$card->addProperty('FN', $fn);
|
||||
$data = $card->serialize();
|
||||
OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'FN\' field: '.$n,OC_Log::DEBUG);
|
||||
}
|
||||
if(!$n){ // Fix missing 'N' field.
|
||||
$n = implode(';', array_reverse(array_slice(explode(' ', $fn), 0, 2))).';;;';
|
||||
$card->setString('N', $n);
|
||||
$data = $card->serialize();
|
||||
OC_Log::write('contacts','OC_Contacts_VCard::add. Added missing \'N\' field: '.$n,OC_Log::DEBUG);
|
||||
}
|
||||
|
||||
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
<script type='text/javascript'>
|
||||
var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
|
||||
</script>
|
||||
<div id="controls">
|
||||
<form>
|
||||
<input type="button" id="contacts_newcontact" value="<?php echo $l->t('Add Contact'); ?>">
|
||||
<input type="button" id="chooseaddressbook" value="<?php echo $l->t('Addressbooks'); ?>">
|
||||
</form>
|
||||
</div>
|
||||
<div id="leftcontent" class="leftcontent">
|
||||
<ul id="contacts">
|
||||
<?php echo $this->inc("part.contacts"); ?>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
|
||||
<?php
|
||||
if ($_['id']){
|
||||
echo $this->inc('part.contact');
|
||||
}
|
||||
else{
|
||||
echo $this->inc('part.no_contacts');
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<!-- Dialogs -->
|
||||
<div id="dialog_holder"></div>
|
||||
<!-- End of Dialogs -->
|
||||
|
|
@ -0,0 +1,184 @@
|
|||
<?php
|
||||
$l=new OC_L10N('contacts');
|
||||
$id = isset($_['id']) ? $_['id'] : '';
|
||||
?>
|
||||
<div id="card">
|
||||
<div id="actionbar">
|
||||
<a title="<?php echo $l->t('Add field'); ?>" class="svg action" id="contacts_propertymenu_button"></a>
|
||||
<div id="contacts_propertymenu" style="display: none;">
|
||||
<ul>
|
||||
<li><a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a></li>
|
||||
<li><a data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
|
||||
<li><a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
|
||||
<li><a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
|
||||
<li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
|
||||
<li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
|
||||
<li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<img onclick="Contacts.UI.Card.export();" class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" />
|
||||
<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
|
||||
</div>
|
||||
|
||||
<div class="contactsection">
|
||||
|
||||
<form style="display:none;" id="file_upload_form" action="ajax/uploadphoto.php" method="post" enctype="multipart/form-data" target="file_upload_target">
|
||||
<fieldset id="photo" class="formfloat">
|
||||
<div id="contacts_details_photo_wrapper" title="<?php echo $l->t('Click or drop to upload picture'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
|
||||
<!-- img style="padding: 1em;" id="contacts_details_photo" alt="Profile picture" src="photo.php?id=<?php echo $_['id']; ?>" / -->
|
||||
<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
|
||||
</div>
|
||||
<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
|
||||
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
|
||||
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
|
||||
<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
|
||||
<iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
|
||||
</fieldset>
|
||||
</form>
|
||||
<form id="contact_identity" method="post" <?php echo ($_['id']==''||!isset($_['id'])?'style="display:none;"':''); ?>>
|
||||
<input type="hidden" name="id" value="<?php echo $_['id'] ?>">
|
||||
<fieldset class="propertycontainer" data-element="N"><input type="hidden" id="n" class="contacts_property" name="value" value="" /></fieldset>
|
||||
<fieldset id="ident" class="formfloat">
|
||||
<!-- legend>Name</legend -->
|
||||
<dl class="form">
|
||||
<!-- dt><label for="n"><?php echo $l->t('Name'); ?></label></dt>
|
||||
<dd style="padding-top: 0.8em;vertical-align: text-bottom;"><span id="n" type="text"></span></dd -->
|
||||
<dt><label for="fn"><?php echo $l->t('Display name'); ?></label></dt>
|
||||
<dd class="propertycontainer" data-element="FN">
|
||||
<select id="fn_select" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>" style="width:16em;">
|
||||
<option id="short" title="Short name"></option>
|
||||
<option id="full" title="Full name"></option>
|
||||
<option id="reverse" title="Reverse"></option>
|
||||
<option id="reverse_comma" title="Reverse with comma"></option>
|
||||
</select><a id="edit_name" class="edit" title="<?php echo $l->t('Edit name details'); ?>"></a>
|
||||
</dd>
|
||||
<dt style="display:none;" id="org_label" data-element="ORG"><label for="org"><?php echo $l->t('Organization'); ?></label></dt>
|
||||
<dd style="display:none;" class="propertycontainer" id="org_value" data-element="ORG"><input id="org" required="required" name="value[ORG]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Organization'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
|
||||
<dt style="display:none;" id="nickname_label" data-element="NICKNAME"><label for="nickname"><?php echo $l->t('Nickname'); ?></label></dt>
|
||||
<dd style="display:none;" class="propertycontainer" id="nickname_value" data-element="NICKNAME"><input id="nickname" required="required" name="value[NICKNAME]" type="text" class="contacts_property" style="width:16em;" name="value" value="" placeholder="<?php echo $l->t('Enter nickname'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
|
||||
<dt style="display:none;" id="bday_label" data-element="BDAY"><label for="bday"><?php echo $l->t('Birthday'); ?></label></dt>
|
||||
<dd style="display:none;" class="propertycontainer" id="bday_value" data-element="BDAY"><input id="bday" required="required" name="value" type="text" class="contacts_property" value="" placeholder="<?php echo $l->t('dd-mm-yyyy'); ?>" /><a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'single');" title="<?php echo $l->t('Delete'); ?>"></a></dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- div class="delimiter"></div -->
|
||||
<form id="contact_communication" method="post" style="display: none;">
|
||||
<div class="contactsection">
|
||||
<!-- email addresses -->
|
||||
<div id="emails" style="display:none;">
|
||||
<fieldset class="contactpart">
|
||||
<legend><?php echo $l->t('Email'); ?></legend>
|
||||
<ul id="emaillist" class="propertylist">
|
||||
<li class="template" style="white-space: nowrap; display: none;" data-element="EMAIL">
|
||||
<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
|
||||
<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
|
||||
<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
|
||||
<?php
|
||||
if(0) { /*foreach($card['EMAIL'] as $email) {*/
|
||||
?>
|
||||
<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $email['checksum'] ?>" data-element="EMAIL">
|
||||
<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($email['parameters']['PREF'])?'checked="checked"':''); ?> />
|
||||
<input type="email" required="required" class="nonempty contacts_property" style="width:15em;" name="value" value="<?php echo $email['value'] ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /><span class="listactions"><a onclick="Contacts.UI.mailTo(this)" class="mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
|
||||
<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
|
||||
<?php } ?>
|
||||
</ul><!-- a id="add_email" class="add" title="<?php echo $l->t('Add email address'); ?>"></a -->
|
||||
</div> <!-- email addresses-->
|
||||
|
||||
<!-- Phone numbers -->
|
||||
<div id="phones" style="display:none;">
|
||||
<fieldset class="contactpart">
|
||||
<legend><?php echo $l->t('Phone'); ?></legend>
|
||||
<ul id="phonelist" class="propertylist">
|
||||
<li class="template" style="white-space: nowrap; display: none;" data-element="TEL">
|
||||
<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
|
||||
<input type="text" required="required" class="nonempty contacts_property" style="width:10em; border: 0px;" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
|
||||
<select multiple="multiple" name="parameters[TYPE][]">
|
||||
<?php echo html_select_options($_['phone_types'], array()) ?>
|
||||
</select>
|
||||
<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
|
||||
<?php
|
||||
if(0) { /*foreach($card['TEL'] as $phone) {*/
|
||||
?>
|
||||
<li class="propertycontainer" style="white-space: nowrap;" data-checksum="<?php echo $phone['checksum'] ?>" data-element="TEL">
|
||||
<input type="checkbox" class="contacts_property" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" <?php echo (isset($phone['parameters']['PREF'])?'checked="checked"':''); ?> />
|
||||
<input type="text" required="required" class="nonempty contacts_property" style="width:8em; border: 0px;" name="value" value="<?php echo $phone['value'] ?>" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
|
||||
<select class="contacts_property" multiple="multiple" name="parameters[TYPE][]">
|
||||
<?php echo html_select_options($_['phone_types'], isset($phone['parameters']['TYPE'])?$phone['parameters']['TYPE']:array()) ?>
|
||||
</select>
|
||||
<a class="delete" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
|
||||
<?php } ?>
|
||||
</ul><!-- a id="add_phone" class="add" title="<?php echo $l->t('Add phone number'); ?>"></a -->
|
||||
</div> <!-- Phone numbers -->
|
||||
|
||||
<!-- Addresses -->
|
||||
<div id="addresses" style="display:none;">
|
||||
<fieldset class="contactpart">
|
||||
<legend><?php echo $l->t('Address'); ?></legend>
|
||||
<div id="addressdisplay">
|
||||
<dl class="addresscard template" style="display: none;" data-element="ADR"><dt>
|
||||
<input class="adr contacts_property" name="value" type="hidden" value="" />
|
||||
<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" />
|
||||
<span class="adr_type_label"></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
|
||||
</dt><dd><ul class="addresslist"></ul></dd></dl>
|
||||
|
||||
<?php if(0) { /*foreach($card['ADR'] as $address) {*/ ?>
|
||||
<dl class="addresscard propertycontainer" data-checksum="<?php echo $address['checksum']; ?>" data-element="ADR">
|
||||
<dt>
|
||||
<input class="adr contacts_property" name="value" type="hidden" value="<?php echo implode(';',$address['value']); ?>" />
|
||||
<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="<?php echo strtoupper(implode(',',$address['parameters'])); ?>" />
|
||||
<span class="adr_type_label">
|
||||
<?php
|
||||
if(count($address['parameters']) > 0) {
|
||||
//array_walk($address['parameters'], ) Nah, this wont work...
|
||||
$translated = array();
|
||||
foreach($address['parameters'] as $type) {
|
||||
$translated[] = $l->t(ucwords(strtolower($type)));
|
||||
}
|
||||
echo implode('/', $translated);
|
||||
}
|
||||
?></span><a class="globe" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.searchOSM(this);" title="<?php echo $l->t('View on map'); ?>"></a><a class="edit" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false);" title="<?php echo $l->t('Edit address details'); ?>"></a><a class="delete" style="float:right;" onclick="$(this).tipsy('hide');Contacts.UI.Card.deleteProperty(this, 'list');" title="Delete address"></a>
|
||||
</dt>
|
||||
<dd>
|
||||
<ul class="addresslist">
|
||||
<?php
|
||||
$adr = $address['value'];
|
||||
$tmp = ($adr[0]?'<li>'.$adr[0].'</li>':'');
|
||||
$tmp .= ($adr[1]?'<li>'.$adr[1].'</li>':'');
|
||||
$tmp .= ($adr[2]?'<li>'.$adr[2].'</li>':'');
|
||||
$tmp .= ($adr[3]||$adr[5]?'<li>'.$adr[5].' '.$adr[3].'</li>':'');
|
||||
$tmp .= ($adr[4]?'<li>'.$adr[4].'</li>':'');
|
||||
$tmp .= ($adr[6]?'<li>'.$adr[6].'</li>':'');
|
||||
echo $tmp;
|
||||
|
||||
?>
|
||||
</ul>
|
||||
</dd>
|
||||
</dl>
|
||||
<?php } ?>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div> <!-- Addresses -->
|
||||
</div>
|
||||
<!-- a id="add_address" onclick="Contacts.UI.Card.editAddress('new', true)" class="add" title="<?php echo $l->t('Add address'); ?>"></a -->
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div id="edit_photo_dialog" title="Edit photo">
|
||||
<div id="edit_photo_dialog_img"></div>
|
||||
</div>
|
||||
<script language="Javascript">
|
||||
$(document).ready(function(){
|
||||
if('<?php echo $id; ?>'!='') {
|
||||
$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':'<?php echo $id; ?>'},function(jsondata){
|
||||
if(jsondata.status == 'success'){
|
||||
Contacts.UI.Card.loadContact(jsondata.data);
|
||||
}
|
||||
else{
|
||||
Contacts.UI.messageBox(t('contacts', 'Error'), jsondata.data.message);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<?php
|
||||
$id = $_['id'];
|
||||
$wattr = isset($_['width'])?'width="'.$_['width'].'"':'';
|
||||
$hattr = isset($_['height'])?'height="'.$_['height'].'"':'';
|
||||
?>
|
||||
<img class="loading" id="contacts_details_photo" <?php echo $wattr; ?> <?php echo $hattr; ?> src="<?php echo OC_Helper::linkTo('contacts', 'photo.php', null, true); ?>?id=<?php echo $id; ?>&refresh=<?php echo rand(); ?>" />
|
||||
<progress id="contacts_details_photo_progress" style="display:none;" value="0" max="100">0 %</progress>
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
<?php
|
||||
$id = $_['id'];
|
||||
$tmp_path = $_['tmp_path'];
|
||||
OC_Log::write('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG);
|
||||
?>
|
||||
<script language="Javascript">
|
||||
jQuery(function($) {
|
||||
$('#cropbox').Jcrop({
|
||||
onChange: showCoords,
|
||||
onSelect: showCoords,
|
||||
onRelease: clearCoords,
|
||||
maxSize: [399, 399],
|
||||
bgColor: 'black',
|
||||
bgOpacity: .4,
|
||||
boxWidth: 400,
|
||||
boxHeight: 400,
|
||||
setSelect: [ 100, 130, 50, 50 ]//,
|
||||
//aspectRatio: 0.8
|
||||
});
|
||||
});
|
||||
// Simple event handler, called from onChange and onSelect
|
||||
// event handlers, as per the Jcrop invocation above
|
||||
function showCoords(c) {
|
||||
$('#x1').val(c.x);
|
||||
$('#y1').val(c.y);
|
||||
$('#x2').val(c.x2);
|
||||
$('#y2').val(c.y2);
|
||||
$('#w').val(c.w);
|
||||
$('#h').val(c.h);
|
||||
};
|
||||
|
||||
function clearCoords() {
|
||||
$('#coords input').val('');
|
||||
};
|
||||
/*
|
||||
$('#coords').submit(function() {
|
||||
alert('Handler for .submit() called.');
|
||||
return true;
|
||||
});*/
|
||||
</script>
|
||||
<img id="cropbox" src="<?php echo OC_Helper::linkTo('contacts', 'dynphoto.php', null, true); ?>?tmp_path=<?php echo urlencode($tmp_path); ?>" />
|
||||
<form id="cropform"
|
||||
class="coords"
|
||||
method="post"
|
||||
enctype="multipart/form-data"
|
||||
target="crop_target"
|
||||
action="<?php echo OC_Helper::linkTo('contacts', 'ajax/savecrop.php', null, true); ?>">
|
||||
|
||||
<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
|
||||
<input type="hidden" id="tmp_path" name="tmp_path" value="<?php echo $tmp_path; ?>" />
|
||||
<fieldset id="coords">
|
||||
<input type="hidden" id="x1" name="x1" value="" />
|
||||
<input type="hidden" id="y1" name="y1" value="" />
|
||||
<input type="hidden" id="x2" name="x2" value="" />
|
||||
<input type="hidden" id="y2" name="y2" value="" />
|
||||
<input type="hidden" id="w" name="w" value="" />
|
||||
<input type="hidden" id="h" name="h" value="" />
|
||||
</fieldset>
|
||||
<iframe name="crop_target" id='crop_target' src=""></iframe>
|
||||
</form>
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
<?php
|
||||
$adr = isset($_['adr'])?$_['adr']:array();
|
||||
$id = $_['id'];
|
||||
$types = array();
|
||||
foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):array() as $type) {
|
||||
$types[] = strtoupper($type);
|
||||
}
|
||||
?>
|
||||
<div id="edit_address_dialog" title="<?php echo $l->t('Edit address'); ?>">
|
||||
<!-- ?php print_r($types); ? -->
|
||||
<fieldset id="address">
|
||||
<dl class="form">
|
||||
<dt>
|
||||
<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
|
||||
</dt>
|
||||
<dd>
|
||||
<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
|
||||
<?php echo html_select_options($_['adr_types'], $types) ?>
|
||||
</select>
|
||||
</dd>
|
||||
<dt>
|
||||
<label class="label" for="adr_pobox"><?php echo $l->t('PO Box'); ?></label>
|
||||
</dt>
|
||||
<dd>
|
||||
<input type="text" id="adr_pobox" name="value[ADR][0]" value="<?php echo isset($adr['value'][0])?$adr['value'][0]:''; ?>">
|
||||
</dd>
|
||||
<dd>
|
||||
<dt>
|
||||
<label class="label" for="adr_extended"><?php echo $l->t('Extended'); ?></label>
|
||||
</dt>
|
||||
<dd>
|
||||
<input type="text" id="adr_extended" name="value[ADR][1]" value="<?php echo isset($adr['value'][1])?$adr['value'][1]:''; ?>">
|
||||
</dd>
|
||||
<dt>
|
||||
<label class="label" for="adr_street"><?php echo $l->t('Street'); ?></label>
|
||||
</dt>
|
||||
<dd>
|
||||
<input type="text" id="adr_street" name="value[ADR][2]" value="<?php echo isset($adr['value'][2])?$adr['value'][2]:''; ?>">
|
||||
</dd>
|
||||
<dt>
|
||||
<label class="label" for="adr_city"><?php echo $l->t('City'); ?></label>
|
||||
</dt>
|
||||
<dd>
|
||||
<input type="text" id="adr_city" name="value[ADR][3]" value="<?php echo isset($adr['value'][3])?$adr['value'][3]:''; ?>">
|
||||
</dd>
|
||||
<dt>
|
||||
<label class="label" for="adr_region"><?php echo $l->t('Region'); ?></label>
|
||||
</dt>
|
||||
<dd>
|
||||
<input type="text" id="adr_region" name="value[ADR][4]" value="<?php echo isset($adr['value'][4])?$adr['value'][4]:''; ?>">
|
||||
</dd>
|
||||
<dt>
|
||||
<label class="label" for="adr_zipcode"><?php echo $l->t('Zipcode'); ?></label>
|
||||
</dt>
|
||||
<dd>
|
||||
<input type="text" id="adr_zipcode" name="value[ADR][5]" value="<?php echo isset($adr['value'][5])?$adr['value'][5]:''; ?>">
|
||||
</dd>
|
||||
<dt>
|
||||
<label class="label" for="adr_country"><?php echo $l->t('Country'); ?></label>
|
||||
</dt>
|
||||
<dd>
|
||||
<input type="text" id="adr_country" name="value[ADR][6]" value="<?php echo isset($adr['value'][6])?$adr['value'][6]:''; ?>">
|
||||
</dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
<?php
|
||||
$l=new OC_L10N('contacts');
|
||||
$name = isset($_['name'])?$_['name']:'';
|
||||
//print_r($name);
|
||||
$id = isset($_['id'])?$_['id']:'';
|
||||
$addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
|
||||
?>
|
||||
<div id="edit_name_dialog" title="Edit name">
|
||||
<form>
|
||||
<fieldset>
|
||||
<dl class="form">
|
||||
<?php if(!is_null($addressbooks)) {
|
||||
if(count($_['addressbooks'])==1) {
|
||||
?>
|
||||
<input type="hidden" id="aid" name="aid" value="<?php echo $_['addressbooks'][0]['id']; ?>">
|
||||
<?php } else { ?>
|
||||
<dt><label for="addressbook"><?php echo $l->t('Addressbook'); ?></label></dt>
|
||||
<dd>
|
||||
<select id="aid" name="aid" size="1">
|
||||
<?php echo html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
|
||||
</select>
|
||||
</dd>
|
||||
<?php }} ?>
|
||||
<dt><label for="pre"><?php echo $l->t('Hon. prefixes'); ?></label></dt>
|
||||
<dd>
|
||||
<input name="pre" id="pre" value="<?php echo isset($name['value'][3]) ? $name['value'][3] : ''; ?>" type="text" list="prefixes" />
|
||||
<datalist id="prefixes">
|
||||
<option value="<?php echo $l->t('Miss'); ?>">
|
||||
<option value="<?php echo $l->t('Ms'); ?>">
|
||||
<option value="<?php echo $l->t('Mr'); ?>">
|
||||
<option value="<?php echo $l->t('Sir'); ?>">
|
||||
<option value="<?php echo $l->t('Mrs'); ?>">
|
||||
<option value="<?php echo $l->t('Dr'); ?>">
|
||||
</datalist>
|
||||
</dd>
|
||||
<dt><label for="giv"><?php echo $l->t('Given name'); ?></label></dt>
|
||||
<dd><input name="giv" id="giv" value="<?php echo isset($name['value'][1]) ? $name['value'][1] : ''; ?>" type="text" /></dd>
|
||||
<dt><label for="add"><?php echo $l->t('Additional names'); ?></label></dt>
|
||||
<dd><input name="add" id="add" value="<?php echo isset($name['value'][2]) ? $name['value'][2] : ''; ?>" type="text" /></dd>
|
||||
<dt><label for="fam"><?php echo $l->t('Family name'); ?></label></dt>
|
||||
<dd><input name="fam" id="fam" value="<?php echo isset($name['value'][0]) ? $name['value'][0] : ''; ?>" type="text" /></dd>
|
||||
<dt><label for="suf"><?php echo $l->t('Hon. suffixes'); ?></label></dt>
|
||||
<dd>
|
||||
<input name="suf" id="suf" value="<?php echo isset($name['value'][4]) ? $name['value'][4] : ''; ?>" type="text" list="suffixes" />
|
||||
<datalist id="suffixes">
|
||||
<option value="<?php echo $l->t('J.D.'); ?>">
|
||||
<option value="<?php echo $l->t('M.D.'); ?>">
|
||||
<option value="<?php echo $l->t('D.O.'); ?>">
|
||||
<option value="<?php echo $l->t('D.C.'); ?>">
|
||||
<option value="<?php echo $l->t('Ph.D.'); ?>">
|
||||
<option value="<?php echo $l->t('Esq.'); ?>">
|
||||
<option value="<?php echo $l->t('Jr.'); ?>">
|
||||
<option value="<?php echo $l->t('Sn.'); ?>">
|
||||
</datalist>
|
||||
</dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<div id="firstrun">
|
||||
You have no contacts in your list.
|
||||
<div id="selections">
|
||||
<input type="button" value="Import contacts" onclick="Contacts.UI.Addressbooks.import()" />
|
||||
<input type="button" value="Add contact" onclick="Contacts.UI.Card.add()" />
|
||||
<input type="button" value="Edit addressbooks" onclick="Contacts.UI.Addressbooks.overview()" />
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -460,7 +460,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
|
|||
}
|
||||
|
||||
public function getMimeType($path) {
|
||||
if ($path2 == "" || $path2 == "/") {
|
||||
if ($path == "" || $path == "/") {
|
||||
return 'httpd/unix-directory';
|
||||
}
|
||||
$source = $this->getSource($path);
|
||||
|
|
@ -517,4 +517,4 @@ class OC_Filestorage_Shared extends OC_Filestorage {
|
|||
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -45,6 +45,11 @@ function handleGetThumbnails($albumname) {
|
|||
OC_JSON::checkLoggedIn();
|
||||
$photo = new OC_Image();
|
||||
$photo->loadFromFile(OC::$CONFIG_DATADIRECTORY.'/../gallery/'.$albumname.'.png');
|
||||
$offset = 3600 * 24; // 24 hour
|
||||
// calc the string in GMT not localtime and add the offset
|
||||
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
|
||||
header('Cache-Control: max-age='.$offset.', must-revalidate');
|
||||
header('Pragma: public');
|
||||
$photo->show();
|
||||
}
|
||||
|
||||
|
|
@ -69,7 +74,7 @@ function handlePartialCreate($path) {
|
|||
if (!OC_Filesystem::is_dir($path)) OC_JSON::error(array('cause' => 'Invalid path given'));
|
||||
|
||||
$album = OC_Gallery_Album::find(OC_User::getUser(), null, $path);
|
||||
$albums;
|
||||
$albums = array();
|
||||
OC_Gallery_Scanner::scanDir($path, $albums);
|
||||
OC_JSON::success(array('album_details' => $albums));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,65 +25,14 @@ require_once('../../../lib/base.php');
|
|||
OC_JSON::checkLoggedIn();
|
||||
OC_JSON::checkAppEnabled('gallery');
|
||||
|
||||
function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height) { //$imgSrc is a FILE - Returns an image resource.
|
||||
//getting the image dimensions
|
||||
if(! function_exists('imagecreatefromjpeg'))
|
||||
OC_Log::write('gallery','GD module not installed',OC_Log::ERROR);
|
||||
|
||||
list($width_orig, $height_orig) = getimagesize($imgSrc);
|
||||
switch (strtolower(substr($imgSrc, strrpos($imgSrc, '.')+1))) {
|
||||
case "jpeg":
|
||||
case "jpg":
|
||||
case "tiff":
|
||||
$myImage = imagecreatefromjpeg($imgSrc);
|
||||
break;
|
||||
case "png":
|
||||
$myImage = imagecreatefrompng($imgSrc);
|
||||
break;
|
||||
default:
|
||||
exit();
|
||||
}
|
||||
if(!$myImage) exit();
|
||||
$ratio_orig = $width_orig/$height_orig;
|
||||
|
||||
if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
|
||||
$new_height = $thumbnail_width/$ratio_orig;
|
||||
$new_width = $thumbnail_width;
|
||||
} else {
|
||||
$new_width = $thumbnail_height*$ratio_orig;
|
||||
$new_height = $thumbnail_height;
|
||||
}
|
||||
|
||||
$x_mid = $new_width/2; //horizontal middle
|
||||
$y_mid = $new_height/2; //vertical middle
|
||||
|
||||
$process = imagecreatetruecolor(round($new_width), round($new_height));
|
||||
|
||||
imagecopyresampled($process, $myImage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
|
||||
$thumb = imagecreatetruecolor($thumbnail_width, $thumbnail_height);
|
||||
imagecopyresampled($thumb, $process, 0, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
|
||||
|
||||
imagedestroy($process);
|
||||
imagedestroy($myImage);
|
||||
return $thumb;
|
||||
}
|
||||
|
||||
$box_size = 200;
|
||||
$img = $_GET['img'];
|
||||
|
||||
$imagePath = OC_Filesystem::getLocalFile($img);
|
||||
|
||||
if(file_exists($imagePath))
|
||||
{
|
||||
$image = CroppedThumbnail($imagePath, $box_size, $box_size);
|
||||
|
||||
header('Content-Type: image/png');
|
||||
$offset = 3600 * 24;
|
||||
$image = OC_Gallery_Photo::getThumbnail($img);
|
||||
if ($image) {
|
||||
$offset = 3600 * 24; // 24 hour
|
||||
// calc the string in GMT not localtime and add the offset
|
||||
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT");
|
||||
header('Cache-Control: max-age='.$offset.', must-revalidate');
|
||||
header('Pragma: public');
|
||||
|
||||
imagepng($image);
|
||||
imagedestroy($image);
|
||||
$image->show();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
class OC_Gallery_Photo{
|
||||
class OC_Gallery_Photo {
|
||||
public static function create($albumId, $img){
|
||||
$stmt = OC_DB::prepare('INSERT INTO *PREFIX*gallery_photos (album_id, file_path) VALUES (?, ?)');
|
||||
$stmt->execute(array($albumId, $img));
|
||||
|
|
@ -65,5 +65,34 @@ class OC_Gallery_Photo{
|
|||
$stmt = OC_DB::prepare("UPDATE *PREFIX*gallery_photos SET file_path = ?, album_id = ? WHERE album_id = ? and file_path = ?");
|
||||
$stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
|
||||
}
|
||||
}
|
||||
|
||||
public static function getThumbnail($image_name) {
|
||||
$imagePath = OC_Filesystem::getLocalFile($image_name);
|
||||
if(!file_exists($imagePath)) {
|
||||
return null;
|
||||
}
|
||||
$save_dir = OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/';
|
||||
$save_dir .= dirname($image_name). '/';
|
||||
$image_name = basename($image_name);
|
||||
$thumb_file = $save_dir . $image_name;
|
||||
if (file_exists($thumb_file)) {
|
||||
$image = new OC_Image($thumb_file);
|
||||
} else {
|
||||
$image = new OC_Image($imagePath);
|
||||
if ($image->valid()) {
|
||||
$image->centerCrop();
|
||||
$image->resize(200);
|
||||
$image->fixOrientation();
|
||||
if (!is_dir($save_dir)) {
|
||||
mkdir($save_dir, 0777, true);
|
||||
}
|
||||
$image->save($thumb_file);
|
||||
}
|
||||
}
|
||||
if ($image->valid()) {
|
||||
//var_dump($image, $image->resource());
|
||||
return $image;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,8 +89,10 @@ class OC_Gallery_Scanner {
|
|||
$file_count = min(count($files), 10);
|
||||
$thumbnail = imagecreatetruecolor($file_count*200, 200);
|
||||
for ($i = 0; $i < $file_count; $i++) {
|
||||
$imagePath = OC_Filesystem::getLocalFile($files[$i]);
|
||||
CroppedThumbnail($imagePath, 200, 200, $thumbnail, $i*200);
|
||||
$image = OC_Gallery_Photo::getThumbnail($files[$i]);
|
||||
if ($image && $image->valid()) {
|
||||
imagecopyresampled($thumbnail, $image->resource(), $i*200, 0, 0, 0, 200, 200, 200, 200);
|
||||
}
|
||||
}
|
||||
imagepng($thumbnail, OC_Config::getValue("datadirectory").'/'. OC_User::getUser() .'/gallery/' . $albumName.'.png');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,10 +70,10 @@ if($arguments['action']){
|
|||
case 'scan':
|
||||
OC_DB::beginTransaction();
|
||||
set_time_limit(0); //recursive scan can take a while
|
||||
$path=$arguments['path'];
|
||||
echo OC_MEDIA_SCANNER::scanFolder($path);
|
||||
$eventSource=new OC_EventSource();
|
||||
OC_MEDIA_SCANNER::scanCollection($eventSource);
|
||||
$eventSource->close();
|
||||
OC_DB::commit();
|
||||
flush();
|
||||
break;
|
||||
case 'scanFile':
|
||||
echo (OC_MEDIA_SCANNER::scanFile($arguments['path']))?'true':'false';
|
||||
|
|
@ -127,29 +127,9 @@ if($arguments['action']){
|
|||
OC_Filesystem::readfile($arguments['path']);
|
||||
exit;
|
||||
case 'find_music':
|
||||
OC_JSON::encodedPrint(findMusic());
|
||||
OC_JSON::encodedPrint(OC_FileCache::searchByMime('audio'));
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
function findMusic($path=''){
|
||||
$music=array();
|
||||
$dh=OC_Filesystem::opendir($path);
|
||||
if($dh){
|
||||
while($filename=readdir($dh)){
|
||||
if($filename[0]!='.'){
|
||||
$file=$path.'/'.$filename;
|
||||
if(OC_Filesystem::is_dir($file)){
|
||||
$music=array_merge($music,findMusic($file));
|
||||
}else{
|
||||
if(OC_MEDIA_SCANNER::isMusic($filename)){
|
||||
$music[]=$file;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return $music;
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,90 +1,44 @@
|
|||
Scanner={
|
||||
songsFound:0,
|
||||
eventSource:null,
|
||||
songsScanned:0,
|
||||
songsChecked:0,
|
||||
startTime:null,
|
||||
endTime:null,
|
||||
stopScanning:false,
|
||||
currentIndex:0,
|
||||
songs:[],
|
||||
findSongs:function(ready){
|
||||
$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=find_music',function(songs){
|
||||
Scanner.songsFound=songs.length;
|
||||
Scanner.currentIndex=-1
|
||||
if(ready){
|
||||
|
||||
ready(songs)
|
||||
}
|
||||
});
|
||||
},
|
||||
scanFile:function(path,ready){
|
||||
path=encodeURIComponent(path);
|
||||
$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=get_path_info&path='+path,function(song){
|
||||
Scanner.songsChecked++;
|
||||
if(ready){
|
||||
ready(song);
|
||||
}
|
||||
if(song){//do this after the ready call so we dont hold up the next ajax call
|
||||
var artistId=song.song_artist;
|
||||
Scanner.songsScanned++;
|
||||
$('#scan span.songCount').text(Scanner.songsScanned);
|
||||
var progress=(Scanner.songsChecked/Scanner.songsFound)*100;
|
||||
$('#scanprogressbar').progressbar('value',progress)
|
||||
Collection.addSong(song);
|
||||
}
|
||||
});
|
||||
},
|
||||
scanCollection:function(ready){
|
||||
$('#scanprogressbar').progressbar({
|
||||
value:0,
|
||||
});
|
||||
$('#scanprogressbar').show();
|
||||
Scanner.songsChecked=0;
|
||||
Scanner.currentIndex=0;
|
||||
Scanner.songsScanned=0;
|
||||
Scanner.startTime=new Date().getTime()/1000;
|
||||
Scanner.findSongs(function(songs){
|
||||
Scanner.songs=songs;
|
||||
Scanner.start(function(){
|
||||
$('#scan input.start').show();
|
||||
$('#scan input.stop').hide();
|
||||
$('#scanprogressbar').hide();
|
||||
Collection.display();
|
||||
if(ready){
|
||||
ready();
|
||||
}
|
||||
});
|
||||
Scanner.eventSource=new OC.EventSource(OC.linkTo('media','ajax/api.php'),{action:'scan'});
|
||||
Scanner.eventSource.listen('count',function(total){
|
||||
Scanner.songsFound=total;
|
||||
});
|
||||
Scanner.eventSource.listen('scanned',function(data){
|
||||
Scanner.songsScanned=data.count;
|
||||
$('#scan span.songCount').text(Scanner.songsScanned);
|
||||
var progress=(Scanner.songsScanned/Scanner.songsFound)*100;
|
||||
$('#scanprogressbar').progressbar('value',progress)
|
||||
});
|
||||
Scanner.eventSource.listen('done',function(count){
|
||||
$('#scan input.start').show();
|
||||
$('#scan input.stop').hide();
|
||||
$('#scanprogressbar').hide();
|
||||
Collection.load(Collection.display)
|
||||
if(ready){
|
||||
ready();
|
||||
}
|
||||
});
|
||||
$('#scancount').show();
|
||||
},
|
||||
stop:function(){
|
||||
Scanner.stopScanning=true;
|
||||
Scanner.close();
|
||||
},
|
||||
start:function(ready){
|
||||
Scanner.stopScanning=false;
|
||||
$('#scancount').show();
|
||||
var scanSong=function(){
|
||||
if(!Scanner.stopScanning && Scanner.currentIndex<=Scanner.songs.length){
|
||||
Scanner.scanFile(Scanner.songs[Scanner.currentIndex],scanSong)
|
||||
}else if(!Scanner.stopScanning){
|
||||
Scanner.endTime=new Date().getTime()/1000;
|
||||
if(ready){
|
||||
ready();
|
||||
ready=null;//only call ready once
|
||||
}
|
||||
}
|
||||
Scanner.currentIndex++;
|
||||
}
|
||||
scanSong();
|
||||
scanSong();
|
||||
},
|
||||
toggle:function(){
|
||||
if(Scanner.stopScanning){
|
||||
Scanner.start();
|
||||
$('#scan input.stop').val(t('media','Pause'));
|
||||
}else{
|
||||
Scanner.stop();
|
||||
$('#scan input.stop').val(t('media','Resume'));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,32 +33,22 @@ class OC_MEDIA_SCANNER{
|
|||
|
||||
/**
|
||||
* scan a folder for music
|
||||
* @param string $path
|
||||
* @param OC_EventSource eventSource (optional)
|
||||
* @return int the number of songs found
|
||||
*/
|
||||
public static function scanFolder($path){
|
||||
if (OC_Filesystem::is_dir($path)) {
|
||||
$songs=0;
|
||||
if ($dh = OC_Filesystem::opendir($path)) {
|
||||
while (($filename = readdir($dh)) !== false) {
|
||||
if($filename<>'.' and $filename<>'..' and substr($filename,0,1)!='.'){
|
||||
$file=$path.'/'.$filename;
|
||||
if(OC_Filesystem::is_dir($file)){
|
||||
$songs+=self::scanFolder($file);
|
||||
}elseif(OC_Filesystem::is_file($file)){
|
||||
$data=self::scanFile($file);
|
||||
if($data){
|
||||
$songs++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public static function scanCollection($eventSource=null){
|
||||
$music=OC_FileCache::searchByMime('audio');
|
||||
$eventSource->send('count',count($music));
|
||||
$songs=0;
|
||||
foreach($music as $file){
|
||||
self::scanFile($file);
|
||||
$songs++;
|
||||
if($eventSource){
|
||||
$eventSource->send('scanned',array('file'=>$file,'count'=>$songs));
|
||||
}
|
||||
}elseif(OC_Filesystem::is_file($path)){
|
||||
$songs=1;
|
||||
self::scanFile($path);
|
||||
}else{
|
||||
$songs=0;
|
||||
}
|
||||
if($eventSource){
|
||||
$eventSource->send('done',$songs);
|
||||
}
|
||||
return $songs;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 488 B |
|
|
@ -0,0 +1,109 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.0"
|
||||
width="22"
|
||||
height="22"
|
||||
id="svg2406"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
sodipodi:docname="add.svg">
|
||||
<metadata
|
||||
id="metadata3125">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="640"
|
||||
inkscape:window-height="480"
|
||||
id="namedview3123"
|
||||
showgrid="false"
|
||||
inkscape:zoom="10.727273"
|
||||
inkscape:cx="11.843286"
|
||||
inkscape:cy="14.728814"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg2406" />
|
||||
<defs
|
||||
id="defs2408">
|
||||
<linearGradient
|
||||
id="linearGradient2264">
|
||||
<stop
|
||||
id="stop2266"
|
||||
style="stop-color:#d7e866;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop2268"
|
||||
style="stop-color:#8cab2a;stop-opacity:1"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
x1="24.103895"
|
||||
y1="15.180944"
|
||||
x2="24.103895"
|
||||
y2="34.224861"
|
||||
id="linearGradient2401"
|
||||
xlink:href="#linearGradient2264"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.8988874,0,0,0.8934652,-10.463705,-9.5659718)" />
|
||||
<linearGradient
|
||||
id="linearGradient4222">
|
||||
<stop
|
||||
id="stop4224"
|
||||
style="stop-color:#ffffff;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop4226"
|
||||
style="stop-color:#ffffff;stop-opacity:0"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
x1="24.138529"
|
||||
y1="6.5316639"
|
||||
x2="24.138529"
|
||||
y2="45.690399"
|
||||
id="linearGradient2398"
|
||||
xlink:href="#linearGradient4222"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.8489228,-1.5061978)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4222"
|
||||
id="linearGradient3128"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.7557025,-1.7858588)"
|
||||
x1="24.138529"
|
||||
y1="6.5316639"
|
||||
x2="24.138529"
|
||||
y2="45.690399" />
|
||||
</defs>
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3128);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
|
||||
id="path2272"
|
||||
d="m 8.5932204,8.2151575 0,-5.9948184 4.9999996,0 0,5.9948184 6,0 0,5.0051815 -6,0 0,6 -4.9999996,0 0,-6 -6,0 0,-5.0051815 6,0 z" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 548 B |
|
|
@ -0,0 +1,345 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.0"
|
||||
width="22"
|
||||
height="22"
|
||||
id="svg2575"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
sodipodi:docname="mail_new.svg"
|
||||
inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/mail.png"
|
||||
inkscape:export-xdpi="65.454544"
|
||||
inkscape:export-ydpi="65.454544">
|
||||
<metadata
|
||||
id="metadata59">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="640"
|
||||
inkscape:window-height="480"
|
||||
id="namedview57"
|
||||
showgrid="false"
|
||||
inkscape:zoom="10.727273"
|
||||
inkscape:cx="11"
|
||||
inkscape:cy="11"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg2575" />
|
||||
<defs
|
||||
id="defs2577">
|
||||
<linearGradient
|
||||
id="linearGradient3943">
|
||||
<stop
|
||||
id="stop3945"
|
||||
style="stop-color:#ffffff;stop-opacity:0.40000001"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop3947"
|
||||
style="stop-color:#ffffff;stop-opacity:0"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
x1="24.138529"
|
||||
y1="7.0478544"
|
||||
x2="24.138529"
|
||||
y2="47.272728"
|
||||
id="linearGradient2560"
|
||||
xlink:href="#linearGradient3943"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.2817955,0,0,0.2800956,-16.058706,13.975052)" />
|
||||
<linearGradient
|
||||
id="linearGradient2264">
|
||||
<stop
|
||||
id="stop2266"
|
||||
style="stop-color:#d7e866;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop2268"
|
||||
style="stop-color:#8cab2a;stop-opacity:1"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
x1="24.103895"
|
||||
y1="15.168831"
|
||||
x2="24.103895"
|
||||
y2="32.485161"
|
||||
id="linearGradient2558"
|
||||
xlink:href="#linearGradient2264"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4691323,0,0,0.4663025,-20.554789,9.7686284)" />
|
||||
<linearGradient
|
||||
id="linearGradient3495-841-851-719">
|
||||
<stop
|
||||
id="stop4120"
|
||||
style="stop-color:#1e1e1e;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop4122"
|
||||
style="stop-color:#1e1e1e;stop-opacity:0"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3333-314-917-262">
|
||||
<stop
|
||||
id="stop4102"
|
||||
style="stop-color:#ffffff;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop4104"
|
||||
style="stop-color:#ffffff;stop-opacity:0"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2490-495-150-777">
|
||||
<stop
|
||||
id="stop4108"
|
||||
style="stop-color:#787878;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop4110"
|
||||
style="stop-color:#b4b4b4;stop-opacity:1"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3242-967-12-570-862-307">
|
||||
<stop
|
||||
id="stop4498"
|
||||
style="stop-color:#f2f2f2;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop4502"
|
||||
style="stop-color:#dbdbdb;stop-opacity:1"
|
||||
offset="0.87426931" />
|
||||
<stop
|
||||
id="stop4504"
|
||||
style="stop-color:#999999;stop-opacity:1"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient5060-6-986-342-61">
|
||||
<stop
|
||||
id="stop4080"
|
||||
style="stop-color:#1e1e1e;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop4082"
|
||||
style="stop-color:#1e1e1e;stop-opacity:0"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
cx="605.71429"
|
||||
cy="486.64789"
|
||||
r="117.14286"
|
||||
fx="605.71429"
|
||||
fy="486.64789"
|
||||
id="radialGradient2724-226-535-494"
|
||||
xlink:href="#linearGradient5060-6-986-342-61"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-6.553443e-2,0,0,2.470588e-2,-21.829255,10.577352)" />
|
||||
<linearGradient
|
||||
id="linearGradient5060-6-252-476-367">
|
||||
<stop
|
||||
id="stop4074"
|
||||
style="stop-color:#1e1e1e;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop4076"
|
||||
style="stop-color:#1e1e1e;stop-opacity:0"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
cx="605.71429"
|
||||
cy="486.64789"
|
||||
r="117.14286"
|
||||
fx="605.71429"
|
||||
fy="486.64789"
|
||||
id="radialGradient2722-303-187-273"
|
||||
xlink:href="#linearGradient5060-6-252-476-367"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(6.553443e-2,0,0,2.470588e-2,-69.175497,10.577352)" />
|
||||
<linearGradient
|
||||
id="linearGradient5048-7-668-934-892">
|
||||
<stop
|
||||
id="stop4066"
|
||||
style="stop-color:#1e1e1e;stop-opacity:0"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop4068"
|
||||
style="stop-color:#1e1e1e;stop-opacity:1"
|
||||
offset="0.5" />
|
||||
<stop
|
||||
id="stop4070"
|
||||
style="stop-color:#1e1e1e;stop-opacity:0"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
x1="302.85715"
|
||||
y1="366.64789"
|
||||
x2="302.85715"
|
||||
y2="609.50507"
|
||||
id="linearGradient2720-766-26-906"
|
||||
xlink:href="#linearGradient5048-7-668-934-892"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(6.553443e-2,0,0,2.470588e-2,-69.188394,10.577352)" />
|
||||
<linearGradient
|
||||
x1="23.903786"
|
||||
y1="35.75"
|
||||
x2="23.903786"
|
||||
y2="16.00676"
|
||||
id="linearGradient3411"
|
||||
xlink:href="#linearGradient3495-841-851-719"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4657385,0,0,0.4850945,0.8223379,-3.5686279)" />
|
||||
<linearGradient
|
||||
x1="23.928667"
|
||||
y1="30.773148"
|
||||
x2="23.928667"
|
||||
y2="45.530704"
|
||||
id="linearGradient3414"
|
||||
xlink:href="#linearGradient3495-841-851-719"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4657385,0,0,0.4850945,0.8223378,-4.102232)" />
|
||||
<linearGradient
|
||||
x1="25.57654"
|
||||
y1="15.000002"
|
||||
x2="25.57654"
|
||||
y2="44.00053"
|
||||
id="linearGradient3417"
|
||||
xlink:href="#linearGradient3333-314-917-262"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4418603,0,0,0.4642857,1.3953491,-3.696433)" />
|
||||
<linearGradient
|
||||
x1="19.875452"
|
||||
y1="10.389797"
|
||||
x2="19.875452"
|
||||
y2="45.60001"
|
||||
id="linearGradient3420"
|
||||
xlink:href="#linearGradient3242-967-12-570-862-307"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4666666,0,0,0.4545454,0.7999999,-2.7272752)" />
|
||||
<linearGradient
|
||||
x1="28.103424"
|
||||
y1="45.000065"
|
||||
x2="28.103424"
|
||||
y2="14.038458"
|
||||
id="linearGradient3422"
|
||||
xlink:href="#linearGradient2490-495-150-777"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4666666,0,0,0.5006418,0.7999998,-4.7785529)" />
|
||||
<linearGradient
|
||||
x1="23.903786"
|
||||
y1="35.75"
|
||||
x2="23.903786"
|
||||
y2="16.00676"
|
||||
id="linearGradient2440"
|
||||
xlink:href="#linearGradient3495-841-851-719"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4657385,0,0,0.4850945,-0.1776621,-4.5686279)" />
|
||||
<linearGradient
|
||||
x1="23.928667"
|
||||
y1="30.773148"
|
||||
x2="23.928667"
|
||||
y2="45.530704"
|
||||
id="linearGradient2443"
|
||||
xlink:href="#linearGradient3495-841-851-719"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4657385,0,0,0.4850945,-0.1776622,-5.102232)" />
|
||||
<linearGradient
|
||||
x1="25.57654"
|
||||
y1="15.000002"
|
||||
x2="25.57654"
|
||||
y2="44.00053"
|
||||
id="linearGradient2446"
|
||||
xlink:href="#linearGradient3333-314-917-262"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4418603,0,0,0.4642857,0.3953491,-4.696433)" />
|
||||
<linearGradient
|
||||
x1="19.875452"
|
||||
y1="10.389797"
|
||||
x2="19.875452"
|
||||
y2="45.60001"
|
||||
id="linearGradient2449"
|
||||
xlink:href="#linearGradient3242-967-12-570-862-307"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4666666,0,0,0.4545454,-0.10677976,-1.5832074)" />
|
||||
<linearGradient
|
||||
x1="28.103424"
|
||||
y1="45.000065"
|
||||
x2="28.103424"
|
||||
y2="14.038458"
|
||||
id="linearGradient2451"
|
||||
xlink:href="#linearGradient2490-495-150-777"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4666666,0,0,0.5006418,-0.10677986,-3.6344851)" />
|
||||
<linearGradient
|
||||
x1="24.103895"
|
||||
y1="15.168831"
|
||||
x2="24.103895"
|
||||
y2="32.485161"
|
||||
id="linearGradient2457"
|
||||
xlink:href="#linearGradient2264"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.4691323,0,0,0.4663025,-20.554789,9.7686284)" />
|
||||
<linearGradient
|
||||
x1="24.138529"
|
||||
y1="7.0478544"
|
||||
x2="24.138529"
|
||||
y2="47.272728"
|
||||
id="linearGradient2459"
|
||||
xlink:href="#linearGradient3943"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.2817955,0,0,0.2800956,-16.058706,13.975052)" />
|
||||
</defs>
|
||||
<rect
|
||||
width="21"
|
||||
height="15"
|
||||
rx="0.46666664"
|
||||
ry="0.45454553"
|
||||
x="0.59322035"
|
||||
y="3.6440678"
|
||||
id="rect2396"
|
||||
style="fill:url(#linearGradient2449);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2451);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
<rect
|
||||
width="19"
|
||||
height="13"
|
||||
rx="0.036476243"
|
||||
ry="0.035004593"
|
||||
x="1.5"
|
||||
y="2.5"
|
||||
id="rect3331"
|
||||
style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2446);stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
<path
|
||||
d="M 8.2139564,10.336975 L 1.1222032,16.468629 M 13.709509,10.325653 L 20.811476,16.468629"
|
||||
id="path3341"
|
||||
style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2443);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
<path
|
||||
d="M 0.8491563,3.0457658 L 11.000062,12.181817 L 20.937208,3.0457658"
|
||||
id="path3493"
|
||||
style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:url(#linearGradient2440);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 526 B |
|
|
@ -0,0 +1,92 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="16px"
|
||||
height="16px"
|
||||
id="svg6077"
|
||||
version="1.1"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
sodipodi:docname="triangle-s.svg"
|
||||
inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/triangle-s.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90">
|
||||
<defs
|
||||
id="defs6079">
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
|
||||
id="linearGradient7308"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0,0.54681372,-0.39376081,0,14.87048,-9.6346)"
|
||||
x1="34.992828"
|
||||
y1="0.94087797"
|
||||
x2="34.992828"
|
||||
y2="33.955856" />
|
||||
<linearGradient
|
||||
id="linearGradient3587-6-5-3-4-5-4-0-1">
|
||||
<stop
|
||||
offset="0"
|
||||
style="stop-color:#000000;stop-opacity:1"
|
||||
id="stop3589-9-2-2-3-2-53-4-3" />
|
||||
<stop
|
||||
offset="1"
|
||||
style="stop-color:#363636;stop-opacity:1"
|
||||
id="stop3591-7-4-73-7-9-86-9-3" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="22.197802"
|
||||
inkscape:cx="1.0398514"
|
||||
inkscape:cy="8"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="true"
|
||||
inkscape:grid-bbox="true"
|
||||
inkscape:document-units="px"
|
||||
inkscape:window-width="1600"
|
||||
inkscape:window-height="845"
|
||||
inkscape:window-x="-2"
|
||||
inkscape:window-y="-3"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata6082">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer">
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 14.5,3 1.5,3 8,15 14.5,3 z"
|
||||
id="path2843-0-1-6-6"
|
||||
style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
d="m 14.5,1.49996 -13,0 6.49999,12 6.50001,-12 z"
|
||||
id="path2843-39-5-5"
|
||||
style="opacity:0.7;color:#000000;fill:url(#linearGradient7308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.1 KiB |
18
lib/app.php
18
lib/app.php
|
|
@ -403,4 +403,22 @@ class OC_App{
|
|||
include OC::$SERVERROOT.'/apps/'.$appid.'/appinfo/update.php';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string appid
|
||||
* @return OC_FilesystemView
|
||||
*/
|
||||
public static function getStorage($appid){
|
||||
if(OC_App::isEnabled($appid)){//sanity check
|
||||
if(OC_User::isLoggedIn()){
|
||||
return new OC_FilesystemView('/'.OC_User::getUser().'/'.$appid);
|
||||
}else{
|
||||
OC_Log::write('core','Can\'t get app storage, app, user not logged in',OC_Log::ERROR);
|
||||
return false;
|
||||
}
|
||||
}else{
|
||||
OC_Log::write('core','Can\'t get app storage, app '.$appid.' not enabled',OC_Log::ERROR);
|
||||
false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,6 +92,19 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* sets the last modification time of the file (mtime) to the value given
|
||||
* in the second parameter or to now if the second param is empty.
|
||||
* Even if the modification time is set to a custom value the access time is set to now.
|
||||
*/
|
||||
public function setLastModifiedTime($mtime) {
|
||||
OC_Filesystem::setFileMtime($this->path, $mtime);
|
||||
}
|
||||
|
||||
public function endsWith( $str, $sub ) {
|
||||
return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates properties on this node,
|
||||
*
|
||||
|
|
@ -110,13 +123,16 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
|
|||
}
|
||||
}
|
||||
else {
|
||||
if(!array_key_exists( $propertyName, $existing )){
|
||||
$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
|
||||
$query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue ));
|
||||
}
|
||||
else{
|
||||
$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyvalue = ? WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
|
||||
$query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName ));
|
||||
if( $this->endsWith( $propertyName, "modificationTime")) {
|
||||
$this->setLastModifiedTime($propertyValue);
|
||||
} else {
|
||||
if(!array_key_exists( $propertyName, $existing )){
|
||||
$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
|
||||
$query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue ));
|
||||
} else {
|
||||
$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyvalue = ? WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
|
||||
$query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName ));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ class OC_DB {
|
|||
static private $schema=false;
|
||||
static private $affected=0;
|
||||
static private $result=false;
|
||||
static private $inTransaction=false;
|
||||
|
||||
/**
|
||||
* @brief connects to the database
|
||||
|
|
@ -490,17 +491,19 @@ class OC_DB {
|
|||
return false;
|
||||
}
|
||||
self::$connection->beginTransaction();
|
||||
self::$inTransaction=true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Commit the database changes done during a transaction that is in progress
|
||||
*/
|
||||
public static function commit($savePoint=''){
|
||||
public static function commit(){
|
||||
self::connect();
|
||||
if(!self::$connection->inTransaction()){
|
||||
if(!self::$inTransaction){
|
||||
return false;
|
||||
}
|
||||
self::$connection->commit();
|
||||
self::$inTransaction=false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ class OC_EventSource{
|
|||
private $fallBackId=0;
|
||||
|
||||
public function __construct(){
|
||||
ob_end_clean();
|
||||
header('Cache-Control: no-cache');
|
||||
$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
|
||||
if($this->fallback){
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class OC_FileCache{
|
|||
if(is_array($result)){
|
||||
return $result;
|
||||
}else{
|
||||
OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
|
||||
OC_Log::write('get(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -125,7 +125,9 @@ class OC_FileCache{
|
|||
$queryParts[]='mimepart=?';
|
||||
}
|
||||
$arguments[]=$id;
|
||||
$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET '.implode(' , ',$queryParts).' WHERE id=?');
|
||||
|
||||
$sql = 'UPDATE *PREFIX*fscache SET '.implode(' , ',$queryParts).' WHERE id=?';
|
||||
$query=OC_DB::prepare($sql);
|
||||
$query->execute($arguments);
|
||||
}
|
||||
|
||||
|
|
@ -231,7 +233,7 @@ class OC_FileCache{
|
|||
if(is_array($result)){
|
||||
return $result;
|
||||
}else{
|
||||
OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
|
||||
OC_Log::write('getFolderContent(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -264,7 +266,7 @@ class OC_FileCache{
|
|||
if(is_array($result)){
|
||||
return $result['id'];
|
||||
}else{
|
||||
OC_Log::write('file not found in cache ('.$path.')','core',OC_Log::DEBUG);
|
||||
OC_Log::write('getFieldId(): file not found in cache ('.$path.')','core',OC_Log::DEBUG);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
|
@ -293,6 +295,7 @@ class OC_FileCache{
|
|||
}else{
|
||||
$view=new OC_FilesystemView(($root=='/')?'':$root);
|
||||
}
|
||||
|
||||
$path=$params['path'];
|
||||
$fullPath=$view->getRoot().$path;
|
||||
$mimetype=$view->getMimeType($path);
|
||||
|
|
@ -303,8 +306,8 @@ class OC_FileCache{
|
|||
if(self::inCache($path,$root)){
|
||||
$parent=self::getFileId($fullPath);
|
||||
$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?');
|
||||
$query->execute(array($parent));
|
||||
while($row=$query->fetch()){
|
||||
$result=$query->execute(array($parent));
|
||||
while($row=$result->fetchRow()){
|
||||
$size+=$row['size'];
|
||||
}
|
||||
$mtime=$view->filemtime($path);
|
||||
|
|
@ -330,8 +333,8 @@ class OC_FileCache{
|
|||
}
|
||||
}
|
||||
$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE path=?');
|
||||
$query->execute(array($path));
|
||||
if($row=$query->fetch()){
|
||||
$result=$query->execute(array($path));
|
||||
if($row=$result->fetchRow()){
|
||||
return $row['size'];
|
||||
}else{//file not in cache
|
||||
return 0;
|
||||
|
|
@ -466,6 +469,7 @@ class OC_FileCache{
|
|||
* fine files by mimetype
|
||||
* @param string $part1
|
||||
* @param string $part2 (optional)
|
||||
* @param string root (optional)
|
||||
* @return array of file paths
|
||||
*
|
||||
* $part1 and $part2 together form the complete mimetype.
|
||||
|
|
@ -474,17 +478,24 @@ class OC_FileCache{
|
|||
* seccond mimetype part can be ommited
|
||||
* e.g. searchByMime('audio')
|
||||
*/
|
||||
public static function searchByMime($part1,$part2=''){
|
||||
if($part2){
|
||||
$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimepart=?');
|
||||
$result=$query->execute(array($part1));
|
||||
public static function searchByMime($part1,$part2='',$root=''){
|
||||
if(!$root){
|
||||
$root=OC_Filesystem::getRoot();
|
||||
}elseif($root='/'){
|
||||
$root='';
|
||||
}
|
||||
$rootLen=strlen($root);
|
||||
$user=OC_User::getUser();
|
||||
if(!$part2){
|
||||
$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimepart=? AND user=?');
|
||||
$result=$query->execute(array($part1,$user));
|
||||
}else{
|
||||
$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimetype=?');
|
||||
$result=$query->execute(array($part1.'/'.$part2));
|
||||
$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimetype=? AND user=?');
|
||||
$result=$query->execute(array($part1.'/'.$part2,$user));
|
||||
}
|
||||
$names=array();
|
||||
while($row=$result->fetchRow()){
|
||||
$names[]=$row['path'];
|
||||
$names[]=substr($row['path'],$rootLen);
|
||||
}
|
||||
return $names;
|
||||
}
|
||||
|
|
@ -509,8 +520,8 @@ class OC_FileCache{
|
|||
$isDir=$view->is_dir($path);
|
||||
$path=$root.$path;
|
||||
$query=OC_DB::prepare('SELECT mtime FROM *PREFIX*fscache WHERE path=?');
|
||||
$query->execute(array($path));
|
||||
if($row=$query->fetch()){
|
||||
$result=$query->execute(array($path));
|
||||
if($row=$result->fetchRow()){
|
||||
$cachedMTime=$row['mtime'];
|
||||
return ($mtime>$cachedMTime);
|
||||
}else{//file not in cache, so it has to be updated
|
||||
|
|
@ -549,7 +560,7 @@ class OC_FileCache{
|
|||
$parent=self::getFileId($view->getRoot().$path);
|
||||
$query=OC_DB::prepare('SELECT name FROM *PREFIX*fscache WHERE parent=?');
|
||||
$result=$query->execute(array($parent));
|
||||
while($row=$result->fetch()){
|
||||
while($row=$result->fetchRow()){
|
||||
$file=$path.'/'.$row['name'];
|
||||
if(!$view->file_exists($file)){
|
||||
if(!$root){//filesystem hooks are only valid for the default root
|
||||
|
|
|
|||
|
|
@ -65,6 +65,13 @@ class OC_Filestorage_Local extends OC_Filestorage{
|
|||
public function filemtime($path){
|
||||
return filemtime($this->datadir.$path);
|
||||
}
|
||||
|
||||
public function setFileMtime($path, $mtime){
|
||||
// sets the modification time of the file to the given value. If mtime is nil the current time is set.
|
||||
// note that the access time of the file always changes to the current time.
|
||||
return touch($this->datadir.$path, $mtime);
|
||||
}
|
||||
|
||||
public function file_get_contents($path){
|
||||
return file_get_contents($this->datadir.$path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -345,6 +345,9 @@ class OC_Filesystem{
|
|||
static public function filemtime($path){
|
||||
return self::$defaultInstance->filemtime($path);
|
||||
}
|
||||
static public function setFileMtime($path, $mtime){
|
||||
return self::$defaultInstance->setFileMtime($path, $mtime);
|
||||
}
|
||||
static public function file_get_contents($path){
|
||||
return self::$defaultInstance->file_get_contents($path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -156,6 +156,9 @@ class OC_FilesystemView {
|
|||
public function filemtime($path){
|
||||
return $this->basicOperation('filemtime',$path);
|
||||
}
|
||||
public function setFileMtime($path, $mtime){
|
||||
return $this->basicOperation('setFileMtime',$path, array('write'), $mtime);
|
||||
}
|
||||
public function file_get_contents($path){
|
||||
return $this->basicOperation('file_get_contents',$path,array('read'));
|
||||
}
|
||||
|
|
|
|||
221
lib/image.php
221
lib/image.php
|
|
@ -44,34 +44,24 @@ function ellipsis($str, $maxlen) {
|
|||
*
|
||||
*/
|
||||
class OC_Image {
|
||||
static private $resource = false; // tmp resource.
|
||||
static private $destroy = false; // if the resource is created withing the object.
|
||||
static private $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
|
||||
static private $filepath = null;
|
||||
protected $resource = false; // tmp resource.
|
||||
protected $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
|
||||
protected $filepath = null;
|
||||
|
||||
/**
|
||||
* @brief Constructor.
|
||||
* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
|
||||
* If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
|
||||
* @returns bool False on error
|
||||
*/
|
||||
function __construct($imageref = null) {
|
||||
//OC_Log::write('core','OC_Image::__construct, start', OC_Log::DEBUG);
|
||||
public function __construct($imageref = null) {
|
||||
//OC_Log::write('core',__METHOD__.'(): start', OC_Log::DEBUG);
|
||||
if(!extension_loaded('gd') || !function_exists('gd_info')) {
|
||||
//if(!function_exists('imagecreatefromjpeg')) {
|
||||
OC_Log::write('core','OC_Image::__construct, GD module not installed', OC_Log::ERROR);
|
||||
OC_Log::write('core',__METHOD__.'(): GD module not installed', OC_Log::ERROR);
|
||||
return false;
|
||||
}
|
||||
if(!is_null($imageref)) {
|
||||
self::load($imageref);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Destructor.
|
||||
*/
|
||||
function __destruct() {
|
||||
if(is_resource(self::$resource) && self::$destroy) {
|
||||
imagedestroy(self::$resource); // Why does this issue a warning.
|
||||
$this->load($imageref);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -80,8 +70,7 @@ class OC_Image {
|
|||
* @returns bool
|
||||
*/
|
||||
public function valid() { // apparently you can't name a method 'empty'...
|
||||
$ret = is_resource(self::$resource);
|
||||
return $ret;
|
||||
return is_resource($this->resource);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -89,7 +78,7 @@ class OC_Image {
|
|||
* @returns int
|
||||
*/
|
||||
public function mimeType() {
|
||||
return is_resource(self::$resource) ? image_type_to_mime_type(self::$imagetype) : '';
|
||||
return is_resource($this->resource) ? image_type_to_mime_type($this->imagetype) : '';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -97,7 +86,7 @@ class OC_Image {
|
|||
* @returns int
|
||||
*/
|
||||
public function width() {
|
||||
return is_resource(self::$resource) ? imagesx(self::$resource) : -1;
|
||||
return is_resource($this->resource) ? imagesx($this->resource) : -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +94,7 @@ class OC_Image {
|
|||
* @returns int
|
||||
*/
|
||||
public function height() {
|
||||
return is_resource(self::$resource) ? imagesy(self::$resource) : -1;
|
||||
return is_resource($this->resource) ? imagesy($this->resource) : -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -122,8 +111,8 @@ class OC_Image {
|
|||
*/
|
||||
|
||||
public function save($filepath=null) {
|
||||
if($filepath === null && self::$filepath === null) {
|
||||
OC_Log::write('core','OC_Image::save. save() called with no path.', OC_Log::ERROR);
|
||||
if($filepath === null && $this->filepath === null) {
|
||||
OC_Log::write('core',__METHOD__.'(): called with no path.', OC_Log::ERROR);
|
||||
return false;
|
||||
} elseif($filepath === null && $this->filepath !== null) {
|
||||
$filepath = $this->filepath;
|
||||
|
|
@ -136,37 +125,41 @@ class OC_Image {
|
|||
*/
|
||||
private function _output($filepath=null, $really=false) {
|
||||
if($really === false) {
|
||||
header('Content-Type: '.self::mimeType());
|
||||
header('Content-Type: '.$this->mimeType());
|
||||
$filepath = null; // Just being cautious ;-)
|
||||
} else {
|
||||
if(!is_writable(dirname($filepath))) {
|
||||
OC_Log::write('core','OC_Image::_output. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
|
||||
OC_Log::write('core',__METHOD__.'(): Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
|
||||
return false;
|
||||
} elseif(is_writable(dirname($filepath)) && file_exists($filepath) && !is_writable($filepath)) {
|
||||
OC_Log::write('core','OC_Image::_output. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
|
||||
OC_Log::write('core',__METHOD__.'(): File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (!$this->valid()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$retval = false;
|
||||
switch(self::$imagetype) {
|
||||
switch($this->imagetype) {
|
||||
case IMAGETYPE_GIF:
|
||||
$retval = imagegif(self::$resource, $filepath);
|
||||
$retval = imagegif($this->resource, $filepath);
|
||||
break;
|
||||
case IMAGETYPE_JPEG:
|
||||
$retval = imagejpeg(self::$resource, $filepath);
|
||||
$retval = imagejpeg($this->resource, $filepath);
|
||||
break;
|
||||
case IMAGETYPE_PNG:
|
||||
$retval = imagepng(self::$resource, $filepath);
|
||||
$retval = imagepng($this->resource, $filepath);
|
||||
break;
|
||||
case IMAGETYPE_XBM:
|
||||
$retval = imagexbm(self::$resource, $filepath);
|
||||
$retval = imagexbm($this->resource, $filepath);
|
||||
break;
|
||||
case IMAGETYPE_WBMP:
|
||||
case IMAGETYPE_BMP:
|
||||
$retval = imagewbmp(self::$resource, $filepath);
|
||||
$retval = imagewbmp($this->resource, $filepath);
|
||||
break;
|
||||
default:
|
||||
$retval = imagepng(self::$resource, $filepath);
|
||||
$retval = imagepng($this->resource, $filepath);
|
||||
}
|
||||
return $retval;
|
||||
}
|
||||
|
|
@ -175,14 +168,14 @@ class OC_Image {
|
|||
* @brief Prints the image when called as $image().
|
||||
*/
|
||||
public function __invoke() {
|
||||
return self::show();
|
||||
return $this->show();
|
||||
}
|
||||
|
||||
/**
|
||||
* @returns Returns the image resource in any.
|
||||
*/
|
||||
public function resource() {
|
||||
return self::$resource;
|
||||
return $this->resource;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -190,9 +183,9 @@ class OC_Image {
|
|||
*/
|
||||
function __toString() {
|
||||
ob_start();
|
||||
$res = imagepng(self::$resource);
|
||||
$res = imagepng($this->resource);
|
||||
if (!$res) {
|
||||
OC_Log::write('core','OC_Image::_string. Error writing image',OC_Log::ERROR);
|
||||
OC_Log::write('core','OC_Image->__toString. Error writing image',OC_Log::ERROR);
|
||||
}
|
||||
return base64_encode(ob_get_clean());
|
||||
}
|
||||
|
|
@ -204,18 +197,18 @@ class OC_Image {
|
|||
*/
|
||||
public function fixOrientation() {
|
||||
if(!is_callable('exif_read_data')){
|
||||
OC_Log::write('core','OC_Image::fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
if(!is_resource(self::$resource)) {
|
||||
OC_Log::write('core','OC_Image::fixOrientation() No image loaded.', OC_Log::DEBUG);
|
||||
if(!is_resource($this->resource)) {
|
||||
OC_Log::write('core','OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
if(is_null(self::$filepath) || !is_readable(self::$filepath)) {
|
||||
OC_Log::write('core','OC_Image::fixOrientation() No readable file path set.', OC_Log::DEBUG);
|
||||
if(is_null($this->filepath) || !is_readable($this->filepath)) {
|
||||
OC_Log::write('core','OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
$exif = exif_read_data(self::$filepath, 'IFD0');
|
||||
$exif = exif_read_data($this->filepath, 'IFD0');
|
||||
if(!$exif) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -223,7 +216,7 @@ class OC_Image {
|
|||
return true; // Nothing to fix
|
||||
}
|
||||
$o = $exif['Orientation'];
|
||||
OC_Log::write('core','OC_Image::fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
|
||||
$rotate = 0;
|
||||
$flip = false;
|
||||
switch($o) {
|
||||
|
|
@ -257,27 +250,27 @@ class OC_Image {
|
|||
$flip = true;
|
||||
break;
|
||||
case 8:
|
||||
$rotate = 270;
|
||||
$rotate = 90;
|
||||
$flip = false;
|
||||
break;
|
||||
}
|
||||
if($rotate) {
|
||||
$res = imagerotate(self::$resource, $rotate, -1);
|
||||
$res = imagerotate($this->resource, $rotate, -1);
|
||||
if($res) {
|
||||
if(imagealphablending($res, true)) {
|
||||
if(imagesavealpha($res, true)) {
|
||||
self::$resource = $res;
|
||||
$this->resource = $res;
|
||||
return true;
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::fixOrientation() Error during alphasaving.', OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->fixOrientation() Error during alphasaving.', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::fixOrientation() Error during alphablending.', OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->fixOrientation() Error during alphablending.', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::fixOrientation() Error during oriention fixing.', OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->fixOrientation() Error during oriention fixing.', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -286,20 +279,19 @@ class OC_Image {
|
|||
/**
|
||||
* @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
|
||||
* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
|
||||
* If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
|
||||
* @returns An image resource or false on error
|
||||
*/
|
||||
public function load($imageref) {
|
||||
if(self::loadFromFile($imageref) !== false) {
|
||||
return self::$resource;
|
||||
} elseif(self::loadFromBase64($imageref) !== false) {
|
||||
return self::$resource;
|
||||
} elseif(self::loadFromData($imageref) !== false) {
|
||||
return self::$resource;
|
||||
} elseif(self::loadFromResource($imageref) !== false) {
|
||||
return self::$resource;
|
||||
if($this->loadFromFile($imageref) !== false) {
|
||||
return $this->resource;
|
||||
} elseif($this->loadFromBase64($imageref) !== false) {
|
||||
return $this->resource;
|
||||
} elseif($this->loadFromData($imageref) !== false) {
|
||||
return $this->resource;
|
||||
} elseif($this->loadFromResource($imageref) !== false) {
|
||||
return $this->resource;
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::load, couldn\'t load anything. Giving up!', OC_Log::DEBUG);
|
||||
OC_Log::write('core',__METHOD__.'(): couldn\'t load anything. Giving up!', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -312,45 +304,45 @@ class OC_Image {
|
|||
public function loadFromFile($imagepath=false) {
|
||||
if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
|
||||
// Debug output disabled because this method is tried before loadFromBase64?
|
||||
OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load: '.ellipsis($imagepath, 50), OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->loadFromFile, couldn\'t load: '.ellipsis($imagepath, 50), OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
$itype = exif_imagetype($imagepath);
|
||||
switch($itype) {
|
||||
case IMAGETYPE_GIF:
|
||||
if (imagetypes() & IMG_GIF) {
|
||||
self::$resource = imagecreatefromgif($imagepath);
|
||||
$this->resource = imagecreatefromgif($imagepath);
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::loadFromFile, GIF images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->loadFromFile, GIF images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
}
|
||||
break;
|
||||
case IMAGETYPE_JPEG:
|
||||
if (imagetypes() & IMG_JPG) {
|
||||
self::$resource = imagecreatefromjpeg($imagepath);
|
||||
$this->resource = imagecreatefromjpeg($imagepath);
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::loadFromFile, JPG images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->loadFromFile, JPG images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
}
|
||||
break;
|
||||
case IMAGETYPE_PNG:
|
||||
if (imagetypes() & IMG_PNG) {
|
||||
self::$resource = imagecreatefrompng($imagepath);
|
||||
$this->resource = imagecreatefrompng($imagepath);
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::loadFromFile, PNG images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->loadFromFile, PNG images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
}
|
||||
break;
|
||||
case IMAGETYPE_XBM:
|
||||
if (imagetypes() & IMG_XPM) {
|
||||
self::$resource = imagecreatefromxbm($imagepath);
|
||||
$this->resource = imagecreatefromxbm($imagepath);
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::loadFromFile, XBM/XPM images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
}
|
||||
break;
|
||||
case IMAGETYPE_WBMP:
|
||||
case IMAGETYPE_BMP:
|
||||
if (imagetypes() & IMG_WBMP) {
|
||||
self::$resource = imagecreatefromwbmp($imagepath);
|
||||
$this->resource = imagecreatefromwbmp($imagepath);
|
||||
} else {
|
||||
OC_Log::write('core','OC_Image::loadFromFile, (W)BMP images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->loadFromFile, (W)BMP images not supported: '.$imagepath, OC_Log::DEBUG);
|
||||
}
|
||||
break;
|
||||
/*
|
||||
|
|
@ -378,17 +370,16 @@ class OC_Image {
|
|||
break;
|
||||
*/
|
||||
default:
|
||||
self::$resource = imagecreatefromstring(file_get_contents($imagepath));
|
||||
$this->resource = imagecreatefromstring(file_get_contents($imagepath));
|
||||
$itype = IMAGETYPE_PNG;
|
||||
OC_Log::write('core','OC_Image::loadFromFile, Default', OC_Log::DEBUG);
|
||||
OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
|
||||
break;
|
||||
}
|
||||
if($this->valid()) {
|
||||
self::$imagetype = $itype;
|
||||
self::$filepath = $imagepath;
|
||||
self::$destroy = true;
|
||||
$this->imagetype = $itype;
|
||||
$this->filepath = $imagepath;
|
||||
}
|
||||
return self::$resource;
|
||||
return $this->resource;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -400,13 +391,12 @@ class OC_Image {
|
|||
if(is_resource($str)) {
|
||||
return false;
|
||||
}
|
||||
self::$resource = imagecreatefromstring($str);
|
||||
if(!self::$resource) {
|
||||
OC_Log::write('core','OC_Image::loadFromData, couldn\'t load', OC_Log::DEBUG);
|
||||
$this->resource = imagecreatefromstring($str);
|
||||
if(!$this->resource) {
|
||||
OC_Log::write('core','OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
self::$destroy = true;
|
||||
return self::$resource;
|
||||
return $this->resource;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -420,20 +410,19 @@ class OC_Image {
|
|||
}
|
||||
$data = base64_decode($str);
|
||||
if($data) { // try to load from string data
|
||||
self::$resource = imagecreatefromstring($data);
|
||||
if(!self::$resource) {
|
||||
OC_Log::write('core','OC_Image::loadFromBase64, couldn\'t load', OC_Log::DEBUG);
|
||||
$this->resource = imagecreatefromstring($data);
|
||||
if(!$this->resource) {
|
||||
OC_Log::write('core','OC_Image->loadFromBase64, couldn\'t load', OC_Log::DEBUG);
|
||||
return false;
|
||||
}
|
||||
self::$destroy = true;
|
||||
return self::$resource;
|
||||
return $this->resource;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Checks if image resource is valid and assigns it to self::$resource.
|
||||
* @brief Checks if image resource is valid and assigns it to $this->resource.
|
||||
* @param $res An image resource.
|
||||
* @returns An image resource or false on error
|
||||
*/
|
||||
|
|
@ -441,7 +430,7 @@ class OC_Image {
|
|||
if(!is_resource($res)) {
|
||||
return false;
|
||||
}
|
||||
self::$resource = $res;
|
||||
$this->resource = $res;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -450,12 +439,12 @@ class OC_Image {
|
|||
* @returns bool
|
||||
*/
|
||||
public function resize($maxsize) {
|
||||
if(!self::$resource) {
|
||||
OC_Log::write('core','OC_Image::resize, No image loaded', OC_Log::ERROR);
|
||||
if(!$this->resource) {
|
||||
OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
|
||||
return false;
|
||||
}
|
||||
$width_orig=imageSX(self::$resource);
|
||||
$height_orig=imageSY(self::$resource);
|
||||
$width_orig=imageSX($this->resource);
|
||||
$height_orig=imageSY($this->resource);
|
||||
$ratio_orig = $width_orig/$height_orig;
|
||||
|
||||
if ($ratio_orig > 1) {
|
||||
|
|
@ -468,18 +457,18 @@ class OC_Image {
|
|||
|
||||
$process = imagecreatetruecolor(round($new_width), round($new_height));
|
||||
if ($process == false) {
|
||||
OC_Log::write('core','OC_Image::resize. Error creating true color image',OC_Log::ERROR);
|
||||
OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
|
||||
imagedestroy($process);
|
||||
return false;
|
||||
}
|
||||
|
||||
imagecopyresampled($process, self::$resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
|
||||
imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
|
||||
if ($process == false) {
|
||||
OC_Log::write('core','OC_Image::resize. Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
|
||||
OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
|
||||
imagedestroy($process);
|
||||
return false;
|
||||
}
|
||||
self::$resource = $process;
|
||||
$this->resource = $process;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -488,12 +477,12 @@ class OC_Image {
|
|||
* @returns bool for success or failure
|
||||
*/
|
||||
public function centerCrop() {
|
||||
if(!self::$resource) {
|
||||
OC_Log::write('core','OC_Image::centerCrop, No image loaded', OC_Log::ERROR);
|
||||
if(!$this->resource) {
|
||||
OC_Log::write('core','OC_Image->centerCrop, No image loaded', OC_Log::ERROR);
|
||||
return false;
|
||||
}
|
||||
$width_orig=imageSX(self::$resource);
|
||||
$height_orig=imageSY(self::$resource);
|
||||
$width_orig=imageSX($this->resource);
|
||||
$height_orig=imageSY($this->resource);
|
||||
if($width_orig === $height_orig) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -509,17 +498,17 @@ class OC_Image {
|
|||
}
|
||||
$process = imagecreatetruecolor($width, $height);
|
||||
if ($process == false) {
|
||||
OC_Log::write('core','OC_Image::centerCrop. Error creating true color image',OC_Log::ERROR);
|
||||
OC_Log::write('core','OC_Image->centerCrop. Error creating true color image',OC_Log::ERROR);
|
||||
imagedestroy($process);
|
||||
return false;
|
||||
}
|
||||
imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $width, $height, $width, $height);
|
||||
imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $width, $height, $width, $height);
|
||||
if ($process == false) {
|
||||
OC_Log::write('core','OC_Image::centerCrop. Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
|
||||
OC_Log::write('core','OC_Image->centerCrop. Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
|
||||
imagedestroy($process);
|
||||
return false;
|
||||
}
|
||||
self::$resource = $process;
|
||||
$this->resource = $process;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -532,26 +521,26 @@ class OC_Image {
|
|||
* @returns bool for success or failure
|
||||
*/
|
||||
public function crop($x, $y, $w, $h) {
|
||||
if(!self::$resource) {
|
||||
OC_Log::write('core','OC_Image::crop, No image loaded', OC_Log::ERROR);
|
||||
if(!$this->resource) {
|
||||
OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
|
||||
return false;
|
||||
}
|
||||
$width_orig=imageSX(self::$resource);
|
||||
$height_orig=imageSY(self::$resource);
|
||||
//OC_Log::write('core','OC_Image::crop. Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
|
||||
$width_orig=imageSX($this->resource);
|
||||
$height_orig=imageSY($this->resource);
|
||||
//OC_Log::write('core',__METHOD__.'(): Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
|
||||
$process = imagecreatetruecolor($w, $h);
|
||||
if ($process == false) {
|
||||
OC_Log::write('core','OC_Image::crop. Error creating true color image',OC_Log::ERROR);
|
||||
OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
|
||||
imagedestroy($process);
|
||||
return false;
|
||||
}
|
||||
imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $w, $h, $w, $h);
|
||||
imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
|
||||
if ($process == false) {
|
||||
OC_Log::write('core','OC_Image::crop. Error resampling process image '.$w.'x'.$h,OC_Log::ERROR);
|
||||
OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$w.'x'.$h,OC_Log::ERROR);
|
||||
imagedestroy($process);
|
||||
return false;
|
||||
}
|
||||
self::$resource = $process;
|
||||
$this->resource = $process;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ class OC_Util {
|
|||
/**
|
||||
* @brief Add a custom element to the header
|
||||
* @param string tag tag name of the element
|
||||
* @param array $attributes array of attrobutes for the element
|
||||
* @param array $attributes array of attributes for the element
|
||||
* @param string $text the text content for the element
|
||||
*/
|
||||
public static function addHeader( $tag, $attributes, $text=''){
|
||||
|
|
|
|||
Loading…
Reference in New Issue