[Xoops-cvs2] xoops-current/html/class xoopsobject.php,1.3,1.4 xoopscomments.php,1.1.1.1,1.2

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

Update of /cvsroot/xoops/xoops-current/html/class
In directory usw-pr-cvs1:/tmp/cvs-serv335

Modified Files:
	xoopsobject.php xoopscomments.php 
Log Message:
no message

Index: xoopsobject.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsobject.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xoopsobject.php	4 Sep 2002 09:54:28 -0000	1.3
--- xoopsobject.php	26 Sep 2002 17:33:27 -0000	1.4
***************
*** 106,113 ****
  			switch ($format) {
  				case "S":
! 					$html = (!empty($this->vars[$key]['nohtml'])) ? 0 :1;
! 					$smiley = (!empty($this->vars[$key]['nosmiley'])) ? 0 : 1;
  
! 					$xcode = (!empty($this->vars[$key]['noxcode'])) ? 0 : 1;
  					return $myts->makeTareaData4Show($this->vars[$key]['value'], $html, $smiley, $xcode);
  					break;
--- 106,113 ----
  			switch ($format) {
  				case "S":
! 					$html = (!empty($this->vars['nohtml']['value'])) ? 0 :1;
! 					$smiley = (!empty($this->vars['nosmiley']['value'])) ? 0 : 1;
  
! 					$xcode = (!empty($this->vars['noxcode']['value'])) ? 0 : 1;
  					return $myts->makeTareaData4Show($this->vars[$key]['value'], $html, $smiley, $xcode);
  					break;
***************
*** 116,123 ****
  					break;
  				case "P":
! 					$html = (!empty($this->vars[$key]['nohtml'])) ? 0 :1;
! 					$smiley = (!empty($this->vars[$key]['nosmiley'])) ? 0 : 1;
  
! 					$xcode = (!empty($this->vars[$key]['noxcode'])) ? 0 : 1;
  					return $myts->makeTareaData4Preview($this->vars[$key]['value'], $html, $smiley, $xcode);
  					break;
--- 116,123 ----
  					break;
  				case "P":
! 					$html = (!empty($this->vars['nohtml']['value'])) ? 0 :1;
! 					$smiley = (!empty($this->vars['nosmiley']['value'])) ? 0 : 1;
  
! 					$xcode = (!empty($this->vars['noxcode']['value'])) ? 0 : 1;
  					return $myts->makeTareaData4Preview($this->vars[$key]['value'], $html, $smiley, $xcode);
  					break;

Index: xoopscomments.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopscomments.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** xoopscomments.php	15 Jul 2002 08:13:11 -0000	1.1.1.1
--- xoopscomments.php	26 Sep 2002 17:33:28 -0000	1.2
***************
*** 41,45 ****
  		$this->initVar("pid", "int", 0, false);
  		$this->initVar("date", "int", NULL, false);
! 		$this->initVar("nohtml", "int", 0, false);
  		$this->initVar("nosmiley", "int", 0, false);
  		$this->initVar("noxcode", "int", 0, false);
--- 41,45 ----
  		$this->initVar("pid", "int", 0, false);
  		$this->initVar("date", "int", NULL, false);
! 		$this->initVar("nohtml", "int", 1, false);
  		$this->initVar("nosmiley", "int", 0, false);
  		$this->initVar("noxcode", "int", 0, false);
***************
*** 75,81 ****
  			$isnew = true;
  			$comment_id = $this->db->genId($this->ctable."_comment_id_seq");
! 			$sql = "INSERT INTO ".$this->ctable." (comment_id, pid, item_id, date, user_id, ip, subject, comment, nohtml, nosmiley, noxcode, icon) VALUES ($comment_id,".$pid.",".$item_id.",".time().",".$user_id.",'".$ip."','".$subject."','".$comment."',".$nohtml.",".$nosmiley.",".$noxcode.",'".$icon."')";
  		} else {
! 			$sql = "UPDATE ".$this->ctable." SET subject='".$subject."',comment='".$comment."',nohtml=".$nohtml.",nosmiley=".$nosmiley.",noxcode=".$noxcode.",icon='".$icon."' WHERE comment_id=".$comment_id."";
  		}
  		if ( !$result = $this->db->query($sql) ) {
--- 75,81 ----
  			$isnew = true;
  			$comment_id = $this->db->genId($this->ctable."_comment_id_seq");
! 			$sql = "INSERT INTO ".$this->ctable." (comment_id, pid, item_id, date, user_id, ip, subject, comment, nohtml, nosmiley, noxcode, icon) VALUES ($comment_id,".$pid.",".$item_id.",".time().",".$user_id.",'".$ip."','".$subject."','".$comment."',1,".$nosmiley.",".$noxcode.",'".$icon."')";
  		} else {
! 			$sql = "UPDATE ".$this->ctable." SET subject='".$subject."',comment='".$comment."',nohtml=1,nosmiley=".$nosmiley.",noxcode=".$noxcode.",icon='".$icon."' WHERE comment_id=".$comment_id."";
  		}
  		if ( !$result = $this->db->query($sql) ) {