diff --git a/CHANGELOG b/CHANGELOG index 3fd4bdcb0..e6ce308c1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -44,7 +44,10 @@ Version 1.0.11 to be released - Bug #641: CDbCache::gc() is not defined (Qiang) - Bug #651: Fixed a bug in Oracle driver that may cause big loop (Qiang) - Bug #653: CDbMessageSource does translate messages when caching is enabled (Qiang) +- Bug #670: Requirements checker page shows wrong minute (Qiang) - Enh #643: Enhanced CAccessControlFilter::expression, COutputCache::varyByExpression and CExpressionDependency::expression so that they can use PHP callback (Qiang) +- Enh #665: Added support for using CStarRating to collect tabular input (Qiang) +- Enh #672: Added Italian translation of error views (Qiang) - Enh: Added core message translation in Thai (Peerajak) - Enh: Allow CHtml::label() and CHtml::activeLabel() not to render the 'for' attribute when it is set false (Qiang) diff --git a/framework/db/schema/oci/COciSchema.php b/framework/db/schema/oci/COciSchema.php index 95e5c6dcd..24d823287 100644 --- a/framework/db/schema/oci/COciSchema.php +++ b/framework/db/schema/oci/COciSchema.php @@ -9,7 +9,7 @@ */ /** - * COciSchema is the class for retrieving metadata information from a PostgreSQL database. + * COciSchema is the class for retrieving metadata information from an Oracle database. * * @author Ricardo Grana * @version $Id$ diff --git a/framework/db/schema/oci/COciTableSchema.php b/framework/db/schema/oci/COciTableSchema.php index 2750136ca..e559d6e9d 100644 --- a/framework/db/schema/oci/COciTableSchema.php +++ b/framework/db/schema/oci/COciTableSchema.php @@ -9,7 +9,7 @@ */ /** - * COciTableSchema represents the metadata for a Ora table. + * COciTableSchema represents the metadata for a Oracle table. * * @author Ricardo Grana * @version $Id$ diff --git a/framework/views/it/error.php b/framework/views/it/error.php new file mode 100644 index 000000000..2df10c631 --- /dev/null +++ b/framework/views/it/error.php @@ -0,0 +1,37 @@ + + + + +Errore <?php echo $data['code']; ?> + + + + + +

Errore

+

+

+Questo errore è avvenuto quando il server Web stava elaborando la tua richiesta. +

+

+Se pensi che è un errore del server, contatta cortesemente . +

+

+Grazie. +

+
+ +
+ + \ No newline at end of file diff --git a/framework/views/it/error400.php b/framework/views/it/error400.php new file mode 100644 index 000000000..349daeca3 --- /dev/null +++ b/framework/views/it/error400.php @@ -0,0 +1,33 @@ + + + + +Richiesta Errata + + + +

Richiesta Errata

+

+

+La richiesta non è stata gestita dal server a causa di una sintassi non corretta. +Cortesemente non ripetere la richiesta senza modifiche. +

+

+Se pensi che è un errore del server, contatta cortesemente . +

+
+ +
+ + \ No newline at end of file diff --git a/framework/views/it/error403.php b/framework/views/it/error403.php new file mode 100644 index 000000000..b36c2f376 --- /dev/null +++ b/framework/views/it/error403.php @@ -0,0 +1,32 @@ + + + + +Non autorizzato + + + +

Non autorizzato

+

+

+Tu non possiede le giuste credenziali per accedere a questa pagine. +

+

+Se pensi che è un errore del server, contatta cortesemente . +

+
+ +
+ + \ No newline at end of file diff --git a/framework/views/it/error404.php b/framework/views/it/error404.php new file mode 100644 index 000000000..64aabf54b --- /dev/null +++ b/framework/views/it/error404.php @@ -0,0 +1,33 @@ + + + + +Pagina non trovata + + + +

Pagina non trovata

+

+

+L'URL richiesto non è stato trovato su questo server. +Se tu hai digitato l'URL manualmente, prego controlla meglio e riprova. +

+

+Se pensi che è un errore del server, contatta cortesemente . +

+
+ +
+ + \ No newline at end of file diff --git a/framework/views/it/error500.php b/framework/views/it/error500.php new file mode 100644 index 000000000..d73e3f9a8 --- /dev/null +++ b/framework/views/it/error500.php @@ -0,0 +1,35 @@ + + + + +Internal Server Error + + + + + +

Internal Server Error

+

+

+Un errore interno è occorso mentre il server web stava elaborando la tua richiesta. +Contatta cortesemente per avvisarlo dell'errore. +

+

+Grazie. +

+
+ +
+ + \ No newline at end of file diff --git a/framework/views/it/error503.php b/framework/views/it/error503.php new file mode 100644 index 000000000..c2bd1e488 --- /dev/null +++ b/framework/views/it/error503.php @@ -0,0 +1,31 @@ + + + + +Servizio non disponibile + + + +

Servizio non disponibile

+

+Il nostro sistema è attualmente in manutenzione. Prova più tardi. +

+

+Grazie. +

+
+ +
+ + \ No newline at end of file diff --git a/framework/views/it/exception.php b/framework/views/it/exception.php new file mode 100644 index 000000000..992f5357f --- /dev/null +++ b/framework/views/it/exception.php @@ -0,0 +1,74 @@ + + + + + +<?php echo CHtml::encode($data['type']); ?> + + + + + + +

+ +

Descrizione

+

+ +

+ +

File Sorgente

+

+ +

+ +
+
+$code)
+	{
+		if($line!==$data['line'])
+			echo CHtml::encode(sprintf("%05d: %s",$line,str_replace("\t",'    ',$code)));
+		else
+		{
+			echo "
";
+			echo CHtml::encode(sprintf("%05d: %s",$line,str_replace("\t",'    ',$code)));
+			echo "
";
+		}
+	}
+}
+?>
+
+
+ +

Stack Trace

+
+
+
+
+
+ +
+ +
+ + \ No newline at end of file diff --git a/framework/views/it/log-firebug.php b/framework/views/it/log-firebug.php new file mode 100644 index 000000000..40ac66386 --- /dev/null +++ b/framework/views/it/log-firebug.php @@ -0,0 +1,23 @@ + \ No newline at end of file diff --git a/framework/views/it/log.php b/framework/views/it/log.php new file mode 100644 index 000000000..65e269be2 --- /dev/null +++ b/framework/views/it/log.php @@ -0,0 +1,32 @@ + + + + + + + + + + +$log) +{ + $color=($index%2)?'#F5F5F5':'#EBF8FE'; + $message='
'.CHtml::encode(wordwrap($log[0])).'
'; + $time=date('H:i:s.',$log[3]).(int)(($log[3]-(int)$log[3])*1000000); + + echo << + + + + + +EOD; +} +?> +
+ Log Applicativo +
TimestampLivelloCategoria/th> + Messaggio
{$time}{$log[1]}{$log[2]}{$message}
+ \ No newline at end of file diff --git a/framework/views/it/profile-callstack-firebug.php b/framework/views/it/profile-callstack-firebug.php new file mode 100644 index 000000000..45ff85f18 --- /dev/null +++ b/framework/views/it/profile-callstack-firebug.php @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/framework/views/it/profile-callstack.php b/framework/views/it/profile-callstack.php new file mode 100644 index 000000000..770006721 --- /dev/null +++ b/framework/views/it/profile-callstack.php @@ -0,0 +1,30 @@ + + + + + + + + + +$entry) +{ + $color=($index%2)?'#F5F5F5':'#EBF8FE'; + list($proc,$time,$level)=$entry; + $proc=CHtml::encode($proc); + $time=sprintf('%0.5f',$time); + $spaces=str_repeat(' ',$level*8); + + echo << + + + +EOD; +} +?> +
+ Report Profiling Callstack +
ProcedureTime (s)
{$spaces}{$proc}{$time}
+ \ No newline at end of file diff --git a/framework/views/it/profile-summary-firebug.php b/framework/views/it/profile-summary-firebug.php new file mode 100644 index 000000000..2ee4453d5 --- /dev/null +++ b/framework/views/it/profile-summary-firebug.php @@ -0,0 +1,22 @@ + diff --git a/framework/views/it/profile-summary.php b/framework/views/it/profile-summary.php new file mode 100644 index 000000000..264bda37c --- /dev/null +++ b/framework/views/it/profile-summary.php @@ -0,0 +1,41 @@ + + + + + + + + + + + + + +$entry) +{ + $color=($index%2)?'#F5F5F5':'#EBF8FE'; + $proc=CHtml::encode($entry[0]); + $min=sprintf('%0.5f',$entry[2]); + $max=sprintf('%0.5f',$entry[3]); + $total=sprintf('%0.5f',$entry[4]); + $average=sprintf('%0.5f',$entry[4]/$entry[1]); + + echo << + + + + + + + +EOD; +} +?> +
+ Report Sommario di Profiling + (Tempo: getExecutionTime()); ?>s, + Memoria: getMemoryUsage()/1024); ?>KB) +
ProceduraCountTotale (s)Avg. (s)Min. (s)Max. (s)
{$proc}{$entry[1]}{$total}{$average}{$min}{$max}
+ \ No newline at end of file diff --git a/framework/web/CClientScript.php b/framework/web/CClientScript.php index 05c5a9daf..012ea6ad0 100644 --- a/framework/web/CClientScript.php +++ b/framework/web/CClientScript.php @@ -219,9 +219,9 @@ class CClientScript extends CApplicationComponent { $html=''; foreach($this->_metas as $meta) - $html.=CHtml::metaTag($meta['content'],null,null,$meta); + $html.=CHtml::metaTag($meta['content'],null,null,$meta)."\n"; foreach($this->_links as $link) - $html.=CHtml::linkTag(null,null,null,null,$link); + $html.=CHtml::linkTag(null,null,null,null,$link)."\n"; foreach($this->cssFiles as $url=>$media) $html.=CHtml::cssFile($url,$media)."\n"; foreach($this->_css as $css) diff --git a/framework/web/widgets/CStarRating.php b/framework/web/widgets/CStarRating.php index 9bbcd6d01..8b0fa83b7 100644 --- a/framework/web/widgets/CStarRating.php +++ b/framework/web/widgets/CStarRating.php @@ -157,7 +157,9 @@ class CStarRating extends CInputWidget { $inputCount=(int)(($this->maxRating-$this->minRating)/$this->ratingStepSize+1); $starSplit=(int)($inputCount/$this->starCount); - $selection=$this->hasModel() ? $this->model->{$this->attribute} : $this->value; + $attr=$this->attribute; + CHtml::resolveName($this->model,$attr); + $selection=$this->hasModel() ? $this->model->$attr : $this->value; $options=$starSplit>1 ? array('class'=>"{split:{$starSplit}}") : array(); for($value=$this->minRating, $i=0;$i<$inputCount; ++$i, $value+=$this->ratingStepSize) { diff --git a/requirements/index.php b/requirements/index.php index 16d4c7796..58519aa13 100644 --- a/requirements/index.php +++ b/requirements/index.php @@ -196,7 +196,7 @@ function getServerInfo() { $info[]=isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : ''; $info[]='Yii Framework/'.getYiiVersion(); - $info[]=@strftime('%Y-%m-%d %H:%m',time()); + $info[]=@strftime('%Y-%m-%d %H:%M',time()); return implode(' ',$info); } @@ -208,18 +208,14 @@ function renderFile($_file_,$_params_=array()) } $result=1; // 1: all pass, 0: fail, -1: pass with warnings -$n=count($requirements); -for($i=0;$i<$n;++$i) + +foreach($requirements as $i=>$requirement) { - $requirement=$requirements[$i]; if($requirement[1] && !$requirement[2]) $result=0; else if($result>0 && !$requirement[1] && !$requirement[2]) $result=-1; - $requirements[$i][0]=$requirements[$i][0]; - $requirements[$i][3]=$requirements[$i][3]; - $requirements[$i][4]=$requirements[$i][4]; - if($requirements[$i][4]==='') + if($requirement[4]==='') $requirements[$i][4]=' '; }