From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 30 Aug 2012 20:17:54 +0000 (+0200)
Subject: allow html inside app descriptions
X-Git-Tag: v4.5.0beta2~42
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b5234a4f34def2087f6d39c50bf567359689bac0;p=nextcloud-server.git

allow html inside app descriptions
---

diff --git a/lib/app.php b/lib/app.php
index 5c0ec2f01ef..006599e7dfc 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -437,6 +437,9 @@ class OC_App{
 				foreach($child->children() as $type){
 					$data['types'][]=$type->getName();
 				}
+			}elseif($child->getName()=='description'){
+				$xml=(string)$child->asXML();
+				$data[$child->getName()]=substr($xml,13,-14);//script <description> tags
 			}else{
 				$data[$child->getName()]=(string)$child;
 			}
diff --git a/settings/js/apps.js b/settings/js/apps.js
index cfddf4a48a1..f9612482373 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -29,7 +29,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		} else {
 			page.find('span.version').text('');
 		}
-		page.find('p.description').text(app.description);
+		page.find('p.description').html(app.description);
 		page.find('img.preview').attr('src', app.preview);
 		page.find('small.externalapp').attr('style', 'visibility:visible');
 		page.find('span.author').text(app.author);
@@ -100,7 +100,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 
 $(document).ready(function(){
 	$('#leftcontent li').each(function(index,li){
-		var app = $.parseJSON($(this).children('span').text());
+		var app = OC.get('appData_'+$(li).data('id'));
 		$(li).data('app',app);
 		$(this).find('span.hidden').remove();
 	});
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 83d63b6b417..8efbcf0a7e9 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -14,9 +14,9 @@
 	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"
 		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
 		<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
-		<span class="hidden">
-			<?php OC_JSON::encodedPrint($app,false) ?>
-		</span>
+		<script type="application/javascript">
+			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app,false) ?>;
+		</script>
 		<?php  if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
 	</li>
 	<?php endforeach;?>