fromapp force setting

diff --git a/fromapp.tgz b/fromapp.tgz
index dbe45ebe0578d594bbd4cd34e04a6eff39f02493..30d84e90533032bb09de73f10074a0345476a86f 100644 (file)
Binary files a/fromapp.tgz and b/fromapp.tgz differ

diff --git a/fromapp/fromapp.css b/fromapp/fromapp.css
index 90aeec49e5ecb81544a615bb89a7bf6ff0955ba6..422624a1dbf060031e9af334eb6cd7e794422288 100644 (file)
--- a/fromapp/fromapp.css
+++ b/fromapp/fromapp.css
@@ -1,13 +1,13 @@
 
 
 
-#fromapp-label {
+#fromapp-label, #fromapp-force-label {
        float: left;
        width: 200px;
        margin-bottom: 25px;
 }
 
-#fromapp {
+#fromapp-input, #fromapp-force {
        float: left;
 }
 

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 51c959060ebe0d2e82b3cbc72840a1911e358582..9a9fa12ba970ac68c97cf83c9886056e21d9c49c 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -32,7 +32,9 @@ function fromapp_settings_post($a,$post) {
        if(! local_user() || (! x($_POST,'fromapp-submit')))
                return;
 
-       set_pconfig(local_user(),'fromapp','app',$_POST['fromapp']);
+       set_pconfig(local_user(),'fromapp','app',$_POST['fromapp-input']);
+       set_pconfig(local_user(),'fromapp','force',intval($_POST['fromapp-force']));
+
        info( t('Fromapp settings updated.') . EOL);
 }
 
@@ -50,14 +52,24 @@ function fromapp_settings(&$a,&$s) {
        $fromapp = get_pconfig(local_user(),'fromapp','app');
        if($fromapp === false)
                $fromapp = '';
+
+       $force = intval(get_pconfig(local_user(),'fromapp','force'));
+
+       $force_enabled = (($force) ? ' checked="checked" ' : '');
+
        
        /* Add some HTML to the existing form */
 
        $s .= '<div class="settings-block">';
        $s .= '<h3>' . t('FromApp Settings') . '</h3>';
        $s .= '<div id="fromapp-wrapper">';
-       $s .= '<label id="fromapp-label" for="fromapp">' . t('The application name you would like to show your posts originating from.') . '</label>';
-       $s .= '<input id="fromapp-input" type="text" name="fromapp" value="' . $fromapp . '" ' . '/>';
+       $s .= '<label id="fromapp-label" for="fromapp-input">' . t('The application name you would like to show your posts originating from.') . '</label>';
+       $s .= '<input id="fromapp-input" type="text" name="fromapp-input" value="' . $fromapp . '" ' . '/>';
+       $s .= '<div class="clear"></div>';
+
+       $s .= '<label id="fromapp-force-label" for="fromapp-force">' . t('Use this application name even if another application was used.') . '</label>';
+       $s .= '<input id="fromapp-force" type="checkbox" name="fromapp-force" value="1" ' . $force_enabled . '/>';
+
        $s .= '</div><div class="clear"></div>';
 
        /* provide a submit button */
@@ -74,10 +86,14 @@ function fromapp_post_hook(&$a,&$item) {
         return;
 
     $app = get_pconfig(local_user(), 'fromapp', 'app');
+       $force = intval(get_pconfig(local_user(), 'fromapp','force'));
 
     if(($app === false) || (! strlen($app)))
         return;
 
+       if(strlen(trim($item['app'])) && (! $force))
+               return;
+
        $apps = explode(',',$app);
        $item['app'] = trim($apps[mt_rand(0,count($apps)-1)]);
        return;