webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed error logging(php7), small fixes

Browse Source
This commit is contained in:
Ulf Gebhardt 2019-01-21 15:31:49 +01:00
parent ba88784980
commit 59cd8f3859
No known key found for this signature in database
GPG Key ID: 44C888923CC8E7F3
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
log/error_handler/error_handler_dbwriter.php
View File

@ -49,7 +49,7 @@ class error_handler_dbwriter implements \SYSTEM\LOG\error_handler {
* @param int $type Type of the Todo(Exception) * @param int $type Type of the Todo(Exception)
* @return bool Returns false * @return bool Returns false
*/ */
public static function todo_exception(\Exception $E, $thrown, $type = \SYSTEM\SQL\system_todo::FIELD_TYPE_EXCEPTION){ public static function todo_exception($E, $thrown, $type = \SYSTEM\SQL\system_todo::FIELD_TYPE_EXCEPTION){
try{ try{
if(\property_exists(get_class($E), 'todo_logged') && $E->todo_logged){ if(\property_exists(get_class($E), 'todo_logged') && $E->todo_logged){
return false;} //alrdy logged(this prevents proper thrown value for every system exception) return false;} //alrdy logged(this prevents proper thrown value for every system exception)

2
log/result/JsonResult.php
View File

@ -55,7 +55,7 @@ class JsonResult{
* @param \Exception $e Exception to be convered. * @param \Exception $e Exception to be convered.
* @return string Returns json string. * @return string Returns json string.
*/ */
public static function error(\Exception $e){ public static function error($e){
$error = array(); $error = array();
$error['class'] = get_class($e); $error['class'] = get_class($e);
$error['message'] = $e->getMessage(); $error['message'] = $e->getMessage();

4
sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl
View File

@ -23,8 +23,8 @@
</tbody> </tbody>
</table> </table>
<ul class="pagination"> <ul class="pagination">
<li><a href="#!text;tag.${tag};filter.${filter};search.${search};page.0">&laquo;</a></li> <li class="page-item"><a class="page-link" href="#!text;tag.${tag};filter.${filter};search.${search};page.0">&laquo;</a></li>
${pagination} ${pagination}
<li><a href="#!text;tag.${tag};filter.${filter};search.${search};page.${page_last}">&raquo;</a></li> <li class="page-item"><a class="page-link" href="#!text;tag.${tag};filter.${filter};search.${search};page.${page_last}">&raquo;</a></li>
</ul> </ul>
</div> </div>

2
security/security.php
View File

@ -238,7 +238,7 @@ class security {
*/ */
public static function confirm_email($post_script=null,$post_script_data=null) { public static function confirm_email($post_script=null,$post_script_data=null) {
if(!\SYSTEM\SECURITY\security::isLoggedIn()){ if(!\SYSTEM\SECURITY\security::isLoggedIn()){
throw new ERROR("You need to be logged in to confirm your EMail!");} throw new \SYSTEM\SECURITY\ERROR("You need to be logged in to confirm your EMail!");}
return self::confirm_email_admin(\SYSTEM\SECURITY\security::getUser()->username, $post_script, $post_script_data); return self::confirm_email_admin(\SYSTEM\SECURITY\security::getUser()->username, $post_script, $post_script_data);
} }