Mowie/Mowie
1
0
Fork 0
mirror of https://github.com/Mowie/Mowie synced 2024-06-19 00:44:08 +00:00
Code Issues Releases Wiki Activity

Added extra text for logging

Browse Source
This commit is contained in:
kolaente 2016-11-13 14:44:58 +01:00
parent d508dfe938
commit 45f957c29b
17 changed files with 61 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/lang/lang.de.php
View File

@ -231,11 +231,12 @@ $lang['stream_construction_mode'] = '{user} hat die Seite in Baustellenmodus ver
$lang['stream_construction_mode_message'] = '{user} hat die Baustellenmodus-Nachricht geändert.'; $lang['stream_construction_mode_message'] = '{user} hat die Baustellenmodus-Nachricht geändert.';
$lang['stream_construction_mode_delete'] = '{user} hat den Baustellenmodus beendet.'; $lang['stream_construction_mode_delete'] = '{user} hat den Baustellenmodus beendet.';
$lang['stream_edited_page_title'] = '{user} hat den Seitentitel geändert.'; $lang['stream_edited_page_title'] = '{user} hat den Seitentitel geändert.';
$lang['stream_created_user'] = '{user} hat einen neuen Nutzer erstellt.'; $lang['stream_created_user'] = '{user} hat den neuen Nutzer "{extra}" erstellt.';
$lang['stream_edited_permissions'] = '{user} hat die Berechtigungen bearbeitet.'; $lang['stream_edited_permissions'] = '{user} hat die Berechtigungen bearbeitet.';
$lang['stream_added_group'] = '{user} hat eine Gruppe hinzugefügt.'; $lang['stream_added_to_group'] = '{user} hat einen Nutzer zur Gruppe "{extra}" hinzugefügt.';
$lang['stream_deleted_group'] = '{user} hat eine Gruppe gelöscht.'; $lang['stream_added_group'] = '{user} hat die Gruppe "{extra}" erstellt.';
$lang['stream_deleted_group'] = '{user} hat die Gruppe "{extra}" gelöscht.';
$lang['stream_deleted_user'] = '{user} hat einen Nutzer gelöscht.'; $lang['stream_deleted_user'] = '{user} hat einen Nutzer gelöscht.';
$lang['stream_created_group'] = '{user} hat eine neue Gruppe erstellt.'; $lang['stream_created_group'] = '{user} hat eine neue Gruppe erstellt.';
$lang['stream_system_update'] = '{user} hat das System geupdated.'; $lang['stream_system_update'] = '{user} hat das System geupdated.';
$lang['stream_app_update'] = '{user} hat eine App geupdated.'; $lang['stream_app_update'] = '{user} hat die App "{extra}" geupdated.';

11
admin/lang/lang.en.php
View File

@ -233,11 +233,12 @@ $lang['stream_construction_mode'] = '{user} put the site into construction mode.
$lang['stream_construction_mode_message'] = '{user} edited the construction-mode message.'; $lang['stream_construction_mode_message'] = '{user} edited the construction-mode message.';
$lang['stream_construction_mode_delete'] = '{user} put the site into production mode.'; $lang['stream_construction_mode_delete'] = '{user} put the site into production mode.';
$lang['stream_edited_page_title'] = '{user} edited the page title.'; $lang['stream_edited_page_title'] = '{user} edited the page title.';
$lang['stream_created_user'] = '{user} created a new user.'; $lang['stream_created_user'] = '{user} created the new user "{extra}".';
$lang['stream_edited_permissions'] = '{user} edited permissions.'; $lang['stream_edited_permissions'] = '{user} edited permissions.';
$lang['stream_added_group'] = '{user} added a group.'; $lang['stream_added_to_group'] = '{user} added a user to the group "{extra}".';
$lang['stream_deleted_group'] = '{user} deleted a group.'; $lang['stream_added_group'] = '{user} created the group "{extra}".';
$lang['stream_deleted_user'] = '{user} deleted an user.'; $lang['stream_deleted_group'] = '{user} deleted the group "{extra}".';
$lang['stream_deleted_user'] = '{user} deleted the user "{extra}".';
$lang['stream_created_group'] = '{user} created a new group.'; $lang['stream_created_group'] = '{user} created a new group.';
$lang['stream_system_update'] = '{user} updated the system'; $lang['stream_system_update'] = '{user} updated the system';
$lang['stream_app_update'] = '{user} updated an app.'; $lang['stream_app_update'] = '{user} updated the app "{extra}".';

2
admin/login.php
View File

@ -68,6 +68,8 @@ if($db->data[0]['id'] != '')
$_SESSION['lvl'] = $db->data[0]['lvl']; $_SESSION['lvl'] = $db->data[0]['lvl'];
$_SESSION['mail'] = $db->data[0]['mail']; $_SESSION['mail'] = $db->data[0]['mail'];
$_SESSION['guestview'] = 'true'; $_SESSION['guestview'] = 'true';
stream_message('{user} has logged in.', 4);
} }
else else
{ {

2
admin/new_user.php
View File

@ -27,7 +27,7 @@ if (hasPerm('manage_admins'))
if ($db->insert()) if ($db->insert())
{ {
echo msg('succes', sprintf($lang->get('admins_cn_success'), $_POST['userN']) . ' <a href="users.php">' . $lang->get('back') . '</a>'); echo msg('succes', sprintf($lang->get('admins_cn_success'), $_POST['userN']) . ' <a href="users.php">' . $lang->get('back') . '</a>');
stream_message('{user} created a new user.', 2); stream_message('{user} created the new user "{extra}".', 2, $_POST['userN']);
} else } else
{ {
echo msg('fail', $lang->get('admins_cn_fail') . ' {back}'); echo msg('fail', $lang->get('admins_cn_fail') . ' {back}');

8
admin/roles.php
View File

@ -14,7 +14,7 @@ if (hasPerm('manage_groups'))
if ($db->update(['id' => $_POST['user']])) if ($db->update(['id' => $_POST['user']]))
{ {
echo msg('success', $lang->get('admins_roles_added_success').' <a href="roles.php?members=' . $_GET['members'] . '">'.$lang->get('back').'</a>'); echo msg('success', $lang->get('admins_roles_added_success').' <a href="roles.php?members=' . $_GET['members'] . '">'.$lang->get('back').'</a>');
stream_message('{user} added a group.', 2); stream_message('{user} added a user to the group "{extra}".', 2, $_GET['members']);
} else } else
{ {
echo msg('fail', $lang->get('admins_roles_added_fail').' <a href="roles.php?members=' . $_GET['members'] . '">'.$lang->get('back').'</a>'); echo msg('fail', $lang->get('admins_roles_added_fail').' <a href="roles.php?members=' . $_GET['members'] . '">'.$lang->get('back').'</a>');
@ -32,7 +32,7 @@ if (hasPerm('manage_groups'))
if ($db->delete(['id' => $_GET['members']])) if ($db->delete(['id' => $_GET['members']]))
{ {
echo msg('success', $lang->get('admins_roles_delete_success').' <a href="roles.php">'.$lang->get('back').'</a>'); echo msg('success', $lang->get('admins_roles_delete_success').' <a href="roles.php">'.$lang->get('back').'</a>');
stream_message('{user} deleted a group.', 2); stream_message('{user} deleted the group "{extra}".', 2, $_GET['members']);
} else } else
{ {
echo msg('fail', $lang->get('admins_roles_delete_fail').' <a href="roles.php">'.$lang->get('back').'</a>'); echo msg('fail', $lang->get('admins_roles_delete_fail').' <a href="roles.php">'.$lang->get('back').'</a>');
@ -59,7 +59,7 @@ if (hasPerm('manage_groups'))
if ($db->update(['id' => $_GET['deluser']])) if ($db->update(['id' => $_GET['deluser']]))
{ {
echo msg('success', $lang->get('admins_roles_user_delete_success').' <a href="roles.php?members=' . $_GET['members'] . '">'.$lang->get('back').'</a>'); echo msg('success', $lang->get('admins_roles_user_delete_success').' <a href="roles.php?members=' . $_GET['members'] . '">'.$lang->get('back').'</a>');
stream_message('{user} deleted an user.', 2); stream_message('{user} deleted the user "{extra}".', 2, $_GET['deluser']);
} else } else
{ {
echo msg('fail', $lang->get('admins_roles_user_delete_fail').' <a href="roles.php?members=' . $_GET['members'] . '">'.$lang->get('back').'</a>'); echo msg('fail', $lang->get('admins_roles_user_delete_fail').' <a href="roles.php?members=' . $_GET['members'] . '">'.$lang->get('back').'</a>');
@ -162,7 +162,7 @@ if (hasPerm('manage_groups'))
if ($db->insert()) if ($db->insert())
{ {
echo msg('success', $lang->get('admins_roles_create_group_success').' <a href="roles.php">'.$lang->get('back').'</a>'); echo msg('success', $lang->get('admins_roles_create_group_success').' <a href="roles.php">'.$lang->get('back').'</a>');
stream_message('{user} created a new group.', 2); stream_message('{user} created the group "{extra}".', 2, $_POST['group_name']. ' ('.$db->lastID().')');
} else } else
{ {
echo msg('fail', $lang->get('admins_roles_create_group_fail').' <a href="roles.php">'.$lang->get('back').'</a>'); echo msg('fail', $lang->get('admins_roles_create_group_fail').' <a href="roles.php">'.$lang->get('back').'</a>');

9
admin/stream.php
View File

@ -17,11 +17,14 @@ if(isset($_GET['getStream']) && is_loggedin())
{ {
if(in_array($stream['lvl'], $loglevel)) if(in_array($stream['lvl'], $loglevel))
{ {
$message = str_replace('{user}', getUserByID($stream['user']), $lang->get($stream['message']));
$message = str_replace('{extra}', $stream['extra'], $message);
$streamData[] = [ $streamData[] = [
'id' => $stream['id'], 'id' => $stream['id'],
'time' => $stream['time'], 'time' => $stream['time'],
'user' => $stream['user'], 'user' => $stream['user'],
'message' => str_replace('{user}', getUserByID($stream['user']), $lang->get($stream['message'])) 'message' => $message
]; ];
} }
} }
@ -41,7 +44,9 @@ $db->setCol('system_stream');
$db->get(null, null, 'id', 'DESC', 200); $db->get(null, null, 'id', 'DESC', 200);
foreach ($db->data as $stream) foreach ($db->data as $stream)
{ {
echo '<p><b>'.date('d.m.Y H:i', $stream['time']).':</b> '.str_replace('{user}', getUserByID($stream['user']), $lang->get($stream['message'])).'</p>'; $message = str_replace('{user}', getUserByID($stream['user']), $lang->get($stream['message']));
$message = str_replace('{extra}', $stream['extra'], $message);
echo '<p><b>'.date('d.m.Y H:i', $stream['time']).':</b> '.$message.'</p>';
} }
echo '</div>'; echo '</div>';

2
admin/update.php
View File

@ -219,7 +219,7 @@ if (isset($_GET['update']))
if(isset($_GET['appUpdate'])) if(isset($_GET['appUpdate']))
{ {
echo msg('succes', sprintf($lang->get('update_app_succss'), $_CONF['app_name']) . ' <a href="general_config.php">' . $lang->get('back') . '</a>'); echo msg('succes', sprintf($lang->get('update_app_succss'), $_CONF['app_name']) . ' <a href="general_config.php">' . $lang->get('back') . '</a>');
stream_message('{user} updated an app.', 2); stream_message('{user} updated the app "{extra}".', 2, $_CONF['app_name']);
} }
else else
{ {

8
apps/Files/index.php
View File

@ -162,7 +162,7 @@ elseif (isset($_GET['del'], $_POST['file']))
if (rrmdir('../../' . $_POST['file'])) if (rrmdir('../../' . $_POST['file']))
{ {
echo 'success'; echo 'success';
stream_message('{user} deleted a folder.', 3); stream_message('{user} deleted the folder "{extra}".', 3, $_POST['file']);
} else } else
{ {
echo 'fail'; echo 'fail';
@ -172,7 +172,7 @@ elseif (isset($_GET['del'], $_POST['file']))
if (unlink('../../' . $_POST['file'])) if (unlink('../../' . $_POST['file']))
{ {
echo 'success'; echo 'success';
stream_message('{user} deleted a file.', 3); stream_message('{user} deleted the file "{extra}".', 3, $_POST['file']);
} else } else
{ {
echo 'fail'; echo 'fail';
@ -210,7 +210,7 @@ elseif (isset($_GET['upload']))
if (move_uploaded_file($_FILES['file']['tmp_name'], '../../' . $_GET['upload'] . $filename)) if (move_uploaded_file($_FILES['file']['tmp_name'], '../../' . $_GET['upload'] . $filename))
{ {
echo 'success'; echo 'success';
stream_message('{user} uploaded a file.', 3); stream_message('{user} uploaded the file "{extra}".', 3, $filename);
} else } else
{ {
echo 'fail'; echo 'fail';
@ -232,7 +232,7 @@ elseif (isset($_GET['newFolder']))
if (mkdir('../../' . $_POST['dir'] . str_replace(' ', '-', $_POST['name']))) if (mkdir('../../' . $_POST['dir'] . str_replace(' ', '-', $_POST['name'])))
{ {
echo 'success'; echo 'success';
stream_message('{user} created a folder.', 3); stream_message('{user} created the folder "{extra}".', 3, $_POST['name']);
} else } else
{ {
echo 'fail'; echo 'fail';

8
apps/Files/lang/lang.de.php
View File

@ -47,7 +47,7 @@ $lang['files_upload_finished'] = 'Upload abgeschlossen.';
$lang['files_upload_failed'] = 'Upload fehlgeschlagen.'; $lang['files_upload_failed'] = 'Upload fehlgeschlagen.';
//Stream Messages //Stream Messages
$lang['files_stream_deleted_folder'] = '{user} hat einen Ordner gelöscht.'; $lang['files_stream_deleted_folder'] = '{user} hat den Ordner "{extra}" gelöscht.';
$lang['files_stream_deleted_file'] = '{user} hat eine Datei gelöscht.'; $lang['files_stream_deleted_file'] = '{user} hat die Datei "{extra}" gelöscht.';
$lang['files_stream_uploaded'] = '{user} hat eine Datei hochgeladen.'; $lang['files_stream_uploaded'] = '{user} hat die Datei "{extra}" hochgeladen.';
$lang['files_stream_created_folder'] = '{user} hat einen Ordner erstellt.'; $lang['files_stream_created_folder'] = '{user} hat den Ordner "{extra}" erstellt.';

8
apps/Files/lang/lang.en.php
View File

@ -47,7 +47,7 @@ $lang['files_upload_finished'] = 'Upload finished.';
$lang['files_upload_failed'] = 'Upload failed.'; $lang['files_upload_failed'] = 'Upload failed.';
//Stream Messages //Stream Messages
$lang['files_stream_deleted_folder'] = '{user} deleted a folder.'; $lang['files_stream_deleted_folder'] = '{user} deleted the folder "{extra}".';
$lang['files_stream_deleted_file'] = '{user} deleted a file.'; $lang['files_stream_deleted_file'] = '{user} deleted the file "{extra}".';
$lang['files_stream_uploaded'] = '{user} uploaded a file.'; $lang['files_stream_uploaded'] = '{user} uploaded the file "{extra}".';
$lang['files_stream_created_folder'] = '{user} created a folder.'; $lang['files_stream_created_folder'] = '{user} created the folder "{extra}".';

2
apps/SimplePages/backend/confirm.php
View File

@ -45,7 +45,7 @@ if (isset($_GET['page']))
$db->data['page_id'] = $_GET['page']; $db->data['page_id'] = $_GET['page'];
$db->delete(); $db->delete();
echo msg('success', $lang->get('sp_confirm_success') . ' <a href="management.php">' . $lang->get('back') . '</a>'); echo msg('success', $lang->get('sp_confirm_success') . ' <a href="management.php">' . $lang->get('back') . '</a>');
stream_message('{user} confirmed contents of a page.', 3); stream_message('{user} confirmed contents of the page "{extra}".', 3, $_GET['page']);
} else } else
{ {
echo msg('fail', $lang->get('sp_confirm_fail') . ' <a href="management.php">' . $lang->get('back') . '</a>'); echo msg('fail', $lang->get('sp_confirm_fail') . ' <a href="management.php">' . $lang->get('back') . '</a>');

6
apps/SimplePages/backend/confirmConfig.php
View File

@ -11,6 +11,10 @@ if(file_exists($iniFile))
$config = parse_ini_file($iniFile); $config = parse_ini_file($iniFile);
//print_r($config);exit; //print_r($config);exit;
$confirmationRequierd = $config['confirmationRequierd']; $confirmationRequierd = $config['confirmationRequierd'];
$confirmationUserMail = $config['confirmationUserMail'];
$confirmationUser = $config['confirmationUser']; $confirmationUser = $config['confirmationUser'];
$db->setCol('system_admins');
$db->data['id'] = $confirmationUser;
$db->get();
$confirmationUserMail = $db->data[0]['mail'];
} }

8
apps/SimplePages/backend/edit.php
View File

@ -94,7 +94,7 @@ if (hasPerm('manage_pages'))
{ {
echo msg('succes', sprintf($lang->get('sp_edit_created'), $_POST['title']).' <a href="management.php">'.$lang->get('back').'</a>'); echo msg('succes', sprintf($lang->get('sp_edit_created'), $_POST['title']).' <a href="management.php">'.$lang->get('back').'</a>');
} }
stream_message('{user} created a page.', 3); stream_message('{user} created the page "{extra}".', 3, $_POST['title'].' ('.$id.')');
} }
else else
{ {
@ -114,7 +114,7 @@ if (hasPerm('manage_pages'))
if ($db->insert()) if ($db->insert())
{ {
echo msg('succes', sprintf($lang->get('sp_edit_edited'), $_POST['title']).' '.sprintf($lang->get('sp_edit_edited_need_confirm'), getUserByID($confirmationUser)).' <a href="management.php">'.$lang->get('back').'</a>'); echo msg('succes', sprintf($lang->get('sp_edit_edited'), $_POST['title']).' '.sprintf($lang->get('sp_edit_edited_need_confirm'), getUserByID($confirmationUser)).' <a href="management.php">'.$lang->get('back').'</a>');
stream_message('{user} edited a page.', 3); stream_message('{user} edited the page "{extra}".', 3, $_POST['title'].' ('.$id.')');
} }
else else
{ {
@ -126,7 +126,7 @@ if (hasPerm('manage_pages'))
if ($db->update(['id' => $_GET['id']])) if ($db->update(['id' => $_GET['id']]))
{ {
echo msg('succes', sprintf($lang->get('sp_edit_edited'), $_POST['title']).' <a href="management.php">'.$lang->get('back').'</a>'); echo msg('succes', sprintf($lang->get('sp_edit_edited'), $_POST['title']).' <a href="management.php">'.$lang->get('back').'</a>');
stream_message('{user} edited a page.', 3); stream_message('{user} edited the page "{extra}".', 3, $_POST['title'].' ('.$id.')');
} }
else else
{ {
@ -166,7 +166,7 @@ if (hasPerm('manage_pages'))
if ($db->delete()) if ($db->delete())
{ {
echo msg('succes', $lang->get('sp_edit_delete_success').' <a href="management.php">'.$lang->get('back').'</a>'); echo msg('succes', $lang->get('sp_edit_delete_success').' <a href="management.php">'.$lang->get('back').'</a>');
stream_message('{user} deleted a page.', 3); stream_message('{user} deleted the page "{extra}".', 3, $_GET['id']);
} }
else else
{ {

2
apps/SimplePages/backend/permissions.php
View File

@ -41,7 +41,7 @@ if (hasPerm('grant_permissions'))
if ($db->insert()) if ($db->insert())
{ {
echo msg('succes', $lang->get('sp_grant_permissions_success')); echo msg('succes', $lang->get('sp_grant_permissions_success'));
stream_message('{user} granted permissions.', 3); stream_message('{user} granted permissions to "{extra}".', 3, getUserByID($_POST['user']). ' ('.$_POST['user'].')');
} else } else
{ {
echo msg('fail', $lang->get('sp_grant_permissions_fail')); echo msg('fail', $lang->get('sp_grant_permissions_fail'));

10
apps/SimplePages/lang/lang.de.php
View File

@ -84,8 +84,8 @@ $lang['sp_edit_save'] = 'Speichern';
$lang['sp_edit_no_page_defined'] = 'Es ist keine Seite definiert.'; $lang['sp_edit_no_page_defined'] = 'Es ist keine Seite definiert.';
//Stream //Stream
$lang['sp_stream_cofirmed'] = '{user} hat Seitenänderungen freigeschaltet.'; $lang['sp_stream_cofirmed'] = '{user} hat Seitenänderungen der Seite "{extra}" freigeschaltet.';
$lang['sp_stream_page_edited'] = '{user} hat eine Seite bearbeitet.'; $lang['sp_stream_page_edited'] = '{user} hat die Seite "{extra}" bearbeitet.';
$lang['sp_stream_page_created'] = '{user} hat eine Seite erstellt.'; $lang['sp_stream_page_created'] = '{user} hat die Seite "{extra}" erstellt.';
$lang['sp_stream_page_deleted'] = '{user} hat eine Seite gelöscht.'; $lang['sp_stream_page_deleted'] = '{user} hat die Seite "{extra}" gelöscht.';
$lang['sp_stream_granted_permissions'] = '{user} hat Berechtigungen vergeben.'; $lang['sp_stream_granted_permissions'] = '{user} hat Berechtigungen an "{extra}" vergeben.';

10
apps/SimplePages/lang/lang.en.php
View File

@ -84,8 +84,8 @@ $lang['sp_edit_save'] = 'Save';
$lang['sp_edit_no_page_defined'] = 'No page defined.'; $lang['sp_edit_no_page_defined'] = 'No page defined.';
//Stream //Stream
$lang['sp_stream_cofirmed'] = '{user} confirmed contents of a page.'; $lang['sp_stream_cofirmed'] = '{user} confirmed contents of the page "{extra}".';
$lang['sp_stream_page_edited'] = '{user} edited a page.'; $lang['sp_stream_page_edited'] = '{user} edited the page "{extra}".';
$lang['sp_stream_page_created'] = '{user} created a page.'; $lang['sp_stream_page_created'] = '{user} created the page "{extra}".';
$lang['sp_stream_page_deleted'] = '{user} deleted a page.'; $lang['sp_stream_page_deleted'] = '{user} deleted the page "{extra}".';
$lang['sp_stream_granted_permissions'] = '{user} granted permissions.'; $lang['sp_stream_granted_permissions'] = '{user} granted permissions to "{extra}".';

3
inc/libs/functions.php
View File

@ -680,7 +680,7 @@ function remote_file_exists($url)
} }
//New Message to the stream //New Message to the stream
function stream_message($msg, $lvl, $time = null, $user = null) function stream_message($msg, $lvl, $extra = '', $time = null, $user = null)
{ {
if(!isset($time)) $time = time(); if(!isset($time)) $time = time();
if(!isset($user)) $user = $_SESSION['userid']; if(!isset($user)) $user = $_SESSION['userid'];
@ -691,6 +691,7 @@ function stream_message($msg, $lvl, $time = null, $user = null)
$db->data['user'] = intval($user); $db->data['user'] = intval($user);
$db->data['lvl'] = $lvl; $db->data['lvl'] = $lvl;
$db->data['message'] = $msg; $db->data['message'] = $msg;
$db->data['extra'] = $extra;
return $db->insert(); return $db->insert();
} }