- renamed screens.rows ->vsize, cols -> hsize (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@2832 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 17 insertions, 17 deletions

diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 57403509..c92101d4 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1491,7 +1491,7 @@
 		$frm_title = S_SCREEN;
 		if(isset($_REQUEST["screenid"]))
 		{
-			$result=DBselect("select screenid,name,cols,rows from screens g".
+			$result=DBselect("select screenid,name,hsize,vsize from screens g".
 				" where screenid=".$_REQUEST["screenid"]);
 			$row=DBfetch($result);
 			$frm_title = S_SCREEN." \"".$row["name"]."\"";
@@ -1499,14 +1499,14 @@
 		if(isset($_REQUEST["screenid"]) && !isset($_REQUEST["form_refresh"]))
 		{
 			$name=$row["name"];
-			$cols=$row["cols"];
-			$rows=$row["rows"];
+			$hsize=$row["hsize"];
+			$vsize=$row["vsize"];
 		}
 		else
 		{
 			$name=get_request("name","");
-			$cols=get_request("cols",1);
-			$rows=get_request("rows",1);
+			$hsize=get_request("hsize",1);
+			$vsize=get_request("bsize",1);
 		}
 		$frmScr = new CFormTable($frm_title,"screenconf.php");
 		$frmScr->SetHelp("web.screenconf.screen.php");
@@ -1516,8 +1516,8 @@
 			$frmScr->AddVar("screenid",$_REQUEST["screenid"]);
 		}
 		$frmScr->AddRow(S_NAME, new CTextBox("name",$name,32));
-		$frmScr->AddRow(S_COLUMNS, new CTextBox("cols",$cols,5));
-		$frmScr->AddRow(S_ROWS, new CTextBox("rows",$rows,5));
+		$frmScr->AddRow(S_COLUMNS, new CTextBox("hsize",$hsize,5));
+		$frmScr->AddRow(S_ROWS, new CTextBox("vsize",$vsize,5));
 
 		$frmScr->AddItemToBottomRow(new CButton("save",S_SAVE));
 		if(isset($_REQUEST["screenid"]))
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index 6629de67..b3981f7f 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -19,7 +19,7 @@
 **/
 ?>
 <?php
-        function        add_screen($name,$cols,$rows)
+        function        add_screen($name,$hsize,$vsize)
         {
                 if(!check_right("Screen","A",0))
                 {
@@ -27,11 +27,11 @@
                         return 0;
                 }
 
-                $sql="insert into screens (name,cols,rows) values (".zbx_dbstr($name).",$cols,$rows)";
+                $sql="insert into screens (name,hsize,vsize) values (".zbx_dbstr($name).",$hsize,$vsize)";
                 return  DBexecute($sql);
         }
 
-        function        update_screen($screenid,$name,$cols,$rows)
+        function        update_screen($screenid,$name,$hsize,$vsize)
         {
                 if(!check_right("Screen","U",0))
                 {
@@ -39,7 +39,7 @@
                         return 0;
                 }
 
-                $sql="update screens set name=".zbx_dbstr($name).",cols=$cols,rows=$rows where screenid=$screenid";
+                $sql="update screens set name=".zbx_dbstr($name).",hsize=$hsize,vsize=$vsize where screenid=$screenid";
                 return  DBexecute($sql);
         }
 
@@ -114,13 +114,13 @@
 		if(is_null($effectiveperiod)) 
 			$effectiveperiod = 3600;
 
-		$result=DBselect("select name,cols,rows from screens where screenid=$screenid");
+		$result=DBselect("select name,hsize,vsize from screens where screenid=$screenid");
 		$row=DBfetch($result);
-		if(!row) return new CSpan("Screen missing".BR);
+		if(!$row) return new CSpan("Screen missing".BR);
 
-		for($r=0;$r<$row["rows"];$r++)
+		for($r=0;$r<$row["vsize"];$r++)
 		{
-			for($c=0;$c<$row["cols"];$c++)
+			for($c=0;$c<$row["hsize"];$c++)
 			{
 				if(isset($skip_field[$r][$c]))	continue;
 
@@ -147,10 +147,10 @@
 			new CLink("No rows in screen ".$row["name"],"screenconf.php?form=update&screenid=".$screenid),
 			($editmode == 0 || $editmode == 2) ? "screen_view" : "screen_edit");
 	
-		for($r=0;$r<$row["rows"];$r++)
+		for($r=0;$r<$row["vsize"];$r++)
 		{
 			$new_cols = array();
-			for($c=0;$c<$row["cols"];$c++)
+			for($c=0;$c<$row["hsize"];$c++)
 			{
 				$item = array();
 				if(isset($skip_field[$r][$c]))		continue;