Version 5.0.0 beta 10

applications/downloads/data/javascript.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="downloads">
- <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/downloads" javascript_name="ips.downloads.browse.js" javascript_type="controller" javascript_version="5000039" javascript_position="1000200">/**
+ <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/downloads" javascript_name="ips.downloads.browse.js" javascript_type="controller" javascript_version="5000041" javascript_position="1000200">/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -59,7 +59,7 @@
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/pending" javascript_name="ips.pending.buttons.js" javascript_type="controller" javascript_version="5000039" javascript_position="1000250">/**
+ <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/pending" javascript_name="ips.pending.buttons.js" javascript_type="controller" javascript_version="5000041" javascript_position="1000250">/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -87,7 +87,7 @@
 
 	});
 }(jQuery, _));</file>
- <file javascript_app="downloads" javascript_location="admin" javascript_path="controllers/settings" javascript_name="ips.settings.settings.js" javascript_type="controller" javascript_version="5000039" javascript_position="1000050">/**
+ <file javascript_app="downloads" javascript_location="admin" javascript_path="controllers/settings" javascript_name="ips.settings.settings.js" javascript_type="controller" javascript_version="5000041" javascript_position="1000050">/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -140,7 +140,7 @@
 
 	});
 }(jQuery, _));</file>
- <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.linkedScreenshots.js" javascript_type="controller" javascript_version="5000039" javascript_position="1000100">/**
+ <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.linkedScreenshots.js" javascript_type="controller" javascript_version="5000041" javascript_position="1000100">/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -212,7 +212,7 @@
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.main.js" javascript_type="controller" javascript_version="5000039" javascript_position="1000100"><![CDATA[/**
+ <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.main.js" javascript_type="controller" javascript_version="5000041" javascript_position="1000100"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -657,7 +657,7 @@
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.changeLog.js" javascript_type="controller" javascript_version="5000039" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.changeLog.js" javascript_type="controller" javascript_version="5000041" javascript_position="1000150"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -779,7 +779,7 @@
 		
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.download.js" javascript_type="controller" javascript_version="5000039" javascript_position="1000150">/**
+ <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.download.js" javascript_type="controller" javascript_version="5000041" javascript_position="1000150">/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -907,7 +907,7 @@
 		
 	});
 }(jQuery, _));</file>
- <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.subscribe.js" javascript_type="controller" javascript_version="5000039" javascript_position="1000150">/**
+ <file javascript_app="downloads" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.subscribe.js" javascript_type="controller" javascript_version="5000041" javascript_position="1000150">/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -970,7 +970,7 @@
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="downloads" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.submit.js" javascript_type="template" javascript_version="5000039" javascript_position="1000050"><![CDATA[/* VIEW TEMPLATES */
+ <file javascript_app="downloads" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.submit.js" javascript_type="template" javascript_version="5000041" javascript_position="1000050"><![CDATA[/* VIEW TEMPLATES */
 ips.templates.set('downloads.submit.screenshot', " \
 	<div class='ipsUploader__row ipsUploader__row--image ipsAttach {{#done}}ipsAttach_done{{/done}}' id='{{id}}' data-role='file' data-fileid='{{id}}' data-filesize='{{sizeRaw}}' data-fullsizeurl='{{imagesrc}}' data-thumbnailurl='{{thumbnail}}' data-fileType='image'>\
 		<div class='ipsUploader__rowPreview' data-role='preview'>\

applications/downloads/data/lang.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="downloads" version="5000039">
+ <app key="downloads" version="5000041">
   <word key="__app_downloads" js="0">Downloads</word>
   <word key="frontnavigation_downloads" js="0">Downloads</word>
   <word key="__indefart_downloads_file_comment" js="0">a comment on a file</word>

applications/downloads/data/theme.xml

@@ -1755,19 +1755,21 @@
 	</ul>
 </div>]]></template>
  <template template_group="view" template_name="log" template_data="$file, $table" template_location="front" template_app="downloads"><![CDATA[{{if $file->container()->log}}
-	<div class='i-padding_2'><div class='ipsMessage ipsMessage--info'>{lang="log_days" pluralize="$file->container()->log"}</div></div>
+	<div class='{{if \IPS\Request::i()->isAjax() }}i-padding_2{{else}}i-margin-bottom_2{{endif}}'><div class='ipsMessage ipsMessage--info'>{lang="log_days" pluralize="$file->container()->log"}</div></div>
 {{endif}}
 {$table|raw}]]></template>
  <template template_group="view" template_name="logRows" template_data="$table, $headers, $rows" template_location="front" template_app="downloads"><![CDATA[{{foreach $rows as $row}}
-	<li class='ipsSpanGrid__6 ipsPhotoPanel ipsPhotoPanel--mini i-padding_2'>
-		{template="userPhoto" app="core" group="global" params="\IPS\Member::load( $row['dmid'] ), 'mini'"}
-		<div>
-			<h3 class='ipsTruncate_1'>{member="name" id="$row['dmid']"}</h3>
-			<span class='i-color_soft'>{datetime="$row['dtime']" norelative="true"}</span>
+	<li>
+		<div class="ipsPhotoPanel ipsPhotoPanel--mini">
+			{template="userPhoto" app="core" group="global" params="\IPS\Member::load( $row['dmid'] ), 'mini'"}
+			<div class="ipsPhotoPanel__text">
+				<h3 class='ipsPhotoPanel__primary'>{template="userLink" app="core" group="global" params="\IPS\Member::load( $row['dmid'] )"}</h3>
+				<span class='ipsPhotoPanel__secondary'>{datetime="$row['dtime']" norelative="true"}</span>
+			</div>
 		</div>
 	</li>
 {{endforeach}}]]></template>
- <template template_group="view" template_name="logTable" template_data="$table, $headers, $rows, $quickSearch" template_location="front" template_app="downloads"><![CDATA[<div data-baseurl='{$table->baseUrl}' data-resort='{$table->resortKey}' data-controller='core.global.core.table' {{if $table->getPaginationKey() != 'page'}}data-pageParam='{$table->getPaginationKey()}'{{endif}}>
+ <template template_group="view" template_name="logTable" template_data="$table, $headers, $rows, $quickSearch" template_location="front" template_app="downloads"><![CDATA[<div data-baseurl='{$table->baseUrl}' data-resort='{$table->resortKey}' data-controller='core.global.core.table' {{if $table->getPaginationKey() != 'page'}}data-pageParam='{$table->getPaginationKey()}'{{endif}} {{if !\IPS\Request::i()->isAjax() }}class="ipsBox"{{endif}}>
 
 	{{if $table->pages > 1}}
 		<div class="ipsButtonBar ipsButtonBar--top">
@@ -1777,7 +1779,7 @@
 		</div>
 	{{endif}}
 	{{if \count( $rows )}}
-		<ol class='ipsGrid {{foreach $table->classes as $class}}{$class} {{endforeach}}' id='elTable_{$table->uniqueId}' data-role="tableRows">
+		<ol class='ipsGrid ipsGrid--fileLogTable i-padding_3 {{foreach $table->classes as $class}}{$class} {{endforeach}}' id='elTable_{$table->uniqueId}' data-role="tableRows">
 			{template="$table->rowsTemplate[1]" params="$table, $headers, $rows" object="$table->rowsTemplate[0]"}
 		</ol>
 	{{else}}
@@ -2042,7 +2044,7 @@
 				{template="reviewUnavailable" group="forms" location="front" app="core" params="'restricted_cannot_comment', \IPS\Member::loggedIn()->warnings(5,NULL,'rpa'), \IPS\Member::loggedIn()->restrict_post"}
 			{{endif}}
 		{{elseif $file->mustDownloadBeforeReview()}}
-			<p class='i-color_soft'>{lang="no_download_review"}</p>
+			<p class='i-color_soft i-font-weight_600 i-text-align_center i-background_2 i-padding_2'>{lang="no_download_review"}</p>
 		{{elseif \IPS\Member::loggedIn()->members_bitoptions['unacknowledged_warnings']}}
 			{template="reviewUnavailable" group="forms" location="front" app="core" params="'unacknowledged_warning_cannot_post', \IPS\Member::loggedIn()->warnings( 1, FALSE )"}
 		{{endif}}

applications/downloads/data/versions.json

@@ -249,6 +249,24 @@
     "107751": "4.7.16",
     "107760": "4.7.17 Beta 1",
     "107761": "4.7.17 Beta 2",
+    "107762": "4.7.17 Beta 3",
+    "107763": "4.7.17",
+    "107764": "4.7.17",
+    "107765": "4.7.17",
+    "107770": "4.7.18 Beta 1",
+    "107771": "4.7.18 Beta 2",
+    "107772": "4.7.18 Beta 3",
+    "107773": "4.7.18",
+    "107774": "4.7.18",
+    "107775": "4.7.18",
+    "107780": "4.7.19 Beta 1",
+    "107781": "4.7.19 Beta 2",
+    "107782": "4.7.19 Beta 3",
+    "107783": "4.7.19 Beta 4",
+    "107784": "4.7.19",
+    "107785": "4.7.19",
+    "107786": "4.7.19",
+    "107787": "4.7.19",
     "500001": "5.0.0 Alpha 1",
     "500002": "5.0.0 Alpha 2",
     "5000003": "5.0.0 Alpha 3",
@@ -287,5 +305,7 @@
     "5000036": "5.0.0 Beta 8",
     "5000037": "5.0.0 Beta 8",
     "5000038": "5.0.0 Beta 9",
-    "5000039": "5.0.0 Beta 9.1"
+    "5000039": "5.0.0 Beta 9.1",
+    "5000040": "5.0.0 Beta 9.1",
+    "5000041": "5.0.0 Beta 10"
 }

applications/downloads/setup/upg_107774/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107774,
+    "name": "4.7.18",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107775/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107775,
+    "name": "4.7.18",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107780/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107780,
+    "name": "4.7.19 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107780/theme.json

@@ -0,0 +1,19 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/widgets\/downloadsReviewFeed"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/downloads/setup/upg_107781/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107781,
+    "name": "4.7.19 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107782/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107782,
+    "name": "4.7.19 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107783/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107783,
+    "name": "4.7.19 Beta 4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107784/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107784,
+    "name": "4.7.19",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107785/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107785,
+    "name": "4.7.19",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107786/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107786,
+    "name": "4.7.19",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_107787/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107787,
+    "name": "4.7.19",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_5000040/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000040,
+    "name": "5.0.0 Beta 9.1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_5000040/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_downloads_categories"
+        ],
+        "removed": []
+    }
+}

applications/downloads/setup/upg_5000041/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000041,
+    "name": "5.0.0 Beta 10",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/downloads/setup/upg_5000041/theme.json

@@ -0,0 +1,22 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/view\/log",
+            "front\/view\/logRows",
+            "front\/view\/logTable",
+            "front\/view\/reviews"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/downloads/setup/upg_5000041/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_downloads_categories"
+        ],
+        "removed": []
+    }
+}

applications/downloads/sources/Category/Category.php

@@ -796,6 +796,12 @@ class Category extends Model implements Permissions
 			Lang::deleteCustom( 'downloads', $langKey );
 		}
 
+		/* Unclaim Attachments */
+		foreach( [ 'description', 'disclaimer', 'subt', 'npv' ] as $id3 )
+		{
+			SystemFile::unclaimAttachments( 'downloads_Categories', $this->_id, null, $id3 );
+		}
+
 		if( $this->card_image )
 		{
 			try
@@ -889,6 +895,23 @@ class Category extends Model implements Permissions
 			Lang::saveCustom( 'downloads', $langKey, iterator_to_array( Db::i()->select( 'word_custom, lang_id', 'core_sys_lang_words', array( 'word_key=?', $oldLangKey ) )->setKeyField( 'lang_id' )->setValueField('word_custom') ) );
 		}
 
+		/* If the description had attachments, link them */
+		$attachmentMappings = [];
+		foreach( Db::i()->select( '*', 'core_attachments_map', [
+			[ 'location_key=?', 'downloads_Categories' ],
+			[ 'id1=?', $oldId ],
+			[ 'id2 is null' ],
+			[ Db::i()->in( 'id3', [ 'description', 'disclaimer', 'subt', 'npv' ] ) ]
+		] ) as $attachment )
+		{
+			$attachment['id1'] = $this->_id;
+			$attachmentMappings[] = $attachment;
+		}
+		if( count( $attachmentMappings ) )
+		{
+			Db::i()->insert( 'core_attachments_map', $attachmentMappings );
+		}
+
 		if ( $oldGridImage )
 		{
 			try

applications/downloads/sources/File/File.php

@@ -2855,8 +2855,6 @@ Filter
 		return FALSE;
 	}
 
-
-	public static string $itemMenuKey ='file_actions';
 	public static string $itemMenuCss = '';
 
 	/**