diff --git a/PluginMarket.class.php b/PluginMarket.class.php
index ecb7e874d6e9d382dd62743cb79516987059aad9..71d155450d22ad0ccf7a726c86f4d2815935ee26 100644
--- a/PluginMarket.class.php
+++ b/PluginMarket.class.php
@@ -2,6 +2,7 @@
require_once __DIR__."/classes/MarketPlugin.class.php";
require_once __DIR__."/classes/MarketRelease.class.php";
+require_once __DIR__."/classes/MarketImage.class.php";
class PluginMarket extends StudIPPlugin implements SystemPlugin {
diff --git a/classes/MarketImage.class.php b/classes/MarketImage.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..a288955c88aa6e3b7a85dde86c01032de341b9e7
--- /dev/null
+++ b/classes/MarketImage.class.php
@@ -0,0 +1,13 @@
+<?php
+
+class MarketImage extends SimpleORMap {
+ protected static function configure($config = array())
+ {
+ $config['db_table'] = 'pluginmarket_images';
+ $config['belongs_to']['plugin'] = array(
+ 'class_name' => 'MarketPlugin',
+ 'foreign_key' => 'plugin_id',
+ );
+ parent::configure($config);
+ }
+}
\ No newline at end of file
diff --git a/classes/MarketRelease.class.php b/classes/MarketRelease.class.php
index 0c774dca680a6ba7db616018fdafa47812ada3b0..2468442a0cb0a055c1ceb879515f855bd0713c88 100644
--- a/classes/MarketRelease.class.php
+++ b/classes/MarketRelease.class.php
@@ -8,6 +8,10 @@ class MarketRelease extends SimpleORMap {
return $GLOBALS['STUDIP_BASE_PATH'] . "/data/pluginmarket_releases";
}
+ static public function findByPlugin_id($plugin_id) {
+ return self::findBySQL("plugin_id = ? ORDER BY version DESC", array($plugin_id));
+ }
+
protected static function configure($config = array())
{
$config['db_table'] = 'pluginmarket_releases';
@@ -45,6 +49,7 @@ class MarketRelease extends SimpleORMap {
rmdirr($tmp_folder);
unlink($file);
+ $this['chdate'] = time();
}
protected function getFilePath() {
diff --git a/install.sql b/install.sql
index 2e4038cbb26682e301bf9f45113f072c0cb9abd0..d349e026ab7c4e1877701e3e4c73c88043b8820a 100644
--- a/install.sql
+++ b/install.sql
@@ -8,6 +8,7 @@ CREATE TABLE IF NOT EXISTS `pluginmarket_plugins` (
`short_description` text NOT NULL,
`release_type` varchar(255) default NULL,
`approved` tinyint(2) NOT NULL default '0',
+ `public` tinyint(2) NOT NULL default '1',
`url` varchar(2000) default NULL,
`classification` enum('firstclass','secondclass','none') NOT NULL default 'none',
`language` enum('de','en','de_en') NOT NULL default 'de',
@@ -41,4 +42,22 @@ CREATE TABLE IF NOT EXISTS `pluginmarket_user_plugins` (
`user_id` varchar(32) NOT NULL,
`plugin_id` varchar(32) NOT NULL,
PRIMARY KEY (`user_id`,`plugin_id`)
-) ENGINE=MyISAM;
\ No newline at end of file
+) ENGINE=MyISAM;
+
+CREATE TABLE IF NOT EXISTS `pluginmarket_rezension` (
+ `rezension_id` varchar(32) NOT NULL,
+ `rezension_txt` text NOT NULL,
+ `user_id` varchar(32) NOT NULL,
+ `mkdate` int(20) NOT NULL,
+ `plugin_id` varchar(32) NOT NULL,
+ KEY `plugin_id` (`plugin_id`)
+) ENGINE=MyISAM;
+
+
+CREATE TABLE IF NOT EXISTS `pluginmarket_tags` (
+ `plugin_id` varchar(32) NOT NULL,
+ `tag` varchar(255) NOT NULL,
+ KEY (`tag_id`),
+ KEY `plugin_id` (`plugin_id`)
+) ENGINE=MyISAM;
+
diff --git a/vendor/Parsedown.php b/vendor/Parsedown.php
new file mode 100644
index 0000000000000000000000000000000000000000..1cfbdf56094b6b3727e1e3c21b5812ebfe70c6fc
--- /dev/null
+++ b/vendor/Parsedown.php
@@ -0,0 +1,1414 @@
+<?php
+
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013 Emanuil Rusev, erusev.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+source: https://github.com/erusev/parsedown
+*/
+
+class Parsedown
+{
+ #
+ # Philosophy
+
+ # Parsedown recognises that the Markdown syntax is optimised for humans so
+ # it tries to read like one. It goes through text line by line. It looks at
+ # how lines start to identify blocks. It looks for special characters to
+ # identify inline elements.
+
+ #
+ # ~
+
+ function text($text)
+ {
+ # make sure no definitions are set
+ $this->Definitions = array();
+
+ # standardize line breaks
+ $text = str_replace("\r\n", "\n", $text);
+ $text = str_replace("\r", "\n", $text);
+
+ # replace tabs with spaces
+ $text = str_replace("\t", ' ', $text);
+
+ # remove surrounding line breaks
+ $text = trim($text, "\n");
+
+ # split text into lines
+ $lines = explode("\n", $text);
+
+ # iterate through lines to identify blocks
+ $markup = $this->lines($lines);
+
+ # trim line breaks
+ $markup = trim($markup, "\n");
+
+ return $markup;
+ }
+
+ #
+ # Setters
+ #
+
+ private $breaksEnabled;
+
+ function setBreaksEnabled($breaksEnabled)
+ {
+ $this->breaksEnabled = $breaksEnabled;
+
+ return $this;
+ }
+
+ #
+ # Lines
+ #
+
+ protected $BlockTypes = array(
+ '#' => array('Atx'),
+ '*' => array('Rule', 'List'),
+ '+' => array('List'),
+ '-' => array('Setext', 'Table', 'Rule', 'List'),
+ '0' => array('List'),
+ '1' => array('List'),
+ '2' => array('List'),
+ '3' => array('List'),
+ '4' => array('List'),
+ '5' => array('List'),
+ '6' => array('List'),
+ '7' => array('List'),
+ '8' => array('List'),
+ '9' => array('List'),
+ ':' => array('Table'),
+ '<' => array('Comment', 'Markup'),
+ '=' => array('Setext'),
+ '>' => array('Quote'),
+ '_' => array('Rule'),
+ '`' => array('FencedCode'),
+ '|' => array('Table'),
+ '~' => array('FencedCode'),
+ );
+
+ # ~
+
+ protected $DefinitionTypes = array(
+ '[' => array('Reference'),
+ );
+
+ # ~
+
+ protected $unmarkedBlockTypes = array(
+ 'CodeBlock',
+ );
+
+ #
+ # Blocks
+ #
+
+ private function lines(array $lines)
+ {
+ $CurrentBlock = null;
+
+ foreach ($lines as $line)
+ {
+ if (chop($line) === '')
+ {
+ if (isset($CurrentBlock))
+ {
+ $CurrentBlock['interrupted'] = true;
+ }
+
+ continue;
+ }
+
+ $indent = 0;
+
+ while (isset($line[$indent]) and $line[$indent] === ' ')
+ {
+ $indent ++;
+ }
+
+ $text = $indent > 0 ? substr($line, $indent) : $line;
+
+ # ~
+
+ $Line = array('body' => $line, 'indent' => $indent, 'text' => $text);
+
+ # ~
+
+ if (isset($CurrentBlock['incomplete']))
+ {
+ $Block = $this->{'addTo'.$CurrentBlock['type']}($Line, $CurrentBlock);
+
+ if (isset($Block))
+ {
+ $CurrentBlock = $Block;
+
+ continue;
+ }
+ else
+ {
+ if (method_exists($this, 'complete'.$CurrentBlock['type']))
+ {
+ $CurrentBlock = $this->{'complete'.$CurrentBlock['type']}($CurrentBlock);
+ }
+
+ unset($CurrentBlock['incomplete']);
+ }
+ }
+
+ # ~
+
+ $marker = $text[0];
+
+ if (isset($this->DefinitionTypes[$marker]))
+ {
+ foreach ($this->DefinitionTypes[$marker] as $definitionType)
+ {
+ $Definition = $this->{'identify'.$definitionType}($Line, $CurrentBlock);
+
+ if (isset($Definition))
+ {
+ $this->Definitions[$definitionType][$Definition['id']] = $Definition['data'];
+
+ continue 2;
+ }
+ }
+ }
+
+ # ~
+
+ $blockTypes = $this->unmarkedBlockTypes;
+
+ if (isset($this->BlockTypes[$marker]))
+ {
+ foreach ($this->BlockTypes[$marker] as $blockType)
+ {
+ $blockTypes []= $blockType;
+ }
+ }
+
+ #
+ # ~
+
+ foreach ($blockTypes as $blockType)
+ {
+ $Block = $this->{'identify'.$blockType}($Line, $CurrentBlock);
+
+ if (isset($Block))
+ {
+ $Block['type'] = $blockType;
+
+ if ( ! isset($Block['identified']))
+ {
+ $Elements []= $CurrentBlock['element'];
+
+ $Block['identified'] = true;
+ }
+
+ if (method_exists($this, 'addTo'.$blockType))
+ {
+ $Block['incomplete'] = true;
+ }
+
+ $CurrentBlock = $Block;
+
+ continue 2;
+ }
+ }
+
+ # ~
+
+ if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
+ {
+ $CurrentBlock['element']['text'] .= "\n".$text;
+ }
+ else
+ {
+ $Elements []= $CurrentBlock['element'];
+
+ $CurrentBlock = $this->buildParagraph($Line);
+
+ $CurrentBlock['identified'] = true;
+ }
+ }
+
+ # ~
+
+ if (isset($CurrentBlock['incomplete']) and method_exists($this, 'complete'.$CurrentBlock['type']))
+ {
+ $CurrentBlock = $this->{'complete'.$CurrentBlock['type']}($CurrentBlock);
+ }
+
+ # ~
+
+ $Elements []= $CurrentBlock['element'];
+
+ unset($Elements[0]);
+
+ # ~
+
+ $markup = $this->elements($Elements);
+
+ # ~
+
+ return $markup;
+ }
+
+ #
+ # Atx
+
+ protected function identifyAtx($Line)
+ {
+ if (isset($Line['text'][1]))
+ {
+ $level = 1;
+
+ while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
+ {
+ $level ++;
+ }
+
+ $text = trim($Line['text'], '# ');
+
+ $Block = array(
+ 'element' => array(
+ 'name' => 'h' . min(6, $level),
+ 'text' => $text,
+ 'handler' => 'line',
+ ),
+ );
+
+ return $Block;
+ }
+ }
+
+ #
+ # Code
+
+ protected function identifyCodeBlock($Line)
+ {
+ if ($Line['indent'] >= 4)
+ {
+ $text = substr($Line['body'], 4);
+
+ $Block = array(
+ 'element' => array(
+ 'name' => 'pre',
+ 'handler' => 'element',
+ 'text' => array(
+ 'name' => 'code',
+ 'text' => $text,
+ ),
+ ),
+ );
+
+ return $Block;
+ }
+ }
+
+ protected function addToCodeBlock($Line, $Block)
+ {
+ if ($Line['indent'] >= 4)
+ {
+ if (isset($Block['interrupted']))
+ {
+ $Block['element']['text']['text'] .= "\n";
+
+ unset($Block['interrupted']);
+ }
+
+ $Block['element']['text']['text'] .= "\n";
+
+ $text = substr($Line['body'], 4);
+
+ $Block['element']['text']['text'] .= $text;
+
+ return $Block;
+ }
+ }
+
+ protected function completeCodeBlock($Block)
+ {
+ $text = $Block['element']['text']['text'];
+
+ $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+ $Block['element']['text']['text'] = $text;
+
+ return $Block;
+ }
+
+ #
+ # Comment
+
+ protected function identifyComment($Line)
+ {
+ if (isset($Line['text'][3]) and $Line['text'][3] === '-' and $Line['text'][2] === '-' and $Line['text'][1] === '!')
+ {
+ $Block = array(
+ 'element' => $Line['body'],
+ );
+
+ if (preg_match('/-->$/', $Line['text']))
+ {
+ $Block['closed'] = true;
+ }
+
+ return $Block;
+ }
+ }
+
+ protected function addToComment($Line, array $Block)
+ {
+ if (isset($Block['closed']))
+ {
+ return;
+ }
+
+ $Block['element'] .= "\n" . $Line['body'];
+
+ if (preg_match('/-->$/', $Line['text']))
+ {
+ $Block['closed'] = true;
+ }
+
+ return $Block;
+ }
+
+ #
+ # Fenced Code
+
+ protected function identifyFencedCode($Line)
+ {
+ if (preg_match('/^(['.$Line['text'][0].']{3,})[ ]*([\w-]+)?[ ]*$/', $Line['text'], $matches))
+ {
+ $Element = array(
+ 'name' => 'code',
+ 'text' => '',
+ );
+
+ if (isset($matches[2]))
+ {
+ $class = 'language-'.$matches[2];
+
+ $Element['attributes'] = array(
+ 'class' => $class,
+ );
+ }
+
+ $Block = array(
+ 'char' => $Line['text'][0],
+ 'element' => array(
+ 'name' => 'pre',
+ 'handler' => 'element',
+ 'text' => $Element,
+ ),
+ );
+
+ return $Block;
+ }
+ }
+
+ protected function addToFencedCode($Line, $Block)
+ {
+ if (isset($Block['complete']))
+ {
+ return;
+ }
+
+ if (isset($Block['interrupted']))
+ {
+ $Block['element']['text']['text'] .= "\n";
+
+ unset($Block['interrupted']);
+ }
+
+ if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
+ {
+ $Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
+
+ $Block['complete'] = true;
+
+ return $Block;
+ }
+
+ $Block['element']['text']['text'] .= "\n".$Line['body'];;
+
+ return $Block;
+ }
+
+ protected function completeFencedCode($Block)
+ {
+ $text = $Block['element']['text']['text'];
+
+ $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+ $Block['element']['text']['text'] = $text;
+
+ return $Block;
+ }
+
+ #
+ # List
+
+ protected function identifyList($Line)
+ {
+ list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
+
+ if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
+ {
+ $Block = array(
+ 'indent' => $Line['indent'],
+ 'pattern' => $pattern,
+ 'element' => array(
+ 'name' => $name,
+ 'handler' => 'elements',
+ ),
+ );
+
+ $Block['li'] = array(
+ 'name' => 'li',
+ 'handler' => 'li',
+ 'text' => array(
+ $matches[2],
+ ),
+ );
+
+ $Block['element']['text'] []= & $Block['li'];
+
+ return $Block;
+ }
+ }
+
+ protected function addToList($Line, array $Block)
+ {
+ if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'[ ]+(.*)/', $Line['text'], $matches))
+ {
+ if (isset($Block['interrupted']))
+ {
+ $Block['li']['text'] []= '';
+
+ unset($Block['interrupted']);
+ }
+
+ unset($Block['li']);
+
+ $Block['li'] = array(
+ 'name' => 'li',
+ 'handler' => 'li',
+ 'text' => array(
+ $matches[1],
+ ),
+ );
+
+ $Block['element']['text'] []= & $Block['li'];
+
+ return $Block;
+ }
+
+ if ( ! isset($Block['interrupted']))
+ {
+ $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
+
+ $Block['li']['text'] []= $text;
+
+ return $Block;
+ }
+
+ if ($Line['indent'] > 0)
+ {
+ $Block['li']['text'] []= '';
+
+ $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
+
+ $Block['li']['text'] []= $text;
+
+ unset($Block['interrupted']);
+
+ return $Block;
+ }
+ }
+
+ #
+ # Quote
+
+ protected function identifyQuote($Line)
+ {
+ if (preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
+ {
+ $Block = array(
+ 'element' => array(
+ 'name' => 'blockquote',
+ 'handler' => 'lines',
+ 'text' => (array) $matches[1],
+ ),
+ );
+
+ return $Block;
+ }
+ }
+
+ protected function addToQuote($Line, array $Block)
+ {
+ if ($Line['text'][0] === '>' and preg_match('/^>[ ]?(.*)/', $Line['text'], $matches))
+ {
+ if (isset($Block['interrupted']))
+ {
+ $Block['element']['text'] []= '';
+
+ unset($Block['interrupted']);
+ }
+
+ $Block['element']['text'] []= $matches[1];
+
+ return $Block;
+ }
+
+ if ( ! isset($Block['interrupted']))
+ {
+ $Block['element']['text'] []= $Line['text'];
+
+ return $Block;
+ }
+ }
+
+ #
+ # Rule
+
+ protected function identifyRule($Line)
+ {
+ if (preg_match('/^(['.$Line['text'][0].'])([ ]{0,2}\1){2,}[ ]*$/', $Line['text']))
+ {
+ $Block = array(
+ 'element' => array(
+ 'name' => 'hr'
+ ),
+ );
+
+ return $Block;
+ }
+ }
+
+ #
+ # Setext
+
+ protected function identifySetext($Line, array $Block = null)
+ {
+ if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+ {
+ return;
+ }
+
+ if (chop($Line['text'], $Line['text'][0]) === '')
+ {
+ $Block['element']['name'] = $Line['text'][0] === '=' ? 'h1' : 'h2';
+
+ return $Block;
+ }
+ }
+
+ #
+ # Markup
+
+ protected function identifyMarkup($Line)
+ {
+ if (preg_match('/^<(\w[\w\d]*)(?:[ ][^>]*)?(\/?)[ ]*>/', $Line['text'], $matches))
+ {
+ if (in_array($matches[1], $this->textLevelElements))
+ {
+ return;
+ }
+
+ $Block = array(
+ 'element' => $Line['body'],
+ );
+
+ if ($matches[2] or $matches[1] === 'hr' or preg_match('/<\/'.$matches[1].'>[ ]*$/', $Line['text']))
+ {
+ $Block['closed'] = true;
+ }
+ else
+ {
+ $Block['depth'] = 0;
+ $Block['name'] = $matches[1];
+ }
+
+ return $Block;
+ }
+ }
+
+ protected function addToMarkup($Line, array $Block)
+ {
+ if (isset($Block['closed']))
+ {
+ return;
+ }
+
+ if (preg_match('/<'.$Block['name'].'([ ][^\/]+)?>/', $Line['text'])) # opening tag
+ {
+ $Block['depth'] ++;
+ }
+
+ if (stripos($Line['text'], '</'.$Block['name'].'>') !== false) # closing tag
+ {
+ if ($Block['depth'] > 0)
+ {
+ $Block['depth'] --;
+ }
+ else
+ {
+ $Block['closed'] = true;
+ }
+ }
+
+ $Block['element'] .= "\n".$Line['body'];
+
+ return $Block;
+ }
+
+ #
+ # Table
+
+ protected function identifyTable($Line, array $Block = null)
+ {
+ if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+ {
+ return;
+ }
+
+ if (strpos($Block['element']['text'], '|') !== false and chop($Line['text'], ' -:|') === '')
+ {
+ $alignments = array();
+
+ $divider = $Line['text'];
+
+ $divider = trim($divider);
+ $divider = trim($divider, '|');
+
+ $dividerCells = explode('|', $divider);
+
+ foreach ($dividerCells as $dividerCell)
+ {
+ $dividerCell = trim($dividerCell);
+
+ if ($dividerCell === '')
+ {
+ continue;
+ }
+
+ $alignment = null;
+
+ if ($dividerCell[0] === ':')
+ {
+ $alignment = 'left';
+ }
+
+ if (substr($dividerCell, -1) === ':')
+ {
+ $alignment = $alignment === 'left' ? 'center' : 'right';
+ }
+
+ $alignments []= $alignment;
+ }
+
+ # ~
+
+ $HeaderElements = array();
+
+ $header = $Block['element']['text'];
+
+ $header = trim($header);
+ $header = trim($header, '|');
+
+ $headerCells = explode('|', $header);
+
+ foreach ($headerCells as $index => $headerCell)
+ {
+ $headerCell = trim($headerCell);
+
+ $HeaderElement = array(
+ 'name' => 'th',
+ 'text' => $headerCell,
+ 'handler' => 'line',
+ );
+
+ if (isset($alignments[$index]))
+ {
+ $alignment = $alignments[$index];
+
+ $HeaderElement['attributes'] = array(
+ 'align' => $alignment,
+ );
+ }
+
+ $HeaderElements []= $HeaderElement;
+ }
+
+ # ~
+
+ $Block = array(
+ 'alignments' => $alignments,
+ 'identified' => true,
+ 'element' => array(
+ 'name' => 'table',
+ 'handler' => 'elements',
+ ),
+ );
+
+ $Block['element']['text'] []= array(
+ 'name' => 'thead',
+ 'handler' => 'elements',
+ );
+
+ $Block['element']['text'] []= array(
+ 'name' => 'tbody',
+ 'handler' => 'elements',
+ 'text' => array(),
+ );
+
+ $Block['element']['text'][0]['text'] []= array(
+ 'name' => 'tr',
+ 'handler' => 'elements',
+ 'text' => $HeaderElements,
+ );
+
+ return $Block;
+ }
+ }
+
+ protected function addToTable($Line, array $Block)
+ {
+ if ($Line['text'][0] === '|' or strpos($Line['text'], '|'))
+ {
+ $Elements = array();
+
+ $row = $Line['text'];
+
+ $row = trim($row);
+ $row = trim($row, '|');
+
+ $cells = explode('|', $row);
+
+ foreach ($cells as $index => $cell)
+ {
+ $cell = trim($cell);
+
+ $Element = array(
+ 'name' => 'td',
+ 'handler' => 'line',
+ 'text' => $cell,
+ );
+
+ if (isset($Block['alignments'][$index]))
+ {
+ $Element['attributes'] = array(
+ 'align' => $Block['alignments'][$index],
+ );
+ }
+
+ $Elements []= $Element;
+ }
+
+ $Element = array(
+ 'name' => 'tr',
+ 'handler' => 'elements',
+ 'text' => $Elements,
+ );
+
+ $Block['element']['text'][1]['text'] []= $Element;
+
+ return $Block;
+ }
+ }
+
+ #
+ # Definitions
+ #
+
+ protected function identifyReference($Line)
+ {
+ if (preg_match('/^\[(.+?)\]:[ ]*<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches))
+ {
+ $Definition = array(
+ 'id' => strtolower($matches[1]),
+ 'data' => array(
+ 'url' => $matches[2],
+ ),
+ );
+
+ if (isset($matches[3]))
+ {
+ $Definition['data']['title'] = $matches[3];
+ }
+
+ return $Definition;
+ }
+ }
+
+ #
+ # ~
+ #
+
+ protected function buildParagraph($Line)
+ {
+ $Block = array(
+ 'element' => array(
+ 'name' => 'p',
+ 'text' => $Line['text'],
+ 'handler' => 'line',
+ ),
+ );
+
+ return $Block;
+ }
+
+ #
+ # ~
+ #
+
+ protected function element(array $Element)
+ {
+ $markup = '<'.$Element['name'];
+
+ if (isset($Element['attributes']))
+ {
+ foreach ($Element['attributes'] as $name => $value)
+ {
+ $markup .= ' '.$name.'="'.$value.'"';
+ }
+ }
+
+ if (isset($Element['text']))
+ {
+ $markup .= '>';
+
+ if (isset($Element['handler']))
+ {
+ $markup .= $this->$Element['handler']($Element['text']);
+ }
+ else
+ {
+ $markup .= $Element['text'];
+ }
+
+ $markup .= '</'.$Element['name'].'>';
+ }
+ else
+ {
+ $markup .= ' />';
+ }
+
+ return $markup;
+ }
+
+ protected function elements(array $Elements)
+ {
+ $markup = '';
+
+ foreach ($Elements as $Element)
+ {
+ if ($Element === null)
+ {
+ continue;
+ }
+
+ $markup .= "\n";
+
+ if (is_string($Element)) # because of Markup
+ {
+ $markup .= $Element;
+
+ continue;
+ }
+
+ $markup .= $this->element($Element);
+ }
+
+ $markup .= "\n";
+
+ return $markup;
+ }
+
+ #
+ # Spans
+ #
+
+ protected $SpanTypes = array(
+ '!' => array('Link'), # ?
+ '&' => array('Ampersand'),
+ '*' => array('Emphasis'),
+ '/' => array('Url'),
+ '<' => array('UrlTag', 'EmailTag', 'Tag', 'LessThan'),
+ '[' => array('Link'),
+ '_' => array('Emphasis'),
+ '`' => array('InlineCode'),
+ '~' => array('Strikethrough'),
+ '\\' => array('EscapeSequence'),
+ );
+
+ # ~
+
+ protected $spanMarkerList = '*_!&[</`~\\';
+
+ #
+ # ~
+ #
+
+ public function line($text)
+ {
+ $markup = '';
+
+ $remainder = $text;
+
+ $markerPosition = 0;
+
+ while ($excerpt = strpbrk($remainder, $this->spanMarkerList))
+ {
+ $marker = $excerpt[0];
+
+ $markerPosition += strpos($remainder, $marker);
+
+ $Excerpt = array('text' => $excerpt, 'context' => $text);
+
+ foreach ($this->SpanTypes[$marker] as $spanType)
+ {
+ $handler = 'identify'.$spanType;
+
+ $Span = $this->$handler($Excerpt);
+
+ if ( ! isset($Span))
+ {
+ continue;
+ }
+
+ # The identified span can be ahead of the marker.
+
+ if (isset($Span['position']) and $Span['position'] > $markerPosition)
+ {
+ continue;
+ }
+
+ # Spans that start at the position of their marker don't have to set a position.
+
+ if ( ! isset($Span['position']))
+ {
+ $Span['position'] = $markerPosition;
+ }
+
+ $plainText = substr($text, 0, $Span['position']);
+
+ $markup .= $this->readPlainText($plainText);
+
+ $markup .= isset($Span['markup']) ? $Span['markup'] : $this->element($Span['element']);
+
+ $text = substr($text, $Span['position'] + $Span['extent']);
+
+ $remainder = $text;
+
+ $markerPosition = 0;
+
+ continue 2;
+ }
+
+ $remainder = substr($excerpt, 1);
+
+ $markerPosition ++;
+ }
+
+ $markup .= $this->readPlainText($text);
+
+ return $markup;
+ }
+
+ #
+ # ~
+ #
+
+ protected function identifyUrl($Excerpt)
+ {
+ if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '/')
+ {
+ return;
+ }
+
+ if (preg_match('/\bhttps?:[\/]{2}[^\s<]+\b\/*/ui', $Excerpt['context'], $matches, PREG_OFFSET_CAPTURE))
+ {
+ $url = str_replace(array('&', '<'), array('&', '<'), $matches[0][0]);
+
+ return array(
+ 'extent' => strlen($matches[0][0]),
+ 'position' => $matches[0][1],
+ 'element' => array(
+ 'name' => 'a',
+ 'text' => $url,
+ 'attributes' => array(
+ 'href' => $url,
+ ),
+ ),
+ );
+ }
+ }
+
+ protected function identifyAmpersand($Excerpt)
+ {
+ if ( ! preg_match('/^&#?\w+;/', $Excerpt['text']))
+ {
+ return array(
+ 'markup' => '&',
+ 'extent' => 1,
+ );
+ }
+ }
+
+ protected function identifyStrikethrough($Excerpt)
+ {
+ if ( ! isset($Excerpt['text'][1]))
+ {
+ return;
+ }
+
+ if ($Excerpt['text'][1] === '~' and preg_match('/^~~(?=\S)(.+?)(?<=\S)~~/', $Excerpt['text'], $matches))
+ {
+ return array(
+ 'extent' => strlen($matches[0]),
+ 'element' => array(
+ 'name' => 'del',
+ 'text' => $matches[1],
+ 'handler' => 'line',
+ ),
+ );
+ }
+ }
+
+ protected function identifyEscapeSequence($Excerpt)
+ {
+ if (isset($Excerpt['text'][1]) and in_array($Excerpt['text'][1], $this->specialCharacters))
+ {
+ return array(
+ 'markup' => $Excerpt['text'][1],
+ 'extent' => 2,
+ );
+ }
+ }
+
+ protected function identifyLessThan()
+ {
+ return array(
+ 'markup' => '<',
+ 'extent' => 1,
+ );
+ }
+
+ protected function identifyUrlTag($Excerpt)
+ {
+ if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(https?:[\/]{2}[^\s]+?)>/i', $Excerpt['text'], $matches))
+ {
+ $url = str_replace(array('&', '<'), array('&', '<'), $matches[1]);
+
+ return array(
+ 'extent' => strlen($matches[0]),
+ 'element' => array(
+ 'name' => 'a',
+ 'text' => $url,
+ 'attributes' => array(
+ 'href' => $url,
+ ),
+ ),
+ );
+ }
+ }
+
+ protected function identifyEmailTag($Excerpt)
+ {
+ if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<(\S+?@\S+?)>/', $Excerpt['text'], $matches))
+ {
+ return array(
+ 'extent' => strlen($matches[0]),
+ 'element' => array(
+ 'name' => 'a',
+ 'text' => $matches[1],
+ 'attributes' => array(
+ 'href' => 'mailto:'.$matches[1],
+ ),
+ ),
+ );
+ }
+ }
+
+ protected function identifyTag($Excerpt)
+ {
+ if (strpos($Excerpt['text'], '>') !== false and preg_match('/^<\/?\w.*?>/', $Excerpt['text'], $matches))
+ {
+ return array(
+ 'markup' => $matches[0],
+ 'extent' => strlen($matches[0]),
+ );
+ }
+ }
+
+ protected function identifyInlineCode($Excerpt)
+ {
+ $marker = $Excerpt['text'][0];
+
+ if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/', $Excerpt['text'], $matches))
+ {
+ $text = $matches[2];
+ $text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+
+ return array(
+ 'extent' => strlen($matches[0]),
+ 'element' => array(
+ 'name' => 'code',
+ 'text' => $text,
+ ),
+ );
+ }
+ }
+
+ protected function identifyLink($Excerpt)
+ {
+ $extent = $Excerpt['text'][0] === '!' ? 1 : 0;
+
+ if (strpos($Excerpt['text'], ']') and preg_match('/\[((?:[^][]|(?R))*)\]/', $Excerpt['text'], $matches))
+ {
+ $Link = array('text' => $matches[1], 'label' => strtolower($matches[1]));
+
+ $extent += strlen($matches[0]);
+
+ $substring = substr($Excerpt['text'], $extent);
+
+ if (preg_match('/^\s*\[([^][]+)\]/', $substring, $matches))
+ {
+ $Link['label'] = strtolower($matches[1]);
+
+ if (isset($this->Definitions['Reference'][$Link['label']]))
+ {
+ $Link += $this->Definitions['Reference'][$Link['label']];
+
+ $extent += strlen($matches[0]);
+ }
+ else
+ {
+ return;
+ }
+ }
+ elseif (isset($this->Definitions['Reference'][$Link['label']]))
+ {
+ $Link += $this->Definitions['Reference'][$Link['label']];
+
+ if (preg_match('/^[ ]*\[\]/', $substring, $matches))
+ {
+ $extent += strlen($matches[0]);
+ }
+ }
+ elseif (preg_match('/^\([ ]*(.*?)(?:[ ]+[\'"](.+?)[\'"])?[ ]*\)/', $substring, $matches))
+ {
+ $Link['url'] = $matches[1];
+
+ if (isset($matches[2]))
+ {
+ $Link['title'] = $matches[2];
+ }
+
+ $extent += strlen($matches[0]);
+ }
+ else
+ {
+ return;
+ }
+ }
+ else
+ {
+ return;
+ }
+
+ $url = str_replace(array('&', '<'), array('&', '<'), $Link['url']);
+
+ if ($Excerpt['text'][0] === '!')
+ {
+ $Element = array(
+ 'name' => 'img',
+ 'attributes' => array(
+ 'alt' => $Link['text'],
+ 'src' => $url,
+ ),
+ );
+ }
+ else
+ {
+ $Element = array(
+ 'name' => 'a',
+ 'handler' => 'line',
+ 'text' => $Link['text'],
+ 'attributes' => array(
+ 'href' => $url,
+ ),
+ );
+ }
+
+ if (isset($Link['title']))
+ {
+ $Element['attributes']['title'] = $Link['title'];
+ }
+
+ return array(
+ 'extent' => $extent,
+ 'element' => $Element,
+ );
+ }
+
+ protected function identifyEmphasis($Excerpt)
+ {
+ if ( ! isset($Excerpt['text'][1]))
+ {
+ return;
+ }
+
+ $marker = $Excerpt['text'][0];
+
+ if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
+ {
+ $emphasis = 'strong';
+ }
+ elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+ {
+ $emphasis = 'em';
+ }
+ else
+ {
+ return;
+ }
+
+ return array(
+ 'extent' => strlen($matches[0]),
+ 'element' => array(
+ 'name' => $emphasis,
+ 'handler' => 'line',
+ 'text' => $matches[1],
+ ),
+ );
+ }
+
+ #
+ # ~
+
+ protected function readPlainText($text)
+ {
+ $breakMarker = $this->breaksEnabled ? "\n" : " \n";
+
+ $text = str_replace($breakMarker, "<br />\n", $text);
+
+ return $text;
+ }
+
+ #
+ # ~
+ #
+
+ protected function li($lines)
+ {
+ $markup = $this->lines($lines);
+
+ $trimmedMarkup = trim($markup);
+
+ if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
+ {
+ $markup = $trimmedMarkup;
+ $markup = substr($markup, 3);
+
+ $position = strpos($markup, "</p>");
+
+ $markup = substr_replace($markup, '', $position, 4);
+ }
+
+ return $markup;
+ }
+
+ #
+ # Multiton
+ #
+
+ static function instance($name = 'default')
+ {
+ if (isset(self::$instances[$name]))
+ {
+ return self::$instances[$name];
+ }
+
+ $instance = new self();
+
+ self::$instances[$name] = $instance;
+
+ return $instance;
+ }
+
+ private static $instances = array();
+
+ #
+ # Deprecated Methods
+ #
+
+ /**
+ * @deprecated in favor of "text"
+ */
+ function parse($text)
+ {
+ $markup = $this->text($text);
+
+ return $markup;
+ }
+
+ #
+ # Fields
+ #
+
+ protected $Definitions;
+
+ #
+ # Read-only
+
+ protected $specialCharacters = array(
+ '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!',
+ );
+
+ protected $StrongRegex = array(
+ '*' => '/^[*]{2}((?:[^*]|[*][^*]*[*])+?)[*]{2}(?![*])/s',
+ '_' => '/^__((?:[^_]|_[^_]*_)+?)__(?!_)/us',
+ );
+
+ protected $EmRegex = array(
+ '*' => '/^[*]((?:[^*]|[*][*][^*]+?[*][*])+?)[*](?![*])/s',
+ '_' => '/^_((?:[^_]|__[^_]*__)+?)_(?!_)\b/us',
+ );
+
+ protected $textLevelElements = array(
+ 'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
+ 'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
+ 'i', 'rp', 'del', 'code', 'strike', 'marquee',
+ 'q', 'rt', 'ins', 'font', 'strong',
+ 's', 'tt', 'sub', 'mark',
+ 'u', 'xm', 'sup', 'nobr',
+ 'var', 'ruby',
+ 'wbr', 'span',
+ 'time',
+ );
+}
diff --git a/views/myplugins/_edit_release.php b/views/myplugins/_edit_release.php
index 26572272d0cdb2b61e8bd7efab477698b2ef9018..2327c0b8874183664caa58c272f087aae92b1bf1 100644
--- a/views/myplugins/_edit_release.php
+++ b/views/myplugins/_edit_release.php
@@ -63,7 +63,7 @@ if ($_SERVER['HTTPS'] == 'on' && $_SERVER['SERVER_PORT'] != 443 ||
<? if (!$release->isNew()) : ?>
<p class="info">
<?= _("Webhook-URL zum Einf�gen in github oder gitlab:") ?>
- <input type="text" style="border: thin solid #cccccc; background-color: #eeeeee;" value="<?= $DOMAIN_STUDIP.URLHelper::getLink("plugins.php/pluginmarket/update/release/".$release->getId(), array('s' => $release->getSecurityHash()), true) ?>">
+ <input type="text" style="border: thin solid #cccccc; background-color: #eeeeee; width:100%;" value="<?= $DOMAIN_STUDIP.URLHelper::getLink("plugins.php/pluginmarket/upate/".$release->getId(), array('s' => $release->getSecurityHash()), true) ?>">
</p>
<? if ($domain_warning) : ?>
<p class="info"><?= htmlReady($domain_warning) ?></p>
diff --git a/views/myplugins/overview.php b/views/myplugins/overview.php
index cf8056cd55594e8be4865d2a523e7116bf6ebbc9..e1220f4a3ad7a57d5a4e9c982851500c0d0fa4ab 100644
--- a/views/myplugins/overview.php
+++ b/views/myplugins/overview.php
@@ -3,6 +3,7 @@
<thead>
<tr>
<th><?= _("Name") ?></th>
+ <th><?= _("Letztes Update") ?></th>
<th></th>
</tr>
</thead>
@@ -10,7 +11,20 @@
<? if (count($plugins)) : ?>
<? foreach ($plugins as $marketplugin) : ?>
<tr>
- <td><?= htmlReady($marketplugin['name']) ?></td>
+ <td>
+ <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/details/".$marketplugin->getId()) ?>">
+ <?= htmlReady($marketplugin['name']) ?>
+ </a>
+ </td>
+ <td>
+ <?
+ $chdate = $marketplugin['chdate'];
+ foreach ($marketplugin->releases as $release) {
+ $chdate = max($chdate, $release['chdate']);
+ }
+ ?>
+ <?= date("j.n.Y, G:i", $chdate) ?> <?= _("Uhr") ?>
+ </td>
<td>
<a href="<?= PluginEngine::getLink($plugin, array(), "myplugins/edit/".$marketplugin->getId()) ?>" data-dialog><?= Assets::img("icons/20/blue/edit") ?></a>
</td>
diff --git a/views/presenting/details.php b/views/presenting/details.php
index 5a7bc4654a928f9c43ce3b256e9d5651a32948b8..017abe707ab7771a1be0f8809683cfd17ae9c9cd 100644
--- a/views/presenting/details.php
+++ b/views/presenting/details.php
@@ -3,6 +3,10 @@
<?= formatReady($marketplugin['description']) ?>
</div>
+<h2><?= _("Galerie") ?></h2>
+
+<div></div>
+
<h2><?= _("Releases") ?></h2>
<table class="default">
<thead>
@@ -19,7 +23,7 @@
<? foreach ($marketplugin->releases as $release) : ?>
<tr>
<td>
- <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/download/".$release->getId()) ?>">
+ <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/download/".$release->getId()) ?>" title="<?= _("Dieses Release runterladen") ?>">
<?= Assets::img("icons/20/blue/download", array('class' => "text-bottom")) ?>
<?= htmlReady($release['version']) ?>
</a>
@@ -40,6 +44,53 @@
</tbody>
</table>
+
+
+
+
+<?
+//Donations, wenn die Datenfelder "Flattr", "Bitcoin-Wallet" gesetzt sind
+$author = User::find($marketplugin['user_id']);
+$flattr_username = $author['datafields']->findBy("name", "Flattr")->val("content");
+$bitcoin_datafield = $author['datafields']->findBy("name", "Bitcoin-Wallet")->val("content");
+?>
+
+<? if ($flattr_username || $bitcoin_wallet) : ?>
+ <h2><?= _("Spenden") ?></h2>
+ <p class="info">
+ <?= _("Der Download ist kostenlos, aber man kann dem Autor mit einer Spende danken und zuk�nftige Entwicklungen anregen.") ?>
+ </p>
+<? endif ?>
+
+<div style="text-align: center;">
+ <? if ($flattr_username) : ?>
+ <script id='fbowlml'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//api.flattr.com/button/view/?uid=<?= urlencode(studip_utf8encode($flattr_username)) ?>&url='+encodeURIComponent(document.URL)+'&title=<?= urlencode(studip_utf8encode($marketplugin['name']." "._("f�r Stud.IP"))) ?>';f.title='Flattr';f.height=62;f.width=55;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fbowlml');</script>
+ <? endif ?>
+
+ <? if ($bitcoin_wallet) : ?>
+ <script src="http://coinwidget.com/widget/coin.js"></script>
+ <script>
+ CoinWidgetCom.go({
+ wallet_address: "<?= htmlReady($bitcoin_wallet) ?>"
+ , currency: "bitcoin"
+ , counter: "count"
+ , alignment: "bl"
+ , qrcode: true
+ , auto_show: false
+ , lbl_button: "Donate"
+ , lbl_address: "My Bitcoin Address:"
+ , lbl_count: "donations"
+ , lbl_amount: "BTC"
+ });
+ </script>
+ <? endif ?>
+</div>
+
+
+
+
+<? if ($marketplugin['user_id'] === $GLOBALS['user']->id) : ?>
<div style="text-align: center">
<?= \Studip\LinkButton::create(_("bearbeiten"), PluginEngine::getURL($plugin, array(), "myplugins/edit/".$marketplugin->getId()), array('data-dialog' => 1)) ?>
-</div>
\ No newline at end of file
+</div>
+<? endif ?>
\ No newline at end of file
diff --git a/views/presenting/overview.php b/views/presenting/overview.php
index c3cdae947a77e96a107ca5c62b7bec2d27879b5f..6cb20e0887e238f379233b6ce0402894a0582c65 100644
--- a/views/presenting/overview.php
+++ b/views/presenting/overview.php
@@ -15,6 +15,9 @@
max-height: 250px;
max-width: 250px;
overflow: hidden;
+ -webkit-animation: scaling 700ms ease-out;
+ -ms-animation: scaling 700ms ease-out;
+ animation: scaling 700ms ease-out;
}
.plugins_shortview > article > h1 {
margin: 0px;
@@ -40,6 +43,54 @@
font-size: 0.9em;
color: #879199;
}
+
+
+ @keyframes scaling {
+ from {
+ opacity: 0.8;
+ transform: scale(0.8,0.8) rotate(-3deg);
+ }
+ to {
+ opacity: 1;
+ transform: scale(1,1) rotate(0deg);
+ }
+ }
+
+ /* Safari, Chrome and Opera > 12.1 */
+ @-webkit-keyframes scaling {
+ from {
+ opacity: 0.8;
+ transform: scale(0.8,0.8) rotate(-3deg);
+ }
+ to {
+ opacity: 1;
+ transform: scale(1,1) rotate(0deg);
+ }
+ }
+
+ /* Internet Explorer */
+ @-ms-keyframes scaling {
+ from {
+ opacity: 0.8;
+ transform: scale(0.8,0.8) rotate(-3deg);
+ }
+ to {
+ opacity: 1;
+ transform: scale(1,1) rotate(0deg);
+ }
+ }
+
+ /* Opera < 12.1 */
+ @-o-keyframes scaling {
+ from {
+ opacity: 0.8;
+ transform: scale(0.8,0.8) rotate(-3deg);
+ }
+ to {
+ opacity: 1;
+ transform: scale(1,1) rotate(0deg);
+ }
+ }
</style>
<? if (isset($new_plugins) && count($new_plugins)) : ?>