Fixed Scripts Edit/Upload

Switching strings to English

Author: Vitexus

.gitignore

@@ -3,4 +3,6 @@
 /nbproject/private/
 /nbproject/
 /test/build/
-/vendor/
+/vendor/
+/debian/icinga-editor.postrm.debhelper
+/debian/icinga-editor.substvars

debian/changelog

@@ -1,4 +1,4 @@
-icinga-editor (1.0-12) UNRELEASED; urgency=medium
+icinga-editor (1.1.2-13) UNRELEASED; urgency=medium
 
   [ dvorak ]
   * Initial release. (Closes: #XXXXXX)
@@ -103,5 +103,7 @@ icinga-editor (1.0-12) UNRELEASED; urgency=medium
   * Fixed config files import during debian package install process
   * Fixed config files import during debian package install process
   * Better README
+  * Fixed search path Fixed composer package version for debian
+    Switching string to English
 
- -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 02 Aug 2016 11:20:14 +0200
+ -- vitex <vitex@developer.kancl.brevnov.czf>  Tue, 02 Aug 2016 14:55:12 +0200

debian/conf/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "vitexsoftware/icinga-editor",
     "description": "Editor of Icinga Configuration files (debianized)",
-    "version": "1.1.2",
+    "version": "1.1.2.13",
     "license": "GPL-2.0",
     "authors": [
         {

debian/lastversion

@@ -1 +1 @@
-1.0
+1.1.2

debian/revison

@@ -1 +1 @@
-12
+0

debian/version

@@ -10,6 +10,9 @@
         <group name="Monitoring">
             <file>file:/home/vitex/Projects/VitexSoftware/iciedit/src/includes/Configure.php</file>
         </group>
-        <group/>
+        <group>
+            <file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/classes/UI/PageBottom.php</file>
+            <file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/index.php</file>
+        </group>
     </open-files>
 </project-private>

nbproject/private/private.xml

@@ -15,19 +15,21 @@
  */
 class Script extends engine\Configurator
 {
-    public $myTable     = 'script';
-    public $myKeyColumn = 'script_id';
-    public $nameColumn  = 'filename';
-    public $keyword     = 'script';
+    public $myTable              = 'script';
+    public $myKeyColumn          = 'script_id';
+    public $nameColumn           = 'filename';
+    public $keyword              = 'script';
+    public $myCreateColumn       = 'DatCreate';
+    public $myLastModifiedColumn = 'DatSave';
 
     /**
-     * Přidat položky register a use ?
+     * Add register a use fields ?
      * @var boolean
      */
     public $allowTemplating = false;
 
     /**
-     * Položky
+     * Fields
      * @var array
      */
     public $useKeywords = [
@@ -45,19 +47,19 @@ class Script extends engine\Configurator
     public $keywordsInfo = [
         'filename' => [
             'severity' => 'mandatory',
-            'title' => 'název příkazu', 'required' => true],
+            'title' => 'Command Name', 'required' => true],
         'body' => [
             'severity' => 'mandatory',
-            'title' => 'tělo skriptu', 'required' => true],
+            'title' => 'Script body', 'required' => true],
         'user_id' => [
             'severity' => 'advanced',
-            'title' => 'vlastník příkazu', 'required' => false],
+            'title' => 'Comand owner', 'required' => false],
         'public' => [
             'severity' => 'advanced',
-            'title' => 'přístupnost'],
+            'title' => 'Publicity'],
         'platform' => [
             'severity' => 'basic',
-            'title' => 'Platforma', 'mandatory' => true]
+            'title' => 'Platform', 'mandatory' => true]
     ];
 
     /**
@@ -85,15 +87,15 @@ public function __construct($itemID = null)
      */
     public function getAllUserData()
     {
-        $AllData = parent::getAllUserData();
-        foreach ($AllData as $ADkey => $AD) {
-            unset($AllData[$ADkey]['deploy']);
-            unset($AllData[$ADkey]['script_type']);
-            unset($AllData[$ADkey]['script_local']);
-            unset($AllData[$ADkey]['script_remote']);
+        $allData = parent::getAllUserData();
+        foreach ($allData as $ADkey => $AD) {
+            unset($allData[$ADkey]['deploy']);
+            unset($allData[$ADkey]['script_type']);
+            unset($allData[$ADkey]['script_local']);
+            unset($allData[$ADkey]['script_remote']);
         }
 
-        return $AllData;
+        return $allData;
     }
 
     /**
@@ -123,7 +125,7 @@ public function getAllData()
      */
     public function deleteButton($name = null, $addUrl = '')
     {
-        return parent::deleteButton(_('skript'), $addUrl);
+        return parent::deleteButton(_('Script'), $addUrl);
     }
 
     /**
@@ -135,6 +137,11 @@ public function deleteButton($name = null, $addUrl = '')
      */
     public function takeData($data, $dataPrefix = null)
     {
+        if (array_key_exists('public', $data)) {
+            $data['public'] = 1;
+        } else {
+            $data['public'] = 0;
+        }
         return parent::takeData($data, $dataPrefix);
     }
 

src/classes/Script.php

@@ -786,7 +786,13 @@ public function saveToSQL($data = null, $searchForID = false)
         } else {
             foreach ($data as $fieldName => $value) {
                 if (!is_null($value)) {
-                    $data[$fieldName] = $this->dblink->addSlashes($value);
+                    if (is_string($value)) {
+                        $data[$fieldName] = $this->dblink->addSlashes($value);
+                    } else {
+                        if (is_bool($value)) {
+                             $data[$fieldName] = intval($value);
+                        }
+                    }
                 }
             }
             $result = parent::saveToSQL($data, $searchForID);

src/classes/engine/Configurator.php

@@ -8,7 +8,7 @@
  * @package    IcingaEditor
  * @subpackage WebUI
  * @author     Vitex <vitex@hippy.cz>
- * @copyright  2012 Vitex@hippy.cz (G)
+ * @copyright  2012-2016 Vitex@hippy.cz (G)
  */
 require_once 'includes/IEInit.php';
 
@@ -30,20 +30,20 @@
                 }
                 $script->setDataValue('body',
                     file_get_contents($_FILES['upload']['tmp_name']));
-                $script->addStatusMessage(_('Skript byl nahran na server'),
+                $script->addStatusMessage(_('Script was uploaded to server'),
                     'success');
             }
 
 
             if (!$script->getName()) {
-                $oUser->addStatusMessage(_('Není zadán název'), 'warning');
+                $oUser->addStatusMessage(_('Script name missing'), 'warning');
             }
             $scriptID = $script->saveToSQL();
 
             if (is_null($scriptID)) {
-                $oUser->addStatusMessage(_('Skript nebyl uložen'), 'warning');
+                $oUser->addStatusMessage(_('Skript was not saved'), 'warning');
             } else {
-                $oUser->addStatusMessage(_('Skript byl uložen'), 'success');
+                $oUser->addStatusMessage(_('Skript was saved'), 'success');
             }
         }
 }
@@ -55,15 +55,15 @@
     $oPage->redirect('scripts.php');
 }
 
-$oPage->addItem(new UI\PageTop(_('Editace skriptu').' '.$script->getName()));
+$oPage->addItem(new UI\PageTop(_('Script Editor').' '.$script->getName()));
 
 
 switch ($oPage->getRequestValue('action')) {
     case 'delete':
         $form = new \Ease\Container;
         $form->addItem(new \Ease\Html\H2Tag($script->getName()));
 
-        $confirmator = $form->addItem(new \Ease\TWB\Panel(_('Opravdu smazat ?')),
+        $confirmator = $form->addItem(new \Ease\TWB\Panel(_('Script removal: Are you sure ?')),
             'danger');
 
         $confirmator->addItem(new \Ease\TWB\Well(nl2br($script->getDataValue('body'))));
@@ -82,20 +82,20 @@
             ['class' => 'form-horizontal', 'enctype' => 'multipart/form-data']);
 
         $form->addInput(new \Ease\Html\InputFileTag('upload'),
-            _('Odeslat soubor'), 'script.sh', _('(Textarea bude prepsana)'));
+            _('Odeslat soubor'), 'script.sh', _('(Textarea will overwrited)'));
 
         if (!$script->getId()) {
-            $form->addItem(new \Ease\TWB\SubmitButton(_('Založit'), 'success'));
+            $form->addItem(new \Ease\TWB\SubmitButton(_('Create'), 'success'));
         } else {
-            $form->addItem(new \Ease\TWB\SubmitButton(_('Uložit'), 'success'));
+            $form->addItem(new \Ease\TWB\SubmitButton(_('Save'), 'success'));
         }
         break;
 }
 $oPage->addItem(new UI\PageBottom());
 
 
 $infopanel = new UI\InfoBox($script);
-$tools     = new \Ease\TWB\Panel(_('Nástroje'), 'warning');
+$tools     = new \Ease\TWB\Panel(_('Tools'), 'warning');
 if ($script->getId()) {
     $tools->addItem($script->deleteButton());
     $tools->addItem(new \Ease\TWB\Panel(_('Transfer'), 'warning',
@@ -108,9 +108,7 @@
         $command->getMyKeyColumn());
 
     if (count($usages)) {
-        $usedBy = new \Ease\TWB\Panel(_('Používající příkazy'));
-
-
+        $usedBy = new \Ease\TWB\Panel(_('Used by commands'));
 
         $listing = new \Ease\Html\UlTag(null, ['class' => 'list-group']);
         foreach ($usages as $usage) {
@@ -136,7 +134,7 @@
 $pageRow = new \Ease\TWB\Row();
 $pageRow->addColumn(2, $infopanel);
 $pageRow->addColumn(6,
-    new \Ease\TWB\Panel(_('Skript').' <strong>'.$script->getName().'</strong>',
+    new \Ease\TWB\Panel(_('Script').' <strong>'.$script->getName().'</strong>',
     'default', $form));
 $pageRow->addColumn(4, $tools);
 $oPage->container->addItem($pageRow);