[Php-blog-plugin-cvs] additional_plugins/serendipity_event_flattr lang_de.inc.php, 1.1, 1.2 lang_en.inc.php, 1.1, 1.2 serendipity_event_flattr.php, 1.1, 1.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_flattr
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7721

Modified Files:
	lang_de.inc.php lang_en.inc.php serendipity_event_flattr.php 
Log Message:
enable on per-entry basis


Index: lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_flattr/lang_en.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lang_en.inc.php	18 May 2010 11:48:53 -0000	1.1
+++ lang_en.inc.php	18 May 2010 12:03:04 -0000	1.2
@@ -15,3 +15,4 @@
 @define('PLUGIN_FLATTR_DSC', 'Flattr posting description (defaults to entry body)');
 @define('PLUGIN_FLATTR_TAG', 'Flattr posting tags (defaults to freetag plugin, if used)');
 
+@define('PLUGIN_FLATTR_ACTIVE', 'Enable flattr');
\ No newline at end of file

Index: serendipity_event_flattr.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_flattr/serendipity_event_flattr.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_flattr.php	18 May 2010 11:48:53 -0000	1.1
+++ serendipity_event_flattr.php	18 May 2010 12:03:04 -0000	1.2
@@ -146,6 +146,7 @@
         );
         
         $this->flattr_attrs = array(
+            'flattr_active' => PLUGIN_FLATTR_ACTIVE,
             'flattr_dsc' => PLUGIN_FLATTR_DSC,
             'flattr_cat' => PLUGIN_FLATTR_CATS,
             'flattr_lng' => PLUGIN_FLATTR_LANG,
@@ -216,6 +217,7 @@
             case 'backend_publish':
             case 'backend_save':
                 serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = '" . $eventData['id'] . "' AND property LIKE 'ep_flattr%'");
+
                 foreach($this->flattr_attrs AS $attr => $attr_desc) {
                     serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, value, property) VALUES ('" . $eventData['id'] . "', '" . serendipity_db_escape_string($serendipity['POST']['properties']['ep_' . $attr]) . "', 'ep_" . $attr . "')");
                 }
@@ -237,19 +239,22 @@
                             $val = '';
                         }
                         
-                        echo '<label for="serendipity[properties][ep_' . $attr . '" title="' . PLUGIN_FLATTR_NAME . '">
+                        echo '<label for="serendipity[properties][ep_' . $attr . ']" title="' . PLUGIN_FLATTR_NAME . '">
                             ' . $attr_desc . ':</label><br/>';
 
-                        if ($attr == 'flattr_lng' || $attr == 'flattr_cat') { 
+                        if ($attr == 'flattr_active' || $attr == 'flattr_lng' || $attr == 'flattr_cat') { 
                             echo '<select name="serendipity[properties][ep_' . $attr . ']" id="properties_' . $attr . '" class="input_select">';
                             if ($attr == 'flattr_lng') {
                                 $opt = $this->flattr_langs;
+                                echo '<option value=""></option>' . "\n";
                             } elseif ($attr == 'flattr_cat') {
                                 $opt = $this->flattr_cats;
+                                echo '<option value=""></option>' . "\n";
+                            } elseif ($attr == 'flattr_active') {
+                                $opt = array('1' => YES, '-1' => NO);
                             }
-                            echo '<option value=""></option>' . "\n";
                             foreach($opt AS $key => $kval) {
-                                echo '<option value="' . $key . '" ' . ($val == $kval ? 'selected="selected"' : '') . '>' . htmlspecialchars($kval) . '</option>' . "\n";
+                                echo '<option value="' . $key . '" ' . ((string)$val == (string)$key ? 'selected="selected"' : '') . '>' . htmlspecialchars($kval) . '</option>' . "\n";
                             }
                             echo '</select>';
                         } else {
@@ -269,6 +274,11 @@
                 $field = 'feed_body';
 
             case 'frontend_display':
+            
+                if ($eventData['properties']['ep_flattr_active'] == '-1') {
+                    return true;
+                }
+
                 $flattr_uid = $this->_addslashes($this->get_config('userid'));
                 $flattr_tle = $this->_addslashes($eventData['title']);
 

Index: lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_flattr/lang_de.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lang_de.inc.php	18 May 2010 11:48:53 -0000	1.1
+++ lang_de.inc.php	18 May 2010 12:03:04 -0000	1.2
@@ -15,3 +15,4 @@
 @define('PLUGIN_FLATTR_DSC', 'Flattr-Beschreibung (standardmäßig Artikeltext)');
 @define('PLUGIN_FLATTR_TAG', 'Flattr-Schlagwörter (standardmäßig vom Artikel-Tags-Plugin, falls verwendet)');
 
+@define('PLUGIN_FLATTR_ACTIVE', 'Flattr aktivieren');
\ No newline at end of file