Reenabled width and heigth in gallery table

This commit is contained in:
marko
2021-05-23 12:57:17 +02:00
parent 812394665c
commit ce6e9420bd
9 changed files with 126 additions and 82 deletions

View File

@@ -8,7 +8,7 @@ global $cwsvJudoConfig;
$messages=array();
//include_once($_SERVER['DOCUMENT_ROOT']."/config/db.inc");
// Datenbankverbindung herstellen
// $mysqlConn = @new mysqli($db_server, $db_user, $db_password, $db_name);
$mysqlConn = @new mysqli(
@@ -23,7 +23,7 @@ $messages=array();
else{
// mögliche Werte für das Jahr herausfinden
$galJahresListe = array();
$queryJahresListe = "
SELECT DISTINCT DATE_FORMAT( datum, '%Y')
AS jahr
@@ -31,7 +31,7 @@ $messages=array();
WHERE 1
ORDER BY DATE_FORMAT( datum, '%Y' ) DESC;
";
$mysqlResults = $mysqlConn->query($queryJahresListe);
if( !$mysqlResults ){
$messages['error'][] = "Fehler bei Datenbankabfrage '".$queryJahresListe."'<br />";
@@ -41,10 +41,10 @@ $messages=array();
array_push( $galJahresListe, $mysqlResult['jahr']);
}
}
// standardmäßig frage die letzten 12 Galerien ab
$queryGals = "
SELECT id,datum,name,url,typ,teaserBildUrl
SELECT id,datum,name,url,typ,teaserBildUrl,promoImgWidth,promoImgHeight
FROM cwsvjudo.wkGalerien
WHERE 1
ORDER BY datum DESC LIMIT 12
@@ -55,29 +55,29 @@ $messages=array();
$minDate = $galJahr."-01-01";
$maxDate = $galJahr."-12-31";
$queryGals = sprintf("
SELECT id,datum,name,url,typ,teaserBildUrl
SELECT id,datum,name,url,typ,teaserBildUrl,promoImgWidth,promoImgHeight
FROM cwsvjudo.wkGalerien
WHERE datum >= '%s' AND datum <= '%s' ORDER BY datum ASC;",
$mysqlConn->real_escape_string($minDate),
$mysqlConn->real_escape_string($maxDate)
);
}
if($_GET['veranstaltungsArt']=="Feier"){
$queryGals =
"SELECT id,datum,name,url,typ,teaserBildUrl ".
$queryGals =
"SELECT id,datum,name,url,typ,teaserBildUrl,promoImgWidth,promoImgHeight ".
"FROM cwsvjudo.wkGalerien ".
"WHERE veranstaltungsArt = 'Feier' ORDER BY datum DESC;";
}
if($_GET['veranstaltungsArt']=="Zelten"){
$queryGals =
"SELECT id,datum,name,url,typ,teaserBildUrl ".
$queryGals =
"SELECT id,datum,name,url,typ,teaserBildUrl,promoImgWidth,promoImgHeight ".
"FROM cwsvjudo.wkGalerien ".
"WHERE veranstaltungsArt = 'Zelten' ORDER BY datum DESC;";
}
$galListe = array();
$mysqlResults = $mysqlConn->query($queryGals);
if( !$mysqlResults ){
@@ -89,7 +89,7 @@ $messages=array();
}
}
}
// Für den Fall einer ampSeite darf ich kein form ohne https verwenden
if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){
if( !is_array($galJahresListe) )
@@ -112,7 +112,7 @@ $messages=array();
"<optgroup label=\"Jahresauswahl\">".
"<option value=\"\"".($galJahr!="" ? "" : " selected")." >Neueste</option>"
);
if( !is_array($galJahresListe) )
$messages['error'][] = "<div>Fehler bei der Jahreszahlenabfrage!</div>";
else{
@@ -130,15 +130,15 @@ $messages=array();
"</noscript>".
"</form>"
);
}// Ende responsiver Jahresselector
echo(
"<table class=\"galTable\">".
"<thead><tr><th>Datum</th><th>Link zur Galerie</th></tr></thead>".
"<tbody>"
);
if( !is_array($galListe) )
$messages['error'][] = "<div>Fehler bei der Galerienabfrage!</div>";
else{
@@ -161,10 +161,20 @@ $messages=array();
"<td >".
"<a href=\"".mb_convert_encoding($gal['url'], 'UTF-8', 'ISO-8859-1')."?galId=".$gal['id']."\">"
);
$tempString = ($gal['teaserBildUrl'] != "" ? "<div><img title=\"".mb_convert_encoding($gal['name'], 'UTF-8', 'ISO-8859-1')." - Bilder der Judoka des Chemnitzer WSV\" alt=\"Teaserbild ".mb_convert_encoding($gal['name'], 'UTF-8', 'ISO-8859-1')."\" src=\"".mb_convert_encoding($gal['teaserBildUrl'], 'UTF-8', 'ISO-8859-1')."\"/></div>" : "");
// width and height of the promoImg
$width_height_string = "width=\"200\" height=\"133\"";
if(
is_positive_integer($gal['promoImgWidth'])
&& is_positive_integer($gal['promoImgHeight'])
){
$width_height_string = "width=\"".strval($gal['promoImgWidth'])."\" height=\"".strval($gal['promoImgHeight'])."\"";
}
$tempString = ($gal['teaserBildUrl'] != "" ? "<div><img title=\"".mb_convert_encoding($gal['name'], 'UTF-8', 'ISO-8859-1')." - Bilder der Judoka des Chemnitzer WSV\" alt=\"Teaserbild ".mb_convert_encoding($gal['name'], 'UTF-8', 'ISO-8859-1')."\" src=\"".mb_convert_encoding($gal['teaserBildUrl'], 'UTF-8', 'ISO-8859-1')."\" ".$width_height_string."/></div>" : "");
//echo($_SERVER['ORIG_PATH_TRANSLATED']);
if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){
$tempString = str_replace("<img", "<amp-img layout=\"responsive\" width=\"200\" height=\"133\"", $tempString);
$tempString = str_replace("<img", "<amp-img layout=\"responsive\" ", $tempString);
$tempString = str_replace("/>", "></amp-img>", $tempString);
}
echo( $tempString );
@@ -191,7 +201,7 @@ if( is_positive_integer($aGalleryId) ){
$query="SELECT url FROM wkGalerien WHERE id = \"".$_aGalleryId."\" ORDER BY Datum ASC LIMIT 1;";
$ergebnis = $db_connection->query( $query );
$galleryLink = $ergebnis->fetchAll();
return $galleryLink[0]['url'];
$db_connection = NULL;
}

View File

@@ -10,6 +10,8 @@ $message = array();
$limit = is_positive_integer($someOptions['limit'])?$someOptions['limit']:1;
$headerRootLevel = is_positive_integer($someOptions['$headerRootLevel'])?$someOptions['$headerRootLevel']:1;
/// Eine Datenbankverbindung (über pdo) erstellen
try{
$db_connection = new PDO(
@@ -22,24 +24,24 @@ $limit = is_positive_integer($someOptions['limit'])?$someOptions['limit']:1;
catch(PDOException $db_error){
$messages['errors'][] = "Error: " . $db_error->getMessage();
}
// News abfragen
// @todo: woher das limit nehmen?
// $newsList = getNews($db_connection, array('limit'=>$limit));
$newsList = getNews($db_connection, $someOptions);
$newsHeading = "Aktuelle Meldungen";
//var_dump($options);
if($someOptions['newsId']) $newsHeading=$newsList[0]['betreff'];
if($someOptions['jahr']) $newsHeading="Nachrichten des Jahres ".$someOptions['jahr'];
echo("<h1>".$newsHeading."</h1>");
echo("<h".strval($headerRootLevel).">".$newsHeading."</h".$headerRootLevel.">");
if( is_array( $newsList ) || is_object( $newsList ) )
foreach($newsList as $news)
echo( getHtmlNews($news, "headingLevel=2")."<hr />" );
echo( getHtmlNews($news, "headingLevel=".strval($headerRootLevel+1))."<hr />" );
else
$messages['errors'][] = "Fehler: Keine Neuigkeiten gefunden!";
// @todo: besser machen!
if(!empty($messages))
var_dump($messages);