Resolved 0000748: Name configuration of all the tables

Resolved 0000750: Check anomalies after upgrade (Feature proposition)


git-svn-id: http://piwigo.org/svn/trunk@2096 68402e56-0260-453c-a942-63ccdbb3a9ee

8 files changed, 341 insertions, 0 deletions

diff --git a/plugins/c13y_upgrade/index.php b/plugins/c13y_upgrade/index.php
new file mode 100644
index 000000000..61741e9cb
--- /dev/null
+++ b/plugins/c13y_upgrade/index.php
@@ -0,0 +1,33 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | 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 |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/c13y_upgrade/initialize.inc.php b/plugins/c13y_upgrade/initialize.inc.php
new file mode 100644
index 000000000..f62e04974
--- /dev/null
+++ b/plugins/c13y_upgrade/initialize.inc.php
@@ -0,0 +1,95 @@
+<?php

+// +-----------------------------------------------------------------------+

+// | 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 |

+// +-----------------------------------------------------------------------+

+// | file          : $Id$

+// | last update   : $Date$

+// | last modifier : $Author$

+// | revision      : $Revision$

+// +-----------------------------------------------------------------------+

+// | 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.                                                                  |

+// +-----------------------------------------------------------------------+

+

+if (!defined('PHPWG_ROOT_PATH'))

+{

+  die('Hacking attempt!');

+}

+

+add_event_handler('get_check_integrity', 'c13y_upgrade');

+

+function c13y_upgrade($c13y_array)

+{

+  global $lang, $conf;

+

+  include(get_language_filepath('plugin.lang.php', dirname(__FILE__).'/'));

+  

+  $result = array();

+

+  if (isset($conf['users_table']))

+  {

+    $result[] = get_c13y(

+      l10n('c13y_upgrade_conf_users_table_msg'),

+      null,

+      null,

+      l10n('c13y_upgrade_conf_users_table_correction').

+      '<BR />'.

+      get_htlm_links_more_info());

+  }

+

+  if (count($result) === 0)

+  {

+    $deactivate_msg_link = 

+      '<a href="'.

+      PHPWG_ROOT_PATH.

+      'admin.php?page=plugins&amp;plugin=c13y_upgrade&amp;action=deactivate'.

+      '" onclick="window.open(this.href, \'\'); return false;">'.

+      l10n('c13y_upgrade_deactivate').'</a>';

+

+    $result[] = get_c13y(

+      l10n('c13y_upgrade_no_anomaly'),

+      'c13y_upgrade_correction',

+      'deactivate_plugin',

+      $deactivate_msg_link

+      );

+  }

+

+  return array_merge($c13y_array, $result);

+}

+

+function c13y_upgrade_correction($action)

+{

+  $result = false;

+

+  switch ($action)

+  {

+    case 'deactivate_plugin':

+      {

+        $query = '

+REPLACE INTO '.PLUGINS_TABLE.'

+(id, state)

+VALUES (\'c13y_upgrade\', \'inactive\')

+;';

+        pwg_query($query);

+        $result = true;

+      }

+      break;

+  }

+

+  return $result;

+}

+

+?>

diff --git a/plugins/c13y_upgrade/language/en_UK.iso-8859-1/index.php b/plugins/c13y_upgrade/language/en_UK.iso-8859-1/index.php
new file mode 100644
index 000000000..61741e9cb
--- /dev/null
+++ b/plugins/c13y_upgrade/language/en_UK.iso-8859-1/index.php
@@ -0,0 +1,33 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | 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 |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/c13y_upgrade/language/en_UK.iso-8859-1/plugin.lang.php b/plugins/c13y_upgrade/language/en_UK.iso-8859-1/plugin.lang.php
new file mode 100644
index 000000000..8500dbe0e
--- /dev/null
+++ b/plugins/c13y_upgrade/language/en_UK.iso-8859-1/plugin.lang.php
@@ -0,0 +1,33 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | 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 |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
+$lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade';
+$lang['c13y_upgrade_conf_users_table_msg'] = '"$conf[\'users_table\']" should not be any more used';
+$lang['c13y_upgrade_conf_users_table_correction'] = '"$conf[\'users_table\']" has been replaced by "$conf[\'tables\'][\'users_table\']"';
+$lang['c13y_upgrade_deactivate'] = 'You can deactivate "Check upgrades" plugin';
+
+?>
diff --git a/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/index.php b/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/index.php
new file mode 100644
index 000000000..61741e9cb
--- /dev/null
+++ b/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/index.php
@@ -0,0 +1,33 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | 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 |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/plugin.lang.php b/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/plugin.lang.php
new file mode 100644
index 000000000..5552049e0
--- /dev/null
+++ b/plugins/c13y_upgrade/language/fr_FR.iso-8859-1/plugin.lang.php
@@ -0,0 +1,33 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | 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 |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
+$lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application';
+$lang['c13y_upgrade_conf_users_table_msg'] = '"$conf[\'users_table\']" ne doit plus être utilisé';
+$lang['c13y_upgrade_conf_users_table_correction'] = '"$conf[\'users_table\']" a été remplacé par "$conf[\'tables\'][\'users_table\']"';
+$lang['c13y_upgrade_deactivate'] = 'Vous pouvez désactiver le plugin "Check upgrades"';
+
+?>
diff --git a/plugins/c13y_upgrade/language/index.php b/plugins/c13y_upgrade/language/index.php
new file mode 100644
index 000000000..61741e9cb
--- /dev/null
+++ b/plugins/c13y_upgrade/language/index.php
@@ -0,0 +1,33 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | 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 |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/plugins/c13y_upgrade/main.inc.php b/plugins/c13y_upgrade/main.inc.php
new file mode 100644
index 000000000..26b7139a5
--- /dev/null
+++ b/plugins/c13y_upgrade/main.inc.php
@@ -0,0 +1,48 @@
+<?php

+/*

+Plugin Name: Check upgrades

+Version:

+Description: Check integrity of upgrades / Contrôle d'intégrité des mises à jour

+Plugin URI: http://www.phpwebgallery.net

+Author: PhpWebGallery team

+Author URI: http://www.phpwebgallery.net

+*/

+// +-----------------------------------------------------------------------+

+// | 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 |

+// +-----------------------------------------------------------------------+

+// | file          : $Id$

+// | last update   : $Date$

+// | last modifier : $Author$

+// | revision      : $Revision$

+// +-----------------------------------------------------------------------+

+// | 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.                                                                  |

+// +-----------------------------------------------------------------------+

+

+if (!defined('PHPWG_ROOT_PATH'))

+{

+  die('Hacking attempt!');

+}

+

+if (in_array(script_basename(), array('popuphelp', 'admin')))

+{

+  if (defined('IN_ADMIN') and IN_ADMIN)

+  {

+   include_once(dirname(__FILE__).'/initialize.inc.php');

+  }

+}

+

+?>