Merge branch '1.8' - after start.php reorganization

actions/admin/plugins/activate.php

@@ -38,7 +38,7 @@
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regenerate as needed
 elgg_invalidate_simplecache();
-elgg_filepath_cache_reset();
+elgg_reset_system_cache();
 
 if (count($activated_guids) === 1) {
 	$url = 'admin/plugins';

actions/admin/plugins/activate_all.php

@@ -28,6 +28,6 @@
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();
-elgg_filepath_cache_reset();
+elgg_reset_system_cache();
 
 forward(REFERER);

actions/admin/plugins/deactivate.php

@@ -37,7 +37,7 @@
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();
-elgg_filepath_cache_reset();
+elgg_reset_system_cache();
 
 if (count($plugin_guids) == 1) {
 	$url = 'admin/plugins';

actions/admin/plugins/deactivate_all.php

@@ -28,6 +28,6 @@
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();
-elgg_filepath_cache_reset();
+elgg_reset_system_cache();
 
 forward(REFERER);

actions/admin/plugins/set_priority.php

@@ -34,6 +34,6 @@
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();
-elgg_filepath_cache_reset();
+elgg_reset_system_cache();
 
 forward(REFERER);

actions/admin/site/flush_cache.php

@@ -4,7 +4,7 @@
  */
 
 elgg_invalidate_simplecache();
-elgg_filepath_cache_reset();
+elgg_reset_system_cache();
 
 system_message(elgg_echo('admin:cache:flushed'));
 forward(REFERER);

actions/admin/site/update_advanced.php

@@ -9,8 +9,7 @@
  * @subpackage Administration.Site
  */
 
-if (datalist_get('default_site')) {
-	$site = get_entity(datalist_get('default_site'));
+if ($site = elgg_get_site_entity()) {
 	if (!($site instanceof ElggSite)) {
 		throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
 	}
@@ -26,10 +25,10 @@
 		elgg_disable_simplecache();
 	}
 
-	if (get_input('viewpath_cache_enabled')) {
-		elgg_enable_filepath_cache();
+	if (get_input('system_cache_enabled')) {
+		elgg_enable_system_cache();
 	} else {
-		elgg_disable_filepath_cache();
+		elgg_disable_system_cache();
 	}
 
 	set_config('default_access', get_input('default_access', ACCESS_PRIVATE), $site->getGUID());

actions/admin/site/update_basic.php

@@ -10,8 +10,7 @@
  * @subpackage Administration.Site
  */
 
-if (datalist_get('default_site')) {
-	$site = get_entity(datalist_get('default_site'));
+if ($site = elgg_get_site_entity()) {
 	if (!($site instanceof ElggSite)) {
 		throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
 	}

actions/avatar/crop.php

@@ -46,7 +46,7 @@
 			$file->delete();
 		}
 
-		system_message(elgg_echo('avatar:resize:fail'));
+		register_error(elgg_echo('avatar:resize:fail'));
 		forward(REFERER);
 	}
 }

actions/profile/fields/add.php

@@ -2,7 +2,6 @@
 /**
  * Elgg profile plugin edit default profile action
  *
- * @package ElggProfile
  */
 
 $label = get_input('label');

actions/profile/fields/delete.php

@@ -2,7 +2,6 @@
 /**
  * Elgg profile plugin edit default profile action removal
  *
- * @package ElggProfile
  */
 
 $id = get_input('id');

actions/profile/fields/reorder.php

@@ -2,11 +2,11 @@
 /**
  * Elgg profile plugin reorder fields
  *
- * @package ElggProfile
  */
 
 $ordering = get_input('fieldorder');
 
 $result = elgg_save_config('profile_custom_fields', $ordering);
 
-exit;
+// called by ajax so we exit
+exit;

documentation/info/config.php

@@ -218,11 +218,11 @@
 $CONFIG->simplecache_enabled;
 
 /**
- * Is view paths cache enabled
+ * Is the system cache enabled
  *
- * @global string $CONFIG->viewpath_cache_enabled
+ * @global string $CONFIG->system_cache_enabled
  */
-$CONFIG->viewpath_cache_enabled;
+$CONFIG->system_cache_enabled;
 
 /**
  * The site description from the current site object.

engine/classes/ElggBatch.php

@@ -3,47 +3,51 @@
  * Efficiently run operations on batches of results for any function
  * that supports an options array.
  *
- * This is usually used with elgg_get_entities() and friends, elgg_get_annotations()
- * and elgg_get_metadata().
+ * This is usually used with elgg_get_entities() and friends,
+ * elgg_get_annotations(), and elgg_get_metadata().
  *
- * If you pass a valid PHP callback, all results will be run through that callback.
- * You can still foreach() through the result set after.  Valid PHP callbacks
- * can be a string, an array, or a closure.
+ * If you pass a valid PHP callback, all results will be run through that
+ * callback. You can still foreach() through the result set after.  Valid
+ * PHP callbacks can be a string, an array, or a closure.
  * {@link http://php.net/manual/en/language.pseudo-types.php}
  *
- * The callback function must accept 3 arguments: an entity, the getter used, and the options used.
+ * The callback function must accept 3 arguments: an entity, the getter
+ * used, and the options used.
  *
- * Results from the callback are stored in callbackResult.
- * If the callback returns only booleans, callbackResults will be the combined
- * result of all calls.
+ * Results from the callback are stored in callbackResult. If the callback
+ * returns only booleans, callbackResults will be the combined result of
+ * all calls.
  *
- * If the callback returns anything else, callbackresult will be an indexed array
- * of whatever the callback returns.  If returning error handling information,
- * you should include enough information to determine which result you're referring
- * to.
+ * If the callback returns anything else, callbackresult will be an indexed
+ * array of whatever the callback returns.  If returning error handling
+ * information, you should include enough information to determine which
+ * result you're referring to.
  *
  * Don't combine returning bools and returning something else.
  *
  * Note that returning false will not stop the foreach.
  *
+ * @warning If your callback or foreach loop deletes or disable entities
+ * you MUST call setIncrementOffset(false) or set that when instantiating.
+ * This forces the offset to stay what it was in the $options array.
+ *
  * @example
  * <code>
+ * // using foreach
  * $batch = new ElggBatch('elgg_get_entities', array());
+ * $batch->setIncrementOffset(false);
  *
  * foreach ($batch as $entity) {
  * 	$entity->disable();
  * }
  *
+ * // using both a callback
  * $callback = function($result, $getter, $options) {
- * 	var_dump("Going to delete annotation id: $result->id");
+ * 	var_dump("Looking at annotation id: $result->id");
  *  return true;
  * }
  *
  * $batch = new ElggBatch('elgg_get_annotations', array('guid' => 2), $callback);
- *
- * foreach ($batch as $annotation) {
- * 	$annotation->delete();
- * }
  * </code>
  *
  * @package    Elgg.Core
@@ -138,6 +142,13 @@ class ElggBatch
 	 */
 	public $callbackResult = null;
 
+	/**
+	 * If false, offset will not be incremented. This is used for callbacks/loops that delete.
+	 *
+	 * @var bool
+	 */
+	private $incrementOffset = true;
+
 	/**
 	 * Batches operations on any elgg_get_*() or compatible function that supports
 	 * an options array.
@@ -156,12 +167,18 @@ class ElggBatch
 	 * @param int    $chunk_size The number of entities to pull in before requesting more.
 	 *                           You have to balance this between running out of memory in PHP
 	 *                           and hitting the db server too often.
+	 * @param bool   $inc_offset Increment the offset on each fetch. This must be false for
+	 *                           callbacks that delete rows. You can set this after the
+	 *                           object is created with {@see ElggBatch::setIncrementOffset()}.
 	 */
-	public function __construct($getter, $options, $callback = null, $chunk_size = 25) {
+	public function __construct($getter, $options, $callback = null, $chunk_size = 25,
+			$inc_offset = true) {
+
 		$this->getter = $getter;
 		$this->options = $options;
 		$this->callback = $callback;
 		$this->chunkSize = $chunk_size;
+		$this->setIncrementOffset($inc_offset);
 
 		if ($this->chunkSize <= 0) {
 			$this->chunkSize = 25;
@@ -174,7 +191,7 @@ public function __construct($getter, $options, $callback = null, $chunk_size = 2
 		// if passed a callback, create a new ElggBatch with the same options
 		// and pass each to the callback.
 		if ($callback && is_callable($callback)) {
-			$batch = new ElggBatch($getter, $options, null, $chunk_size);
+			$batch = new ElggBatch($getter, $options, null, $chunk_size, $inc_offset);
 
 			$all_results = null;
 
@@ -245,9 +262,15 @@ private function getNextResultsChunk() {
 			}
 		}
 
+		if ($this->incrementOffset) {
+			$offset = $this->offset + $this->retrievedResults;
+		} else {
+			$offset = $this->offset;
+		}
+
 		$current_options = array(
 			'limit' => $limit,
-			'offset' => $this->offset + $this->retrievedResults
+			'offset' => $offset
 		);
 
 		$options = array_merge($this->options, $current_options);
@@ -269,6 +292,16 @@ private function getNextResultsChunk() {
 		}
 	}
 
+	/**
+	 * Increment the offset from the original options array? Setting to
+	 * false is required for callbacks that delete rows.
+	 *
+	 * @param bool $increment
+	 */
+	public function setIncrementOffset($increment = true) {
+		$this->incrementOffset = (bool) $increment;
+	}
+
 	/**
 	 * Implements Iterator
 	 */

engine/classes/ElggUser.php

@@ -384,7 +384,6 @@ function listFriends($subtype = "", $limit = 10, array $vars = array()) {
 			'relationship' => 'friend',
 			'relationship_guid' => $this->guid,
 			'limit' => $limit,
-			'offset' => get_input('offset', 0),
 			'full_view' => false,
 		);
 
@@ -458,7 +457,14 @@ function listGroups($subtype = "", $limit = 10, $offset = 0) {
 	 * @return array|false
 	 */
 	public function getObjects($subtype = "", $limit = 10, $offset = 0) {
-		return get_user_objects($this->getGUID(), $subtype, $limit, $offset);
+		$params = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'owner_guid' => $this->getGUID(),
+			'limit' => $limit,
+			'offset' => $offset
+		);
+		return elgg_get_entities($params);
 	}
 
 	/**

engine/lib/access.php

@@ -671,8 +671,10 @@ function add_user_to_access_collection($user_guid, $collection_id) {
 		return false;
 	}
 
+	// if someone tries to insert the same data twice, we do a no-op on duplicate key
 	$q = "INSERT INTO {$CONFIG->dbprefix}access_collection_membership
-			SET access_collection_id = {$collection_id}, user_guid = {$user_guid}";
+			SET access_collection_id = $collection_id, user_guid = $user_guid
+			ON DUPLICATE KEY UPDATE user_guid = user_guid";
 	$result = insert_data($q);
 
 	return $result !== false;

engine/lib/annotations.php

@@ -209,9 +209,11 @@ function elgg_get_annotations(array $options = array()) {
  * Deletes annotations based on $options.
  *
  * @warning Unlike elgg_get_annotations() this will not accept an empty options array!
+ *          This requires at least one constraint: annotation_owner_guid(s),
+ *          annotation_name(s), annotation_value(s), or guid(s) must be set.
  *
  * @param array $options An options array. {@See elgg_get_annotations()}
- * @return mixed
+ * @return mixed Null if the metadata name is invalid. Bool on success or fail.
  * @since 1.8.0
  */
 function elgg_delete_annotations(array $options) {