Merge pull request #84 from YetiForceCompany/developer

0.2.9
YetiForceCompany · Jan 4, 2022 · 4b6cba9 · 4b6cba9
2 parents 895eda1 + 837bac2
commit 4b6cba9
Show file tree

Hide file tree

Showing 29 changed files with 241 additions and 366 deletions.
diff --git a/plugins/contextmenu/contextmenu.php b/plugins/contextmenu/contextmenu.php
@@ -28,7 +28,7 @@
  */
 class contextmenu extends rcube_plugin
 {
-    public $task = '^((?!login).)*$';
+    public $task = '?(?!login$|logout$|cli$).*';
     private $rcube;
 
     public function init()

diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php
@@ -111,10 +111,10 @@ function preferences_list($args)
     function preferences_save($args)
     {
         if ($args['section'] == 'mailview') {
-            $args['prefs']['emoticons_display'] = !empty(rcube_utils::get_input_value('_emoticons_display', rcube_utils::INPUT_POST));
+            $args['prefs']['emoticons_display'] = (bool) rcube_utils::get_input_value('_emoticons_display', rcube_utils::INPUT_POST);
         }
         else if ($args['section'] == 'compose') {
-            $args['prefs']['emoticons_compose'] = !empty(rcube_utils::get_input_value('_emoticons_compose', rcube_utils::INPUT_POST));
+            $args['prefs']['emoticons_compose'] = (bool) rcube_utils::get_input_value('_emoticons_compose', rcube_utils::INPUT_POST);
         }
 
         return $args;

diff --git a/plugins/emoticons/emoticons_engine.php b/plugins/emoticons/emoticons_engine.php
diff --git a/plugins/jqueryui/themes/elastic/jquery-ui.min.css b/plugins/jqueryui/themes/elastic/jquery-ui.min.css
diff --git a/plugins/jqueryui/themes/elastic/jquery.minicolors.min.css b/plugins/jqueryui/themes/elastic/jquery.minicolors.min.css
diff --git a/plugins/password/drivers/cpanel_webmail.php b/plugins/password/drivers/cpanel_webmail.php
diff --git a/plugins/password/drivers/directadmin.php b/plugins/password/drivers/directadmin.php
@@ -190,7 +190,10 @@ function query($request, $content = '')
             $this->set_login($location['user'], $location['pass']);
 
             $request = $location['path'];
-            $content = $location['query'];
+
+            if ($content == '') {
+                $content = $location['query'];
+            }
 
             if (strlen($request) < 1) {
                 $request = '/';
@@ -320,7 +323,7 @@ function query($request, $content = '')
 
                 $this->max_redirects--;
                 $this->redirectURL = $headers['location'];
-                $this->query($headers['location']);
+                $this->query($headers['location'], $content);
             }
         }
     }

diff --git a/plugins/password/helpers/chpass-wrapper.py b/plugins/password/helpers/chpass-wrapper.py
@@ -26,7 +26,7 @@
     sys.exit('Changing password for user %s is forbidden (user blacklisted)' %
              username)
 
-handle = subprocess.Popen('/usr/sbin/chpasswd', stdin = subprocess.PIPE)
+handle = subprocess.Popen('/usr/sbin/chpasswd', stdin = subprocess.PIPE, universal_newlines = True)
 handle.communicate('%s:%s' % (username, password))
 
 sys.exit(handle.returncode)