Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/ajax.js
===================================================================
diff -u -r8180 -r8184
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/ajax.js (.../ajax.js) (revision 8180)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/ajax.js (.../ajax.js) (revision 8184)
@@ -115,7 +115,7 @@
}
Request.setOpacity = function (opacity, id) {
- var elem = typeof(id)=='string' ? document.getElementById(id) : id;
+ var elem = typeof(id)=='string' ? document.getElementById(id) : id;
var object = elem.style;
object.opacity = (opacity / 100);
object.MozOpacity = (opacity / 100);
Index: branches/unlabeled/unlabeled-1.76.2/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r8183 -r8184
--- branches/unlabeled/unlabeled-1.76.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 8183)
+++ branches/unlabeled/unlabeled-1.76.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 8184)
@@ -354,11 +354,13 @@
$this->ValidateConfig($prefix);
}
}
+
function ValidateConfig($prefix)
{
global $debugger;
$config =& $this->configData[$prefix];
+
$tablename = $config['TableName'];
$float_types = Array ('float', 'double', 'numeric');
$conn =& $this->Application->GetADODBConnection();
@@ -373,6 +375,7 @@
$res = $conn->Query('DESCRIBE '.$tablename);
$config_link = $debugger->getFileLink(FULL_PATH.$this->prefixFiles[$config['Prefix']], 1, $config['Prefix']);
+
$error_messages = Array (
'field_not_found' => 'Field %s exists in the database, but is not defined in config',
'default_missing' => 'Default value for field %s not set in config',
@@ -382,6 +385,7 @@
'invalid_default' => 'Default value for field %s%s not sync. to db (in config = %s, in db = %s)',
'type_missing' => 'Type definition for field %s missing in config',
);
+
$config_errors = Array ();
$tablename = preg_replace('/^'.preg_quote(TABLE_PREFIX, '/').'(.*)/', '\\1', $tablename); // remove table prefix
@@ -393,6 +397,7 @@
// skip multilingual fields
continue;
}
+
if (!array_key_exists ($f_name, $config['Fields'])) {
$config_errors[] = sprintf($error_messages['field_not_found'], $f_name);
}
Index: branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php
===================================================================
diff -u -r8117 -r8184
--- branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php (.../session.php) (revision 8117)
+++ branches/unlabeled/unlabeled-1.57.2/core/kernel/session/session.php (.../session.php) (revision 8184)
@@ -871,6 +871,7 @@
{
return $this->Storage->DeleteExpired();
}
+
/**
* Allows to check if user in this session is logged in or not
*
@@ -879,6 +880,7 @@
function LoggedIn()
{
$user_id = $this->RecallVar('user_id');
+
$ret = $user_id > 0;
if ($this->RecallVar('admin') == 1 && ($user_id == -1)) {
$ret = true;