aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--h-source/Application/Controllers/DownloadController.php3
-rw-r--r--h-source/Application/Controllers/NotebooksController.php4
-rw-r--r--h-source/Application/Include/hardware.php2
-rw-r--r--h-source/Application/Include/languages.php1
-rw-r--r--h-source/Application/Models/NotebooksModel.php1
-rw-r--r--h-source/Application/Views/Help/index.php12
-rw-r--r--h-source/Application/Views/Help/index_es.php8
-rw-r--r--h-source/Application/Views/Help/index_fr.php8
-rw-r--r--h-source/Application/Views/Help/index_it.php7
-rw-r--r--h-source/Application/Views/Notebooks/form.php5
-rw-r--r--h-source/Application/Views/Notebooks/page.php5
-rw-r--r--h-source/tables.sql4
12 files changed, 55 insertions, 5 deletions
diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php
index d55f5ad..64eec34 100644
--- a/h-source/Application/Controllers/DownloadController.php
+++ b/h-source/Application/Controllers/DownloadController.php
@@ -69,6 +69,7 @@ class DownloadController extends BaseController
}
if ($type === 'notebook')
{
+ $xml .= "\t\t<architecture>".$row['hardware']['architecture']."</architecture>\n";
$xml .= "\t\t<free_bios>".$row['hardware']['bios']."</free_bios>\n";
}
@@ -138,7 +139,7 @@ class DownloadController extends BaseController
$xml .= "\t\t<it_works>".$row['hardware']['fingerprint_works']."</it_works>\n";
}
- $devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard','acquisition-card','fingerprint-reader');
+ $devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard','acquisition-card','fingerprint-reader','3G-card');
if (in_array($type,$devicesWithDriverEntry))
{
$xml .= "\t\t<driver>".$row['hardware']['driver']."</driver>\n";
diff --git a/h-source/Application/Controllers/NotebooksController.php b/h-source/Application/Controllers/NotebooksController.php
index 03fe4f4..b533a4e 100644
--- a/h-source/Application/Controllers/NotebooksController.php
+++ b/h-source/Application/Controllers/NotebooksController.php
@@ -55,6 +55,7 @@ class NotebooksController extends GenericController
"+++++checkIsStrings|".Notebooks::videoList() => "video_card_works",
"++++++checkIsStrings|".Notebooks::$biosSelect => "bios",
"+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works",
+ "++++++++checkIsStrings|".Notebooks::$architectureSelect => "architecture",
);
$this->m['HardwareModel']->strongConditions['insert'] = array(
@@ -70,6 +71,7 @@ class NotebooksController extends GenericController
"+++++checkIsStrings|".Notebooks::videoList() => "video_card_works",
"++++++checkIsStrings|".Notebooks::$biosSelect => "bios",
"+++++++checkIsStrings|".Notebooks::webcamList() => "webcam_works",
+ "++++++++checkIsStrings|".Notebooks::$architectureSelect => "architecture",
);
$this->m['HardwareModel']->softConditions['update'] = array(
@@ -92,7 +94,7 @@ class NotebooksController extends GenericController
"+++checkMatch|/^[a-zA-Z0-9\-\_\.\+\s\/\,\:\;\(\)\[\]]+$/" => "webcam_type|only the following characters are allowed for the <i>webcam</i> entry: a-z A-Z 0-9 - _ . + / , : ; ( ) [ ]",
);
- $this->m['HardwareModel']->setFields('vendor,model,compatibility,kernel,description,distribution,video_card_type,video_card_works,wifi_type,wifi_works,comm_year,subtype,bios,webcam_type,webcam_works','sanitizeAll');
+ $this->m['HardwareModel']->setFields('vendor,model,compatibility,kernel,description,distribution,video_card_type,video_card_works,wifi_type,wifi_works,comm_year,subtype,bios,webcam_type,webcam_works,architecture','sanitizeAll');
$argKeys = array(
'page:forceNat' => 1,
diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php
index 17ea425..06b6cc5 100644
--- a/h-source/Application/Include/hardware.php
+++ b/h-source/Application/Include/hardware.php
@@ -241,6 +241,8 @@ class Notebooks extends Hardware
);
public static $subtypeSelect = 'notebook,netbook,not-specified';
+
+ public static $architectureSelect = 'not-specified,i386,amd64,MIPS,ARM';
public static $biosSelect = 'not-specified,no,yes';
diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php
index 2e054c5..9ab5de9 100644
--- a/h-source/Application/Include/languages.php
+++ b/h-source/Application/Include/languages.php
@@ -220,6 +220,7 @@ class Lang
"No fingerprint readers found" => "Non è stato trovato alcun lettore di impronte digitali",
"Download the xml file of all the <b>acquisition cards</b> in the database" => "Scarica il file xml di tutte le <b>schede di acquisizione</b> presenti nel database",
"Download the xml file of all the <b>fingerprint readers</b> in the database" => "Scarica il file xml di tutti i <b>lettori di impronte digitali</b> presenti nel database",
+ "architecture" => "architettura",
),
'es' => array
(
diff --git a/h-source/Application/Models/NotebooksModel.php b/h-source/Application/Models/NotebooksModel.php
index c8d5993..00ab64d 100644
--- a/h-source/Application/Models/NotebooksModel.php
+++ b/h-source/Application/Models/NotebooksModel.php
@@ -52,6 +52,7 @@ class NotebooksModel extends GenericModel {
'vendor' => gtext("vendor"),
'model' => gtext('model name'),
'subtype' => gtext('subtype (notebook or netbook)'),
+ 'architecture' => gtext('architecture'),
'bios' => gtext('does it have a free bios?'),
'comm_year' => gtext('year of commercialization'),
'distribution' => gtext('GNU/Linux distribution used for the test'),
diff --git a/h-source/Application/Views/Help/index.php b/h-source/Application/Views/Help/index.php
index ad9f31b..aff2583 100644
--- a/h-source/Application/Views/Help/index.php
+++ b/h-source/Application/Views/Help/index.php
@@ -388,9 +388,17 @@
dpkg-query -W -f '${Version}\n' cups
</pre>
-
+ <h3>How to discover the architecture of your notebook</h3>
+
+ <p>Open a terminal and type the following command:</p>
+
+ <pre>
+ dpkg --print-architecture
+ </pre>
+
+
<a name="fully-free"><h1>List of fully free GNU/Linux distributions</h1></a>
-
+
<p>They are listed in alphabetical order</p>
<ul>
diff --git a/h-source/Application/Views/Help/index_es.php b/h-source/Application/Views/Help/index_es.php
index df4f09f..df26c25 100644
--- a/h-source/Application/Views/Help/index_es.php
+++ b/h-source/Application/Views/Help/index_es.php
@@ -388,6 +388,14 @@
<pre>
dpkg-query -W -f '${Version}\n' cups
</pre>
+
+ <h3>How to discover the architecture of your notebook</h3>
+
+ <p>Open a terminal and type the following command:</p>
+
+ <pre>
+ dpkg --print-architecture
+ </pre>
<a name="fully-free"><h1>Lista de las distribuciones GNU/Linux completamente libres</h1></a>
diff --git a/h-source/Application/Views/Help/index_fr.php b/h-source/Application/Views/Help/index_fr.php
index 4a51221..e4f63da 100644
--- a/h-source/Application/Views/Help/index_fr.php
+++ b/h-source/Application/Views/Help/index_fr.php
@@ -378,6 +378,14 @@
<pre>
dpkg-query -W -f '${Version}\n' cups
</pre>
+
+ <h3>How to discover the architecture of your notebook</h3>
+
+ <p>Open a terminal and type the following command:</p>
+
+ <pre>
+ dpkg --print-architecture
+ </pre>
<a name="fully-free"><h1>Liste de dristributions GNU/Linux entièrement libre</h1></a>
diff --git a/h-source/Application/Views/Help/index_it.php b/h-source/Application/Views/Help/index_it.php
index 7d8fbe4..d2a6c4b 100644
--- a/h-source/Application/Views/Help/index_it.php
+++ b/h-source/Application/Views/Help/index_it.php
@@ -405,7 +405,14 @@ o compilando dai sorgenti e prova degli screensaver (per esempio <b>Skyrocket</b
<pre>
dpkg-query -W -f '${Version}\n' cups
</pre>
+
+ <h3>Come scoprire l'architettura del tuo notebook</h3>
+ <p>Apri un terminale e digita il seguente comando:</p>
+
+ <pre>
+ dpkg --print-architecture
+ </pre>
<a name="fully-free"><h1>Lista di distribuzioni GNU/Linux completamente libere</h1></a>
diff --git a/h-source/Application/Views/Notebooks/form.php b/h-source/Application/Views/Notebooks/form.php
index 698620e..d4e871b 100644
--- a/h-source/Application/Views/Notebooks/form.php
+++ b/h-source/Application/Views/Notebooks/form.php
@@ -54,6 +54,11 @@
<div class="entry_label"><?php echo gtext("subtype (notebook or netbook)");?>:</div>
<?php echo Html_Form::select('subtype',$values['subtype'],Notebooks::$subtypeSelect,"select_entry");?>
</div>
+
+ <div class="form_entry">
+ <div class="entry_label"><?php echo gtext("architecture");?>:</div>
+ <?php echo Html_Form::select('architecture',$values['architecture'],Notebooks::$architectureSelect,"select_entry");?>
+ </div>
<div class="form_entry">
<div class="entry_label"><?php echo gtext("does it have a free bios?");?></div>
diff --git a/h-source/Application/Views/Notebooks/page.php b/h-source/Application/Views/Notebooks/page.php
index 4de99ff..2af4468 100644
--- a/h-source/Application/Views/Notebooks/page.php
+++ b/h-source/Application/Views/Notebooks/page.php
@@ -52,6 +52,11 @@
<div class="inner_label"><?php echo gtext("subtype (notebook or netbook)");?>:</div>
<div class="inner_value"><b><?php echo $item[$tableName]['subtype'];?></b></div>
</div>
+
+ <div class="notebook_vendor">
+ <div class="inner_label"><?php echo gtext("architecture");?>:</div>
+ <div class="inner_value"><b><?php echo $item[$tableName]['architecture'];?></b></div>
+ </div>
<div class="notebook_vendor">
<div class="inner_label"><?php echo gtext("does it have a free bios?");?></div>
diff --git a/h-source/tables.sql b/h-source/tables.sql
index 34c8ab9..c3e69fe 100644
--- a/h-source/tables.sql
+++ b/h-source/tables.sql
@@ -97,7 +97,8 @@ create table hardware (
webcam_works varchar(30) CHARACTER SET utf8 not null default 'not-specified',
sound_card_works varchar(30) CHARACTER SET utf8 not null default 'not-specified',
bluetooth_works varchar(30) CHARACTER SET utf8 not null default 'not-specified',
- fingerprint_works varchar(30) CHARACTER SET utf8 not null default 'not-specified'
+ fingerprint_works varchar(30) CHARACTER SET utf8 not null default 'not-specified',
+ architecture char(15) not null default 'not-specified'
)engine=innodb;
create table revisions (
@@ -128,6 +129,7 @@ create table revisions (
sound_card_works varchar(30) CHARACTER SET utf8 not null default 'not-specified',
bluetooth_works varchar(30) CHARACTER SET utf8 not null default 'not-specified',
fingerprint_works varchar(30) CHARACTER SET utf8 not null default 'not-specified',
+ architecture char(15) not null default 'not-specified',
id_hard INT UNSIGNED NOT NULL
)engine=innodb;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 11:15:55 +0000