Fixed search path

Vitexus · Vitexus · commit aef37c2dfb99 · 2016-08-02T14:21:33.000+02:00
Fixed composer package version for debian
Switching string to English
diff --git a/composer.json b/composer.json
@@ -1,7 +1,8 @@
 {
     "name": "vitexsoftware/icinga-editor",
     "description": "Editor of Icinga Configuration files",
-    "version": "1.0",
+    "license": "GPL-2.0",
+    "version": "1.1.2",
     "authors": [
         {
             "name": "vitex",
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-icinga-editor (1.0-11) UNRELEASED; urgency=medium
+icinga-editor (1.0-12) UNRELEASED; urgency=medium
 
   [ dvorak ]
   * Initial release. (Closes: #XXXXXX)
@@ -102,5 +102,6 @@ icinga-editor (1.0-11) UNRELEASED; urgency=medium
   * Fixed config files import during debian package install process
   * Fixed config files import during debian package install process
   * Fixed config files import during debian package install process
+  * Better README
 
- -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 02 Aug 2016 00:41:20 +0200
+ -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 02 Aug 2016 11:20:14 +0200
diff --git a/debian/conf/composer.json b/debian/conf/composer.json
@@ -1,7 +1,8 @@
 {
     "name": "vitexsoftware/icinga-editor",
     "description": "Editor of Icinga Configuration files (debianized)",
-    "version": "1.0.11",
+    "version": "1.1.2",
+    "license": "GPL-2.0",
     "authors": [
         {
             "name": "vitex",
@@ -14,7 +15,7 @@
     },
     "require": {
         "php": ">= 5.5.9",
-        "vitexsoftware/ease-framework": ">= 1.1.2"
+        "ease-framework": "*"
     },
     "autoload": {
         "psr-4": {
diff --git a/debian/deb-package.sh b/debian/deb-package.sh
@@ -21,6 +21,7 @@ else
     echo $VERSION > debian/lastversion
 fi
 
+rm -rf debian/$PACKAGE
 
 cd ..
 ls *.deb
diff --git a/debian/revison b/debian/revison
@@ -1 +1 @@
-11
+12
diff --git a/src/classes/UI/BootstrapMenu.php b/src/classes/UI/BootstrapMenu.php
@@ -27,7 +27,7 @@ public function __construct($name = null, $content = null,
         $user = \Ease\Shared::user();
         \Ease\TWB\Part::twBootstrapize();
         if (!$user->getUserID()) {
-            $this->addMenuItem('<a href="createaccount.php">'.\Ease\TWB\Part::GlyphIcon('leaf').' '._('Registrace').'</a>',
+            $this->addMenuItem('<a href="createaccount.php">'.\Ease\TWB\Part::GlyphIcon('leaf').' '._('Sign Up').'</a>',
                 'right');
             $this->addMenuItem(
                 '
@@ -36,29 +36,29 @@ public function __construct($name = null, $content = null,
 <a class="dropdown-toggle" href="login.php" data-toggle="dropdown"><i class="icon-circle-arrow-left"></i> '._('Přihlášení').'<strong class="caret"></strong></a>
 <div class="dropdown-menu" style="padding: 15px; padding-bottom: 0px; left: -150px;">
 <form method="post" class="navbar-form navbar-left" action="login.php" accept-charset="UTF-8">
-<input class="form-control" style="margin-bottom: 15px;" type="text" placeholder="'._('login').'" id="username" name="login">
-<input class="form-control" style="margin-bottom: 15px;" type="password" placeholder="'._('Heslo').'" id="password" name="password">
+<input class="form-control" style="margin-bottom: 15px;" type="text" placeholder="'._('Username').'" id="username" name="login">
+<input class="form-control" style="margin-bottom: 15px;" type="password" placeholder="'._('Password').'" id="password" name="password">
 <!-- input style="float: left; margin-right: 10px;" type="checkbox" name="remember-me" id="remember-me" value="1">
-<label class="string optional" for="remember-me"> '._('zapamatuj si mne').'</label -->
-<input class="btn btn-primary btn-block" type="submit" id="sign-in" value="'._('přihlásit').'">
+<label class="string optional" for="remember-me"> '._('Remember me').'</label -->
+<input class="btn btn-primary btn-block" type="submit" id="sign-in" value="'._('Sign In').'">
 </form>
 </div>', 'right'
             );
         } else {
 
             $userMenu = '<li class="dropdown" style="width: 120px; text-align: right; background-image: url( '.$user->getIcon().' ) ;  background-repeat: no-repeat; background-position: left center; background-size: 40px 40px;"><a href="#" class="dropdown-toggle" data-toggle="dropdown">'.$user->getUserLogin().' <b class="caret"></b></a>
 <ul class="dropdown-menu" style="text-align: left; left: -60px;">
-<li><a href="settings.php">'.\Ease\TWB\Part::GlyphIcon('wrench').'<i class="icon-cog"></i> '._('Nastavení').'</a></li>
+<li><a href="settings.php">'.\Ease\TWB\Part::GlyphIcon('wrench').'<i class="icon-cog"></i> '._('Settings').'</a></li>
 ';
 
             if ($user->getSettingValue('admin')) {
-                $userMenu .= '<li><a href="overview.php">'.\Ease\TWB\Part::GlyphIcon('list').' '._('Přehled konfigurací').'</a></li>';
+                $userMenu .= '<li><a href="overview.php">'.\Ease\TWB\Part::GlyphIcon('list').' '._('Configuration overview').'</a></li>';
             }
 
             $this->addMenuItem($userMenu.'
-<li><a href="http://v.s.cz/kontakt.php">'.\Ease\TWB\Part::GlyphIcon('envelope').' '._('Uživatelská podpora').'</a></li>
+<li><a href="http://v.s.cz/kontakt.php">'.\Ease\TWB\Part::GlyphIcon('envelope').' '._('Support').'</a></li>
 <li class="divider"></li>
-<li><a href="logout.php">'.\Ease\TWB\Part::GlyphIcon('off').' '._('Odhlášení').'</a></li>
+<li><a href="logout.php">'.\Ease\TWB\Part::GlyphIcon('off').' '._('Sign off').'</a></li>
 </ul>
 </li>
 ', 'right');
@@ -73,7 +73,7 @@ public function draw()
         $statusMessages = $this->webPage->getStatusMessagesAsHtml();
         if ($statusMessages) {
             $this->addItem(new \Ease\Html\Div($statusMessages,
-                ['id' => 'StatusMessages', 'class' => 'well', 'title' => _('kliknutím skryjete zprávy'),
+                ['id' => 'StatusMessages', 'class' => 'well', 'title' => _('Click to hide messages'),
                 'data-state' => 'down']));
             $this->addItem(new \Ease\Html\Div(null, ['id' => 'smdrag']));
             $this->webPage->cleanMessages();
diff --git a/src/classes/UI/ChildrenSelector.php b/src/classes/UI/ChildrenSelector.php
@@ -22,47 +22,47 @@ class ChildrenSelector extends \Ease\Container
     public function __construct($Host)
     {
         $FieldName      = 'parents';
-        $InitialContent = new \Ease\TWB\Panel(_('Potomci'));
+        $InitialContent = new \Ease\TWB\Panel(_('Children'));
         $InitialContent->setTagCss(['width' => '100%']);
 
         if (is_null($Host->getMyKey())) {
-            $InitialContent->addItem(_('Nejprve je potřeba uložit záznam'));
+            $InitialContent->addItem(_('Please save record firs'));
         } else {
 
-            $Service = new Engine\IEService();
+            $Service = new \Icinga\Editor\Engine\Service();
 
-            $ServicesAssigned = $Service->dblink->queryToArray('SELECT '.$Service->myKeyColumn.','.$Service->nameColumn.' FROM '.$Service->myTable.' WHERE '.$FieldName.' LIKE \'%"'.$Host->getName().'"%\'',
+            $servicesAssigned = $Service->dblink->queryToArray('SELECT '.$Service->myKeyColumn.','.$Service->nameColumn.' FROM '.$Service->myTable.' WHERE '.$FieldName.' LIKE \'%"'.$Host->getName().'"%\'',
                 $Service->myKeyColumn);
 
-            $AllServices = $Service->getListing();
-            foreach ($AllServices as $ServiceID => $ServiceInfo) {
-                if ($ServiceInfo['register'] != 1) {
-                    unset($AllServices[$ServiceID]);
+            $allServices = $Service->getListing();
+            foreach ($allServices as $ServiceID => $serviceInfo) {
+                if ($serviceInfo['register'] != 1) {
+                    unset($allServices[$ServiceID]);
                 }
             }
 
-            foreach ($ServicesAssigned as $ServiceID => $ServiceInfo) {
-                unset($AllServices[$ServiceID]);
+            foreach ($servicesAssigned as $ServiceID => $serviceInfo) {
+                unset($allServices[$ServiceID]);
             }
 
-            if (count($AllServices)) {
+            if (count($allServices)) {
 
-                foreach ($AllServices as $ServiceID => $ServiceInfo) {
-                    $Jellybean = new \Ease\Html\SpanTag($ServiceInfo[$Service->nameColumn],
+                foreach ($allServices as $ServiceID => $serviceInfo) {
+                    $Jellybean = new \Ease\Html\SpanTag($serviceInfo[$Service->nameColumn],
                         null, ['class' => 'jellybean gray']);
-                    $Jellybean->addItem(new \Ease\Html\ATag('?addservice='.$ServiceInfo[$Service->nameColumn].'&amp;service_id='.$ServiceID.'&amp;'.$Host->getmyKeyColumn().'='.$Host->getMyKey().'&amp;'.$Host->nameColumn.'='.$Host->getName(),
-                        $ServiceInfo[$Service->nameColumn]));
+                    $Jellybean->addItem(new \Ease\Html\ATag('?addservice='.$serviceInfo[$Service->nameColumn].'&amp;service_id='.$ServiceID.'&amp;'.$Host->getmyKeyColumn().'='.$Host->getMyKey().'&amp;'.$Host->nameColumn.'='.$Host->getName(),
+                        $serviceInfo[$Service->nameColumn]));
                     $InitialContent->addItem($Jellybean);
                 }
             }
 
-            if (count($ServicesAssigned)) {
+            if (count($servicesAssigned)) {
                 $InitialContent->addItem('</br>');
-                foreach ($ServicesAssigned as $ServiceID => $ServiceInfo) {
-                    $Jellybean = new \Ease\Html\SpanTag($ServiceInfo[$Service->nameColumn],
+                foreach ($servicesAssigned as $ServiceID => $serviceInfo) {
+                    $Jellybean = new \Ease\Html\SpanTag($serviceInfo[$Service->nameColumn],
                         null, ['class' => 'jellybean']);
-                    $Jellybean->addItem($ServiceInfo[$Service->nameColumn]);
-                    $Jellybean->addItem(new \Ease\Html\ATag('?delservice='.$ServiceInfo[$Service->nameColumn].'&amp;service_id='.$ServiceID.'&amp;'.$Host->getmyKeyColumn().'='.$Host->getMyKey().'&amp;'.$Host->nameColumn.'='.$Host->getName(),
+                    $Jellybean->addItem($serviceInfo[$Service->nameColumn]);
+                    $Jellybean->addItem(new \Ease\Html\ATag('?delservice='.$serviceInfo[$Service->nameColumn].'&amp;service_id='.$ServiceID.'&amp;'.$Host->getmyKeyColumn().'='.$Host->getMyKey().'&amp;'.$Host->nameColumn.'='.$Host->getName(),
                         \Ease\TWB\Part::GlyphIcon('remove')));
                     $InitialContent->addItem($Jellybean);
                 }
@@ -74,34 +74,34 @@ public function __construct($Host)
     /**
      * Uloží položky
      *
-     * @param array $Request
+     * @param array $request
      */
-    public static function saveMembers($Request)
+    public static function saveMembers($request)
     {
-        $Service = new Engine\IEService();
-        if (isset($Request[$Service->myKeyColumn])) {
-            if ($Service->loadFromSQL($Request[$Service->myKeyColumn])) {
-                if (isset($Request['addservice']) || isset($Request['delservice'])) {
-                    if (isset($Request['addservice'])) {
-                        $Service->addHostName($Request['host_id'],
-                            $Request['host_name']);
-                        if ($Service->saveToSQL()) {
-                            $Service->addStatusMessage(sprintf(_('položka %s byla přidána'),
-                                    $Request['addservice']), 'success');
+        $service = new \Icinga\Editor\Engine\Service();
+        if (isset($request[$service->myKeyColumn])) {
+            if ($service->loadFromSQL($request[$service->myKeyColumn])) {
+                if (isset($request['addservice']) || isset($request['delservice'])) {
+                    if (isset($request['addservice'])) {
+                        $service->addHostName($request['host_id'],
+                            $request['host_name']);
+                        if ($service->saveToSQL()) {
+                            $service->addStatusMessage(sprintf(_('The item %s was added'),
+                                    $request['addservice']), 'success');
                         } else {
-                            $Service->addStatusMessage(sprintf(_('položka %s nebyla přidána'),
-                                    $Request['addservice']), 'warning');
+                            $service->addStatusMessage(sprintf(_('The item %s was not added'),
+                                    $request['addservice']), 'warning');
                         }
                     }
-                    if (isset($Request['delservice'])) {
-                        $Service->delHostName($Request['host_id'],
-                            $Request['host_name']);
-                        if ($Service->saveToSQL()) {
-                            $Service->addStatusMessage(sprintf(_('položka %s byla odebrána'),
-                                    $Request['delservice']), 'success');
+                    if (isset($request['delservice'])) {
+                        $service->delHostName($request['host_id'],
+                            $request['host_name']);
+                        if ($service->saveToSQL()) {
+                            $service->addStatusMessage(sprintf(_('The item %s has been removed'),
+                                    $request['delservice']), 'success');
                         } else {
-                            $Service->addStatusMessage(sprintf(_('položka %s nebyla odebrána'),
-                                    $Request['delservice']), 'warning');
+                            $service->addStatusMessage(sprintf(_('The item %s not removed'),
+                                    $request['delservice']), 'warning');
                         }
                     }
                 }
diff --git a/src/classes/UI/IconSelector.php b/src/classes/UI/IconSelector.php
@@ -25,7 +25,7 @@ class IconSelector extends \Ease\Container
     /**
      * Volba ikony pro host
      *
-     * @param IEHost $host
+     * @param \Icinga\Editor\Engine\Host $host
      */
     public function __construct($host)
     {
diff --git a/src/includes/IEInit.php b/src/includes/IEInit.php
@@ -12,9 +12,10 @@
     get_include_path().PATH_SEPARATOR.
     'includes'.PATH_SEPARATOR.
     '../includes'.PATH_SEPARATOR.
-    '/usr/share/icinga-editor/includes/'.PATH_SEPARATOR.
+    '../../vendor'.PATH_SEPARATOR.
+    '../vendor'.PATH_SEPARATOR.
     '/var/lib/icinga-editor'.PATH_SEPARATOR.
-    '../vendor'
+    '/usr/share/icinga-editor/includes/'
 );
 
 require_once 'Configure.php';
diff --git a/src/index.php b/src/index.php
@@ -25,12 +25,12 @@
 $oPage->heroUnit->addItem(new \Ease\Html\ImgTag('img/vsmonitoring.png'));
 $oPage->heroUnit->addItem(new \Ease\Html\ATag('http://icinga.org/',
     new \Ease\Html\ImgTag('img/icinga_logo4-300x109.png')));
-$oPage->heroUnit->addItem(_('Monitoring služeb'));
+$oPage->heroUnit->addItem(_('Editor'));
 $oPage->heroUnit->setTagCss(['text-align' => 'center']);
 
-$oPage->columnI->addItem(_('Sledování hostů'));
-$oPage->columnII->addItem(_('Sledování služeb'));
-$oPage->columnIII->addItem(_('Notifikace mail/jabber/sms/twitter'));
+$oPage->columnI->addItem(_('Watch the hosts'));
+$oPage->columnII->addItem(_('Watch the services'));
+$oPage->columnIII->addItem(_('Notifications on mail/jabber/sms/twitter'));
 
 $oPage->addItem(new UI\PageBottom());
 
diff --git a/src/login.php b/src/login.php
@@ -12,7 +12,7 @@
 require_once 'includes/IEInit.php';
 
 if (!is_object($oUser)) {
-    die(_('Cookies jsou vyžadovány'));
+    die(_('Cookies requied'));
 }
 
 $login = $oPage->getRequestValue('login');
@@ -40,34 +40,34 @@
         \Ease\Shared::user(new User($forceID));
         \Ease\Shared::user()->SettingsColumn = 'settings';
         $oUser->setSettingValue('admin', TRUE);
-        $oUser->addStatusMessage(_('Přihlášen jako: ').$oUser->getUserLogin(),
+        $oUser->addStatusMessage(_('Signed in as: ').$oUser->getUserLogin(),
             'success');
         \Ease\Shared::user()->loginSuccess();
         $oPage->redirect('main.php');
         exit;
     } else {
-        $oPage->addStatusMessage(_('Prosím zadejte vaše přihlašovací udaje'));
+        $oPage->addStatusMessage(_('Please enter your login name'));
     }
 }
 
-$oPage->addItem(new UI\PageTop(_('Přihlaš se')));
+$oPage->addItem(new UI\PageTop(_('Sign in')));
 $oPage->addPageColumns();
 
 $loginFace = new \Ease\Html\Div();
 
-$oPage->columnI->addItem(new \Ease\Html\Div(_('Zadejte, prosím, Vaše přihlašovací údaje:')));
+$oPage->columnI->addItem(new \Ease\Html\Div(_('Please enter your login details:')));
 
 $loginForm = $loginFace->addItem(new \Ease\TWB\Form('Login'));
-$loginForm->addItem(new \Ease\TWB\FormGroup(_('Uživatelské jméno'),
+$loginForm->addItem(new \Ease\TWB\FormGroup(_('User Name'),
     new \Ease\Html\InputTextTag('login', $login)));
-$loginForm->addItem(new \Ease\TWB\FormGroup(_('Heslo'),
+$loginForm->addItem(new \Ease\TWB\FormGroup(_('Pasword'),
     new \Ease\Html\InputPasswordTag('password')));
-$loginForm->addItem(new \Ease\TWB\SubmitButton('LogIn', _('Přihlášení')));
+$loginForm->addItem(new \Ease\TWB\SubmitButton('LogIn', _('Sign In')));
 
 $oPage->columnII->addItem($loginFace);
 
 $oPage->columnI->addItem(new \Ease\TWB\LinkButton('passwordrecovery.php',
-    _('Obnova hesla')));
+    _('Password recovery')));
 
 /*
   $oPage->columnII->addItem(new \Ease\Html\DivTag('TwitterAuth', IETwitter::AuthButton('twauth.php')));
diff --git a/src/main.php b/src/main.php
@@ -26,7 +26,7 @@
 } else {
     $oPage->container->addItem(new \Ease\TWB\LinkButton('wizard-host.php',
         _('Založte si první sledovaný host'), 'success'));
-    $oUser->addStatusMessage(_('Zatím není zaregistrovaný žádný sledovaný host'),
+    $oUser->addStatusMessage(_('It is not yet registered any monitored host'),
         'warning');
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vitexsoftware/icinga-editor",`
`3`	`3`	`"description": "Editor of Icinga Configuration files",`
`4`		`- "version": "1.0",`
	`4`	`+ "license": "GPL-2.0",`
	`5`	`+ "version": "1.1.2",`
`5`	`6`	`"authors": [`
`6`	`7`	`{`
`7`	`8`	`"name": "vitex",`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class IconSelector extends \Ease\Container`
`25`	`25`	`/**`
`26`	`26`	`* Volba ikony pro host`
`27`	`27`	`*`
`28`		`- * @param IEHost $host`
	`28`	`+ * @param \Icinga\Editor\Engine\Host $host`
`29`	`29`	`*/`
`30`	`30`	`public function __construct($host)`
`31`	`31`	`{`