Merge branch 'Phundrak-dev' into dev

2020-04-07 17:37:49 +02:00 · 2020-04-07 17:37:49 +02:00 · 58b4b869cd
commit 58b4b869cd
parent 610ff2ecad f64695f42d
8 changed files with 238 additions and 25 deletions
--- a/README.md
+++ b/README.md
@ -129,12 +129,11 @@ To check if your server is set up correctly, turn on a debug mode (in config add
 # Features

 * Dark mode, retina ready, legacy theme available.
-* Create own language mutations, available: **English** and **German**.
 * Use BBcode in texts.
 * Make posts available for **everyone**, **only you** or just for **friends**.
 * Extra fields in post: **Feeling**, **With** and **At**.
 * Hide posts from timeline so they are visible only when you need them to be.
-* All pasted links will get preview with page title, description and image.
+* All pasted links will get preview with page title, description and image (can be configured proxy).
 * Upload images using button *(for mobile)*.
 * Upload images using drag & drop *(drop it into textarea)*.
 * Upload images using CTRL + V *(paste it into textarea)*. 
@ -146,3 +145,11 @@ To check if your server is set up correctly, turn on a debug mode (in config add
 * Display posts from chosen date using (format YYYY-MM-DD or YYY-MM): `http://blog/#from=2017-06`.
 * Display posts to chosen date using (format YYYY-MM-DD or YYY-MM): `http://blog/#to=2017-06`.
 * Combine parameters in url using `&`, e.g. show posts between dates: `http://blog/#from=2017-06&to=2017-08`.
+
+## Language support
+Feel free to create new PR and add a new language. Specify language in config or in url: `http://blog/?hl=sk`.
+
+* en - 🇬🇧 English
+* de - 🇩🇪 German
+* sk - 🇸🇰 Slovak
+* fr - 🇫🇷 French (thanks @Phundrak)
--- a/app/lang/fr.ini
+++ b/app/lang/fr.ini
@ -0,0 +1,67 @@
+; index.html
+Show More = "Voir plus"
+
+Login = "Connexion"
+Logout = "Déconnexion"
+
+Nick = "Pseudo"
+Password = "Mot de passe"
+Cancel = "Annuler"
+
+Post = "Publier"
+
+Edit Post = "Modifier la publication"
+Change Date = "Changer la date"
+Hide from Timeline = "Cacher du mur"
+Show on Timeline = "Montrer sur le mur"
+Delete Post = "Supprimer la publication"
+
+Drag photos here = "Glisser les photos ici"
+Drop photos here = "Déposer les photos ici"
+What's on your mind? = "Que souhaitez-vous partager ?"
+Feeling = "Je me sens"
+How are you feeling? = "Comment vous sentez-vous ?"
+With = "Avec"
+Who are you with? = "Avec qui êtes-vous ?"
+At = "À"
+Where are you? = "Où êtes-vous ?"
+Save = "Enregistrer"
+
+January = "Janvier"
+February = "Février"
+March = "Mars"
+April = "Avril"
+May = "Mai"
+June = "Juin"
+July = "Juillet"
+August = "Août"
+September = "Septembre"
+October = "Octobre"
+November = "Novembre"
+December = "Décembre"
+
+Time: = "Heure:"
+Hour: = "Heure:"
+Minute: = "Minutes:"
+
+This post will be deleted and you'll no longer be able to find it. You can also edit this post if you just want to change something. = "Cette publication sera supprimée et vous ne pourrez plus la retrouver. Vous pouvez aussi la modifier si vous souhaitez simplement changer quelque chose."
+
+with = "avec"
+here: = "à"
+
+Public = "Publique"
+Friends = "Amis"
+Only me = "Seulement moi"
+
+Show hidden content = "Montrer le contenu caché"
+Show all posts = "Montrer toutes les publications"
+
+; user.class.php
+You are already logged in. = "Vous êtes déjà connectés."
+The nick or password is incorrect. = "Votre pseudo ou mot de passe est incorrect."
+You can't log out. There is no account. = "Vous ne pouvez pas vous déconnecter, les comptes sont désactivés."
+You are not even logged in. = "Vous n’êtes même pas connectés."
+
+; post.class.php
+You need to be logged in to perform this action. = "Vous devez être connectés pour pouvoir faire ça."
+No data. = "Aucune données."
--- a/app/lang/sk.ini
+++ b/app/lang/sk.ini
@ -0,0 +1,67 @@
+; index.html
+Show More = "Zobraziť viac"
+
+Login = "Prihlásiť sa"
+Logout = "Odhlásiť sa"
+
+Nick = "Prihlasovacie meno"
+Password = "Heslo"
+Cancel = "Zrušiť"
+
+Post = "Nový príspevok"
+
+Edit Post = "Upraviť príspevok"
+Change Date = "Zmeniť dátum"
+Hide from Timeline = "Skryť na časovej osi"
+Show on Timeline = "Zobraziť na časovej osi"
+Delete Post = "Odstrániť príspevok"
+
+Drag photos here = "Sem presuňte fotografie"
+Drop photos here = "Tu vložte fotografie"
+What's on your mind? = "Na čo myslíš?"
+Feeling = "Pocit"
+How are you feeling? = "Ako sa cítiš?"
+With = "Spolu s"
+Who are you with? = "S kým si?"
+At = "Miesto"
+Where are you? = "Kde si?"
+Save = "Uložiť"
+
+January = "Január"
+February = "Február"
+March = "Marec"
+April = "Apríl"
+May = "Máj"
+June = "Jún"
+July = "Júl"
+August = "August"
+September = "September"
+October = "Október"
+November = "November"
+December = "December"
+
+Time: = "Čas:"
+Hour: = "Hodnia:"
+Minute: = "Minúta:"
+
+This post will be deleted and you'll no longer be able to find it. You can also edit this post if you just want to change something. = "Tento príspevok bude odstránený a už ho nebudete môcť nájsť. Tento príspevok môžete tiež upraviť, ak chcete niečo zmeniť."
+
+with = "s"
+here: = "tu:"
+
+Public = "Verejné"
+Friends = "Priatelia"
+Only me = "Iba ja"
+
+Show hidden content = "Zobraziť skrytý obsah"
+Show all posts = "Zobraziť všetky príspevky"
+
+; user.class.php
+You are already logged in. = "Už si prihlásený."
+The nick or password is incorrect. = "Prihlasovacie meno alebo heslo je nesprávne."
+You can't log out. There is no account. = "Nemôžeš sa odhlásiť. Neexistuje žiadny účet."
+You are not even logged in. = "Nie si ani prihlásený."
+
+; post.class.php
+You need to be logged in to perform this action. = "Na vykonanie tejto akcie musíš byť prihlásený."
+No data. = "Žiadne dáta."
--- a/app/post.class.php
+++ b/app/post.class.php
@ -244,15 +244,53 @@ class Post
 		}

 		preg_match('/^https?:\/\/(www\.)?([^:\/\s]+)(.*)?$/i', $l, $url);
+		$curl_request_url = $l;

 		// Get content
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_HEADER, 0);
+		curl_setopt($ch, CURLOPT_ENCODING , "");
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_URL, $l);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
 		curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Proxycat/1.1)");
 		curl_setopt($ch, CURLOPT_REFERER, '');
+		curl_setopt($ch, CURLOPT_TIMEOUT, 7); // 7sec
+
+		// Proxy settings
+		if($proxy = Config::get_safe("proxy", false)){
+			$proxytype = Config::get_safe("proxytype", false);
+			$proxyauth = Config::get_safe("proxyauth", false);
+			if($proxytype === 'URL_PREFIX'){
+				$curl_request_url = $proxy.$curl_request_url;
+
+				if($proxyauth){
+					curl_setopt($ch, CURLOPT_USERPWD, $proxyauth);
+				}
+			} else {
+				curl_setopt($ch, CURLOPT_PROXY, $proxy);
+
+				if($proxyauth){
+					curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyauth);
+				}
+
+				switch ($proxytype) {
+					case 'CURLPROXY_SOCKS4':
+						$proxytype = CURLPROXY_SOCKS4;
+						break;
+					case 'CURLPROXY_SOCKS5':
+						$proxytype = CURLPROXY_SOCKS5;
+						break;
+					case 'CURLPROXY_HTTP':
+					default:
+						$proxytype = CURLPROXY_HTTP;
+						break;
+				}
+
+				curl_setopt($ch, CURLOPT_PROXYTYPE, $proxytype);
+			}
+		}
+
+		curl_setopt($ch, CURLOPT_URL, $curl_request_url);
 		$html = curl_exec($ch);
 		curl_close($ch);

@ -298,7 +336,22 @@ class Post
 			}

 			if($n == 'twitter:image:src' || $p == 'og:image'){
-				$content["thumb"] = $c;
+				// Absolute url
+				if(preg_match("/^(https?:)?\/\//", $c)) {
+					$content["thumb"] = $c;
+				}
+
+				// Relative url from root
+				elseif(preg_match("/^\//", $c)) {
+					preg_match("/^((?:https?:)?\/\/([^\/]+))(\/|$)/", $l, $m);
+					$content["thumb"] = $m[1].'/'.$c;
+				}
+
+				// Relative url from current directory
+				else {
+					preg_match("/^((?:https?:)?\/\/[^\/]+.*?)(\/[^\/]*)?$/", $l, $m);
+					$content["thumb"] = $m[1].'/'.$c;
+				}
 			}

 			if($n == 'twitter:domain'){
--- a/config.ini
+++ b/config.ini
@ -43,8 +43,20 @@ images_path = data/i/
 thumbnails_path = data/t/
 logs_path = data/logs/

+[proxy]
+;proxy = hostname:port
+;proxyauth = username:password
+;proxytype = CURLPROXY_HTTP ; default, if not set
+;proxytype = CURLPROXY_SOCKS4
+;proxytype = CURLPROXY_SOCKS5
+
+;URL_PREFIX type:
+;proxy = http://your.page.com/proxy.cgi?
+;proxyauth = username:password
+;proxytype = URL_PREFIX
+
 [system]
 system_name = blog
-version = 1.25
+version = 1.253
 debug = false
 logs = false
--- a/static/scripts/app.js
+++ b/static/scripts/app.js
@ -6,12 +6,13 @@ $("#dd_mask").click(function(){

 // Posts loading functions
 var posts = {
-	first: false,   // Is first loaded?
-	last: false,    // Is last loaded?
-	loading: false, // Is something loading right now?
+	initialized: false, // Is initialized?
+	first: false,       // Is first loaded?
+	last: false,        // Is last loaded?
+	loading: false,     // Is something loading right now?

-	limit: 5,       // Limit posts per load
-	offset: 0,      // Current offset
+	limit: 5,           // Limit posts per load
+	offset: 0,          // Current offset

 	filter: {
 		from: null,     // Show posts from specified date
@ -57,7 +58,7 @@ var posts = {

 	load: function(){
 		// If is something loading now or is loading done
-		if(posts.loading || posts.last)
+		if(!posts.initialized || posts.loading || posts.last)
 			return ;

 		// Now is
@ -111,6 +112,8 @@ var posts = {

 	init: function(){
 		posts.hash_update();
+		posts.initialized = true;
+		posts.load();
 	}
 };

@ -742,7 +745,7 @@ $.fn.post_fill = function(data){
 	*/

 	var height = 200;
-	if(data.text.length > 400){
+	if(data.text.length > 400 && post.find(".show_more").length == 0){
 		post.find(".b_text").css("max-height", height+"px");
 		var show_more = $('#prepared .show_more').clone();
 		show_more.insertAfter(post.find(".b_text"));
@ -750,6 +753,8 @@ $.fn.post_fill = function(data){
 			$(this).remove();
 			post.find(".b_text").css("max-height", '');
 		});
+	} else if(post.find(".show_more").length != 0) {
+		post.find(".show_more").remove();
 	}

 	// Highlight
--- a/static/styles/theme01.css
+++ b/static/styles/theme01.css
@ -85,7 +85,7 @@ body {
    width: 80px;
    height: 80px;
  }
-  
+
  .cover .name {
    left: 121px;
    font-size: 18px;
@ -156,10 +156,6 @@ body {
  background: white;
 }

-.b_post.is_hidden {
-  border-color: black;
-}
-
 .b_post.is_hidden .b_overlay {
  display: flex;
 }
@ -881,6 +877,7 @@ body {

 .options_content th {
  width: 1%;
+  white-space: nowrap;
  font-size: 13px;
  font-weight: normal;
  text-align: left;
--- a/static/styles/theme02.css
+++ b/static/styles/theme02.css
@ -28,6 +28,7 @@
  --filter: none;
  --filter-hover: invert(0.25);
  --overlay-background: rgba(0, 0, 0, .25);
+  --overlay-fallback-background: #ccc;
 }

@media (prefers-color-scheme: dark) {
@ -61,6 +62,7 @@
    --filter: invert(0.62) sepia(0.98) saturate(0.12) hue-rotate(175deg) brightness(0.9) contrast(0.96);
    --filter-hover: invert(1);
    --overlay-background: rgba(255, 255, 255, .25);
+    --overlay-fallback-background: #555;
  }
 }

@ -151,7 +153,7 @@ body {
    height: 80px;
    margin-left: -40px;
  }
-  
+
  .cover .name {
    font-size: 18px;
    line-height: 26px;
@ -212,18 +214,20 @@ body {
  height: 100%;
  border-radius: 8px;
  z-index: 1;
-  backdrop-filter: blur(25px);
-  background: var(--overlay-background);
+  background: var(--overlay-fallback-background);
+}
+
+@supports (backdrop-filter: blur(25px)) {
+  .b_overlay {
+    backdrop-filter: blur(25px);
+    background: var(--overlay-background);
+  }
 }

 .b_overlay .button {
  background: var(--primary-background);
 }

-.b_post.is_hidden {
-  box-shadow: inset 0px 0px 9px -1px var(--primary-text)
-}
-
 .b_post.is_hidden .b_overlay {
  display: flex;
 }
@ -1013,6 +1017,7 @@ body {

 .options_content th {
  width: 1%;
+  white-space: nowrap;
  font-size: 13px;
  font-weight: normal;
  text-align: left;
@ -1285,4 +1290,4 @@ select {
    background-size: 16px 16px;
    /*original: theme02/7wYk0RRj5-g.png*/
  }
-}
+}