Commit 76ef40063a31fa23d3f358f62950db98a9524a78

Authored by Péter Szládovics
2 parents e7f1fc1a 05fbc816

Merge branch 'master' of https://git.myonline.hu/pty/smbind-ng

lib/smbind.class.php
... ... @@ -585,6 +585,7 @@
585 585 }
586 586 return $ret;
587 587 }
  588 +
588 589 public function getDeletedZones($zonetype = NULL) {
589 590 $ret = array();
590 591 if (is_string($zonetype)) {
... ...
src/include.php
... ... @@ -525,7 +525,7 @@ function menu_buttons() {
525 525  
526 526 $cmasters = $user->getCommitableZones('master');
527 527 $cmc = (is_array($cmasters)) ? sizeof($cmasters) : 0;
528   - $cslaves = intval($user->getCommitableZones('slave'));
  528 + $cslaves = $user->getCommitableZones('slave');
529 529 $csc = (is_array($cslaves)) ? sizeof($cslaves) : 0;
530 530 $commitables = $cmc + $csc;
531 531 if($commitables == 0) {
... ...
src/slave_zoneread.php
... ... @@ -43,7 +43,7 @@ $smarty->assign("pagetitle", "Slave zones");
43 43 $smarty->assign("template", "slave_zoneread.tpl");
44 44 $smarty->assign("help", help("zoneread"));
45 45 $smarty->assign("menu_button", menu_buttons());
46   -$smarty->assign("page_root", $src . "zonelist.php?");
  46 +$smarty->assign("page_root", $src . "slave_zonelist.php?");
47 47 $smarty->display("main.tpl");
48 48  
49 49 ?>
... ...