From: Yves K. <yku...@us...> - 2004-11-06 19:24:10
|
Update of /cvsroot/phpwebsite-comm/modules/xwysiwyg/mod/xwysiwyg/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules/xwysiwyg/mod/xwysiwyg/class Modified Files: xwysiwyg.php Log Message: bugfix php-notice varable not set case edit in action removed optical tuning Index: xwysiwyg.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/xwysiwyg/mod/xwysiwyg/class/xwysiwyg.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** xwysiwyg.php 5 Nov 2004 22:44:48 -0000 1.9 --- xwysiwyg.php 6 Nov 2004 19:23:28 -0000 1.10 *************** *** 358,368 **** $formTags['PLUG_IMAGE_TEXT'] = $_SESSION['translate']->it("Enable ImageManager-Plugin"); // $formTags['PLUG_SPELL_TEXT'] = "n.a. yet ".$_SESSION['translate']->it("Enable SpellChecker-Plugin"); ! if(isset($_REQUEST['func'])AND($_REQUEST['func'] == "update")) { ! if($GLOBALS['core']->sqlUpdate($settings, "mod_xwysiwyg_conf")) { ! $formTags['MESSAGE'] = "<span style=\"color:green;font-weight:bold\">".$_SESSION['translate']->it("Settings saved successfully")."</span><br />"; } ! else { $formTags['MESSAGE'] = "<span class=\"errortext\">".$_SESSION['translate']->it("There was a problem saving to the database")."</span><br />"; } ! } else { $formTags['MESSAGE'] = "<span style=\"color:blue;font-weight:bold\">".$_SESSION['translate']->it("Make your selections")."</span><br />"; } ! $formTags['EDITOR'] = $_SESSION['translate']->it("You use [var1] now", "<b>".$settings['editor']."</b>"); ! $formTags['TOGGLE'] = $this->toggleButton($settings['editor']); $this->content .= PHPWS_Template::processTemplate($formTags, "xwysiwyg", "ha_options.tpl"); $this->content .= $this->showArea(); --- 358,364 ---- $formTags['PLUG_IMAGE_TEXT'] = $_SESSION['translate']->it("Enable ImageManager-Plugin"); // $formTags['PLUG_SPELL_TEXT'] = "n.a. yet ".$_SESSION['translate']->it("Enable SpellChecker-Plugin"); ! $formTags['MESSAGE'] = $this->updateOptions($settings); ! $formTags['EDITOR'] = $_SESSION['translate']->it("You use [var1] now", "<b>".$settings['editor']."</b>"); ! $formTags['TOGGLE'] = $this->toggleButton($settings['editor']); $this->content .= PHPWS_Template::processTemplate($formTags, "xwysiwyg", "ha_options.tpl"); $this->content .= $this->showArea(); *************** *** 375,379 **** function showFCKoptions($settings) { if ($_SESSION["OBJ_user"]->allow_access("xwysiwyg", "settings")) { ! if($_REQUEST['func'] == "update") { if(isset($_REQUEST['lang_activ'])) { $settings['lang_activ'] = 1; } else { $settings['lang_activ'] = 0; } --- 371,375 ---- function showFCKoptions($settings) { if ($_SESSION["OBJ_user"]->allow_access("xwysiwyg", "settings")) { ! if (isset($_REQUEST['func'])AND($_REQUEST['func'] == "update")) { if(isset($_REQUEST['lang_activ'])) { $settings['lang_activ'] = 1; } else { $settings['lang_activ'] = 0; } *************** *** 412,422 **** $formTags['REQUEST_MODE_TEXT'] = $_SESSION['translate']->it("Enable Request-Mode"); $formTags['FCK_SKIN_TEXT'] = $_SESSION['translate']->it("Select your Skin"); ! if($_REQUEST['func'] == "update") { ! if($GLOBALS['core']->sqlUpdate($settings, "mod_xwysiwyg_conf")) { ! $formTags['MESSAGE'] = "<span style=\"color:green;font-weight:bold\">".$_SESSION['translate']->it("Settings saved successfully")."</span><br />"; } ! else { $formTags['MESSAGE'] = "<span class=\"errortext\">".$_SESSION['translate']->it("There was a problem saving to the database")."</span><br />"; } ! } else { $formTags['MESSAGE'] = "<span style=\"color:blue;font-weight:bold\">".$_SESSION['translate']->it("Make your selections")."</span><br />"; } ! $formTags['EDITOR'] = $_SESSION['translate']->it("You use [var1] now", "<b>".$settings['editor']."</b>"); ! $formTags['TOGGLE'] = $this->toggleButton($settings['editor']); $this->content .= PHPWS_Template::processTemplate($formTags, "xwysiwyg", "fck_options.tpl"); $this->content .= $this->showArea(); --- 408,414 ---- $formTags['REQUEST_MODE_TEXT'] = $_SESSION['translate']->it("Enable Request-Mode"); $formTags['FCK_SKIN_TEXT'] = $_SESSION['translate']->it("Select your Skin"); ! $formTags['MESSAGE'] = $this->updateOptions($settings); ! $formTags['EDITOR'] = $_SESSION['translate']->it("You use [var1] now", "<b>".$settings['editor']."</b>"); ! $formTags['TOGGLE'] = $this->toggleButton($settings['editor']); $this->content .= PHPWS_Template::processTemplate($formTags, "xwysiwyg", "fck_options.tpl"); $this->content .= $this->showArea(); *************** *** 427,430 **** --- 419,431 ---- + function updateOptions($settings) { + if(isset($_REQUEST['func'])AND($_REQUEST['func'] == "update")) { + if($GLOBALS['core']->sqlUpdate($settings, "mod_xwysiwyg_conf")) { + $message = "<span style=\"color:green;font-weight:bold\">".$_SESSION['translate']->it("Settings saved successfully")."</span><br />"; } + else { $message = "<span class=\"errortext\">".$_SESSION['translate']->it("There was a problem saving to the database")."</span><br />"; } + } else { $message = "<span style=\"color:blue;font-weight:bold\">".$_SESSION['translate']->it("Make your selections")."</span><br />"; } + return $message; + } + function showArea() { $query = "SELECT id, area FROM ".PHPWS_TBL_PREFIX."mod_xwysiwyg_areas ORDER BY 1"; *************** *** 435,449 **** $id = $row['id']; $area = $row['area']; ! $delelink = $this->linkRef."&action=deleData&id=$id"; ! $deletext = $_SESSION['translate']->it("Delete"); ! $table[] = array($id,$area,"<a href=\"$delelink\">$deletext</a>"); } } $content = "<hr /><div style=\"float:right\"> ! <form action=\"index.php\" method=\"post\" TITLE=\"new\"> ! <input type=\"Hidden\" name=\"module\" value=\"xwysiwyg\"> ! <input type=\"Hidden\" name=\"action\" value=\"addArea\"> ! <input type=\"Text\" name=\"area\" size=\"20\"> ! <input type=\"Submit\" value=\"".$_SESSION['translate']->it("New")."\"> </form></div>"; $content .= PHPWS_Text::ezTable($table,2,2,1,"",NULL,1,"top"); --- 436,450 ---- $id = $row['id']; $area = $row['area']; ! $delelink = $this->linkRef."&action=deleData&id=$id"; ! $deletext = $_SESSION['translate']->it("Delete"); ! $table[] = array($id,$area,"<a href=\"$delelink\">$deletext</a>"); } } $content = "<hr /><div style=\"float:right\"> ! <form action=\"index.php\" method=\"post\" title=\"new\"> ! <input type=\"hidden\" name=\"module\" value=\"xwysiwyg\"> ! <input type=\"hidden\" name=\"action\" value=\"addArea\"> ! <input type=\"text\" name=\"area\" size=\"20\"> ! <input type=\"submit\" value=\"".$_SESSION['translate']->it("New")."\"> </form></div>"; $content .= PHPWS_Text::ezTable($table,2,2,1,"",NULL,1,"top"); *************** *** 451,463 **** } ! function toggleButton($editor) { ! $content = "<form action=\"index.php\" method=\"POST\" title=\"toggle\"> ! <input type=\"Hidden\" name=\"module\" value=\"xwysiwyg\"> ! <input type=\"Hidden\" name=\"action\" value=\"toggle\">"; if($editor=="htmlarea") ! $content .= "<input type=\"Hidden\" name=\"editor\" value=\"fck\">"; else ! $content .= "<input type=\"Hidden\" name=\"editor\" value=\"htmlarea\">"; ! $content .="<input type=\"Submit\" value=\"".$_SESSION['translate']->it("Change")."\"> </form>"; return $content; --- 452,464 ---- } ! function toggleButton($editor) { //need xhtml compatibility ! $content = "<form action=\"index.php\" method=\"post\" title=\"toggle\"> ! <input type=\"hidden\" name=\"module\" value=\"xwysiwyg\"> ! <input type=\"hidden\" name=\"action\" value=\"toggle\">"; if($editor=="htmlarea") ! $content .= "<input type=\"hidden\" name=\"editor\" value=\"fck\">"; else ! $content .= "<input type=\"hidden\" name=\"editor\" value=\"htmlarea\">"; ! $content .="<input type=\"submit\" value=\"".$_SESSION['translate']->it("Change")."\"> </form>"; return $content; *************** *** 472,476 **** function addArea() { if ($_SESSION["OBJ_user"]->allow_access("xwysiwyg","settings")) {//Administrativ condition ! if($_REQUEST['area']) {$data['area'] = PHPWS_Text::parseInput($_REQUEST['area']); } else {return FALSE;} if($GLOBALS['core']->sqlInsert($data, "mod_xwysiwyg_areas", TRUE, FALSE)) { --- 473,477 ---- function addArea() { if ($_SESSION["OBJ_user"]->allow_access("xwysiwyg","settings")) {//Administrativ condition ! if(isset($_REQUEST['area'])) {$data['area'] = PHPWS_Text::parseInput($_REQUEST['area']); } else {return FALSE;} if($GLOBALS['core']->sqlInsert($data, "mod_xwysiwyg_areas", TRUE, FALSE)) { *************** *** 508,512 **** case "toggle": //this for action=admin ! $this->toggleEditor(PHPWS_Text::parseInput($_REQUEST["editor"])); case "admin": //this for action=admin --- 509,514 ---- case "toggle": //this for action=admin ! if(isset($_REQUEST['editor'])) ! $this->toggleEditor(PHPWS_Text::parseInput($_REQUEST["editor"])); case "admin": //this for action=admin *************** *** 520,533 **** break; ! case "addArea": //this for action=data $this->addArea(); break; ! case "editData": //this for action=data ! $this->editData(PHPWS_Text::parseInput($_REQUEST["id"])); ! break; ! ! case "deleData": //this for action=data ! $this->delArea(PHPWS_Text::parseInput($_REQUEST["id"])); break; --- 522,532 ---- break; ! case "addArea": $this->addArea(); break; ! case "deleData": ! if(isset($_REQUEST['id'])) ! $this->delArea(PHPWS_Text::parseInput($_REQUEST["id"])); break; |