Merge pull request #141 from Kanti/master

[TASK] see #140

README.md

@@ -47,7 +47,7 @@ HTMLy requires PHP 5.3 or greater.
 Installations
 -------------
 if you have openssl on your server, use the [Installer](https://github.com/Kanti/htmly-installer/releases/latest). read the [Instructions](https://github.com/Kanti/htmly-installer/blob/master/README.md#htmly-installerphp).
-If you don't have openssl, download the latest version, extract it, then upload the extracted files to your server. Make sure the installation folder is writeable by your server.
+If you don't have openssl, [download](https://github.com/danpros/htmly/releases/latest) the latest version, extract it, then upload the extracted files to your server. Make sure the installation folder is writeable by your server.
 
 Configurations
 --------------

index.php

@@ -1,5 +1,5 @@
 <?php
-
+$config_file = 'config/config.ini';
 require 'system/vendor/autoload.php';
 require_once "system/upgrade/run.php";
 require 'system/htmly.php';

system/admin/admin.php

@@ -68,7 +68,7 @@ function edit_post($title, $tag, $url, $content, $oldfile, $destination = null,
 
     $post_title = $title;
     $post_fi = $fi;
-    $post_vid = $vid;
+    $post_vid = str_replace(["http://", "https://", "www.", "youtube", ".com", "/watch?v=", "/embed/"], "", $vid);
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
@@ -157,11 +157,11 @@ function edit_page($title, $url, $content, $oldfile, $destination = null, $descr
 // Add blog post
 function add_post($title, $tag, $url, $content, $user, $description = null, $fi, $vid)
 {
-        
+
     $post_date = date('Y-m-d-H-i-s');
     $post_title = $title;
     $post_fi = $fi;
-    $post_vid = $vid;
+    $post_vid = str_replace(["http://", "https://", "www.", "youtube", ".com", "/watch?v=", "/embed/"], "", $vid);
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
@@ -170,7 +170,7 @@ function add_post($title, $tag, $url, $content, $user, $description = null, $fi,
         $post_description = "";
     }
     $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
-    $post_content = '<!--fi ' . $post_fi . ' fi-->' . "\n\n" .  '<!--vid ' . $post_vid . ' vid-->' . "\n\n" . $post_content;
+    $post_content = '<!--fi ' . $post_fi . ' fi-->' . "\n\n" . '<!--vid ' . $post_vid . ' vid-->' . "\n\n" . $post_content;
 
     if (!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {

system/htmly.php

@@ -4,7 +4,6 @@
 date_default_timezone_set('Asia/Jakarta');
 
 // Load the configuration file
-$config_file = 'config/config.ini';
 config('source', $config_file);
 if(config('timezone')) {
     date_default_timezone_set(config('timezone'));

system/upgrade/run.php

@@ -1,5 +1,7 @@
 <?php
 
+config('source', $config_file);
+
 $updater = new Kanti\HubUpdater("danpros/htmly");
 $info = $updater->getCurrentInfo();
 $versionNumber = substr($info['tag_name'], 1);
@@ -32,5 +34,8 @@ function rrmdir($dir)
     }
 }
 
-file_put_contents("index.php", file_get_contents("system/upgrade/index.php"));
-rrmdir("system/upgrade/");
+
+if(!config("dev")){
+    file_put_contents("index.php", file_get_contents("system/upgrade/index.php"));
+    rrmdir("system/upgrade/");
+}