Deleting users fix

Author: Vitexus

debian/changelog

@@ -1,4 +1,4 @@
-icinga-editor (0.200-11) UNRELEASED; urgency=medium
+icinga-editor (0.200-12) UNRELEASED; urgency=medium
 
   [ dvorak ]
   * Initial release. (Closes: #XXXXXX)
@@ -23,5 +23,6 @@ icinga-editor (0.200-11) UNRELEASED; urgency=medium
   * Database Renamed to icinga_editor
   * Fix User(s content) delete
   * Namespace use fix for engine classes
+  * Namespace use fix for engine classes II
 
- -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 19 Jul 2016 15:26:34 +0200
+ -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 19 Jul 2016 15:32:49 +0200

debian/conf/icinga-editor.conf

@@ -18,7 +18,7 @@ Alias /icinga-editor /usr/share/icinga-editor
 		php_admin_flag allow_url_fopen On
 		php_value include_path .:/usr/share/php:/usr/share/icinga-editor/classes
 #		php_admin_value upload_tmp_dir /var/lib/icinga-editor/tmp
-		php_admin_value open_basedir /usr/share/icinga-editor/:/etc/icinga-editor/:/etc/icinga/generated/:/var/lib/icinga-editor/:/usr/share/php/:/usr/share/javascript/:/usr/share/locale:/var/lib/icinga-editor/:/var/tmp:/tmp:/etc/apache2/conf-enabled/:/usr/share/icinga/htdocs/images/logos/:/usr/share/nagios/htdocs/images
+		php_admin_value open_basedir /usr/share/icinga-editor/:/etc/icinga-editor/:/etc/icinga/generated/:/var/lib/icinga-editor/:/usr/share/php/:/usr/share/javascript/:/usr/share/locale:/var/lib/icinga-editor/:/var/tmp:/tmp:/etc/apache2/conf-enabled/icinga-web.conf:/usr/share/icinga/htdocs/images/logos/:/usr/share/nagios/htdocs/images
 	</IfModule>
 
 # enable gzip compression

debian/control

@@ -7,7 +7,7 @@ Priority: optional
 Homepage: http://vitexsoftware.cz/monitoring.php
 
 Package: icinga-editor
-Depends: ${misc:Depends},libjs-twitter-bootstrap, ease-framework, dbconfig-common , php-mail, php5-curl, icinga, mtr-tiny, php-image-graphviz, libjs-d3js, php5-cli, php5-intl, composer
+Depends: ${misc:Depends},libjs-twitter-bootstrap, ease-framework, dbconfig-common , php-mail, php5-curl, icinga, mtr-tiny, php-image-graphviz, libjs-d3js, php5-cli, php5-intl, composer, libjs-twitter-bootstrap-switch
 Recommends: mysql-server,icinga-web, icinga-web-config-icinga, graphicsmagick-imagemagick-compat, pnp4icinga
 Architecture: all
 Section: web

debian/revison

@@ -1 +1 @@
-11
+12

src/classes/User.php

@@ -274,11 +274,11 @@ public function delete($id = null)
         }
 
 
-        $userGroup = new Engine\UserGroup;
+        $userGroup = new Engine\UserGroup();
         $userGroup->delUser($id);
 
 
-        $command   = new Engine\Command;
+        $command   = new Engine\Command();
         $myCommand = $command->getOwned($id);
         if ($myCommand) {
             foreach ($myCommand as $command_id => $cmd) {
@@ -287,7 +287,7 @@ public function delete($id = null)
             }
         }
 
-        $contact   = new Engine\Contact;
+        $contact   = new Engine\Contact();
         $myContact = $contact->getOwned($id);
         if ($myContact) {
             foreach ($myContact as $contact_id => $cmd) {
@@ -298,7 +298,7 @@ public function delete($id = null)
         }
 
 
-        $contactgroup   = new Engine\Contactgroup;
+        $contactgroup   = new Engine\Contactgroup();
         $myContactgroup = $contactgroup->getOwned($id);
         if ($myContactgroup) {
             foreach ($myContactgroup as $contactgroup_id => $cmd) {
@@ -308,7 +308,7 @@ public function delete($id = null)
         }
 
 
-        $hostgroup   = new Engine\Hostgroup;
+        $hostgroup   = new Engine\Hostgroup();
         $myHostgroup = $hostgroup->getOwned($id);
         if ($myHostgroup) {
             foreach ($myHostgroup as $hostgroup_id => $cmd) {
@@ -317,7 +317,7 @@ public function delete($id = null)
             }
         }
 
-        $host   = new Engine\Host;
+        $host   = new Engine\Host();
         $myHost = $host->getOwned($id);
         if ($myHost) {
             foreach ($myHost as $host_id => $cmd) {
@@ -326,7 +326,7 @@ public function delete($id = null)
             }
         }
 
-        $servicegroup   = new Engine\Servicegroup;
+        $servicegroup   = new Engine\Servicegroup();
         $myServicegroup = $servicegroup->getOwned($id);
         if ($myServicegroup) {
             foreach ($myServicegroup as $servicegroup_id => $cmd) {
@@ -335,7 +335,7 @@ public function delete($id = null)
             }
         }
 
-        $service   = new Engine\Service;
+        $service   = new Engine\Service();
         $myService = $service->getOwned($id);
         if ($myService) {
             foreach ($myService as $service_id => $cmd) {
@@ -344,7 +344,7 @@ public function delete($id = null)
             }
         }
 
-        $timeperiod   = new Engine\Timeperiod;
+        $timeperiod   = new Engine\Timeperiod();
         $myTimeperiod = $timeperiod->getOwned($id);
         if ($myTimeperiod) {
             foreach ($myTimeperiod as $timeperiod_id => $cmd) {
@@ -365,14 +365,12 @@ public function delete($id = null)
             }
         }
 
-        if ($this->deleteFromSQL()) {
+        if ($this->deleteFromSQL($this->getUserID())) {
 
             $this->addStatusMessage(sprintf(_('Uživatel %s byl smazán'),
                     $this->getUserLogin()));
 
-            require_once 'Ease/EaseMail.php';
-
-            $email = new EaseMail($this->getDataValue('email'),
+            $email = new \Ease\Mailer($this->getDataValue('email'),
                 _('Oznámení o zrušení účtu'));
             $email->setMailHeaders(['From' => EMAIL_FROM]);
             $email->addItem(new \Ease\Html\Div("Právě jste byl/a smazán/a z Aplikace VSMonitoring s těmito přihlašovacími údaji:\n"));