Compare commits

..

No commits in common. "master" and "php83" have entirely different histories.

12 changed files with 27 additions and 28 deletions

View File

@ -67,12 +67,12 @@ class cron_log2sqlite implements \SYSTEM\CRON\cronjob{
'(`ID`, `class`, `message`, `code`, `file`, `line`, `trace`, `ip`, `querytime`, `time`,'. '(`ID`, `class`, `message`, `code`, `file`, `line`, `trace`, `ip`, `querytime`, `time`,'.
' `server_name`, `server_port`, `request_uri`, `post`,'. ' `server_name`, `server_port`, `request_uri`, `post`,'.
' `http_referer`, `http_user_agent`, `user`, `thrown`)'. ' `http_referer`, `http_user_agent`, `user`, `thrown`)'.
'VALUES ('.$row['ID'].', \''.\SQLite3::escapeString($row['class'] ?: '').'\', \''.\SQLite3::escapeString($row['message'] ?: '').'\', '. 'VALUES ('.$row['ID'].', \''.\SQLite3::escapeString($row['class']).'\', \''.\SQLite3::escapeString($row['message']).'\', '.
$row['code'].', \''.\SQLite3::escapeString($row['file'] ?: '').'\', '.$row['line'].', \''.\SQLite3::escapeString($row['trace'] ?: '').'\', \''. $row['code'].', \''.\SQLite3::escapeString($row['file']).'\', '.$row['line'].', \''.\SQLite3::escapeString($row['trace']).'\', \''.
$row['ip'].'\', '.$row['querytime'].', \''.$row['time'].'\', \''. $row['ip'].'\', '.$row['querytime'].', \''.$row['time'].'\', \''.
\SQLite3::escapeString($row['server_name'] ?: '').'\', '.($row['server_port'] ?: 'NULL').', \''.\SQLite3::escapeString($row['request_uri']).'\', \''.\SQLite3::escapeString($row['post'] ?: '').'\', \''. \SQLite3::escapeString($row['server_name']).'\', '.($row['server_port'] ? $row['server_port'] : 'NULL').', \''.\SQLite3::escapeString($row['request_uri']).'\', \''.\SQLite3::escapeString($row['post']).'\', \''.
\SQLite3::escapeString($row['http_referer'] ?: '').'\', \''.\SQLite3::escapeString($row['http_user_agent'] ?: '').'\', '.($row['user'] ?: 'NULL').','.true.');')){ \SQLite3::escapeString($row['http_referer']).'\', \''.\SQLite3::escapeString($row['http_user_agent']).'\', '.($row['user'] ? $row['user'] : 'NULL').','.true.');')){
new \SYSTEM\LOG\ERROR('failed to insert into log archive'); new \SYSTEM\LOG\ERROR('failed to insert into log archiev');
return cronstatus::CRON_STATUS_FAIL; return cronstatus::CRON_STATUS_FAIL;
} }
//Delete single //Delete single
@ -82,7 +82,7 @@ class cron_log2sqlite implements \SYSTEM\CRON\cronjob{
} }
set_time_limit(30); set_time_limit(30);
if(!$con->exec('end transaction')){ if(!$con->exec('end transaction')){
new \SYSTEM\LOG\ERROR('failed to insert into log archive'); new \SYSTEM\LOG\ERROR('failed to insert into log archiev');
return cronstatus::CRON_STATUS_FAIL;}; return cronstatus::CRON_STATUS_FAIL;};
return cronstatus::CRON_STATUS_SUCCESFULLY; return cronstatus::CRON_STATUS_SUCCESFULLY;

View File

@ -105,9 +105,7 @@ class ResultMysqliPrepare extends \SYSTEM\DB\Result{
* @return bool Returns true or false * @return bool Returns true or false
*/ */
public function seek($row_number){ public function seek($row_number){
mysqli_stmt_store_result($this->res); return \mysqli_stmt_data_seek($this->res,$row_number);}
\mysqli_stmt_data_seek($this->res,$row_number);
}
public function insert_id(){ public function insert_id(){
return $this->connection->insert_id(); return $this->connection->insert_id();

@ -1 +1 @@
Subproject commit 50de610cf67e4bf7e3af592eba5a6f281246ada9 Subproject commit e1b78be9da41b36a94c9161dbdb5763143097663

@ -1 +1 @@
Subproject commit a80cf8c55491929f6446b1fe245c065e42902035 Subproject commit 66ca23259d649ad34cb887fe527c358cd11685e5

@ -1 +1 @@
Subproject commit 115d37a6dad85c5d57117542a50f0f987ae36523 Subproject commit b170d9d7582764226139c7a2a9d6b5a2d953bfb0

@ -1 +1 @@
Subproject commit b34a34a0ddda4ff5e0a45e0930db5194a665b64d Subproject commit 56561aa20d45aea2edfae60086fe08e97ad24bb3

@ -1 +1 @@
Subproject commit a87b2b35dbe66efd2b90a83f367aa0a77b3a1e6e Subproject commit d48b252986b739c190ce5b569cf375cb9fd6f81c

View File

@ -28,7 +28,7 @@ class SYS_LOG_MONTH extends \SYSTEM\DB\QP {
* @return string Returns PostgreSQL Query String * @return string Returns PostgreSQL Query String
*/ */
public static function pgsql(){return public static function pgsql(){return
'SELECT * FROM '.\SYSTEM\SQL\system_log::NAME_PG.' WHERE EXTRACT(MONTH FROM time)::INTEGER = $1 AND EXTRACT(YEAR FROM time)::INTEGER = $2 ORDER BY time ASC LIMIT 100;'; 'SELECT * FROM '.\SYSTEM\SQL\system_log::NAME_PG.' WHERE EXTRACT(MONTH FROM time)::INTEGER = $1 AND EXTRACT(YEAR FROM time)::INTEGER = $2 ORDER BY time ASC LIMIT 250;';
} }
/** /**
@ -37,6 +37,6 @@ class SYS_LOG_MONTH extends \SYSTEM\DB\QP {
* @return string Returns MYSQL Query String * @return string Returns MYSQL Query String
*/ */
public static function mysql(){return public static function mysql(){return
'SELECT * FROM '.\SYSTEM\SQL\system_log::NAME_MYS.' WHERE MONTH(time) = ? AND YEAR(time) = ? ORDER BY time ASC LIMIT 100;'; 'SELECT * FROM '.\SYSTEM\SQL\system_log::NAME_MYS.' WHERE MONTH(time) = ? AND YEAR(time) = ? ORDER BY time ASC LIMIT 250;';
} }
} }

View File

@ -2,7 +2,7 @@
<td>${name}</td> <td>${name}</td>
<td>${extension}</td> <td>${extension}</td>
<td> <td>
<a data-toggle="tooltip" title="<img src='${url}' style='max-width: 250px; max-height: 250px;'/>" href="${url}" target="_blank" id="tooltip_${cat}_${i}">${url}</a> <a data-toggle="tooltip" title="<img src='${url}'/>" href="${url}" target="_blank" id="tooltip_${cat}_${i}">${url}</a>
</td> </td>
<td> <td>
<button type="submit" class="btn-warning btn btn-sm imgrnbtn" style="margin: 1px;;" cat="${cat}" id="${name}" textfield="#renametext_${cat}_${i}"><span class="fa fa-edit" aria-hidden="true"></span></button> <button type="submit" class="btn-warning btn btn-sm imgrnbtn" style="margin: 1px;;" cat="${cat}" id="${name}" textfield="#renametext_${cat}_${i}"><span class="fa fa-edit" aria-hidden="true"></span></button>

View File

@ -41,12 +41,12 @@ class saimod_sys_git extends \SYSTEM\SAI\sai_module {
$git = $gits[$i]; $git = $gits[$i];
try{ try{
$repo = \GIT\Git::open($git['path']); $repo = \GIT\Git::open($git['path']);
$git['git_url'] = $repo->run('ls-remote --get-url').'<br><br>'; $git['git_project'] = $repo->run('ls-remote --get-url').'<br><br>';
$git['git_project'] = nl2br(htmlentities($repo->run('log --date=relative --graph -3'))); $git['git_project'] .= nl2br(htmlentities($repo->run('log --date=relative --graph -3')));
$subs = explode("\n",$repo->run('config --file .gitmodules --get-regexp path')); $subs = explode("\n",$repo->run('config --file .gitmodules --get-regexp path'));
foreach($subs as $sub){ foreach($subs as $sub){
if($sub == ''){ if($sub == ''){
continue;} continue;}
$gits[] = array('title' => $git['title'].'/'.explode('.',$sub)[1], $gits[] = array('title' => $git['title'].'/'.explode('.',$sub)[1],
'path' => $git['path'].preg_replace('/\s+/', '', explode('path ',$sub)[1]).'/'); 'path' => $git['path'].preg_replace('/\s+/', '', explode('path ',$sub)[1]).'/');

View File

@ -2,8 +2,8 @@
<div class="col-12 sai_padding_10 bg-primary"> <div class="col-12 sai_padding_10 bg-primary">
<h4 class="sai_margin_off">&nbsp;<span class="fa fa-git" aria-hidden="true"></span>&nbsp;&nbsp;${sai_git_title}</h4> <h4 class="sai_margin_off">&nbsp;<span class="fa fa-git" aria-hidden="true"></span>&nbsp;&nbsp;${sai_git_title}</h4>
</div> </div>
<div class="col-md-12" id="tab_content"> <div class="col-md-12 sai_padding_off sai_border_left" id="tab_content">
<div class="row"> <div class="row-fluid">
${panels} ${panels}
</div> </div>
</div> </div>

View File

@ -1,9 +1,10 @@
<div class="col-4 p-2"> <div class="col-md-6">
<div id="project" class="card sai_gridbox"> <div id="project" class="panel panel-default sai_gridbox">
<div class="card-body"> <div class="panel-heading"><b>${title}</b></div>
<h4 class="card-title">${title}</h4> <div class="panel-body">
<p class="card-text">${git_project}</p> <div class="inner-page">
<p class="card-link" href="${git_url}">${git_url}</a> ${git_project}
</div>
</div> </div>
</div> </div>
</div> </div>