svnno****@sourc*****
svnno****@sourc*****
2009年 3月 8日 (日) 01:23:15 JST
Revision: 177
http://svn.sourceforge.jp/view?root=cinemaru&view=rev&rev=177
Author: asben
Date: 2009-03-08 01:23:14 +0900 (Sun, 08 Mar 2009)
Log Message:
-----------
ディレクトリ名を変更して複数のcinemaruをインストールした時の不調箇所修正
Modified Paths:
--------------
trunk/cinemaru/blocks/cinemaru_block_random.php
trunk/cinemaru/blocks/cinemaru_block_thumb.php
trunk/cinemaru/index.php
trunk/cinemaru/movie.php
trunk/cinemaru/templates/list_part.html
trunk/cinemaru/templates/movie.html
trunk/cinemaru/templates/thumb_part.html
Modified: trunk/cinemaru/blocks/cinemaru_block_random.php
===================================================================
--- trunk/cinemaru/blocks/cinemaru_block_random.php 2009-03-06 17:03:46 UTC (rev 176)
+++ trunk/cinemaru/blocks/cinemaru_block_random.php 2009-03-07 16:23:14 UTC (rev 177)
@@ -1,8 +1,7 @@
<?php
-if (defined('__CINEMARU_BLOCK_RANDOM_PHP__')) {
- return;
-}
+if (! defined('__CINEMARU_BLOCK_RANDOM_PHP__')) {
+
define('__CINEMARU_BLOCK_RANDOM_PHP__', 1);
function b_cinemaru_block_random( $options )
@@ -18,12 +17,15 @@
}
$GLOBALS['mydirname'] = $mydirname_cinemaru;
+ $constpref = strtoupper($mydirname_cinemaru);
+
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname_cinemaru . '/include/db.php');
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname_cinemaru . '/include/misc.php');
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname_cinemaru . '/constants.php');
$constpref = strtoupper( $mydirname_cinemaru ) ;
+ $xoopsTpl->assign('file_type', constant($constpref.'_FORM_FILE_TYPE_YOUTUBE_URL'));
$xoopsTpl->assign('mydirname', $mydirname_cinemaru);
@@ -59,4 +61,4 @@
return array();
}
-
+}
Modified: trunk/cinemaru/blocks/cinemaru_block_thumb.php
===================================================================
--- trunk/cinemaru/blocks/cinemaru_block_thumb.php 2009-03-06 17:03:46 UTC (rev 176)
+++ trunk/cinemaru/blocks/cinemaru_block_thumb.php 2009-03-07 16:23:14 UTC (rev 177)
@@ -1,8 +1,7 @@
<?php
-if (defined('__CINEMARU_BLOCK_THUMB_PHP__')) {
- return;
-}
+if (! defined('__CINEMARU_BLOCK_THUMB_PHP__')) {
+
define('__CINEMARU_BLOCK_THUMB_PHP__', 1);
function b_cinemaru_block_thumb($options)
@@ -17,6 +16,9 @@
$mydirname = $options[0];
$GLOBALS['mydirname'] = $mydirname;
+ $constpref = strtoupper($mydirname);
+ $xoopsTpl->assign('file_type', constant($constpref.'_FORM_FILE_TYPE_YOUTUBE_URL'));
+
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/include/db.php');
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/include/misc.php');
require_once(XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/language/' . $xoopsConfig['language']. '/main.php');
@@ -57,3 +59,5 @@
return $form;
}
+
+}
\ No newline at end of file
Modified: trunk/cinemaru/index.php
===================================================================
--- trunk/cinemaru/index.php 2009-03-06 17:03:46 UTC (rev 176)
+++ trunk/cinemaru/index.php 2009-03-07 16:23:14 UTC (rev 177)
@@ -69,6 +69,7 @@
$xoopsTpl->assign('last', $pn->get_last());
$xoopsTpl->assign('total', $total);
$xoopsTpl->assign('cinemaru_module_config', $xoopsModuleConfig);
+$xoopsTpl->assign('file_type', constant($constpref.'_FORM_FILE_TYPE_YOUTUBE_URL'));
$l = $pn->get_page_list();
Modified: trunk/cinemaru/movie.php
===================================================================
--- trunk/cinemaru/movie.php 2009-03-06 17:03:46 UTC (rev 176)
+++ trunk/cinemaru/movie.php 2009-03-07 16:23:14 UTC (rev 177)
@@ -84,6 +84,7 @@
$xoopsTpl->assign('tag_editable', $groupperm_tag_editable);
$xoopsTpl->assign('report', $groupperm_report);
$xoopsTpl->assign('t', time());
+$xoopsTpl->assign('file_type', constant($constpref.'_FORM_FILE_TYPE_YOUTUBE_URL'));
if (preg_match('/^star1.swf$/', $xoopsModuleConfig['sp_command1_url'])) {
$xoopsTpl->assign('spcmd1url', XOOPS_URL . '/modules/' . $mydirname . '/flash/star1.swf');
Modified: trunk/cinemaru/templates/list_part.html
===================================================================
--- trunk/cinemaru/templates/list_part.html 2009-03-06 17:03:46 UTC (rev 176)
+++ trunk/cinemaru/templates/list_part.html 2009-03-07 16:23:14 UTC (rev 177)
@@ -1,7 +1,7 @@
<a href="<{$xoops_url}>/modules/<{$mydirname}>/movie.php?id=<{$movie.id}>">
<img src="<{if $movie.image_file_url != ""}><{$movie.image_file_url|escape:"html"}>
<{elseif $movie.image_file}><{$xoops_url}>/uploads/<{$mydirname}>/image/<{$movie.image_file}>
- <{else}><{if $movie.file_type==$smarty.const.CINEMARU_FORM_FILE_TYPE_YOUTUBE_URL}><{$xoops_url}>/modules/<{$mydirname}>/images/no_img_y.gif
+ <{else}><{if $movie.file_type==$file_type}><{$xoops_url}>/modules/<{$mydirname}>/images/no_img_y.gif
<{else}><{$xoops_url}>/modules/<{$mydirname}>/images/no_image.png<{/if}>
<{/if}>"
width="150" height="112" style="float: left;" ><{if $movie.title ==
Modified: trunk/cinemaru/templates/movie.html
===================================================================
--- trunk/cinemaru/templates/movie.html 2009-03-06 17:03:46 UTC (rev 176)
+++ trunk/cinemaru/templates/movie.html 2009-03-07 16:23:14 UTC (rev 177)
@@ -97,7 +97,7 @@
<td class="odd" width="80" valign="middle">
<img src="<{if $movie.image_file_url != ''}><{$movie.image_file_url|escape:"html"}>
<{elseif $movie.image_file}><{$xoops_url}>/uploads/<{$mydirname}>/image/<{$movie.image_file}>
- <{else}><{if $movie.file_type==$smarty.const.CINEMARU_FORM_FILE_TYPE_YOUTUBE_URL}><{$xoops_url}>/modules/<{$mydirname}>/images/no_img_y.gif
+ <{else}><{if $movie.file_type==$file_type}><{$xoops_url}>/modules/<{$mydirname}>/images/no_img_y.gif
<{else}><{$xoops_url}>/modules/<{$mydirname}>/images/no_image.png<{/if}>
<{/if}>"
width="80" height="60">
@@ -181,7 +181,7 @@
<a href="movie.php?id=<{$rel_movie.id}>">
<img src="<{if $rel_movie.image_file_url != ''}><{$rel_movie.image_file_url|escape:"html"}>
<{elseif $rel_movie.image_file}><{$xoops_url}>/uploads/<{$mydirname}>/image/<{$rel_movie.image_file}>
- <{else}><{if $rel_movie.file_type==$smarty.const.CINEMARU_FORM_FILE_TYPE_YOUTUBE_URL}><{$xoops_url}>/modules/<{$mydirname}>/images/no_img_y.gif
+ <{else}><{if $rel_movie.file_type==$file_type}><{$xoops_url}>/modules/<{$mydirname}>/images/no_img_y.gif
<{else}><{$xoops_url}>/modules/<{$mydirname}>/images/no_image.png<{/if}>
<{/if}>" width="100" height="70">
<p><{$rel_movie.title}></p>
Modified: trunk/cinemaru/templates/thumb_part.html
===================================================================
--- trunk/cinemaru/templates/thumb_part.html 2009-03-06 17:03:46 UTC (rev 176)
+++ trunk/cinemaru/templates/thumb_part.html 2009-03-07 16:23:14 UTC (rev 177)
@@ -1,7 +1,7 @@
<a href="<{$xoops_url}>/modules/<{$mydirname}>/movie.php?id=<{$movie.id}>">
<img src="<{if $movie.image_file_url != ''}><{$movie.image_file_url|escape:"html"}>
<{elseif $movie.image_file}><{$xoops_url}>/uploads/<{$mydirname}>/image/<{$movie.image_file}>
- <{else}><{if $movie.file_type==$smarty.const.CINEMARU_FORM_FILE_TYPE_YOUTUBE_URL}><{$xoops_url}>/modules/<{$mydirname}>/images/no_img_y.gif
+ <{else}><{if $movie.file_type==$file_type}><{$xoops_url}>/modules/<{$mydirname}>/images/no_img_y.gif
<{else}><{$xoops_url}>/modules/<{$mydirname}>/images/no_image.png<{/if}>
<{/if}>"
width="150" height="112"><br><{if $movie.title ==