Skip to content

Removed environment config and created default example config #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shrimpwagon wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Removed environment config and created default example config #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d148bb2
Removed environment config and created default example config
shrimpwagon Mar 25, 2021
c1cf7c4
Added override.css
shrimpwagon Mar 25, 2021
c4033ed
Fixed typo and added override.css to admin header
shrimpwagon Mar 25, 2021
ecd1fb2
Added override.css to reports
shrimpwagon Mar 25, 2021
57a81c4
Clock and modified when timestamps are actual unix timestamps using t…
shrimpwagon Mar 26, 2021
4a8fee4
Fixed selecting punches for deletion not working. Updated headers.
shrimpwagon Mar 26, 2021
690eac6
Added some debugging bread crumbs
shrimpwagon Mar 26, 2021
2536e60
remove crap validation
shrimpwagon Mar 26, 2021
935fdca
Added installer
shrimpwagon Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
config.inc.php
css/override.css
2 changes: 2 additions & 0 deletions admin/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/default.css' />\n";
echo "<link rel='stylesheet' type='text/css' media='print' href='../css/print.css' />\n";
if(file_exists(__DIR__ . '/../css/override.css') )
echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/override.css' />\n";
echo "<script language=\"javascript\" src=\"../scripts/pnguin.js\"></script>\n";
echo "</head>\n";

Expand Down
2 changes: 2 additions & 0 deletions admin/header_colorpick.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/default.css' />\n";
echo "<link rel='stylesheet' type='text/css' media='print' href='../css/print.css' />\n";
if(file_exists(__DIR__ . '/../css/override.css') )
echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/override.css' />\n";
echo "<script language=\"javascript\" src=\"../scripts/ColorPicker2.js\"></script>\n";
echo "<script language=\"javascript\">var cp = new ColorPicker();</script>\n";
echo "<script language=\"javascript\" src=\"../scripts/pnguin.js\"></script>\n";
Expand Down
2 changes: 2 additions & 0 deletions admin/header_date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/default.css' />\n";
echo "<link rel='stylesheet' type='text/css' media='print' href='../css/print.css' />\n";
if(file_exists(__DIR__ . '/../css/override.css') )
echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/override.css' />\n";
echo "<script language=\"javascript\" src=\"../scripts/CalendarPopup.js\"></script>\n";
echo "<script language=\"javascript\">document.write(getCalendarStyles());</script>\n";
echo "<script language=\"javascript\">var cal = new CalendarPopup('mydiv');</script>\n";
Expand Down
2 changes: 2 additions & 0 deletions admin/header_get.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/default.css' />\n";
echo "<link rel='stylesheet' type='text/css' media='print' href='../css/print.css' />\n";
if(file_exists(__DIR__ . '/../css/override.css') )
echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/override.css' />\n";
echo "<script type=\"text/javascript\" src=\"../scripts/CalendarPopup.js\"></script>\n";
echo "<script language=\"javascript\">document.write(getCalendarStyles());</script>\n";
echo "<script language=\"javascript\" src=\"../scripts/pnguin.js\"></script>\n";
Expand Down
2 changes: 2 additions & 0 deletions admin/header_get_sysedit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/default.css' />\n";
echo "<link rel='stylesheet' type='text/css' media='print' href='../css/print.css' />\n";
if(file_exists(__DIR__ . '/../css/override.css') )
echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/override.css' />\n";
echo "<script type=\"text/javascript\" src=\"../scripts/CalendarPopup.js\"></script>\n";
echo "<script language=\"javascript\">document.write(getCalendarStyles());</script>\n";
echo "<script language=\"javascript\" src=\"../scripts/pnguin.js\"></script>\n";
Expand Down
2 changes: 2 additions & 0 deletions admin/header_post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/default.css' />\n";
echo "<link rel='stylesheet' type='text/css' media='print' href='../css/print.css' />\n";
if(file_exists(__DIR__ . '/../css/override.css') )
echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/override.css' />\n";
echo "<script type=\"text/javascript\" src=\"../scripts/CalendarPopup.js\"></script>\n";
echo "<script language=\"javascript\">document.write(getCalendarStyles());</script>\n";
echo "<script language=\"javascript\" src=\"../scripts/pnguin.js\"></script>\n";
Expand Down
2 changes: 2 additions & 0 deletions admin/header_post_sysedit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/default.css' />\n";
echo "<link rel='stylesheet' type='text/css' media='print' href='../css/print.css' />\n";
if(file_exists(__DIR__ . '/../css/override.css') )
echo "<link rel='stylesheet' type='text/css' media='screen' href='../css/override.css' />\n";
echo "<script type=\"text/javascript\" src=\"../scripts/CalendarPopup.js\"></script>\n";
echo "<script language=\"javascript\">document.write(getCalendarStyles());</script>\n";
echo "<script language=\"javascript\" src=\"../scripts/pnguin.js\"></script>\n";
Expand Down
15 changes: 2 additions & 13 deletions admin/timeadd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,17 +656,6 @@
$user = "";
}

// configure current time to insert for audit log

$time = time();
$time_hour = gmdate('H', $time);
$time_min = gmdate('i', $time);
$time_sec = gmdate('s', $time);
$time_month = gmdate('m', $time);
$time_day = gmdate('d', $time);
$time_year = gmdate('Y', $time);
$time_tz_stamp = mktime($time_hour, $time_min, $time_sec, $time_month, $time_day, $time_year);

// this needs to be changed later
$post_why = "";

Expand All @@ -680,11 +669,11 @@

if (strtolower($ip_logging) == "yes") {
$query2 = "insert into " . $db_prefix . "audit (modified_by_ip, modified_by_user, modified_when, modified_from, modified_to, modified_why, user_modified) values
('" . $connecting_ip . "', '" . $user . "', '" . $time_tz_stamp . "', '0', '" . $timestamp . "', '" . $post_why . "', '" . $post_username . "')";
('" . $connecting_ip . "', '" . $user . "', UNIX_TIMESTAMP(), '0', '" . $timestamp . "', '" . $post_why . "', '" . $post_username . "')";
$result2 = mysql_query($query2);
} else {
$query2 = "insert into " . $db_prefix . "audit (modified_by_user, modified_when, modified_from, modified_to, modified_why, user_modified) values
('" . $user . "', '" . $time_tz_stamp . "', '0', '" . $timestamp . "', '" . $post_why . "', '" . $post_username . "')";
('" . $user . "', UNIX_TIMESTAMP(), '0', '" . $timestamp . "', '" . $post_why . "', '" . $post_username . "')";
$result2 = mysql_query($query2);
}

Expand Down
150 changes: 49 additions & 101 deletions admin/timedelete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
$tmp_get_user = "" . $row['empfullname'] . "";
}
if (!isset($tmp_get_user)) {
echo "Something is fishy here.\n";
echo "Error: User not found.\n";
exit;
}
}
Expand All @@ -194,7 +194,7 @@
$tmp_username = "" . $row['empfullname'] . "";
}
if (!isset($tmp_username)) {
echo "Something is fishy here.\n";
echo "Error: User not found.\n";
exit;
}
}
Expand All @@ -206,7 +206,7 @@
$tmp_post_displayname = "" . $row['displayname'] . "";
}
if (!isset($tmp_post_displayname)) {
echo "Something is fishy here.\n";
echo "Error: User and display name not found.\n";
exit;
}
}
Expand Down Expand Up @@ -278,22 +278,30 @@

// begin post validation //

if (empty($post_date)) {
if (empty($post_date))
{
$evil_post = '1';
echo " <table align=center class=table_border width=60% border=0 cellpadding=0 cellspacing=3>\n";
echo " <tr>\n";
echo " <td class=table_rows width=20 align=center><img src='../images/icons/cancel.png' /></td><td class=table_rows_red>
A valid Date is required.</td></tr>\n";
echo " </table>\n";
} elseif (preg_match('/' . "^([0-9]{1,2})[-,/,.]([0-9]{1,2})[-,/,.](([0-9]{2})|([0-9]{4}))$" . '/i', $post_date, $date_regs)) {
if ($calendar_style == "amer") {
if (isset($date_regs)) {
$month = $date_regs[1];
$day = $date_regs[2];
$year = $date_regs[3];
}
if ($month > 12 || $day > 31) {
}

else
{
$date_regs = explode('/', $post_date);

if ($calendar_style == "amer")
{
$month = $date_regs[0];
$day = $date_regs[1];
$year = $date_regs[2];

if ($month > 12 || $day > 31)
{
$evil_post = '1';

if (!isset($evil_post)) {
echo " <table align=center class=table_border width=60% border=0 cellpadding=0 cellspacing=3>\n";
echo " <tr>\n";
Expand All @@ -302,15 +310,20 @@
echo " </table>\n";
}
}
} elseif ($calendar_style == "euro") {
if (isset($date_regs)) {
$month = $date_regs[2];
$day = $date_regs[1];
$year = $date_regs[3];
}
if ($month > 12 || $day > 31) {
}

elseif ($calendar_style == "euro")
{
$month = $date_regs[1];
$day = $date_regs[0];
$year = $date_regs[2];

if ($month > 12 || $day > 31)
{
$evil_post = '1';
if (!isset($evil_post)) {

if (!isset($evil_post))
{
echo " <table align=center class=table_border width=60% border=0 cellpadding=0 cellspacing=3>\n";
echo " <tr>\n";
echo " <td class=table_rows width=20 align=center><img src='../images/icons/cancel.png' /></td><td class=table_rows_red>
Expand Down Expand Up @@ -390,85 +403,29 @@

// determine who the authenticated user is for audit log

if (isset($_SESSION['valid_user'])) {
if (isset($_SESSION['valid_user']))
{
$user = $_SESSION['valid_user'];
} elseif (isset($_SESSION['time_admin_valid_user'])) {
$user = $_SESSION['time_admin_valid_user'];
} else {
$user = "";
}

// configure current time to insert for audit log
elseif (isset($_SESSION['time_admin_valid_user']))
{
$user = $_SESSION['time_admin_valid_user'];
}

$time = time();
$time_hour = gmdate('H', $time);
$time_min = gmdate('i', $time);
$time_sec = gmdate('s', $time);
$time_month = gmdate('m', $time);
$time_day = gmdate('d', $time);
$time_year = gmdate('Y', $time);
$time_tz_stamp = mktime($time_hour, $time_min, $time_sec, $time_month, $time_day, $time_year);
else {
$user = "";
}

// this needs to be changed later
$post_why = "";

for ($x = 0; $x < $final_num_rows; $x++) {

// begin post validation //

$final_username[$x] = stripslashes($final_username[$x]);
$tmp_username = stripslashes($tmp_username);

$final_username[$x] = stripslashes($final_username[$x]);
if ($final_username[$x] != $tmp_username) {
echo "Something is fishy here.\n";
exit;
}
//if ((strlen($final_mysql_timestamp[$x]) != "10") || (!is_integer($final_mysql_timestamp[$x]))) {echo "Something is fishy here.\n"; exit;}

$query_sel = "select * from " . $db_prefix . "punchlist where punchitems = '" . $final_inout[$x] . "'";
$result_sel = mysql_query($query_sel);

while ($row = mysql_fetch_array($result_sel)) {
$punchitems = "" . $row['punchitems'] . "";
}
mysql_free_result($result_sel);
if (!isset($punchitems)) {
echo "Something is fishy here.\n";
exit;
}

$final_notes[$x] = ereg_replace("[^[:alnum:] \,\.\?-]", "", $final_notes[$x]);
$final_username[$x] = addslashes($final_username[$x]);

$query5 = "select * from " . $db_prefix . "info where (fullname = '" . $final_username[$x] . "') and (timestamp = '" . $final_mysql_timestamp[$x] . "') and
(`inout` = '" . $final_inout[$x] . "') and (notes = '" . $final_notes[$x] . "')";
$result5 = mysql_query($query5);
@$tmp_num_rows = mysql_num_rows($result5);

if ((isset($tmp_num_rows)) && (@$tmp_num_rows != '1')) {
echo "Something is fishy here.\n";
exit;
}

// end post validation //

$row_color = ($row_count % 2) ? $color1 : $color2;

if (@$delete_time_checkbox[$x] == '1') {

// begin post validation //

$tmp_time[$x] = date("$timefmt", $final_mysql_timestamp[$x] + $tzo);
if ($tmp_time[$x] != $final_time[$x]) {
echo "Something is fishy here.\n";
exit;
}

// end post validation //

//if (!get_magic_quotes_gpc()) {$final_username[$x] = addslashes($final_username[$x]);}

$query = "select * from " . $db_prefix . "employees where empfullname = '" . $final_username[$x] . "'";
$result = mysql_query($query);

Expand Down Expand Up @@ -504,11 +461,11 @@

if (strtolower($ip_logging) == "yes") {
$query6 = "insert into " . $db_prefix . "audit (modified_by_ip, modified_by_user, modified_when, modified_from, modified_to, modified_why, user_modified) values
('" . $connecting_ip . "', '" . $user . "', '" . $time_tz_stamp . "', '" . $final_mysql_timestamp[$x] . "', '0', '" . $post_why . "', '" . $final_username[$x] . "')";
('" . $connecting_ip . "', '" . $user . "', UNIX_TIMESTAMP(), '" . $final_mysql_timestamp[$x] . "', '0', '" . $post_why . "', '" . $final_username[$x] . "')";
$result6 = mysql_query($query6);
} else {
$query6 = "insert into " . $db_prefix . "audit (modified_by_user, modified_when, modified_from, modified_to, modified_why, user_modified) values
('" . $user . "', '" . $time_tz_stamp . "', '" . $final_mysql_timestamp[$x] . "', '0', '" . $post_why . "', '" . $final_username[$x] . "')";
('" . $user . "', UNIX_TIMESTAMP(), '" . $final_mysql_timestamp[$x] . "', '0', '" . $post_why . "', '" . $final_username[$x] . "')";
$result6 = mysql_query($query6);
}

Expand All @@ -534,17 +491,17 @@
// begin post validation //

if ($_POST['tmp_var'] != '1') {
echo "Something is fishy here.\n";
echo "Something is fishy here E.\n";
exit;
}
$tmp_calc = intval($calc);
$tmp_timestamp = intval($timestamp);
if ((strlen($tmp_calc) != "10") || (!is_integer($tmp_calc))) {
echo "Something is fishy here.\n";
echo "Something is fishy here F.\n";
exit;
}
if ((strlen($tmp_timestamp) != "10") || (!is_integer($tmp_timestamp))) {
echo "Something is fishy here.\n";
echo "Something is fishy here G.\n";
exit;
}

Expand Down Expand Up @@ -635,18 +592,9 @@

} else {

// configure timestamp to insert/update //

if ($calendar_style == "euro") {
// $post_date = "$day/$month/$year";
@$post_date = "$month/$day/$year";
} elseif ($calendar_style == "amer") {
@$post_date = "$month/$day/$year";
}

$post_date = "$month/$day/$year";
$row_count = '0';
$timestamp = strtotime($post_date) - @$tzo;
//$calc = $timestamp + 86400 - @$tzo;
$timestamp = strtotime($post_date);
$calc = $timestamp + 86400;
$post_username = stripslashes($post_username);
$post_displayname = stripslashes($post_displayname);
Expand Down
15 changes: 2 additions & 13 deletions admin/timeedit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,17 +587,6 @@
$user = "";
}

// configure current time to insert for audit log

$time = time();
$time_hour = gmdate('H', $time);
$time_min = gmdate('i', $time);
$time_sec = gmdate('s', $time);
$time_month = gmdate('m', $time);
$time_day = gmdate('d', $time);
$time_year = gmdate('Y', $time);
$time_tz_stamp = mktime($time_hour, $time_min, $time_sec, $time_month, $time_day, $time_year);

// this needs to be changed later
$post_why = "";

Expand Down Expand Up @@ -654,12 +643,12 @@

if (strtolower($ip_logging) == "yes") {
$query4 = "insert into " . $db_prefix . "audit (modified_by_ip, modified_by_user, modified_when, modified_from, modified_to, modified_why, user_modified) values
('" . $connecting_ip . "', '" . $user . "', '" . $time_tz_stamp . "', '" . $final_mysql_timestamp[$x] . "', '" . $new_tstamp[$x] . "', '" . $post_why . "',
('" . $connecting_ip . "', '" . $user . "', UNIX_TIMESTAMP(), '" . $final_mysql_timestamp[$x] . "', '" . $new_tstamp[$x] . "', '" . $post_why . "',
'" . $final_username[$x] . "')";
$result4 = mysql_query($query4);
} else {
$query4 = "insert into " . $db_prefix . "audit (modified_by_user, modified_when, modified_from, modified_to, modified_why, user_modified) values
('" . $user . "', '" . $time_tz_stamp . "', '" . $final_mysql_timestamp[$x] . "', '" . $new_tstamp[$x] . "', '" . $post_why . "', '" . $final_username[$x] . "')";
('" . $user . "', UNIX_TIMESTAMP(), '" . $final_mysql_timestamp[$x] . "', '" . $new_tstamp[$x] . "', '" . $post_why . "', '" . $final_username[$x] . "')";
$result4 = mysql_query($query4);
}

Expand Down
2 changes: 1 addition & 1 deletion config.inc.php → config.example.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
$use_server_tz = "no";


/* If you are using PHP 5.1+ and do not have access to chance your php.ini config file then
/* If you are using PHP 5.1+ and do not have access to change your php.ini config file then
uncomment the following line and change it to the correct time zone. */
//date_default_timezone_set("America/St_Johns");

Expand Down
2 changes: 2 additions & 0 deletions header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@

echo "<link rel='stylesheet' type='text/css' media='screen' href='css/default.css' />\n";
echo "<link rel='stylesheet' type='text/css' media='print' href='css/print.css' />\n";
if(file_exists(__DIR__ . '/css/override.css') )
echo "<link rel='stylesheet' type='text/css' media='screen' href='css/override.css' />\n";

// set refresh rate for each page //

Expand Down
Loading