aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-03-31 20:36:32 +0000
committerrvelices <rv-github@modusoptimus.com>2010-03-31 20:36:32 +0000
commitff8049ff2841d1164eae14f73a15f8f47a4f9035 (patch)
treed90400d27abf3fc5301c42d211d155d884fbac99
parentc8bbbb34055d57435ed44757bd69815aba1887c7 (diff)
move no_photo_yet feature to a new php file included by common.inc.php only if required (avoid parsing this code that will be rarely executed)
git-svn-id: http://piwigo.org/svn/trunk@5509 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/common.inc.php80
-rw-r--r--include/no_photo_yet.inc.php103
2 files changed, 106 insertions, 77 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 085dff703..dddc9b6d9 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -111,7 +111,7 @@ try
}
catch (Exception $e)
{
- my_error(l10n($e->getMessage(), true));
+ my_error(l10n($e->getMessage(), true));
}
pwg_db_check_charset();
@@ -162,83 +162,9 @@ else
$template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme'] );
}
-// The "No Photo Yet" feature: if you have no photo yet in your gallery, the
-// gallery displays only a big box to show you the way for adding your first
-// photos
-if (
- !isset($conf['no_photo_yet']) // the message disappears at first photo
- and !(defined('IN_ADMIN') and IN_ADMIN) // no message inside administration
- and script_basename() != 'identification' // keep the ability to login
- and script_basename() != 'ws' // keep the ability to discuss with web API
- and !isset($_SESSION['no_photo_yet']) // temporary hide
- )
+if ( !isset($conf['no_photo_yet']) )
{
- $query = '
-SELECT
- COUNT(*)
- FROM '.IMAGES_TABLE.'
-;';
- list($nb_photos) = pwg_db_fetch_row(pwg_query($query));
- if (0 == $nb_photos)
- {
- if (isset($_GET['no_photo_yet']))
- {
- if ('browse' == $_GET['no_photo_yet'])
- {
- $_SESSION['no_photo_yet'] = 'browse';
- redirect(make_index_url());
- exit();
- }
-
- if ('deactivate' == $_GET['no_photo_yet'])
- {
- conf_update_param('no_photo_yet', 'false');
- redirect(make_index_url());
- exit();
- }
- }
-
- $template->set_filenames(array('no_photo_yet'=>'no_photo_yet.tpl'));
-
- if (is_admin())
- {
- $url = $conf['no_photo_yet_url'];
- if (substr($url, 0, 4) != 'http')
- {
- $url = get_root_url().$url;
- }
-
- $template->assign(
- array(
- 'step' => 2,
- 'intro' => sprintf(
- l10n('Hello %s, your Piwigo photo gallery is empty!'),
- $user['username']
- ),
- 'next_step_url' => $url,
- 'deactivate_url' => get_root_url().'?no_photo_yet=deactivate',
- )
- );
- }
- else
- {
-
- $template->assign(
- array(
- 'step' => 1,
- 'U_LOGIN' => 'identification.php',
- 'deactivate_url' => get_root_url().'?no_photo_yet=browse',
- )
- );
- }
-
- $template->pparse('no_photo_yet');
- exit();
- }
- else
- {
- conf_update_param('no_photo_yet', 'false');
- }
+ include(PHPWG_ROOT_PATH.'include/no_photo_yet.inc.php');
}
if (isset($user['internal_status']['guest_must_be_guest'])
diff --git a/include/no_photo_yet.inc.php b/include/no_photo_yet.inc.php
new file mode 100644
index 000000000..5f885cbf2
--- /dev/null
+++ b/include/no_photo_yet.inc.php
@@ -0,0 +1,103 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2010 Piwigo Team http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+
+// The "No Photo Yet" feature: if you have no photo yet in your gallery, the
+// gallery displays only a big box to show you the way for adding your first
+// photos
+if (
+ !(defined('IN_ADMIN') and IN_ADMIN) // no message inside administration
+ and script_basename() != 'identification' // keep the ability to login
+ and script_basename() != 'ws' // keep the ability to discuss with web API
+ and !isset($_SESSION['no_photo_yet']) // temporary hide
+ )
+{
+ $query = '
+SELECT
+ COUNT(*)
+ FROM '.IMAGES_TABLE.'
+;';
+ list($nb_photos) = pwg_db_fetch_row(pwg_query($query));
+ if (0 == $nb_photos)
+ {
+ if (isset($_GET['no_photo_yet']))
+ {
+ if ('browse' == $_GET['no_photo_yet'])
+ {
+ $_SESSION['no_photo_yet'] = 'browse';
+ redirect(make_index_url());
+ exit();
+ }
+
+ if ('deactivate' == $_GET['no_photo_yet'])
+ {
+ conf_update_param('no_photo_yet', 'false');
+ redirect(make_index_url());
+ exit();
+ }
+ }
+
+ $template->set_filenames(array('no_photo_yet'=>'no_photo_yet.tpl'));
+
+ if (is_admin())
+ {
+ $url = $conf['no_photo_yet_url'];
+ if (substr($url, 0, 4) != 'http')
+ {
+ $url = get_root_url().$url;
+ }
+
+ $template->assign(
+ array(
+ 'step' => 2,
+ 'intro' => sprintf(
+ l10n('Hello %s, your Piwigo photo gallery is empty!'),
+ $user['username']
+ ),
+ 'next_step_url' => $url,
+ 'deactivate_url' => get_root_url().'?no_photo_yet=deactivate',
+ )
+ );
+ }
+ else
+ {
+
+ $template->assign(
+ array(
+ 'step' => 1,
+ 'U_LOGIN' => 'identification.php',
+ 'deactivate_url' => get_root_url().'?no_photo_yet=browse',
+ )
+ );
+ }
+
+ $template->pparse('no_photo_yet');
+ exit();
+ }
+ else
+ {
+ conf_update_param('no_photo_yet', 'false');
+ }
+}
+
+?> \ No newline at end of file