mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13319 from owncloud/replace-line-breaks-in-app-description 

replace line breaks in the app description by spaces - fixes #13315
This commit is contained in:
Lukas Reschke 2015-01-17 01:03:41 +01:00
parent 08d118eab7 520d8ec53b
commit 744cf713f7
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/private/app.php
View File

@ -642,6 +642,10 @@ class OC_App {
$parser = new \OC\App\InfoParser(\OC::$server->getHTTPHelper(), \OC::$server->getURLGenerator());
$data = $parser->parse($file);
if(is_array($data)) {
$data = OC_App::parseAppInfo($data);
}
self::$appInfo[$appId] = $data;
return $data;
@ -914,7 +918,8 @@ class OC_App {
$i = 0;
$l = \OC::$server->getL10N('core');
foreach ($remoteApps as $app) {
$app1[$i] = $app;
// enhance app info (for example the description)
$app1[$i] = OC_App::parseAppInfo($app);
$app1[$i]['author'] = $app['personid'];
$app1[$i]['ocs_id'] = $app['id'];
$app1[$i]['internal'] = $app1[$i]['active'] = 0;
@ -1199,4 +1204,36 @@ class OC_App {
return false;
}
}
/**
* parses the app data array and enhanced the 'description' value
*
* @param array $data the app data
* @return array improved app data
*/
public static function parseAppInfo(array $data) {
// just modify the description if it is available
// otherwise this will create a $data element with an empty 'description'
if(isset($data['description'])) {
// sometimes the description contains line breaks and they are then also
// shown in this way in the app management which isn't wanted as HTML
// manages line breaks itself
// first of all we split on empty lines
$paragraphs = preg_split("!\n[[:space:]]*\n!m", $data['description']);
$result = [];
foreach ($paragraphs as $value) {
// replace multiple whitespace (tabs, space, newlines) inside a paragraph
// with a single space - also trims whitespace
$result[] = trim(preg_replace('![[:space:]]+!m', ' ', $value));
}
// join the single paragraphs with a empty line in between
$data['description'] = implode("\n\n", $result);
}
return $data;
}
}

29
tests/lib/app.php
View File

@ -508,5 +508,34 @@ class Test_App extends \Test\TestCase {
// Remove the cache of the mocked apps list with a forceRefresh
\OC_App::getEnabledApps(true);
}
/**
* Providers for the app data values
*/
function appDataProvider() {
return [
[
['description' => " \t This is a multiline \n test with \n \t \n \n some new lines "],
['description' => "This is a multiline test with\n\nsome new lines"]
],
[
['description' => " \t This is a multiline \n test with \n \t some new lines "],
['description' => "This is a multiline test with some new lines"]
],
[
['not-a-description' => " \t This is a multiline \n test with \n \t some new lines "],
['not-a-description' => " \t This is a multiline \n test with \n \t some new lines "]
],
];
}
/**
* Test app info parser
*
* @dataProvider appDataProvider
*/
public function testParseAppInfo($data, $expected) {
$this->assertEquals($expected, \OC_App::parseAppInfo($data));
}
}