chamilo / chamilo-lms

main/inc/lib/svg-edit/extensions/imagelib/groups.php

Indentation +19 added lines, -19 removed lines

@@ -34,9 +34,9 @@ 
 $array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
 
 if (count($array_to_search) > 0) {
-	while (list($key) = each($array_to_search)) {
-		$all_files[] = basename($array_to_search[$key]['path']);
-	}
+    while (list($key) = each($array_to_search)) {
+        $all_files[] = basename($array_to_search[$key]['path']);
+    }
 }
 
 //get all svg and png group files
@@ -70,26 +70,26 @@ 
         ($is_allowed_to_edit || GroupManager :: is_user_in_group($_user['user_id'], $groupId))) || $group_properties['doc_state'] == 1
 ){
 
-	if (!empty($png_svg_files)) {
-		echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
-		echo '<ul>';
-		foreach($png_svg_files as $filename) {
-			$image = $group_disk_path.$filename;
-
-			if (strpos($filename, "svg")){
-				$new_sizes['width'] = 60;
-				$new_sizes['height'] = 60;
-			} else {
-				$new_sizes = api_resize_image($image, 60, 60);
-			}
+    if (!empty($png_svg_files)) {
+        echo '<h3>'.get_lang('SelectSVGEditImage').'</h3>';
+        echo '<ul>';
+        foreach($png_svg_files as $filename) {
+            $image = $group_disk_path.$filename;
+
+            if (strpos($filename, "svg")){
+                $new_sizes['width'] = 60;
+                $new_sizes['height'] = 60;
+            } else {
+                $new_sizes = api_resize_image($image, 60, 60);
+            }
             echo '<li style="display:inline; padding:8px;">';
             echo '<a href = "'.$group_web_path.$filename.'" alt="'.$filename.'" title="'.$filename.'">';
             echo '<img src = "'.$group_web_path.$filename.'" width = "'.$new_sizes['width'].'" height="'.$new_sizes['height'].'" border="0"></a></li>';
-		}
-		echo '</ul>';
-	}
+        }
+        echo '</ul>';
+    }
 } else {
-	echo Display::display_warning_message(get_lang('OnlyAccessFromYourGroup'));
+    echo Display::display_warning_message(get_lang('OnlyAccessFromYourGroup'));
 }
 ?>
 </body>

main/inc/lib/group_portal_manager.lib.php

Indentation +14 added lines, -14 removed lines

@@ -1335,27 +1335,27 @@
     public static function get_groups_by_user_count($user_id = null, $relation_type = GROUP_USER_PERMISSION_READER, $with_image = false)
     {
         $table_group_rel_user	= Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
-		$tbl_group				= Database::get_main_table(TABLE_MAIN_GROUP);
-		$user_id = intval($user_id);
+        $tbl_group				= Database::get_main_table(TABLE_MAIN_GROUP);
+        $user_id = intval($user_id);
 
-		if ($relation_type == 0) {
-			$where_relation_condition = '';
-		} else {
-			$relation_type 			= intval($relation_type);
-			$where_relation_condition = "AND gu.relation_type = $relation_type ";
-		}
+        if ($relation_type == 0) {
+            $where_relation_condition = '';
+        } else {
+            $relation_type 			= intval($relation_type);
+            $where_relation_condition = "AND gu.relation_type = $relation_type ";
+        }
 
-		$sql = "SELECT count(g.id) as count
+        $sql = "SELECT count(g.id) as count
 				FROM $tbl_group g
 				INNER JOIN $table_group_rel_user gu
 				ON gu.group_id = g.id WHERE gu.user_id = $user_id $where_relation_condition ";
 
-		$result = Database::query($sql);
-		if (Database::num_rows($result) > 0) {
-			$row = Database::fetch_array($result, 'ASSOC');
+        $result = Database::query($sql);
+        if (Database::num_rows($result) > 0) {
+            $row = Database::fetch_array($result, 'ASSOC');
             return $row['count'];
-		}
-		return 0;
+        }
+        return 0;
     }
 
     /**

main/inc/lib/extra_field.lib.php

Indentation +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
         'changeable',
         'filter',
         'extra_field_type',
-         /* Enable this when field_loggeable is introduced as a table field (2.0)
+            /* Enable this when field_loggeable is introduced as a table field (2.0)
         'field_loggeable',
          */
         'created_at'
@@ -523,7 +523,7 @@ 
      * France:Paris;Bretagne;Marseilles;Lyon|Belgique:Bruxelles;Namur;Liège;Bruges|Peru:Lima;Piura;
      * into
      * array(
- *      'France' =>
+     *      'France' =>
      *      array('Paris', 'Bregtane', 'Marseilles'),
      *  'Belgique' =>
      *      array('Namur', 'Liège')
@@ -1184,7 +1184,7 @@ 
 
                         if ($this->type == 'user') {
 
-                           /* //the magic should be here
+                            /* //the magic should be here
                             $user_tags = UserManager::get_user_tags($user_id, $field_details[0]);
 
                             $tag_list = '';

main/inc/lib/diagnoser.lib.php

Indentation +13 added lines, -13 removed lines

@@ -401,19 +401,19 @@
 
     public function format_yes_no_optional($value)
     {
-    	$return = '';
-    	switch($value) {
-     		case 0:
-     			$return = get_lang('No');
-     			break;
-     		case 1:
-     			$return = get_lang('Yes');
-     			break;
-			case 2:
-				$return = get_lang('Optional');
-				break;
-    	}
-    	return $return;
+        $return = '';
+        switch($value) {
+                case 0:
+                 $return = get_lang('No');
+                    break;
+                case 1:
+                 $return = get_lang('Yes');
+                    break;
+            case 2:
+                $return = get_lang('Optional');
+                break;
+        }
+        return $return;
 
     }
 

main/inc/lib/extra_field_value.lib.php

Indentation +5 added lines, -6 removed lines

@@ -720,11 +720,11 @@ 
         return false;
     }
 
-     /**
-     * @param int $itemId
-     * @param int $fieldId
-     * @return array
-     */
+        /**
+         * @param int $itemId
+         * @param int $fieldId
+         * @return array
+         */
     public function getAllValuesByItemAndField($itemId, $fieldId)
     {
         $fieldId = intval($fieldId);
@@ -847,7 +847,6 @@ 
     /**
      * Deletes all values from an item
      * @param int $itemId (session id, course id, etc)
-
      * @assert (-1,-1) == null
      */
     public function deleteValuesByItem($itemId)

main/inc/lib/export.lib.inc.php

Indentation +11 added lines, -11 removed lines

@@ -56,7 +56,7 @@ 
 
         DocumentManager::file_send_for_download($filePath, true, $filename.'.csv');
         exit;
-	}
+    }
 
     /**
      * Export tabular data to XLS-file
@@ -79,7 +79,7 @@ 
 
         DocumentManager::file_send_for_download($filePath, true, $filename.'.xlsx');
         exit;
-	}
+    }
 
     /**
      * Export tabular data to XLS-file (as html table)
@@ -112,13 +112,13 @@ 
     }
 
     /**
-    * Export tabular data to XML-file
-    * @param array  Simple array of data to put in XML
-    * @param string Name of file to be given to the user
-    * @param string Name of common tag to place each line in
-    * @param string Name of the root element. A root element should always be given.
-    * @param string Encoding in which the data is provided
-    */
+     * Export tabular data to XML-file
+     * @param array  Simple array of data to put in XML
+     * @param string Name of file to be given to the user
+     * @param string Name of common tag to place each line in
+     * @param string Name of the root element. A root element should always be given.
+     * @param string Encoding in which the data is provided
+     */
     public static function arrayToXml(
         $data,
         $filename = 'export',
@@ -148,7 +148,7 @@ 
         fclose($handle);
         DocumentManager :: file_send_for_download($file, true, $filename.'.xml');
         exit;
-	}
+    }
 
     /**
      * Export hierarchical tabular data to XML-file
@@ -197,7 +197,7 @@ 
         foreach ($data as $row) {
             $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
             if (is_array($row['value'])) {
-            	$string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
+                $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
                 $string .= str_repeat("\t",$level).'</'.$row['name'].'>';
             } else {
                 $string .= $row['value'];

main/inc/lib/browser/Browser.php

Indentation +9 added lines, -9 removed lines

@@ -256,9 +256,9 @@ 
     }
 
     /**
-    * Is the browser from facebook?
-    * @return boolean True if the browser is from facebook otherwise false
-    */
+     * Is the browser from facebook?
+     * @return boolean True if the browser is from facebook otherwise false
+     */
     public function isFacebook() 
     { 
         return $this->_is_facebook;
@@ -591,12 +591,12 @@ 
             }
             return true;
         } // Test for versions > IE 10
-		else if(stripos($this->_agent, 'trident') !== false) {
-			$this->setBrowser(self::BROWSER_IE);
-			$result = explode('rv:', $this->_agent);
-			$this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
-			$this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
-		} // Test for Pocket IE
+        else if(stripos($this->_agent, 'trident') !== false) {
+            $this->setBrowser(self::BROWSER_IE);
+            $result = explode('rv:', $this->_agent);
+            $this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
+            $this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
+        } // Test for Pocket IE
         else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
             $aresult = explode(' ', stristr($this->_agent, 'mspie'));
             $this->setPlatform(self::PLATFORM_WINDOWS_CE);

main/inc/lib/certificate.lib.php

Indentation +15 added lines, -15 removed lines

@@ -144,8 +144,8 @@ 
     }
 
     /**
-    *  Generates an HTML Certificate and fills the path_certificate field in the DB
-    **/
+     *  Generates an HTML Certificate and fills the path_certificate field in the DB
+     **/
     public function generate($params = array())
     {
         // The user directory should be set
@@ -261,12 +261,12 @@ 
     }
 
     /**
-    * update user info about certificate
-    * @param int $cat_id category id
-    * @param int $user_id user id
-    * @param string $path_certificate the path name of the certificate
-    * @return void()
-    */
+     * update user info about certificate
+     * @param int $cat_id category id
+     * @param int $user_id user id
+     * @param string $path_certificate the path name of the certificate
+     * @return void()
+     */
     public function update_user_info_about_certificate(
         $cat_id,
         $user_id,
@@ -368,13 +368,13 @@ 
     }
 
     /**
-    * Shows the student's certificate (HTML file). If the global setting
-    * allow_public_certificates is set to 'false', no certificate can be printed.
-    * If the global allow_public_certificates is set to 'true' and the course
-    * setting allow_public_certificates is set to 0, no certificate *in this
-    * course* can be printed (for anonymous users). Connected users can always
-    * print them.
-    */
+     * Shows the student's certificate (HTML file). If the global setting
+     * allow_public_certificates is set to 'false', no certificate can be printed.
+     * If the global allow_public_certificates is set to 'true' and the course
+     * setting allow_public_certificates is set to 0, no certificate *in this
+     * course* can be printed (for anonymous users). Connected users can always
+     * print them.
+     */
     public function show()
     {
         // Special rules for anonymous users

main/inc/lib/phpmailer/class.smtp.php

Indentation +429 added lines, -429 removed lines

@@ -47,130 +47,130 @@ 
  */

 

 class SMTP {

-  /**

-   *  SMTP server port

-   *  @var int

-   */

-  public $SMTP_PORT = 25;

-

-  /**

-   *  SMTP reply line ending

-   *  @var string

-   */

-  public $CRLF = "\r\n";

-

-  /**

-   *  Sets whether debugging is turned on

-   *  @var bool

-   */

-  public $do_debug;       // the level of debug to perform

-

-  /**

-   *  Sets VERP use on/off (default is off)

-   *  @var bool

-   */

-  public $do_verp = false;

-

-  /////////////////////////////////////////////////

-  // PROPERTIES, PRIVATE AND PROTECTED

-  /////////////////////////////////////////////////

-

-  private $smtp_conn; // the socket to the server

-  private $error;     // error if any on the last call

-  private $helo_rply; // the reply the server sent to us for HELO

-

-  /**

-   * Initialize the class so that the data is in a known state.

-   * @access public

-   * @return void

-   */

-  public function __construct() {

+    /**

+     *  SMTP server port

+     *  @var int

+     */

+    public $SMTP_PORT = 25;

+

+    /**

+     *  SMTP reply line ending

+     *  @var string

+     */

+    public $CRLF = "\r\n";

+

+    /**

+     *  Sets whether debugging is turned on

+     *  @var bool

+     */

+    public $do_debug;       // the level of debug to perform

+

+    /**

+     *  Sets VERP use on/off (default is off)

+     *  @var bool

+     */

+    public $do_verp = false;

+

+    /////////////////////////////////////////////////

+    // PROPERTIES, PRIVATE AND PROTECTED

+    /////////////////////////////////////////////////

+

+    private $smtp_conn; // the socket to the server

+    private $error;     // error if any on the last call

+    private $helo_rply; // the reply the server sent to us for HELO

+

+    /**

+     * Initialize the class so that the data is in a known state.

+     * @access public

+     * @return void

+     */

+    public function __construct() {

     $this->smtp_conn = 0;

     $this->error = null;

     $this->helo_rply = null;

 

     $this->do_debug = 0;

-  }

-

-  /////////////////////////////////////////////////

-  // CONNECTION FUNCTIONS

-  /////////////////////////////////////////////////

-

-  /**

-   * Connect to the server specified on the port specified.

-   * If the port is not specified use the default SMTP_PORT.

-   * If tval is specified then a connection will try and be

-   * established with the server for that number of seconds.

-   * If tval is not specified the default is 30 seconds to

-   * try on the connection.

-   *

-   * SMTP CODE SUCCESS: 220

-   * SMTP CODE FAILURE: 421

-   * @access public

-   * @return bool

-   */

-  public function Connect($host, $port = 0, $tval = 30) {

+    }

+

+    /////////////////////////////////////////////////

+    // CONNECTION FUNCTIONS

+    /////////////////////////////////////////////////

+

+    /**

+     * Connect to the server specified on the port specified.

+     * If the port is not specified use the default SMTP_PORT.

+     * If tval is specified then a connection will try and be

+     * established with the server for that number of seconds.

+     * If tval is not specified the default is 30 seconds to

+     * try on the connection.

+     *

+     * SMTP CODE SUCCESS: 220

+     * SMTP CODE FAILURE: 421

+     * @access public

+     * @return bool

+     */

+    public function Connect($host, $port = 0, $tval = 30) {

     // set the error val to null so there is no confusion

     $this->error = null;

 

     // make sure we are __not__ connected

     if($this->connected()) {

-      // already connected, generate error

-      $this->error = array("error" => "Already connected to a server");

-      return false;

+        // already connected, generate error

+        $this->error = array("error" => "Already connected to a server");

+        return false;

     }

 

     if(empty($port)) {

-      $port = $this->SMTP_PORT;

+        $port = $this->SMTP_PORT;

     }

 

     // connect to the smtp server

     $this->smtp_conn = @fsockopen($host,    // the host of the server

-                                 $port,    // the port to use

-                                 $errno,   // error number if any

-                                 $errstr,  // error message if any

-                                 $tval);   // give up after ? secs

+                                    $port,    // the port to use

+                                    $errno,   // error number if any

+                                    $errstr,  // error message if any

+                                    $tval);   // give up after ? secs

     // verify we connected properly

     if(empty($this->smtp_conn)) {

-      $this->error = array("error" => "Failed to connect to server",

-                           "errno" => $errno,

-                           "errstr" => $errstr);

-      if($this->do_debug >= 1) {

+        $this->error = array("error" => "Failed to connect to server",

+                            "errno" => $errno,

+                            "errstr" => $errstr);

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     // SMTP server can take longer to respond, give longer timeout for first read

     // Windows does not have support for this timeout function

     if(substr(PHP_OS, 0, 3) != "WIN")

-     socket_set_timeout($this->smtp_conn, $tval, 0);

+        socket_set_timeout($this->smtp_conn, $tval, 0);

 

     // get any announcement

     $announce = $this->get_lines();

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';

     }

 

     return true;

-  }

-

-  /**

-   * Initiate a TLS communication with the server.

-   *

-   * SMTP CODE 220 Ready to start TLS

-   * SMTP CODE 501 Syntax error (no parameters allowed)

-   * SMTP CODE 454 TLS not available due to temporary reason

-   * @access public

-   * @return bool success

-   */

-  public function StartTLS() {

+    }

+

+    /**

+     * Initiate a TLS communication with the server.

+     *

+     * SMTP CODE 220 Ready to start TLS

+     * SMTP CODE 501 Syntax error (no parameters allowed)

+     * SMTP CODE 454 TLS not available due to temporary reason

+     * @access public

+     * @return bool success

+     */

+    public function StartTLS() {

     $this->error = null; # to avoid confusion

 

     if(!$this->connected()) {

-      $this->error = array("error" => "Called StartTLS() without being connected");

-      return false;

+        $this->error = array("error" => "Called StartTLS() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);

@@ -179,35 +179,35 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 220) {

-      $this->error =

-         array("error"     => "STARTTLS not accepted from server",

-               "smtp_code" => $code,

-               "smtp_msg"  => substr($rply,4));

-      if($this->do_debug >= 1) {

+        $this->error =

+            array("error"     => "STARTTLS not accepted from server",

+                "smtp_code" => $code,

+                "smtp_msg"  => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     // Begin encrypted connection

     if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {

-      return false;

+        return false;

     }

 

     return true;

-  }

-

-  /**

-   * Performs SMTP authentication.  Must be run after running the

-   * Hello() method.  Returns true if successfully authenticated.

-   * @access public

-   * @return bool

-   */

-  public function Authenticate($username, $password) {

+    }

+

+    /**

+     * Performs SMTP authentication.  Must be run after running the

+     * Hello() method.  Returns true if successfully authenticated.

+     * @access public

+     * @return bool

+     */

+    public function Authenticate($username, $password) {

     // Start authentication

     fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);

 

@@ -215,14 +215,14 @@ 
     $code = substr($rply,0,3);

 

     if($code != 334) {

-      $this->error =

+        $this->error =

         array("error" => "AUTH not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     // Send encoded username

@@ -232,14 +232,14 @@ 
     $code = substr($rply,0,3);

 

     if($code != 334) {

-      $this->error =

+        $this->error =

         array("error" => "Username not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     // Send encoded password

@@ -249,87 +249,87 @@ 
     $code = substr($rply,0,3);

 

     if($code != 235) {

-      $this->error =

+        $this->error =

         array("error" => "Password not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     return true;

-  }

-

-  /**

-   * Returns true if connected to a server otherwise false

-   * @access public

-   * @return bool

-   */

-  public function Connected() {

+    }

+

+    /**

+     * Returns true if connected to a server otherwise false

+     * @access public

+     * @return bool

+     */

+    public function Connected() {

     if(!empty($this->smtp_conn)) {

-      $sock_status = socket_get_status($this->smtp_conn);

-      if($sock_status["eof"]) {

+        $sock_status = socket_get_status($this->smtp_conn);

+        if($sock_status["eof"]) {

         // the socket is valid but we are not connected

         if($this->do_debug >= 1) {

             echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";

         }

         $this->Close();

         return false;

-      }

-      return true; // everything looks good

+        }

+        return true; // everything looks good

     }

     return false;

-  }

-

-  /**

-   * Closes the socket and cleans up the state of the class.

-   * It is not considered good to use this function without

-   * first trying to use QUIT.

-   * @access public

-   * @return void

-   */

-  public function Close() {

+    }

+

+    /**

+     * Closes the socket and cleans up the state of the class.

+     * It is not considered good to use this function without

+     * first trying to use QUIT.

+     * @access public

+     * @return void

+     */

+    public function Close() {

     $this->error = null; // so there is no confusion

     $this->helo_rply = null;

     if(!empty($this->smtp_conn)) {

-      // close the connection and cleanup

-      fclose($this->smtp_conn);

-      $this->smtp_conn = 0;

-    }

-  }

-

-  /////////////////////////////////////////////////

-  // SMTP COMMANDS

-  /////////////////////////////////////////////////

-

-  /**

-   * Issues a data command and sends the msg_data to the server

-   * finializing the mail transaction. $msg_data is the message

-   * that is to be send with the headers. Each header needs to be

-   * on a single line followed by a <CRLF> with the message headers

-   * and the message body being seperated by and additional <CRLF>.

-   *

-   * Implements rfc 821: DATA <CRLF>

-   *

-   * SMTP CODE INTERMEDIATE: 354

-   *     [data]

-   *     <CRLF>.<CRLF>

-   *     SMTP CODE SUCCESS: 250

-   *     SMTP CODE FAILURE: 552,554,451,452

-   * SMTP CODE FAILURE: 451,554

-   * SMTP CODE ERROR  : 500,501,503,421

-   * @access public

-   * @return bool

-   */

-  public function Data($msg_data) {

+        // close the connection and cleanup

+        fclose($this->smtp_conn);

+        $this->smtp_conn = 0;

+    }

+    }

+

+    /////////////////////////////////////////////////

+    // SMTP COMMANDS

+    /////////////////////////////////////////////////

+

+    /**

+     * Issues a data command and sends the msg_data to the server

+     * finializing the mail transaction. $msg_data is the message

+     * that is to be send with the headers. Each header needs to be

+     * on a single line followed by a <CRLF> with the message headers

+     * and the message body being seperated by and additional <CRLF>.

+     *

+     * Implements rfc 821: DATA <CRLF>

+     *

+     * SMTP CODE INTERMEDIATE: 354

+     *     [data]

+     *     <CRLF>.<CRLF>

+     *     SMTP CODE SUCCESS: 250

+     *     SMTP CODE FAILURE: 552,554,451,452

+     * SMTP CODE FAILURE: 451,554

+     * SMTP CODE ERROR  : 500,501,503,421

+     * @access public

+     * @return bool

+     */

+    public function Data($msg_data) {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Data() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Data() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"DATA" . $this->CRLF);

@@ -338,18 +338,18 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 354) {

-      $this->error =

+        $this->error =

         array("error" => "DATA command not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     /* the server is ready to accept data!

@@ -380,49 +380,49 @@ 
     $field = substr($lines[0],0,strpos($lines[0],":"));

     $in_headers = false;

     if(!empty($field) && !strstr($field," ")) {

-      $in_headers = true;

+        $in_headers = true;

     }

 

     $max_line_length = 998; // used below; set here for ease in change

 

     while(list(,$line) = @each($lines)) {

-      $lines_out = null;

-      if($line == "" && $in_headers) {

+        $lines_out = null;

+        if($line == "" && $in_headers) {

         $in_headers = false;

-      }

-      // ok we need to break this line up into several smaller lines

-      while(strlen($line) > $max_line_length) {

+        }

+        // ok we need to break this line up into several smaller lines

+        while(strlen($line) > $max_line_length) {

         $pos = strrpos(substr($line,0,$max_line_length)," ");

 

         // Patch to fix DOS attack

         if(!$pos) {

-          $pos = $max_line_length - 1;

-          $lines_out[] = substr($line,0,$pos);

-          $line = substr($line,$pos);

+            $pos = $max_line_length - 1;

+            $lines_out[] = substr($line,0,$pos);

+            $line = substr($line,$pos);

         } else {

-          $lines_out[] = substr($line,0,$pos);

-          $line = substr($line,$pos + 1);

+            $lines_out[] = substr($line,0,$pos);

+            $line = substr($line,$pos + 1);

         }

 

         /* if processing headers add a LWSP-char to the front of new line

          * rfc 822 on long msg headers

          */

         if($in_headers) {

-          $line = "\t" . $line;

+            $line = "\t" . $line;

         }

-      }

-      $lines_out[] = $line;

+        }

+        $lines_out[] = $line;

 

-      // send the lines to the server

-      while(list(,$line_out) = @each($lines_out)) {

+        // send the lines to the server

+        while(list(,$line_out) = @each($lines_out)) {

         if(strlen($line_out) > 0)

         {

-          if(substr($line_out, 0, 1) == ".") {

+            if(substr($line_out, 0, 1) == ".") {

             $line_out = "." . $line_out;

-          }

+            }

         }

         fputs($this->smtp_conn,$line_out . $this->CRLF);

-      }

+        }

     }

 

     // message data has been sent

@@ -432,111 +432,111 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => "DATA not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

     return true;

-  }

-

-  /**

-   * Sends the HELO command to the smtp server.

-   * This makes sure that we and the server are in

-   * the same known state.

-   *

-   * Implements from rfc 821: HELO <SP> <domain> <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE ERROR  : 500, 501, 504, 421

-   * @access public

-   * @return bool

-   */

-  public function Hello($host = '') {

+    }

+

+    /**

+     * Sends the HELO command to the smtp server.

+     * This makes sure that we and the server are in

+     * the same known state.

+     *

+     * Implements from rfc 821: HELO <SP> <domain> <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE ERROR  : 500, 501, 504, 421

+     * @access public

+     * @return bool

+     */

+    public function Hello($host = '') {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

+        $this->error = array(

             "error" => "Called Hello() without being connected");

-      return false;

+        return false;

     }

 

     // if hostname for HELO was not specified send default

     if(empty($host)) {

-      // determine appropriate default to send to server

-      $host = "localhost";

+        // determine appropriate default to send to server

+        $host = "localhost";

     }

 

     // Send extended hello first (RFC 2821)

     if(!$this->SendHello("EHLO", $host)) {

-      if(!$this->SendHello("HELO", $host)) {

+        if(!$this->SendHello("HELO", $host)) {

         return false;

-      }

+        }

     }

 

     return true;

-  }

-

-  /**

-   * Sends a HELO/EHLO command.

-   * @access private

-   * @return bool

-   */

-  private function SendHello($hello, $host) {

+    }

+

+    /**

+     * Sends a HELO/EHLO command.

+     * @access private

+     * @return bool

+     */

+    private function SendHello($hello, $host) {

     fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);

 

     $rply = $this->get_lines();

     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => $hello . " not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     $this->helo_rply = $rply;

 

     return true;

-  }

-

-  /**

-   * Starts a mail transaction from the email address specified in

-   * $from. Returns true if successful or false otherwise. If True

-   * the mail transaction is started and then one or more Recipient

-   * commands may be called followed by a Data command.

-   *

-   * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE SUCCESS: 552,451,452

-   * SMTP CODE SUCCESS: 500,501,421

-   * @access public

-   * @return bool

-   */

-  public function Mail($from) {

+    }

+

+    /**

+     * Starts a mail transaction from the email address specified in

+     * $from. Returns true if successful or false otherwise. If True

+     * the mail transaction is started and then one or more Recipient

+     * commands may be called followed by a Data command.

+     *

+     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE SUCCESS: 552,451,452

+     * SMTP CODE SUCCESS: 500,501,421

+     * @access public

+     * @return bool

+     */

+    public function Mail($from) {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Mail() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Mail() without being connected");

+        return false;

     }

 

     $useVerp = ($this->do_verp ? "XVERP" : "");

@@ -546,40 +546,40 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => "MAIL not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

     return true;

-  }

-

-  /**

-   * Sends the quit command to the server and then closes the socket

-   * if there is no error or the $close_on_error argument is true.

-   *

-   * Implements from rfc 821: QUIT <CRLF>

-   *

-   * SMTP CODE SUCCESS: 221

-   * SMTP CODE ERROR  : 500

-   * @access public

-   * @return bool

-   */

-  public function Quit($close_on_error = true) {

+    }

+

+    /**

+     * Sends the quit command to the server and then closes the socket

+     * if there is no error or the $close_on_error argument is true.

+     *

+     * Implements from rfc 821: QUIT <CRLF>

+     *

+     * SMTP CODE SUCCESS: 221

+     * SMTP CODE ERROR  : 500

+     * @access public

+     * @return bool

+     */

+    public function Quit($close_on_error = true) {

     $this->error = null; // so there is no confusion

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Quit() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Quit() without being connected");

+        return false;

     }

 

     // send the quit command to the server

@@ -589,7 +589,7 @@ 
     $byemsg = $this->get_lines();

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';

     }

 

     $rval = true;

@@ -597,42 +597,42 @@ 
 

     $code = substr($byemsg,0,3);

     if($code != 221) {

-      // use e as a tmp var cause Close will overwrite $this->error

-      $e = array("error" => "SMTP server rejected quit command",

-                 "smtp_code" => $code,

-                 "smtp_rply" => substr($byemsg,4));

-      $rval = false;

-      if($this->do_debug >= 1) {

+        // use e as a tmp var cause Close will overwrite $this->error

+        $e = array("error" => "SMTP server rejected quit command",

+                    "smtp_code" => $code,

+                    "smtp_rply" => substr($byemsg,4));

+        $rval = false;

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';

-      }

+        }

     }

 

     if(empty($e) || $close_on_error) {

-      $this->Close();

+        $this->Close();

     }

 

     return $rval;

-  }

-

-  /**

-   * Sends the command RCPT to the SMTP server with the TO: argument of $to.

-   * Returns true if the recipient was accepted false if it was rejected.

-   *

-   * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250,251

-   * SMTP CODE FAILURE: 550,551,552,553,450,451,452

-   * SMTP CODE ERROR  : 500,501,503,421

-   * @access public

-   * @return bool

-   */

-  public function Recipient($to) {

+    }

+

+    /**

+     * Sends the command RCPT to the SMTP server with the TO: argument of $to.

+     * Returns true if the recipient was accepted false if it was rejected.

+     *

+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250,251

+     * SMTP CODE FAILURE: 550,551,552,553,450,451,452

+     * SMTP CODE ERROR  : 500,501,503,421

+     * @access public

+     * @return bool

+     */

+    public function Recipient($to) {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Recipient() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Recipient() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);

@@ -641,41 +641,41 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250 && $code != 251) {

-      $this->error =

+        $this->error =

         array("error" => "RCPT not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

     return true;

-  }

-

-  /**

-   * Sends the RSET command to abort and transaction that is

-   * currently in progress. Returns true if successful false

-   * otherwise.

-   *

-   * Implements rfc 821: RSET <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE ERROR  : 500,501,504,421

-   * @access public

-   * @return bool

-   */

-  public function Reset() {

+    }

+

+    /**

+     * Sends the RSET command to abort and transaction that is

+     * currently in progress. Returns true if successful false

+     * otherwise.

+     *

+     * Implements rfc 821: RSET <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE ERROR  : 500,501,504,421

+     * @access public

+     * @return bool

+     */

+    public function Reset() {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Reset() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Reset() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"RSET" . $this->CRLF);

@@ -684,46 +684,46 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => "RSET failed",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     return true;

-  }

-

-  /**

-   * Starts a mail transaction from the email address specified in

-   * $from. Returns true if successful or false otherwise. If True

-   * the mail transaction is started and then one or more Recipient

-   * commands may be called followed by a Data command. This command

-   * will send the message to the users terminal if they are logged

-   * in and send them an email.

-   *

-   * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE SUCCESS: 552,451,452

-   * SMTP CODE SUCCESS: 500,501,502,421

-   * @access public

-   * @return bool

-   */

-  public function SendAndMail($from) {

+    }

+

+    /**

+     * Starts a mail transaction from the email address specified in

+     * $from. Returns true if successful or false otherwise. If True

+     * the mail transaction is started and then one or more Recipient

+     * commands may be called followed by a Data command. This command

+     * will send the message to the users terminal if they are logged

+     * in and send them an email.

+     *

+     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE SUCCESS: 552,451,452

+     * SMTP CODE SUCCESS: 500,501,502,421

+     * @access public

+     * @return bool

+     */

+    public function SendAndMail($from) {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-          "error" => "Called SendAndMail() without being connected");

-      return false;

+        $this->error = array(

+            "error" => "Called SendAndMail() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);

@@ -732,82 +732,82 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => "SAML not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

     return true;

-  }

-

-  /**

-   * This is an optional command for SMTP that this class does not

-   * support. This method is here to make the RFC821 Definition

-   * complete for this class and __may__ be implimented in the future

-   *

-   * Implements from rfc 821: TURN <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE FAILURE: 502

-   * SMTP CODE ERROR  : 500, 503

-   * @access public

-   * @return bool

-   */

-  public function Turn() {

+    }

+

+    /**

+     * This is an optional command for SMTP that this class does not

+     * support. This method is here to make the RFC821 Definition

+     * complete for this class and __may__ be implimented in the future

+     *

+     * Implements from rfc 821: TURN <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE FAILURE: 502

+     * SMTP CODE ERROR  : 500, 503

+     * @access public

+     * @return bool

+     */

+    public function Turn() {

     $this->error = array("error" => "This method, TURN, of the SMTP ".

                                     "is not implemented");

     if($this->do_debug >= 1) {

-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';

+        echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';

     }

     return false;

-  }

-

-  /**

-  * Get the current error

-  * @access public

-  * @return array

-  */

-  public function getError() {

+    }

+

+    /**

+     * Get the current error

+     * @access public

+     * @return array

+     */

+    public function getError() {

     return $this->error;

-  }

-

-  /////////////////////////////////////////////////

-  // INTERNAL FUNCTIONS

-  /////////////////////////////////////////////////

-

-  /**

-   * Read in as many lines as possible

-   * either before eof or socket timeout occurs on the operation.

-   * With SMTP we can tell if we have more lines to read if the

-   * 4th character is '-' symbol. If it is a space then we don't

-   * need to read anything else.

-   * @access private

-   * @return string

-   */

-  private function get_lines() {

+    }

+

+    /////////////////////////////////////////////////

+    // INTERNAL FUNCTIONS

+    /////////////////////////////////////////////////

+

+    /**

+     * Read in as many lines as possible

+     * either before eof or socket timeout occurs on the operation.

+     * With SMTP we can tell if we have more lines to read if the

+     * 4th character is '-' symbol. If it is a space then we don't

+     * need to read anything else.

+     * @access private

+     * @return string

+     */

+    private function get_lines() {

     $data = "";

     while($str = @fgets($this->smtp_conn,515)) {

-      if($this->do_debug >= 4) {

+        if($this->do_debug >= 4) {

         echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';

         echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';

-      }

-      $data .= $str;

-      if($this->do_debug >= 4) {

+        }

+        $data .= $str;

+        if($this->do_debug >= 4) {

         echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';

-      }

-      // if 4th character is a space, we are done reading, break the loop

-      if(substr($str,3,1) == " ") { break; }

+        }

+        // if 4th character is a space, we are done reading, break the loop

+        if(substr($str,3,1) == " ") { break; }

     }

     return $data;

-  }

+    }

 

 }