Changeset 451 for branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include

Timestamp:

Nov 20, 2009, 2:52:16 PM (15 years ago)

Author:

toemon

Message:

MUブランチにVer2.2.0RC1の変更内容をマージ

Location:

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include

Files:

• custom_functions.php (modified) (1 diff)
• xpress_common_functions.php (modified) (1 diff)
• xpress_upgrade.php (added)

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -792 +792 @@
 
         $week_begins = intval(get_option('start_of_week'));
-        $head_pattrn = '<thead>\s*<tr>\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*(<th[^>]*>.*<\/th>)\s*<\/tr>\s*<\/thead>';
+        $head_pattrn = '<thead>\s*<tr>\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*(<th[^>]*>[^<]*<\/th>)\s*<\/tr>\s*<\/thead>';
         if(preg_match('/'. $head_pattrn . '/s' ,$calendar,$head_match)){
                 $sun_index = 1 - $week_begins;

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -365 +365 @@
 }
 
+function get_block_file_path($mydirname,$file_name)
+{
+        global $xoops_config, $xpress_config;
+        $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
+        $select_theme = xpress_ThemeTemplate(get_xpress_theme_name($mydirname));
+        $xpress_default_theme = 'xpress_default';
+        $select_block = '/wp-content/themes/' . $select_theme . '/blocks/' . $file_name;
+        $default_block = '/wp-content/themes/xpress_default/blocks/' . $file_name;
+        $select_block_path = $mydirpath . $select_block;
+        $default_block_path =  $mydirpath . $default_block;
+
+        $block_file_data = array();
+        $block_file_data['file_path'] = $default_block_path;
+        $block_file_data['error'] = '';
+
+        if($select_theme != $xpress_default_theme){
+                if (file_exists($select_block_path)){
+                        $select_block_version = get_block_version($select_block_path);
+                        $default_block_version = get_block_version($default_block_path);
+                        if (version_compare($select_block_version,$default_block_version, "<")){
+                                $block_file_data['file_path'] = $default_block_path;
+                                if ($xpress_config->is_block_error_display){
+                                        $error_str = '<div style="color:red">';
+                                        $error_str .= sprintf(__('Block file %1$s is an old version %2$s.<br />used block file %3$s of new version %4$s.','xpressme'),$select_block,$select_block_version,$default_block,$default_block_version);
+                                        $error_str .= '</div>';
+                                        $block_file_data['error'] = $error_str;
+                                }
+                        } else {
+                                $block_file_data['file_path'] = $select_block_path;
+                                $block_file_data['error'] = '';
+                        }
+                }
+        }
+        return $block_file_data;
+}
+
+function get_block_version($file_path = ''){
+        $array_file = file($file_path);
+        $pattern = '^[\s|\/]*[B|b]lock\s+[V|v]ersion\s*[:|;]\s*([0-9|.]*)';
+        $version = '0.1';
+        if (empty($file_path)) return $version;
+        if (!file_exists($file_path)) return $version;
+        if (count($array_file) > 5) $file_count = 5; else $file_count = count($array_file);
+        for ($i = 0 ; $i < $file_count ; $i++){
+                if (preg_match('/' . $pattern . '/' ,$array_file[$i],$matchs)){
+                        $version = $matchs[1];
+                        break;
+                }
+        }
+        return $version;
+}
+
 ?>