0.6.1 rev 4014

nightflyza · Dec 23, 2014 · ece8f52 · ece8f52
1 parent 7fdcc80
commit ece8f52
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1 +1 @@
-0.6.1 rev 4012
+0.6.1 rev 4014
diff --git a/config/alter.ini b/config/alter.ini
@@ -351,5 +351,5 @@ ADCOMMENTS_ENABLED=1
 MYSQLDUMP_PATH="/usr/local/bin/mysqldump"
 ;mysql system command path
 MYSQL_PATH="/usr/local/bin/mysql"
-;Vlan pools extended management enabled?
+;VLAN pools extended management enabled?
 VLANGEN_SUPPORT=0
diff --git a/config/optsaltcfg b/config/optsaltcfg
@@ -139,6 +139,7 @@ VOLS_ENABLED=TRIGGER|VOLS Module is enabled
 CORPS_ENABLED=TRIGGER|Corporate users management enabled
 NETWORKS_EXT=TRIGGER|Extended networks and pools management
 ADCOMMENTS_ENABLED=TRIGGER|Additional comments functionality enabled
+VLANGEN_SUPPORT=TRIGGER|VLAN pools extended management enabled
 
 CHAPTER_OPAYZ=OpenPayz
 OPENPAYZ_SUPPORT=TRIGGER|OpenPayz support

diff --git a/config/permgroups.ini b/config/permgroups.ini
@@ -1,6 +1,6 @@
 USERREG=TASKBAR,USERSEARCH,WINBOX,TAGS,USERPROFILE,USEREDIT,USERREG,CASH,ANNIHILATION,ALWAYSONLINE,BINDER,CONTRACT,CORPORATE,CREDIT,CREDITEXPIRE,DOWN,LIFESTORY,MAC,EMAIL,MOBILE,NOTES,ONLINE,PASSIVE,PASSWORD,PHONE,PLARPING,PLCHECKER,PLDHCP,PLDOCS,PLFEES,PLIPCHANGE,PLPINGER,RADIUS,PLSENDMESSAGE,PLDETAILS,PLVCASH,PRINTCHECK,REALNAME,RESET,USERSPEED,TARIFFEDIT,TRAFFSTATS,PDATA,OPTION82,CORPS
 GEO=BUILDS,CITY,STREETS,VOLS
-SYSTEM=TARIFFSPEED,VSERVICES,SWITCHES,SWITCHESEDIT,SWITCHM,TARIFFS,STGNEWADMIN,ARPDIAG,BACKUP,CASHTYPES,CFTYPES,DHCP,STGDOCSIS,DSHAPER,DSTAT,EVENTVIEW,LOUSYTARIFFS,MASSSEND,MULTINET,NAS,PERMISSIONS,REPORTMASTERADM,RULES,SQLCONSOLE,SYSCONF,MTSIGMON,MASSRESET,UHW,SWITCHMAP,EXPRESSCARD,EXPRESSCARDREG,DOCSIS,ZBSMAN,SWITCHPOLL,MTEXTCONF,USERSMAP,FREERADIUS,WATCHDOG,ZBSANN,SCINFO
+SYSTEM=TARIFFSPEED,VSERVICES,SWITCHES,SWITCHESEDIT,SWITCHM,TARIFFS,STGNEWADMIN,ARPDIAG,BACKUP,CASHTYPES,CFTYPES,DHCP,STGDOCSIS,DSHAPER,DSTAT,EVENTVIEW,LOUSYTARIFFS,MASSSEND,MULTINET,NAS,PERMISSIONS,REPORTMASTERADM,RULES,SQLCONSOLE,SYSCONF,MTSIGMON,MASSRESET,UHW,SWITCHMAP,EXPRESSCARD,EXPRESSCARDREG,DOCSIS,ZBSMAN,SWITCHPOLL,MTEXTCONF,USERSMAP,FREERADIUS,WATCHDOG,ZBSANN,SCINFO,PLVLANGEN,ADDVLAN
 FINANCE=BANKSTA,CARDS,AGENTS,EMPLOYEE,OPENPAYZ,PAYEXPORT,PAYFIND,TASKMAN,TICKETING,SIGREQ,CAPAB
 REPORTS=GENOCIDE,NDS,CARDREPORT,NEWMAC,REPORTCREXP,REPORTDSTAT,REPORTFINANCE,REPORTSIGNUP,STREETEPORT,SYSLOAD,REPORTTARIFFS,REPORTTRAFFIC,REPORTMASTER,SPEEDCONTROL,PLFUNDS,ASKOZIA,ASTERISK,REPORTAUTOFREEZE,REPORTNOSWPORT,SCREPORT,REPORTCOMPLEX
 CATV=CATV,CATVCASH,CATVDECODEREDIT,CATVPROFILE,CATVSTATS,CATVTARIFFEDIT,CATVACT,CATVUSEREDIT,CATVBS,UKV,UKVREG,UKVTAR,UKVBST,UKVREP,UKVCASH,UKVDEL
diff --git a/languages/russian/billing.php b/languages/russian/billing.php
@@ -1807,9 +1807,9 @@
 $lang['def']['Restore DB']='Восстановить БД';
 $lang['def']['Restoring a database from a dump, completely and permanently destroy your current database. Think again if you really want it.']='Восстановление БД из дампа, полностью и навсегда уничтожит вашу текущую БД. Подумайте еще раз, действительно ли вы этого хотите.';
 $lang['def']['You can restore database only with enabled NOSTGCHECKPID option and stopped Stargazer']='Восстановление БД из дампа возможно только с включенной опцией NOSTGCHECKPID и остановленным Stargazer.';
-$lang['def']['']='';
-$lang['def']['']='';
-$lang['def']['']='';
+$lang['def']['VLAN pools extended management enabled']='Продвинутое управление VLAN-ами включено';
+$lang['def']['right to change user vlan']='Право изменять Vlan пользователя';
+$lang['def']['right to control vlan pools']='Право управлять пулами Vlan-ов';
 $lang['def']['']='';
 
 

diff --git a/languages/ukrainian/billing.php b/languages/ukrainian/billing.php
@@ -1821,6 +1821,8 @@
 $lang['def']['Restore DB']='Відновити БД';
 $lang['def']['Restoring a database from a dump, completely and permanently destroy your current database. Think again if you really want it.']='Відновлення БД з дампа, повністю і назавжди знищить вашу поточну БД. Подумайте ще раз, чи дійсно ви цього бажаєте.';
 $lang['def']['You can restore database only with enabled NOSTGCHECKPID option and stopped Stargazer']='Відновлення БД з дампу можливо тільки з увімкненою опцією NOSTGCHECKPID та зупиненим Stargazer.';
-
+$lang['def']['VLAN pools extended management enabled']='Розширене керування VLAN-ами увімкнено';
+$lang['def']['right to change user vlan']='Право змінювати Vlan користувача';
+$lang['def']['right to control vlan pools']='Право керувати пулами Vlan-ів';
 
 ?>
diff --git a/modules/general/addvlan/module.php b/modules/general/addvlan/module.php
@@ -1,3 +1,3 @@
 <?php
-$this->registerModule($module,  'main',  'Add vlan pool',  'Nightfly',  array('ADDVLAN'  =>  __('right to control vlan pools')));
+$this->registerModule($module,  'main',  'Add vlan pool',  'L1ght',  array('ADDVLAN'  =>  __('right to control vlan pools')));
 ?>