Work/fdn2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of

Browse Source 
ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Conflicts:
	private/lib/gui/GUIHandler.php
This commit is contained in:
Riccardo Di Dato
2016-03-17 11:03:03 +01:00
parent e8980911dc 3f641fd7b5
commit ff898967db
11 changed files with 216 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
private/bin/importOldData.php
+11 -1
View File
@@ -81,7 +81,17 @@ $dati = $statement->fetchALL(PDO::FETCH_CLASS,"stdClass");
if (preg_match("/^http/",$ele->img)){
$media = new stdClass();
$media->mediaType = MediaModel::TYPE_YOUTUBE;
$media->link = $ele->img;
$matches = array();
if ( preg_match("~^http[s]?[:]//youtu\.be/(.+)$~", trim($ele->img), $matches) ){
$media->link = $matches[1];
}
else if (preg_match("~http[s]?[:]//www\.youtube\.com/embed/([^\"]+)[\"]~", trim($ele->img), $matches)){
$media->link = $matches[1];
}
else if (preg_match("~http[s]?[:]//www\.youtube\.com/watch[?]v[=](.+)$~", trim($ele->img), $matches)){
$media->link = $matches[1];
}
// $media->link = $ele->img;
$media = new MediaModel($media);
GlobalVariables::get("dao")->save($media);
DaoMediaHandler::addMedia($notizia, $media);
private/lib/gui/GUIHandler.php
+1 -1
View File
@@ -172,7 +172,7 @@ class GUIHandler {
echo UserLoginManager::getLogged()->nome." ".UserLoginManager::getLogged()->cognome.' | <a href="javascript:logout();">LOGOUT</a>';
}
else {
echo '<a href="javascript:openLoginModal();">LOGIN</a> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a>';
echo '<a id="loginLink" href="javascript:openLoginModal();">LOGIN</a> | <a id="regButton" href="javascript:openRegistrationModal();">REGISTRATI</a>';
}
?>
</div>
private/lib/gui/html.inclusion.php
+1 -1
View File
@@ -37,7 +37,7 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"ckeditor/ckeditor.js"
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"datetimepicker-master/build/jquery.datetimepicker.full.min.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"highcharts.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"highcharts.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"functions.js?rev=".time());