r33916 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r33915‎ | r33916 | r33917 >
Date:16:17, 26 April 2008
Author:ialex
Status:old
Tags:
Comment:
Also check that the directory is writable, otherwise people will only get an error when saving changes.
Modified paths:
  • /trunk/extensions/Configure/Configure.body.php (modified) (history)
  • /trunk/extensions/Configure/Configure.i18n.php (modified) (history)
  • /trunk/extensions/Configure/Configure.obj.php (modified) (history)
  • /trunk/extensions/Configure/Configure.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Configure/Configure.obj.php
@@ -45,11 +45,11 @@
4646 return;
4747 $cont = file_get_contents( $file );
4848 if( empty( $cont ) )
49 - # Wired, should not happen
 49+ # Weird, should not happen
5050 return;
5151 $arr = unserialize( $cont );
5252 if( !is_array( $arr ) || $arr === array() )
53 - # Wired, should not happen too
 53+ # Weird, should not happen too
5454 return;
5555 $this->mConf = $arr;
5656
@@ -149,11 +149,11 @@
150150 return array();
151151 $cont = file_get_contents( $file );
152152 if( empty( $cont ) )
153 - # Wired, should not happen
 153+ # Weird, should not happen
154154 return array();
155155 $arr = unserialize( $cont );
156156 if( !is_array( $arr ) )
157 - # Wired, should not happen too
 157+ # Weird, should not happen too
158158 return array();
159159 return $arr;
160160 }
Index: trunk/extensions/Configure/Configure.body.php
@@ -51,12 +51,20 @@
5252 return;
5353 }
5454
 55+ // Check that the directory exists...
5556 if( !is_dir( $wgConf->getDir() ) ){
5657 $msg = wfMsgNoTrans( 'configure-no-directory', $wgConf->getDir() );
5758 $wgOut->addWikiText( "<div class='errorbox'><strong>$msg</strong></div>" );
5859 return;
5960 }
6061
 62+ // And that it's writable by PHP
 63+ if( !is_writable( $wgConf->getDir() ) ){
 64+ $msg = wfMsgNoTrans( 'configure-directory-not-writable', $wgConf->getDir() );
 65+ $wgOut->addWikiText( "<div class='errorbox'><strong>$msg</strong></div>" );
 66+ return;
 67+ }
 68+
6169 $this->outputHeader();
6270
6371 if( $version = $wgRequest->getVal( 'version' ) ){
Index: trunk/extensions/Configure/Configure.i18n.php
@@ -8,69 +8,71 @@
99 $messages = array();
1010
1111 $messages['en'] = array(
12 - 'configure' => 'Configure the wiki',
13 - 'configure-desc' => 'Allow authorised users to [[Special:Configure|configure]] the wiki by a web-based interface',
14 - 'configure-summary' => 'This special page allow you to configure this wiki, see [http://www.mediawiki.org/wiki/Manual:Configuration_settings Configuration settings] for more information.',
15 - 'configure-btn-save' => 'Save settings',
16 - 'configure-edit-old' => 'Warning: you are editing an <strong>old</strong> version of the configuration.',
17 - 'configure-error' => 'The configuration could not be saved',
18 - 'configure-no-directory' => 'The directory used to store the settings, <tt>$1</tt>, does not exist.
 12+ 'configure' => 'Configure the wiki',
 13+ 'configure-desc' => 'Allow authorised users to [[Special:Configure|configure]] the wiki by a web-based interface',
 14+ 'configure-summary' => 'This special page allow you to configure this wiki, see [http://www.mediawiki.org/wiki/Manual:Configuration_settings Configuration settings] for more information.',
 15+ 'configure-btn-save' => 'Save settings',
 16+ 'configure-directory-not-writable' => 'The directory used to store the settings, <tt>$1</tt>, is not writable.
 17+Please make it writable by PHP to use this extension.',
 18+ 'configure-edit-old' => 'Warning: you are editing an <strong>old</strong> version of the configuration.',
 19+ 'configure-error' => 'The configuration could not be saved',
 20+ 'configure-no-directory' => 'The directory used to store the settings, <tt>$1</tt>, does not exist.
1921 Please create it or change it to use this extension.',
20 - 'configure-no-old' => 'No old version of the configuration available',
21 - 'configure-no-setup' => 'You have to call <code>efConfigureSetup()</code> explicitly in your LocalSettings.php file to use this extension.',
22 - 'configure-no-transwiki' => 'You are not allowed to change settings in other wikis',
23 - 'configure-old-versions' => 'List of old versions of the configuration:',
24 - 'configure-old-not-available' => 'The old version of the settings you requested, $1, is not available',
25 - 'configure-saved' => 'The configuration has been saved',
26 - 'configure-section-general' => 'General settings',
27 - 'configure-section-paths' => 'Paths',
28 - 'configure-section-db' => 'Database',
29 - 'configure-section-db-notallowed' => 'You are not allowed to change the database settings.',
30 - 'configure-section-email' => 'E-mail',
31 - 'configure-section-enotif' => 'E-mail notification',
32 - 'configure-section-localization' => 'Localisation',
33 - 'configure-section-html' => 'HTML',
34 - 'configure-section-debug' => 'Debugging',
35 - 'configure-section-profiling' => 'Profiling',
36 - 'configure-section-site' => 'Site customisation',
37 - 'configure-section-ajax' => 'Ajax',
38 - 'configure-section-namespaces' => 'Namespaces',
39 - 'configure-section-skin' => 'Skins',
40 - 'configure-section-category' => 'Categories',
41 - 'configure-section-cache' => 'Cache',
42 - 'configure-section-pcache' => 'Parser cache',
43 - 'configure-section-messagecache' => 'Messages cache',
44 - 'configure-section-memcached' => 'Memcached',
45 - 'configure-section-interwiki' => 'Interwiki',
46 - 'configure-section-access' => 'Access',
47 - 'configure-section-groups' => 'Groups',
48 - 'configure-section-block' => 'Blocks',
49 - 'configure-section-rates' => 'Rate limits',
50 - 'configure-section-proxy' => 'Proxies',
51 - 'configure-section-squid' => 'Squids',
52 - 'configure-section-cookie' => 'Cookies',
53 - 'configure-section-reduction' => 'Reduction',
54 - 'configure-section-upload' => 'Upload',
55 - 'configure-section-sharedupload' => 'Shared upload',
56 - 'configure-section-mime' => 'MIME types',
57 - 'configure-section-images' => 'Images',
58 - 'configure-section-svg' => 'SVG',
59 - 'configure-section-antivirus' => 'Antivirus',
60 - 'configure-section-parser' => 'Parser',
61 - 'configure-section-tex' => 'TeX',
62 - 'configure-section-tidy' => 'Tidy',
63 - 'configure-section-specialpages' => 'Special pages',
64 - 'configure-section-recentchanges' => 'Recent changes',
65 - 'configure-section-users' => 'Users',
66 - 'configure-section-feed' => 'Feed',
67 - 'configure-section-job' => 'Jobs',
68 - 'configure-section-extension' => 'Extensions',
69 - 'configure-section-copyright' => 'Copyright',
70 - 'configure-section-htcp' => 'HTCP multicast',
71 - 'configure-section-misc' => 'Miscellaneous',
72 - 'configure-setting-not-available' => 'This setting is not available in this version of MediaWiki',
73 - 'right-configure' => 'Configure the wiki',
74 - 'right-configure-all' => "Configure all wiki's settings",
 22+ 'configure-no-old' => 'No old version of the configuration available',
 23+ 'configure-no-setup' => 'You have to call <code>efConfigureSetup()</code> explicitly in your LocalSettings.php file to use this extension.',
 24+ 'configure-no-transwiki' => 'You are not allowed to change settings in other wikis',
 25+ 'configure-old-versions' => 'List of old versions of the configuration:',
 26+ 'configure-old-not-available' => 'The old version of the settings you requested, $1, is not available',
 27+ 'configure-saved' => 'The configuration has been saved',
 28+ 'configure-section-general' => 'General settings',
 29+ 'configure-section-paths' => 'Paths',
 30+ 'configure-section-db' => 'Database',
 31+ 'configure-section-db-notallowed' => 'You are not allowed to change the database settings.',
 32+ 'configure-section-email' => 'E-mail',
 33+ 'configure-section-enotif' => 'E-mail notification',
 34+ 'configure-section-localization' => 'Localisation',
 35+ 'configure-section-html' => 'HTML',
 36+ 'configure-section-debug' => 'Debugging',
 37+ 'configure-section-profiling' => 'Profiling',
 38+ 'configure-section-site' => 'Site customisation',
 39+ 'configure-section-ajax' => 'Ajax',
 40+ 'configure-section-namespaces' => 'Namespaces',
 41+ 'configure-section-skin' => 'Skins',
 42+ 'configure-section-category' => 'Categories',
 43+ 'configure-section-cache' => 'Cache',
 44+ 'configure-section-pcache' => 'Parser cache',
 45+ 'configure-section-messagecache' => 'Messages cache',
 46+ 'configure-section-memcached' => 'Memcached',
 47+ 'configure-section-interwiki' => 'Interwiki',
 48+ 'configure-section-access' => 'Access',
 49+ 'configure-section-groups' => 'Groups',
 50+ 'configure-section-block' => 'Blocks',
 51+ 'configure-section-rates' => 'Rate limits',
 52+ 'configure-section-proxy' => 'Proxies',
 53+ 'configure-section-squid' => 'Squids',
 54+ 'configure-section-cookie' => 'Cookies',
 55+ 'configure-section-reduction' => 'Reduction',
 56+ 'configure-section-upload' => 'Upload',
 57+ 'configure-section-sharedupload' => 'Shared upload',
 58+ 'configure-section-mime' => 'MIME types',
 59+ 'configure-section-images' => 'Images',
 60+ 'configure-section-svg' => 'SVG',
 61+ 'configure-section-antivirus' => 'Antivirus',
 62+ 'configure-section-parser' => 'Parser',
 63+ 'configure-section-tex' => 'TeX',
 64+ 'configure-section-tidy' => 'Tidy',
 65+ 'configure-section-specialpages' => 'Special pages',
 66+ 'configure-section-recentchanges' => 'Recent changes',
 67+ 'configure-section-users' => 'Users',
 68+ 'configure-section-feed' => 'Feed',
 69+ 'configure-section-job' => 'Jobs',
 70+ 'configure-section-extension' => 'Extensions',
 71+ 'configure-section-copyright' => 'Copyright',
 72+ 'configure-section-htcp' => 'HTCP multicast',
 73+ 'configure-section-misc' => 'Miscellaneous',
 74+ 'configure-setting-not-available' => 'This setting is not available in this version of MediaWiki',
 75+ 'right-configure' => 'Configure the wiki',
 76+ 'right-configure-all' => "Configure all wiki's settings",
7577 );
7678
7779 /** Bulgarian (Български)
@@ -288,63 +290,65 @@
289291 * @author Grondin
290292 */
291293 $messages['fr'] = array(
292 - 'configure' => 'Configurer le wiki',
293 - 'configure-desc' => 'Permet aux utilisateurs avec les permisssions adéquates de configurer le wiki via une page spéciale',
294 - 'configure-summary' => "Cette page spéciale vous permet de configurer ce wiki, voyez les [http://www.mediawiki.org/wiki/Manual:Configuration_settings/fr paramètres de configuration] pour plus d'informations.",
295 - 'configure-btn-save' => 'Sauvegarder les réglages',
296 - 'configure-edit-old' => 'Attention : vous êtes en train de modifier une <strong>ancienne</strong> version de la configuration.',
297 - 'configure-error' => "La configuration n'a pu être sauvegardée",
298 - 'configure-no-directory' => 'Le dossier utilisé pour sauvegarder la configuration, <tt>$1</tt>, n’existe pas. Veuillez le créer ou le changer pour que cette extension fonctionne.',
299 - 'configure-no-old' => "Il n’existe pas d'ancienne version disponible de la configuration.",
300 - 'configure-no-setup' => 'Vous devez explicitement appeller la fonction <code>efConfigureSetup()</code> dans votre fichier LocalSettings.php pour utiliser cette extension.',
301 - 'configure-no-transwiki' => "Vous n'êtes pas autorisé à changer les réglages d'autres wikis",
302 - 'configure-old-versions' => 'Liste des anciennes versions de la configuration :',
303 - 'configure-old-not-available' => "L'ancienne version de la configuration que vous avez demandée, $1, n'est pas disponible",
304 - 'configure-saved' => 'La configuration a été sauvegardée avec succès',
305 - 'configure-section-general' => 'Réglages généraux',
306 - 'configure-section-paths' => 'Chemins',
307 - 'configure-section-db' => 'Base de données',
308 - 'configure-section-db-notallowed' => "Vous n'êtes pas autorisé à changer les réglages de la base de données.",
309 - 'configure-section-email' => 'Courriel',
310 - 'configure-section-enotif' => 'Notification par courriel',
311 - 'configure-section-localization' => 'Localisation',
312 - 'configure-section-html' => 'Html',
313 - 'configure-section-debug' => 'Débogage',
314 - 'configure-section-profiling' => 'Profilage',
315 - 'configure-section-site' => 'Personnalisation du site',
316 - 'configure-section-namespaces' => 'Espaces de noms',
317 - 'configure-section-skin' => 'Habillage',
318 - 'configure-section-category' => 'Catégories',
319 - 'configure-section-cache' => 'Cache',
320 - 'configure-section-pcache' => 'Cache du parseur',
321 - 'configure-section-messagecache' => 'Cache des messages',
322 - 'configure-section-memcached' => 'Mémoire cachée',
323 - 'configure-section-access' => 'Accès',
324 - 'configure-section-groups' => 'Groupes',
325 - 'configure-section-block' => 'Blocages',
326 - 'configure-section-rates' => 'Limites',
327 - 'configure-section-proxy' => 'Serveurs mandataires',
328 - 'configure-section-squid' => 'Serveur squids',
329 - 'configure-section-cookie' => 'Cookies',
330 - 'configure-section-reduction' => 'Réduction',
331 - 'configure-section-upload' => 'Téléchargements',
332 - 'configure-section-sharedupload' => 'Téléchargements partagés',
333 - 'configure-section-mime' => 'Types MIME',
334 - 'configure-section-images' => 'Images',
335 - 'configure-section-antivirus' => 'Antivirus',
336 - 'configure-section-parser' => 'Parseur',
337 - 'configure-section-specialpages' => 'Pages spéciales',
338 - 'configure-section-recentchanges' => 'Modifications récentes',
339 - 'configure-section-users' => 'Utilisateurs',
340 - 'configure-section-feed' => 'Alimentation',
341 - 'configure-section-job' => 'Travaux',
342 - 'configure-section-extension' => 'Extensions',
343 - 'configure-section-copyright' => 'Droits d’auteur',
344 - 'configure-section-htcp' => 'HTCP multicanal',
345 - 'configure-section-misc' => 'Autres',
346 - 'configure-setting-not-available' => "Ce paramètre n'est pas disponible sur cette version de MediaWiki",
347 - 'right-configure' => 'Configurer le wiki',
348 - 'right-configure-all' => 'Configurer tous les paramètres du wiki',
 294+ 'configure' => 'Configurer le wiki',
 295+ 'configure-desc' => 'Permet aux utilisateurs avec les permisssions adéquates de configurer le wiki via une page spéciale',
 296+ 'configure-summary' => "Cette page spéciale vous permet de configurer ce wiki, voyez les [http://www.mediawiki.org/wiki/Manual:Configuration_settings/fr paramètres de configuration] pour plus d'informations.",
 297+ 'configure-btn-save' => 'Sauvegarder les réglages',
 298+ 'configure-directory-not-writable' => 'Le dossier utilisé pour sauvegarder la configuration, <tt>$1</tt>, ne peut pas être modifié.
 299+Veuillez le rendre modifiable par PHP pour que cette extension fonctionne.',
 300+ 'configure-edit-old' => 'Attention : vous êtes en train de modifier une <strong>ancienne</strong> version de la configuration.',
 301+ 'configure-error' => "La configuration n'a pu être sauvegardée",
 302+ 'configure-no-directory' => 'Le dossier utilisé pour sauvegarder la configuration, <tt>$1</tt>, n’existe pas. Veuillez le créer ou le changer pour que cette extension fonctionne.',
 303+ 'configure-no-old' => "Il n’existe pas d'ancienne version disponible de la configuration.",
 304+ 'configure-no-setup' => 'Vous devez explicitement appeller la fonction <code>efConfigureSetup()</code> dans votre fichier LocalSettings.php pour utiliser cette extension.',
 305+ 'configure-no-transwiki' => "Vous n'êtes pas autorisé à changer les réglages d'autres wikis",
 306+ 'configure-old-versions' => 'Liste des anciennes versions de la configuration :',
 307+ 'configure-old-not-available' => "L'ancienne version de la configuration que vous avez demandée, $1, n'est pas disponible",
 308+ 'configure-saved' => 'La configuration a été sauvegardée avec succès',
 309+ 'configure-section-general' => 'Réglages généraux',
 310+ 'configure-section-paths' => 'Chemins',
 311+ 'configure-section-db' => 'Base de données',
 312+ 'configure-section-db-notallowed' => "Vous n'êtes pas autorisé à changer les réglages de la base de données.",
 313+ 'configure-section-email' => 'Courriel',
 314+ 'configure-section-enotif' => 'Notification par courriel',
 315+ 'configure-section-localization' => 'Localisation',
 316+ 'configure-section-html' => 'Html',
 317+ 'configure-section-debug' => 'Débogage',
 318+ 'configure-section-profiling' => 'Profilage',
 319+ 'configure-section-site' => 'Personnalisation du site',
 320+ 'configure-section-namespaces' => 'Espaces de noms',
 321+ 'configure-section-skin' => 'Habillage',
 322+ 'configure-section-category' => 'Catégories',
 323+ 'configure-section-cache' => 'Cache',
 324+ 'configure-section-pcache' => 'Cache du parseur',
 325+ 'configure-section-messagecache' => 'Cache des messages',
 326+ 'configure-section-memcached' => 'Mémoire cachée',
 327+ 'configure-section-access' => 'Accès',
 328+ 'configure-section-groups' => 'Groupes',
 329+ 'configure-section-block' => 'Blocages',
 330+ 'configure-section-rates' => 'Limites',
 331+ 'configure-section-proxy' => 'Serveurs mandataires',
 332+ 'configure-section-squid' => 'Serveur squids',
 333+ 'configure-section-cookie' => 'Cookies',
 334+ 'configure-section-reduction' => 'Réduction',
 335+ 'configure-section-upload' => 'Téléchargements',
 336+ 'configure-section-sharedupload' => 'Téléchargements partagés',
 337+ 'configure-section-mime' => 'Types MIME',
 338+ 'configure-section-images' => 'Images',
 339+ 'configure-section-antivirus' => 'Antivirus',
 340+ 'configure-section-parser' => 'Parseur',
 341+ 'configure-section-specialpages' => 'Pages spéciales',
 342+ 'configure-section-recentchanges' => 'Modifications récentes',
 343+ 'configure-section-users' => 'Utilisateurs',
 344+ 'configure-section-feed' => 'Alimentation',
 345+ 'configure-section-job' => 'Travaux',
 346+ 'configure-section-extension' => 'Extensions',
 347+ 'configure-section-copyright' => 'Droits d’auteur',
 348+ 'configure-section-htcp' => 'HTCP multicanal',
 349+ 'configure-section-misc' => 'Autres',
 350+ 'configure-setting-not-available' => "Ce paramètre n'est pas disponible sur cette version de MediaWiki",
 351+ 'right-configure' => 'Configurer le wiki',
 352+ 'right-configure-all' => 'Configurer tous les paramètres du wiki',
349353 );
350354
351355 /** Galician (Galego)
Index: trunk/extensions/Configure/Configure.php
@@ -16,7 +16,7 @@
1717 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure',
1818 'description' => 'Allow authorised users to configure the wiki by a web-based interface',
1919 'descriptionmsg' => 'configure-desc',
20 - 'version' => '0.1.4',
 20+ 'version' => '0.1.5',
2121 );
2222
2323 ## Adding new rights...

Status & tagging log