Changeset 38


Ignore:
Timestamp:
Jul 25, 2003, 11:33:41 PM (21 years ago)
Author:
z0rglub
Message:

Adding support of independant uploadable categories

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/cat_modify.php

    r21 r38  
    2121$tpl = array( 'remote_site','editcat_confirm','editcat_back','editcat_title1',
    2222              'editcat_name','editcat_comment','editcat_status',
    23               'editcat_visible','editcat_status_info', 'submit' );
     23              'editcat_visible','editcat_visible_info', 'submit',
     24              'editcat_uploadable' );
    2425templatize_array( $tpl, 'lang', $sub );
    2526//---------------------------------------------------------------- verification
     
    5455 
    5556  $query = 'UPDATE '.PREFIX_TABLE.'categories';
     57
     58  $query.= ' SET name = ';
    5659  if ( $_POST['name'] == '' )
    57   {
    58     $query.= ' SET name = NULL';
    59   }
     60    $query.= 'NULL';
    6061  else
    61   {
    62     $query.= " SET name = '".htmlentities( $_POST['name'], ENT_QUOTES)."'";
    63   }
     62    $query.= "'".htmlentities( $_POST['name'], ENT_QUOTES)."'";
     63
     64  $query.= ', comment = ';
    6465  if ( $_POST['comment'] == '' )
    65   {
    66     $query.= ', comment = NULL';
    67   }
     66    $query.= 'NULL';
    6867  else
    69   {
    70     $query.= ", comment = '".htmlentities( $_POST['comment'], ENT_QUOTES )."'";
    71   }
     68    $query.= "'".htmlentities( $_POST['comment'], ENT_QUOTES )."'";
     69
    7270  $query.= ", status = '".$_POST['status']."'";
    7371  $query.= ", visible = '".$_POST['visible']."'";
    74   $query.= " WHERE id = '".$_GET['cat']."'";
     72  $query.= ", uploadable = '".$_POST['uploadable']."'";
     73  $query.= ' WHERE id = '.$_GET['cat'];
    7574  $query.= ';';
    7675  mysql_query( $query );
     
    9493$vtp->setVar( $sub, 'form_action', add_session_id( $form_action ) );
    9594
    96 $query = 'SELECT a.id,name,dir,status,comment';
     95$query = 'SELECT a.id,name,dir,status,comment,uploadable';
    9796$query.= ',id_uppercat,site_id,galleries_url,visible';
    9897$query.= ' FROM '.PREFIX_TABLE.'categories as a, '.PREFIX_TABLE.'sites as b';
     
    149148$vtp->setVar( $sub, 'visible_option.checked', $checked );
    150149$vtp->closeSession( $sub, 'visible_option' );
     150// uploadable : true or false
     151if ( $conf['upload_available'] )
     152{
     153  $vtp->addSession( $sub, 'uploadable' );
     154  $vtp->addSession( $sub, 'uploadable_option' );
     155  $vtp->setVar( $sub, 'uploadable_option.value', 'true' );
     156  $vtp->setVar( $sub, 'uploadable_option.option', $lang['yes'] );
     157  $checked = '';
     158  if ( $row['uploadable'] == 'true' )
     159  {
     160    $checked = ' checked="checked"';
     161  }
     162  $vtp->setVar( $sub, 'uploadable_option.checked', $checked );
     163  $vtp->closeSession( $sub, 'uploadable_option' );
     164  $vtp->addSession( $sub, 'uploadable_option' );
     165  $vtp->setVar( $sub, 'uploadable_option.value', 'false' );
     166  $vtp->setVar( $sub, 'uploadable_option.option', $lang['no'] );
     167  $checked = '';
     168  if ( $row['uploadable'] == 'false' )
     169  {
     170    $checked = ' checked="checked"';
     171  }
     172  $vtp->setVar( $sub, 'uploadable_option.checked', $checked );
     173  $vtp->closeSession( $sub, 'uploadable_option' );
     174  $vtp->closeSession( $sub, 'uploadable' );
     175}
    151176//----------------------------------------------------------- sending html code
    152177$vtp->Parse( $handle , 'sub', $sub );
  • trunk/category.php

    r37 r38  
    437437  }
    438438  // upload a picture in the category
    439   if ( $page['cat_site_id'] == 1 and $conf['upload_available'] )
     439  if ( $page['cat_site_id'] == 1
     440       and $conf['upload_available']
     441       and $page['cat_uploadable'] )
    440442  {
    441443    $vtp->addSession( $handle, 'upload' );
  • trunk/include/functions_category.inc.php

    r33 r38  
    283283               
    284284  $query = 'SELECT nb_images,id_uppercat,comment,site_id,galleries_url,dir';
    285   $query.= ',date_last';
     285  $query.= ',date_last,uploadable';
    286286  $query.= ' FROM '.PREFIX_TABLE.'categories AS a';
    287287  $query.= ', '.PREFIX_TABLE.'sites AS b';
     
    295295  $cat['last_dir']    = $row['dir'];
    296296  $cat['date_last']   = $row['date_last'];
     297  $cat['uploadable']  = get_boolean( $row['uploadable'] );
    297298  $galleries_url = $row['galleries_url'];
    298                
     299
    299300  $cat['dir'] = "";
    300301  $i = 0;
     
    380381{
    381382  global $page,$lang,$user,$conf;
    382  
     383
    383384  if ( isset( $page['cat'] ) )
    384385  {
     
    392393    {
    393394      $result = get_cat_info( $page['cat'] );
    394       $page['comment']       = $result['comment'];
    395       $page['cat_dir']       = $result['dir'];
    396       $page['cat_name']      = $result['name'];
    397       $page['cat_nb_images'] = $result['nb_images'];
    398       $page['cat_site_id']   = $result['site_id'];
     395      $page['comment']        = $result['comment'];
     396      $page['cat_dir']        = $result['dir'];
     397      $page['cat_name']       = $result['name'];
     398      $page['cat_nb_images']  = $result['nb_images'];
     399      $page['cat_site_id']    = $result['site_id'];
     400      $page['cat_uploadable'] = $result['uploadable'];
    399401      $page['title'] = get_cat_display_name( $page['cat_name'], ' - ', '' );
    400402      $page['where'] = ' WHERE cat_id = '.$page['cat'];
  • trunk/language/francais.php

    r33 r38  
    486486  $lang['editcat_comment'] = 'Commentaire';
    487487  $lang['editcat_status'] = 'Status';
    488   $lang['editcat_status_info'] = '(invisible sauf pour les administrateurs)';
    489 // start version 1.3
     488// start version 1.3
     489  // $lang['editcat_status_info'] = '(invisible sauf pour les administrateurs)';
     490//  $lang['editcat_status_info'] => $lang['editcat_visible_info']
     491  $lang['editcat_visible_info'] = '(invisible sauf pour les administrateurs)';
    490492  $lang['editcat_visible'] = 'Visible';
     493  $lang['editcat_uploadable'] = 'Ajout d\'images par les visiteurs';
    491494// end version 1.3
    492495  // page info images
  • trunk/template/default/admin/cat_modify.vtp

    r21 r38  
    2121    </tr>
    2222    <tr>
    23       <td style="width:20%;">{#editcat_comment}</td>
     23      <td>{#editcat_comment}</td>
    2424      <td class="row2">
    2525        <textarea name="comment" rows="5" cols="50" style="overflow:auto">{#comment}</textarea>
     
    2727    </tr>
    2828    <tr>
    29       <td style="width:20%;">{#editcat_status}</td>
     29      <td>{#editcat_status}</td>
    3030      <td class="row2">
    3131        <!--VTP_status_option-->
     
    3535    </tr>
    3636    <tr>
    37       <td style="width:20%;">{#editcat_visible}</td>
     37      <td>{#editcat_visible}</td>
    3838      <td class="row2">
    3939        <!--VTP_visible_option-->
    4040        <input type="radio" name="visible" value="{#value}"{#checked} />{#option}
    4141        <!--/VTP_visible_option-->
    42         {#editcat_status_info}
     42        {#editcat_visible_info}
    4343      </td>
    4444    </tr>
     45    <!--VTP_uploadable-->
     46    <tr>
     47      <td>{#editcat_uploadable}</td>
     48      <td class="row2">
     49        <!--VTP_uploadable_option-->
     50        <input type="radio" name="uploadable" value="{#value}"{#checked} />{#option}
     51        <!--/VTP_uploadable_option-->
     52      </td>
     53    </tr>
     54    <!--/VTP_uploadable-->
    4555    <tr>
    4656      <td colspan="2">&nbsp;</td>
  • trunk/template/default/category.vtp

    r25 r38  
    3131              &nbsp;<img src="{#lien_collapsed}" alt="&gt;"/>&nbsp;<a href="{#url}" title="{#title}">{#name}</a><br />
    3232              <!--/VTP_summary-->
     33              <!--VTP_upload-->
     34              <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;"/>&nbsp;<a href="{#url}" class="back">{#upload_picture}</a>
     35              <!--/VTP_upload-->
    3336            </div>
    3437          {#frame_end}
     
    7881                  <div class="infoCat">
    7982                  {#nb_image_category} "{#cat_name}" : {#cat_nb_images}
    80                   <!--VTP_upload-->
    81                   <br /><a href="{#url}" class="back">{#upload_picture}</a>
    82                   <!--/VTP_upload-->
    8383                  </div>
    8484                <!--/VTP_cat_infos-->
  • trunk/upload.php

    r26 r38  
    104104  check_restrictions( $page['cat'] );
    105105  $result = get_cat_info( $page['cat'] );
    106   $page['cat_dir'] = $result['dir'];
    107   $page['cat_site_id'] = $result['site_id'];
    108   $page['cat_name'] = $result['name'];
     106  $page['cat_dir']        = $result['dir'];
     107  $page['cat_site_id']    = $result['site_id'];
     108  $page['cat_name']       = $result['name'];
     109  $page['cat_uploadable'] = $result['uploadable'];
    109110}
    110111else
     
    114115if ( $access_forbidden == true
    115116     or $page['cat_site_id'] != 1
    116      or !$conf['upload_available'] )
     117     or !$conf['upload_available']
     118     or !$page['cat_uploadable'] )
    117119{
    118120  echo '<div style="text-align:center;">'.$lang['upload_forbidden'].'<br />';
Note: See TracChangeset for help on using the changeset viewer.