Commit 05fbc816f427c9e736d8e325b9f6ae957e260fb4

Authored by root
1 parent 97410a16

Minor bugfixes

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