Merge /media/sdb1/gitRepositories/judo into redesign2018

Conflicts:
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
This commit is contained in:
marko
2018-12-03 17:40:44 +01:00
14 changed files with 259 additions and 48 deletions

View File

@@ -18,29 +18,33 @@ if($_GET['action'] == "INSERT"){
$wkId = $_GET['wkId'];
$checkSum = urldecode( $_GET['checkSum'] );
$vidUrl = urldecode( $_GET['vidUrl'] );
$posterUrl = urldecode( $_GET['posterUrl'] );
echo("CheckSum is ".$checkSum);
echo("vidUrl is ".$vidUrl);
echo("CheckSum is ".$checkSum."\n");
echo("vidUrl is ".$vidUrl."\n");
echo("posterUrl is ".$posterUrl."\n");
$vidQuery =
$cwsvJudoDbConnection->prepare(
"INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url ) VALUES ( :wkId, HEX(:checkSum), :vidUrl);"
"INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url, posterUrl ) VALUES ( :wkId, UNHEX(:checkSum), :vidUrl, :posterUrl );"
);
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
$vidQuery->bindParam(':checkSum', $checkSum );
$vidQuery->bindParam(':vidUrl', $vidUrl );
$vidQuery->bindParam(':posterUrl', $posterUrl );
echo("INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url, posterUrl ) VALUES ( ".$wkId.", UNHEX('".$checkSum."' ), '".$vidUrl."', '".$posterUrl."' );\n");
$vidQuery->execute();
$vidQuery =
$cwsvJudoDbConnection->prepare(
"UPDATE cwsvjudo.`shiai.videos` SET wkId=:wkId, url=:vidUrl WHERE checkSum=HEX( :checkSum );"
"UPDATE cwsvjudo.`shiai.videos` SET wkId=:wkId, url=:vidUrl, posterUrl=:posterUrl WHERE checkSum=UNHEX( :checkSum );"
// "UPDATE cwsvjudo.`shiai.videos` url=:vidUrl WHERE checkSum=HEX(:checkSum);"
);
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
$vidQuery->bindParam(':checkSum', $checkSum );
$vidQuery->bindParam(':vidUrl', $vidUrl );
$vidQuery->bindParam(':posterUrl', $posterUrl );
echo( "UPDATE cwsvjudo.`shiai.videos` SET wkId=".$wkId.", url='".$vidUrl."', posterUrl='".$posterUrl."' WHERE checkSum=UNHEX( '".$checkSum."' );\n");
$vidQuery->execute();
}
@@ -64,8 +68,8 @@ if($_GET['action'] == "INSERT"){
<body>
<?php
var_dump($_GET);
var_dump($wkVideos);
//var_dump($_GET);
//var_dump($wkVideos);
?>
</body>

View File

@@ -13,6 +13,7 @@ argParser = argparse.ArgumentParser()
#argParser.add_argument("wkId", type=int)
argParser.add_argument("--checkSum")
argParser.add_argument("--vidUrl")
argParser.add_argument("--posterUrl")
argParser.add_argument("--shiaiYamlFile")
argv = argParser.parse_args()
@@ -26,7 +27,8 @@ payLoad = {
'action' : "INSERT",
'wkId' : shiaiData['wkId'],
'checkSum': urllib.parse.quote(argv.checkSum),
'vidUrl' : urllib.parse.quote(argv.vidUrl)
'vidUrl' : urllib.parse.quote(argv.vidUrl),
'posterUrl' : urllib.parse.quote(argv.posterUrl)
}
r = requests.get('http://cwsvjudo.bplaced.net/admin/vidGal.php', params=payLoad, auth=('marko', '***REMOVED***'))