xoops-cvs2

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin
In directory usw-pr-cvs1:/tmp/cvs-serv25120

Modified Files:
	main.php blocksadmin.php 
Log Message:
no message

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.php	20 Sep 2002 16:21:07 -0000	1.3
--- main.php	26 Sep 2002 17:13:32 -0000	1.4
***************
*** 36,45 ****
  
  if ( $op == "save" ) {
!       	save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $balias, $bcachetime, $bmodule);
  	exit();
  }
  
  if ( $op == "update" ) {
! 	update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $balias, $bcachetime, $bmodule, $options);
  }
  
--- 36,45 ----
  
  if ( $op == "save" ) {
!       	save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $bcachetime, $bmodule);
  	exit();
  }
  
  if ( $op == "update" ) {
! 	update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $bcachetime, $bmodule, $options);
  }
  

Index: blocksadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/blocksadmin.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** blocksadmin.php	24 Sep 2002 17:42:35 -0000	1.6
--- blocksadmin.php	26 Sep 2002 17:13:33 -0000	1.7
***************
*** 155,159 ****
  	}
  
! 	function save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $balias, $bcachetime, $bmodule){
  		global $xoopsUser;
  		$myblock = new XoopsBlock();
--- 155,159 ----
  	}
  
! 	function save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $bcachetime, $bmodule){
  		global $xoopsUser;
  		$myblock = new XoopsBlock();
***************
*** 168,172 ****
  		$myblock->setVar('type', 'C');
  		$myblock->setVar('btemplate', $btemplate);
! 		$myblock->setVar('balias', $balias);
  		$myblock->setVar('bcachetime', $bcachetime);
  		switch ($bctype) {
--- 168,172 ----
  		$myblock->setVar('type', 'C');
  		$myblock->setVar('btemplate', $btemplate);
! 		//$myblock->setVar('balias', $balias);
  		$myblock->setVar('bcachetime', $bcachetime);
  		switch ($bctype) {
***************
*** 346,350 ****
  	}
  
! 	function update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $balias, $bcachetime, $bmodule, $options=array()){
  		global $xoopsConfig;
  		$myblock = new XoopsBlock($bid);
--- 346,350 ----
  	}
  
! 	function update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $bcachetime, $bmodule, $options=array()){
  		global $xoopsConfig;
  		$myblock = new XoopsBlock($bid);
***************
*** 357,361 ****
  		$myblock->setVar('content', $bcontent);
  		$myblock->setVar('btemplate', $btemplate);
! 		$myblock->setVar('balias', $balias);
  		$myblock->setVar('bcachetime', $bcachetime);
  		if ( isset($options) && (count($options) > 0) ) {
--- 357,361 ----
  		$myblock->setVar('content', $bcontent);
  		$myblock->setVar('btemplate', $btemplate);
! 		//$myblock->setVar('balias', $balias);
  		$myblock->setVar('bcachetime', $bcachetime);
  		if ( isset($options) && (count($options) > 0) ) {