1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00

entity problem

This commit is contained in:
secretr
2008-11-29 23:31:02 +00:00
parent 676ea956cd
commit 9a4bb0e1b9
2 changed files with 10 additions and 20 deletions

View File

@@ -11,23 +11,12 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $
| $Revision: 1.16 $ | $Revision: 1.17 $
| $Date: 2008-11-29 21:16:48 $ | $Date: 2008-11-29 23:31:02 $
| $Author: e107steved $ | $Author: secretr $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
//AJAX check
if(isset($_REQUEST['ajax_used']))
{
define('e_AJAX_REQUEST', true);
$_E107['minimal'] = true;
}
else
{
define('e_AJAX_REQUEST', false);
}
require_once("../class2.php"); require_once("../class2.php");
if (!getperms("4")) if (!getperms("4"))
{ {
@@ -70,6 +59,7 @@ if (e_QUERY)
$action = varset($uc_qs[0],'config'); $action = varset($uc_qs[0],'config');
$params = varset($uc_qs[1],''); $params = varset($uc_qs[1],'');
//AJAX request check is already made by the API
if(e_AJAX_REQUEST) if(e_AJAX_REQUEST)
{ {
$class_num = intval(varset($uc_qs[2],0)); $class_num = intval(varset($uc_qs[2],0));
@@ -116,7 +106,7 @@ if(e_AJAX_REQUEST)
$row['existing'] = $class_num; //required when user tree is clicked $row['existing'] = $class_num; //required when user tree is clicked
//icon //icon
$row['iconview'] = $row['userclass_icon'] ? e_IMAGE_ABS.'userclasses/'.$row['userclass_icon'] : e_IMAGE_ABS."generic/blank.gif"; $row['iconview'] = $row['userclass_icon'] ? e_IMAGE_ABS.'userclasses/'.$row['userclass_icon'] : e_IMAGE_ABS."generic/blank.gif";
$row["uc_icon_select"] = $row['userclass_icon']; //icons select box $row['uc_icon_select'] = $row['userclass_icon']; //icons select box
//Send the prefered response type //Send the prefered response type
//echo $jshelper->sendJSONResponse('fill-form', $row); //echo $jshelper->sendJSONResponse('fill-form', $row);
@@ -377,7 +367,7 @@ switch ($action)
$text .= " $text .= "
<input class='button' type='submit' id='edit' name='edit' value='".LAN_EDIT."' /> <input class='button' type='submit' id='edit' name='edit' value='".LAN_EDIT."' />
<input class='button' type='submit' name='delete' value='".LAN_DELETE."' /> <input class='button' type='submit' name='delete' value='".LAN_DELETE."' />
<input type='checkbox' name='confirm' value='1' /><span class='smalltext'> ".UCSLAN_11."</span> <input type='checkbox' name='confirm' id='confirm' value='1' /><label for='confirm' class='smalltext'> ".UCSLAN_11."</span>
</td> </td>
</tr>"; </tr>";
} }

View File

@@ -8,8 +8,8 @@
* e107 Javascript API * e107 Javascript API
* *
* $Source: /cvs_backup/e107_0.8/e107_files/jslib/e107.js.php,v $ * $Source: /cvs_backup/e107_0.8/e107_files/jslib/e107.js.php,v $
* $Revision: 1.10 $ * $Revision: 1.11 $
* $Date: 2008-11-29 17:35:38 $ * $Date: 2008-11-29 23:31:02 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -2306,7 +2306,7 @@ var e107AjaxAbstract = Class.create ({
el.checked = (el.value == data); el.checked = (el.value == data);
break; break;
default: default:
el.value = data; el.value = data.unescapeHTML(); //browsers doesn't unescape entities on JS update, why?!
break; break;
} }