Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 51 insertions, 0 deletions

diff --git a/mod/lightpics/activate.php b/mod/lightpics/activate.php
new file mode 100644
index 000000000..752420a4c
--- /dev/null
+++ b/mod/lightpics/activate.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Activate Tidypics
+ * 
+ * @author Cash Costello
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
+ */
+
+// register classes
+if (get_subtype_id('object', 'album')) {
+	update_subtype('object', 'album', 'TidypicsAlbum');
+} else {
+	add_subtype('object', 'album', 'TidypicsAlbum');
+}
+if (get_subtype_id('object', 'image')) {
+	update_subtype('object', 'image', 'TidypicsImage');
+} else {
+	add_subtype('object', 'image', 'TidypicsImage');
+}
+
+// set default settings
+
+$image_sizes = array();
+$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
+$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
+$image_sizes['tiny_image_width'] = $image_sizes['tiny_image_height'] = 60;
+$image_sizes = serialize($image_sizes);
+
+$defaults = array(
+	'tagging' => true,
+	'view_count' => true,
+	'uploader' => true,
+	'exif' => true,
+	'download_link' => true,
+
+	'maxfilesize' => 5,
+	'image_lib' => 'GD',
+
+	'img_river_view' => 'batch',
+	'album_river_view' => 'set',
+
+	'image_sizes' => $image_sizes,
+
+	'notify_interval' => 60 * 60 * 24,
+);
+
+foreach ($defaults as $name => $value) {
+	if (elgg_get_plugin_setting($name, 'lightpics') === null) {
+		elgg_set_plugin_setting($name, $value, 'lightpics');
+	}
+}