Add some codes from 3.61. Currently files under /nucleus/libs and /nucleus/libs/sql...

[nucleus-jp/nucleus-jp-ancient.git] / utf8 / nucleus / libs / showlist.php

diff --git a/utf8/nucleus/libs/showlist.php b/utf8/nucleus/libs/showlist.php
index b8049cc..a0d1304 100644 (file)
--- a/utf8/nucleus/libs/showlist.php
+++ b/utf8/nucleus/libs/showlist.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)

- * Copyright (C) 2002-2009 The Nucleus Group
+ * Copyright (C) 2002-2010 The Nucleus Group

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License


@@ -13,7 +13,7 @@
  * Functions to create lists of things inside the admin are
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * Functions to create lists of things inside the admin are
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License

- * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @copyright Copyright (C) 2002-2010 The Nucleus Group

  * @version $Id$
  * @version $NucleusJP: showlist.php,v 1.7.2.3 2007/12/03 00:01:48 kmorimatsu Exp $
  */
  * @version $Id$
  * @version $NucleusJP: showlist.php,v 1.7.2.3 2007/12/03 00:01:48 kmorimatsu Exp $
  */


@@ -186,7 +186,6 @@ function listplug_table_pluginlist($template, $type) {
                                        echo _LIST_PLUGS_VER, ' ' , htmlspecialchars($plug->getVersion()) , '<br />';
                                        if ($plug->getURL())
                                        echo '<a href="',htmlspecialchars($plug->getURL()),'" tabindex="'.$template['tabindex'].'">',_LIST_PLUGS_SITE,'</a><br />';
                                        echo _LIST_PLUGS_VER, ' ' , htmlspecialchars($plug->getVersion()) , '<br />';
                                        if ($plug->getURL())
                                        echo '<a href="',htmlspecialchars($plug->getURL()),'" tabindex="'.$template['tabindex'].'">',_LIST_PLUGS_SITE,'</a><br />';

-//                                     echo '<a href="',htmlspecialchars($plug->getURL()),'" tabindex="'.$template['tabindex'].'">'.htmlspecialchars(shorten($plug->getURL(), 25, '...')),'</a><br />';

                                echo '</td>';
                                echo '<td>';
                                        echo _LIST_PLUGS_DESC .'<br/>'. encode_desc($plug->getDescription());
                                echo '</td>';
                                echo '<td>';
                                        echo _LIST_PLUGS_DESC .'<br/>'. encode_desc($plug->getDescription());


@@ -273,7 +272,7 @@ function listplug_plugOptionRow($current) {
        $meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
 
        // only if it is not a hidden option write the controls to the page
        $meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
 
        // only if it is not a hidden option write the controls to the page

-       if (@$meta['access'] != 'hidden') {
+       if ($meta['access'] != 'hidden') {

                echo '<td>',htmlspecialchars($current['description']?$current['description']:$current['name']),'</td>';
                echo '<td>';
                switch($current['type']) {
                echo '<td>',htmlspecialchars($current['description']?$current['description']:$current['name']),'</td>';
                echo '<td>';
                switch($current['type']) {


@@ -298,7 +297,7 @@ function listplug_plugOptionRow($current) {
                        case 'textarea':
                                //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
                                echo '<textarea class="pluginoption" cols="30" rows="5" name="',htmlspecialchars($varname),'"';
                        case 'textarea':
                                //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
                                echo '<textarea class="pluginoption" cols="30" rows="5" name="',htmlspecialchars($varname),'"';

-                               if (@$meta['access'] == 'readonly') {
+                               if ($meta['access'] == 'readonly') {

                                        echo ' readonly="readonly"';
                                }
                                echo '>',htmlspecialchars($current['value']),'</textarea>';
                                        echo ' readonly="readonly"';
                                }
                                echo '>',htmlspecialchars($current['value']),'</textarea>';


@@ -308,15 +307,15 @@ function listplug_plugOptionRow($current) {
                                //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
 
                                echo '<input type="text" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'"';
                                //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
 
                                echo '<input type="text" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'"';

-                               if (@$meta['datatype'] == 'numerical') {
+                               if ($meta['datatype'] == 'numerical') {

                                        echo ' onkeyup="checkNumeric(this)" onblur="checkNumeric(this)"';
                                }
                                        echo ' onkeyup="checkNumeric(this)" onblur="checkNumeric(this)"';
                                }

-                               if (@$meta['access'] == 'readonly') {
+                               if ($meta['access'] == 'readonly') {

                                        echo ' readonly="readonly"';
                                }
                                echo ' />';
                }
                                        echo ' readonly="readonly"';
                                }
                                echo ' />';
                }

-               echo @$current['extra'];
+               echo $current['extra'];

                echo '</td>';
        }
 }
                echo '</td>';
        }
 }


@@ -371,8 +370,7 @@ function listplug_table_itemlist($template, $type) {
                        echo " / <a href='index.php?action=itemdelete&amp;itemid={$current->inumber}'>" . _LISTS_DELETE . "</a><br />";
                        // evaluate amount of comments for the item
                        $camount = $COMMENTS->amountComments();
                        echo " / <a href='index.php?action=itemdelete&amp;itemid={$current->inumber}'>" . _LISTS_DELETE . "</a><br />";
                        // evaluate amount of comments for the item
                        $camount = $COMMENTS->amountComments();

-                       if ($camount>0)
-                       {
+                       if ($camount>0) {

                                echo "<a href='index.php?action=itemcommentlist&amp;itemid=$current->inumber'>";
                                echo "( " . sprintf(_LIST_ITEM_COMMENTS, $COMMENTS->amountComments())." )</a>";
                        }
                                echo "<a href='index.php?action=itemcommentlist&amp;itemid=$current->inumber'>";
                                echo "( " . sprintf(_LIST_ITEM_COMMENTS, $COMMENTS->amountComments())." )</a>";
                        }