chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - formatting code, fixing PHP warnings.

Browse Source
1.9.x
Julio Montoya 12 years ago
parent e7c083de0c
commit cc720b5c36
7 changed files with 117 additions and 115 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/inc/lib/pdf.lib.php
  2. 14
      main/inc/lib/pear/HTML/QuickForm.php
  3. 10
      main/inc/lib/pear/HTML/QuickForm/date.php
  4. 2
      main/inc/lib/pear/HTML/QuickForm/element.php
  5. 18
      main/inc/lib/pear/Text/Diff.php

2
main/inc/lib/pdf.lib.php
Unescape View File

@ -355,7 +355,7 @@ class PDF
if (!empty($css)) {
$this->pdf->WriteHTML($css, 1);
}
$this->pdf->WriteHTML($document_html,2);
$this->pdf->WriteHTML($document_html, 2);
if (empty($pdf_name)) {
$output_file = 'pdf_'.date('Y-m-d-his').'.pdf';

14
main/inc/lib/pear/HTML/QuickForm.php
Unescape View File

@ -668,13 +668,20 @@ class HTML_QuickForm extends HTML_Common
// Add the element if it is not an incompatible duplicate
if (!empty($elementName) && isset($this->_elementIndex[$elementName])) {
if ($this->_elements[$this->_elementIndex[$elementName]]->getType() ==
$elementObject->getType()) {
if ($this->_elements[$this->_elementIndex[$elementName]]->getType() == $elementObject->getType()
) {
$this->_elements[] =& $elementObject;
$elKeys = array_keys($this->_elements);
$this->_duplicateIndex[$elementName][] = end($elKeys);
} else {
$error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, "Element '$elementName' already exists in HTML_QuickForm::addElement()", 'HTML_QuickForm_Error', true);
$error = PEAR::raiseError(
null,
QUICKFORM_INVALID_ELEMENT_NAME,
null,
E_USER_WARNING,
"Element '$elementName' already exists in HTML_QuickForm::addElement()", 'HTML_QuickForm_Error',
true
);
return $error;
}
} else {
@ -682,6 +689,7 @@ class HTML_QuickForm extends HTML_Common
$elKeys = array_keys($this->_elements);
$this->_elementIndex[$elementName] = end($elKeys);
}
if ($this->_freezeAll) {
$elementObject->freeze();
}

10
main/inc/lib/pear/HTML/QuickForm/date.php
Unescape View File

@ -305,9 +305,6 @@ class HTML_QuickForm_date extends HTML_QuickForm_group
}
}
// }}}
// {{{ _createElements()
function _createElements()
{
$this->_separator = $this->_elements = array();
@ -315,8 +312,6 @@ class HTML_QuickForm_date extends HTML_QuickForm_group
$locale =& $this->_locale[$this->_options['language']];
$backslash = false;
// Modified by Ivan Tcholakov, 16-MAR-2010.
//for ($i = 0, $length = strlen($this->_options['format']); $i < $length; $i++) {
// $sign = $this->_options['format']{$i};
for ($i = 0, $length = api_strlen($this->_options['format']); $i < $length; $i++) {
$sign = api_substr($this->_options['format'], $i, 1);
//
@ -503,7 +498,7 @@ class HTML_QuickForm_date extends HTML_QuickForm_group
function toHtml()
{
include_once('HTML/QuickForm/Renderer/Default.php');
include_once 'HTML/QuickForm/Renderer/Default.php';
$renderer = new HTML_QuickForm_Renderer_Default();
$renderer->setElementTemplate('{element}');
parent::accept($renderer);
@ -531,7 +526,4 @@ class HTML_QuickForm_date extends HTML_QuickForm_group
return parent::onQuickFormEvent($event, $arg, $caller);
}
}
// }}}
}
?>

2
main/inc/lib/pear/HTML/QuickForm/element.php
Unescape View File

@ -89,7 +89,7 @@ class HTML_QuickForm_element extends HTML_Common
* @access public
* @return void
*/
function HTML_QuickForm_element($elementName=null, $elementLabel=null, $attributes=null)
function HTML_QuickForm_element($elementName = null, $elementLabel = null, $attributes = null)
{
HTML_Common::HTML_Common($attributes);
if (isset($elementName)) {

18
main/inc/lib/pear/Text/Diff.php
Unescape View File

@ -17,7 +17,8 @@
* @package Text_Diff
* @author Geoffrey T. Dairiki <dairiki@dairiki.org>
*/
class Text_Diff {
class Text_Diff
{
/**
* Array of changes.
@ -380,10 +381,9 @@ class Text_Diff_Op_copy extends Text_Diff_Op {
function &reverse()
{
$reverse = &new Text_Diff_Op_copy($this->final, $this->orig);
$reverse = new Text_Diff_Op_copy($this->final, $this->orig);
return $reverse;
}
}
/**
@ -392,7 +392,8 @@ class Text_Diff_Op_copy extends Text_Diff_Op {
*
* @access private
*/
class Text_Diff_Op_delete extends Text_Diff_Op {
class Text_Diff_Op_delete extends Text_Diff_Op
{
function Text_Diff_Op_delete($lines)
{
@ -402,7 +403,7 @@ class Text_Diff_Op_delete extends Text_Diff_Op {
function &reverse()
{
$reverse = &new Text_Diff_Op_add($this->orig);
$reverse = new Text_Diff_Op_add($this->orig);
return $reverse;
}
@ -424,7 +425,7 @@ class Text_Diff_Op_add extends Text_Diff_Op {
function &reverse()
{
$reverse = &new Text_Diff_Op_delete($this->final);
$reverse = new Text_Diff_Op_delete($this->final);
return $reverse;
}
@ -436,7 +437,8 @@ class Text_Diff_Op_add extends Text_Diff_Op {
*
* @access private
*/
class Text_Diff_Op_change extends Text_Diff_Op {
class Text_Diff_Op_change extends Text_Diff_Op
{
function Text_Diff_Op_change($orig, $final)
{
@ -446,7 +448,7 @@ class Text_Diff_Op_change extends Text_Diff_Op {
function &reverse()
{
$reverse = &new Text_Diff_Op_change($this->final, $this->orig);
$reverse = new Text_Diff_Op_change($this->final, $this->orig);
return $reverse;
}

Write Preview
Loading…
Cancel
Save