marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zum Commit vorgemerkte Änderungen:

Browse Source 
geändert:       index.php
This commit is contained in:
marko
2021-06-08 20:13:50 +02:00
parent f60fef0904
commit 239ae8b68a
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/miscAssis.php
View File

@@ -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){

5
homepage/wkParticipo/index.php
View File

@@ -72,6 +72,11 @@ return $ret;
<nav class="navBar"> <nav class="navBar">
<ul> <ul>
<<<<<<< Updated upstream
=======
<li><a href="/machs">Achievementsystem</a></li>
<li><a href="./infoZettel.php">Infozettel</a></li>
>>>>>>> Stashed changes
<li> <li>
<a href ="./eventKalender.php">alle geplanten Wettkämpfe als Liste</a> <a href ="./eventKalender.php">alle geplanten Wettkämpfe als Liste</a>
</li> </li>