Create a update precedure from 1.1.3 to 1.2.0

Change version number to 1.2.0
Update log and admin to work with PHP v 7.2
2020-04-05 20:36:09 +02:00 · 2020-04-05 18:04:00 +02:00 · 2020-04-05 17:42:46 +02:00 · 2020-04-05 15:31:29 +02:00
32 changed files with 159 additions and 153 deletions
--- a/admin/blog.func.php
+++ b/admin/blog.func.php
@ -179,7 +179,8 @@ global $l, $plugins;
                '".$form_input['allowpingback']."'  );";

    $writeblog = new Query($sql);
-    $id = mysql_insert_id();
+global $mysql;
+    $id = mysqli_insert_id($mysql);
     if($writeblog->error()) {
        echo "<pre>\n";
        echo $writeblog->getError();
--- a/admin/categories.php
+++ b/admin/categories.php
@ -25,7 +25,7 @@
 					$c['main'] .= $categories->output_form($form_input, 'new', $l['admin']['cat_new']);
 				}
 			}
-			else $c['main'] .= $categories->output_form(array('id' => NULL, 'name' => NULL, 'url' => NULL, 'description' => NULL), 'new', $l['admin']['cat_new']);
+			else $c['main'] .= $categories->output_form('', 'new', $l['admin']['cat_new']);
 			break;

 		case 'change':
--- a/admin/login.php
+++ b/admin/login.php
@ -63,7 +63,7 @@ $c['main'] = '
      <input class="userdata" id="password" type="password" name="password" />
      <input style="display: none;" name="username" type="text" value="do-not-change" /></p>
   <p><input type="hidden" name="url" value="' . htmlspecialchars(!empty($get['url']) ? $get['url'] : '') . '" />
-      <button value="' . $l['admin']['login_send'] . '">' . htmlspecialchars($l['admin']['login_send']) . '</button></p>
+      <input type="submit" value="' . $l['admin']['login_send'] . '" /></p>
  </form>
 ';

--- a/admin/media/select-picture.php
+++ b/admin/media/select-picture.php
@ -25,7 +25,7 @@ if($_GET['p']) { ?>
   	    <input id="class" type="text" size="20"></p>
   	 <p><?php echo $l['admin']['pic_alt'] ?><br />
   	    <input id="alt" type="text" size="20"></p>
-   	 <p><button value="<?php echo $l['admin']['pic_insert'] ?>"><?php echo htmlspecialchars($l['admin']['pic_insert']) ?></button></p>
+   	 <p><input type="submit" value="<?php echo $l['admin']['pic_insert'] ?>"></p>
   	 </form>
 <?php
 }
--- a/admin/media/upload-picture.php
+++ b/admin/media/upload-picture.php
@ -63,7 +63,7 @@
        <input id="class" type="text" size="20"></p>
     <p><?php echo $l['admin']['pic_alt'] ?><br />
        <input id="alt" type="text" size="20"></p>
-     <p><button value="<?php echo $l['admin']['pic_insert'] ?>"><?php echo htmlspecialchars($l['admin']['pic_insert']) ?></button></p>
+     <p><input type="submit" value="<?php echo $l['admin']['pic_insert'] ?>"></p>
     </form>
    <?php
   }
@ -79,7 +79,7 @@ if (empty($_FILES['probe']) or isset($errors))
  <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
  <?php echo add_session_id_input_tag() ?>
  <input type="file" name="probe" /><br><br>
-  <button value="<?php echo $l['admin']['pic_upload'] ?>"><?php echo htmlspecialchars($l['admin']['pic_upload']) ?></button>
+  <input type="submit" value="<?php echo $l['admin']['pic_upload'] ?>">
 </form>
 <?php
 }
--- a/admin/media/upload-teaser.php
+++ b/admin/media/upload-teaser.php
@ -83,7 +83,7 @@ if (empty($_FILES['probe']) or isset($errors))
  <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
  <?php echo add_session_id_input_tag() ?>
  <input type="file" name="probe" /><br><br>
-  <button value="<?php echo $l['admin']['pic_upload'] ?>"><?php echo htmlspecialchars($l['admin']['pic_upload']) ?></button>
+  <input type="submit" value="<?php echo $l['admin']['pic_upload'] ?>">
 </form>
 <?php
 }
--- a/error404.php
+++ b/error404.php
@ -7,7 +7,7 @@
 $c['main'] = "<h2>".$l['err404_topic']."</h2>\n<p>".$l['err404_message']."</p>";
 $c['main'] .= '     <form id="searchform" action="'.JLOG_PATH.'/search.php" accept-charset="UTF-8">
      <p><input class="userdata" type="text" name="q" size="30" value="'.htmlspecialchars($get['url']).'" />
-         <button class="send" value="'.$l['content_search'].'">'.htmlspecialchars($l['content_search']).'</button></p>
+         <input class="send" type="submit" value="'.$l['content_search'].'" /></p>
     </form>';

 require(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'do_template.php');
--- a/index.php
+++ b/index.php
@ -29,10 +29,9 @@
 }
 require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');

- $c['meta']['robots']        = "noindex, follow";
- $c['meta']['description']   = htmlspecialchars(strip_tags(str_replace("\n", '', JLOG_DESCRIPTION)), ENT_QUOTES);
- $c['meta']['title']         = $l['index_topic'];
- $c['meta']['html_language'] = $l['html_language'];
+ $c['meta']['robots']       = "noindex, follow";
+ $c['meta']['description']  = htmlspecialchars(strip_tags(str_replace("\n", '', JLOG_DESCRIPTION)), ENT_QUOTES);
+ $c['meta']['title']        = $l['index_topic'];

 $c['main'] = "";
 $cc = array();
--- a/lang/lang.de.inc.php
+++ b/lang/lang.de.inc.php
@ -86,7 +86,6 @@
 "err404_message"           => "Diese Seite existiert leider nicht. Versuchen Sie sie über die Suchfunktion zu finden.",

 "language"                 => "de-de",
-"html_language"            => "de",
 "locale"                   => array('de_DE.UTF-8', 'de_DE.UTF-8@euro', 'de_DE'),
 "date_format"              => "%d. %B %Y um %H:%M Uhr",
 "date_format_comment"      => "%d.%m.%Y",
--- a/lang/lang.en.inc.php
+++ b/lang/lang.en.inc.php
@ -86,7 +86,6 @@
 "err404_message"           => "There is no such page. Please try the search engine on this page.",

 "language"                 => "en-gb",
-"html_language"            => "en",
 "locale"                   => array(  "en_US", "us", "verUS" ),
 "date_format"              => "%d. %B %Y um %H:%M Uhr",
 "date_format_comment"      => "%d.%m.%Y",
--- a/lang/lang.it.inc.php
+++ b/lang/lang.it.inc.php
@ -86,7 +86,6 @@
 "err404_message"           => "Non ci sono file riguardanti la ricerca in questa pagina. Perfavore prova a usare il motore di ricerca di questa pagina.",

 "language"                 => "it-it",
-"html_language"            => "it",
 "locale"                   => array( "it_IT", "it" ),
 "date_format"              => "%d. %B %Y alle %H:%M",
 "date_format_comment"      => "%d.%m.%Y",
--- a/lang/lang.pl.inc.php
+++ b/lang/lang.pl.inc.php
@ -85,7 +85,6 @@
 "err404_message"           => "Nie ma takiej strony. Prosze użyć przeglądarki na tej stronie.",

 "language"                 => "en-gb",
-"html_language"            => "pl",
 "locale"                   => array(  "en_US", "us", "verUS" ),
 "date_format"              => "%d. %B %Y um %H:%M Uhr",
 "date_format_comment"      => "%d.%m.%Y",
--- a/lang/lang.sv.inc.php
+++ b/lang/lang.sv.inc.php
@ -86,7 +86,6 @@
 "err404_message"           => "Denna sida existerar tyvärr inte. Försök hitta den genom sökfunktionen.",

 "language"                 => "sv-se",
-"html_language"            => "sv",
 "locale"                   => array('sv_SE', 'sve_sve'),
 "date_format"              => "%Y-%B-%d kl %H:%M",
 "date_format_comment"      => "%Y-%m-%d",
--- a/log.php
+++ b/log.php
@ -149,7 +149,8 @@ elseif(isset($com_form['form_submitted']) AND $com_form['form_submitted'] == $l[
                )"; 

        $newcomment = new Query($sql);
-        $cid = mysql_insert_id();
+global $mysql;
+        $cid = mysqli_insert_id($mysql);
        if($newcomment->error()) {
            if($newcomment->getErrno() == 1062) {
                $errors[] = $l['comments_duplicate'];
--- a/personal/css/print.css
+++ b/personal/css/print.css
@ -3,7 +3,7 @@
 */

 /* -- hide -- */
-	aside, #subnav, .skip, .entryform, .hidecomments, #entryform, hr { display: none; }
+	#subnav, .skip, .entryform, .hidecomments, #entryform, hr { display: none; }

 /* -- main settings -- */
 	body { font-family: Georgia, "Times New Roman", Times, serif; }
@ -12,8 +12,8 @@
 	
 /* -- links -- */
 	a { text-decoration: none; }
-	main a:after { font-size: 70%; content:" <"attr(href)">"; }
-	main .meta a:after, main h2 a:after { content:""; }
+	#main a:after { font-size: 70%; content:" <"attr(href)">"; }
+	#main .meta a:after, #main h2 a:after { content:""; }

 /* -- comments -- */
 	ul#commentslist { list-style-type: none; }
--- a/personal/css/screen.css
+++ b/personal/css/screen.css
@ -26,7 +26,7 @@
        border-top: 0;
        position: relative;
    }
-    main {
+    #main {
        margin: 0 0 0 25px;
        padding: 190px 0 2em 0;
        width: 64.5%;
@ -34,7 +34,7 @@
    }

    /* Clearfix-Hack */
-    main:after {
+    #main:after {
        content: "."; 
        display: block; 
        height: 0; 
@ -42,11 +42,11 @@
        visibility: hidden;
    }

-    main {display: inline-table;}
+    #main {display: inline-table;}

    /* Hides from IE-mac \*/
-    * html main {height: 1%;}
-    main {display: block;}
+    * html #main {height: 1%;}
+    #main {display: block;}
    /* End hide from IE-mac */

    /* -- logo -- */
@ -98,7 +98,7 @@
        .rss img { vertical-align: middle; border: 0; width: 94px; height: 15px; }

    /* -- footer -- */
-        footer {
+        #footer {
         clear: both;
         height: 60px;
         background: url(img/footer.png) no-repeat top center;
@ -132,13 +132,13 @@
    /* -- pictures -- */
        .fl { float: left; margin: 0 1em 1em 0; }
        .fr { float: right; margin: 0 0 1em 1em; }
-        main img, dl.img {
+        #main img, dl.img {
            border: 1px solid #aaa;
            padding: 2px;
            max-width: 95%;
        }
        dl.img dt { padding: 0; margin: 0;}
-        main dl.img dt img { margin: 0; padding: 0; max-width: 100%; border: none; }
+        #main dl.img dt img { margin: 0; padding: 0; max-width: 100%; border: none; }
        dl.img dd { margin: 0; padding: 0 0.3em; font-size: 90%; }
        .teaser { clear: both; }

--- a/personal/template.tpl
+++ b/personal/template.tpl
@ -1,45 +1,40 @@
-<!DOCTYPE html>
-<html lang="<jlog:html-language />">
- <head>
-  <title><jlog:title /> - <jlog:website /></title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <jlog:aditional-header />
-  <link rel="stylesheet" href="<jlog:homelink />/personal/css/print.css"  type="text/css" media="print" />
-  <link rel="stylesheet" href="<jlog:homelink />/personal/css/screen.css" type="text/css" media="screen, projection" />
- </head>
- <body>
-  <p class="skip"><a href="#main"><jlog:skipcontent /></a></p>
-  <div id="container">
-   <span id="pokal"></span>
-   <header>
-    <h1><a title="<jlog:home />" href="<jlog:homelink />/"><jlog:website /></a></h1>
-   </header>
-   <aside>
-    <dl id="subnav">
-     <dt class="first"><jlog:slogan-h /></dt>
-      <dd><jlog:slogan /></dd>
-     <dt><jlog:search-h /></dt>
-      <dd>
-       <form action="<jlog:homelink />/search.php">
-        <p><input class="userdata" type="search" name="q" size="15" value="" />
-         <button class="send" value="<jlog:search />"><jlog:search /></button></p>
-       </form>
-      </dd>
-     <dt><jlog:categorieslist-h /></dt>
-      <dd><jlog:categorieslist /></dd>
-     <dt><jlog:current-h /></dt>
-      <dd><jlog:subcurrent /></dd>
-      <dd><jlog:archive-more /> <a href="<jlog:archivelink />"><jlog:archive /></a>.</dd>
-     <dt><jlog:sub-info /></dt>
-      <dd class="rss"><jlog:rss-link /><br /> <jlog:rss-info /></dd>
-      <dd><jlog:copyright /></dd>
-      <dd><jlog:powered /></dd>
-    </dl>
-   </aside>
-   <main id="main">
-    <jlog:content />
-   </main>
-   <footer>&nbsp;</footer>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title><jlog:title /> - <jlog:website /></title>
+   <jlog:aditional-header />
+   <link rel="stylesheet" href="<jlog:homelink />/personal/css/print.css"  type="text/css" media="print" />
+   <link rel="stylesheet" href="<jlog:homelink />/personal/css/screen.css" type="text/css" media="screen, projection" />
+   <!--[if lte IE 6]><link rel="stylesheet" href="<jlog:homelink />/personal/css/ielte6.css" type="text/css" media="screen" /><![endif]-->
+</head>
+<body>
+ <p class="skip"><a href="#main"><jlog:skipcontent /></a></p>
+ <div id="container"><span id="pokal"></span>
+  <h1><a title="<jlog:home />" href="<jlog:homelink />/"><jlog:website /></a></h1>
+  <dl id="subnav">
+   <dt class="first"><jlog:slogan-h /></dt>
+    <dd><jlog:slogan /></dd>
+   <dt><jlog:search-h /></dt>
+    <dd>
+     <form action="<jlog:homelink />/search.php">
+      <p><input class="userdata" type="text" name="q" size="15" value="" />
+         <input class="send" type="submit" value="<jlog:search />" /></p>
+     </form>
+    </dd>
+   <dt><jlog:categorieslist-h /></dt>
+    <dd><jlog:categorieslist /></dd>
+   <dt><jlog:current-h /></dt>
+    <dd><jlog:subcurrent /></dd>
+    <dd><jlog:archive-more /> <a href="<jlog:archivelink />"><jlog:archive /></a>.</dd>
+   <dt><jlog:sub-info /></dt>
+    <dd class="rss"><jlog:rss-link /><br /> <jlog:rss-info /></dd>
+    <dd><jlog:copyright /></dd>
+    <dd><jlog:powered /></dd>
+  </dl>
+  <div id="main">
+   <jlog:content />
  </div>
- </body>
+  <div id="footer">&nbsp;</div>
+ </div>
+</body>
 </html>
--- a/plugins/CommentCloser.jplug.php
+++ b/plugins/CommentCloser.jplug.php
@ -91,7 +91,7 @@ EOT;
        
 		$output .= <<<EOT
 automatisch</label>
-<button name="commclose_do" value="schlie&#223;en">schlie&#223;en</button></p>
+<input type="submit" name="commclose_do" value="schlie&#223;en" />.</p>
 <p>Nach der angegeben Zeit k&#246;nnen Beitr&#228;ge nicht mehr kommentiert werden.</p>
 </form>
 EOT;
--- a/scripts/JlogUpdater.php
+++ b/scripts/JlogUpdater.php
@ -13,7 +13,8 @@ class JlogUpdater
        '1.0.2' => '1.1.0',
        '1.1.0' => '1.1.1',
        '1.1.1' => '1.1.2',
-        '1.1.2' => '1.1.3'
+        '1.1.2' => '1.1.3',
+	'1.1.3' => '1.2.0'
    );
    
    function JlogUpdater() 
@ -52,7 +53,7 @@ class JlogUpdater
            $html .= $class->getForm($l);
            $version = $this->versions[$version];
        }
-        $html .= '<p><button name="update" value="' . $l['admin']['update_start'] . '">' . htmlspecialchars($l['admin']['update_start']) . '</button></p>';
+        $html .= '<p><input type="submit" name="update" value="' . $l['admin']['update_start'] . '" /></p>';
        $html .= '</form>';
        return $html;
    }
--- a/scripts/categories.class.php
+++ b/scripts/categories.class.php
@ -6,7 +6,7 @@ class Categories {
    var $categories = array();
    var $l = array();

-    function Categories($l) {
+    function __construct($l) {
    
        $this->l = $l;
    
--- a/scripts/database.class.php
+++ b/scripts/database.class.php
@ -8,14 +8,15 @@
     var $_error = "";

       //Konstruktor
-        function Query($sql)
+        function __construct($sql)
        {
-        // Query in der Klasse speichern
-        	$this->_sql = trim($sql);
-        	$this->_result = mysql_query($this->_sql);
+	  global $mysql;
+          // Query in der Klasse speichern
+          $this->_sql = trim($sql);
+          $this->_result = mysqli_query($mysql, $this->_sql);
          if(!$this->_result) {
-            $this->_errno = mysql_errno();
-            $this->_error = mysql_error();
+            $this->_errno = mysqli_errno($mysql);
+            $this->_error = mysqli_error($mysql);
          }
        }

@ -46,11 +47,12 @@
        }

        function fetch() {
+         global $mysql;
         if($this->error()) {
            echo "An Error has occurred, please check your MySQL-Query.";
            $return = null;
         } 
-         else $return = mysql_fetch_assoc($this->_result);
+         else $return = mysqli_fetch_assoc($this->_result);
         return $return;
        }

@ -58,13 +60,13 @@
         if($this->error()) {
            $return = -1;
         }
-         else $return = mysql_num_rows($this->_result);
+         else $return = mysqli_num_rows($this->_result);
         return $return;
        }
        
        function free() {
        // Speicher freimachen
-         mysql_free_result($this->_result);
+         mysqli_free_result($this->_result);
        }

    }
--- a/scripts/do_template.php
+++ b/scripts/do_template.php
@ -54,7 +54,6 @@ if(defined('JLOG_ADMIN')) {

 $_search = array (
        "<jlog:language />",
-        "<jlog:html-language />",
        "<jlog:website />",
        "<jlog:title />",
        "<jlog:aditional-header />",
@ -82,7 +81,6 @@ $_search = array (

 $_replace = array (
        $l['language'],
-        $l['html_language'],
        htmlspecialchars(JLOG_WEBSITE, ENT_QUOTES),
        htmlspecialchars($c['meta']['title']),
   		$c['meta']['aditionalheader'],
--- a/scripts/general.func.php
+++ b/scripts/general.func.php
@ -27,7 +27,7 @@ function archive() {
 // get year links
 class Year_Links {

-        function Year_Links($get, $start, $page, $l, $cat="") {
+        function __construct($get, $start, $page, $l, $cat="") {
         $date  = getdate();
         $this->_now = $date['year'];
         $this->_start = $start;
@ -88,10 +88,11 @@ function strip($_data) {
 }
 // escape input for mysql
 function escape_for_mysql($_data) {
+global $mysql;
        if (is_array($_data))
 		foreach($_data as $key => $val) $_data[$key] = escape_for_mysql($val);
        else
-		$_data = mysql_real_escape_string($_data);
+		$_data = mysqli_real_escape_string($mysql, $_data);
 		// uses last opened MySQL link implicitly
 		// assumption is valid because this function is never called
 		// before mysql_connect
@ -295,7 +296,7 @@ function my_serialize_cfg($arg) {
 class JLOG_Tags {
  var $tree = array();

-  function JLOG_Tags($body) {
+  function __construct($body) {
      preg_match_all('/<jlog:([a-z]\w+)\s?([^>]*)\/?>(<\/(\1):(\2)>)?/ims', $body, $this->tree);
  }

--- a/scripts/jlogPlugins.class.php
+++ b/scripts/jlogPlugins.class.php
@ -4,38 +4,38 @@
 class JlogPlugin {

 /* Hooks */
-		function hook_body            ($t) { return $t; } // string body
-		function hook_commentForm     ($t) { return $t; } // string with comment form output + array with form data
-		function hook_adminContent    ($t) { return $t; } // string content
-		function hook_newComment      ($t) { return $t; } // array  form data
-		function hook_updateComment   ($t) { return $t; } // array  form data
-		function hook_deleteComment   ($t) { return $t; } // string comment id
-		function hook_showComment     ($t) { return $t; } // string comment output
-		function hook_onUpdate        ($t) { return $t; } // array  with all rss feeds and sub
-		function hook_doEntry         ($t) { return $t; } // string with entry + array with data from database + string count comments + string section
-		function hook_doTeaser        ($t) { return $t; } // string with entry + array with data from database + string count comments + string pre + string post
-		function hook_bbcode          ($t) { return $t; } // bbcode object
-		function hook_bbcomments      ($t) { return $t; } // bbcomments object
-		function hook_adminForm       ($t) { return $t; } // admin formular
-		function hook_insertEntry     ($t) { return $t; } // int id + array with form data
-		function hook_updateEntry     ($t) { return $t; } // int id + array with form data
-		function hook_permalink       ($t) { return $t; } // string permalink + string date + string url + string section
-		function hook_xmlrpcPermalink ($t) { return $t; } // string url
-		function hook_countComments   ($t) { return $t; } // array with id and count
-		function hook_adminMail       ($t) { return $t; } // array with mail + array blogentry
-		function hook_commentorMail   ($t) { return $t; } // array with mail + array blogentry
-		function hook_commentAdminList($t) { return $t; } // string with actual tr + array with comment data
-		function hook_previewComment  ($t) { return $t; } // same as newComment
-		function hook_dispatchLogin   ($t) { return $t; } //
-		function hook_loginForm       ($t) { return $t; } //	
-		function hook_adminMenu       ($t) { return $t; } // string with the admin menu html
-		function hook_adminList       ($t) { return $t; } //
+		function hook_body            ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string body
+		function hook_commentForm     ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string with comment form output + array with form data
+		function hook_adminContent    ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string content
+		function hook_newComment      ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // array  form data
+		function hook_updateComment   ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // array  form data
+		function hook_deleteComment   ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string comment id
+		function hook_showComment     ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string comment output
+		function hook_onUpdate        ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // array  with all rss feeds and sub
+		function hook_doEntry         ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string with entry + array with data from database + string count comments + string section
+		function hook_doTeaser        ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string with entry + array with data from database + string count comments + string pre + string post
+		function hook_bbcode          ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // bbcode object
+		function hook_bbcomments      ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // bbcomments object
+		function hook_adminForm       ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // admin formular
+		function hook_insertEntry     ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // int id + array with form data
+		function hook_updateEntry     ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // int id + array with form data
+		function hook_permalink       ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string permalink + string date + string url + string section
+		function hook_xmlrpcPermalink ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string url
+		function hook_countComments   ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // array with id and count
+		function hook_adminMail       ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // array with mail + array blogentry
+		function hook_commentorMail   ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // array with mail + array blogentry
+		function hook_commentAdminList($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string with actual tr + array with comment data
+		function hook_previewComment  ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // same as newComment
+		function hook_dispatchLogin   ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } //
+		function hook_loginForm       ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } //	
+		function hook_adminMenu       ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } // string with the admin menu html
+		function hook_adminList       ($t, $a = null, $b = null, $c = null, $d = null, $e = null, $f = null) { return $t; } //
 }

 class JlogPluginManager {
    var $plugins = array();

-    function JlogPluginManager($plugindirectory) {
+    function __construct($plugindirectory) {
        $handle = "";
        $file = "";
        $this->get = strip($_GET);
--- a/scripts/mail.class.php
+++ b/scripts/mail.class.php
@ -63,7 +63,7 @@ class Jlog_Mail
    * Jlog_Mail() - constructor
    *
    */
-    function Jlog_Mail()
+    function __construct()
    {
 	# XXX don't know if needed
 	mb_internal_encoding('UTF-8');
--- a/scripts/prepend.inc.php
+++ b/scripts/prepend.inc.php
@ -25,6 +25,8 @@

 // load settings and version information
 error_reporting(E_ALL ^ E_NOTICE);
+ini_set('display_errors', 1);
+
 require_once(dirname(__FILE__).DIRECTORY_SEPARATOR."..".DIRECTORY_SEPARATOR."personal".DIRECTORY_SEPARATOR."settings.inc.php");
 require_once(JLOG_BASEPATH."scripts".DIRECTORY_SEPARATOR."version.inc.php");
 
@ -62,20 +64,15 @@ require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'comments.php');
 if(defined('JLOG_ADMIN')) require_once(JLOG_BASEPATH.'lang'.DIRECTORY_SEPARATOR.'lang-admin.'.JLOG_LANGUAGE.'.inc.php');

 // connect to database
-$connect = @mysql_connect(JLOG_DB_URL, JLOG_DB_USER, JLOG_DB_PWD);
-if ($connect == FALSE) {
-  mail(JLOG_EMAIL, $l['admin']['e_db'], $l['admin']['e_db_is']."\n".mysql_error());
-  die("<strong>".$l['db_error']."</strong><br />".$l['plz_try_again'].".");
-}
-// select our database
-$select = @mysql_select_db(JLOG_DB);
-if ($connect == FALSE) {
-  mail(JLOG_EMAIL, $l['admin']['e_db'], $l['admin']['e_db_is']."\n".mysql_error());
+$mysql = @mysqli_connect(JLOG_DB_URL, JLOG_DB_USER, JLOG_DB_PWD, JLOG_DB);
+if ($mysql == FALSE) {
+  mail(JLOG_EMAIL, $l['admin']['e_db'], $l['admin']['e_db_is']."\n".mysqli_connect_error());
  die("<strong>".$l['db_error']."</strong><br />".$l['plz_try_again'].".");
 }
+
 // do some settings
-@mysql_query("SET NAMES utf8");
-@mysql_query("SET sql_mode=''");
+@mysqli_query($mysql, "SET NAMES utf8");
+@mysqli_query($mysql, "SET sql_mode=''");

 // some more code that needs to run for every page - however, this
 // code requires an established connection to the database
--- a/scripts/stringparser.class.php
+++ b/scripts/stringparser.class.php
@ -199,7 +199,7 @@ class StringParser {
 	 *
 	 * @access public
 	 */
-	function StringParser () {
+	function __construct () {
 	}
 	
 	/**
@ -910,7 +910,7 @@ class StringParser_Node {
 	 *                        occurred at. If not determinable, it is -1.
 	 * @global __STRINGPARSER_NODE_ID
 	 */
-	function StringParser_Node ($occurredAt = -1) {
+	function __constructor ($occurredAt = -1) {
 		$this->_id = $GLOBALS['__STRINGPARSER_NODE_ID']++;
 		$this->occurredAt = $occurredAt;
 	}
@ -1248,7 +1248,7 @@ class StringParser_Node {
 	 * @param object $node The node to destroy
 	 * @return bool True on success, else false.
 	 */
-	function destroyNode (&$node) {
+	static function destroyNode (&$node) {
 		if ($node === null) {
 			return false;
 		}
@ -1486,8 +1486,8 @@ class StringParser_Node_Text extends StringParser_Node {
 	 *                        occurred at. If not determinable, it is -1.
 	 * @see StringParser_Node_Text::content
 	 */
-	function StringParser_Node_Text ($content, $occurredAt = -1) {
-		parent::StringParser_Node ($occurredAt);
+	function __construct ($content, $occurredAt = -1) {
+#		parent::__construct ($occurredAt);
 		$this->content = $content;
 	}
 	
--- a/scripts/update.php
+++ b/scripts/update.php
@ -1,6 +1,6 @@
 <?php
 $now_date = getdate();
-
+$errors = array();
 $data['rss'] = "";
 $data['rss_full'] = "";
 $data['sub'] = "";
--- a/scripts/update/113To120.php
+++ b/scripts/update/113To120.php
@ -0,0 +1,15 @@
+<?php
+
+class JlogUpdate_113To120
+{
+    function getForm($l) 
+    {
+        return '<p>Bitte beachten Sie, dass nach Durchführung dieses Updates eventuell einzelne Plugins nicht mehr funktionieren.<br />'
+             . 'Kontaktieren Sie in einem solchen Fall den Plugin-Autor bzzgl. eines Updates für das Plugin.</p>';
+    }
+    
+    function performUpdate($l, $settings)
+    {
+        return true;
+    }
+}
--- a/scripts/version.inc.php
+++ b/scripts/version.inc.php
@ -23,8 +23,8 @@
 * $Date: 2009-01-13 21:58:12 +0100 (Tis, 13 Jan 2009) $
 */

-define('JLOG_SOFTWARE_VERSION', '1.1.3');
-define('JLOG_SOFTWARE_URL', 'http://jeenaparadies.net/projects/jlog');
+define('JLOG_SOFTWARE_VERSION', '1.2.0');
+define('JLOG_SOFTWARE_URL', 'https://github.com/jeena/jlog/');
 define('JLOG_SOFTWARE_PHPV', '4.1.1');
 define('JLOG_SOFTWARE_MYSQLV', '4.1.0');

--- a/search.php
+++ b/search.php
@ -9,7 +9,7 @@

    $c['main'] .= '     <form id="searchform" action="'.JLOG_PATH.'/search.php" accept-charset="UTF-8">
      <p><input class="userdata" type="text" name="q" size="30" value="'.htmlspecialchars($searchstring, ENT_QUOTES).'" />
-         <button class="send" value="'.$l['content_search'].'">'.htmlspecialchars($l['content_search']).'</button></p>
+         <input class="send" type="submit" value="'.$l['content_search'].'" /></p>
     </form>
     <script type="text/javascript">jlog_searchpage = true;</script>
 ';
--- a/setup.php
+++ b/setup.php
@ -12,7 +12,6 @@
 header("Content-Type: text/html; charset=UTF-8");


- define("JLOG_NEW_VERSION", '1.1.0');
 define("JLOG_SETUP", true);
 define("JLOG_ADMIN", false);
 $basepath = dirname( __FILE__ ).DIRECTORY_SEPARATOR;
@ -50,6 +49,7 @@
 define("JLOG_MYSQLV", JLOG_SOFTWARE_MYSQLV);
 
 $errors = array();
+ $mysql = null;
 
 $l['admin']['submit'] = $l['admin']['s_install'];
 $setup = new Settings($l);
@ -111,6 +111,7 @@

 function create_mysql_tables($data) {
  # returns false if all tables were created, if not returns the $errors array
+  $errors = array();

  $sql['content'] = '
    CREATE TABLE `'.$data['jlog_db_prefix'].'content` (
@ -128,7 +129,7 @@
      section varchar(10) default \'weblog\',
      UNIQUE KEY id (id),
      FULLTEXT KEY content_index (content, topic, teaser, keywords)
-    ) TYPE=MyISAM CHARACTER SET utf8;';
+    ) CHARACTER SET utf8;';

  $sql['comments'] = '
   CREATE TABLE `'.$data["jlog_db_prefix"].'comments` (
@ -146,7 +147,7 @@
     PRIMARY KEY (id),
     UNIQUE KEY sid (sid),
     FULLTEXT KEY comments_index ( name, city, email, homepage, content )
-   ) TYPE=MyISAM CHARACTER SET utf8;';
+   ) CHARACTER SET utf8;';
   
  $sql['categories'] = '
   CREATE TABLE `'.$data["jlog_db_prefix"].'categories` (
@ -156,13 +157,13 @@
     description text,
     UNIQUE KEY id (id),
     UNIQUE KEY url (url)
-   ) TYPE=MyISAM CHARACTER SET utf8;';
+   ) CHARACTER SET utf8;';
   
  $sql['catassign'] = '
   CREATE TABLE `'.$data["jlog_db_prefix"].'catassign` (
     content_id int(11),
     cat_id tinyint(4)
-   ) TYPE=MyISAM CHARACTER SET utf8;';
+   ) CHARACTER SET utf8;';

  $sql['attributes'] = '
   CREATE TABLE `'.$data["jlog_db_prefix"].'attributes` (
@ -172,13 +173,13 @@
     value varchar(250) NOT NULL default \'\',
     PRIMARY KEY (id),
     KEY entry_id (entry_id)
-   ) TYPE=MyISAM CHARACTER SET utf8;';
+   ) CHARACTER SET utf8;';

    global $l;
-
-    if(!@mysql_connect($data['jlog_db_url'], $data['jlog_db_user'], $data['jlog_db_pwd'])) $errors[] = "Falsche Zugangsdaten | ".mysql_error();
-    elseif(!@mysql_select_db($data['jlog_db'])) $errors[] = "Datenbank ".$data['jlog_db']." extistiert nicht".mysql_error();
-    elseif(!version_compare(mysql_get_server_info(), JLOG_MYSQLV, ">=") == 1) $errors[] = $l['admin']['s_mysqlv_tolow'];
+    global $mysql;
+    if(!($mysql = @mysqli_connect($data['jlog_db_url'], $data['jlog_db_user'], $data['jlog_db_pwd'], $data['jlog_db']))) $errors[] = "Falsche Zugangsdaten | ".mysqli_connect_error();
+    elseif(!@mysqli_select_db($mysql, $data['jlog_db'])) $errors[] = "Datenbank ".$data['jlog_db']." extistiert nicht".mysqli_error($connect);
+    elseif(!version_compare(mysqli_get_server_info($mysql), JLOG_MYSQLV, ">=") == 1) $errors[] = $l['admin']['s_mysqlv_tolow'];
    else {
 		 new Query("SET NAMES utf8");
     $create['content'] = new Query($sql['content']);
@ -265,7 +266,7 @@
 </head>
 <body>
  <div id="container">
-   <h1><a href="http://jeenaparadies.net/projects/jlog/" title="Jlog v'.JLOG_NEW_VERSION.'"><img id="logo" src="http://jeenaparadies.net/img/jlog-logo.png" style="width: 210px; height: 120px;" alt="Jlog" /></a> SETUP</h1>
+   <h1><a href="http://github.com/jeena/jlog/" title="Jlog v'.JLOG_NEW_VERSION.'"><img id="logo" src="http://paradies.jeena.net/img/jlog-logo.png" style="width: 210px; height: 120px;" alt="Jlog" /></a> SETUP</h1>
    '.$content.'
  </div>
 </body>
Author	SHA1	Message	Date
Jeena	2ce42038de	Create a update precedure from 1.1.3 to 1.2.0	2020-04-05 20:36:09 +02:00
Jeena	5de6785f99	Change version number to 1.2.0	2020-04-05 18:04:00 +02:00
Jeena	23c3d3b65b	Update log and admin to work with PHP v 7.2 Mostly changing mysql_ to mysqli_ but also some OOP fixes it classes, especially the bbcode parser which doesn't have a new version working with PHP 7.	2020-04-05 17:42:46 +02:00
Jeena	7af86452ff	Update setup to run under PHP7 Mostly mysql_ to mysqli_ changes.	2020-04-05 15:31:29 +02:00