remove donations

controllers/myplugins.php

@@ -89,9 +89,6 @@ class MypluginsController extends MarketController
             if (!isset($data["publiclyvisible"])) {
                 $data['publiclyvisible'] = 0;
             }
-            if (!isset($data["donationsaccepted"])) {
-                $data['donationsaccepted'] = 0;
-            }
             if (!$this->marketplugin->isRootable() && isset($data['deprecated'])) {
                 unset($data['deprecated']);
             }

migrations/01_init_plugin_migration.php

 <?php
 
 class InitPluginMigration extends Migration {
-    
+
     function description() {
         return 'creates the database';
     }
@@ -29,7 +29,7 @@ class InitPluginMigration extends Migration {
                 KEY `user_id` (`user_id`),
                 KEY `pluginclassname` (`pluginclassname`),
                 FULLTEXT KEY `searchdescription` (`description`,`short_description`)
-            ) ENGINE=MyISAM;
+            )
         ");
         $db->exec("
             CREATE TABLE IF NOT EXISTS `pluginmarket_releases` (
@@ -49,14 +49,14 @@ class InitPluginMigration extends Migration {
                 PRIMARY KEY (`release_id`),
                 KEY `plugin_id` (`plugin_id`),
                 KEY `user_id` (`user_id`)
-            ) ENGINE=MyISAM;
+            )
         ");
         $db->exec("
             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;
+            )
         ");
         $db->exec("
             CREATE TABLE IF NOT EXISTS `pluginmarket_tags` (
@@ -67,7 +67,7 @@ class InitPluginMigration extends Migration {
                 PRIMARY KEY (`tag`,`plugin_id`),
                 KEY `plugin_id` (`plugin_id`),
                 KEY `user_id` (`user_id`)
-            ) ENGINE=MyISAM;
+            )
         ");
         $db->exec("
             CREATE TABLE IF NOT EXISTS `pluginmarket_reviews` (
@@ -82,7 +82,7 @@ class InitPluginMigration extends Migration {
                 UNIQUE KEY `unique_votes` (`plugin_id`,`user_id`),
                 KEY `plugin_id` (`plugin_id`),
                 KEY `user_id` (`user_id`)
-            ) ENGINE=MyISAM;
+            )
         ");
         $db->exec("
             CREATE TABLE IF NOT EXISTS `pluginmarket_images` (
@@ -95,7 +95,7 @@ class InitPluginMigration extends Migration {
                 `chdate` int(20) NOT NULL,
                 PRIMARY KEY (`image_id`),
                 KEY `plugin_id` (`plugin_id`)
-            ) ENGINE=MyISAM
+            )
         ");
         $db->exec("
             CREATE TABLE IF NOT EXISTS `pluginmarket_release_followers` (
@@ -108,7 +108,7 @@ class InitPluginMigration extends Migration {
                 `mkdate` bigint(20) NOT NULL,
                 PRIMARY KEY (`releasefollower_id`),
                 UNIQUE KEY `unique_users` (`user_id`,`release_id`)
-            ) ENGINE=MyISAM
+            )
         ");
         $db->exec("
             CREATE TABLE IF NOT EXISTS `pluginmarket_plugin_follower` (
@@ -120,12 +120,12 @@ class InitPluginMigration extends Migration {
                 PRIMARY KEY (`following_id`),
                 KEY `user_id` (`user_id`),
                 KEY `plugin_id` (`plugin_id`)
-            ) ENGINE=MyISAM
+            )
         ");
 
     }
-	
+
     public function down() {
 
     }
-}
+}
\ No newline at end of file

migrations/09_remove_donations.php

+<?php
+class RemoveDonations extends Migration {
+
+    public function up() {
+
+        DBManager::get()->exec("
+            ALTER TABLE `pluginmarket_plugins` DROP COLUMN `donationsaccepted`
+        ");
+        SimpleORMap::expireTableScheme();
+    }
+
+    public function down()
+    {
+        DBManager::get()->exec("
+            ALTER TABLE `pluginmarket_plugins` ADD COLUMN `donationsaccepted` TINYINT NOT NULL DEFAULT '0'
+        ");
+        SimpleORMap::expireTableScheme();
+    }
+
+}

plugin.manifest

 pluginname=PluginMarktplatz
 pluginclassname=PluginMarket
 origin=studip
-version=1.1
+version=1.2

views/myplugins/edit.php

@@ -65,11 +65,6 @@
             </p>
         </div>
 
-        <label>
-            <?= _("Möglichkeit zum Spenden einblenden") ?>
-            <input type="checkbox" name="data[donationsaccepted]" value="1"<?= $marketplugin->isNew() || $marketplugin['donationsaccepted'] ? " checked" : "" ?>>
-        </label>
-
         <? if ($marketplugin->isRootable()) : ?>
             <label>
                 <?= _("Plugin veraltet") ?>

views/presenting/details.php

@@ -170,65 +170,6 @@ if ($image) {
 
 
 
-
-
-<? if ($marketplugin['donationsaccepted']) : ?>
-    <?
-    //Donations, wenn die Datenfelder "Flattr", "Bitcoin-Wallet" gesetzt sind
-    $author = User::find($marketplugin['user_id']);
-    if ($author) {
-        $flattr_username = $author['datafields']->findBy("name", "Flattr")->val("content");
-        $bitcoin_datafield = $author['datafields']->findBy("name", "Bitcoin-Wallet")->val("content");
-        $paypal_datafield = $author['datafields']->findBy("name", "Paypal-Account (Email)")->val("content");
-    }
-    ?>
-
-    <? if ($flattr_username || $bitcoin_wallet || $paypal_datafield) : ?>
-        <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($flattr_username) ?>&url='+encodeURIComponent(document.URL)+'&title=<?= urlencode($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 (!empty($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 ?>
-
-        <? if ($paypal_datafield) : ?>
-            <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top" style="display: inline-block;">
-                <div><strong><img src="http://pics.ebaystatic.com/aw/pics/logos/logoPayPal_51x14.gif"></strong></div>
-                <input type="hidden" name="cmd" value="_donations">
-                <input type="hidden" name="business" value="<?= htmlReady($paypal_datafield) ?>">
-                <input type="hidden" name="lc" value="DE">
-                <input type="hidden" name="no_note" value="0">
-                <input type="hidden" name="currency_code" value="EUR">
-                <input type="hidden" name="bn" value="PP-DonationsBF:btn_donateCC_LG.gif:NonHostedGuest">
-                <input type="image" src="https://www.paypalobjects.com/de_DE/DE/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="Jetzt einfach, schnell und sicher online bezahlen – mit PayPal.">
-                <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-            </form>
-        <? endif ?>
-    </div>
-<? endif ?>
-
 <h2><?= _("Bewertungen") ?></h2>
 <div>
     <div style="text-align: center;">