lots of work on merging photo and file albums/folders

2 files changed, 9 insertions, 5 deletions

diff --git a/mod/photos.php b/mod/photos.php
index 786194cd8..dee027cf9 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -277,9 +277,8 @@ function photos_post(&$a) {
 		if($p) {
 			$ext = $phototypes[$p[0]['type']];
 
-			$r = q("UPDATE `photo` SET `description` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource_id` = '%s' AND `uid` = %d",
+			$r = q("UPDATE `photo` SET `description` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource_id` = '%s' AND `uid` = %d",
 				dbesc($desc),
-				dbesc($albname),
 				dbesc($str_contact_allow),
 				dbesc($str_group_allow),
 				dbesc($str_contact_deny),
@@ -421,7 +420,7 @@ function photos_post(&$a) {
 		$_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']);
 	}
 
-	$r = attach_store($a->channel,get_observer_hash(), $_REQUEST);
+	$r = attach_store($a->channel,get_observer_hash(), '', $_REQUEST);
 
 	if(! $r['success']) {
 		notice($r['message'] . EOL);
diff --git a/mod/settings.php b/mod/settings.php
index 9284033e6..f26182dc6 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -400,6 +400,8 @@ function settings_post(&$a) {
 	$maxreq           = ((x($_POST,'maxreq'))     ? intval($_POST['maxreq'])             : 0);
 	$expire           = ((x($_POST,'expire'))     ? intval($_POST['expire'])             : 0);
 	$evdays           = ((x($_POST,'evdays'))     ? intval($_POST['evdays'])             : 3);
+	$photo_path       = ((x($_POST,'photo_path')) ? escape_tags(trim($_POST['photo_path'])) : '');
+	$attach_path      = ((x($_POST,'attach_path')) ? escape_tags(trim($_POST['attach_path'])) : '');
 
 	$channel_menu     = ((x($_POST['channel_menu'])) ? htmlspecialchars_decode(trim($_POST['channel_menu']),ENT_QUOTES) : '');
 
@@ -506,6 +508,8 @@ function settings_post(&$a) {
 	set_pconfig(local_channel(),'system','vnotify',$vnotify);
 	set_pconfig(local_channel(),'system','always_show_in_notices',$always_show_in_notices);
 	set_pconfig(local_channel(),'system','evdays',$evdays);
+	set_pconfig(local_channel(),'system','photo_path',$photo_path);
+	set_pconfig(local_channel(),'system','attach_path',$attach_path);
 
 	$r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d",
 		dbesc($username),
@@ -1011,7 +1015,6 @@ function settings_content(&$a) {
 			'deny_gid' => $channel['channel_deny_gid']
 		); 
 
-
 		require_once('include/group.php');
 		$group_select = mini_group_select(local_channel(),$channel['channel_default_group']);
 
@@ -1129,7 +1132,9 @@ function settings_content(&$a) {
 			'$expert' => feature_enabled(local_channel(),'expert'),
 			'$hint' => t('Please enable expert mode (in <a href="settings/features">Settings > Additional features</a>) to adjust!'),
 			'$lbl_misc' => t('Miscellaneous Settings'),
-			'$menus' => $menu,
+			'$photo_path' => array('photo_path', t('Default photo upload folder'), get_pconfig(local_channel(),'system','photo_path'), '%Y - current year, %m -  current month'),
+			'$attach_path' => array('attach_path', t('Default file upload folder'), get_pconfig(local_channel(),'system','attach_path'), '%Y - current year, %m -  current month'),
+			'$menus' => $menu,			
 			'$menu_desc' => t('Personal menu to display in your channel pages'),
 			'$removeme' => t('Remove Channel'),
 			'$removechannel' => t('Remove this channel.'),