Translate object types in search result

web/inc/i18n/ar.php

@@ -390,6 +390,13 @@ $LANG['ar'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'إضافة مخدم أسماء (NS) جديد',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/bs.php

@@ -390,6 +390,13 @@ $LANG['bs'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/cn.php

@@ -390,6 +390,13 @@ $LANG['cn'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/cz.php

@@ -391,6 +391,13 @@ $LANG['cz'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/da.php

@@ -392,6 +392,13 @@ $LANG['da'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/de.php

@@ -390,6 +390,13 @@ $LANG['de'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/el.php

@@ -391,6 +391,13 @@ $LANG['el'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/en.php

@@ -390,6 +390,13 @@ $LANG['en'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/es.php

@@ -390,6 +390,13 @@ $LANG['es'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/fa.php

@@ -392,6 +392,13 @@ $LANG['fa'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'افزودن یک نام سرور دیگر',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/fi.php

@@ -391,6 +391,13 @@ $LANG['fi'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/fr.php

@@ -390,6 +390,13 @@ $LANG['fr'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Ajouter un autre Serveur de Noms',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/hu.php

@@ -394,6 +394,13 @@ $LANG['hu'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/id.php

@@ -393,6 +393,13 @@ $LANG['id'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/it.php

@@ -391,6 +391,13 @@ $LANG['it'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/ja.php

@@ -390,6 +390,13 @@ $LANG['ja'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'ネームサーバーを追加',
 
+    'web domain' => 'ウェブドメイン',
+    'dns domain' => 'DNSドメイン',
+    'dns record' => 'DNSレコード',
+    'mail domain' => 'メールドメイン',
+    'mail account' => 'メールアカウント',
+    'cron job' => 'Cronジョブ',
+
     'cron' => 'Cron',
     'user dir' => 'ユーザーディレクトリ',
 

web/inc/i18n/nl.php

@@ -391,6 +391,13 @@ $LANG['nl'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/no.php

@@ -391,6 +391,13 @@ $LANG['no'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/pl.php

@@ -390,6 +390,13 @@ $LANG['pl'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Dodaj jeszcze jeden serwer DNS',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/pt-BR.php

@@ -390,6 +390,13 @@ $LANG['pt-BR'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Adicionar um ou mais Servidores de Nome',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/pt.php

@@ -390,6 +390,13 @@ $LANG['pt'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Adicionar um ou mais Servidores de Nome',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/ro.php

@@ -391,6 +391,13 @@ $LANG['ro'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/ru.php

@@ -391,6 +391,13 @@ $LANG['ru'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Добавить ещё один Сервер Имён',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/se.php

@@ -390,6 +390,13 @@ $LANG['se'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/tr.php

@@ -391,6 +391,13 @@ $LANG['tr'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/tw.php

@@ -393,6 +393,13 @@ $LANG['tw'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => '新增域名服務器',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/ua.php

@@ -391,6 +391,13 @@ $LANG['ua'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/inc/i18n/vi.php

@@ -390,6 +390,13 @@ $LANG['vi'] = array(
     'VESTA' => 'VESTA',
     'Add one more Name Server' => 'Add one more Name Server',
 
+    'web domain' => 'web domain',
+    'dns domain' => 'dns domain',
+    'dns record' => 'dns record',
+    'mail domain' => 'mail domain',
+    'mail account' => 'mail account',
+    'cron job' => 'cron job',
+
     'cron' => 'cron',
     'user dir' => 'user dir',
 

web/templates/admin/list_search.html

@@ -39,28 +39,28 @@
       <?
         foreach ($data as $key => $value) {
           ++$i;
-          if ($data[$key]['SUSPENDED'] == 'yes') {
+          if ($value['SUSPENDED'] == 'yes') {
             $status = 'suspended';
-            $spnd_action = 'unsuspend' ;
+            $spnd_action = 'unsuspend';
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
           }
-            if ($data[$key]['TYPE'] == 'db') {
+          if ($value['TYPE'] == 'db') {
             $object = 'database';
           } else {
-            $object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']);
+            $object = strtolower($value['TYPE'] . ' ' . $value['KEY']);
           }
 
-          $uniq_id = $data[$key]['TYPE'].'-';
-          if($data[$key]['KEY'] == 'ACCOUNT'){
+          $uniq_id = $value['TYPE'] . '-';
+          if ($value['KEY'] == 'ACCOUNT'){
             $uniq_id .= 'acc-';
           }
-          $uniq_id .= sha1($data[$key]['RESULT']);
+          $uniq_id .= sha1($value['RESULT']);
         ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE[$uniq_id] == 1) echo ' l-unit--starred'; ?>" id="web-unit-<?=$i?>" uniq-id="<?=$uniq_id?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$data[$key]['RESULT']?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE[$uniq_id] == 1) echo ' l-unit--starred'; ?>" id="web-unit-<?=$i?>" uniq-id="<?=$uniq_id?>" sort-date="<?=strtotime($value['DATE'].' '.$value['TIME'])?>" sort-name="<?=$value['RESULT']?>">
         <div class="l-unit-toolbar clearfix">
           <!--div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="check" value="check<?=$i?>">
@@ -71,7 +71,7 @@
             <div class="actions-panel clearfix">
 
             <?
-              if ($data[$key]['USER'] != $user && $data[$key]['KEY'] == 'ACCOUNT') {
+              if ($value['USER'] != $user && $value['KEY'] == 'ACCOUNT') {
                 if ($key == $user) {
             ?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
@@ -98,54 +98,54 @@
                       unset($_SESSION['look_alert']);
                   }
                 } else { ?>
-                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$data[$key]['USER']?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$value['USER']?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
             <?  }
               }
             ?>
 
 
             <?
-              if ($data[$key]['KEY'] == 'RECORD') {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+              if ($value['KEY'] == 'RECORD') {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&record_id='.$value['LINK'].'&user='.$value['USER'];
               }
-              if ($data[$key]['KEY'] == 'ACCOUNT') {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+              if ($value['KEY'] == 'ACCOUNT') {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&account='.$value['LINK'].'&user='.$value['USER'];
               }
-              if ($data[$key]['KEY'] == 'JOB') {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+              if ($value['KEY'] == 'JOB') {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?job='.$value['LINK'].'&user='.$value['USER'];
               }
-              if ($data[$key]['KEY'] == 'DATABASE') {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+              if ($value['KEY'] == 'DATABASE') {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?database='.$value['RESULT'].'&user='.$value['USER'];
               }
-              if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+              if (($value['KEY'] != 'RECORD') && ($value['KEY'] != 'ACCOUNT') && ($value['KEY'] != 'JOB') && ($value['KEY'] != 'DATABASE') ) {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?'.strtolower($value['KEY']).'='.$value['RESULT'].'&user='.$value['USER'];
               }
             ?>
               <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="<?=$edit_lnk?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <? if (!empty($data[$key]['STATS'])) { ?>
-                  <div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$data[$key]['RESULT']?>/vstats/"  target="_blank"><?=__('open webstats')?> <i></i></a><span class="shortcut">&nbsp;w</span></div>
+              <? if (!empty($value['STATS'])) { ?>
+                  <div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$value['RESULT']?>/vstats/"  target="_blank"><?=__('open webstats')?> <i></i></a><span class="shortcut">&nbsp;w</span></div>
               <? } ?>
 
 
               <?
-                if ($data[$key]['KEY'] == 'RECORD') {
-                  $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'RECORD') {
+                  $spnd_lnk = '/'.$spnd_action.'/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&record_id='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'SUSPEND_RECORD_CONFIRMATION';
                 }
-                if ($data[$key]['KEY'] == 'ACCOUNT') {
-                  $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'ACCOUNT') {
+                  $spnd_lnk = '/'.$spnd_action.'/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&account='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'SUSPEND_USER_CONFIRMATION';
                 }
-                if ($data[$key]['KEY'] == 'JOB') {
-                  $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'JOB') {
+                  $spnd_lnk = '/'.$spnd_action.'/'.$value['TYPE'].'/?job='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'SUSPEND_CRON_CONFIRMATION';
                 }
-                  if ($data[$key]['KEY'] == 'DATABASE') {
-                  $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                  if ($value['KEY'] == 'DATABASE') {
+                  $spnd_lnk = '/'.$spnd_action.'/'.$value['TYPE'].'/?database='.$value['RESULT'].'&user='.$value['USER'];
                   $cnfrm = 'SUSPEND_DATABASE_CONFIRMATION';
                 }
-                if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                  $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                if (($value['KEY'] != 'RECORD') && ($value['KEY'] != 'ACCOUNT') && ($value['KEY'] != 'JOB') && ($value['KEY'] != 'DATABASE') ) {
+                  $spnd_lnk = '/'.$spnd_action.'/'.$value['TYPE'].'/?'.strtolower($value['KEY']).'='.$value['RESULT'].'&user='.$value['USER'];
                   $cnfrm = 'SUSPEND_DOMAIN_CONFIRMATION';
                 }
               ?>
@@ -154,31 +154,31 @@
                   <?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
                   <input type="hidden" name="<?=$spnd_action?>_url" value="<?=$spnd_lnk?>&token=<?=$_SESSION['token']?>" />
                   <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
-                    <p class="confirmation"><?=__($cnfrm, $data[$key]['RESULT'])?></p>
+                    <p class="confirmation"><?=__($cnfrm, $value['RESULT'])?></p>
                   </div>
                 </a>
                 <span class="shortcut">&nbsp;S</span>
               </div>
 
               <?
-                if ($data[$key]['KEY'] == 'RECORD') {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'RECORD') {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&record_id='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_RECORD_CONFIRMATION';
                 }
-                if ($data[$key]['KEY'] == 'ACCOUNT') {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'ACCOUNT') {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&account='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_USER_CONFIRMATION';
                 }
-                if ($data[$key]['KEY'] == 'JOB') {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'JOB') {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?job='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_CRON_CONFIRMATION';
                 }
-                if ($data[$key]['KEY'] == 'DATABASE') {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'DATABASE') {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?database='.$value['RESULT'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_DATABASE_CONFIRMATION';
                 }
-                if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                if (($value['KEY'] != 'RECORD') && ($value['KEY'] != 'ACCOUNT') && ($value['KEY'] != 'JOB') && ($value['KEY'] != 'DATABASE') ) {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?'.strtolower($value['KEY']).'='.$value['RESULT'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_DOMAIN_CONFIRMATION';
                 }
               ?>
@@ -187,7 +187,7 @@
                   <?=__('delete')?> <i class="do_delete"></i>
                   <input type="hidden" name="delete_url" value="<?=$delete_lnk?>&token=<?=$_SESSION['token']?>" />
                   <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                    <p class="confirmation"><?=__($cnfrm, $data[$key]['RESULT'])?></p>
+                    <p class="confirmation"><?=__($cnfrm, $value['RESULT'])?></p>
                   </div>
                 </a>
                 <span class="shortcut delete">&nbsp;Del</span>
@@ -201,7 +201,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=translate_date($data[$key]['DATE'])?>
+            <?=translate_date($value['DATE'])?>
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
@@ -211,7 +211,7 @@
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__name separate">
-            <?=$data[$key]['RESULT']?> <span><?=str_replace(',', ', ', $data[$key]['ALIAS'])?></span>
+            <?=$value['RESULT']?> <span><?=str_replace(',', ', ', $value['ALIAS'])?></span>
           </div>
           <!-- /.l-unit__name -->
           <div class="l-unit__stats">
@@ -219,14 +219,14 @@
               <tr>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=$object?></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__($object)?></div>
                   </div>
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
                     <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Owner')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['USER']?></b>
+                      <b><?=$value['USER']?></b>
                     </div>
                   </div>
                 </td>

web/templates/user/list_search.html

@@ -39,27 +39,27 @@
       <?
         foreach ($data as $key => $value) {
           ++$i;
-          if ($data[$key]['SUSPENDED'] == 'yes') {
+          if ($value['SUSPENDED'] == 'yes') {
             $status = 'suspended';
             $spnd_action = 'unsuspend' ;
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
           }
-            if ($data[$key]['TYPE'] == 'db') {
+            if ($value['TYPE'] == 'db') {
             $object = 'database';
           } else {
-            $object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']);
+            $object = strtolower($value['TYPE']." ".$value['KEY']);
           }
 
-          $uniq_id = $data[$key]['TYPE'].'-';
-          if($data[$key]['KEY'] == 'ACCOUNT'){
+          $uniq_id = $value['TYPE'].'-';
+          if($value['KEY'] == 'ACCOUNT'){
             $uniq_id .= 'acc-';
           }
-          $uniq_id .= sha1($data[$key]['RESULT']);
+          $uniq_id .= sha1($value['RESULT']);
         ?>
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE[$uniq_id] == 1) echo ' l-unit--starred';?>" id="web-unit-<?=$i?>" uniq-id="<?=$uniq_id?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$data[$key]['RESULT']?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE[$uniq_id] == 1) echo ' l-unit--starred';?>" id="web-unit-<?=$i?>" uniq-id="<?=$uniq_id?>" sort-date="<?=strtotime($value['DATE'].' '.$value['TIME'])?>" sort-name="<?=$value['RESULT']?>">
         <div class="l-unit-toolbar clearfix">
           <!--div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="check" value="check<?=$i?>">
@@ -70,7 +70,7 @@
             <div class="actions-panel clearfix">
 
             <?
-              if ($data[$key]['USER'] != $user && $data[$key]['KEY'] == 'ACCOUNT') {
+              if ($value['USER'] != $user && $value['KEY'] == 'ACCOUNT') {
                 if ($key == $user) {
             ?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
@@ -97,53 +97,53 @@
                       unset($_SESSION['look_alert']);
                   }
                 } else { ?>
-                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$data[$key]['USER']?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
+                  <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$value['USER']?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
             <?  }
               }
             ?>
 
 
             <?
-              if ($data[$key]['KEY'] == 'RECORD') {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+              if ($value['KEY'] == 'RECORD') {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&record_id='.$value['LINK'].'&user='.$value['USER'];
               }
-              if ($data[$key]['KEY'] == 'ACCOUNT') {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+              if ($value['KEY'] == 'ACCOUNT') {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&account='.$value['LINK'].'&user='.$value['USER'];
               }
-              if ($data[$key]['KEY'] == 'JOB') {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+              if ($value['KEY'] == 'JOB') {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?job='.$value['LINK'].'&user='.$value['USER'];
               }
-              if ($data[$key]['KEY'] == 'DATABASE') {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+              if ($value['KEY'] == 'DATABASE') {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?database='.$value['RESULT'].'&user='.$value['USER'];
               }
-              if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+              if (($value['KEY'] != 'RECORD') && ($value['KEY'] != 'ACCOUNT') && ($value['KEY'] != 'JOB') && ($value['KEY'] != 'DATABASE') ) {
+                $edit_lnk = '/edit/'.$value['TYPE'].'/?'.strtolower($value['KEY']).'='.$value['RESULT'].'&user='.$value['USER'];
               }
             ?>
               <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="<?=$edit_lnk?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
-              <? if (!empty($data[$key]['STATS'])) { ?>
-                  <div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$data[$key]['RESULT']?>/vstats/"  target="_blank"><?=__('open webstats')?> <i></i></a><span class="shortcut">&nbsp;W</span></div>
+              <? if (!empty($value['STATS'])) { ?>
+                  <div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$value['RESULT']?>/vstats/"  target="_blank"><?=__('open webstats')?> <i></i></a><span class="shortcut">&nbsp;W</span></div>
               <? } ?>
 
               <?
-                if ($data[$key]['KEY'] == 'RECORD') {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'RECORD') {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&record_id='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_RECORD_CONFIRMATION';
                 }
-                if ($data[$key]['KEY'] == 'ACCOUNT') {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'ACCOUNT') {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&account='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_USER_CONFIRMATION';
                 }
-                if ($data[$key]['KEY'] == 'JOB') {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'JOB') {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?job='.$value['LINK'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_CRON_CONFIRMATION';
                 }
-                if ($data[$key]['KEY'] == 'DATABASE') {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                if ($value['KEY'] == 'DATABASE') {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?database='.$value['RESULT'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_DATABASE_CONFIRMATION';
                 }
-                if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
-                  $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                if (($value['KEY'] != 'RECORD') && ($value['KEY'] != 'ACCOUNT') && ($value['KEY'] != 'JOB') && ($value['KEY'] != 'DATABASE') ) {
+                  $delete_lnk = '/delete/'.$value['TYPE'].'/?'.strtolower($value['KEY']).'='.$value['RESULT'].'&user='.$value['USER'];
                   $cnfrm = 'DELETE_DOMAIN_CONFIRMATION';
                 }
               ?>
@@ -152,7 +152,7 @@
                   <?=__('delete')?> <i class="do_delete"></i>
                   <input type="hidden" name="delete_url" value="<?=$delete_lnk?>&token=<?=$_SESSION['token']?>" />
                   <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                    <p class="confirmation"><?=__($cnfrm, $data[$key]['RESULT'])?></p>
+                    <p class="confirmation"><?=__($cnfrm, $value['RESULT'])?></p>
                   </div>
                 </a>
                 <span class="shortcut delete">&nbsp;Del</span>
@@ -165,8 +165,8 @@
         <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date" u_date="<?=strtotime($data[$key]['DATE'])?>">
-            <?=translate_date($data[$key]['DATE'])?>
+          <div class="l-unit__date" u_date="<?=strtotime($value['DATE'])?>">
+            <?=translate_date($value['DATE'])?>
           </div>
           <div class="l-unit__suspended"><?__('suspended')?></div>
           <div class="text-center">
@@ -175,8 +175,8 @@
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name separate" u_name="<?=$data[$key]['RESULT']?>">
-            <?=$data[$key]['RESULT']?> <span><?=str_replace(',', ', ', $data[$key]['ALIAS'])?></span>
+          <div class="l-unit__name separate" u_name="<?=$value['RESULT']?>">
+            <?=$value['RESULT']?> <span><?=str_replace(',', ', ', $value['ALIAS'])?></span>
           </div>
           <!-- /.l-unit__name -->
           <div class="l-unit__stats">
@@ -184,14 +184,14 @@
               <tr>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=$object?></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__($object)?></div>
                   </div>
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
                     <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Owner')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=$data[$key]['USER']?></b>
+                      <b><?=$value['USER']?></b>
                     </div>
                   </div>
                 </td>
@@ -235,4 +235,4 @@
           </div>
         </div>
       </div>
-    </div>
+    </div>