Changeset 1701

Show
Ignore:
Timestamp:
02/21/2008 04:50:39 PM (9 months ago)
Author:
driehle
Message:

are you ready for Jlog 1.1.0-RC1? ;-)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/scripts/prepend.inc.php

    r1694 r1701  
    11<?php 
    22 
    3  error_reporting(E_ALL ^ E_NOTICE); 
     3// load settings and version information 
     4error_reporting(E_ALL ^ E_NOTICE); 
     5require_once(JLOG_BASEPATH."personal".DIRECTORY_SEPARATOR."settings.inc.php"); 
     6require_once(JLOG_BASEPATH."scripts".DIRECTORY_SEPARATOR."version.inc.php"); 
     7  
     8// redirect to update-script if new jlog version was installed 
     9if(!defined('JLOG_INSTALLED_VERSION') OR version_compare(JLOG_INSTALLED_VERSION, JLOG_SOFTWARE_VERSION, '<')) { 
     10  if(dirname($_SERVER['PHP_SELF']) !== "/") $dir = dirname($_SERVER['PHP_SELF']); 
     11  header("Location: http://".$_SERVER['HTTP_HOST'].$dir."/admin/update.php"); 
     12  exit; 
     13} 
    414 
    5  define("JLOG_VERSION", '1.1.0'); 
    6  define("JLOG_DB_CONTENT", JLOG_DB_PREFIX."content"); 
    7  define("JLOG_DB_COMMENTS", JLOG_DB_PREFIX."comments"); 
    8  define("JLOG_DB_CATASSIGN", JLOG_DB_PREFIX."catassign"); 
    9  define("JLOG_DB_CATEGORIES", JLOG_DB_PREFIX."categories"); 
    10  define("JLOG_DB_ATTRIBUTES", JLOG_DB_PREFIX."attributes"); 
     15// define constants for names of tables in database 
     16define("JLOG_DB_CONTENT", JLOG_DB_PREFIX."content"); 
     17define("JLOG_DB_COMMENTS", JLOG_DB_PREFIX."comments"); 
     18define("JLOG_DB_CATASSIGN", JLOG_DB_PREFIX."catassign"); 
     19define("JLOG_DB_CATEGORIES", JLOG_DB_PREFIX."categories"); 
     20define("JLOG_DB_ATTRIBUTES", JLOG_DB_PREFIX."attributes"); 
    1121 
    12 // need this in every page 
    13  if(!defined('JLOG_LANGUAGE')) { 
    14    if(dirname($_SERVER['PHP_SELF']) !== "/") $dir = dirname($_SERVER['PHP_SELF']); 
    15    header("Location: http://".$_SERVER['HTTP_HOST'].$dir."/admin/update.php"); 
    16  } 
    17  require_once(JLOG_BASEPATH.'lang'.DIRECTORY_SEPARATOR.'lang.'.JLOG_LANGUAGE.'.inc.php'); 
    18  require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'database.class.php'); 
    19  require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'bbcode.php'); 
    20  require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'general.func.php');  
    21  require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'comments.php'); 
     22// we need these files on every page 
     23require_once(JLOG_BASEPATH.'lang'.DIRECTORY_SEPARATOR.'lang.'.JLOG_LANGUAGE.'.inc.php'); 
     24require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'database.class.php'); 
     25require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'bbcode.php'); 
     26require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'general.func.php');  
     27require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'comments.php'); 
    2228 
    23 // need this only on admincenter 
    24  if(defined('JLOG_ADMIN')) require_once(JLOG_BASEPATH.'lang'.DIRECTORY_SEPARATOR.'lang-admin.'.JLOG_LANGUAGE.'.inc.php'); 
     29// additionaly, when in admin-mode, we need this file 
     30if(defined('JLOG_ADMIN')) require_once(JLOG_BASEPATH.'lang'.DIRECTORY_SEPARATOR.'lang-admin.'.JLOG_LANGUAGE.'.inc.php'); 
    2531 
    26  // connect database 
    27  $connect = @mysql_connect(JLOG_DB_URL, JLOG_DB_USER, JLOG_DB_PWD); 
    28  if ($connect == FALSE) { 
     32// connect to database 
     33$connect = @mysql_connect(JLOG_DB_URL, JLOG_DB_USER, JLOG_DB_PWD); 
     34if ($connect == FALSE) { 
    2935  mail(JLOG_EMAIL, $l['admin']['e_db'], $l['admin']['e_db_is']."\n".mysql_error()); 
    3036  die("<strong>".$l['db_error']."</strong><br />".$l['plz_try_again']."."); 
    31  } 
    32  @mysql_select_db( JLOG_DB ); 
    33  @mysql_query("SET NAMES utf8"); 
    34  @mysql_query("SET sql_mode=''"); 
     37} 
     38// select our database 
     39$select = @mysql_select_db(JLOG_DB); 
     40if ($connect == FALSE) { 
     41  mail(JLOG_EMAIL, $l['admin']['e_db'], $l['admin']['e_db_is']."\n".mysql_error()); 
     42  die("<strong>".$l['db_error']."</strong><br />".$l['plz_try_again']."."); 
     43} 
     44// do some settings 
     45@mysql_query("SET NAMES utf8"); 
     46@mysql_query("SET sql_mode=''"); 
    3547 
    36 // need this in every page, too but with database 
    37  setlocale(LC_TIME, $l['locale']); 
    38  require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'categories.class.php'); 
    39  require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'jlogPlugins.class.php'); 
    40  $plugins = new JlogPluginManager(JLOG_BASEPATH.'plugins'.DIRECTORY_SEPARATOR); 
     48// some more code that needs to run for every page - however, this 
     49// code requires an established connection to the database 
     50setlocale(LC_TIME, $l['locale']); 
     51require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'categories.class.php'); 
     52require_once(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'jlogPlugins.class.php'); 
     53$plugins = new JlogPluginManager(JLOG_BASEPATH.'plugins'.DIRECTORY_SEPARATOR); 
    4154 
    42    ### Plugin Hooks for bbcode 
    43    $bbcode = $plugins->callHook('bbcode', $bbcode); 
    44    $bbcomments = $plugins->callHook('bbcomments', $bbcomments); 
    45  
    46 ?> 
     55// call hooks for bbcode plugins 
     56$bbcode = $plugins->callHook('bbcode', $bbcode); 
     57$bbcomments = $plugins->callHook('bbcomments', $bbcomments); 
     58    
     59// eof 

  • trunk/scripts/settings.class.php

    r1693 r1701  
    296296 
    297297     // serialize data to file format 
    298      $file_content = "<?php\n"; 
     298     $file_content = "<?php\n//generated at " . date('Y-m-d, h:i:s') . "\n"; 
    299299     
    300300     foreach($this->d as $key => $value) { 
    …… 
    311311    } 
    312312  
    313     $file_content .= " require_once(JLOG_BASEPATH.\"scripts\".DIRECTORY_SEPARATOR.\"prepend.inc.php\");\n?" . ">"; 
     313    $file_content .= "\n// eof"; 
    314314 
    315315    // write to settings.inc.php 

  • trunk/scripts/version.inc.php

    r1667 r1701  
    55 */  
    66 
    7 define('JLOG_SOFTWARE_VERSION', '1.1.0'); 
     7define('JLOG_SOFTWARE_VERSION', '1.1.0-RC1'); 
    88define('JLOG_SOFTWARE_URL', 'http://jeenaparadies.net/projects/jlog'); 
    99define('JLOG_SOFTWARE_PHPV', '4.1.1');