Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1285) +++ branches/2.8.x/CHANGELOG (revision 1286) @@ -11,7 +11,11 @@ ! = Update/Change ------------------------------------- 2.8.1 ------------------------------------- -01-Feb-2010 Dietmar Woellbrink (Luisehahne) +08-Feb-2010 Dietmar Woellbrink (Luisehahne) +# Droplet emailfilter fixed search mdcr.js +! some little fixes in upgrade-script ++ new WebsiteBaker Logo in themes +05-Feb-2010 Dietmar Woellbrink (Luisehahne) ! Fixed wrong themes path in jquery_theme.js, that plugins works correctly + images icons to run base theme 01-Feb-2010 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1285) +++ branches/2.8.x/wb/upgrade-script.php (revision 1286) @@ -64,27 +64,38 @@ $x++; } } + + + + return $data; } - // check existings tables for upgrade or install -/* -$get_result = mysql_list_tables (DB_NAME); */ -$get_result = $database->query( "SHOW TABLES FROM ".DB_NAME); -$all_tables = array(); -if($get_result->numRows() > 0) + +// check existings tables for upgrade or install +function check_wb_tables() { - while ($data = $get_result->fetchRow()) - { - $tmp = str_replace(TABLE_PREFIX, '', $data[0]); - if(in_array($tmp,$table_list)) + global $database,$table_list; + $get_result = $database->query( "SHOW TABLES FROM ".DB_NAME); + $all_tables = array(); + if($get_result->numRows() > 0) { - $all_tables[] = $tmp; + while ($data = $get_result->fetchRow()) + { + $tmp = str_replace(TABLE_PREFIX, '', $data[0]); + if(in_array($tmp,$table_list)) + { + $all_tables[] = $tmp; + } + } } - } - } + return $all_tables; +} +// check existing tables +$all_tables = check_wb_tables(); +// only for array tests function show_array($array=array()) { print '
';
@@ -99,6 +110,8 @@
 Upgrade script
 
 
 
 
 

-Website Baker Logo
+WebsiteBaker Project
 
-
Website Baker Upgrade

-
This script upgrades an existing Website Baker Version 2.7 installation to the Version . The upgrade script alters the existing WB database to reflect the changes introduced with WB 2.8.x

+
WebsiteBaker Upgrade

+
This script upgrades an existing WebsiteBaker Version 2.7 and higher installation to the Version . The upgrade script alters the existing WB database to reflect the changes introduced with WB 2.8.x

 
 It is highly recommended to create a manual backup of the entire /pages folder and the MySQL database before proceeding.
Note: The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.

 
 

-
+
 

 I confirm that a manual backup of the /pages folder and the MySQL database was created.
 


 

@@ -181,43 +202,14 @@
 }
 
 echo '
Step 2: Updating database entries
';
-if(!defined('DEFAULT_THEME')) { define('DEFAULT_THEME', 'wb_theme'); }
 
 require_once(WB_PATH.'/framework/functions.php');
 require_once(WB_PATH.'/framework/class.admin.php');
 $admin = new admin('Addons', 'modules', false, false);
-require_once(WB_PATH.'/framework/initialize.php');
 
 $OK   = 'OK';
 $FAIL = 'FAILED';
 
-    $check_text = 'total ';
-    // $check_tables = mysqlCheckTables( DB_NAME ) ;
-
-    if(sizeof($all_tables) == 22)
-    {
-        echo '
NOTICE: Your database '.DB_NAME.' has '.sizeof($all_tables).' '.$check_text.' tables from '.sizeof($table_list).' included in package '.$OK.'
';
-    }
-    else
-    {
-        status_msg('WARNING:
can\'t run Upgrade, missing tables', 'warning', 'div');
-    	echo '
Install missing tables, you can install them in backend->addons->modules->advanced. Then again run upgrade-script.php
';
-        $result = array_diff ( $table_list, $all_tables );
-        echo '
';
-        while ( list ( $key, $val ) = each ( $result ) )
-        {
-            echo TABLE_PREFIX.$val.' '.$FAIL.'
';
-        }
-        echo '
';
-    	echo '
';
-    	echo '';
-    	echo '


';
-        echo "

-        
-        
-        ";
-        exit();
-    }
 // function to add a var/value-pair into settings-table
 function db_add_key_value($key, $value) {
 	global $database; global $OK; global $FAIL;
@@ -261,23 +253,72 @@
 }
 
 /**********************************************************
- *  - Adding field sec_anchor to settings table
+ *  - Adding field default_theme to settings table
  */
-
-echo "
Adding sec_anchor to settings table
";
+echo "
Adding default_theme to settings table
";
 $cfg = array(
-	'sec_anchor' => 'wb_'
+	'default_theme' => 'wb_theme'
 );
+
 foreach($cfg as $key=>$value) {
 	db_add_key_value($key, $value);
 }
 
 /**********************************************************
- *  - Adding field default_theme to settings table
+ *  - install droplets
  */
-echo "
Adding default_theme to settings table
";
+    $drops = (!in_array ( "mod_droplets", $all_tables)) ? "
Install droplets
" : "
Upgrade droplets
";
+    echo $drops;
+
+     $file_name = (!in_array ( "mod_droplets", $all_tables)) ? "install.php" : "upgrade.php";
+     require_once (WB_PATH."/modules/droplets/".$file_name);
+
+// check again all tables, to get a new array
+ if(sizeof($all_tables) < 22) { $all_tables = check_wb_tables(); }
+/**********************************************************
+ *  - check tables comin with WebsiteBaker
+ */
+    $check_text = 'total ';
+    // $check_tables = mysqlCheckTables( DB_NAME ) ;
+
+    if(sizeof($all_tables) == 22)
+    {
+        echo '
NOTICE: Your database '.DB_NAME.' has '.sizeof($all_tables).' '.$check_text.' tables from '.sizeof($table_list).' included in package '.$OK.'
';
+    }
+    else
+    {
+        status_msg('WARNING:
can\'t run Upgrade, missing tables', 'warning', 'div');
+    	echo '
Install missing tables, you can install them in backend->addons->modules->advanced. Then again run upgrade-script.php
';
+        $result = array_diff ( $table_list, $all_tables );
+        echo '
';
+        while ( list ( $key, $val ) = each ( $result ) )
+        {
+            echo TABLE_PREFIX.$val.' '.$FAIL.'
';
+        }
+        echo '
';
+    	echo '
';
+    	echo '';
+    	echo '
';
+        if(defined('ADMIN_URL'))
+        {
+        	echo '
';
+        	echo ' ';
+        	echo '
';
+        }
+        echo "


+        
+        
+        ";
+        exit();
+    }
+
+/**********************************************************
+ *  - Adding field sec_anchor to settings table
+ */
+
+echo "
Adding sec_anchor to settings table
";
 $cfg = array(
-	'default_theme' => 'wb_theme'
+	'sec_anchor' => 'wb_'
 );
 foreach($cfg as $key=>$value) {
 	db_add_key_value($key, $value);
@@ -311,20 +352,20 @@
 echo "
Adding field redirect_type to mod_menu_link table
";
 db_add_field('redirect_type', 'mod_menu_link', "INT NOT NULL DEFAULT '302' AFTER `target_page_id`");
 
-/**********************************************************
- *  - Update search no results database filed to create
- *  valid XHTML if search is empty
- */
-echo "
Updating database field `no_results` of search table: ";
-$search_no_results = addslashes('
[TEXT_NO_RESULTS]
');
-$sql = "UPDATE `" . TABLE_PREFIX . "search` SET `value` = '$search_no_results' WHERE `name`= 'no_results'";
-$database->query($sql);
-echo ($database->query($sql)) ? " $OK
" : " $FAIL
";
 
 
-if (version_compare(VERSION, '2.8.0') <= 0)
+if (version_compare(WB_VERSION, '2.8.0') < 0)
 {
     /**********************************************************
+     *  - Update search no results database filed to create
+     *  valid XHTML if search is empty
+     */
+    echo "
Updating database field `no_results` of search table: ";
+    $search_no_results = addslashes('
[TEXT_NO_RESULTS]
');
+    $sql = "UPDATE `" . TABLE_PREFIX . "search` SET `value` = '$search_no_results' WHERE `name`= 'no_results'";
+    $database->query($sql);
+    echo ($database->query($sql)) ? " $OK
" : " $FAIL
";
+    /**********************************************************
      *  - Update settings of News Modul
      */
 
@@ -378,10 +419,12 @@
 
[POST_TITLE]

 
';
 
-    if(in_array('mod_news_settings', $all_tables))
-    {
-        // Insert default settings into database
-        $query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings where section_id != 0 and page_id != 0");
+if(in_array('mod_news_settings', $all_tables))
+{
+   // Insert default settings into database
+   $query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings where section_id != 0 and page_id != 0");
+   if($query_dates->numRows() > 1)
+   {
         while($result = $query_dates->fetchRow())
         {
 
@@ -434,19 +477,19 @@
         	echo mysql_error().'
';
 
         }
+
+
+      if ((version_compare(WB_VERSION, '2.8.0') <= 0) && file_exists(WB_PATH."/modules/news/upgrade.php"))
+      {
+              echo '
Upgrade existings postfiles to new format

';
+              // change old postfiles to new postfiles
+              require_once(WB_PATH."/modules/news/upgrade.php");
+      }
     }
-    else
-    {
-        echo 'Missing database table '.TABLE_PREFIX.'mod_news_settings '.$FAIL.'
';
-    }
 
-    if(file_exists(WB_PATH."/modules/news/upgrade.php"))
-    {
-        echo '
Upgrade existings postfiles to new format

';
-        // change old postfiles to new postfiles
-        require_once(WB_PATH."/modules/news/upgrade.php");
+   }
+
 }
-}
 
 /**********************************************************
  *  - Set Version to WB 2.8.1
@@ -455,15 +498,6 @@
 echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value` = '$version' WHERE `name` = 'wb_version'")) ? " $OK
" : " $FAIL
";
 
 /**********************************************************
- *  - install droplets
- */
-$drops = (!in_array ( "mod_droplets", $all_tables)) ? "
Install droplets
" : "
Upgrade droplets
";
-echo $drops;
-
- $file_name = (!in_array ( "mod_droplets", $all_tables)) ? "install.php" : "upgrade.php";
- require_once (WB_PATH."/modules/droplets/".$file_name);
-
-/**********************************************************
  *  - Reload all addons
  */
 
@@ -510,17 +544,23 @@
 /**********************************************************
  *  - End of upgrade script
  */
+
+// require(WB_PATH.'/framework/initialize.php');
+
+if(!defined('DEFAULT_THEME')) { define('DEFAULT_THEME', 'wb_theme'); }
+if(!defined('THEME_PATH')) { define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME);}
+
 echo '
Congratulations: The upgrade script is finished ...
';
 status_msg('Warning:
Please delete the file upgrade-script.php via FTP before proceeding.', 'warning', 'div');
 // show buttons to go to the backend or frontend
 echo '
';
 if(defined('WB_URL')) {
-	echo '
';
+	echo '';
 	echo '';
 	echo '
';
 }
 if(defined('ADMIN_URL')) {
-	echo '
';
+	echo '';
 	echo ' ';
 	echo '
';
 }
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1285)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1286)
@@ -52,6 +52,6 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.1');
-if(!defined('REVISION')) define('REVISION', '1285');
+if(!defined('REVISION')) define('REVISION', '1286');
 
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/templates/classic_theme/images/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/wb_theme/images/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/templates/argos_theme/images/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/2.8.x/wb/modules/droplets/example/EmailFilter.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/example/EmailFilter.php	(revision 1285)
+++ branches/2.8.x/wb/modules/droplets/example/EmailFilter.php	(revision 1286)
@@ -1,5 +1,5 @@
-//:Emailfiltering on your output - output filtering with the options below - Mailto links can be encrypted by a Javascript 
-//:usage:  [[EmailFilter]] 
+//:Emailfiltering on your output - output filtering with the options below - Mailto links can be encrypted by a Javascript
+//:usage:  [[EmailFilter]] 
  
 // You can configure the output filtering with the options below.
 // Tip: Mailto links can be encrypted by a Javascript function. 
@@ -40,7 +40,7 @@
 	$output_filter_mode = $output_filter_mode + 2;								// 0|2
 					
 	// check if Javascript mailto encryption is enabled (call register_frontend_functions in the template)
-	$search = '';
+	$search = '';
 	if(strpos($wb_page_data, $search) !== false) { 
 		$output_filter_mode = $output_filter_mode + 4;							// 0|4
 	}