From de2912cd6ed9a86a084831c14136a619a37361ff Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 5 Aug 2016 01:19:46 +0200 Subject: [PATCH 1/4] Add social snippets on HTML head Support for Twitter Card, Open Graph (Facebook & Google+). --- index.php | 53 ++++++++++++++++++++++++++++++++------------ templates/movie.rain | 19 +++++++++++++++- 2 files changed, 57 insertions(+), 15 deletions(-) diff --git a/index.php b/index.php index 23ce96d..448114e 100644 --- a/index.php +++ b/index.php @@ -66,6 +66,7 @@ define('PAGINATION', $_CONFIG['pagination']); define('IMDB_LANGUAGE', $_CONFIG['languages'][$_CONFIG['language']][0]); define('ROBOTS', $_CONFIG['robots']); +define('BASE_URL', (empty($_SERVER['REQUEST_SCHEME']) ? 'http' : $_SERVER['REQUEST_SCHEME']).'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']).'/'); /** * Rain class @@ -267,6 +268,17 @@ public function previousMovie($current_id) { return false; } + // return the full URI to image linked to a given movie + public static function CompleteImageURI($movie) + { + global $_CONFIG; + $img = !empty($movie['link_image']) ? $movie['link_image'] : BASE_URL.'assets/img/movie.jpg'; + // if img is hosted in local, we have to add server URL before... + if (substr( $img, 0, strlen($_CONFIG['images'].'/') ) === $_CONFIG['images'].'/') { $img = BASE_URL.$img; } + + return $img; + } + /* * Write an RSS file with the movies $data given * $data: movies to write @@ -275,41 +287,36 @@ public function previousMovie($current_id) { */ private function updateRSS($data, $title, $file) { global $_CONFIG; - $url = (empty($_SERVER['REQUEST_SCHEME']) ? 'http' : $_SERVER['REQUEST_SCHEME']).'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']).'/'; $xml = ''.PHP_EOL; $xml .= ''.PHP_EOL; $xml .= ''.PHP_EOL; - $xml .= ''.PHP_EOL; + $xml .= ''.PHP_EOL; $xml .= ''.$title.''.PHP_EOL; - $xml .= ''.$url.''.PHP_EOL; + $xml .= ''.BASE_URL.''.PHP_EOL; $xml .= 'RSS feed of '.$title.''.PHP_EOL; $xml .= ''.date("D, d M Y H:i:s O").''.PHP_EOL; - $xml .= ''.$url.''.PHP_EOL; + $xml .= ''.BASE_URL.''.PHP_EOL; $xml .= ''.$_CONFIG['language'].''.PHP_EOL; $xml .= ''.MYMOVIES.''.PHP_EOL; $xml .= ''.PHP_EOL; $xml .= ''.$title.''.PHP_EOL; - $xml .= ''.$url.'assets/img/movies_48x48.png'.PHP_EOL; - $xml .= ''.$url.''.PHP_EOL; + $xml .= ''.BASE_URL.'assets/img/movies_48x48.png'.PHP_EOL; + $xml .= ''.BASE_URL.''.PHP_EOL; $xml .= '48'.PHP_EOL; $xml .= '48'.PHP_EOL; $xml .= ''.PHP_EOL; foreach ($data as $id => $movie) { $xml .= ''.PHP_EOL; $xml .= ''. $movie['title'] .''.PHP_EOL; - $xml .= ''.$url.substr(Path::movie($movie['id']), 2).''.PHP_EOL; + $xml .= ''.BASE_URL.substr(Path::movie($movie['id']), 2).''.PHP_EOL; $xml .= ''.($movie['status']==Movie::SEEN ? 'Movie seen · Rated '.$movie['note'].'/10' : 'Movie not seen').'
'.htmlspecialchars_decode(htmlentities($movie['synopsis'], ENT_COMPAT, 'UTF-8')).']]>'.PHP_EOL; - // trasform image url if needed - $img = !empty($movie['link_image']) ? $movie['link_image'] : $url.'assets/img/movie.jpg'; - // if img is hosted in local, we have to add $url before... - if (substr( $img, 0, strlen($_CONFIG['images'].'/') ) === $_CONFIG['images'].'/') { $img = $url.$img; } - $xml .= ''.PHP_EOL; + $xml .= ''.PHP_EOL; $xml .= ''.$movie['id'].''.PHP_EOL; $xml .= ''.date("D, d M Y H:i:s O", $movie['id']).''.PHP_EOL; foreach (explode(',', $movie['genre']) as $genre) { - $xml .= ''.trim(mb_convert_case($genre, MB_CASE_TITLE, "UTF-8")).''.PHP_EOL; + $xml .= ''.trim(mb_convert_case($genre, MB_CASE_TITLE, "UTF-8")).''.PHP_EOL; } - $xml .= ''.TITLE.''.PHP_EOL; + $xml .= ''.TITLE.''.PHP_EOL; $xml .= ''.PHP_EOL; } $xml .= ''.PHP_EOL; @@ -816,6 +823,18 @@ function displayNote($note) { $result .= ''; return $result.''.PHP_EOL; } +// Convert note into HTML stars +function displaySimpleNote($note) { + $note = $note/2; + $full_stars = floor($note); + $half_star = (2*$note) % 2; + $result = ''; + for ($i=0; $i<$full_stars; $i++) + $result .= '★'; + if ($half_star == 1) + $result .= '☆'; + return $result; +} // remplace status by icon function displayStatus($status) { $result = ' + + + + + + + + + + + {include="page.menu"} @@ -12,7 +24,12 @@

- {if="isLogged()"} {/if} + {if="isLogged()"} + + + + + {/if} {$movie['title']}

From ddf57df5fa44c8a267bfe0b32d95bdf5a7808414 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 5 Aug 2016 01:35:21 +0200 Subject: [PATCH 2/4] Better support for G+ social snippet --- templates/movie.rain | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/movie.rain b/templates/movie.rain index 1cbce12..2959c24 100644 --- a/templates/movie.rain +++ b/templates/movie.rain @@ -1,5 +1,5 @@ - + {include="page.head"} @@ -7,13 +7,15 @@ - + - + + + {include="page.menu"} From efbb37df78bdd46521693e6b006218522b0e4808 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 5 Aug 2016 01:46:07 +0200 Subject: [PATCH 3/4] Add language and description tag for movie page --- index.php | 3 ++- templates/movie.rain | 3 ++- templates/page.head.rain | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 448114e..bf9aad3 100644 --- a/index.php +++ b/index.php @@ -66,6 +66,7 @@ define('PAGINATION', $_CONFIG['pagination']); define('IMDB_LANGUAGE', $_CONFIG['languages'][$_CONFIG['language']][0]); define('ROBOTS', $_CONFIG['robots']); +define('BASE_LANG', $_CONFIG['language']); define('BASE_URL', (empty($_SERVER['REQUEST_SCHEME']) ? 'http' : $_SERVER['REQUEST_SCHEME']).'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']).'/'); /** @@ -962,7 +963,7 @@ function moviePage() { $tpl->assign('movie_previous', $movies->previousMovie($movie['id'])); $tpl->assign('social', [ 'title' => $movie['title'], - 'description' => ($movie['status']==Movie::SEEN ? displaySimpleNote($movie['note']) : 'Not seen yet').' — '. displaySynopsis($movie['synopsis'], 180), + 'description' => ($movie['status']==Movie::SEEN ? displaySimpleNote($movie['note']) : 'Not seen yet').' — '. displaySynopsis($movie['synopsis'], 250), 'image' => Movies::CompleteImageURI($movie), 'url' => str_replace('./', BASE_URL, Path::movie($movie['id'])) ]); diff --git a/templates/movie.rain b/templates/movie.rain index 2959c24..3796b3f 100644 --- a/templates/movie.rain +++ b/templates/movie.rain @@ -1,7 +1,8 @@ - + {include="page.head"} + diff --git a/templates/page.head.rain b/templates/page.head.rain index 270cdef..4c68581 100644 --- a/templates/page.head.rain +++ b/templates/page.head.rain @@ -1,5 +1,5 @@ -{if="!empty($page_title)"} {$page_title} · {/if}{#TITLE#} +{if="!empty($page_title)"}{$page_title} · {/if}{#TITLE#} From 95f33234e6996d5953e59df9e7a7d0146b2b7d86 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sat, 6 Aug 2016 10:18:37 +0200 Subject: [PATCH 4/4] v1.2.0 : social share Add social share buttons --- index.php | 14 +++++++++++--- templates/admin.settings.rain | 10 +++++++++- templates/form.install.rain | 25 +++++++++++++++++-------- templates/movie.rain | 6 ++++++ templates/page.head.rain | 5 +++-- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/index.php b/index.php index bf9aad3..932956f 100644 --- a/index.php +++ b/index.php @@ -29,7 +29,7 @@ define('PHPPREFIX',''); define('MYMOVIES', 'MyMovies'); -define('MYMOVIES_VERSION', '1.1.2'); +define('MYMOVIES_VERSION', '1.2.0'); define('INACTIVITY_TIMEOUT', 3600); define('RSS', 'movies.rss'); define('RSS_BOXOFFICE', 'box-office.rss'); @@ -60,15 +60,18 @@ //ob_start(); $tpl = new RainTPL(); -if (!is_file($_CONFIG['settings'])) { define('TITLE', $_CONFIG['title']); define('ROBOTS', $_CONFIG['robots']); install($tpl); } +if (!is_file($_CONFIG['settings'])) { define('TITLE', $_CONFIG['title']); define('ROBOTS', $_CONFIG['robots']); define('AUTHOR', 'Nicolas Devenet'); install($tpl); } require($_CONFIG['settings']); define('TITLE', $_CONFIG['title']); define('PAGINATION', $_CONFIG['pagination']); define('IMDB_LANGUAGE', $_CONFIG['languages'][$_CONFIG['language']][0]); define('ROBOTS', $_CONFIG['robots']); +define('AUTHOR', empty($_CONFIG['author']) ? $_CONFIG['login'] : $_CONFIG['author'] ); define('BASE_LANG', $_CONFIG['language']); define('BASE_URL', (empty($_SERVER['REQUEST_SCHEME']) ? 'http' : $_SERVER['REQUEST_SCHEME']).'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']).'/'); +$tpl->assign('MyMoviesVersion', preg_replace('#(\d+\.\d+)(\.\d+)#', '$1', MYMOVIES_VERSION)); + /** * Rain class * @version 2.7.2 @@ -633,6 +636,7 @@ function writeSettings() { $file .= '$_CONFIG[\'hash\']='.var_export($_CONFIG['hash'], TRUE).'; '; $file .= '$_CONFIG[\'salt\']='.var_export($_CONFIG['salt'], TRUE).'; '; $file .= '$_CONFIG[\'title\']='.var_export($_CONFIG['title'], TRUE).'; '; + $file .= '$_CONFIG[\'author\']='.var_export($_CONFIG['author'], TRUE).'; '; $file .= '$_CONFIG[\'robots\']='.var_export($_CONFIG['robots'], TRUE).'; '; $file .= '$_CONFIG[\'language\']='.var_export($_CONFIG['language'], TRUE).'; '; $file .= '$_CONFIG[\'pagination\']='.var_export($_CONFIG['pagination'], TRUE).'; '; @@ -924,6 +928,7 @@ function install($tpl) { $_CONFIG['salt'] = sha1(uniqid('',true).'_'.mt_rand()); $_CONFIG['hash'] = sha1($_CONFIG['login'].$_POST['password'].$_CONFIG['salt']); $_CONFIG['title'] = empty($_POST['title']) ? 'MyMovies' : htmlspecialchars(trim($_POST['title'])); + $_CONFIG['author'] = empty($_POST['author']) ? $_CONFIG['login'] : htmlspecialchars(trim($_POST['author'])); $_CONFIG['language'] = !empty($_POST['locale']) && array_key_exists($_POST['locale'], $_CONFIG['languages']) ? $_POST['locale'] : 'en'; writeSettings(); header('Location: '.$_SERVER['REQUEST_URI']); @@ -961,11 +966,13 @@ function moviePage() { $tpl->assign('movies_count', $movies->count()); $tpl->assign('movie_next', $movies->nextMovie($movie['id'])); $tpl->assign('movie_previous', $movies->previousMovie($movie['id'])); + $social_url = str_replace('./', BASE_URL, Path::movie($movie['id'])); $tpl->assign('social', [ 'title' => $movie['title'], 'description' => ($movie['status']==Movie::SEEN ? displaySimpleNote($movie['note']) : 'Not seen yet').' — '. displaySynopsis($movie['synopsis'], 250), 'image' => Movies::CompleteImageURI($movie), - 'url' => str_replace('./', BASE_URL, Path::movie($movie['id'])) + 'twitter' => urlencode(($movie['status']==Movie::SEEN ? 'I’ve seen' : 'I want to see').' “'.$movie['title'].'” via #MyMovies '.$social_url), + 'url' => $social_url ]); $tpl->draw('movie'); exit(); @@ -1047,6 +1054,7 @@ function settingsPage() { if (!empty($_POST['pagination'])) { $_CONFIG['pagination'] = max(2, $_POST['pagination']+0); } if (!empty($_POST['robots'])) { $_CONFIG['robots'] = parseRobots(in_array('index', $_POST['robots']), in_array('follow', $_POST['robots']), in_array('archive', $_POST['robots']) ); } else { $_CONFIG['robots'] = parseRobots(false, false, false); } + $_CONFIG['author'] = empty($_POST['author']) ? $_CONFIG['login'] : htmlspecialchars(trim($_POST['author'])); writeSettings(); header('Location: '.Path::settings().'&update'); exit(); diff --git a/templates/admin.settings.rain b/templates/admin.settings.rain index 832b148..9c5ebff 100644 --- a/templates/admin.settings.rain +++ b/templates/admin.settings.rain @@ -46,7 +46,7 @@
- +
@@ -63,6 +63,14 @@
+
+ +
+ +

Social share: it’s displayed when you post the URL of a movie page on Twitter, Facebook, … +
If not set, your login will be used.

+
+
diff --git a/templates/form.install.rain b/templates/form.install.rain index 37d8f32..838f66c 100644 --- a/templates/form.install.rain +++ b/templates/form.install.rain @@ -41,30 +41,39 @@
- +
- +
-
- +
+
- -

You can change it later if needed .

+ +

You can edit it later .

+ +
+ +

Social share: it’s displayed when you post the URL of a movie page on Twitter, Facebook, … +
If not set, your login will be used.

+
+
+ +
-

Used for IMDB search when importing information to add a movie.

+

Used for IMDB search when importing a movie.

@@ -79,4 +88,4 @@ {include="page.foot"} - \ No newline at end of file + diff --git a/templates/movie.rain b/templates/movie.rain index 3796b3f..1a1e32d 100644 --- a/templates/movie.rain +++ b/templates/movie.rain @@ -2,6 +2,7 @@ {include="page.head"} + @@ -62,6 +63,11 @@

{$movie['synopsis']}

+
diff --git a/templates/page.head.rain b/templates/page.head.rain index 4c68581..919618f 100644 --- a/templates/page.head.rain +++ b/templates/page.head.rain @@ -1,9 +1,10 @@ {if="!empty($page_title)"}{$page_title} · {/if}{#TITLE#} - + - + +