diff options
Diffstat (limited to 'h-source/Application')
7 files changed, 24 insertions, 5 deletions
diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php index bfc4346..d55f5ad 100644 --- a/h-source/Application/Controllers/DownloadController.php +++ b/h-source/Application/Controllers/DownloadController.php @@ -51,7 +51,7 @@ class DownloadController extends BaseController $xml .= "\t<general_informations>\n"; $xml .= "\t\t<credits>h-node project</credits>\n"; $xml .= "\t\t<link>www.h-node.com</link>\n"; - $xml .= "\t\t<date>".date("Y-m-d H:m:s")."</date>\n"; + $xml .= "\t\t<date>".date("Y-m-d H:i:s")."</date>\n"; $xml .= "\t\t<license>".License::getInsideXml()."</license>\n"; $xml .= "\t</general_informations>\n"; diff --git a/h-source/Application/Controllers/ThreegcardsController.php b/h-source/Application/Controllers/ThreegcardsController.php index 69484cd..c535005 100644 --- a/h-source/Application/Controllers/ThreegcardsController.php +++ b/h-source/Application/Controllers/ThreegcardsController.php @@ -65,18 +65,22 @@ class ThreegcardsController extends GenericController ); $this->m['HardwareModel']->softConditions['update'] = array( - "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the <i>kernel</i> entry", + "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the <i>kernel</i> entry", "checkLength|20000" => "description", "+checkLength|49" => "kernel", + "++checkLength|49" => "driver", + "++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "driver|only the following characters are allowed for the <i>driver</i> entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", ); $this->m['HardwareModel']->softConditions['insert'] = array( "checkMatch|/^[a-zA-Z0-9\-\_\.\+\s]+$/" => "kernel|characters not allowed in the <i>kernel</i> entry", "checkLength|20000" => "description", "+checkLength|49" => "kernel", + "++checkLength|49" => "driver", + "++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "driver|only the following characters are allowed for the <i>driver</i> entry: a-z A-Z 0-9 - _ . + s / , : ; ( ) [ ]", ); - $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,wifi_works,pci_id,interface','sanitizeAll'); + $this->m['HardwareModel']->setFields('model,kernel,description,distribution,comm_year,wifi_works,pci_id,interface,driver','sanitizeAll'); $argKeys = array( 'page:forceNat' => 1, diff --git a/h-source/Application/Include/license.php b/h-source/Application/Include/license.php index 72c25da..08a6a2c 100644 --- a/h-source/Application/Include/license.php +++ b/h-source/Application/Include/license.php @@ -28,6 +28,7 @@ class License 'en' => "The contents of this page are in the Public Domain. (see the <a href='http://creativecommons.org/publicdomain/zero/1.0/'>CC0 page</a> for detailed information). Anyone is free to copy, modify, publish, use, sell, or distribute the text for any purpose, commercial or non-commercial, and by any means.", 'it' => "I contenuti di questa pagina sono di Pubblico Dominio. (leggi la <a href='http://creativecommons.org/publicdomain/zero/1.0/deed.it'>pagina CC0</a> per informazioni dettagliate). Chiunque è libero di copiare, modificare, pubblicare, usare, vendere, o distribuire tale contenuto per qualsiasi fine, commerciale o non commerciale, e con ogni mezzo.", 'es' => "El contenido de esta página está en Dominio Público. (vea la <a href='http://creativecommons.org/publicdomain/zero/1.0/deed.es_ES'>página CC0</a> para información detallada). Cualquiera es libre de copiar, modificar, publicar, usar, vender o distribuir el texto para cualquier propósito, comercial o no comercial, y por cualquier medio.", + 'fr' => "Le contenu de cette page est dans le Domaine Public (voir la <a href='http://creativecommons.org/publicdomain/zero/1.0/deed.fr'>page CC0</a> pour plus d'informations). Quiquonque est libre de copier, modifier, publier, utiliser, vendre ou distribuer le texte , quelques soit le but et le moyen.", ); //license notice that does appear inside the xml download page @@ -35,6 +36,7 @@ class License 'en' => "The contents of this page are in the Public Domain. (see the CC0 page at http://creativecommons.org/publicdomain/zero/1.0/ for detailed information). Anyone is free to copy, modify, publish, use, sell, or distribute the text for any purpose, commercial or non-commercial, and by any means.", 'it' => "I contenuti di questa pagina sono di Pubblico Dominio. (leggi la pagina CC0 all'indirizzo http://creativecommons.org/publicdomain/zero/1.0/deed.it per informazioni dettagliate). Chiunque è libero di copiare, modificare, pubblicare, usare, vendere, o distribuire tale contenuto per qualsiasi fine, commerciale o non commerciale, e con ogni mezzo.", 'es' => "El contenido de esta página está en Dominio Público. (vea la página CC0 http://creativecommons.org/publicdomain/zero/1.0/deed.es_ES para información detallada). Cualquiera es libre de copiar, modificar, publicar, usar, vender o distribuir el texto para cualquier propósito, comercial o no comercial, y por cualquier medio.", + 'fr' => "Le contenu de cette page est dans le Domaine Public (voir la page CC0 http://creativecommons.org/publicdomain/zero/1.0/deed.fr pour plus d'informations). Quiquonque est libre de copier, modifier, publier, utiliser, vendre ou distribuer le texte , quelques soit le but et le moyen.", ); //license notice that does appear before the submission of each hardware and wiki page @@ -42,6 +44,7 @@ class License 'en' => "Any text submitted by you will be put in the Public Domain (see the <a href='http://creativecommons.org/publicdomain/zero/1.0/'>CC0 page</a> for detailed information).", 'it' => "Ogni testo da te inviato diventerà di Pubblico Dominio. (leggi la <a href='http://creativecommons.org/publicdomain/zero/1.0/deed.it'>pagina CC0</a> per informazioni dettagliate).", 'es' => "Cualquier texto agregado por usted será colocado en el Dominio Público (vea la <a href='http://creativecommons.org/publicdomain/zero/1.0/deed.es_ES'>página CC0</a> para información detallada).", + 'fr' => "Chaque texte que vous soumettrez seront placés dans le Domaine Public (voir la <a href='http://creativecommons.org/publicdomain/zero/1.0/deed.fr'>page CC0</a> pour plus d'informations)" ); //license notice that does appear before the submission of each hardware page from the h-node client (h-client) @@ -49,6 +52,7 @@ class License 'en' => "Any text submitted by you will be put in the Public Domain (see the CC0 page at \nhttp://creativecommons.org/publicdomain/zero/1.0/ for detailed information).", 'it' => "Ogni testo da te inviato diventerà di Pubblico Dominio. (leggi la pagina CC0 all'indirizzo \nhttp://creativecommons.org/publicdomain/zero/1.0/deed.it per informazioni dettagliate).", 'es' => "Cualquier texto agregado por usted será colocado en el Dominio Público (vea la página CC0 \nhttp://creativecommons.org/publicdomain/zero/1.0/deed.es_ES para información detallada).", + 'fr' => "Chaque texte que vous soumettrez seront placés dans le Domaine Public (voir la page CC0 \nhttp://creativecommons.org/publicdomain/zero/1.0/deed.fr pour plus d'informations)" ); public static function getNotice($noticeArray) diff --git a/h-source/Application/Models/ThreegcardsModel.php b/h-source/Application/Models/ThreegcardsModel.php index 6bde5c8..3579e01 100644 --- a/h-source/Application/Models/ThreegcardsModel.php +++ b/h-source/Application/Models/ThreegcardsModel.php @@ -63,6 +63,7 @@ class ThreegcardsModel extends GenericModel 'distribution' => gtext('GNU/Linux distribution used for the test'), 'kernel' => gtext('tested with the following kernel libre'), 'wifi_works' => gtext("does it work with free software?"), + 'driver' => gtext("free driver used"), 'description' => gtext('Description'), ); diff --git a/h-source/Application/Models/WikiModel.php b/h-source/Application/Models/WikiModel.php index bfbc4ad..9cb4f6f 100644 --- a/h-source/Application/Models/WikiModel.php +++ b/h-source/Application/Models/WikiModel.php @@ -55,14 +55,14 @@ class WikiModel extends Model_Map { "checkNotEmpty" => 'title', "checkLength|99" => 'title|'.gtext('title is too long'), "+checkNotEmpty" => 'page', - "+checkLength|9000" => 'page|'.gtext('the page text is too long'), + "+checkLength|29900" => 'page|'.gtext('the page text is too long'), ); $this->strongConditions['update'] = array( "checkNotEmpty" => 'title', "checkLength|99" => 'title|'.gtext('title is too long'), "+checkNotEmpty" => 'page', - "+checkLength|9000" => 'page|'.gtext('the page text is too long'), + "+checkLength|29900" => 'page|'.gtext('the page text is too long'), ); $this->databaseConditions['insert'] = array( diff --git a/h-source/Application/Views/Threegcards/form.php b/h-source/Application/Views/Threegcards/form.php index 075333e..fd80f5a 100644 --- a/h-source/Application/Views/Threegcards/form.php +++ b/h-source/Application/Views/Threegcards/form.php @@ -75,6 +75,11 @@ <div class="entry_label hidden_x_explorer"><?php echo gtext("does it work with free software?");?></div> <?php echo Html_Form::select('wifi_works',$values['wifi_works'],ThreeGcards::$select,"select_entry hidden_x_explorer");?> </div> + + <div class="form_entry"> + <div class="entry_label hidden_x_explorer"><?php echo gtext("free driver used");?> (<?php echo gtext("see the help page or leave blank if you are not sure");?>):</div> + <?php echo Html_Form::input('driver',$values['driver'],'input_entry');?> + </div> <div class="form_entry"> <div class="entry_label"><?php echo gtext("Description: (write here all the useful information)");?><br /><a href="<?php echo $this->baseUrl."/help/index/$lang#wiki-syntax";?>"><?php echo gtext("discover all the wiki tags");?></a></div> diff --git a/h-source/Application/Views/Threegcards/page.php b/h-source/Application/Views/Threegcards/page.php index 61752d8..ef79898 100644 --- a/h-source/Application/Views/Threegcards/page.php +++ b/h-source/Application/Views/Threegcards/page.php @@ -77,6 +77,11 @@ <div class="inner_label"><?php echo gtext("does it work with free software?");?></div> <div class="inner_value"><b><?php echo $item[$tableName]['wifi_works'];?></b></div> </div> + + <div class="notebook_kernel"> + <div class="inner_label"><?php echo gtext("free driver used");?>:</div> + <div class="inner_value"><b><?php echo $item[$tableName]['driver'];?></b></div> + </div> <div class="notebook_description"> <div class="notebook_description_label"><?php echo gtext("Description");?>:</div> |