changes of the weekend

PluginMarket.class.php

@@ -9,7 +9,7 @@ class PluginMarket extends StudIPPlugin implements SystemPlugin {
     public function __construct() {
         parent::__construct();
         $top = new Navigation($this->getDisplayTitle(), PluginEngine::getURL($this, array(), "presenting/overview"));
-        $top->setImage($this->getPluginURL()."/assets/topicon_42.png");
+        $top->setImage($this->getPluginURL()."/assets/topicon_".($GLOBALS['auth']->auth['devicePixelRatio'] ? 84 : 42).".png");
         $top->addSubNavigation("presenting", new Navigation($this->getDisplayTitle(), PluginEngine::getURL($this, array(), "presenting/overview")));
         if ($GLOBALS['perm']->have_perm("autor")) {
             $top->addSubNavigation("myplugins", new Navigation(_("Meine Plugins"), PluginEngine::getURL($this, array(), "myplugins/overview")));

controllers/myplugins.php

@@ -44,8 +44,12 @@ class MypluginsController extends PluginController {
         if (!Request::isPost()) {
             throw new Exception("Method not allowed. Try a POST request.");
         }
+        $data = Request::getArray("data");
+        if (!isset($data["publiclyvisible"])) {
+            $data['publiclyvisible'] = 0;
+        }
         $this->marketplugin = new MarketPlugin(Request::option("id") ?: null);
-        $this->marketplugin->setData(Request::getArray("data"));
+        $this->marketplugin->setData($data);
         if ($this->marketplugin->isNew()) {
             $this->marketplugin['user_id'] = $GLOBALS['user']->id;
         }

controllers/presenting.php

@@ -22,7 +22,7 @@ class PresentingController extends PluginController {
             }
         }
 
-        $this->plugins = MarketPlugin::findBySQL("1=1 ORDER BY name ASC");
+        $this->plugins = MarketPlugin::findBySQL("publiclyvisible = 1 AND approved = 1 ORDER BY name ASC");
     }
 
     public function details_action($plugin_id) {

install.sql

@@ -8,7 +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',
+    `publiclyvisible` TINYINT 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',

views/myplugins/edit.php

@@ -28,6 +28,11 @@
             <textarea class="add_toolbar" name="data[description]"><?= htmlReady($marketplugin['description']) ?></textarea>
         </label>
 
+        <label>
+            <?= _("Sichtbar fr alle") ?>
+            <input type="checkbox" name="data[publiclyvisible]" value="1"<?= $marketplugin->isNew() || $marketplugin['publiclyvisible'] ? " checked" : "" ?>>
+        </label>
+
         <div>
             <?= _("Lizenz") ?>
             <input type="hidden" name="data[license]" value="GPL 2 or later">

views/myplugins/overview.php

@@ -5,6 +5,7 @@
             <th><?= _("Name") ?></th>
             <th><?= _("Letztes Update") ?></th>
             <th></th>
+            <th></th>
         </tr>
     </thead>
     <tbody>
@@ -25,6 +26,11 @@
                 ?>
                 <?= date("j.n.Y, G:i", $chdate) ?> <?= _("Uhr") ?>
             </td>
+            <td>
+                <? if (!$marketplugin['publiclyvisible']) :  ?>
+                    <?= Assets::img("icons/20/grey/lock-locked.png.png", array('title' => _("Plugin ist nicht ffentlich"))) ?>
+                <? endif ?>
+            </td>
             <td>
                 <a href="<?= PluginEngine::getLink($plugin, array(), "myplugins/edit/".$marketplugin->getId()) ?>" data-dialog><?= Assets::img("icons/20/blue/edit") ?></a>
             </td>

views/presenting/details.php

+<? if (!$marketplugin['publiclyvisible']) : ?>
+    <?= PageLayout::postMessage(MessageBox::info(_("Dieses Plugin ist nicht ffentlich."))) ?>
+<? endif ?>
+
 <h1><?= htmlReady($marketplugin['name']) ?></h1>
 <div>
     <?= formatReady($marketplugin['description']) ?>
@@ -5,7 +9,11 @@
 
 <h2><?= _("Galerie") ?></h2>
 
-<div></div>
+<div>
+    <? if ($marketplugin['user_id'] === $GLOBALS['user']->id) : ?>
+    <div><a href=""><?= Assets::img("icons/20/blue/add") ?></a></div>
+    <? endif ?>
+</div>
 
 <h2><?= _("Releases") ?></h2>
 <table class="default">