Index: branches/unlabeled/unlabeled-1.32.2/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -r8114 -r8183 --- branches/unlabeled/unlabeled-1.32.2/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 8114) +++ branches/unlabeled/unlabeled-1.32.2/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 8183) @@ -249,10 +249,10 @@ // 3. replace tags if needed $default_replacement_tags = Array ( ' ' ' 'GetDBField('ReplacementTags'); $replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array (); $replacement_tags = array_merge_recursive2($default_replacement_tags, $replacement_tags); Index: branches/unlabeled/unlabeled-1.76.2/core/units/users/users_event_handler.php =================================================================== diff -u -r8121 -r8183 --- branches/unlabeled/unlabeled-1.76.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 8121) +++ branches/unlabeled/unlabeled-1.76.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 8183) @@ -118,12 +118,14 @@ if ($this->Application->GetVar('admin') == 1) { $session_admin =& $this->Application->recallObject('Session.admin'); /* @var $session_admin Session */ + if (!$session_admin->LoggedIn()) { // front-end session created from admin session & both expired $this->Application->DeleteVar('admin'); $this->Application->Redirect('index', Array('expired' => 1), '', 'admin/index.php'); } } + $get = $this->Application->HttpQuery->getRedirectParams(); $t = $this->Application->GetVar('t'); $get['js_redirect'] = $this->Application->ConfigValue('UseJSRedirect'); Index: branches/unlabeled/unlabeled-1.18.2/core/units/general/inp1_parser.php =================================================================== diff -u -r8110 -r8183 --- branches/unlabeled/unlabeled-1.18.2/core/units/general/inp1_parser.php (.../inp1_parser.php) (revision 8110) +++ branches/unlabeled/unlabeled-1.18.2/core/units/general/inp1_parser.php (.../inp1_parser.php) (revision 8183) @@ -21,7 +21,7 @@ return $template_body; } - if ( !$this->InportalInited) { + if (!$this->InportalInited) { //$save_t = $this->Application->GetVar('t'); $this->InitInPortal(); $var_list['t'] = $this->cutTPL($var_list['t']); Index: branches/unlabeled/unlabeled-1.178.2/core/kernel/application.php =================================================================== diff -u -r8180 -r8183 --- branches/unlabeled/unlabeled-1.178.2/core/kernel/application.php (.../application.php) (revision 8180) +++ branches/unlabeled/unlabeled-1.178.2/core/kernel/application.php (.../application.php) (revision 8183) @@ -2246,7 +2246,6 @@ function LoggedIn() { return $this->Session->LoggedIn(); - } /** Index: branches/unlabeled/unlabeled-1.78.2/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r8180 -r8183 --- branches/unlabeled/unlabeled-1.78.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 8180) +++ branches/unlabeled/unlabeled-1.78.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 8183) @@ -550,7 +550,6 @@ $currency =& $this->Application->recallObject('curr.-'.$iso, null, Array('skip_autoload' => true)); if( !$currency->isLoaded() ) $currency->Load($iso, 'ISO'); - $symbol = $currency->GetDBField('Symbol'); if (!$symbol) $symbol = $currency->GetDBField('ISO').' '; if ($currency->GetDBField('SymbolPosition') == 0) { Index: branches/unlabeled/unlabeled-1.76.2/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r8121 -r8183 --- branches/unlabeled/unlabeled-1.76.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 8121) +++ branches/unlabeled/unlabeled-1.76.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 8183) @@ -357,6 +357,7 @@ function ValidateConfig($prefix) { global $debugger; + $config =& $this->configData[$prefix]; $tablename = $config['TableName']; $float_types = Array ('float', 'double', 'numeric'); @@ -369,6 +370,7 @@ safeDefine('DBG_RAISE_ON_WARNINGS', 1); return ; } + $res = $conn->Query('DESCRIBE '.$tablename); $config_link = $debugger->getFileLink(FULL_PATH.$this->prefixFiles[$config['Prefix']], 1, $config['Prefix']); $error_messages = Array ( @@ -405,6 +407,7 @@ $config_errors[] = sprintf($error_messages['default_missing'], $f_name); $default_missing = true; } + if ($field['Null'] != 'YES') { // field is NOT NULL in database (MySQL5 for null returns "NO", but MySQL4 returns "") if ( $f_name != $config['IDField'] && !isset($options['not_null']) && !isset($options['required']) ) { @@ -419,9 +422,11 @@ $config_errors[] = sprintf($error_messages['not_null_error3'], $f_name); } } + if (!array_key_exists('type', $options)) { $config_errors[] = sprintf($error_messages['type_missing'], $f_name); } + if (!$default_missing) { if ($f_name == $config['IDField'] && $options['type'] != 'string' && $options['default'] !== 0) { $config_errors[] = sprintf($error_messages['invalid_default'], 'IDField ', $f_name, $this->varDump($options['default']), $this->varDump($field['Default'])); @@ -433,9 +438,11 @@ } } } + if ($config_errors) { $error_prefix = 'Config Error'.(count($config_errors) > 1 ? 's' : '').': for prefix '.$config_link.' ('.$tablename.') in unit config:
'; $config_errors = $error_prefix.'   '.implode('
   ', $config_errors); + $debugger->appendHTML($config_errors); safeDefine('DBG_RAISE_ON_WARNINGS', 1); } @@ -444,7 +451,6 @@ function varDump($value) { return ''.var_export($value, true).' of '.gettype($value); - } function ProcessDependencies($prefix) Index: branches/unlabeled/unlabeled-1.37.2/kernel/include/itemdb.php =================================================================== diff -u -r8116 -r8183 --- branches/unlabeled/unlabeled-1.37.2/kernel/include/itemdb.php (.../itemdb.php) (revision 8116) +++ branches/unlabeled/unlabeled-1.37.2/kernel/include/itemdb.php (.../itemdb.php) (revision 8183) @@ -658,7 +658,6 @@ if($table == null) $table = $this->tablename; - if (!isset($tables_found[$table])) { // checks if table specified in item exists in db $db =& GetADODBConnection(); Index: branches/unlabeled/unlabeled-1.13.2/core/units/general/helpers/multilanguage.php =================================================================== diff -u -r8108 -r8183 --- branches/unlabeled/unlabeled-1.13.2/core/units/general/helpers/multilanguage.php (.../multilanguage.php) (revision 8108) +++ branches/unlabeled/unlabeled-1.13.2/core/units/general/helpers/multilanguage.php (.../multilanguage.php) (revision 8183) @@ -128,6 +128,7 @@ $field_mask['type'] = $field_options['db_type']; } $field_mask['default'] = 'DEFAULT '.$default_value; + if (strtoupper($field_mask['type']) == 'TEXT') { // text fields in mysql doesn't have default value $field_mask = $field_mask['name'].' '.$field_mask['type'].' '.$field_mask['null']; Index: branches/unlabeled/unlabeled-1.25.2/core/units/languages/import_xml.php =================================================================== diff -u -r8112 -r8183 --- branches/unlabeled/unlabeled-1.25.2/core/units/languages/import_xml.php (.../import_xml.php) (revision 8112) +++ branches/unlabeled/unlabeled-1.25.2/core/units/languages/import_xml.php (.../import_xml.php) (revision 8183) @@ -214,14 +214,16 @@ $this->current_phrase = Array( 'LanguageId' => $this->current_language['LanguageId'], 'Phrase' => $attributes['LABEL'], 'PhraseType' => $attributes['TYPE'], + 'PhraseId' => 0, 'Module' => $phrase_module, 'LastChanged' => adodb_mktime(), 'LastChangeIP' => $this->ip_address, 'Translation' => ''); break; case 'LANGUAGES LANGUAGE EVENTS EVENT': - $this->current_event = Array( 'LanguageId' => $this->current_language['LanguageId'], + $this->current_event = Array( 'EmailMessageId'=> 0, + 'LanguageId' => $this->current_language['LanguageId'], 'EventId' => $this->events_hash[ $attributes['EVENT'].'_'.$attributes['TYPE'] ], 'MessageType' => $attributes['MESSAGETYPE'], 'Template' => ''); @@ -298,7 +300,7 @@ else { $this->current_phrase['Translation'] = base64_decode($this->current_phrase['Translation']); } - $this->insertRecord($this->tables['phrases'], $this->current_phrase); + $this->Conn->doInsert($this->current_phrase, $this->tables['phrases']); } break; @@ -310,33 +312,13 @@ else { $this->current_event['Template'] = base64_decode($this->current_event['Template']); } - $this->insertRecord($this->tables['emailmessages'],$this->current_event); + $this->Conn->doInsert($this->current_event, $this->tables['emailmessages']); break; } array_pop($this->path); } - function insertRecord($table, $fields_hash) - { - $fields = ''; - $values = ''; - - foreach($fields_hash as $field_name => $field_value) - { - $fields .= '`'.$field_name.'`,'; - $values .= $this->Conn->qstr($field_value).','; - } - - $fields = preg_replace('/(.*),$/', '\\1', $fields); - $values = preg_replace('/(.*),$/', '\\1', $values); - - $sql = 'INSERT INTO `'.$table.'` ('.$fields.') VALUES ('.$values.')'; - $this->Conn->Query($sql); - -// return $this->Conn->getInsertID(); // no need because of temp table without auto_increment column at all - } - /** * Creates XML file with exported language data *