mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 04:38:27 +01:00
Code Issues Releases Wiki Activity

More $admin_log global removal.

Browse Source
This commit is contained in:
Cameron 2014-10-23 11:12:13 -07:00
parent 1ff46a68a2
commit ac56b5ca10
34 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/admin_log.php
View File

@ -874,7 +874,7 @@ if(isset($_POST['deleteitems']) && ($action == 'comments'))
{
//$text = str_replace('--NUMBER--', $count,RL_LAN_112);
$emessage->add(str_replace('--NUMBER--', $count, RL_LAN_112), E_MESSAGE_SUCCESS);
$admin_log->log_event('COMMENT_01', 'ID: '.implode(',', $_POST['del_item']), E_LOG_INFORMATIVE, '');
e107::getLog()->add('COMMENT_01', 'ID: '.implode(',', $_POST['del_item']), E_LOG_INFORMATIVE, '');
}
else
{
@ -952,7 +952,7 @@ if(($action == "backdel") && isset($_POST['backdeltype']))
// Add in a log event
$message = $db_name.str_replace(array('--OLD--', '--NUM--'), array($old_string, $del_count), RL_LAN_057);
$mes->addSuccess($message);
$admin_log->log_event($db_msg, "db_Delete - earlier than {$old_string} (past {$qs[2]} days)[!br!]".$message.'[!br!]'.$db_table.' '.$qry, E_LOG_INFORMATIVE, '');
e107::getLog()->add($db_msg, "db_Delete - earlier than {$old_string} (past {$qs[2]} days)[!br!]".$message.'[!br!]'.$db_table.' '.$qry, E_LOG_INFORMATIVE, '');
}
else
{

2
e107_admin/administrator.php
View File

@ -94,7 +94,7 @@ if (isset($_POST['del_admin']) && count($_POST['del_admin']))
$mes->addAuto($sql -> db_Update("user", "user_admin=0, user_perms='' WHERE user_id= ".$aID), 'update', ADMSLAN_61, LAN_DELETED_FAILED, false);
$logMsg = str_replace(array('--ID--', '--NAME--'),array($aID, $row['user_name']),ADMSLAN_73);
$admin_log->log_event('ADMIN_02',$logMsg,E_LOG_INFORMATIVE,'');
e107::getLog()->add('ADMIN_02',$logMsg,E_LOG_INFORMATIVE,'');
}

4
e107_admin/emoticon.php
View File

@ -40,7 +40,7 @@ if (isset($_POST['active']))
if ($pref['smiley_activate'] != $_POST['smiley_activate'])
{
$pref['smiley_activate'] = $_POST['smiley_activate'];
$admin_log->log_event($pref['smiley_activate'] ? 'EMOTE_02' : 'EMOTE_03', $pref['emotepack'], E_LOG_INFORMATIVE, '');
e107::getLog()->add($pref['smiley_activate'] ? 'EMOTE_02' : 'EMOTE_03', $pref['emotepack'], E_LOG_INFORMATIVE, '');
save_prefs();
$update = true;
}
@ -88,7 +88,7 @@ foreach($_POST as $key => $value)
{
$mes->addInfo(LAN_NO_CHANGE);
}
$admin_log->log_event('EMOTE_01', $pref['emotepack'], E_LOG_INFORMATIVE, '');
e107::getLog()->add('EMOTE_01', $pref['emotepack'], E_LOG_INFORMATIVE, '');
break;
}

6
e107_admin/filemanager.php
View File

@ -114,11 +114,11 @@ if (isset($_POST['deleteconfirm']))
}
if (count($deleteList))
{
$admin_log->log_event('FILEMAN_01',implode('[!br!]',$deleteList),E_LOG_INFORMATIVE,'');
e107::getLog()->add('FILEMAN_01',implode('[!br!]',$deleteList),E_LOG_INFORMATIVE,'');
}
if (count($moveList))
{
$admin_log->log_event('FILEMAN_02',implode('[!br!]',$moveList),E_LOG_INFORMATIVE,'');
e107::getLog()->add('FILEMAN_02',implode('[!br!]',$moveList),E_LOG_INFORMATIVE,'');
}
}
@ -173,7 +173,7 @@ if (isset($_POST['upload']))
}
if (count($uploadList))
{
$admin_log->log_event('FILEMAN_03',implode('[!br!]',$uploadList),E_LOG_INFORMATIVE,'');
e107::getLog()->add('FILEMAN_03',implode('[!br!]',$uploadList),E_LOG_INFORMATIVE,'');
}
}

6
e107_admin/image.php
View File

@ -2308,7 +2308,7 @@ if (isset($_POST['submit_show_delete_multi']))
//Format system message
if(!empty($message))
{
$admin_log->log_event('IMALAN_01', implode('[!br!]', $message), E_LOG_INFORMATIVE, '');
e107::getLog()->add('IMALAN_01', implode('[!br!]', $message), E_LOG_INFORMATIVE, '');
$mes->addSuccess(implode(', ', $message).' '.IMALAN_28);
}
}
@ -2346,7 +2346,7 @@ if (isset($_POST['submit_show_deleteall']))
$message = $count." ".IMALAN_26;
$mes->addSuccess($message);
$admin_log->log_event('IMALAN_02', $message.$imgList,E_LOG_INFORMATIVE, '');
e107::getLog()->add('IMALAN_02', $message.$imgList,E_LOG_INFORMATIVE, '');
unset($imgList);
}
}
@ -2391,7 +2391,7 @@ if (isset($_POST['submit_avdelete_multi']))
}
$mes->addSuccess(IMALAN_51.'<strong>'.implode(', ', $tmp).'</strong> '.IMALAN_28);
$admin_log->log_event('IMALAN_03', implode('[!br!]', $avList), E_LOG_INFORMATIVE, '');
e107::getLog()->add('IMALAN_03', implode('[!br!]', $avList), E_LOG_INFORMATIVE, '');
unset($search_users);
}

6
e107_admin/language.php
View File

@ -92,7 +92,7 @@ if (isset($_POST['del_existing']) && $_POST['lang_choices'] && getperms('0'))
}
}
}
$admin_log->log_event('LANG_02', $message.'[!br!]', E_LOG_INFORMATIVE, '');
e107::getLog()->add('LANG_02', $message.'[!br!]', E_LOG_INFORMATIVE, '');
$sql->db_ResetTableList();
if ($action == 'modify')
@ -158,7 +158,7 @@ if (isset($_POST['create_tables']) && $_POST['language'])
}
}
}
$admin_log->log_event('LANG_03', $message, E_LOG_INFORMATIVE, '');
e107::getLog()->add('LANG_03', $message, E_LOG_INFORMATIVE, '');
$sql->db_ResetTableList();
}
/*
@ -194,7 +194,7 @@ if (varset($_POST['ziplang']) && varset($_POST['language']))
if(varset($pref['lancheck'][$_POST['language']]) == 1)
{
$text = zip_up_lang($_POST['language']);
$admin_log->log_event('LANG_04', $_POST['language'], E_LOG_INFORMATIVE, '');
e107::getLog()->add('LANG_04', $_POST['language'], E_LOG_INFORMATIVE, '');
$mes->addInfo(LANG_LAN_25.': '.$text);
}
else

2
e107_admin/meta.php
View File

@ -56,7 +56,7 @@ if (isset($_POST['metasubmit']))
unset($meta_tag[e_LANGUAGE]);
}*/
$admin_log->log_event('META_01', 'meta_news_summary=>'.$pref['meta_news_summary'].'[!br!]'.e_LANGUAGE, E_LOG_INFORMATIVE, '');
e107::getLog()->add('META_01', 'meta_news_summary=>'.$pref['meta_news_summary'].'[!br!]'.e_LANGUAGE, E_LOG_INFORMATIVE, '');
save_prefs();
}

6
e107_admin/newspost.php
View File

@ -1287,7 +1287,7 @@ class admin_newspost
e107::getEvent()->trigger("newsdel", $del_id);
if($sql->delete("news", "news_id={$del_id}"))
{
$admin_log->log_event('NEWS_01',$del_id,E_LOG_INFORMATIVE,'');
e107::getLog()->add('NEWS_01',$del_id,E_LOG_INFORMATIVE,'');
$this->show_message(NWSLAN_31." #".$del_id." ".NWSLAN_32, E_MESSAGE_SUCCESS);
$this->clear_cache();
@ -1314,7 +1314,7 @@ class admin_newspost
e107::getEvent()->trigger("newscatdel", $del_id);
if ($sql->delete("news_category", "category_id={$del_id}"))
{
$admin_log->log_event('NEWS_02',$del_id,E_LOG_INFORMATIVE,'');
e107::getLog()->add('NEWS_02',$del_id,E_LOG_INFORMATIVE,'');
$this->show_message(NWSLAN_33." #".$del_id." ".NWSLAN_32, E_MESSAGE_SUCCESS);
$this->clear_cache();
}
@ -1324,7 +1324,7 @@ class admin_newspost
case 'sn':
if ($sql->delete("submitnews", "submitnews_id={$del_id}"))
{
$admin_log->log_event('NEWS_03',$del_id,E_LOG_INFORMATIVE,'');
e107::getLog()->add('NEWS_03',$del_id,E_LOG_INFORMATIVE,'');
$this->show_message(NWSLAN_34." #".$del_id." ".NWSLAN_32);
$this->clear_cache();
}

6
e107_admin/plugin.php
View File

@ -695,7 +695,7 @@ class pluginManager{
}
$logInfo = deftrue($plug['plugin_name'],$plug['plugin_name']). " v".$plug['plugin_version']." ({e_PLUGIN}".$plug['plugin_path'].")";
$admin_log->log_event('PLUGMAN_03', $logInfo, E_LOG_INFORMATIVE, '');
e107::getLog()->add('PLUGMAN_03', $logInfo, E_LOG_INFORMATIVE, '');
}
if($_POST['delete_files'])
@ -930,7 +930,7 @@ class pluginManager{
$name = deftrue($info['plugin_name'],$info['plugin_name']). " v".$eplug_version. "({e_PLUGIN}".$info['plugin_path'].")";
$admin_log->log_event('PLUGMAN_02', $name, E_LOG_INFORMATIVE, '');
e107::getLog()->add('PLUGMAN_02', $name, E_LOG_INFORMATIVE, '');
$text .= (isset($eplug_upgrade_done)) ? '<br />'.$eplug_upgrade_done : "<br />".LAN_UPGRADE_SUCCESSFUL;
$sql->update('plugin', "plugin_version ='{$eplug_version}', plugin_addons='{$eplug_addons}' WHERE plugin_id='$this->id' ");
$pref['plug_installed'][$plug['plugin_path']] = $eplug_version; // Update the version
@ -959,7 +959,7 @@ class pluginManager{
if(file_exists($_path.'plugin.xml'))
{
$text .= $plugin->install_plugin_xml($this->id, 'refresh');
$admin_log->log_event('PLUGMAN_04', $this->id.':'.$plug['plugin_path'], E_LOG_INFORMATIVE, '');
e107::getLog()->add('PLUGMAN_04', $this->id.':'.$plug['plugin_path'], E_LOG_INFORMATIVE, '');
}
}

6
e107_admin/search.php
View File

@ -81,7 +81,7 @@ if (vartrue($save_search))
// $sql -> db_Update("core", "e107_value='".$serialpref."' WHERE e107_name='search_prefs'");
e107::getConfig('search')->setPref($search_prefs)->save(false,true,false);
$admin_log->log_event('SEARCH_03','',E_LOG_INFORMATIVE,'');
e107::getLog()->add('SEARCH_03','',E_LOG_INFORMATIVE,'');
}
@ -142,7 +142,7 @@ if (isset($_POST['update_handler']))
if($check)
{
$mes->addSuccess(LAN_UPDATED);
$admin_log->log_event('SEARCH_05', $handler_type.', '.$query[2], E_LOG_INFORMATIVE, '');
e107::getLog()->add('SEARCH_05', $handler_type.', '.$query[2], E_LOG_INFORMATIVE, '');
}
elseif(0 === $check) $mes->addInfo(LAN_NO_CHANGE);
else
@ -174,7 +174,7 @@ if (isset($_POST['update_prefs']))
if($check)
{
$mes->addSuccess(LAN_UPDATED);
$admin_log->log_event('SEARCH_05', $handler_type.', '.$query[2], E_LOG_INFORMATIVE, '');
e107::getLog()->add('SEARCH_05', $handler_type.', '.$query[2], E_LOG_INFORMATIVE, '');
}
else //it's an error
{

2
e107_admin/ugflag.php
View File

@ -48,7 +48,7 @@ if(isset($_POST['updatesettings']))
if($changed)
{
$admin_log->log_event(($pref['maintainance_flag'] == 0) ? 'MAINT_02' : 'MAINT_01', $pref['maintainance_text'], E_LOG_INFORMATIVE, '');
e107::getLog()->add(($pref['maintainance_flag'] == 0) ? 'MAINT_02' : 'MAINT_01', $pref['maintainance_text'], E_LOG_INFORMATIVE, '');
save_prefs();
$mes->addSuccess(UGFLAN_1);
}

6
e107_admin/update_routines.php
View File

@ -444,7 +444,7 @@ function update_core_prefs($type='')
e107::getConfig('core')->setPref($pref)->save();
$admin_log->logMessage(LAN_UPDATE_14.$e107info['e107_version'], E_MESSAGE_NODISPLAY, E_MESSAGE_INFO);
$admin_log->flushMessages('UPDATE_03',E_LOG_INFORMATIVE);
//$admin_log->log_event('UPDATE_03',LAN_UPDATE_14.$e107info['e107_version'].'[!br!]'.implode(', ',$accum),E_LOG_INFORMATIVE,''); // Log result of actual update
//e107::getLog()->add('UPDATE_03',LAN_UPDATE_14.$e107info['e107_version'].'[!br!]'.implode(', ',$accum),E_LOG_INFORMATIVE,''); // Log result of actual update
}
return $just_check;
}
@ -1638,7 +1638,7 @@ function update_706_to_800($type='')
//$admin_log->log_event('UPDATE_01',LAN_UPDATE_14.$e107info['e107_version'].'[!br!]'.implode('[!br!]',$updateMessages),E_LOG_INFORMATIVE,''); // Log result of actual update
//e107::getLog()->add('UPDATE_01',LAN_UPDATE_14.$e107info['e107_version'].'[!br!]'.implode('[!br!]',$updateMessages),E_LOG_INFORMATIVE,''); // Log result of actual update
return $just_check;
}
@ -1773,7 +1773,7 @@ function update_70x_to_706($type='')
// If we get to here, in checking mode no updates are required. In update mode, all done.
if ($just_check) return TRUE;
$admin_log->log_event('UPDATE_02',LAN_UPDATE_14.$e107info['e107_version'],E_LOG_INFORMATIVE,''); // Log result of actual update
e107::getLog()->add('UPDATE_02',LAN_UPDATE_14.$e107info['e107_version'],E_LOG_INFORMATIVE,''); // Log result of actual update
return $just_check; // TRUE if no updates needed, FALSE if updates needed and completed
}

2
e107_admin/updateadmin.php
View File

@ -50,7 +50,7 @@ if (isset($_POST['update_settings']))
$check = $sql -> db_Update('user',$userData);
if ($check)
{
$admin_log->log_event('ADMINPW_01', '', E_LOG_INFORMATIVE, '');
e107::getLog()->add('ADMINPW_01', '', E_LOG_INFORMATIVE, '');
$userMethods->makeUserCookie(array('user_id' => USERID,'user_password' => $userData['data']['user_password']), FALSE); // Can't handle autologin ATM
$mes->addSuccess(UDALAN_3." ".ADMINNAME);
$e_event -> trigger('adpword');

2
e107_admin/upload.php
View File

@ -199,7 +199,7 @@ if ($action == "dis" && isset($_POST['updelete']['upload_'.$id]) )
unlink(e_UPLOAD.$row['upload_ss']);
}
$message = ($sql->db_Delete("upload", "upload_id='".intval($id)."'")) ? UPLLAN_1 : LAN_DELETED_FAILED;
$admin_log->log_event('UPLOAD_01',$row['upload_file'],E_LOG_INFORMATIVE,'');
e107::getLog()->add('UPLOAD_01',$row['upload_file'],E_LOG_INFORMATIVE,'');
}
if ($action == "dlm")

20
e107_admin/users.php
View File

@ -454,7 +454,7 @@ class users_admin_ui extends e_admin_ui
{
if ($sql->update("user","user_ban='1' WHERE user_id='".$userid."' "))
{
$admin_log->log_event('USET_05', str_replace(array('--UID--','--NAME--'), array($row['user_id'], $row['user_name']), USRLAN_161), E_LOG_INFORMATIVE);
e107::getLog()->add('USET_05', str_replace(array('--UID--','--NAME--'), array($row['user_id'], $row['user_name']), USRLAN_161), E_LOG_INFORMATIVE);
$mes->addSuccess("(".$userid.".".$row['user_name']." - {$row['user_email']}) ".USRLAN_8);
}
if (trim($row['user_ip']) == "")
@ -513,7 +513,7 @@ class users_admin_ui extends e_admin_ui
$userMethods->addNonDefaulted($row);
$sysuser->setData($row)->save();
$admin_log->log_event('USET_10', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_166), E_LOG_INFORMATIVE);
e107::getLog()->add('USET_10', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_166), E_LOG_INFORMATIVE);
$e_event->trigger('userfull', $row);
$mes->addSuccess(USRLAN_86." (#".$sysuser->getId()." : ".$sysuser->getName().' - '.$sysuser->getValue('email').")");
@ -683,7 +683,7 @@ class users_admin_ui extends e_admin_ui
$search = array('--UID--', '--NAME--', '--EMAIL--', '--ADMIN_UID--', '--ADMIN_NAME--', '--ADMIN_EMAIL--');
$replace = array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email'), $user->getId(), $user->getName(), $user->getValue('email'));
$admin_log->log_event('USET_08', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
e107::getLog()->add('USET_08', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
$this->redirect('list', 'main', true);
}
@ -699,7 +699,7 @@ class users_admin_ui extends e_admin_ui
{
$sysuser->set('user_admin', 1)->save(); //"user","user_admin='1' WHERE user_id={$userid}"
$lan = str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_164);
$admin_log->log_event('USET_08', $lan, E_LOG_INFORMATIVE);
e107::getLog()->add('USET_08', $lan, E_LOG_INFORMATIVE);
$mes->addSuccess($lan);
}
@ -825,7 +825,7 @@ class users_admin_ui extends e_admin_ui
$sysuser->email('email', $options);
//sendemail($send_to,$subject,$message);
}
$admin_log->log_event('USET_14', str_replace(array('--UID--','--CLASSES--'), array($id, $svar), UCSLAN_11), E_LOG_INFORMATIVE);
e107::getLog()->add('USET_14', str_replace(array('--UID--','--CLASSES--'), array($id, $svar), UCSLAN_11), E_LOG_INFORMATIVE);
$mes->addSuccess(nl2br($message));
}
@ -978,7 +978,7 @@ class users_admin_ui extends e_admin_ui
if ($check)
{
$admin_log->log_event('USET_11', str_replace(array('--ID--','--NAME--','--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_167), E_LOG_INFORMATIVE);
e107::getLog()->add('USET_11', str_replace(array('--ID--','--NAME--','--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_167), E_LOG_INFORMATIVE);
$mes->addSuccess(USRLAN_140.": <a href='mailto:".$sysuser->getValue('email')."?body=".$return_address."' title=\"".LAN_USER_08."\" >".$sysuser->getName()." (".$sysuser->getValue('email').")</a> ({$lan}) ");
}
else
@ -1235,7 +1235,7 @@ class users_admin_ui extends e_admin_ui
$user_data['user_id'] = $userid;
// Add to admin log
$admin_log->log_event('USET_02',"UName: {$user_data['user_name']}; Email: {$user_data['user_email']}", E_LOG_INFORMATIVE);
e107::getLog()->add('USET_02',"UName: {$user_data['user_name']}; Email: {$user_data['user_email']}", E_LOG_INFORMATIVE);
// Add to user audit trail
$admin_log->user_audit(USER_AUDIT_ADD_ADMIN, $user_data, 0, $user_data['user_loginname']);
@ -1749,7 +1749,7 @@ class users_admin_ui extends e_admin_ui
}
if ($count)
{
$admin_log->log_event('USET_12',str_replace('--COUNT--',$count,USRLAN_168),E_LOG_INFORMATIVE);
e107::getLog()->add('USET_12',str_replace('--COUNT--',$count,USRLAN_168),E_LOG_INFORMATIVE);
}
}
@ -1914,7 +1914,7 @@ class users_admin_ui extends e_admin_ui
}
if ($del_count)
{
$admin_log->log_event('USET_13',str_replace('--COUNT--',$del_count,USRLAN_169),E_LOG_INFORMATIVE);
e107::getLog()->add('USET_13',str_replace('--COUNT--',$del_count,USRLAN_169),E_LOG_INFORMATIVE);
}
if ($tot)
{
@ -1966,7 +1966,7 @@ class users_admin_ui extends e_admin_ui
// $sql->db_Delete("user","user_id='{$u['user_id']}' ");
// $sql->db_Delete("user_extended","user_extended_id='{$u['user_id']}' ");
// }
// $admin_log->log_event('USET_04',str_replace(array('--COUNT--','--TYPE--'),array(count($uList),$bantype),USRLAN_160),E_LOG_INFORMATIVE);
// e107::getLog()->add('USET_04',str_replace(array('--COUNT--','--TYPE--'),array(count($uList),$bantype),USRLAN_160),E_LOG_INFORMATIVE);
// }
// $ns->tablerender(USRLAN_57,"<div style='text-align:center'><b>".$text."</b></div>");
// unset ($text);

22
e107_admin/users_extended.php
View File

@ -67,7 +67,7 @@ if ($tmp)
{
$sql->db_Update("user_extended_struct", "user_extended_struct_order=user_extended_struct_order+1 WHERE user_extended_struct_type > 0 AND user_extended_struct_parent = {$_parent} AND user_extended_struct_order ='".($_order-1)."'");
$sql->db_Update("user_extended_struct", "user_extended_struct_order=user_extended_struct_order-1 WHERE user_extended_struct_type > 0 AND user_extended_struct_parent = {$_parent} AND user_extended_struct_id='".$_id."'");
$admin_log->log_event('EUF_01',$_id.', '.$_order.', '.$_parent,E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_01',$_id.', '.$_order.', '.$_parent,E_LOG_INFORMATIVE,'');
e107::getCache()->clear_sys('user_extended_struct', true);
}
}
@ -85,7 +85,7 @@ if ($tmp)
{
$sql->db_Update("user_extended_struct", "user_extended_struct_order=user_extended_struct_order-1 WHERE user_extended_struct_type > 0 AND user_extended_struct_parent = {$_parent} AND user_extended_struct_order='".($_order+1)."'");
$sql->db_Update("user_extended_struct", "user_extended_struct_order=user_extended_struct_order+1 WHERE user_extended_struct_type > 0 AND user_extended_struct_parent = {$_parent} AND user_extended_struct_id='".$_id."'");
$admin_log->log_event('EUF_02',$_id.', '.$_order.', '.$_parent,E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_02',$_id.', '.$_order.', '.$_parent,E_LOG_INFORMATIVE,'');
e107::getCache()->clear_sys('user_extended_struct', true);
}
}
@ -100,7 +100,7 @@ if (isset($_POST['catup_x']) || isset($_POST['catup']))
{
$sql->db_Update("user_extended_struct", "user_extended_struct_order=user_extended_struct_order+1 WHERE user_extended_struct_type = 0 AND user_extended_struct_order='".($_order-1)."'");
$sql->db_Update("user_extended_struct", "user_extended_struct_order=user_extended_struct_order-1 WHERE user_extended_struct_type = 0 AND user_extended_struct_id='".$_id."'");
$admin_log->log_event('EUF_03',$_id.', '.$_order,E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_03',$_id.', '.$_order,E_LOG_INFORMATIVE,'');
e107::getCache()->clear_sys('user_extended_struct', true);
}
}
@ -115,7 +115,7 @@ if (isset($_POST['catdown_x']) || isset($_POST['catdown']))
{
$sql->db_Update("user_extended_struct", "user_extended_struct_order=user_extended_struct_order-1 WHERE user_extended_struct_type = 0 AND user_extended_struct_order='".($_order+1)."'");
$sql->db_Update("user_extended_struct", "user_extended_struct_order=user_extended_struct_order+1 WHERE user_extended_struct_type = 0 AND user_extended_struct_id='".$_id."'");
$admin_log->log_event('EUF_04',$_id.', '.$_order,E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_04',$_id.', '.$_order,E_LOG_INFORMATIVE,'');
e107::getCache()->clear_sys('user_extended_struct', true);
}
}
@ -153,7 +153,7 @@ if (isset($_POST['add_field']))
}
else
{
$admin_log->log_event('EUF_05',$ue_field_name.'[!br!]'.$tp->toDB($_POST['user_text']).'[!br!]'.intval($_POST['user_type']),E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_05',$ue_field_name.'[!br!]'.$tp->toDB($_POST['user_text']).'[!br!]'.intval($_POST['user_type']),E_LOG_INFORMATIVE,'');
e107::getCache()->clear_sys('user_extended_struct', true);
}
}
@ -177,7 +177,7 @@ if (isset($_POST['update_field']))
$result = $mes->addAuto($ue->user_extended_modify($sub_action, $tp->toDB($_POST['user_field']), $tp->toDB($_POST['user_text']), intval($_POST['user_type']), $upd_parms, $upd_values, $tp->toDB($_POST['user_default']), intval($_POST['user_required']), intval($_POST['user_read']), intval($_POST['user_write']), intval($_POST['user_applicable']), intval($_POST['user_parent'])), 'update', EXTLAN_29, false, false);
if($result)
{
$admin_log->log_event('EUF_06',$tp->toDB($_POST['user_field']).'[!br!]'.$tp->toDB($_POST['user_text']).'[!br!]'.intval($_POST['user_type']),E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_06',$tp->toDB($_POST['user_field']).'[!br!]'.$tp->toDB($_POST['user_text']).'[!br!]'.intval($_POST['user_type']),E_LOG_INFORMATIVE,'');
e107::getCache()->clear_sys('user_extended_struct', true);
}
}
@ -199,7 +199,7 @@ if (isset($_POST['update_category']))
);
if($result)
{
$admin_log->log_event('EUF_09',$name,E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_09',$name,E_LOG_INFORMATIVE,'');
e107::getCache()->clear_sys('user_extended_struct', true);
}
}
@ -219,7 +219,7 @@ if (isset($_POST['add_category']))
$result = $mes->addAuto($sql->db_Insert("user_extended_struct","'0', '{$name}', '".$tp->toDB($_POST['user_text'])."', 0, '', '', '', '".intval($_POST['user_read'])."', '".intval($_POST['user_write'])."', '0', '0', '".intval($_POST['user_applicable'])."', '0', '0'"), 'insert', EXTLAN_40, false, false);
if($result)
{
$admin_log->log_event('EUF_08',$name,E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_08',$name,E_LOG_INFORMATIVE,'');
e107::getCache()->clear_sys('user_extended_struct', true);
}
}
@ -242,7 +242,7 @@ if (varset($_POST['eu_action'],'') == "delcat")
}
elseif($ue->user_extended_remove($_id, $_name))
{
$admin_log->log_event('EUF_10',$_id.', '.$_name,E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_10',$_id.', '.$_name,E_LOG_INFORMATIVE,'');
$message = EXTLAN_41;
e107::getCache()->clear_sys('user_extended_struct', true);
}
@ -1182,7 +1182,7 @@ class users_ext
$ret .= EXTLAN_70." $f ".EXTLAN_71."<br />";
}
}
$admin_log->log_event('EUF_11',implode(', ',$_POST['activate']),E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_11',implode(', ',$_POST['activate']),E_LOG_INFORMATIVE,'');
return $ret;
}
@ -1205,7 +1205,7 @@ class users_ext
$ret .= EXTLAN_70." $f ".EXTLAN_73."<br />";
}
}
$admin_log->log_event('EUF_12',implode(', ',$_POST['deactivate']),E_LOG_INFORMATIVE,'');
e107::getLog()->add('EUF_12',implode(', ',$_POST['deactivate']),E_LOG_INFORMATIVE,'');
return $ret;
}

2
e107_admin/wmessage.php
View File

@ -308,6 +308,6 @@ function welcome_adminlog($msg_num='00', $id=0, $woffle='')
if ($msg) $msg .= '[!br!]';
$msg .= $woffle;
}
$admin_log->log_event('WELCOME_'.$msg_num,$msg,E_LOG_INFORMATIVE,'');
e107::getLog()->add('WELCOME_'.$msg_num,$msg,E_LOG_INFORMATIVE,'');
}
?>

2
e107_handlers/theme_handler.php
View File

@ -1844,7 +1844,7 @@ class themeHandler
}
global $pref,$admin_log;
// if (!varset($pref['admin_log_log']['admin_banlist'],0)) return;
$admin_log->log_event('THEME_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
e107::getLog()->add('THEME_'.$msg_num, $woffle, E_LOG_INFORMATIVE, '');
}
function parse_theme_php($path)

2
e107_handlers/user_handler.php
View File

@ -1600,7 +1600,7 @@ class e_userperms
//$sql->db_Update("user", "user_perms='{$perm}' WHERE user_id='{$modID}' ")
e107::getMessage()->addAuto($sysuser->set('user_perms', $perm)->save(), 'update', sprintf(LAN_UPDATED, $tp->toDB($_POST['ad_name'])), false, false);
$logMsg = str_replace(array('--ID--', '--NAME--'),array($modID, $a_name),ADMSLAN_72).$perm;
$admin_log->log_event('ADMIN_01',$logMsg,E_LOG_INFORMATIVE,'');
e107::getLog()->add('ADMIN_01',$logMsg,E_LOG_INFORMATIVE,'');
}
}

2
e107_plugins/banner/admin_banner.php
View File

@ -687,7 +687,7 @@ function banners_adminlog($msg_num='00', $woffle='')
$pref = e107::getPref();
// if (!varset($pref['admin_log_log']['admin_banners'],0)) return;
$admin_log->log_event('BANNER_'.$msg_num,$woffle, E_LOG_INFORMATIVE,'');
e107::getLog()->add('BANNER_'.$msg_num,$woffle, E_LOG_INFORMATIVE,'');
}
?>

4
e107_plugins/chatbox_menu/admin_chatbox.php
View File

@ -62,7 +62,7 @@ if (isset($_POST['prune']))
$prunetime = time() - $chatbox_prune;
$sql->db_Delete("chatbox", "cb_datestamp < '{$prunetime}' ");
$admin_log->log_event('CHBLAN_02', $chatbox_prune.', '.$prunetime, E_LOG_INFORMATIVE, '');
e107::getLog()->add('CHBLAN_02', $chatbox_prune.', '.$prunetime, E_LOG_INFORMATIVE, '');
$e107cache->clear("nq_chatbox");
$mes->addSuccess(CHBLAN_28);
}
@ -88,7 +88,7 @@ if (isset($_POST['recalculate']))
{
$sql->db_Update("user", "user_chats = '{$cnt}' WHERE user_id = '{$uid}'");
}
$admin_log->log_event('CHBLAN_03','', E_LOG_INFORMATIVE, '');
e107::getLog()->add('CHBLAN_03','', E_LOG_INFORMATIVE, '');
$mes->addSuccess(CHBLAN_33);
}

8
e107_plugins/download/admin_download.php
View File

@ -102,7 +102,7 @@ if (isset($_POST['update_catorder']))
$sql -> db_Update("download_category", "download_category_order='".intval($order)."' WHERE download_category_id='".intval($key)."'");
}
}
$admin_log->log_event('DOWNL_08',implode(',',array_keys($_POST['catorder'])),E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_08',implode(',',array_keys($_POST['catorder'])),E_LOG_INFORMATIVE,'');
$ns->tablerender("", "<div style='text-align:center'><b>".LAN_UPDATED."</b></div>");
}
/*
@ -175,7 +175,7 @@ if (isset($_POST['addlimit']))
if ($sql->db_Insert('generic',$vals))
{
$message = DOWLAN_117;
$admin_log->log_event('DOWNL_09',$valString,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_09',$valString,E_LOG_INFORMATIVE,'');
}
else
{
@ -208,7 +208,7 @@ if (isset($_POST['updatelimits']))
if ($sql->db_Delete('generic',"gen_id = {$idLim}"))
{
$message .= $idLim." - ".DOWLAN_119."<br/>";
$admin_log->log_event('DOWNL_11','ID: '.$idLim,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_11','ID: '.$idLim,E_LOG_INFORMATIVE,'');
}
else
{
@ -224,7 +224,7 @@ if (isset($_POST['updatelimits']))
}
$valString = implode(',',$vals);
$sql->db_UpdateArray('generic',$vals," WHERE gen_id = {$idLim}");
$admin_log->log_event('DOWNL_10',$idLim.', '.$valString,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_10',$idLim.', '.$valString,E_LOG_INFORMATIVE,'');
$message .= $idLim." - ".DOWLAN_121."<br/>";
unset($vals);
}

12
e107_plugins/download/handlers/adminDownload_class.php
View File

@ -1187,7 +1187,7 @@ class adminDownload extends download
$logString .= '[!br!]'.$k.'=>'.$v;
}
}
$admin_log->log_event($aText,$logString,E_LOG_INFORMATIVE,'');
e107::getLog()->add($aText,$logString,E_LOG_INFORMATIVE,'');
}
*/
// -----------------------------------------------------------------------------
@ -1890,12 +1890,12 @@ class adminDownload extends download
if ($id)
{
admin_update($sql->db_Update("download_category", "download_category_name='{$download_category_name}', download_category_description='{$download_category_description}', download_category_icon ='{$download_category_icon}', download_category_parent= '{$download_categoory_parent}', download_category_class='{$download_category_class}' WHERE download_category_id='{$id}'"), 'update', DOWLAN_48);
$admin_log->log_event('DOWNL_03',$download_category_name.'[!br!]'.$download_category_description,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_03',$download_category_name.'[!br!]'.$download_category_description,E_LOG_INFORMATIVE,'');
}
else
{
admin_update($sql->db_Insert("download_category", "0, '{$download_category_name}', '{$download_category_description}', '{$download_category_icon}', '{$download_categoory_parent}', '{$download_category_class}', 0 "), 'insert', DOWLAN_47);
$admin_log->log_event('DOWNL_02',$download_category_name.'[!br!]'.$download_category_description,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_02',$download_category_name.'[!br!]'.$download_category_description,E_LOG_INFORMATIVE,'');
}
if ($subAction == "sn")
{
@ -1914,7 +1914,7 @@ class adminDownload extends download
if ($delete == "mirror")
{
admin_update($sql -> db_Delete("download_mirror", "mirror_id=".$del_id), delete, DOWLAN_135);
$admin_log->log_event('DOWNL_14','ID: '.$del_id,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_14','ID: '.$del_id,E_LOG_INFORMATIVE,'');
}
@ -2059,12 +2059,12 @@ class adminDownload extends download
if (isset($_POST['id']))
{
admin_update($sql -> db_Update("download_mirror", "mirror_name='{$name}', mirror_url='{$url}', mirror_image='".$tp->toDB($_POST['mirror_image'])."', mirror_location='{$location}', mirror_description='{$description}' WHERE mirror_id=".intval($_POST['id'])), 'update', DOWLAN_133);
$admin_log->log_event('DOWNL_13','ID: '.intval($_POST['id']).'[!br!]'.$logString,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_13','ID: '.intval($_POST['id']).'[!br!]'.$logString,E_LOG_INFORMATIVE,'');
}
else
{
admin_update($sql -> db_Insert("download_mirror", "0, '{$name}', '{$url}', '".$tp->toDB($_POST['mirror_image'])."', '{$location}', '{$description}', 0"), 'insert', DOWLAN_134);
$admin_log->log_event('DOWNL_12',$logString,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_12',$logString,E_LOG_INFORMATIVE,'');
}
}
}*/

8
e107_plugins/download/includes/admin.php
View File

@ -1783,7 +1783,7 @@ $columnInfo = array(
if ($delete == "mirror")
{
$mes->addAuto($sql -> db_Delete("download_mirror", "mirror_id=".$del_id), delete, DOWLAN_135);
$admin_log->log_event('DOWNL_14','ID: '.$del_id,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_14','ID: '.$del_id,E_LOG_INFORMATIVE,'');
}
@ -1934,12 +1934,12 @@ $columnInfo = array(
if (isset($_POST['id']))
{
$mes->addAuto($sql -> db_Update("download_mirror", "mirror_name='{$name}', mirror_url='{$url}', mirror_image='".$tp->toDB($_POST['mirror_image'])."', mirror_location='{$location}', mirror_description='{$description}' WHERE mirror_id=".intval($_POST['id'])), 'update', DOWLAN_133);
$admin_log->log_event('DOWNL_13','ID: '.intval($_POST['id']).'[!br!]'.$logString,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_13','ID: '.intval($_POST['id']).'[!br!]'.$logString,E_LOG_INFORMATIVE,'');
}
else
{
$mes->addAuto($sql -> db_Insert("download_mirror", "0, '{$name}', '{$url}', '".$tp->toDB($_POST['mirror_image'])."', '{$location}', '{$description}', 0"), 'insert', DOWLAN_134);
$admin_log->log_event('DOWNL_12',$logString,E_LOG_INFORMATIVE,'');
e107::getLog()->add('DOWNL_12',$logString,E_LOG_INFORMATIVE,'');
}
}
}
@ -2120,7 +2120,7 @@ $columnInfo = array(
$logString .= '[!br!]'.$k.'=>'.$v;
}
}
$admin_log->log_event($aText,$logString,E_LOG_INFORMATIVE,'');
e107::getLog()->add($aText,$logString,E_LOG_INFORMATIVE,'');
}

2
e107_plugins/gsitemap/e_module.php
View File

@ -44,7 +44,7 @@ function pingit($vals)
$pinger->ping($xml_rpc_server, $xml_rpc_port, $xml_rpc_path, $xml_rpc_method, $weblog_name, $weblog_url, $changes_url, $cat_or_rss, $extended);
$log = strip_tags($vals['news_title']."\n".$changes_url."\n".$cat_or_rss."\n".$pinger->smessage);
$admin_log->log_event("Gsitemap Google-ping",$log, 4);
e107::getLog()->add("Gsitemap Google-ping",$log, 4);
}

8
e107_plugins/linkwords/admin_config.php
View File

@ -66,7 +66,7 @@ if(isset($deltest[LAN_DELETE]))
if ($sql->db_Count('linkwords', '(*)', "WHERE linkword_id = ".$delete_id))
{
$sql->db_Delete('linkwords', 'linkword_id='.$delete_id);
$admin_log->log_event('LINKWD_03','ID: '.$delete_id,'');
e107::getLog()->add('LINKWD_03','ID: '.$delete_id,'');
$e107->ecache->clear_sys(LW_CACHE_TAG);
//$message = LWLAN_19;
$mes->addSuccess(LAN_DELETED);
@ -116,7 +116,7 @@ if (isset($_POST['saveopts_linkword']))
save_prefs();
$logString = implode(', ',$pref['lw_context_visibility']).'[!br!]'.$pref['lw_page_visibility'].'[!br!]'.$pref['lw_ajax_enable'].'[!br!]'.$pref['lw_notsamepage'];
$e107->ecache->clear_sys(LW_CACHE_TAG);
$admin_log->log_event('LINKWD_04',$logString,'');
e107::getLog()->add('LINKWD_04',$logString,'');
}
@ -140,7 +140,7 @@ if (isset($_POST['submit_linkword']) || isset($_POST['update_linkword']))
{
if ($sql->db_Insert('linkwords', $data))
{
$admin_log->log_event('LINKWD_01',$logString,'');
e107::getLog()->add('LINKWD_01',$logString,'');
$mes->addSuccess(LAN_CREATED);
}
else
@ -156,7 +156,7 @@ if (isset($_POST['submit_linkword']) || isset($_POST['update_linkword']))
{
$mes->addSuccess(LAN_UPDATED);
$logString = 'ID: '.$id.'[!br!]'.$logString;
$admin_log->log_event('LINKWD_02',$logString,'');
e107::getLog()->add('LINKWD_02',$logString,'');
}
else
{

2
e107_plugins/linkwords/linkwords.php
View File

@ -57,7 +57,7 @@ class e_linkwords
$pref['e_tohtml_list'][] = 'linkwords';
}
save_prefs();
$admin_log->log_event('LINKWD_05',LWLAN_58.'[!br!]'.$pref['tohtml_hook'],''); // Log that the update was done
e107::getLog()->add('LINKWD_05',LWLAN_58.'[!br!]'.$pref['tohtml_hook'],''); // Log that the update was done
return;
}

8
e107_plugins/log/admin_config.php
View File

@ -196,7 +196,7 @@ if(IsSet($_POST['wipeSubmit']))
}
$logStr .= '[!br!]'.$key;
}
$admin_log->log_event('STAT_01',ADSTAT_L81.$logStr,'');
e107::getLog()->add('STAT_01',ADSTAT_L81.$logStr,'');
//$message = ADSTAT_L25; // TODO:$emessage
$mes->addSuccess(LAN_UPDATED);
@ -237,7 +237,7 @@ if (isset($_POST['updatesettings']))
}
save_prefs();
file_put_contents(e_LOG.LogFlagFile, "<?php\n\$logEnable={$pref['statActivate']};\n?>\n"); // Logging task uses to see if logging enabled
$admin_log->log_event('STAT_02',ADSTAT_L82.$logStr,'');
e107::getLog()->add('STAT_02',ADSTAT_L82.$logStr,'');
}
$ns->tablerender($caption, $mes->render() . $text);
@ -526,7 +526,7 @@ switch ($action)
$logStr .= "[!br!]{$k} => ".$v;
}
$text .= "</td></tr>";
$admin_log->log_event('STAT_04',ADSTAT_L83.$logStr,'');
e107::getLog()->add('STAT_04',ADSTAT_L83.$logStr,'');
}
$text .= "<tr><td>".ADSTAT_L70."</td>";
$text .= "<td><select class='tbox' name='delete_month'>\n";
@ -776,7 +776,7 @@ function rempagego()
{
$sql -> db_Insert("logstats", "0, 'pageTotal', '{$pagetotal}' ");
}
$admin_log->log_event('STAT_03',ADSTAT_L80."[!br!]".implode("[!br!]",$_POST['remcb']),'');
e107::getLog()->add('STAT_03',ADSTAT_L80."[!br!]".implode("[!br!]",$_POST['remcb']),'');
$varStart = chr(36);
$quote = chr(34);

2
e107_plugins/login_menu/config.php
View File

@ -99,7 +99,7 @@ if (isset($_POST['update_menu']))
}
//$menuPref->setPref('login_menu', $loginPrefs);
$menuPref->save(false, true, false);
$admin_log->log_event('MISC_03','', E_LOG_INFORMATIVE,'');
e107::getLog()->add('MISC_03','', E_LOG_INFORMATIVE,'');
//$ns->tablerender("", '<div style=\'text-align:center\'><b>'.LAN_SETSAVED.'</b></div>');
$mes->addSuccess(LAN_SAVED);
$ns->tablerender("", $mes->render() . $text);

2
e107_plugins/newsfeed/admin_config.php
View File

@ -87,7 +87,7 @@ $ns->tablerender($caption, $mes->render() . $text);
if($action == "delete")
{
$sql->db_Delete('newsfeed', 'newsfeed_id='.$id);
$admin_log->log_event('NEWSFD_03','ID: '.$id,E_LOG_INFORMATIVE,'');
e107::getLog()->add('NEWSFD_03','ID: '.$id,E_LOG_INFORMATIVE,'');
$mes->addSuccess(LAN_DELETED);
}

6
e107_plugins/poll/poll_class.php
View File

@ -75,7 +75,7 @@ class poll
{
admin_purge_related("poll", $existing);
}
$admin_log->log_event('POLL_01',LAN_AL_POLL_01.': '.$existing,'');
e107::getLog()->add('POLL_01',LAN_AL_POLL_01.': '.$existing,'');
//return POLL_ADLAN08;
}
}
@ -158,7 +158,7 @@ class poll
$sql->update("polls", "poll_votes='".$foo['poll_votes']."' WHERE poll_id='".intval(POLLID)."' ");
}
$admin_log->log_event('POLL_02','ID: '.POLLID.' - '.$poll_title,'');
e107::getLog()->add('POLL_02','ID: '.POLLID.' - '.$poll_title,'');
//$message = POLLAN_45;
}
else
@ -181,7 +181,7 @@ class poll
}
}
$ret = $sql->insert("polls", "'0', ".time().", ".intval($active_start).", ".intval($active_end).", ".ADMINID.", '{$poll_title}', '{$poll_options}', '{$votes}', '', '1', '".$tp->toDB($poll_comment)."', '".intval($multipleChoice)."', '".intval($showResults)."', '".intval($pollUserclass)."', '".intval($storageMethod)."'");
$admin_log->log_event('POLL_03','ID: '.$ret.' - '.$poll_title,''); // Intentionally only log admin-entered polls
e107::getLog()->add('POLL_03','ID: '.$ret.' - '.$poll_title,''); // Intentionally only log admin-entered polls
}
else
{

2
e107_plugins/rss_menu/admin_prefs.php
View File

@ -200,7 +200,7 @@ if(isset($_POST['delete']))
{
$d_idt = array_keys($_POST['delete']);
$message = ($sql -> db_Delete("rss", "rss_id=".intval($d_idt[0]))) ? LAN_DELETED : LAN_DELETED_FAILED;
$admin_log->log_event('RSS_01','ID: '.intval($d_idt[0]).' - '.$message,E_LOG_INFORMATIVE,'');
e107::getLog()->add('RSS_01','ID: '.intval($d_idt[0]).' - '.$message,E_LOG_INFORMATIVE,'');
$e107cache->clear("rss");
}

2
e107_plugins/trackback/modtrackback.php
View File

@ -40,7 +40,7 @@ if (isset($_POST['moderate']))
}
if (count($temp))
{
$admin_log->log_event('TRACK_02',implode(', ',$temp), E_LOG_INFORMATIVE,'');
e107::getLog()->add('TRACK_02',implode(', ',$temp), E_LOG_INFORMATIVE,'');
}
}
$ns->tablerender("", "<div style='text-align:center'><b>".TRACKBACK_L15."</b></div>");

2
e107_plugins/user/usertheme_menu_config.php
View File

@ -60,7 +60,7 @@ if (isset($_POST['update_theme']))
$pref['allow_theme_select'] = $themeeditclass;
save_prefs();
$woffle = LAN_UMENU_THEME_8.$pref['allowed_themes'].'[!br!]'.LAN_UMENU_THEME_9.$pref['allow_theme_select'];
$admin_log->log_event('UTHEME_01',$woffle,E_LOG_INFORMATIVE,'');
e107::getLog()->add('UTHEME_01',$woffle,E_LOG_INFORMATIVE,'');
}
}