Changeset 1756

Timestamp:

09/21/2008 03:06:37 PM (4 months ago)

Author:

driehle

Message:

added svn keywords to all our files, did some more work

Location:

branches/1.5

Files:

• .htaccess (modified) (1 prop)
• LICENSE.html (modified) (1 prop)
• README.txt (modified) (1 prop)
• admin/auth.php (modified) (1 prop)
• admin/blog.func.php (modified) (1 prop)
• admin/categories.php (modified) (1 prop)
• admin/change.php (modified) (1 prop)
• admin/comments.php (modified) (1 prop)
• admin/export-rss2.php (modified) (1 prop)
• admin/index.php (modified) (1 prop)
• admin/login.php (modified) (1 prop)
• admin/logout.php (modified) (1 prop)
• admin/media/select-picture.php (modified) (1 prop)
• admin/media/select-teaser.php (modified) (1 prop)
• admin/media/upload-picture.php (modified) (1 prop)
• admin/media/upload-teaser.php (modified) (1 prop)
• admin/new.php (modified) (1 prop)
• admin/plugin.php (modified) (1 prop)
• admin/settings.php (modified) (1 prop)
• admin/update.php (modified) (1 prop)
• archive.php (modified) (1 diff, 1 prop)
• config.inc.php (added)
• error404.php (modified) (1 diff, 1 prop)
• img/JLOG_edit.png (modified) (1 prop) (previous)
• img/JLOG_rss-full.png (modified) (1 prop) (previous)
• img/JLOG_rss-summary.png (modified) (1 prop) (previous)
• img/JLOG_trash.png (modified) (1 prop) (previous)
• index.php (modified) (1 diff)
• lang/.htaccess (modified) (1 prop)
• lang/lang-admin.de.inc.php (modified) (1 prop)
• lang/lang-admin.en.inc.php (modified) (1 prop)
• lang/lang-admin.it.inc.php (modified) (1 prop)
• lang/lang-admin.sv.inc.php (modified) (1 prop)
• lang/lang.de.inc.php (modified) (1 prop)
• lang/lang.en.inc.php (modified) (1 prop)
• lang/lang.it.inc.php (modified) (1 prop)
• lang/lang.sv.inc.php (modified) (1 prop)
• learn_bb.php (modified) (1 diff, 1 prop)
• lib/.htaccess (modified) (1 prop)
• lib/Jlog/Bbcode.php (modified) (1 prop)
• lib/Jlog/Categories.php (modified) (1 prop)
• lib/Jlog/Comments.php (modified) (1 prop)
• lib/Jlog/Db.php (modified) (2 diffs, 1 prop)
• lib/Jlog/Db/Query.php (modified) (1 prop)
• lib/Jlog/Feeds.php (modified) (1 prop)
• lib/Jlog/Functions.php (modified) (1 diff, 1 prop)
• lib/Jlog/Language.php (modified) (1 prop)
• lib/Jlog/Plugin/Basic.php (modified) (1 prop)
• lib/Jlog/Plugin/Manager.php (modified) (1 prop)
• lib/Jlog/Settings.php (modified) (1 prop)
• lib/Jlog/Tags.php (modified) (1 prop)
• lib/Jlog/Template.php (modified) (1 prop)
• lib/Jlog/Update.php (modified) (1 prop)
• lib/Jlog/Update/102To110.php (modified) (1 prop)
• lib/Jlog/Update/110To111.php (modified) (1 diff, 1 prop)
• lib/Jlog/Update/Example.php (modified) (1 prop)
• lib/Jlog/Validate/Url.php (modified) (1 prop)
• lib/Jlog/Version.php (modified) (1 prop)
• lib/Jlog/YearLinks.php (modified) (1 prop)
• lib/bootstrap.php (modified) (4 diffs, 1 prop)
• log.php (modified) (1 diff, 1 prop)
• page.php (modified) (1 diff, 1 prop)
• personal/conf (added)
• personal/conf/.htaccess (copied) (copied from branches/1.5/lib/.htaccess) (2 props)
• plugins/.htaccess (modified) (1 prop)
• search.php (modified) (1 diff, 1 prop)
• setup.php (modified) (1 diff, 1 prop)
• stop.php (modified) (1 diff, 1 prop)
• themes/default/css/admin.css (modified) (1 prop)
• themes/default/css/ielte6.css (modified) (1 prop)
• themes/default/css/popup.css (modified) (1 prop)
• themes/default/css/print.css (modified) (1 prop)
• themes/default/css/screen.css (modified) (1 prop)
• themes/default/img/Browse.plb (modified) (1 prop) (previous)
• themes/default/img/banner-ielte6.jpg (modified) (1 prop) (previous)
• themes/default/img/banner.jpg (modified) (1 prop) (previous)
• themes/default/img/body.png (modified) (1 prop) (previous)
• themes/default/img/border.png (modified) (1 prop) (previous)
• themes/default/img/cheese.png (modified) (1 prop) (previous)
• themes/default/img/footer.png (modified) (1 prop) (previous)
• themes/default/img/pokal.png (modified) (1 prop) (previous)
• themes/default/javascripts.js (modified) (1 prop)
• themes/default/template.tpl (modified) (1 prop)
• xmlrpc.php (modified) (1 diff, 1 prop)

branches/1.5/archive.php

@@ -1 +1 @@
 <?php
- require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+
+/**
+ * Jlog
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * $HeadURL$
+ * $Rev$
+ * $Author$
+ * $Date$
+ **/
+
+require_once('./config.inc.php');
+require_once(JLOG_LIBPATH . '/bootstrap.php');
+
 
  $get = strip($_GET);

branches/1.5/error404.php

@@ -1 +1 @@
 <?php
- require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+
+/**
+ * Jlog
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * $HeadURL$
+ * $Rev$
+ * $Author$
+ * $Date$
+ **/
+
+require_once('./config.inc.php');
+require_once(JLOG_LIBPATH . '/bootstrap.php');
+
  $get = strip($_GET);
 

branches/1.5/index.php

@@ -22 +22 @@
  * $Author$
  * $Date$
- */
+ **/
 
- if(!file_exists(dirname( __FILE__ ).DIRECTORY_SEPARATOR.'personal'.DIRECTORY_SEPARATOR.'settings.inc.php')) {
-    if(dirname($_SERVER['SCRIPT_NAME']) !== "/") $dir = dirname($_SERVER['SCRIPT_NAME']);
-    header("Location: http://".$_SERVER['HTTP_HOST'].$dir."/setup.php");
- }
- require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+require_once('./config.inc.php');
+require_once(JLOG_LIBPATH . '/bootstrap.php');
+
 
  $c['meta']['robots']       = "noindex, follow";

branches/1.5/learn_bb.php

@@ -1 +1 @@
 <?php
- require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+
+/**
+ * Jlog
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * $HeadURL$
+ * $Rev$
+ * $Author$
+ * $Date$
+ **/
+
+require_once('./config.inc.php');
+require_once(JLOG_LIBPATH . '/bootstrap.php');
+
  $version = $_GET['v'];
 

branches/1.5/lib/Jlog/Db.php

@@ -17 +17 @@
         // select our database
         $select = @mysql_select_db(JLOG_DB);
-        // FIXME: we already do have this lines, see line 13 in this file, isn't it?
-        if ($connect == FALSE) {
+        if ($select == 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').".");
@@ -35 +34 @@
     // escape input for mysql
     function escape($_data) {
-        // FIXME: shouldn't we  use mysql_real_escape*() here? (Jeena)
         if (is_array($_data)) foreach($_data as $key => $val) {
             $_data[$key] = escape_for_mysql($val);
         }
-        else $_data = mysql_escape_string($_data);
+        else $_data = mysql_real_escape_string($_data);
         return $_data;
     }

branches/1.5/lib/Jlog/Functions.php

@@ -155 +155 @@
     }
 
-    // TODO: (Jeena) Remove it, we never used it anyway
-    function my_serialize_cfg($arg) {   
-        if(is_string($arg)) return "'".preg_replace("/'/","\\'",$arg)."'";
-        elseif(is_integer($arg)) return (string)$arg;
-        elseif(is_float($arg)) return (string)$arg;
-        elseif(is_null($arg)) return 'NULL';
-        elseif(is_bool($arg)) {
-            if($arg) return 'true';
-            else return 'false';
+    function redirect($uri)
+    {
+        $host  = empty($_SERVER['HTTP_HOST'])
+                  ? (empty($_SERVER['SERVER_NAME'])
+                      ? $_SERVER['SERVER_ADDR']
+                      : $_SERVER['SERVER_NAME'])
+                  : $_SERVER['HTTP_HOST'];
+        $proto = (empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) == 'off')
+                  ? 'http'
+                  : 'https';
+        $port  = $_SERVER['SERVER_PORT'];
+    
+        $uri   = $proto . '://' . $host;
+        if ((('http' == $proto) and (80 != $port))
+        or (('https' == $proto) and (443 != $port))) 
+        {
+            $uri .= ':' . $port;
         }
-        elseif(is_array($arg)) {
-            $retval = 'Array(';
-            foreach($arg as $key => $value) {
-                $retval .= $this->my_serialize_cfg($key).' => '.$this->my_serialize_cfg($value).',';
-            }
-            $retval .= ')';
-            return $retval;
-        }
-        else die("unsupported type! ".gettype($arg));
+        $uri  .= '/' . $uri;
+    
+        header('Location: ' . $uri);
+        exit;
     }
     

branches/1.5/lib/Jlog/Update/110To111.php

@@ -3 +3 @@
 // TODO: (Jeena) I think we should not bother the user with the update-script
 // when it is not necessary.
+// (Dennis) This can be archieved by modifying Jlog_Update to hide virtual
+// update scripts from the web interface, if they do not actually perform 
+// anything. However, we should keep a class for each step in an update-chain,
+// so that the update process can be started easily from *any* version.
+
 class JlogUpdate_110To111
 {

branches/1.5/lib/bootstrap.php

@@ -24 +24 @@
  */
 
-// define path to library folder
-error_reporting(E_ALL ^ E_NOTICE);  // TODO: We should remove this line now
-define ('JLOG_LIBPATH', dirname(__FILE__));
 set_include_path(JLOG_LIBPATH . PATH_SEPARATOR . get_include_path());
 
 // load settings and version informatione
-require_once(JLOG_LIBPATH . '/../personal/settings.inc.php');
+require_once(JLOG_CONFPATH . '/settings.inc.php');
 require_once('Jlog/Version.php');
  
-// these two constants did not exist in Jlog 1.0.2
+// these two constants did not exist in Jlog 1.0.2 (backward compatibility)
 if (!defined('JLOG_INSTALLED_VERSION')) {
     define('JLOG_INSTALLED_VERSION', '1.0.2');
@@ -40 +37 @@
     define('JLOG_LANGUAGE', 'de');
 }
+
 // define constants for names of tables in database
 define("JLOG_DB_CONTENT", JLOG_DB_PREFIX."content");
@@ -49 +47 @@
 // redirect to update-script if new jlog version was installed
 if(version_compare(JLOG_INSTALLED_VERSION, JLOG_SOFTWARE_VERSION, '<')
-        AND substr($_SERVER['SCRIPT_FILENAME'], -17) !== '/admin/update.php')
+        AND substr($_SERVER['SCRIPT_FILENAME'], strlen(JLOG_ADMINFOLDERNAME) + 12) 
+        !== '/' . JLOG_ADMINFOLDERNAME . '/update.php')
 {
-        header('Location: ' . JLOG_PATH . '/admin/update.php');
-        exit;
+        Jlog_Functions::redirect(JLOG_ADMINFOLDERNAME . '/update.php');
+        // exit
 }
 
@@ -98 +97 @@
 
 // call hooks for bbcode plugins
-$bbcode = $pluginManager->callHook('bbcode', $bbcode);
-$bbcomments = $pluginManager->callHook('bbcomments', $bbcomments);
+$pluginManager->callHook('bbcode', $bbcode->forContent());
+$pluginManager->callHook('bbcomments', $bbcomments->forComments());
    
 // eof

branches/1.5/log.php

@@ -1 +1 @@
 <?php
- require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+
+/**
+ * Jlog
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * $HeadURL$
+ * $Rev$
+ * $Author$
+ * $Date$
+ **/
+
+require_once('./config.inc.php');
+require_once(JLOG_LIBPATH . '/bootstrap.php');
+
 
  $get = strip($_GET);

branches/1.5/page.php

@@ -1 +1 @@
 <?php
- require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+
+/**
+ * Jlog
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ * $HeadURL$
+ * $Rev$
+ * $Author$
+ * $Date$
+ **/
+
+require_once('./config.inc.php');
+require_once(JLOG_LIBPATH . '/bootstrap.php');
+
 
  $get = strip($_GET);

branches/1.5/search.php

@@ -1 +1 @@
 <?php
- require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
+
+/**
+ * Jlog
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) a