[phpws-comm-commits] modules/xwysiwyg/mod/xwysiwyg/class xwysiwyg.php,1.8,1.9

[Yves K. <yku...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/xwysiwyg/mod/xwysiwyg/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23163/modules/xwysiwyg/mod/xwysiwyg/class

Modified Files:
	xwysiwyg.php 
Log Message:
Incorporated some code from /js/wysiwyg.php
Bugfix; Permission not working properly

Index: xwysiwyg.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/xwysiwyg/mod/xwysiwyg/class/xwysiwyg.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** xwysiwyg.php	3 Nov 2004 20:54:47 -0000	1.8
--- xwysiwyg.php	5 Nov 2004 22:44:48 -0000	1.9
***************
*** 13,17 ****
  class PHPWS_xwysiwyg {
  
- 
  	function pickCSS() {   
  		$pick_css = $_SESSION['OBJ_layout']->theme_dir."browsers.txt";
--- 13,16 ----
***************
*** 33,41 ****
  
  
  
  function isBox($area){
  	$settings = PHPWS_xwysiwyg::readConfig();
- 	if((!$settings['view_anon'])AND(!$_SESSION["OBJ_user"]->isUser())) return FALSE;
- 	if((!$settings['view_user'])AND(!$_SESSION["OBJ_user"]->isDeity())) return FALSE;
  	$query = "SELECT id FROM ".PHPWS_TBL_PREFIX."mod_xwysiwyg_areas WHERE area = '$area'";
  	$result = $GLOBALS['core']->quickFetch($query);
--- 32,81 ----
  
  
+ function readConfig() {
+ 	if(!isset($GLOBALS['xwysiwyg_settings'])) {
+ 		$sql = "SELECT * FROM ".PHPWS_TBL_PREFIX."mod_xwysiwyg_conf";
+ 		$settings = $GLOBALS['core']->quickFetch($sql);
+ 		$GLOBALS['xwysiwyg_settings'] = $settings;
+ 	} else	$settings = $GLOBALS['xwysiwyg_settings'];
+   return $settings;
+ }// END FUNC _read_config
+ 
+ 
+ function isSupported($section_name){
+ 	$answer = array();
+ 	$supported = FALSE;
+ 	require_once(PHPWS_SOURCE_DIR.'mod/xwysiwyg/class/phpSniff.class.php');//include the browser checking code
+ 	//First thing, check browser version. Since I haven't tested, you'll have to add a better list of supported browsers
+ 	$client =& new phpSniff($GET_VARS['UA']);
+ 	//Now we want an inclusion list of browsers. These browsers are supposed to work, Galleon or aol versions
+ 	$browsers = array("fb.6+", "NS7+","ie5.5+","mz1.3+","op7+","kq3+","ga","aol","ca");
+ 	foreach($browsers as $search) {
+ 	    if($client->browser_is($search)) $supported = TRUE;
+ 	}
+ 	
+ 	$settings = PHPWS_xwysiwyg::readConfig();
+ 	$allowed = FALSE;
+ 	if($_SESSION["OBJ_user"]->isDeity()) $allowed = TRUE;
+ 	elseif((!$_SESSION["OBJ_user"]->isUser())AND(!$_SESSION["OBJ_user"]->isDeity())AND($settings['view_anon'])) $allowed = TRUE;
+ 	elseif(($_SESSION["OBJ_user"]->isUser())AND(!$_SESSION["OBJ_user"]->isDeity())AND($settings['view_user'])) $allowed = TRUE;	
+ 
+ 	if((!$supported)OR(!$allowed)) {
+ 		$answer[xwysiwyg]	= FALSE;
+ 		$answer[onRequest]	= FALSE;
+ 		$answer[xwButton]	= FALSE;
+ 	} elseif($settings['request_mode']) {
+ 		$answer[xwysiwyg]	= TRUE;
+ 		$answer[onRequest]	= TRUE;
+ 		$answer[xwButton]	= TRUE;
+ 	} else {
+ 		$answer[xwysiwyg]	= PHPWS_xwysiwyg::isBox($section_name);
+ 		$answer[onRequest]	= FALSE;
+ 		$answer[xwButton]	= $_SESSION["OBJ_user"]->allow_access("xwysiwyg","settings");
+ 	}
+ 	return $answer;
+ }
  
  function isBox($area){
  	$settings = PHPWS_xwysiwyg::readConfig();
  	$query = "SELECT id FROM ".PHPWS_TBL_PREFIX."mod_xwysiwyg_areas WHERE area = '$area'";
  	$result = $GLOBALS['core']->quickFetch($query);
***************
*** 44,48 ****
  }
  
- 
  function loadPlugins($settings) {
  	$loadplugs = "";
--- 84,87 ----
***************
*** 85,92 ****
  }
  
- 
- 
- 
- 
  function makeEditors($settings,$index,$regplugs,$area,$lang) {	// HtmlArea - Editor - Section
  	if($settings['editor']=="htmlarea") {
--- 124,127 ----
***************
*** 168,172 ****
  function makeMain($settings,$editors,$loadplugs,$lang) {
  	if($settings['editor']=="htmlarea") {
! 		// start cookie-code from chris
  		setcookie("htmlarea_insfile_cookie_create", $_SESSION['OBJ_user']->allow_access("documents", "edit_settings"));
  		setcookie("htmlarea_insfile_cookie_upload", $_SESSION['OBJ_user']->allow_access("documents", "add_document"));
--- 203,207 ----
  function makeMain($settings,$editors,$loadplugs,$lang) {
  	if($settings['editor']=="htmlarea") {
! 		// start cookie-code from chrisbarc
  		setcookie("htmlarea_insfile_cookie_create", $_SESSION['OBJ_user']->allow_access("documents", "edit_settings"));
  		setcookie("htmlarea_insfile_cookie_upload", $_SESSION['OBJ_user']->allow_access("documents", "add_document"));
***************
*** 177,181 ****
  		setcookie("pws_source_dir", PHPWS_SOURCE_DIR);
  		setcookie("pws_source_http", PHPWS_SOURCE_HTTP);
! 		// end cookie-code from chris
  
  		// HtmlArea-Main for all Modes
--- 212,216 ----
  		setcookie("pws_source_dir", PHPWS_SOURCE_DIR);
  		setcookie("pws_source_http", PHPWS_SOURCE_HTTP);
! 		// end cookie-code from chrisbarc
  
  		// HtmlArea-Main for all Modes
***************
*** 228,232 ****
  
  
- 
  function makeJS() {
  	$main = "";
--- 263,266 ----
***************
*** 250,263 ****
  
  
- 
- 
- function readConfig() {
-   $sql = "SELECT * FROM ".PHPWS_TBL_PREFIX."mod_xwysiwyg_conf";
-   $settings = $GLOBALS['core']->quickFetch($sql);
-   //$GLOBALS['xwysiwyg_settings'] = $settings;
-   return $settings;
- }// END FUNC _read_config
- 
- 
  function showHAoptions($settings) {
   if ($_SESSION["OBJ_user"]->allow_access("xwysiwyg", "settings")) {
--- 284,287 ----