0.6.6 rev 4374

nightflyza · May 7, 2015 · 5d33940 · 5d33940
1 parent 4a9e94c
commit 5d33940
Show file tree

Hide file tree

Showing 25 changed files with 1,084 additions and 982 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1 +1 @@
-0.6.6 rev 4364
+0.6.6 rev 4374
diff --git a/api/libs/api.cf.php b/api/libs/api.cf.php
@@ -316,8 +316,8 @@ function cf_FieldDisplay($type, $data) {
  * @return void
  */
 function cf_FieldEditor($login) {
-    global $billing;
-    $alter_conf = rcms_parse_ini_file(CONFIG_PATH . "alter.ini");
+    global $billing,$ubillingConfig;
+    $alter_conf = $ubillingConfig->getAlter();
     $result = '';
     //edit routine 
     if (isset($_POST['modtype'])) {

diff --git a/api/libs/api.ubim.php b/api/libs/api.ubim.php
@@ -147,7 +147,7 @@ function im_ContactList() {
                 if (wf_CheckGet(array('checknew'))) {
                     $unreadCounter = im_CheckForUnreadMessagesByUser($eachadmin);
                     if ($unreadCounter != 0) {
-                        $blinker = wf_img('skins/ubim_blink.gif', __('Unread message'));
+                        $blinker = wf_img('skins/icon_mail.gif');
                     } else {
                         $blinker = '';
                     }
@@ -161,8 +161,8 @@ function im_ContactList() {
                     $aliveFlag = web_bool_led(false);
                 }
                 $conatactAvatar = gravatar_ShowAdminAvatar($eachadmin, '32') . ' ';
-                $threadLink = wf_AjaxLink("?module=ubim&showthread=" . $eachadmin, $eachadmin, 'threadContainer', false, 'ubimcontact');
-                $threadLink.=$blinker;
+                $threadLink = wf_AjaxLink("?module=ubim&showthread=" . $eachadmin, $eachadmin.' '.$blinker, 'threadContainer', false, 'ubimcontact');
+                //$threadLink.=$blinker;
 
                 $cells = wf_TableCell($aliveFlag, '', '', 'valign="center" align="center"');
                 $cells.= wf_TableCell($conatactAvatar, '35', '', 'valign="center" align="left"');

diff --git a/config/globalmenu.ini b/config/globalmenu.ini
@@ -500,7 +500,7 @@ NAME="Connection details report"
 URL="?module=report_condet"
 ICON="report_condet.png"
 CATEGORY=3
-NEED_RIGHT=CONDET
+NEED_RIGHT=ONLINE
 NEED_OPTION=CONDET_ENABLED
 
 [sigreq]

diff --git a/config/modules.d/reports/report_condet.php b/config/modules.d/reports/report_condet.php
@@ -1,3 +1,3 @@
 if ($alter_conf['CONDET_ENABLED']) {
-$taskbar.=build_task('CONDET','?module=report_condet','report_condet.png',__('Connection details report'));
+$taskbar.=build_task('ONLINE','?module=report_condet','report_condet.png',__('Connection details report'));
 }
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,CONDET
+USERREG=TASKBAR,USERSEARCH,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,CONDET
 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,PLVLANGEN,ADDVLAN
+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,SWITCHLOGIN
 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,UKVSEAL
diff --git a/languages/russian/billing.php b/languages/russian/billing.php
@@ -1905,6 +1905,9 @@
 $lang['def']['Cable']='Кабель';
 $lang['def']['m']='м';
 $lang['def']['Connection details report']='Очет по деталям подключений';
+$lang['def']['right to add login prompts for switches']='Право управлять авторизационными данными свичей';
+$lang['def']['']='';
+$lang['def']['']='';
 $lang['def']['']='';
 
 

diff --git a/languages/ukrainian/billing.php b/languages/ukrainian/billing.php
@@ -1919,5 +1919,6 @@
 $lang['def']['Cable']='Кабель';
 $lang['def']['m']='м';
 $lang['def']['Connection details report']='Звіт деталей підключення';
+$lang['def']['right to add login prompts for switches']='Право керувати авторизаційними даними комутаторів';
 
 ?>