Changeset 2325

Timestamp:

May 2, 2008, 11:56:21 PM (16 years ago)

Author:

rub

Message:

Resolved issue 0000823: Enhance upload functionalities

First commit, others will be follow.
Not hesitate to change my translations.

Add upload configuration tabsheet (move and add configuration)
Change and add define for access level
Can show upload link every time
Can restrict access upload.class.php
Can choice category on upload page
Add upload class not use for the moment
Review quickly and temporary style of upload.tpl

Location:

trunk

Files:

• admin/configuration.php (modified) (8 diffs)
• admin/include/functions.php (modified) (1 diff)
• identification.php (modified) (1 diff)
• include/constants.php (modified) (1 diff)
• include/functions_category.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (3 diffs)
• include/menubar.inc.php (modified) (2 diffs)
• include/upload.class.php (added)
• install/config.sql (modified) (1 diff)
• install/db/70-database.php (added)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/en_UK/common.lang.php (modified) (2 diffs)
• language/en_UK/help/configuration.html (modified) (2 diffs)
• language/es_ES/admin.lang.php (modified) (1 diff)
• language/es_ES/common.lang.php (modified) (2 diffs)
• language/es_ES/help/configuration.html (modified) (2 diffs)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• language/fr_FR/common.lang.php (modified) (2 diffs)
• language/fr_FR/help/configuration.html (modified) (2 diffs)
• language/nl_NL/admin.lang.php (modified) (1 diff)
• language/nl_NL/common.lang.php (modified) (2 diffs)
• language/nl_NL/help/configuration.html (modified) (2 diffs)
• nbm.php (modified) (1 diff)
• password.php (modified) (1 diff)
• register.php (modified) (1 diff)
• search_rules.php (modified) (1 diff)
• template/yoga/admin/configuration.tpl (modified) (2 diffs)
• template/yoga/admin/default-layout.css (modified) (4 diffs)
• template/yoga/admin/picture_modify.tpl (modified) (1 diff)
• template/yoga/menubar.tpl (modified) (5 diffs)
• template/yoga/upload.tpl (modified) (1 diff)
• upload.php (modified) (6 diffs)
• ws.php (modified) (1 diff)

trunk/admin/configuration.php

@@ -52 +52 @@
     'rate_anonymous',
     'email_admin_on_new_user',
-    'email_admin_on_picture_uploaded',
    );
 
@@ -59 +58 @@
     'history_admin',
     'history_guest'
+   );
+
+$upload_checkboxes = array(
+    'upload_link_everytime',
+    'email_admin_on_picture_uploaded',
    );
 
@@ -106 +110 @@
       }
       foreach( $comments_checkboxes as $checkbox)
+      {
+        $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
+      }
+      break;
+    }
+    case 'upload' :
+    {
+      foreach( $upload_checkboxes as $checkbox)
       {
         $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
@@ -161 +173 @@
 $tabsheet->add('history', l10n('conf_history_title'), $conf_link.'history');
 $tabsheet->add('comments', l10n('conf_comments_title'), $conf_link.'comments');
+$tabsheet->add('upload', l10n('conf_upload_title'), $conf_link.'upload');
 $tabsheet->add('default', l10n('conf_display'), $conf_link.'default');
 // TabSheet selection
@@ -188 +201 @@
         ));
 
-    foreach( $main_checkboxes as $checkbox)
+    foreach ($main_checkboxes as $checkbox)
     {
       $template->append(
@@ -203 +216 @@
   {
     //Necessary for merge_block_vars
-    foreach( $history_checkboxes as $checkbox)
+    foreach ($history_checkboxes as $checkbox)
     {
       $template->append(
@@ -223 +236 @@
         ));
 
-    foreach( $comments_checkboxes as $checkbox)
+    foreach ($comments_checkboxes as $checkbox)
     {
       $template->append(
@@ -235 +248 @@
     break;
   }
+  case 'upload' :
+  {
+    $template->assign(
+      'upload',
+      array(
+        'upload_user_access_options'=> get_user_access_level_html_options(ACCESS_GUEST),
+        'upload_user_access_options_selected' => array($conf['upload_user_access'])
+        )
+      );
+    //Necessary for merge_block_vars
+    foreach ($upload_checkboxes as $checkbox)
+    {
+      $template->append(
+          'upload',
+          array(
+            $checkbox => $conf[$checkbox]
+            ),
+          true
+        );
+    }
+    break;
+  }
   case 'default' :
   {

trunk/admin/include/functions.php

@@ -1838 +1838 @@
   return $query;
 }
+
+/**
+ * Returns array use on template with html_options method
+ * @param Min and Max access to use
+ * @return array of user access level
+ */
+function get_user_access_level_html_options($MinLevelAccess = ACCESS_FREE, $MaxLevelAccess = ACCESS_CLOSED)
+{
+  $tpl_options = array();
+  for ($level = $MinLevelAccess; $level <= $MaxLevelAccess; $level++)
+  {
+    $tpl_options[$level] = l10n(sprintf('ACCESS_%d', $level));
+  }
+  return $tpl_options;
+}
+
 ?>

trunk/identification.php

@@ -29 +29 @@
 // | Check Access and exit when user status is not ok                      |
 // +-----------------------------------------------------------------------+
-check_status(ACCESS_NONE);
+check_status(ACCESS_FREE);
 
 //-------------------------------------------------------------- identification

trunk/include/constants.php

@@ -37 +37 @@
 
 // Access codes
-define('ACCESS_NONE', 0);
+define('ACCESS_FREE', 0);
 define('ACCESS_GUEST', 1);
 define('ACCESS_CLASSIC', 2);
 define('ACCESS_ADMINISTRATOR', 3);
 define('ACCESS_WEBMASTER', 4);
+define('ACCESS_CLOSED', 5);
 
 // Table names

trunk/include/functions_category.inc.php

@@ -453 +453 @@
 }
 
+/**
+ * returns the link of upload menu
+ *
+ * @param null
+ * @return string or null
+ */
+function get_upload_menu_link()
+{
+  global $conf, $page, $user;
+
+  $show_link = false;
+  $arg_link = null;
+
+  if (is_autorize_status($conf['upload_user_access']))
+  {
+    if (isset($page['category']) and $page['category']['uploadable'] )
+    {
+      // upload a picture in the category
+      $show_link = true;
+      $arg_link = 'cat='.$page['category']['id'];
+    }
+    else
+    if ($conf['upload_link_everytime'])
+    {
+      // upload a picture in the category
+      $query = '
+SELECT
+  1
+FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
+  ON id = cat_id and user_id = '.$user['id'].'
+WHERE
+  uploadable = \'true\'
+  '.get_sql_condition_FandF
+    (
+      array
+        (
+          'visible_categories' => 'id',
+        ),
+      'AND'
+    ).'
+LIMIT 1';
+
+      $show_link = mysql_num_rows(pwg_query($query)) <> 0;
+    }
+  }
+  if ($show_link)
+  {
+    return get_root_url().'upload.php'.(empty($arg_link) ? '' : '?'.$arg_link);
+  }
+  else
+  {
+    return;
+  }
+}
+
 ?>

trunk/include/functions_user.inc.php

@@ -1089 +1089 @@
 
 /*
- * Return access_type definition of uuser
+ * Return access_type definition of user
  * Test does with user status
  * @return bool
@@ -1102 +1102 @@
     {
       $access_type_status =
-        ($conf['guest_access'] ? ACCESS_GUEST : ACCESS_NONE);
+        ($conf['guest_access'] ? ACCESS_GUEST : ACCESS_FREE);
       break;
     }
@@ -1127 +1127 @@
     default:
     {
-      $access_type_status = ACCESS_NONE;
+      $access_type_status = ACCESS_FREE;
       break;
     }

trunk/include/menubar.inc.php

@@ -40 +40 @@
     'U_CATEGORIES' => make_index_url(array('section' => 'categories')),
     'U_LOST_PASSWORD' => get_root_url().'password.php',
+    'U_UPLOAD' => get_upload_menu_link()
     )
   );
@@ -305 +306 @@
   );
 
-if (isset($page['category']) and $page['category']['uploadable'] )
-{ // upload a picture in the category
-  $url = get_root_url().'upload.php?cat='.$page['category']['id'];
-  $template->assign('U_UPLOAD', $url);
-}
-
 trigger_action('loc_end_menubar');
 $template->assign_var_from_handle('MENUBAR', 'menubar');
+
 ?>

trunk/install/config.sql

@@ -26 +26 @@
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('obligatory_user_mail_address','false','Mail address is obligatory for users');
 INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('c13y_ignore',null,'List of ignored anomalies');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('upload_link_everytime','false','Show upload link every time');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('upload_user_access',2 /*ACCESS_CLASSIC*/,'User access level to upload');

trunk/language/en_UK/admin.lang.php

@@ -635 +635 @@
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Purge compiled templates'] = 'Purge compiled templates';
-/* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
+$lang['Caddie is currently empty'] = 'Caddie is currently empty';
+$lang['conf_upload_title'] = 'Upload';
+$lang['Show upload link every time'] = 'Show upload link every time';
+$lang['User access level to upload'] = 'User access level to upload';
+$lang['ACCESS_0'] = 'Free access';
+$lang['ACCESS_1'] = 'Access to all';
+$lang['ACCESS_2'] = 'Access to subscribed';
+$lang['ACCESS_3'] = 'Access to administrators';
+$lang['ACCESS_4'] = 'Access to webmasters';
+$lang['ACCESS_5'] = 'No access';
+
 ?>

trunk/language/en_UK/common.lang.php

@@ -307 +307 @@
 $lang['update_rate'] = 'Update your rating';
 $lang['update_wrong_dirname'] = 'wrong filename';
-$lang['upload_advise'] = 'Choose an image to place in the category : ';
 $lang['upload_advise_filesize'] = 'the filesize of the picture must not exceed : ';
 $lang['upload_advise_filetype'] = 'the picture must be to the fileformat jpg, gif or png';
@@ -365 +364 @@
 $lang['See elements linked to this tag only'] = 'See images linked to this tag only';
 $lang['elements posted during the last %d days'] = 'images posted during the last %d days';
+$lang['Choose an image'] = 'Choose an image';
+
 ?>

trunk/language/en_UK/help/configuration.html

@@ -34 +34 @@
 
   <li><strong>Email admins when a new user registers</strong>: Administrators will be received mail for each registration.</li>
-
-  <li><strong>Email adminis when a picture is uploaded</strong>: Administrators will be received mail for each picture uploaded by a user.</li>
 
 </ul>
@@ -77 +75 @@
 User comments validation takes place in the screen <span class="pwgScreen">Administration, Pictures, Comments</span>.</li>
 
+</ul>
+
+<!--TODO --><h3>Upload</h3>
+<ul>
+<!--TODO -->  <li><strong>Show upload link every time</strong>: If exists uploadeable categories, add link will be show for each categoy.</li>
+<!--TODO -->  <li><strong>User access level to upload</strong>: Allows to restrict upload by users</li>
+  <li><strong>Email adminis when a picture is uploaded</strong>: Administrators will be received mail for each picture uploaded by a user.</li>
 </ul>
 

trunk/language/es_ES/admin.lang.php

@@ -640 +640 @@
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
 $lang['Purge compiled templates'] = 'Purgar el templates compilado';
-$lang['Caddie is currently empty'] = 'Caddie is currently empty';
+/* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
+/* TODO */ $lang['conf_upload_title'] = 'Upload';
+/* TODO */ $lang['Show upload link every time'] = 'Show upload link every time';
+/* TODO */ $lang['User access level to upload'] = 'User access level to upload';
+/* TODO */ $lang['ACCESS_0'] = 'Free access';
+/* TODO */ $lang['ACCESS_1'] = 'Access to all';
+/* TODO */ $lang['ACCESS_2'] = 'Access to subscribed';
+/* TODO */ $lang['ACCESS_3'] = 'Access to administrators';
+/* TODO */ $lang['ACCESS_4'] = 'Access to webmasters';
+/* TODO */ $lang['ACCESS_5'] = 'No access';
+
 ?>

trunk/language/es_ES/common.lang.php

@@ -307 +307 @@
 $lang['update_rate'] = 'Actualizar nota';
 $lang['update_wrong_dirname'] = 'Mal nombre de repertorio';
-$lang['upload_advise'] = 'Elegir una imagen para agregar en esta categoría : ';
 $lang['upload_advise_filesize'] = 'El peso de la imagen debe sobrepasar : ';
 $lang['upload_advise_filetype'] = 'El tamaño de la imagen debe ser jpg, png ou gif';
@@ -365 +364 @@
 $lang['See elements linked to this tag only'] = 'Ver las imágenes relacionadas únicamente a este tag';
 $lang['elements posted during the last %d days'] = 'esta imagen tiene menos de %d dias';
+$lang['Choose an image'] = 'Elegir una imagen';
+
 ?>

trunk/language/es_ES/help/configuration.html

@@ -24 +24 @@
 
   <li><strong>Permitir el registro de los utilizadores</strong>: La inscripción es libre para ellos todos.</li>
-
-  <li><strong>Notificar a los administradores cuando una imagen es cargada</strong>: Los administradores recibirán un courriel a cada imagen puesto en disposición por un utilizador.</li>
 
 </ul>
@@ -63 +61 @@
 </ul>
 
+<!--TODO --><h3>Upload</h3>
+<ul>
+<!--TODO -->  <li><strong>Show upload link every time</strong>: If exists uploadeable categories, add link will be show for each categoy.</li>
+<!--TODO -->  <li><strong>User access level to upload</strong>: Allows to restrict upload by users</li>
+  <li><strong>Notificar a los administradores cuando una imagen es cargada</strong>: Los administradores recibirán un courriel a cada imagen puesto en disposición por un utilizador.</li>
+</ul>
+
 <h3>Fijación por defecto</h3>
 <p>Modificar las opciones de fijación por defecto: para los visitadores no conectados. Una vez conectado, estas opciones son sobrecargadas por las del utilizador, a las que puede modificar en la pantalla <span

trunk/language/fr_FR/admin.lang.php

@@ -636 +636 @@
 $lang['Purge compiled templates'] = 'Purger les templates compilés';
 $lang['Caddie is currently empty'] = 'Le panier est actuellement vide.';
+$lang['conf_upload_title'] = 'Téléchargement';
+$lang['Show upload link every time'] = 'Afficher le lien d\'ajout d\'image tout le temps';
+$lang['User access level to upload'] = 'Niveau d\'accès utilisateur pour télécharger';
+$lang['ACCESS_0'] = 'Accès libre';
+$lang['ACCESS_1'] = 'Accès à tous';
+$lang['ACCESS_2'] = 'Accès aux inscrits';
+$lang['ACCESS_3'] = 'Accès aux administrateurs';
+$lang['ACCESS_4'] = 'Accès aux webmestres';
+$lang['ACCESS_5'] = 'Pas d\'accès';
+
 ?>

trunk/language/fr_FR/common.lang.php

@@ -307 +307 @@
 $lang['update_rate'] = 'Mettre à jour votre note';
 $lang['update_wrong_dirname'] = 'mauvais nom de répertoire';
-$lang['upload_advise'] = 'Choisir une image à ajouter dans cette catégorie : ';
 $lang['upload_advise_filesize'] = 'le poids de l\'image ne doit dépasser : ';
 $lang['upload_advise_filetype'] = 'le format de l\'image doit être jpg, png ou gif';
@@ -365 +364 @@
 $lang['See elements linked to this tag only'] = 'Voir les images liées uniquement à ce tag';
 $lang['elements posted during the last %d days'] = 'images ajoutées au cours de %d derniers jours';
+$lang['Choose an image'] = 'Choisir une image à ajouter';
+
 ?>

trunk/language/fr_FR/help/configuration.html

@@ -34 +34 @@
 
   <li><strong>Notifier les administrateurs lors de l'inscription d'un utilisateur</strong>: Les administrateurs recevront un courriel à chaque inscription.</li>
-
-  <li><strong>Notifier les administrateurs quand une image est téléchargée</strong>: Les administrateurs recevront un courriel à chaque image mis à disposition par un utilisateur.</li>
 
 </ul>
@@ -77 +75 @@
 La validation des commentaires utilisateurs a lieu dans l'écran <span class="pwgScreen">Administration, Images, Commentaires</span>.</li>
 
+</ul>
+
+<h3>Téléchargement</h3>
+<ul>
+  <li><strong>Afficher le lien d'ajout d'image tout le temps</strong>: S'il existe des catégories permettant le téléchargement, le lien d'ajout d'image sera affiché quelque soit la catégorie.</li>
+  <li><strong>Niveau d'accès utilisateur pour télécharger</strong>: Permet de restreindre l'ajout à certains utilisateurs</li>
+  <li><strong>Notifier les administrateurs quand une image est téléchargée</strong>: Les administrateurs recevront un courriel à chaque image mis à disposition par un utilisateur.</li>
 </ul>
 

trunk/language/nl_NL/admin.lang.php

@@ -644 +644 @@
 /* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates';
 /* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
+/* TODO */ $lang['conf_upload_title'] = 'Upload';
+/* TODO */ $lang['Show upload link every time'] = 'Show upload link every time';
+/* TODO */ $lang['User access level to upload'] = 'User access level to upload';
+/* TODO */ $lang['ACCESS_0'] = 'Free access';
+/* TODO */ $lang['ACCESS_1'] = 'Access to all';
+/* TODO */ $lang['ACCESS_2'] = 'Access to subscribed';
+/* TODO */ $lang['ACCESS_3'] = 'Access to administrators';
+/* TODO */ $lang['ACCESS_4'] = 'Access to webmasters';
+/* TODO */ $lang['ACCESS_5'] = 'No access';
+
 ?>

trunk/language/nl_NL/common.lang.php

@@ -307 +307 @@
 $lang['update_rate'] = 'Werk je beoordeling bij';
 $lang['update_wrong_dirname'] = 'verkeerde bestandsnaam';
-$lang['upload_advise'] = 'Kies een afbeelding om in een categorie te plaatsen : ';
 $lang['upload_advise_filesize'] = 'het bestandsformaat mag niet te groot zijn : ';
 $lang['upload_advise_filetype'] = 'de afbeelding moet een extensie hebbben die eindigt op jpg, gif of png';
@@ -365 +364 @@
 $lang['See elements linked to this tag only'] = 'Toon afbeelding gelinkt met deze tag';
 $lang['elements posted during the last %d days'] = 'afbeelding binnen de %d dagen';
+$lang['Choose an image'] = 'Kies een afbeelding om';
+
 ?>

trunk/language/nl_NL/help/configuration.html

@@ -27 +27 @@
 
   <li><strong>Email admins wanneer een nieuwe gebruiker zich registreerd</strong>: Administrators ontvangen een mailtje bij elke registratie.</li>
-
-  <li><strong>Email admins wanneer een afbeelding is ge-upload</strong>: Administrators ontvangen een mailtje voor elke ge-uploade bestand door gebruikers.</li>
 
 </ul>
@@ -65 +63 @@
 </ul>
 
+<!--TODO --><h3>Upload</h3>
+<ul>
+<!--TODO -->  <li><strong>Show upload link every time</strong>: If exists uploadeable categories, add link will be show for each categoy.</li>
+<!--TODO -->  <li><strong>User access level to upload</strong>: Allows to restrict upload by users</li>
+  <li><strong>Email admins wanneer een afbeelding is ge-upload</strong>: Administrators ontvangen een mailtje voor elke ge-uploade bestand door gebruikers.</li>
+</ul>
+
 <h3>Standaard weergave</h3>
 

trunk/nbm.php

@@ -26 +26 @@
 define('PHPWG_ROOT_PATH','./');
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
-check_status(ACCESS_NONE);
+check_status(ACCESS_FREE);
 include_once(PHPWG_ROOT_PATH.'include/functions_notification.inc.php');
 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');

trunk/password.php

@@ -33 +33 @@
 // | Check Access and exit when user status is not ok                      |
 // +-----------------------------------------------------------------------+
-check_status(ACCESS_NONE);
+check_status(ACCESS_FREE);
 
 // +-----------------------------------------------------------------------+

trunk/register.php

@@ -29 +29 @@
 // | Check Access and exit when user status is not ok                      |
 // +-----------------------------------------------------------------------+
-check_status(ACCESS_NONE);
+check_status(ACCESS_FREE);
 
 //----------------------------------------------------------- user registration

trunk/search_rules.php

@@ -40 +40 @@
 define('PHPWG_ROOT_PATH','./');
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
-check_status(ACCESS_NONE);
+check_status(ACCESS_FREE);
 include_once( PHPWG_ROOT_PATH.'include/functions_search.inc.php' );
 

trunk/template/yoga/admin/configuration.tpl

@@ -80 +80 @@
       </label>
     </li>
-
-    <li>
-      <label>
-        <span class="property">{'Email administrators when a picture is uploaded'|@translate}</span>
-        <input type="checkbox" name="email_admin_on_picture_uploaded" {if ($main.email_admin_on_picture_uploaded)}checked="checked"{/if} />
-      </label>
-    </li>
   </ul>
 </fieldset>
@@ -153 +146 @@
 {/if}
 
+{if isset($upload)}
+<fieldset id="uploadConf">
+  <ul>
+    <li>
+      <label><span class="property">{'Show upload link every time'|@translate}</span>
+      <input type="checkbox" name="upload_link_everytime" {if ($upload.upload_link_everytime)}checked="checked"{/if} /></label>
+    </li>
+    <li>
+      <label><span class="property">{'User access level to upload'|@translate}</span>
+      {html_options name="upload_user_access" options=$upload.upload_user_access_options selected=$upload.upload_user_access_options_selected}
+    </li>
+    <li>
+      <label>
+        <span class="property">{'Email administrators when a picture is uploaded'|@translate}</span>
+        <input type="checkbox" name="email_admin_on_picture_uploaded" {if ($upload.email_admin_on_picture_uploaded)}checked="checked"{/if} />
+      </label>
+    </li>
+  </ul>
+</fieldset>
+{/if}
+
 {if isset($default)}
 {$PROFILE_CONTENT}

trunk/template/yoga/admin/default-layout.css

@@ -100 +100 @@
 FIELDSET#mainConfCheck SPAN.property,
 FIELDSET#historyConf SPAN.property,
-FIELDSET#commentsConf SPAN.property {
+FIELDSET#commentsConf SPAN.property,
+FIELDSET#uploadConf SPAN.property {
   float: right;
   text-align: left;
@@ -106 +107 @@
 FIELDSET#mainConfCheck INPUT,
 FIELDSET#historyConf INPUT,
-FIELDSET#commentsConf INPUT {
+FIELDSET#commentsConf INPUT,
+FIELDSET#uploadConf INPUT {
   float: none;
 }
@@ -122 +124 @@
 }
 FIELDSET#mainConfCheck INPUT,
-FIELDSET#historyConf INPUT {
+FIELDSET#historyConf INPUT,
+FIELDSET#commentsConf INPUT,
+FIELDSET#uploadConf SELECT,
+FIELDSET#uploadConf INPUT {
   margin-left: 5%;
 }
@@ -129 +134 @@
   width: 85%;
 }
-FIELDSET#commentsConf INPUT {
-  margin-left: 5%;
+
+FIELDSET#uploadConf SPAN.property {
+  width: 75%;
 }
 

trunk/template/yoga/admin/picture_modify.tpl

@@ -116 +116 @@
       </tr>
 
-        <tr>
-                <td><strong>{'Minimum privacy level'|@translate}</strong></td>
-                <td>
-                        <select name="level" size="1">
-                        {html_options options=$level_options selected=$level_options_selected}
-                        </select>
-          </td>
-        </tr>
+  <tr>
+    <td><strong>{'Minimum privacy level'|@translate}</strong></td>
+    <td>
+      <select name="level" size="1">
+        {html_options options=$level_options selected=$level_options_selected}
+      </select>
+    </td>
+  </tr>
 
     </table>

trunk/template/yoga/menubar.tpl

@@ -4 +4 @@
 {if not empty($links)}
 <dl id="mbLinks">
-        <dt>{'Links'|@translate}</dt>
-        <dd>
-        <ul>
-                {foreach from=$links item=link}
-                <li>
-                <a href="{$link.URL}"
-                        {if isset($link.new_window) }onclick="window.open(this.href, '{$link.new_window.NAME|@escape:'javascript'}','{$link.new_window.FEATURES|@escape:'javascript'}'); return false;"{/if}
-                >
-                        {$link.LABEL}
-                </a>
-                </li>
-                {/foreach}{*links*}
-        </ul>
-        </dd>
+  <dt>{'Links'|@translate}</dt>
+  <dd>
+  <ul>
+    {foreach from=$links item=link}
+    <li>
+    <a href="{$link.URL}"
+      {if isset($link.new_window) }onclick="window.open(this.href, '{$link.new_window.NAME|@escape:'javascript'}','{$link.new_window.FEATURES|@escape:'javascript'}'); return false;"{/if}
+    >
+      {$link.LABEL}
+    </a>
+    </li>
+    {/foreach}{*links*}
+  </ul>
+  </dd>
 </dl>
 {/if}{*links*}
@@ -29 +29 @@
 
 <dl id="mbCategories">
-        <dt><a href="{$U_CATEGORIES}">{'Categories'|@translate}</a></dt>
-        <dd>
-                {$MENU_CATEGORIES_CONTENT}
+  <dt><a href="{$U_CATEGORIES}">{'Categories'|@translate}</a></dt>
+  <dd>
+    {$MENU_CATEGORIES_CONTENT}
   {if isset($U_UPLOAD)}
   <ul><li>
@@ -37 +37 @@
   </li></ul>
   {/if}
-                <p class="totalImages">{$pwg->l10n_dec('%d element', '%d elements', $NB_PICTURE)}</p>
+    <p class="totalImages">{$pwg->l10n_dec('%d element', '%d elements', $NB_PICTURE)}</p>
   </dd>
 </dl>
@@ -44 +44 @@
 {if not empty($related_tags)}
 <dl id="mbTags">
-        <dt>{'Related tags'|@translate}</dt>
-        <dd>
-                <ul id="menuTagCloud">
-                {foreach from=$related_tags item=tag}
-                <li>
-                {if !empty($tag.add) }
-                        <a href="{$tag.add.URL}" 
-                                title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.add.COUNTER)}"
-                                rel="nofollow">
-                                <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
-                        </a>
-                {/if}
-                <a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See elements linked to this tag only'|@translate}">{$tag.NAME}</a>
-                </li>
-                {/foreach}
-                </ul>
-        </dd>
+  <dt>{'Related tags'|@translate}</dt>
+  <dd>
+    <ul id="menuTagCloud">
+    {foreach from=$related_tags item=tag}
+    <li>
+    {if !empty($tag.add) }
+      <a href="{$tag.add.URL}" 
+        title="{$pwg->l10n_dec('%d element are also linked to current tags', '%d elements are also linked to current tags', $tag.add.COUNTER)}"
+        rel="nofollow">
+        <img src="{$ROOT_URL}{$themeconf.icon_dir}/add_tag.png" alt="+" />
+      </a>
+    {/if}
+    <a href="{$tag.U_TAG}" class="{$tag.CLASS}" title="{'See elements linked to this tag only'|@translate}">{$tag.NAME}</a>
+    </li>
+    {/foreach}
+    </ul>
+  </dd>
 </dl>
 {/if}
@@ -66 +66 @@
 
 <dl id="mbSpecial">
-        <dt>{'special_categories'|@translate}</dt>
-        <dd>
-                <ul>
-                        {foreach from=$special_categories item=cat}
-                        <li><a href="{$cat.URL}" title="{$cat.TITLE}" {if isset($cat.REL)}{$cat.REL}{/if}>{$cat.NAME}</a></li>
-                        {/foreach}
-                </ul>
-        </dd>
+  <dt>{'special_categories'|@translate}</dt>
+  <dd>
+    <ul>
+      {foreach from=$special_categories item=cat}
+      <li><a href="{$cat.URL}" title="{$cat.TITLE}" {if isset($cat.REL)}{$cat.REL}{/if}>{$cat.NAME}</a></li>
+      {/foreach}
+    </ul>
+  </dd>
 </dl>
 
 
 <dl id="mbMenu">
-        <dt>{'title_menu'|@translate}</dt>
-        <dd>
-                <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch">
-                        <p>
-                                <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" />
-                        </p>
-                </form>
-                <script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+  <dt>{'title_menu'|@translate}</dt>
+  <dd>
+    <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch">
+      <p>
+        <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" />
+      </p>
+    </form>
+    <script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
 
-                <ul>
-                {foreach from=$summaries item=sum}
-                        <li><a href="{$sum.U_SUMMARY}" title="{$sum.TITLE}" {if isset($sum.REL)}{$sum.REL}{/if}>{$sum.NAME}</a></li>
-                {/foreach}
-                </ul>
-        </dd>
+    <ul>
+    {foreach from=$summaries item=sum}
+      <li><a href="{$sum.U_SUMMARY}" title="{$sum.TITLE}" {if isset($sum.REL)}{$sum.REL}{/if}>{$sum.NAME}</a></li>
+    {/foreach}
+    </ul>
+  </dd>
 </dl>
 
 
 <dl id="mbIdentification">
-        <dt>{'identification'|@translate}</dt>
-        <dd>
+  <dt>{'identification'|@translate}</dt>
+  <dd>
     {if isset($USERNAME)}
     <p>{'hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
     {/if}
     
-        <ul>
-                {if isset($U_REGISTER)}
-                <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
-                {/if}
+  <ul>
+    {if isset($U_REGISTER)}
+    <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
+    {/if}
 
-                {if isset($U_IDENTIFY)}
-                <li><a href="{$U_IDENTIFY}" rel="nofollow">{'Connection'|@translate}</a></li>
-                {/if}
+    {if isset($U_IDENTIFY)}
+    <li><a href="{$U_IDENTIFY}" rel="nofollow">{'Connection'|@translate}</a></li>
+    {/if}
 
-                {if isset($U_LOGOUT)}
-                <li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
-                {/if}
+    {if isset($U_LOGOUT)}
+    <li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
+    {/if}
 
-                {if isset($U_PROFILE)}
-                <li><a href="{$U_PROFILE}" title="{'hint_customize'|@translate}">{'customize'|@translate}</a></li>
-                {/if}
+    {if isset($U_PROFILE)}
+    <li><a href="{$U_PROFILE}" title="{'hint_customize'|@translate}">{'customize'|@translate}</a></li>
+    {/if}
 
-                {if isset($U_ADMIN)}
-                <li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
-                {/if}
-        </ul>
-        
-        {if isset($U_IDENTIFY)}
-        <form method="post" action="{$U_IDENTIFY}" class="filter" id="quickconnect">
-        <fieldset>
-                <legend>{'Quick connect'|@translate}</legend>
+    {if isset($U_ADMIN)}
+    <li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
+    {/if}
+  </ul>
+  
+  {if isset($U_IDENTIFY)}
+  <form method="post" action="{$U_IDENTIFY}" class="filter" id="quickconnect">
+  <fieldset>
+    <legend>{'Quick connect'|@translate}</legend>
 
-                <label>
-                  {'Username'|@translate}
-                  <input type="text" name="username" size="15" value="">
-                </label>
+    <label>
+      {'Username'|@translate}
+      <input type="text" name="username" size="15" value="">
+    </label>
 
-                <label>
-                  {'Password'|@translate}
-                  <input type="password" name="password" size="15">
-                </label>
+    <label>
+      {'Password'|@translate}
+      <input type="password" name="password" size="15">
+    </label>
 
-                {if $AUTHORIZE_REMEMBERING}
-                <label>
-                  {'remember_me'|@translate}
-                  <input type="checkbox" name="remember_me" value="1">
-                </label>
-                {/if}
-                <p>
-                 <input class="submit" type="submit" name="login" value="{'Submit'|@translate}">
-                </p>
-                
-                <ul class="actions">
-                  <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
-                  {if isset($U_REGISTER)}
-                  <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li>
-                  {/if}
-                </ul>
+    {if $AUTHORIZE_REMEMBERING}
+    <label>
+      {'remember_me'|@translate}
+      <input type="checkbox" name="remember_me" value="1">
+    </label>
+    {/if}
+    <p>
+     <input class="submit" type="submit" name="login" value="{'Submit'|@translate}">
+    </p>
+    
+    <ul class="actions">
+      <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
+      {if isset($U_REGISTER)}
+      <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li>
+      {/if}
+    </ul>
 
-        </fieldset>
-        </form>
+  </fieldset>
+  </form>
     {/if}
 

trunk/template/yoga/upload.tpl

@@ -36 +36 @@
     </tr>
     <tr>
-      <td colspan="2" align="center" style="padding:10px;">
+      <td colspan="2" align="center">
       <input name="picture" type="file" value="" />
       </td>
     </tr>
     {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
-    <!-- username  -->
+    <!-- category -->
     <tr>
-      <td class="menu">{'Username'|@translate} <span style="color:red;">*</span></td>
-      <td align="left" style="padding:10px;">
+      <td>{'Category'|@translate}</td>
+      <td>
+        {html_options name="category" options=$categories selected=$categories_selected}
+      </td>
+    </tr>
+    <!-- username -->
+    <tr>
+      <td>{'Username'|@translate} <span style="color:red;">*</span></td>
+      <td>
       <input name="username" type="text" value="{$NAME}" />
       </td>
     </tr>
-    <!-- mail address  -->
+    <!-- mail address -->
     <tr>
-      <td class="menu">{'mail_address'|@translate} <span style="color:red;">*</span></td>
-      <td align="left" style="padding:10px;">
+      <td>{'mail_address'|@translate} <span style="color:red;">*</span></td>
+      <td>
       <input name="mail_address" type="text" value="{$EMAIL}" />
       </td>
     </tr>
-    <!-- name of the picture  -->
+    <!-- name of the picture -->
     <tr>
-      <td class="menu">{'upload_name'|@translate}</td>
-      <td align="left" style="padding:10px;">
+      <td>{'upload_name'|@translate}</td>
+      <td>
       <input name="name" type="text" value="{$NAME_IMG}" />
       </td>
     </tr>
-    <!-- author  -->
+    <!-- author -->
     <tr>
-      <td class="menu">{'upload_author'|@translate}</td>
-      <td align="left" style="padding:10px;">
+      <td>{'upload_author'|@translate}</td>
+      <td>
       <input name="author" type="text" value="{$AUTHOR_IMG}" />
       </td>
     </tr>
-    <!-- date of creation  -->
+    <!-- date of creation -->
     <tr>
-      <td class="menu">{'Creation date'|@translate} (DD/MM/YYYY)</td>
-      <td align="left" style="padding:10px;">
+      <td>{'Creation date'|@translate} (DD/MM/YYYY)</td>
+      <td>
       <input name="date_creation" type="text" value="{$DATE_IMG}" />
       </td>
     </tr>
-    <!-- comment  -->
+    <!-- comment -->
     <tr>
-      <td class="menu">{'comment'|@translate}</td>
-      <td align="left" style="padding:10px;">
+      <td>{'comment'|@translate}</td>
+      <td>
        <textarea name="comment" rows="3" cols="40" style="overflow:auto">{$COMMENT_IMG}</textarea>
       </td>

trunk/upload.php

@@ -21 +21 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
+
 define('PHPWG_ROOT_PATH','./');
-include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
-
-check_status(ACCESS_GUEST);
-
-$username = !empty($_POST['username'])?$_POST['username']:$user['username'];
-$mail_address = !empty($_POST['mail_address'])?$_POST['mail_address']:@$user['mail_address'];
-$name = !empty($_POST['name'])?$_POST['name']:'';
-$author = !empty($_POST['author'])?$_POST['author']:'';
-$date_creation = !empty($_POST['date_creation'])?$_POST['date_creation']:'';
-$comment = !empty($_POST['comment'])?$_POST['comment']:'';
+
+// +-----------------------------------------------------------------------+
+// | Includes                                                              |
+// +-----------------------------------------------------------------------+
+include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+include_once(PHPWG_ROOT_PATH.'include/upload.class.php');
+
+// +-----------------------------------------------------------------------+
+// | Check Access and exit when user status is not ok                      |
+// +-----------------------------------------------------------------------+
+check_status($conf['upload_user_access']);
+
+// +-----------------------------------------------------------------------+
+// | Create upload object                                                  |
+// +-----------------------------------------------------------------------+
+$upload = new Upload();
+
+
+$username = !empty($_POST['username']) ? $_POST['username']:(is_classic_user() ? $user['username'] : '');
+$mail_address = !empty($_POST['mail_address']) ? $_POST['mail_address'] : (is_classic_user() ? $user['email'] : '');
+$name = !empty($_POST['name']) ? $_POST['name'] : '';
+$author = !empty($_POST['author']) ? $_POST['author'] : (is_classic_user() ? $user['username'] : '');
+$date_creation = !empty($_POST['date_creation']) ? $_POST['date_creation'] : '';
+$comment = !empty($_POST['comment']) ? $_POST['comment'] : '';
 
 //------------------------------------------------------------------- functions
@@ -122 +137 @@
 
 //-------------------------------------------------- access authorization check
+if (isset($_POST['category']) and is_numeric($_POST['category']))
+{
+  $page['category'] = $_POST['category'];
+}
+else
 if (isset($_GET['cat']) and is_numeric($_GET['cat']))
 {
   $page['category'] = $_GET['cat'];
 }
-
-if (isset($page['category']))
-{
-  check_restrictions( $page['category'] );
-  $category = get_cat_info( $page['category'] );
-  $category['cat_dir'] = get_complete_dir( $page['category'] );
+else
+{
+  $page['category'] = null;
+}
+
+if (! empty($page['category']))
+{
+  check_restrictions($page['category']);
+  $category = get_cat_info($page['category']);
+  $category['cat_dir'] = get_complete_dir($page['category']);
 
   if (url_is_remote($category['cat_dir']) or !$category['uploadable'])
@@ -138 +162 @@
   }
 }
-else { // $page['category'] may be set by a futur plugin but without it
-  bad_request('invalid parameters');
+else
+{
+  if (isset($_POST['submit']))
+  {
+    // $page['category'] may be set by a futur plugin but without it
+    bad_request('invalid parameters');
+  }
+  else
+  {
+    $category = null;
+  }
 }
 
@@ -148 +181 @@
   $page['waiting_id'] = $_GET['waiting_id'];
 }
+
 //-------------------------------------------------------------- picture upload
 // verfying fields
@@ -297 +331 @@
 $template->set_filenames(array('upload'=>'upload.tpl'));
 
+// Load category list
+$query = '
+SELECT
+  id, name, uppercats, global_rank
+FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
+  ON id = cat_id and user_id = '.$user['id'].'
+WHERE
+  uploadable = \'true\'
+  '.get_sql_condition_FandF
+    (
+      array
+        (
+          'visible_categories' => 'id',
+        ),
+      'AND'
+    ).'
+;';
+display_select_cat_wrapper($query, array($page['category']), 'categories');
+
 $u_form = PHPWG_ROOT_PATH.'upload.php?cat='.$page['category'];
 if ( isset( $page['waiting_id'] ) )
@@ -305 +358 @@
 if ( isset( $page['waiting_id'] ) )
 {
-  $advise_title=l10n('upload_advise_thumbnail').$_FILES['picture']['name'];
+  $advise_title = l10n('upload_advise_thumbnail').$_FILES['picture']['name'];
 }
 else
 {
-  $advise_title = l10n('upload_advise');
-  $advise_title.= get_cat_display_name($category['upper_names']);
+  $advise_title = l10n('Choose an image');
 }
 

trunk/ws.php

@@ -25 +25 @@
 
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
-check_status(ACCESS_NONE);
+check_status(ACCESS_FREE);
 include_once(PHPWG_ROOT_PATH.'include/ws_core.inc.php');