From dd6719738936be31cdaa1758ca86d5eb14dcab3d Mon Sep 17 00:00:00 2001 From: Barry Mieny Date: Mon, 4 Oct 2010 16:33:58 +0200 Subject: Cleanup of stray spaces and tabs --- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/cart.html | 18 ++++++++--------- user_guide/libraries/email.html | 4 ++-- user_guide/libraries/file_uploading.html | 18 ++++++++--------- user_guide/libraries/form_validation.html | 30 ++++++++++++++--------------- user_guide/libraries/ftp.html | 12 ++++++------ user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/loader.html | 6 +++--- user_guide/libraries/output.html | 4 ++-- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/table.html | 8 ++++---- user_guide/libraries/typography.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/xmlrpc.html | 32 +++++++++++++++---------------- 14 files changed, 71 insertions(+), 71 deletions(-) (limited to 'user_guide/libraries') diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index 74a8619bf..2c052424d 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -114,7 +114,7 @@ how data passed to your cells is handled so you can pass different types of info

Setting Display Preferences

-

There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an +

There are seven preferences you can set to control various aspects of the calendar. Preferences are set by passing an array of preferences in the second parameter of the loading function. Here is an example:

diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index 0dcf04acc..fb5f6621c 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -58,7 +58,7 @@ Shopping Cart Class

Shopping Cart Class

-

The Cart Class permits items to be added to a session that stays active while a user is browsing your site. +

The Cart Class permits items to be added to a session that stays active while a user is browsing your site. These items can be retrieved and displayed in a standard "shopping cart" format, allowing the user to update the quantity or remove items from the cart.

Please note that the Cart Class ONLY provides the core "cart" functionality. It does not provide shipping, credit card authorization, or other processing components.

@@ -109,7 +109,7 @@ It is intended to be used in cases where your product has options associated wit
  • options - Any additional attributes that are needed to identify the product. These must be passed via an array. -

    In addition to the five indexes above, there are two reserved words: rowid and subtotal. These are used internally by the Cart class, so +

    In addition to the five indexes above, there are two reserved words: rowid and subtotal. These are used internally by the Cart class, so please do NOT use those words as index names when inserting data into the cart.

    Your array may contain additional data. Anything you include in your array will be stored in the session. However, it is best to standardize your data among @@ -181,24 +181,24 @@ $this->cart->insert($data); <?php foreach($this->cart->contents() as $items): ?> <?php echo form_hidden($i.'[rowid]', $items['rowid']); ?> - + <tr> <td><?php echo form_input(array('name' => $i.'[qty]', 'value' => $items['qty'], 'maxlength' => '3', 'size' => '5')); ?></td> <td> <?php echo $items['name']; ?> - + <?php if ($this->cart->has_options($items['rowid']) == TRUE): ?> - + <p> <?php foreach ($this->cart->product_options($items['rowid']) as $option_name => $option_value): ?> - + <strong><?php echo $option_name; ?>:</strong> <?php echo $option_value; ?><br /> - + <?php endforeach; ?> </p> - + <?php endif; ?> - + </td> <td style="text-align:right"><?php echo $this->cart->format_number($items['price']); ?></td> <td style="text-align:right">$<?php echo $this->cart->format_number($items['subtotal']); ?></td> diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index e144826be..b863ef4c1 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -83,7 +83,7 @@ Email Class $this->load->library('email');

    -$this->email->from('your@example.com', 'Your Name');
    +$this->email->from('your@example.com', 'Your Name');
    $this->email->to('someone@example.com');
    $this->email->cc('another@another-example.com');
    $this->email->bcc('them@their-example.com');
    @@ -233,7 +233,7 @@ in a loop, permitting the data to be reset between cycles.

    foreach ($list as $name => $address)
    {
        $this->email->clear();

    - +     $this->email->to($address);
        $this->email->from('your@example.com');
        $this->email->subject('Here is your info '.$name);
    diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index 31041341f..254b2666a 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -145,15 +145,15 @@ folder:

    diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 2099135a0..1d0b57181 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -106,7 +106,7 @@ have left the old class in the library so applications currently using it will n
    1. A form is displayed.
    2. You fill it in and submit it.
      3. -
    3. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data +
    4. If you submitted something invalid, or perhaps missed a required item, the form is redisplayed containing your data along with an error message describing the problem.
    5. This process continues until you have submitted a valid form.
    @@ -225,13 +225,13 @@ folder:

    @@ -616,7 +616,7 @@ $this->form_validation->set_rules('first_name', 'lang:first_name', 'r

    Changing the Error Delimiters

    -

    By default, the Form Validation class adds a paragraph tag (<p>) around each error message shown. You can either change these delimiters globally or +

    By default, the Form Validation class adds a paragraph tag (<p>) around each error message shown. You can either change these delimiters globally or individually.

      diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index a46b155b9..493177655 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -82,7 +82,7 @@ $this->load->library('ftp');
      $config['hostname'] = 'ftp.example.com';
      $config['username'] = 'your-username';
      $config['password'] = 'your-password';
      -$config['debug'] = TRUE;
      +$config['debug'] = TRUE;

      $this->ftp->connect($config);

      @@ -101,7 +101,7 @@ $this->load->library('ftp');
      $config['hostname'] = 'ftp.example.com';
      $config['username'] = 'your-username';
      $config['password'] = 'your-password';
      -$config['debug'] = TRUE;
      +$config['debug'] = TRUE;

      $this->ftp->connect($config);

      @@ -121,7 +121,7 @@ $this->load->library('ftp');
      $config['hostname'] = 'ftp.example.com';
      $config['username'] = 'your-username';
      $config['password'] = 'your-password';
      -$config['debug'] = TRUE;
      +$config['debug'] = TRUE;

      $this->ftp->connect($config);

      @@ -231,7 +231,7 @@ $this->ftp->delete_file('/public_html/joe/blog.html');

      $this->ftp->delete_dir()

      Lets you delete a directory and everything it contains. Supply the source path to the directory with a trailing slash.

      -

      Important  Be VERY careful with this function. It will recursively delete +

      Important  Be VERY careful with this function. It will recursively delete everything within the supplied path, including sub-folders and all files. Make absolutely sure your path is correct. Try using the list_files() function first to verify that your path is correct.

      @@ -242,7 +242,7 @@ $this->ftp->delete_dir('/public_html/path/to/folder/');

      $this->ftp->list_files()

      -

      Permits you to retrieve a list of files on your server returned as an array. You must supply +

      Permits you to retrieve a list of files on your server returned as an array. You must supply the path to the desired directory.

      @@ -254,7 +254,7 @@ print_r($list);

      $this->ftp->mirror()

      -

      Recursively reads a local folder and everything it contains (including sub-folders) and creates a +

      Recursively reads a local folder and everything it contains (including sub-folders) and creates a mirror via FTP based on it. Whatever the directory structure of the original file path will be recreated on the server. You must supply a source path and a destination path:

      diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index 3dce50bf2..98ed4f6dd 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -447,7 +447,7 @@ calling the watermark function. Here is an example:

      $config['source_image'] = '/path/to/image/mypic.jpg';
      -$config['wm_text'] = 'Copyright 2006 - John Doe';
      +$config['wm_text'] = 'Copyright 2006 - John Doe';
      $config['wm_type'] = 'text';
      $config['wm_font_path'] = './system/fonts/texb.ttf';
      $config['wm_font_size'] = '16';
      diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index 1d5a47f40..34e3929a9 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -78,8 +78,8 @@ Note: We use the terms "class" and "library" interchangeably.

      Once loaded, the library will be ready for use, using $this->email->some_function().

      -

      Library files can be stored in subdirectories within the main "libraries" folder, or within your personal application/libraries folder. -To load a file located in a subdirectory, simply include the path, relative to the "libraries" folder. +

      Library files can be stored in subdirectories within the main "libraries" folder, or within your personal application/libraries folder. +To load a file located in a subdirectory, simply include the path, relative to the "libraries" folder. For example, if you have file located at:

      libraries/flavors/chocolate.php @@ -217,7 +217,7 @@ $this->load->library('foo_bar');

      When your controller is finished using resources from an application package, and particularly if you have other application packages you want to work with, you may wish to remove the package path so the Loader no longer looks in that folder for resources. To remove the last path added, simply call the method with no parameters.

      $this->load->remove_package_path()

      - +

      Or to remove a specific package path, specify the same path previously given to add_package_path() for a package.:

      $this->load->remove_package_path(APPPATH.'third_party/foo_bar/'); diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index eeb278371..a1427de7b 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -140,9 +140,9 @@ at the bottom of your pages for debugging and optimization purposes.

      Parsing Execution Variables

      CodeIgniter will parse the pseudo-variables {elapsed_time} and {memory_usage} in your output by default. To disable this, set the $parse_exec_vars class property to FALSE in your controller. - + $this->output->parse_exec_vars = FALSE; - + diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 521b708b1..42c102c8d 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -69,7 +69,7 @@ Pagination Class

      Here is a simple example showing how to create pagination in one of your controller functions:

      -$this->load->library('pagination');

      +$this->load->library('pagination');

      $config['base_url'] = 'http://example.com/index.php/test/page/';
      $config['total_rows'] = '200';
      $config['per_page'] = '20'; diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index f1a46fca0..e90aca3d2 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -83,7 +83,7 @@ $data = array(
                   array('John', 'Green', 'Medium')
                   );

      -echo $this->table->generate($data); +echo $this->table->generate($data);

      Here is an example of a table created from a database query result. The table class will automatically generate the @@ -95,7 +95,7 @@ $this->load->library('table');

      $query = $this->db->query("SELECT * FROM my_table");

      -echo $this->table->generate($query); +echo $this->table->generate($query);       @@ -110,7 +110,7 @@ $this->table->add_row('Fred', 'Blue', 'Small');
      $this->table->add_row('Mary', 'Red', 'Large');
      $this->table->add_row('John', 'Green', 'Medium');

      -echo $this->table->generate(); +echo $this->table->generate();

      Here is the same example, except instead of individual parameters, arrays are used:

      @@ -124,7 +124,7 @@ $this->table->add_row(array('Fred', 'Blue', 'Small'));
      $this->table->add_row(array('Mary', 'Red', 'Large'));
      $this->table->add_row(array('John', 'Green', 'Medium'));

      -echo $this->table->generate(); +echo $this->table->generate(); diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 2675fa759..e78af5f9a 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -134,7 +134,7 @@ This function is identical to the native PHP nl2br() function, except

      When using the Typography library in conjunction with the Template Parser library it can often be desirable to protect single and double quotes within curly braces. To enable this, set the protect_braced_quotes class property to TRUE.

      - +

      Usage example:

      $this->load->library('typography');
      diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 0e7d1d696..84db54431 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -81,7 +81,7 @@ to determine if it is producing the correct data type and result.

      $this->unit->run( test, expected result, 'test name', 'notes');

      -

      Where test is the result of the code you wish to test, expected result is the data type you expect, +

      Where test is the result of the code you wish to test, expected result is the data type you expect, test name is an optional name you can give your test, and notes are optional notes. Example:

      $test = 1 + 1;
      diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 8d1dbdf5f..971ab0296 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -192,7 +192,7 @@ The allowed methods are on the left side of the array. When either of those are

      The 'object' key is a special key that you pass an instantiated class object with, which is necessary when the method you are mapping to is not part of the CodeIgniter super object.

      - +

      In other words, if an XML-RPC Client sends a request for the new_post method, your server will load the My_blog class and call the new_entry function. If the request is for the update_post method, your @@ -202,7 +202,7 @@ server will load the My_blog class and call the update_entry

      There are two additional configuration keys you may make use of when initializing the server class: debug can be set to TRUE in order to enable debugging, and xss_clean may be set to FALSE to prevent sending data through the Security library's xss_clean function. - +

      Processing Server Requests

      When the XML-RPC Server receives a request and loads the class/method for processing, it will pass @@ -324,20 +324,20 @@ In it, place this code and save it to your applications/controllers/<?php class Xmlrpc_client extends Controller { - + function index() - { + { $this->load->helper('url'); $server_url = site_url('xmlrpc_server'); - + $this->load->library('xmlrpc'); - + $this->xmlrpc->server($server_url, 80); $this->xmlrpc->method('Greetings'); - + $request = array('How is it going?'); - $this->xmlrpc->request($request); - + $this->xmlrpc->request($request); + if ( ! $this->xmlrpc->send_request()) { echo $this->xmlrpc->display_error(); @@ -367,24 +367,24 @@ class Xmlrpc_server extends Controller { { $this->load->library('xmlrpc'); $this->load->library('xmlrpcs'); - + $config['functions']['Greetings'] = array('function' => 'Xmlrpc_server.process'); - + $this->xmlrpcs->initialize($config); $this->xmlrpcs->serve(); } - - + + function process($request) { $parameters = $request->output_parameters(); - + $response = array( array( 'you_said' => $parameters['0'], 'i_respond' => 'Not bad at all.'), 'struct'); - + return $this->xmlrpc->send_response($response); } } @@ -422,7 +422,7 @@ The Server receives the request and maps it to the "process" function, where a r                        )
                       );
      $this->xmlrpc->request($request);       - +

      You can retrieve the associative array when processing the request in the Server.

      $parameters = $request->output_parameters();
      -- cgit v1.2.3-24-g4f1b