aboutsummaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-07-14 08:10:28 -0400
committerCash Costello <cash.costello@gmail.com>2012-07-14 08:10:28 -0400
commit4761adf8eee9feadd77599682ef192b56520d11d (patch)
tree022a921d20ddd26fb226351cadedf9a8dfe9e971 /classes
parent4448f072dc6149a62b602e60e766fd00c2b6af89 (diff)
parentc1da32e6a7e2f4a15a3b2d69cd38a1c0c164a99d (diff)
downloadelgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.gz
elgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.bz2
Pulling in several small fixes from Brett's fork
Diffstat (limited to 'classes')
-rw-r--r--classes/TidypicsAlbum.php15
-rw-r--r--classes/TidypicsImage.php11
2 files changed, 24 insertions, 2 deletions
diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php
index ad1a357de..57bdcf707 100644
--- a/classes/TidypicsAlbum.php
+++ b/classes/TidypicsAlbum.php
@@ -206,8 +206,14 @@ class TidypicsAlbum extends ElggObject {
}
$list = unserialize($listString);
+ // if empty don't need to check the permissions.
+ if (!$list || $list[0] == '') {
+ return array();
+ }
+
// check access levels
$guidsString = implode(',', $list);
+
$options = array(
'wheres' => array("e.guid IN ($guidsString)"),
'order_by' => "FIELD(e.guid, $guidsString)",
@@ -225,8 +231,15 @@ class TidypicsAlbum extends ElggObject {
* @param array $list An indexed array of image guids
*/
public function setImageList($list) {
+ // validate data
+ foreach ($list as $guid) {
+ if (!filter_var($guid, FILTER_VALIDATE_INT)) {
+ return false;
+ }
+ }
+
$listString = serialize($list);
- $this->orderedImages = $listString;
+ return $this->orderedImages = $listString;
}
/**
diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php
index c0b5de723..26a3483a9 100644
--- a/classes/TidypicsImage.php
+++ b/classes/TidypicsImage.php
@@ -90,7 +90,11 @@ class TidypicsImage extends ElggFile {
* @return string
*/
public function getTitle() {
- return $this->title;
+ if ($this->title) {
+ return $this->title;
+ } else {
+ return $this->originalfilename;
+ }
}
/**
@@ -244,6 +248,11 @@ class TidypicsImage extends ElggFile {
trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
throw new Exception(elgg_echo('tidypics:image_pixels'));
}
+
+ // make sure file fits quota
+ if (!tp_upload_check_quota($data['size'], elgg_get_logged_in_user_guid())) {
+ throw new Exception(elgg_echo('tidypics:cannot_upload_exceeds_quota'));
+ }
}
/**