aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-01-13 20:51:57 +0000
committerrvelices <rv-github@modusoptimus.com>2011-01-13 20:51:57 +0000
commitaf6e6b55ca0a3eb8c5af4cce4b0f4385bb74fd89 (patch)
treec102f82509abfb7c09f2eddbd95d74f1f1cae1c8
parentfe569ab1bf4baa44a808a2d6e81bcddc28d61b62 (diff)
feature 2108 finalize upload removal (php warnings)
git-svn-id: http://piwigo.org/svn/trunk@8652 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_category.inc.php55
-rw-r--r--include/menubar.inc.php1
-rw-r--r--themes/default/template/upload.tpl115
3 files changed, 0 insertions, 171 deletions
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index f0e1f63c9..675b310d5 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -495,59 +495,4 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
return $display_text;
}
-/**
- * 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 = pwg_db_num_rows(pwg_query($query)) <> 0;
- }
- }
- if ($show_link)
- {
- return get_root_url().'upload.php'.(empty($arg_link) ? '' : '?'.$arg_link);
- }
- else
- {
- return;
- }
-}
-
?> \ No newline at end of file
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index c50b34461..a138e8786 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -105,7 +105,6 @@ function initialize_menu()
'NB_PICTURE' => $user['nb_total_images'],
'MENU_CATEGORIES' => get_categories_menu(),
'U_CATEGORIES' => make_index_url(array('section' => 'categories')),
- 'U_UPLOAD' => get_upload_menu_link()
);
$block->template = 'menubar_categories.tpl';
}
diff --git a/themes/default/template/upload.tpl b/themes/default/template/upload.tpl
deleted file mode 100644
index 268ccbfa7..000000000
--- a/themes/default/template/upload.tpl
+++ /dev/null
@@ -1,115 +0,0 @@
-{* Example of resizeable *}
-{*
-{include file='include/autosize.inc.tpl'}
-*}
-
-<div id="content" class="content">
-
- <div class="titrePage">
- <ul class="categoryActions">
- <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
- <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
- </a></li>
- </ul>
- <h2>{'Upload a picture'|@translate}</h2>
- </div>
-
- {if !empty($errors)}
- <div class="errors">
- <ul>
- {foreach from=$errors item=error}
- <li>{$error}</li>
- {/foreach}
- </ul>
- </div>
- {/if}
-
- {if not $UPLOAD_SUCCESSFUL }
- <form enctype="multipart/form-data" method="post" action="{$F_ACTION}">
- <table style="width:80%;margin-left:auto;margin-right:auto;">
- <tr>
- <td colspan="2" class="menu">
- <div style="text-align:center;">{$ADVISE_TITLE}</div>
- {if not empty($advises)}
- <ul>
- {foreach from=$advises item=advise}
- <li>{$advise}</li>
- {/foreach}
- </ul>
- {/if}
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <input class="file" name="picture" type="file" value="">
- </td>
- </tr>
- {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
- <!-- category -->
- <tr>
- <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 -->
- <tr>
- <td>{'E-mail address'|@translate} <span style="color:red;">*</span></td>
- <td>
- <input name="mail_address" type="text" value="{$EMAIL}">
- </td>
- </tr>
- <!-- name of the picture -->
- <tr>
- <td>{'Name of the picture'|@translate}</td>
- <td>
- <input name="name" type="text" value="{$NAME_IMG}">
- </td>
- </tr>
- <!-- author -->
- <tr>
- <td>{'Author'|@translate}</td>
- <td>
- <input name="author" type="text" value="{$AUTHOR_IMG}">
- </td>
- </tr>
- <!-- date of creation -->
- <tr>
- <td>{'Creation date'|@translate} (DD/MM/YYYY)</td>
- <td>
- <input name="date_creation" type="text" value="{$DATE_IMG}">
- </td>
- </tr>
- <!-- comment -->
- <tr>
- <td>{'Comment'|@translate}</td>
- <td>
- <textarea name="comment" id="comment" rows="3" cols="40" style="overflow:auto">{$COMMENT_IMG}</textarea>
- </td>
- </tr>
- {/if}
- <tr>
- <td colspan="2" align="center">
- <input class="submit" name="submit" type="submit" value="{'Submit'|@translate}">
- </td>
- </tr>
- </table>
- </form>
- {else}
- {'Picture uploaded with success, an administrator will validate it as soon as possible'|@translate}<br>
- <div style="text-align:center;">
- <a href="{$U_RETURN}">[ {'Home'|@translate} ]</a>
- </div>
- {/if}
-
- {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
- <div style="text-align:left; margin-left:20px;"><span style="color:red;">*</span> : {'obligatory'|@translate}</div>
- {/if}
-</div> <!-- content -->