Changeset 1340103

Timestamp:

01/31/2016 05:38:13 PM (10 years ago)

Author:

.dan

Message:

options

Location:

smokesignal/trunk

Files:

• class.smokesignal.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• smoke-signal.php (modified) (2 diffs)
• translations/smokesignal-cs_CZ.mo (modified) (previous)
• translations/smokesignal-cs_CZ.po (modified) (6 diffs)
• translations/smokesignal-sk_SK.mo (modified) (previous)
• translations/smokesignal-sk_SK.po (modified) (5 diffs)
• views/new.php (modified) (2 diffs)

smokesignal/trunk/class.smokesignal.php

@@ -268 +268 @@
 */
         $current_user = wp_get_current_user();
+
+        $options = get_option('smokesignal_options');
+        $emailExcerpt = false;
+        if(!empty($options['email_excerpt']) && $options['email_excerpt'] == true) {
+            $emailExcerpt = true;
+        }
+
+        if($emailExcerpt) {
+            $message = substr( $message, 0, strrpos( substr( $message, 0, 50), ' ' ) );
+            $message .= '...';
+        }
 
         if(!empty($user)) {

smokesignal/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.4.1
-Stable tag: 1.2.4
+Stable tag: 1.2.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -24 +24 @@
 
 == Changelog ==
+= 1.2.5 =
+* Added options for sending only excerpt of message and input type for recipients
+
 = 1.2.4 =
 * Czech translation

smokesignal/trunk/smoke-signal.php

@@ -8 +8 @@
  * Plugin URI: http://www.danielhrenak.sk
  * Description: A brief description of the plugin.
- * Version: 1.2.4
+ * Version: 1.2.5
  * Author: Daniel Hrenak
  * Author URI: http://www.danielhrenak.sk
@@ -53 +53 @@
     require_once(SMOKESIGNAL_PLUGIN_DIR . 'class.smokesignal.php');
     require_once(SMOKESIGNAL_PLUGIN_DIR . 'class.smokesignalgroup.php');
+    require_once(SMOKESIGNAL_PLUGIN_DIR . 'options.php');
 
     add_action('init', array('SmokeSignal', 'init'));

smokesignal/trunk/translations/smokesignal-cs_CZ.po

@@ -5 +5 @@
 "Project-Id-Version: SmokeSignal v1.0\n"
 "Report-Msgid-Bugs-To: https://smokesignal.trac.wordpress.org\n"
-"POT-Creation-Date: 2015-02-25 20:28+0100\n"
-"PO-Revision-Date: 2015-02-25 20:28+0100\n"
+"POT-Creation-Date: 2016-01-27 18:35+0100\n"
+"PO-Revision-Date: 2016-01-31 17:59+0100\n"
 "Last-Translator: Daniel Hrenak <[email protected]>\n"
 "Language-Team:  <[email protected]>\n"
@@ -19 +19 @@
 "X-Poedit-SearchPath-0: /www/wp/wp41/wp-content/plugins/smokesignal\n"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:63
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:67
 msgid "User Messages"
 msgstr "Zprávy uživatelů"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:63
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:67
 msgid "Messages"
 msgstr "Zprávy"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:67
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:71
 msgid "User Groups"
 msgstr "Skupiny užívatelů"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:67
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:71
 msgid "Groups"
 msgstr "Skupiny"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:83
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:260
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:87
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:265
 msgid "You have new messages"
 msgstr "Máš nové zprávy"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:262
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:267
 msgid "has wrote you: "
 msgstr "ti napísal(a):"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:266
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:271
 msgid "You can reply in your user section at"
 msgstr "Odpovědět môžeš v užívatelské části na stránce"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:268
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:273
 msgid "... and have a nice day :)"
 msgstr "... a přeji pěkný den :)"
@@ -67 +67 @@
 
 #: /www/wp/wp41/wp-content/plugins/smokesignal/views/group.php:25
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:21
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:11
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:22
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:12
 msgid "Add attachment"
 msgstr "Vložit soubor"
 
 #: /www/wp/wp41/wp-content/plugins/smokesignal/views/group.php:30
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:26
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:14
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:28
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:16
 msgid "Send"
 msgstr "Odeslat"
@@ -139 +139 @@
 msgstr "Zobrazit a odpovědět"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/list.php:66
-msgid "wrote at"
-msgstr "napsal(a) v"
-
 #: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:8
 msgid "Send to"
@@ -151 +147 @@
 msgstr "Komunikace s "
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:30
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:32
 msgid "Load more"
 msgstr "Načíst další"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:32
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:34
 msgid "No more messages"
 msgstr "Žádné další zprávy"
@@ -167 +163 @@
 msgstr "já"
 
+msgid "Select from users"
+msgstr "Vybírat z uživatelů"
+
+msgid "Write username"
+msgstr "Psat uživatelské jméno\t"
+
+msgid "SmokeSignal Settings"
+msgstr "SmokeSignal nastavení"
+
+msgid "General settings"
+msgstr "Všeobecné nastavení"
+
+msgid "Email notifications"
+msgstr "Emailové notifikace"
+
+msgid "Recipient input type"
+msgstr "Zadávaní adresáta"
+
+msgid "send only excerpt of message"
+msgstr "v emailové notifikaci uvádět pouze čásť zprávy"
+
+#~ msgid "wrote at"
+#~ msgstr "napsal(a) v"
 
 #~ msgid "Send to all users with role"

smokesignal/trunk/translations/smokesignal-sk_SK.po

@@ -5 +5 @@
 "Project-Id-Version: SmokeSignal v1.0\n"
 "Report-Msgid-Bugs-To: https://smokesignal.trac.wordpress.org\n"
-"POT-Creation-Date: 2015-02-25 20:28+0100\n"
-"PO-Revision-Date: 2016-01-09 20:41+0100\n"
+"POT-Creation-Date: 2016-01-27 18:35+0100\n"
+"PO-Revision-Date: 2016-01-31 17:59+0100\n"
 "Last-Translator: Daniel Hrenak <[email protected]>\n"
 "Language-Team:  <[email protected]>\n"
@@ -19 +19 @@
 "X-Poedit-SearchPath-0: /www/wp/wp41/wp-content/plugins/smokesignal\n"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:63
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:67
 msgid "User Messages"
 msgstr "Správy užívateľov"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:63
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:67
 msgid "Messages"
 msgstr "Správy"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:67
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:71
 msgid "User Groups"
 msgstr "Skupiny užívateľov"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:67
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:71
 msgid "Groups"
 msgstr "Skupiny"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:83
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:260
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:87
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:265
 msgid "You have new messages"
 msgstr "Máš nové správy"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:262
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:267
 msgid "has wrote you: "
 msgstr "ti napísal(a):"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:266
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:271
 msgid "You can reply in your user section at"
 msgstr "Odpovedať môžeš v užívateľskej časti na stránke"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:268
+#: /www/wp/wp41/wp-content/plugins/smokesignal/class.smokesignal.php:273
 msgid "... and have a nice day :)"
 msgstr "... a prajem pekný deň :)"
@@ -67 +67 @@
 
 #: /www/wp/wp41/wp-content/plugins/smokesignal/views/group.php:25
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:21
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:11
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:22
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:12
 msgid "Add attachment"
 msgstr "Vložiť súbor"
 
 #: /www/wp/wp41/wp-content/plugins/smokesignal/views/group.php:30
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:26
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:14
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/new.php:28
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:16
 msgid "Send"
 msgstr "Odoslať"
@@ -147 +147 @@
 msgstr "Komunikácia s "
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:30
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:32
 msgid "Load more"
 msgstr "Načítať ďalšie"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:32
+#: /www/wp/wp41/wp-content/plugins/smokesignal/views/reply.php:34
 msgid "No more messages"
 msgstr "Žiadne ďalšie správy"
@@ -163 +163 @@
 msgstr "ja"
 
-#: /www/wp/wp41/wp-content/plugins/smokesignal/views/list.php:66
-msgid "wrote at"
-msgstr "napísal(a) o"
+msgid "Select from users"
+msgstr "Vyberať z uživateľov"
+
+msgid "Write username"
+msgstr "Písať užívateľské mená"
+
+msgid "SmokeSignal Settings"
+msgstr "SmokeSignal nastavenia"
+
+msgid "General settings"
+msgstr "Všeobecné nastavenia"
+
+msgid "Email notifications"
+msgstr "Emailové notifikácie"
+
+msgid "Recipient input type"
+msgstr "Zadávanie adresáta"
+
+msgid "send only excerpt of message"
+msgstr "v emailovej notifikácii zobrazovať iba úryvok správy"
+
+#~ msgid "wrote at"
+#~ msgstr "napísal(a) o"
 
 #~ msgid "Send to all users with role"

smokesignal/trunk/views/new.php

@@ +1 @@
+
+<?php
+$options = get_option('smokesignal_options');
+
+$selectUser = true;
+if(!empty($options['recipient_input_type']) && $options['recipient_input_type'] == 'input') {
+    $selectUser = false;
+}
+
+?>
 
 <div class="wrap">
@@ -8 +18 @@
                     <th scope="row"><label for="to_id"><?= __('Send to', 'smokesignal') ?></label></th>
                     <td>
-                        <!-- <input name="to_name" id="to_name" /> -->
-
-                        <select name="to_id" id="to_id">
-                            <?php foreach($args['users'] as $user) { ?>
-                            <option value="<?= $user->id ?>"><?= $user->user_nicename ?></option>
-                            <?php } ?>
-                        </select>
+                        <?php if($selectUser) { ?>
+                            <select name="to_id" id="to_id">
+                                <?php foreach($args['users'] as $user) { ?>
+                                    <option value="<?= $user->id ?>"><?= $user->user_nicename ?></option>
+                                <?php } ?>
+                            </select>
+                        <?php } else { ?>
+                            <input name="to_name" id="to_name" />
+                        <?php } ?>
 
                     </td>