Merge pull request hestiacp#1617 from trajche/Roundcube-ubuntu-change-password

myvesta · web-flow · commit 4922062af6e2 · 2018-06-13T21:04:17.000+02:00
Fixing the change password for Roundcube to work with Ubuntu
diff --git a/install/ubuntu/16.04/roundcube/vesta.php b/install/ubuntu/16.04/roundcube/vesta.php
@@ -6,8 +6,9 @@
  * @version 1.0
  * @author Serghey Rodin <skid@vestacp.com>
  */
-
-    function password_save($curpass, $passwd)
+class rcube_vesta_password
+{
+    function save($curpass, $passwd)
     {
         $rcmail = rcmail::get_instance();
         $vesta_host = $rcmail->config->get('password_vesta_host');
@@ -69,3 +70,4 @@ function password_save($curpass, $passwd)
         }
 
     }
+}
diff --git a/install/ubuntu/16.10/roundcube/vesta.php b/install/ubuntu/16.10/roundcube/vesta.php
@@ -6,8 +6,8 @@
  * @version 1.0
  * @author Serghey Rodin <skid@vestacp.com>
  */
-
-    function password_save($curpass, $passwd)
+class rcube_vesta_password {
+    function save($curpass, $passwd)
     {
         $rcmail = rcmail::get_instance();
         $vesta_host = $rcmail->config->get('password_vesta_host');
@@ -69,3 +69,4 @@ function password_save($curpass, $passwd)
         }
 
     }
+}
diff --git a/install/ubuntu/17.04/roundcube/vesta.php b/install/ubuntu/17.04/roundcube/vesta.php
@@ -6,8 +6,9 @@
  * @version 1.0
  * @author Serghey Rodin <skid@vestacp.com>
  */
-
-    function password_save($curpass, $passwd)
+class rcube_vesta_password
+{
+    function save($curpass, $passwd)
     {
         $rcmail = rcmail::get_instance();
         $vesta_host = $rcmail->config->get('password_vesta_host');
@@ -69,3 +70,4 @@ function password_save($curpass, $passwd)
         }
 
     }
+}
diff --git a/install/ubuntu/17.10/roundcube/vesta.php b/install/ubuntu/17.10/roundcube/vesta.php
@@ -6,8 +6,8 @@
  * @version 1.0
  * @author Serghey Rodin <skid@vestacp.com>
  */
-
-    function password_save($curpass, $passwd)
+class rcube_vesta_password {
+    function save($curpass, $passwd)
     {
         $rcmail = rcmail::get_instance();
         $vesta_host = $rcmail->config->get('password_vesta_host');
@@ -69,3 +69,4 @@ function password_save($curpass, $passwd)
         }
 
     }
+}
diff --git a/install/ubuntu/18.04/roundcube/vesta.php b/install/ubuntu/18.04/roundcube/vesta.php
@@ -6,8 +6,8 @@
  * @version 1.0
  * @author Serghey Rodin <skid@vestacp.com>
  */
-
-    function password_save($curpass, $passwd)
+class rcube_vesta_password {
+    function save($curpass, $passwd)
     {
         $rcmail = rcmail::get_instance();
         $vesta_host = $rcmail->config->get('password_vesta_host');
@@ -69,3 +69,4 @@ function password_save($curpass, $passwd)
         }
 
     }
+}

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,9 @@`
`6`	`6`	`* @version 1.0`
`7`	`7`	`* @author Serghey Rodin <skid@vestacp.com>`
`8`	`8`	`*/`
`9`		`-`
`10`		`- function password_save($curpass, $passwd)`
	`9`	`+class rcube_vesta_password`
	`10`	`+{`
	`11`	`+ function save($curpass, $passwd)`
`11`	`12`	`{`
`12`	`13`	`$rcmail = rcmail::get_instance();`
`13`	`14`	`$vesta_host = $rcmail->config->get('password_vesta_host');`
`@@ -69,3 +70,4 @@ function password_save($curpass, $passwd)`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`}`
	`73`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`* @version 1.0`
`7`	`7`	`* @author Serghey Rodin <skid@vestacp.com>`
`8`	`8`	`*/`
`9`		`-`
`10`		`- function password_save($curpass, $passwd)`
	`9`	`+class rcube_vesta_password {`
	`10`	`+ function save($curpass, $passwd)`
`11`	`11`	`{`
`12`	`12`	`$rcmail = rcmail::get_instance();`
`13`	`13`	`$vesta_host = $rcmail->config->get('password_vesta_host');`
`@@ -69,3 +69,4 @@ function password_save($curpass, $passwd)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`}`
	`72`	`+}`