diff --git a/admin/adminAppDataQueue.php b/admin/adminAppDataQueue.php index 9337ec9..7a2ac83 100644 --- a/admin/adminAppDataQueue.php +++ b/admin/adminAppDataQueue.php @@ -61,15 +61,14 @@ if (!$_REQUEST['id']) while($ob = mysql_fetch_object($hResult)) { if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - echo "\n"; - echo " ".date("Y-n-t h:i:sa", $ob->submitTime)."  \n"; - if($ob->userId) - { - $oUser = new User($ob->userId); - echo " ".$oUser->sRealname." (".$oUser->sEmail.")\n"; - } - else - echo " Anonymous\n"; + echo "\n"; + echo "".print_date(mysqltimestamp_to_unixtimestamp($oApp->sSubmitTime))."\n"; + $oUser = new User($ob->submitterId); + echo ""; + echo $oUser->sEmail ? "sEmail."\">":""; + echo $oUser->sRealname; + echo $oUser->sEmail ? "":""; + echo "\n"; echo "".lookup_app_name($ob->appId)."\n"; echo "".lookup_version_name($ob->versionId)."\n"; echo "".$ob->type."\n"; diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php index b323256..f3bfa2e 100644 --- a/admin/adminAppQueue.php +++ b/admin/adminAppQueue.php @@ -287,8 +287,12 @@ else } if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } echo "\n"; - echo " ".date("Y-n-t h:i:sa", $oApp->sSubmitTime)."  \n"; - echo " sEmail."\">".$oSubmitter->sRealname."\n"; + echo " ".print_date(mysqltimestamp_to_unixtimestamp($oApp->sSubmitTime))."\n"; + echo " \n"; + echo $oSubmitter->sEmail ? "sEmail."\">":""; + echo $oSubmitter->sRealname; + echo $oSubmitter->sEmail ? "":""; + echo " \n"; echo " ".$sVendor."\n"; echo " ".$oApp->sName."\n"; echo " [iAppId."\">process]\n"; @@ -343,8 +347,12 @@ else $sVendor = $oVendor->sName; if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } echo "\n"; - echo " ".date("Y-n-t h:i:sa", $oVersion->sSubmitTime)."  \n"; - echo " sEmail."\">".$oSubmitter->sRealname."\n"; + echo " ".print_date(mysqltimestamp_to_unixtimestamp($oApp->sSubmitTime))."\n"; + echo " \n"; + echo $oSubmitter->sEmail ? "sEmail."\">":""; + echo $oSubmitter->sRealname; + echo $oSubmitter->sEmail ? "":""; + echo " \n"; echo " ".$sVendor."\n"; echo " ".$oApp->sName."\n"; echo " ".$oVersion->sName."\n"; diff --git a/admin/adminMaintainerQueue.php b/admin/adminMaintainerQueue.php index b886958..f0188bd 100644 --- a/admin/adminMaintainerQueue.php +++ b/admin/adminMaintainerQueue.php @@ -249,7 +249,7 @@ if ($_REQUEST['sub']) $query = "SELECT queueId, appId, versionId,". "userId, maintainReason,". "superMaintainer,". - "UNIX_TIMESTAMP(submitTime) as submitTime ". + "submitTime as submitTime ". "from appMaintainerQueue;"; $result = query_appdb($query); @@ -290,7 +290,7 @@ if ($_REQUEST['sub']) $oVersion = new Version($ob->versionId); if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } echo "\n"; - echo " ".date("Y-n-t h:i:sa", $ob->submitTime)."  \n"; + echo " ".print_date(mysqldatetime_to_unixtimestamp($ob->submitTime))."  \n"; echo " ".$oApp->sName."\n"; if($ob->superMaintainer) diff --git a/admin/adminMaintainers.php b/admin/adminMaintainers.php index 4c530bc..b1af823 100644 --- a/admin/adminMaintainers.php +++ b/admin/adminMaintainers.php @@ -68,9 +68,8 @@ if ($_REQUEST['sub']) $oUser = new User($ob->userId); if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } echo "\n"; - echo " ".date("Y-n-t h:i:sa", $ob->submitTime)."  \n"; + echo " ".print_date(mysqldatetime_to_unixtimestamp($ob->submitTime))."  \n"; echo " sEmail."\">".$oUser->sRealname."\n"; - if($ob->superMaintainer) { echo " ".lookup_app_name($ob->appId)."\n"; diff --git a/include/application.php b/include/application.php index d01a759..b7d3918 100644 --- a/include/application.php +++ b/include/application.php @@ -80,6 +80,7 @@ class Application { $this->iVendorId = $oRow->vendorId; $this->iCatId = $oRow->catId; $this->iSubmitterId = $oRow->submitterId; + $this->sSubmitTime = $oRow->submitTime; $this->sDate = $oRow->submitTime; $this->sName = $oRow->appName; $this->sKeywords = $oRow->keywords; diff --git a/include/tableve.php b/include/tableve.php index d27bb91..9d289db 100644 --- a/include/tableve.php +++ b/include/tableve.php @@ -1,7 +1,4 @@ ".stripslashes($value)."\n"; break; case "timestamp": - $time = $this->timestamp_to_unix($value); - echo makedate($time); + $time = mysqltimestamp_to_unixtimestamp($value); + echo print_date($time); break; case "datetime": - $time = parsedate($value); - echo makedate($time); + $time = mysqldatetime_to_unixtimestamp($value); + echo print_date($time); break; default: echo "$value  \n"; @@ -315,12 +303,12 @@ class TableVE { echo "$value  \n"; break; case "timestamp": - $time = $this->timestamp_to_unix($value); - echo makedate($time); + $time = mysqltimestamp_to_unixtimestamp($value); + echo print_date($time); break; case "datetime": - $time = parsedate($value); - echo makedate($time); + $time = mysqldatetime_to_unixtimestamp($value); + echo print_date($time); break; default: echo "$value  \n"; diff --git a/include/util.php b/include/util.php index 21b7326..28833fb 100644 --- a/include/util.php +++ b/include/util.php @@ -34,11 +34,29 @@ function values($arr) /* * format date */ -function makedate($time) +function print_date($sTimestamp) { - return date("F d, Y H:i:s", $time); + return date("F d Y H:i:s", $sTimestamp); } +function mysqltimestamp_to_unixtimestamp($sTimestamp) +{ + $d = substr($sTimestamp,6,2); // day + $m = substr($sTimestamp,4,2); // month + $y = substr($sTimestamp,0,4); // year + $hours = substr($sTimestamp,8,2); // year + $minutes = substr($sTimestamp,10,2); // year + $seconds = substr($sTimestamp,12,2); // year + return mktime($hours,$minutes,$seconds,$m, $d, $y); +} + +function mysqldatetime_to_unixtimestamp($sDatetime) +{ + sscanf($sDatetime, "%4s-%2s-%2s %2s:%2s:%2s", + &$y, &$m, &$d, + &$hours, &$minutes, &$seconds); + return mktime($hours,$minutes,$seconds,$m, $d, $y); +} function get_remote() {