Merge branch 'wkParticipo' of https://gitea.cwsvjudo.dedyn.io/marko/cwsvJudo into wkParticipo
This commit is contained in:
@@ -162,9 +162,9 @@ function toAscii($str, $replace=array(), $delimiter='-') {
|
|||||||
return $clean;
|
return $clean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Wrapper function for a query to the
|
||||||
|
/// $aDbConnection connection to a db
|
||||||
function dbQuery($aDbConnection, $aQueryString, $aBindArray = array(), $someOptions = array( "dbCharset" => "ISO-8859-1", "outCharset" => "UTF-8" ) ){
|
function dbQuery($aDbConnection, $aQueryString, $aBindArray = array(), $someOptions = array( "dbCharset" => "ISO-8859-1", "outCharset" => "UTF-8" ) ){
|
||||||
//echo("Doing ".$aQueryString);
|
|
||||||
var_dump($aBindArray);
|
|
||||||
if( empty($someOptions['dbCharset']) ) $someOptions['dbCharset'] = "ISO-8859-1";
|
if( empty($someOptions['dbCharset']) ) $someOptions['dbCharset'] = "ISO-8859-1";
|
||||||
if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8";
|
if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8";
|
||||||
/// @toDo: Bisher wird nur die Rückgabe konvertiert. Eigentlich muss
|
/// @toDo: Bisher wird nur die Rückgabe konvertiert. Eigentlich muss
|
||||||
@@ -187,7 +187,7 @@ if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8";
|
|||||||
print "Error!: " . $db_error->getMessage() . "<br/>";
|
print "Error!: " . $db_error->getMessage() . "<br/>";
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
//var_dump($ret);
|
|
||||||
// Zeichensatzkonvertierung
|
// Zeichensatzkonvertierung
|
||||||
if( is_array($ret) ){
|
if( is_array($ret) ){
|
||||||
foreach($ret as &$entry){
|
foreach($ret as &$entry){
|
||||||
|
|||||||
@@ -18,6 +18,31 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
|
|||||||
if ($mysqlConn->connect_error) {
|
if ($mysqlConn->connect_error) {
|
||||||
$sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error;
|
$sqlMessage['error'] .= 'Datenbankverbindung fehlgeschlagen: ' . $mysqlConn->connect_error;
|
||||||
}
|
}
|
||||||
|
// var_dump($_SESSION);
|
||||||
|
|
||||||
|
/// Stellt den cssCode mit den Variablendefinitionen bereit
|
||||||
|
/*
|
||||||
|
function colorThemeCss($colorArray = array('backgroundColor'=>"#FFAE00", 'highlightColor'=>"#FF8100", 'buttonColor'=>"#291670")){
|
||||||
|
//$colorTypes = ["backgroundColor", "highlightColor", "buttonColor"];
|
||||||
|
$defaultColors =['backgroundColor'=> "#FFAE00", 'highlightColor'=>"#FF8100", 'buttonColor'=>"#291670"];
|
||||||
|
|
||||||
|
//echo("DBG: colorArray:"); var_dump($colorArray);
|
||||||
|
|
||||||
|
// Inputdatenvalidierung
|
||||||
|
foreach($defaultColors as $key=>$value){
|
||||||
|
if( !preg_match("/^#(?:[0-9a-fA-F]{3}){1,2}$/", $colorArray[$key]) ){
|
||||||
|
$colorArray[$key] = $defaultColors[$key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$ret = ":root{";
|
||||||
|
|
||||||
|
foreach($colorArray as $key=>$value){
|
||||||
|
$ret .= "--".$key.": ".$value."; ";
|
||||||
|
}
|
||||||
|
$ret .= "}";
|
||||||
|
return $ret;
|
||||||
|
}*/
|
||||||
?>
|
?>
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
|
|||||||
Reference in New Issue
Block a user