Changeset 6752

Timestamp:

Apr 26, 2008, 10:21:17 PM (14 years ago)

Author:

ebihara

Message:

#2027:小窓ファイルが見つからない場合、小窓キャスターのJavascriptを読み込むようにした

Location:

OpenPNE/trunk/webapp

Files:

• lib/db/etc.php (modified) (1 diff)
• lib/smarty_plugins/modifier.t_cmd.php (modified) (2 diffs)
• lib/smarty_plugins/modifier.t_url2cmd.php (modified) (2 diffs)
• modules/admin/lib/db_admin.php (modified) (1 diff)

OpenPNE/trunk/webapp/lib/db/etc.php

@@ -902 +902 @@
 }
 
+function db_etc_c_cmd_url4name($name)
+{
+    $sql = 'SELECT c_cmd.url FROM c_cmd INNER JOIN c_cmd_caster USING(c_cmd_caster_id)'
+         . ' WHERE name = ? ORDER BY c_cmd_caster.sort_order';
+    return db_get_one($sql, array($name));
+}
+
 ?>

OpenPNE/trunk/webapp/lib/smarty_plugins/modifier.t_cmd.php

@@ -22 +22 @@
     $args = $matches[4];
 
-    if (!db_is_use_cmd($src, $GLOBALS['_CMD']['type'])) {
+    $path = 'cmd/' . $src . '.js';
+
+    // ファイルが読み込めない場合は、小窓キャスターのJavaScriptを読み込む
+    if (!is_readable($path)) {
+        $path = db_etc_c_cmd_url4name($src);
+    }
+
+    if (!db_is_use_cmd($src, $GLOBALS['_CMD']['type']) || !$path) {
         return $matches[0];
     }
@@ -30 +37 @@
 
     $result = <<<EOD
-<script type="text/javascript" src="cmd/{$src}.js"></script>
+<script type="text/javascript" src="{$path}"></script>
 <script type="text/javascript">
 <!--

OpenPNE/trunk/webapp/lib/smarty_plugins/modifier.t_url2cmd.php

@@ -39 +39 @@
     $path = './cmd/' . $file;
 
-    if (!OPENPNE_USE_CMD_TAG || !db_is_use_cmd($cmd, $GLOBALS['_CMD']['type']) || !is_readable($path)) {
+    // ファイルが読み込めない場合は、小窓キャスターのJavaScriptを読み込む
+    if (!is_readable($path)) {
+        $path = db_etc_c_cmd_url4name($cmd);
+    }
+
+    if (!OPENPNE_USE_CMD_TAG || !db_is_use_cmd($cmd, $GLOBALS['_CMD']['type']) || !$path) {
         if (in_array($GLOBALS['_CMD']['type'], db_get_url2a_denied_list())) {
             // t_url2aが無効: 何もせずに返す
@@ -51 +56 @@
     $url_html = str_replace('&', '&', $url);
     $result = <<<EOD
-<script type="text/javascript" src="cmd/{$file}"></script>
+<script type="text/javascript" src="{$path}"></script>
 <script type="text/javascript">
 <!--

OpenPNE/trunk/webapp/modules/admin/lib/db_admin.php

@@ -3220 +3220 @@
                 'name' => $name,
                 'url' => $enclosure->link,
+                'permit' => 127,
                 'c_cmd_caster_id' => $c_cmd_caster_id,
                 'r_datetime' => $item['date'],