- history, stats and redirect go smarty

- lang correction - small change in calling check_server_plugins (use by ref param instead of global) git-svn-id: http://piwigo.org/svn/trunk@2245 68402e56-0260-453c-a942-63ccdbb3a9ee
2025-04-28 04:09:56 +03:00 · 2008-03-03 12:50:54 +00:00 · 2008-03-03 12:50:54 +00:00 · 7688a7cbb6
commit 7688a7cbb6
parent 14bfa8a3e6
9 changed files with 211 additions and 275 deletions
--- a/admin/history.php
+++ b/admin/history.php
@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
 // | last update   : $Date$
@ -159,21 +159,10 @@ $template->set_filename('history', 'admin/history.tpl');
 // TabSheet initialization
 history_tabsheet();

-$base_url = PHPWG_ROOT_PATH.'admin.php?page=history';
-
-$template->assign_vars(
+$template->assign(
  array(
    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=history',
-
-    'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=history'
-    )
-  );
-
-$template->assign_vars(
-  array(
-    'TODAY_DAY'   => date('d', time()),
-    'TODAY_MONTH' => date('m', time()),
-    'TODAY_YEAR'  => date('Y', time()),
+    'F_ACTION' => get_root_url().'admin.php?page=history'
    )
  );

@ -498,8 +487,8 @@ SELECT
      }
    }

-    $template->assign_block_vars(
-      'detail',
+    $template->append(
+      'search_results',
      array(
        'DATE'      => $line['date'],
        'TIME'      => $line['time'],
@ -514,7 +503,6 @@ SELECT
                : 'deleted '.$line['category_id'] )
          : '',
        'TAGS'       => $tags_string,
-        'T_CLASS'   => ($i % 2) ? 'row1' : 'row2',
        )
      );
  }
@ -535,7 +523,7 @@ SELECT
  foreach ($username_of as $user_id => $user_name)
  {
    $member_string = $user_name.'&nbsp;<a href="';
-    $member_string.= PHPWG_ROOT_PATH.'admin.php?page=history';
+    $member_string.= get_root_url().'admin.php?page=history';
    $member_string.= '&amp;search_id='.$page['search_id'];
    $member_string.= '&amp;user_id='.$user_id;
    $member_string.= '">+</a>';
@ -543,8 +531,8 @@ SELECT
    $member_strings[] = $member_string;
  }

-  $template->assign_block_vars(
-    'summary',
+  $template->assign(
+    'search_summary',
    array(
      'NB_LINES' => l10n_dec(
        '%d line filtered', '%d lines filtered',
@ -577,18 +565,13 @@ SELECT
 if (isset($page['search_id']))
 {
  $navbar = create_navigation_bar(
-    PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start')),
+    get_root_url().'admin.php'.get_query_string_diff(array('start')),
    $page['nb_lines'],
    $page['start'],
    $conf['nb_logs_page']
    );

-  $template->assign_block_vars(
-    'navigation',
-    array(
-      'NAVBAR' => $navbar
-      )
-    );
+  $template->assign('NAV_BAR', $navbar);
 }

 // +-----------------------------------------------------------------------+
@ -646,49 +629,35 @@ else
    pwg_get_cookie_var('history_display_thumbnail', $display_thumbnails[2]);
 }

-// start date
-get_day_list('start_day', @$form['start_day']);
-get_month_list('start_month', @$form['start_month']);
-// end date
-get_day_list('end_day', @$form['end_day']);
-get_month_list('end_month', @$form['end_month']);

-$template->assign_vars(
+$month_list = $lang['month'];
+$month_list[0]='------------';
+ksort($month_list);
+
+$template->assign(
  array(
-    'START_YEAR' => @$form['start_year'],
-    'END_YEAR'   => @$form['end_year'],
    'IMAGE_ID' => @$form['image_id'],
    'FILENAME' => @$form['filename'],
+
+    'month_list' => $month_list,
+
+    'START_DAY_SELECTED' => @$form['start_day'],
+    'START_MONTH_SELECTED' => @$form['start_month'],
+    'START_YEAR' => @$form['start_year'],
+
+    'END_DAY_SELECTED' => @$form['end_day'],
+    'END_MONTH_SELECTED' => @$form['end_month'],
+    'END_YEAR'   => @$form['end_year'],
    )
  );

-foreach ($types as $option)
-{
-  $selected = '';
-  
-  if (in_array($option, $form['types']))
-  {
-    $selected = 'selected="selected"';
-  }
-  
-  $template->assign_block_vars(
-    'types_option',
+$template->assign(
    array(
-      'VALUE' => $option,
-      'CONTENT' => l10n($option),
-      'SELECTED' => $selected,
+      'type_option_values' => $types,
+      'type_option_selected' => $form['types']
    )
  );
-}

-$template->assign_block_vars(
-  'user_option',
-  array(
-    'VALUE'=> -1,
-    'CONTENT' => '------------',
-    'SELECTED' => ''
-    )
-  );

 $query = '
 SELECT
@ -697,46 +666,19 @@ SELECT
  FROM '.USERS_TABLE.'
  ORDER BY username ASC
 ;';
-$result = pwg_query($query);
-
-while ($row = mysql_fetch_array($result))
-{
-  $selected = '';
-
-  if (isset($form['user'])
-      and $row['id'] == $form['user'])
-  {
-    $selected = 'selected="selected"';
-  }
-  
-  $template->assign_block_vars(
-    'user_option',
+$template->assign(
  array(
-      'VALUE' => $row['id'],
-      'CONTENT' => $row['username'],
-      'SELECTED' => $selected,
+    'user_options' => simple_hash_from_query($query, 'id','username'),
+    'user_options_selected' => array(@$form['user'])
  )
 );
-}

-foreach ($display_thumbnails as $display_thumbnail)
-{
-  $selected = '';
-  
-  if ($display_thumbnail === $form['display_thumbnail'])
-  {
-    $selected = 'selected="selected"';
-  }
-  
-  $template->assign_block_vars(
-    'display_thumbnail',
+$template->assign(
  array(
-      'VALUE' => $display_thumbnail,
-      'CONTENT' => l10n($display_thumbnail),
-      'SELECTED' => $selected,
+      'display_thumbnail_values' => $display_thumbnails,
+      'display_thumbnail_selected' => array($form['display_thumbnail']),
    )
  );
-}

 // +-----------------------------------------------------------------------+
 // |                           html code display                           |
--- a/admin/include/functions_plugins.inc.php
+++ b/admin/include/functions_plugins.inc.php
@ -136,10 +136,8 @@ function sort_plugins_by_state($plugins, $db_plugins_by_id)
 * Retrieve PEM server datas
 * @param bool (true for retrieve new extensions)
 */
-function check_server_plugins($newext=false)
+function check_server_plugins(& $fs_plugins, $newext=false)
 {
-  global $fs_plugins;
-  
  foreach($fs_plugins as $plugin_id => $fs_plugin)
  {
    if (!empty($fs_plugin['uri']) and strpos($fs_plugin['uri'] , 'extension_view.php?eid='))
@ -170,7 +168,6 @@ function check_server_plugins($newext=false)
 */
 function extract_plugin_files($action, $source, $dest)
 {
-  global $archive;
  if ($archive = tempnam( PHPWG_PLUGINS_PATH, 'zip'))
  {
    if (@copy(PEM_URL . str_replace(' ', '%20', $source), $archive))
--- a/admin/plugins_new.php
+++ b/admin/plugins_new.php
@ -85,7 +85,7 @@ $template->assign('selected', htmlentities($my_base_url.'&order=').$order);
 // +-----------------------------------------------------------------------+
 // |                     start template output                             |
 // +-----------------------------------------------------------------------+
-$plugins_infos = check_server_plugins(true);
+$plugins_infos = check_server_plugins($fs_plugins, true);
 if ($plugins_infos !== false)
 {
  if ($order == 'date') krsort($plugins_infos);
--- a/admin/plugins_update.php
+++ b/admin/plugins_update.php
@ -80,7 +80,7 @@ if (isset($_GET['upgradestatus']) and isset($_GET['plugin']))
 // +-----------------------------------------------------------------------+
 // |                     start template output                             |
 // +-----------------------------------------------------------------------+
-$plugins_infos = check_server_plugins();
+$plugins_infos = check_server_plugins($fs_plugins);

 if ($plugins_infos !== false)
 {
--- a/admin/stats.php
+++ b/admin/stats.php
@ -388,14 +388,14 @@ $template->set_filename('stats', 'admin/stats.tpl');
 // TabSheet initialization
 history_tabsheet();

-$base_url = PHPWG_ROOT_PATH.'admin.php?page=history';
+$base_url = get_root_url().'admin.php?page=history';

-$template->assign_vars(
+$template->assign(
  array(
    'L_STAT_TITLE' => implode($conf['level_separator'], $title_parts),
    'PERIOD_LABEL' => $period_label,
-    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=history',
-    'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=history',
+    'U_HELP' => get_root_url().'popuphelp.php?page=history',
+    'F_ACTION' => $base_url,
    )
  );

@ -468,7 +468,7 @@ if (count($datas) > 0)
    else if (isset($page['month']))
    {
      $url =
-        PHPWG_ROOT_PATH.'admin.php'
+        get_root_url().'admin.php'
        .'?page=stats'
        .'&amp;year='.$page['year']
        .'&amp;month='.$page['month']
@ -482,7 +482,7 @@ if (count($datas) > 0)
    else if (isset($page['year']))
    {
      $url =
-        PHPWG_ROOT_PATH.'admin.php'
+        get_root_url().'admin.php'
        .'?page=stats'
        .'&amp;year='.$page['year']
        .'&amp;month='.$i
@ -494,7 +494,7 @@ if (count($datas) > 0)
    {
      // at least the year is defined
      $url =
-        PHPWG_ROOT_PATH.'admin.php'
+        get_root_url().'admin.php'
        .'?page=stats'
        .'&amp;year='.$i
        ;
@ -507,8 +507,8 @@ if (count($datas) > 0)
      $value = '<a href="'.$url.'">'.$value.'</a>';
    }

-    $template->assign_block_vars(
-      'statrow',
+    $template->append(
+      'statrows',
      array(
        'VALUE' => $value,
        'PAGES' => $datas[$i],
--- a/template/yoga/admin/history.tpl
+++ b/template/yoga/admin/history.tpl
@ -1,158 +1,151 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div class="titrePage">
  <ul class="categoryActions">
    <li>
      <a
-        href="{U_HELP}"
+        href="{$U_HELP}"
        onclick="popuphelp(this.href); return false;"
-        title="{lang:Help}"
+        title="{'Help'|@translate}"
      >
-        <img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)">
+        <img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)">
      </a>
    </li>
  </ul>
-  <h2>{lang:History} {TABSHEET_TITLE}</h2>
-  {TABSHEET}
+  <h2>{'History'|@translate} {$TABSHEET_TITLE}</h2>
+  {$TABSHEET}
 </div>

-<form class="filter" method="post" name="filter" action="{F_ACTION}">
+<form class="filter" method="post" name="filter" action="{$F_ACTION}">
 <fieldset>
-  <legend>{lang:Filter}</legend>
+  <legend>{'Filter'|@translate}</legend>
  <ul>
-    <li><label>{lang:search_date_from}</label></li>
+    <li><label>{'search_date_from'|@translate}</label></li>
    <li>
      <select name="start_day">
-        <!-- BEGIN start_day -->
-        <option {start_day.SELECTED} value="{start_day.VALUE}">{start_day.OPTION}</option>
-        <!-- END start_day -->
+      	<option value="0">--</option>
+        {section name=day start=1 loop=31}
+          <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$START_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
+        {/section}
      </select>
      <select name="start_month">
-        <!-- BEGIN start_month -->
-        <option {start_month.SELECTED} value="{start_month.VALUE}">{start_month.OPTION}</option>
-        <!-- END start_month -->
+      	{html_options options=$month_list selected=$START_MONTH_SELECTED}
      </select>
-      <input name="start_year" value="{START_YEAR}" type="text" size="4" maxlength="4" >
+      <input name="start_year" value="{$START_YEAR}" type="text" size="4" maxlength="4" >
    </li>
  </ul>
  <ul>
-    <li><label>{lang:search_date_to}</label></li>
+    <li><label>{'search_date_to'|@translate}</label></li>
    <li>
      <select name="end_day">
-        <!-- BEGIN end_day -->
-        <option {end_day.SELECTED} value="{end_day.VALUE}">{end_day.OPTION}</option>
-        <!-- END end_day -->
+      	<option value="0">--</option>
+        {section name=day start=1 loop=31}
+          <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$END_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
+        {/section}
      </select>
      <select name="end_month">
-        <!-- BEGIN end_month -->
-        <option {end_month.SELECTED} value="{end_month.VALUE}">{end_month.OPTION}</option>
-        <!-- END end_month -->
+      	{html_options options=$month_list selected=$END_MONTH_SELECTED}
      </select>
-      <input name="end_year" value="{END_YEAR}" type="text" size="4" maxlength="4" >
+      <input name="end_year" value="{$END_YEAR}" type="text" size="4" maxlength="4" >
    </li>
  </ul>

  <label>
-    {lang:Element type}
+    {'Element type'|@translate}
    <select name="types[]" multiple="multiple" size="4">
-      <!-- BEGIN types_option -->
-      <option value="{types_option.VALUE}" {types_option.SELECTED}>
-        {types_option.CONTENT}
-      </option>
-      <!-- END types_option -->
+    	{html_options values=$type_option_values output=$type_option_values|translate selected=$type_option_selected}
    </select>
  </label>

  <label>
-    {lang:User}
+    {'User'|@translate}
    <select name="user">
-      <!-- BEGIN user_option -->
-      <option value="{user_option.VALUE}" {user_option.SELECTED}>
-        {user_option.CONTENT}
-      </option>
-      <!-- END user_option -->
+    	<option value="-1">------------</option>
+    	{html_options options=$user_options selected=$user_options_selected}
    </select>
  </label>

  <label>
-    {lang:Image id}
-    <input name="image_id" value="{IMAGE_ID}" type="text" size="5">
+    {'Image id'|@translate}
+    <input name="image_id" value="{$IMAGE_ID}" type="text" size="5">
  </label>

  <label>
-    {lang:File name}
-    <input name="filename" value="{FILENAME}" type="text">
+    {'File name'|@translate}
+    <input name="filename" value="{$FILENAME}" type="text">
  </label>

-  <input class="submit" type="submit" name="submit" value="{lang:submit}" />
+  <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" />
 </fieldset>
 <fieldset>
-  <legend>{lang:Display}</legend>
+  <legend>{'Display'|@translate}</legend>
  <ul>
    <li>
-      {lang:Thumbnails}
+      {'Thumbnails'|@translate}
      <select name="display_thumbnail">
-        <!-- BEGIN display_thumbnail -->
-        <option {display_thumbnail.SELECTED} value="{display_thumbnail.VALUE}">{display_thumbnail.CONTENT}</option>
-        <!-- END display_thumbnail -->
+      	{html_options values=$display_thumbnail_values output=$display_thumbnail_values|translate selected=$display_thumbnail_selected}
      </select>
    </li>
  </ul>
 </fieldset>
 </form>

-<!-- BEGIN summary -->
+{if isset($search_summary)}
 <fieldset>
-  <legend>{lang:Summary}</legend>
+  <legend>{'Summary'|@translate}</legend>

  <ul>
-    <li>{summary.NB_LINES}</li>
-    <li>{summary.FILESIZE}</li>
+    <li>{$search_summary.NB_LINES}, {$search_summary.FILESIZE}</li>
    <li>
-      {summary.USERS}
+      {$search_summary.USERS}
      <ul>
-        <li>{summary.MEMBERS}</li>
-        <li>{summary.GUESTS}</li>
+        <li>{$search_summary.MEMBERS}</li>
+        <li>{$search_summary.GUESTS}</li>
      </ul>
    </li>
  </ul>
 </fieldset>
-<!-- END summary -->
+{/if}

-<!-- BEGIN navigation -->
-<div class="admin">
-{navigation.NAVBAR}
+
+{if !empty($NAV_BAR)}
+<div class="navigationBar">
+	{$NAV_BAR}
 </div>
-<!-- END navigation -->
+{/if}
+

 <table class="table2" id="detailedStats">
 <tr class="throw">
-    <th>{lang:date}</th>
-    <th>{lang:time}</th>
-    <th>{lang:user}</th>
-    <th>{lang:IP}</th>
-    <th>{lang:image}</th>
-    <th>{lang:Element type}</th>
-    <th>{lang:section}</th>
-    <th>{lang:category}</th>
-    <th>{lang:tags}</th>
+	<th>{'date'|@translate}</th>
+	<th>{'time'|@translate}</th>
+	<th>{'user'|@translate}</th>
+	<th>{'IP'|@translate}</th>
+	<th>{'image'|@translate}</th>
+	<th>{'Element type'|@translate}</th>
+	<th>{'section'|@translate}</th>
+	<th>{'category'|@translate}</th>
+	<th>{'tags'|@translate}</th>
 </tr>
-<!-- BEGIN detail -->
-  <tr class="{detail.T_CLASS}">
-    <td class="hour">{detail.DATE}</td>
-    <td class="hour">{detail.TIME}</td>
-    <td>{detail.USER}</td>
-    <td>{detail.IP}</td>
-    <td>{detail.IMAGE}</td>
-    <td>{detail.TYPE}</td>
-    <td>{detail.SECTION}</td>
-    <td>{detail.CATEGORY}</td>
-    <td>{detail.TAGS}</td>
+{if !empty($search_results) }
+{foreach from=$search_results item=detail name=res_loop}
+<tr class="{if $smarty.foreach.res_loop.index is odd}row1{else}row2{/if}">
+	<td class="hour">{$detail.DATE}</td>
+	<td class="hour">{$detail.TIME}</td>
+	<td>{$detail.USER}</td>
+	<td>{$detail.IP}</td>
+	<td>{$detail.IMAGE}</td>
+	<td>{$detail.TYPE}</td>
+	<td>{$detail.SECTION}</td>
+	<td>{$detail.CATEGORY}</td>
+	<td>{$detail.TAGS}</td>
 </tr>
-<!-- END detail -->
+{/foreach}
+{/if}
 </table>

-<!-- BEGIN navigation -->
-<div class="admin">
-{navigation.NAVBAR}
+
+{if !empty($NAV_BAR)}
+<div class="navigationBar">
+	{$NAV_BAR}
 </div>
-<!-- END navigation -->
+{/if}
--- a/template/yoga/admin/plugins_update.tpl
+++ b/template/yoga/admin/plugins_update.tpl
@ -12,7 +12,7 @@
    <td>{'Name'|@translate}</td>
    <td>{'plugins_actual_version'|@translate}</td>
    <td>{'plugins_new_version'|@translate}</td>
-    <td>{'plugins_action'|@translate}</td>
+    <td>{'Actions'|@translate}</td>
  </tr>
 </thead>
 {foreach from=$plugins_not_uptodate item=plugin name=plugins_loop}
--- a/template/yoga/admin/stats.tpl
+++ b/template/yoga/admin/stats.tpl
@ -1,34 +1,38 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
+
 <div class="titrePage">
  <ul class="categoryActions">
    <li>
      <a
-        href="{U_HELP}"
+        href="{$U_HELP}"
        onclick="popuphelp(this.href); return false;"
-        title="{lang:Help}"
+        title="{'Help'|@translate}"
      >
-        <img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)">
+        <img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)">
      </a>
    </li>
  </ul>
-  <h2>{lang:History} {TABSHEET_TITLE}</h2>
-  {TABSHEET}
+  <h2>{'History'|@translate} {$TABSHEET_TITLE}</h2>
+  {$TABSHEET}
 </div>

-<h3>{L_STAT_TITLE}</h3>
+<h3>{$L_STAT_TITLE}</h3>

 <table class="table2" id="dailyStats">
 	<tr class="throw">
-    <th>{PERIOD_LABEL}</th>
-    <th>{lang:Pages seen}</th>
+		<th>{$PERIOD_LABEL}</th>
+		<th>{'Pages seen'|@translate}</th>
 		<th></th>
 	</tr>
-<!-- BEGIN statrow -->
+
+{if not empty($statrows)}
+{foreach from=$statrows item=row}
 	<tr>
-    <td style="white-space: nowrap">{statrow.VALUE}</td>
-    <td class="number">{statrow.PAGES}</td>
-    <td><div class="statBar" style="width:{statrow.WIDTH}px"></div></td>
+		<td style="white-space: nowrap">{$row.VALUE}</td>
+		<td class="number">{$row.PAGES}</td>
+		<td><div class="statBar" style="width:{$row.WIDTH}px"></div></td>
 	</tr>
-<!-- END statrow -->
+{/foreach}
+{/if}
+
 </table>
--- a/template/yoga/redirect.tpl
+++ b/template/yoga/redirect.tpl
@ -1,3 +1,3 @@
-<!-- DEV TAG: not smarty migrated -->
-<p>{U_REDIRECT_MSG}</p>
-<p><a href="{U_REFRESH}">{lang:click_to_redirect}</a></p>
+{* $Id$ *}
+<p>{$REDIRECT_MSG}</p>
+<p><a href="{$refresh.U_REFRESH}">{'click_to_redirect'|@translate}</a></p>