to import contacts."); ?> (Max. ) @@ -36,5 +36,7 @@ if(OCP\App::isEnabled('files_encryption')) { \ No newline at end of file diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php index ff0cb44022c..4fc9eba992d 100644 --- a/apps/gallery/ajax/thumbnail.php +++ b/apps/gallery/ajax/thumbnail.php @@ -20,14 +20,15 @@ * License along with this library. If not, see
';
+
+ for ($i = 0; $i < count($this->tiles_array); $i++) {
+ $img_w = $this->tiles_array[$i]->getWidth();
+ $extra = '';
+ if ($img_w != IMAGE_WIDTH) $extra = ' style="width:'.$img_w.'px"';
+ $r .= '
';
+ return $r;
+ }
+
+ private $tiles_array;
+ private $available_space;
+}
+
+class TileSingle extends TileBase {
+
+ public function __construct($path) {
+ \OC_Log::write(TAG, 'Loading file from path '.$path, \OC_Log::DEBUG);
+ $this->file_path = $path;
+/* $this->image = new \OC_Image();
+ if (!$this->image->loadFromFile($this->file_path)) {
+ \OC_Log::write(TAG, 'Loading file filed', \OC_Log::ERROR);
+ return;
+ }
+ $this->image->fixOrientation();*/
+ }
+
+ public function getWidth() {
+ $a = ThumbnailsManager::getInstance()->getThumbnailInfo($this->file_path);
+ return $a['width'];
+ }
+
+ public function get($extra = '') {
+ // !HACK! file path needs to be encoded twice because files app decode twice url, so any special chars like + or & in filename
+ // !HACK! will result in failing of opening them
+ return ''.$this->tiles_array[$i]->get().'
';
+ }
+
+ $r .= ''.$this->stack_name.'
';
+ for ($i = 0; $i < count($this->tiles_array); $i++) {
+ $top = rand(-5, 5);
+ $left = rand(-5, 5);
+ $img_w = $this->tiles_array[$i]->getWidth();
+ $extra = '';
+ if ($img_w < IMAGE_WIDTH) {
+ $extra = 'width:'.$img_w.'px;';
+ }
+ $r .= '';
+ }
+ return $r;
+ }
+
+ public function getOnHoverAction() {
+ return 'javascript:t(this);return false;';
+ }
+
+ public function getOnOutAction() {
+ return 'javascript:o(this);return false;';
+ }
+
+ public function getCount() {
+ return count($this->tiles_array);
+ }
+
+ public function getOnClickAction() {
+ return 'javascript:openNewGal(\''.$this->stack_name.'\');';
+ }
+
+ private $tiles_array;
+ private $stack_name;
+}
+
+?>
diff --git a/apps/gallery/lib/tiles_test.php b/apps/gallery/lib/tiles_test.php
new file mode 100644
index 00000000000..022a88f75cc
--- /dev/null
+++ b/apps/gallery/lib/tiles_test.php
@@ -0,0 +1,87 @@
+
+
+
+
+
+addTile(new \OC\Pictures\TileSingle($images[$i]));
+ continue;
+ }
+ if (strcmp($prev_dir_arr[0], $dir_arr[0])!=0) {
+ $tl->addTile(new \OC\Pictures\TileStack($arr, $prev_dir_arr[0]));
+ $arr = array();
+ }
+ $arr[] = $root.$images[$i];
+ $previous_element = $images[$i];
+}
+
+$dir_arr = explode('/', $previous_element);
+
+if (count($dir_arr)==0) {
+ $tl->addTile(new \OC\Pictures\TileSingle($previous_element));
+} else if (count($dir_arr) && $ts->getCount() == 0){
+ $ts = new \OC\Pictures\TileStack(array($previous_element), $dir_arr[0]);
+} else {
+ $arr[] = $previous_element;
+ $ts->addTile($arr);
+}
+
+if ($ts->getCount() != 0) {
+ $tl->addTile($ts);
+}
+
+echo $tl->get();
+
+?>
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 99af3bda0a3..39e3bbf47b3 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -1,31 +1,105 @@
-
-
-
-
-
-
-
-
-
-
-
-
-; ?>)
-
-
+
+
+
+addTile(new \OC\Pictures\TileSingle($root.$images[$i]));
+ continue;
+ }
+ if (strcmp($prev_dir_arr[0], $dir_arr[0])!=0) {
+ $tl->addTile(new \OC\Pictures\TileStack($arr, $prev_dir_arr[0]));
+ $arr = array();
+ }
+ $arr[] = $root.$images[$i];
+ $previous_element = $images[$i];
+}
+
+$dir_arr = explode('/', $previous_element);
+
+if (count($images)>1) {
+ if (count($dir_arr)==0) {
+ $tl->addTile(new \OC\Pictures\TileSingle($previous_element));
+ } else if (count($dir_arr) && $ts->getCount() == 0){
+ $ts = new \OC\Pictures\TileStack(array($root.$previous_element), $dir_arr[0]);
+ } else {
+ $arr[] = $previous_element;
+ $ts->addTile($arr);
+ }
+}
+
+if ($ts->getCount() != 0) {
+ $tl->addTile($ts);
+}
+
+echo $tl->get();
+
+?>
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index baca1d32bad..62e7c8ca6bc 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -27,6 +27,11 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
protected $ldapGroupMemberAssocAttr;
protected $configured = false;
+ protected $_group_user = array();
+ protected $_user_groups = array();
+ protected $_group_users = array();
+ protected $_groups = array();
+
public function __construct() {
$this->ldapGroupFilter = OCP\Config::getAppValue('user_ldap', 'ldap_group_filter', '(objectClass=posixGroup)');
$this->ldapGroupMemberAssocAttr = OCP\Config::getAppValue('user_ldap', 'ldap_group_member_assoc_attribute', 'uniqueMember');
@@ -48,6 +53,9 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
if(!$this->configured) {
return false;
}
+ if(isset($this->_group_user[$gid][$uid])) {
+ return $this->_group_user[$gid][$uid];
+ }
$dn_user = OC_LDAP::username2dn($uid);
$dn_group = OC_LDAP::groupname2dn($gid);
// just in case
@@ -64,8 +72,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
//TODO: this can be done with one LDAP query
if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') {
$dns = array();
- foreach($members as $uid) {
- $filter = str_replace('%uid', $uid, OC_LDAP::conf('ldapLoginFilter'));
+ foreach($members as $mid) {
+ $filter = str_replace('%uid', $mid, OC_LDAP::conf('ldapLoginFilter'));
$ldap_users = OC_LDAP::fetchListOfUsers($filter, 'dn');
if(count($ldap_users) < 1) {
continue;
@@ -75,7 +83,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
$members = $dns;
}
- return in_array($dn_user, $members);
+ $this->_group_user[$gid][$uid] = in_array($dn_user, $members);
+ return $this->_group_user[$gid][$uid];
}
/**
@@ -90,8 +99,12 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
if(!$this->configured) {
return array();
}
+ if(isset($this->_user_groups[$uid])) {
+ return $this->_user_groups[$uid];
+ }
$userDN = OC_LDAP::username2dn($uid);
if(!$userDN) {
+ $this->_user_groups[$uid] = array();
return array();
}
@@ -112,9 +125,9 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
$this->ldapGroupMemberAssocAttr.'='.$uid
));
$groups = OC_LDAP::fetchListOfGroups($filter, array(OC_LDAP::conf('ldapGroupDisplayName'),'dn'));
- $userGroups = OC_LDAP::ownCloudGroupNames($groups);
+ $this->_user_groups[$uid] = array_unique(OC_LDAP::ownCloudGroupNames($groups), SORT_LOCALE_STRING);
- return array_unique($userGroups, SORT_LOCALE_STRING);
+ return $this->_user_groups[$uid];
}
/**
@@ -125,14 +138,19 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
if(!$this->configured) {
return array();
}
+ if(isset($this->_group_users[$gid])) {
+ return $this->_group_users[$gid];
+ }
$groupDN = OC_LDAP::groupname2dn($gid);
if(!$groupDN) {
+ $this->_group_users[$gid] = array();
return array();
}
$members = OC_LDAP::readAttribute($groupDN, $this->ldapGroupMemberAssocAttr);
if(!$members) {
+ $this->_group_users[$gid] = array();
return array();
}
@@ -154,7 +172,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
if(!$isMemberUid) {
$result = array_intersect($result, OCP\User::getUsers());
}
- return array_unique($result, SORT_LOCALE_STRING);
+ $this->_group_users[$gid] = array_unique($result, SORT_LOCALE_STRING);
+ return $this->_group_users[$gid];
}
/**
@@ -167,10 +186,11 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
if(!$this->configured) {
return array();
}
-
- $ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
- $groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
- return $groups;
+ if(is_null($this->_groups)) {
+ $ldap_groups = OC_LDAP::fetchListOfGroups($this->ldapGroupFilter, array(OC_LDAP::conf('ldapGroupDisplayName'), 'dn'));
+ $this->_groups = OC_LDAP::ownCloudGroupNames($ldap_groups);
+ }
+ return $this->groups;
}
/**
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index f6942ad326e..22d464b65a2 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -52,6 +52,8 @@ class OC_LDAP {
static protected $ldapGroupDisplayName;
static protected $ldapLoginFilter;
+ static protected $__d;
+
/**
* @brief initializes the LDAP backend
* @param $force read the config settings no matter what
@@ -59,6 +61,9 @@ class OC_LDAP {
* initializes the LDAP backend
*/
static public function init($force = false) {
+ if(is_null(self::$__d)) {
+ self::$__d = new OC_LDAP_DESTRUCTOR();
+ }
self::readConfiguration($force);
self::establishConnection();
}
@@ -258,7 +263,7 @@ class OC_LDAP {
$key = self::recursiveArraySearch($knownObjects, $ldapObject['dn']);
//everything is fine when we know the group
- if($key) {
+ if($key !== false) {
$ownCloudNames[] = $knownObjects[$key]['owncloud_name'];
continue;
}
@@ -329,30 +334,6 @@ class OC_LDAP {
return $query->execute()->fetchAll();
}
- /**
- * @brief inserts a new group into the mappings table
- * @param $dn the record in question
- * @param $ocname the name to use in ownCloud
- * @returns true on success, false otherwise
- *
- * inserts a new group into the mappings table
- */
- static private function mapGroup($dn, $ocname) {
- return self::mapComponent($dn, $ocname, false);
- }
-
- /**
- * @brief inserts a new user into the mappings table
- * @param $dn the record in question
- * @param $ocname the name to use in ownCloud
- * @returns true on success, false otherwise
- *
- * inserts a new user into the mappings table
- */
- static private function mapUser($dn, $ocname) {
- return self::mapComponent($dn, $ocname, true);
- }
-
/**
* @brief inserts a new user or group into the mappings table
* @param $dn the record in question
@@ -380,12 +361,22 @@ class OC_LDAP {
SELECT 1
FROM '.$table.'
WHERE ldap_dn = ?
- AND owncloud_name = ? )
+ OR owncloud_name = ? )
');
$res = $insert->execute(array($dn, $ocname, $dn, $ocname));
- return !OCP\DB::isError($res);
+ if(OCP\DB::isError($res)) {
+ return false;
+ }
+
+ $insRows = $res->numRows();
+
+ if($insRows == 0) {
+ return false;
+ }
+
+ return true;
}
static public function fetchListOfUsers($filter, $attr) {
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index ba66c7a9ca8..9281aebe81d 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -34,6 +34,9 @@ class OC_USER_LDAP extends OC_User_Backend {
// will be retrieved from LDAP server
protected $ldap_dc = false;
+ // cache getUsers()
+ protected $_users = null;
+
public function __construct() {
$this->ldapUserFilter = OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter', '(objectClass=posixAccount)');
$this->ldapQuotaAttribute = OCP\Config::getAppValue('user_ldap', 'ldap_quota_attr', '');
@@ -108,9 +111,11 @@ class OC_USER_LDAP extends OC_User_Backend {
* Get a list of all users.
*/
public function getUsers(){
- $ldap_users = OC_LDAP::fetchListOfUsers($this->ldapUserFilter, array(OC_LDAP::conf('ldapUserDisplayName'), 'dn'));
- $users = OC_LDAP::ownCloudUserNames($ldap_users);
- return $users;
+ if(is_null($this->_users)) {
+ $ldap_users = OC_LDAP::fetchListOfUsers($this->ldapUserFilter, array(OC_LDAP::conf('ldapUserDisplayName'), 'dn'));
+ $this->_users = OC_LDAP::ownCloudUserNames($ldap_users);
+ }
+ return $this->_users;
}
/**
@@ -119,7 +124,7 @@ class OC_USER_LDAP extends OC_User_Backend {
* @return boolean
*/
public function userExists($uid){
- return in_array($uid, self::getUsers());
+ return in_array($uid, $this->getUsers());
}
}
diff --git a/apps/user_migrate/js/export.js b/apps/user_migrate/js/export.js
index 2d660b2de6b..aef45c45a7b 100644
--- a/apps/user_migrate/js/export.js
+++ b/apps/user_migrate/js/export.js
@@ -9,7 +9,7 @@ $(document).ready(function(){
function(result){
if(result.status == 'success'){
// Download the file
- window.location = OC.filePath('user_migrate','ajax','export.php?operation=download') ;
+ window.location = OC.linkTo('user_migrate','ajax/export.php') + '?operation=download';
$('.loading').hide();
$('#exportbtn').val(t('user_migrate', 'Export'));
} else {
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index f1d90eaeffe..6bed7bdd93f 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -23,7 +23,6 @@ if (isset($_POST['user'])) {
$msg = $tmpl->fetchPage();
$l = OC_L10N::get('core');
$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
- $r=mail($email, $l->t('Owncloud password reset'), $msg, 'From:' . $from);
OC_MAIL::send($email,$_POST['user'],$l->t('ownCloud password reset'),$msg,$from,'ownCloud');
echo('sent');
diff --git a/lib/cache.php b/lib/cache.php
index 70f11f35518..55d5b064c41 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -10,7 +10,17 @@ class OC_Cache {
static protected $cache;
static protected function init() {
+ $fast_cache = null;
+ if (!$fast_cache && function_exists('xcache_set')) {
+ $fast_cache = new OC_Cache_XCache();
+ }
+ if (!$fast_cache && function_exists('apc_store')) {
+ $fast_cache = new OC_Cache_APC();
+ }
self::$cache = new OC_Cache_File();
+ if ($fast_cache) {
+ self::$cache = new OC_Cache_Broker($fast_cache, self::$cache);
+ }
}
static public function get($key) {
diff --git a/lib/cache/broker.php b/lib/cache/broker.php
new file mode 100644
index 00000000000..62a7cd96d15
--- /dev/null
+++ b/lib/cache/broker.php
@@ -0,0 +1,55 @@
+
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Cache_Broker {
+ protected $fast_cache;
+ protected $slow_cache;
+
+ public function __construct($fast_cache, $slow_cache) {
+ $this->fast_cache = $fast_cache;
+ $this->slow_cache = $slow_cache;
+ }
+
+ public function get($key) {
+ if ($r = $this->fast_cache->get($key)) {
+ return $r;
+ }
+ return $this->slow_cache->get($key);
+ }
+
+ public function set($key, $value, $ttl=0) {
+ $set_slow = strlen($value) > 8192;
+ if ($set_slow) {
+ if ($this->fast_cache->hasKey($key)) {
+ $this->fast_cache->remove($key);
+ }
+ $this->slow_cache->set($key, $value, $ttl);
+ } else {
+ $this->fast_cache->set($key, $value, $ttl);
+ }
+ }
+
+ public function hasKey($key) {
+ if ($this->fast_cache->hasKey($key)) {
+ return true;
+ }
+ return $this->slow_cache->hasKey($key);
+ }
+
+ public function remove($key) {
+ if ($this->fast_cache->remove($key)) {
+ return true;
+ }
+ return $this->slow_cache->remove($key);
+ }
+
+ public function clear(){
+ $this->fast_cache->clear();
+ $this->slow_cache->clear();
+ }
+}
diff --git a/lib/image.php b/lib/image.php
index a6bb92cea27..af61f9424e9 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -136,6 +136,8 @@ class OC_Image {
*/
private function _output($filepath=null) {
if($filepath) {
+ if (!file_exists(dirname($filepath)))
+ mkdir(dirname($filepath), 0777, true);
if(!is_writable(dirname($filepath))) {
OC_Log::write('core',__METHOD__.'(): Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
return false;
@@ -426,7 +428,7 @@ class OC_Image {
if(is_resource($str)) {
return false;
}
- $this->resource = imagecreatefromstring($str);
+ $this->resource = @imagecreatefromstring($str);
if(!$this->resource) {
OC_Log::write('core','OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG);
return false;
@@ -445,7 +447,7 @@ class OC_Image {
}
$data = base64_decode($str);
if($data) { // try to load from string data
- $this->resource = imagecreatefromstring($data);
+ $this->resource = @imagecreatefromstring($data);
if(!$this->resource) {
OC_Log::write('core','OC_Image->loadFromBase64, couldn\'t load', OC_Log::DEBUG);
return false;
@@ -496,6 +498,32 @@ class OC_Image {
return true;
}
+ public function preciseResize($width, $height) {
+ if (!$this->valid()) {
+ OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
+ return false;
+ }
+ $width_orig=imageSX($this->resource);
+ $height_orig=imageSY($this->resource);
+ $process = imagecreatetruecolor($width, $height);
+
+ if ($process == false) {
+ OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
+ imagedestroy($process);
+ return false;
+ }
+
+ imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
+ if ($process == false) {
+ OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
+ imagedestroy($process);
+ return false;
+ }
+ imagedestroy($this->resource);
+ $this->resource = $process;
+ return true;
+ }
+
/**
* @brief Crops the image to the middle square. If the image is already square it just returns.
* @param int maximum size for the result (optional)
diff --git a/lib/l10n.php b/lib/l10n.php
index 70b32b92984..887652e2b85 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -77,6 +77,10 @@ class OC_L10N{
* language.
*/
public function __construct($app, $lang = null){
+ $this->init($app, $lang);
+ }
+
+ protected function init($app, $lang = null){
// Find the right language
if(is_null($lang)){
$lang = self::findLanguage($app);
diff --git a/settings/templates/help.php b/settings/templates/help.php
index a53ec76d681..cf61207e601 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -26,9 +26,9 @@
"") { echo('
'); } ?>
- '') echo('');?>
-
- '') echo('
'.$l->t('Answer').':
'.$kb['answer'].'
');?> + '') echo('');?> + + '') echo(''.$l->t('Answer').':
'.htmlentities($kb['answer']).'
');?>