add docblocks to all files, classes, methods and variables

diff --git a/bin/bdrem.php b/bin/bdrem.php
index 4965c3d7e2b7f39a12cb7dfd7b0d6a5238cf8ecf..d5a40db8116c6ed7fdd5d76ce84cb9f755565241 100755 (executable)
--- a/bin/bdrem.php
+++ b/bin/bdrem.php
@@ -1,9 +1,21 @@
 #!/usr/bin/env php
 <?php
 #!/usr/bin/env php
 <?php

+/**
+ * Script to start bdrem.
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 if (file_exists(__DIR__ . '/../src/bdrem/Autoloader.php')) {
 namespace bdrem;
 
 if (file_exists(__DIR__ . '/../src/bdrem/Autoloader.php')) {

-    require_once __DIR__ . '/../src/bdrem/Autoloader.php';
+    include_once __DIR__ . '/../src/bdrem/Autoloader.php';

     Autoloader::register();
 }
 $cli = new Cli();
     Autoloader::register();
 }
 $cli = new Cli();

diff --git a/src/bdrem/Autoloader.php b/src/bdrem/Autoloader.php
index 093b1b0bc874d4c5985031ec5987b805dcbb679b..cebd0ebbeb7f37b3a4b1e6a6d2403df616f055e8 100644 (file)
--- a/src/bdrem/Autoloader.php
+++ b/src/bdrem/Autoloader.php
@@ -1,16 +1,51 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * Class autoloader, PSR-0 compliant.
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Autoloader
 {
 class Autoloader
 {

+    /**
+     * Load the given class
+     *
+     * @param string $class Class name
+     *
+     * @return void
+     */

     public function load($class)
     {
         $file = strtr($class, '_\\', '//') . '.php';
         if (stream_resolve_include_path($file)) {
     public function load($class)
     {
         $file = strtr($class, '_\\', '//') . '.php';
         if (stream_resolve_include_path($file)) {

-            require $file;
+            include $file;

         }
     }
 
         }
     }
 

+    /**
+     * Register this autoloader
+     *
+     * @return void
+     */

     public static function register()
     {
         set_include_path(
     public static function register()
     {
         set_include_path(

diff --git a/src/bdrem/Cli.php b/src/bdrem/Cli.php
index f108e8e4b8b48cff5567458051538c172054bac0..0525a37634819c231ab7c769ad6a87e2a056550e 100644 (file)
--- a/src/bdrem/Cli.php
+++ b/src/bdrem/Cli.php
@@ -1,8 +1,39 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * Command line user interface for the terminal/shell.
+ * Renders an ASCII table by default.
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Cli extends UserInterface
 {
 class Cli extends UserInterface
 {

+    /**
+     * Load parameters for the CLI option parser.
+     * Set the default renderer to "console" and adds some CLI-only commands
+     * like "readme" and "config".
+     *
+     * @return \Console_CommandLine CLI option parser
+     */

     protected function loadParameters()
     {
         $parser = parent::loadParameters();
     protected function loadParameters()
     {
         $parser = parent::loadParameters();


@@ -24,6 +55,13 @@ class Cli extends UserInterface
         return $parser;
     }
 
         return $parser;
     }
 

+    /**
+     * Handle any commands given on the CLI
+     *
+     * @param object $res Command line parameters and options
+     *
+     * @return void
+     */

     protected function handleCommands($res)
     {
         if ($res->command_name == '') {
     protected function handleCommands($res)
     {
         if ($res->command_name == '') {


@@ -37,12 +75,22 @@ class Cli extends UserInterface
         }
     }
 
         }
     }
 

+    /**
+     * Handle the "readme" command and output the readme.
+     *
+     * @return void
+     */

     protected function showReadme()
     {
         readfile(__DIR__ . '/../../README.rst');
         exit();
     }
 
     protected function showReadme()
     {
         readfile(__DIR__ . '/../../README.rst');
         exit();
     }
 

+    /**
+     * Handle the "config" command and output the default configuration
+     *
+     * @return void
+     */

     protected function extractConfig()
     {
         readfile(__DIR__ . '/../../data/bdrem.config.php.dist');
     protected function extractConfig()
     {
         readfile(__DIR__ . '/../../data/bdrem.config.php.dist');

diff --git a/src/bdrem/Config.php b/src/bdrem/Config.php
index 57d0cfd7d1995527cb8163b3bb0355756071e417..f586ed37c25e88ae0c0bd08d683b62ef07d0cb19 100644 (file)
--- a/src/bdrem/Config.php
+++ b/src/bdrem/Config.php
@@ -1,26 +1,102 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * Configuration options for bdrem
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Config
 {
 class Config
 {

+    /**
+     * Current date, YYYY-MM-DD
+     * @var string
+     */

     public $date;
     public $date;

+
+    /**
+     * Days to show before $date
+     * @var integer
+     */

     public $daysPrev;
     public $daysPrev;

+
+    /**
+     * Days to show after $date
+     * @var integer
+     */

     public $daysNext;
     public $daysNext;

+
+    /**
+     * Locale to render the dates in, e.g. "de_DE.UTF-8"
+     * @var string
+     */

     public $locale;
     public $locale;

+
+    /**
+     * Renderer name to use (e.g. "console")
+     * @var string
+     */

     public $renderer;
     public $renderer;

+
+    /**
+     * Event source configuration.
+     * - First value is source name ("Ldap", "Sql")
+     * - Second value is the source configuration
+     * @var array
+     */

     public $source;
     public $source;

+
+    /**
+     * Do not output anything if there are no events to show
+     * @var boolean
+     */

     public $stopOnEmpty;
 
     public $stopOnEmpty;
 

+    /**
+     * List of config file paths that were tried to load
+     * @var array
+     */

     public $cfgFiles = array();
     public $cfgFiles = array();

+
+    /**
+     * If a configuration file could be found
+     * @var boolean
+     */

     public $cfgFileExists;
 
 
 
     public $cfgFileExists;
 
 
 

+    /**
+     * Init configuration file path loading
+     */

     public function __construct()
     {
         $this->loadConfigFilePaths();
     }
 
     public function __construct()
     {
         $this->loadConfigFilePaths();
     }
 

+    /**
+     * Load the configuration from the first configuration file found.
+     *
+     * @return void
+     */

     public function load()
     {
         foreach ($this->cfgFiles as $file) {
     public function load()
     {
         foreach ($this->cfgFiles as $file) {


@@ -32,6 +108,11 @@ class Config
         $this->cfgFileExists = false;
     }
 
         $this->cfgFileExists = false;
     }
 

+    /**
+     * Load possible configuration file paths into $this->cfgFiles.
+     *
+     * @return void
+     */

     protected function loadConfigFilePaths()
     {
         $pharFile = \Phar::running();
     protected function loadConfigFilePaths()
     {
         $pharFile = \Phar::running();


@@ -47,6 +128,13 @@ class Config
         $this->cfgFiles[] = '/etc/bdrem.php';
     }
 
         $this->cfgFiles[] = '/etc/bdrem.php';
     }
 

+    /**
+     * Load a single configuration file and set the config class variables
+     *
+     * @param string $filename Configuration file path
+     *
+     * @return void
+     */

     protected function loadFile($filename)
     {
         include $filename;
     protected function loadFile($filename)
     {
         include $filename;


@@ -58,6 +146,12 @@ class Config
         }
     }
 
         }
     }
 

+    /**
+     * Load a event source from $this->source.
+     * Class name has to be \bdrem\Source_$source
+     *
+     * @return object Source object
+     */

     public function loadSource()
     {
         if ($this->source === null) {
     public function loadSource()
     {
         if ($this->source === null) {


@@ -70,6 +164,13 @@ class Config
         return new $class($settings[0]);
     }
 
         return new $class($settings[0]);
     }
 

+    /**
+     * Set the current date
+     *
+     * @param string $date Date in any format
+     *
+     * @return void
+     */

     public function setDate($date)
     {
         if ($date === null) {
     public function setDate($date)
     {
         if ($date === null) {


@@ -80,6 +181,15 @@ class Config
         }
     }
 
         }
     }
 

+    /**
+     * Get a configuration variable
+     *
+     * @param string $varname Configuration variable name
+     * @param string $default Default value in case the variable is not set
+     *                        or is empty
+     *
+     * @return mixed Configuration value or default
+     */

     public function get($varname, $default = '')
     {
         if (!isset($this->$varname) || $this->$varname == '') {
     public function get($varname, $default = '')
     {
         if (!isset($this->$varname) || $this->$varname == '') {

diff --git a/src/bdrem/Event.php b/src/bdrem/Event.php
index 29585e7c30c57b49471edd3bc167c6ae614c99e5..e0d18395c50ead1d2fb5ce7e5f1c44fae25c49cb 100644 (file)
--- a/src/bdrem/Event.php
+++ b/src/bdrem/Event.php
@@ -1,20 +1,46 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * Event model with title, type and date.
+ * Contains calculation methods
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Event
 {
     /**
      * Title of the event or name of the person that has the event
 class Event
 {
     /**
      * Title of the event or name of the person that has the event

+     * @var string

      */
     public $title;
 
     /**
      * Type of the event, e.g. "birthday"
      */
     public $title;
 
     /**
      * Type of the event, e.g. "birthday"

+     * @var string

      */
     public $type;
 
     /**
      */
     public $type;
 
     /**

-     * Date of the event. 
+     * Date of the event.

      * ???? as year is allowed
      *
      * @var string YYYY-MM-DD
      * ???? as year is allowed
      *
      * @var string YYYY-MM-DD


@@ -53,6 +79,13 @@ class Event
 
 
 
 
 
 

+    /**
+     * Set event data
+     *
+     * @param string $title Name of person the event relates to
+     * @param string $type  Type of the event (e.g. "birthday")
+     * @param string $date  Date of the event in format YYYY-MM-DD
+     */

     public function __construct($title = null, $type = null, $date = null)
     {
         $this->title = $title;
     public function __construct($title = null, $type = null, $date = null)
     {
         $this->title = $title;


@@ -64,9 +97,13 @@ class Event
      * Checks if the event's date is within the given date.
      * Also calculates the age and days since the event.
      *
      * Checks if the event's date is within the given date.
      * Also calculates the age and days since the event.
      *

+     * @param string  $strDate       Date, YYYY-MM-DD
+     * @param integer $nDaysPrevious Include number of days before $strDate
+     * @param integer $nDaysNext     Include number of days after $strDate
+     *

      * @return boolean True if the event's date is within the given range
      */
      * @return boolean True if the event's date is within the given range
      */

-    public function isWithin($strDate, $nDaysPrev, $nDaysNext)
+    public function isWithin($strDate, $nDaysPrevious, $nDaysNext)

     {
         $this->refDate = $strDate;
         list($rYear, $rMonth, $rDay) = explode('-', $strDate);
     {
         $this->refDate = $strDate;
         list($rYear, $rMonth, $rDay) = explode('-', $strDate);


@@ -106,13 +143,19 @@ class Event
         if ($nDiff > 0) {
             return $nDiff <= $nDaysNext;
         } else {
         if ($nDiff > 0) {
             return $nDiff <= $nDaysNext;
         } else {

-            return -$nDiff <= $nDaysPrev;
+            return -$nDiff <= $nDaysPrevious;

         }
 
         return false;
     }
 
     /**
         }
 
         return false;
     }
 
     /**

+     * Compare two events by by their date, then by their title.
+     * Used for sorting
+     *
+     * @param Event $e1 Event #1
+     * @param Event $e2 Event #2
+     *

      * @return integer x < 0: e1 is less than e2
      *                 x > 0: e1 is larger than e2
      */
      * @return integer x < 0: e1 is less than e2
      *                 x > 0: e1 is larger than e2
      */


@@ -120,7 +163,7 @@ class Event
     {
         list($e1Year, $e1Month, $e1Day) = explode('-', $e1->date);
         list($e2Year, $e2Month, $e2Day) = explode('-', $e2->date);
     {
         list($e1Year, $e1Month, $e1Day) = explode('-', $e1->date);
         list($e2Year, $e2Month, $e2Day) = explode('-', $e2->date);

-        
+

         if ($e1Month < 3 && $e2Month > 10) {
             return 1;
         } else if ($e1Month > 10 && $e2Month < 3) {
         if ($e1Month < 3 && $e2Month > 10) {
             return 1;
         } else if ($e1Month > 10 && $e2Month < 3) {

diff --git a/src/bdrem/Renderer.php b/src/bdrem/Renderer.php
index 363d413de11ae6923a62a7ba50892096f24dae33..7357af6f5d9484e978db25e3c7e930e3afe149ed 100644 (file)
--- a/src/bdrem/Renderer.php
+++ b/src/bdrem/Renderer.php
@@ -1,10 +1,44 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * Base event renderer
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 abstract class Renderer
 {
 abstract class Renderer
 {

+    /**
+     * HTTP content type of output
+     * @var string
+     */

     protected $httpContentType = null;
 
     protected $httpContentType = null;
 

+    /**
+     * Call the renderer and output the rendering result to shell or browser
+     *
+     * @param array $arEvents Event objects to render
+     *
+     * @return void
+     */

     public function renderAndOutput($arEvents)
     {
         if (PHP_SAPI != 'cli' && $this->httpContentType !== null) {
     public function renderAndOutput($arEvents)
     {
         if (PHP_SAPI != 'cli' && $this->httpContentType !== null) {


@@ -13,12 +47,31 @@ abstract class Renderer
         echo $this->render($arEvents);
     }
 
         echo $this->render($arEvents);
     }
 

+    /**
+     * Do something when there are no events to render
+     *
+     * @return void
+     */

     public function handleStopOnEmpty()
     {
     }
 
     public function handleStopOnEmpty()
     {
     }
 

+    /**
+     * Display the events in some way
+     *
+     * @param array $arEvents Events to display
+     *
+     * @return string Event representation
+     */

     abstract public function render($arEvents);
 
     abstract public function render($arEvents);
 

+    /**
+     * Converts the given date string according to the user's locale setting.
+     *
+     * @param string $dateStr Date in format YYYY-MM-DD
+     *
+     * @return string Formatted date
+     */

     protected function getLocalDate($dateStr)
     {
         if ($dateStr{0} != '?') {
     protected function getLocalDate($dateStr)
     {
         if ($dateStr{0} != '?') {

diff --git a/src/bdrem/Renderer/Console.php b/src/bdrem/Renderer/Console.php
index 87eeb9a1c4c858bad02a8e00ea833c130304b5e0..61fb67e527f3254dd4bcd6b7b3896efca896d9ad 100644 (file)
--- a/src/bdrem/Renderer/Console.php
+++ b/src/bdrem/Renderer/Console.php
@@ -1,8 +1,35 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * Render events on the terminal as ASCII table
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Renderer_Console extends Renderer
 {
 class Renderer_Console extends Renderer
 {

+    /**
+     * HTTP content type
+     * @var string
+     */

     protected $httpContentType = 'text/plain; charset=utf-8';
 
     /**
     protected $httpContentType = 'text/plain; charset=utf-8';
 
     /**


@@ -17,6 +44,13 @@ class Renderer_Console extends Renderer
      */
     protected $cc;
 
      */
     protected $cc;
 

+    /**
+     * Render events as console table
+     *
+     * @param array $arEvents Array of events to render
+     *
+     * @return string ASCII table
+     */

     public function render($arEvents)
     {
         $this->loadConfig();
     public function render($arEvents)
     {
         $this->loadConfig();


@@ -70,6 +104,14 @@ class Renderer_Console extends Renderer
         return $tbl->getTable();
     }
 
         return $tbl->getTable();
     }
 

+    /**
+     * Wrap each string in an array in an ANSI color code
+     *
+     * @param array  $data      Array of strings
+     * @param string $colorCode ANSI color code or name
+     *
+     * @return array Wrapped data
+     */

     protected function ansiWrap($data, $colorCode = null)
     {
         if (!$this->ansi || $colorCode === null) {
     protected function ansiWrap($data, $colorCode = null)
     {
         if (!$this->ansi || $colorCode === null) {


@@ -84,6 +126,11 @@ class Renderer_Console extends Renderer
         return $data;
     }
 
         return $data;
     }
 

+    /**
+     * Load configuration values into the class
+     *
+     * @return void
+     */

     protected function loadConfig()
     {
         if (isset($this->config->ansi)) {
     protected function loadConfig()
     {
         if (isset($this->config->ansi)) {

diff --git a/src/bdrem/Renderer/Html.php b/src/bdrem/Renderer/Html.php
index 637a8389d1599bfb23b68f8670589284641cbdd5..428f819277870477d9339a5af3f12cb73f31ea0a 100644 (file)
--- a/src/bdrem/Renderer/Html.php
+++ b/src/bdrem/Renderer/Html.php
@@ -1,22 +1,64 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * HTML page renderer. Renders a full HTML page.
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Renderer_Html extends Renderer
 {
 class Renderer_Html extends Renderer
 {

+    /**
+     * HTTP content type
+     * @var string
+     */

     protected $httpContentType = 'application/xhtml+xml; charset=utf-8';
 
     protected $httpContentType = 'application/xhtml+xml; charset=utf-8';
 

+    /**
+     * Send out HTTP headers when nothing shall be outputted.
+     *
+     * @return void
+     */

     public function handleStopOnEmpty()
     {
         header('HTTP/1.0 204 No Content');
     }
 
     public function handleStopOnEmpty()
     {
         header('HTTP/1.0 204 No Content');
     }
 

+    /**
+     * Generate a HTML page with the given events.
+     *
+     * @param array $arEvents Events to display on the HTML page
+     *
+     * @return string HTML code
+     *
+     * @see Renderer_HtmlTable
+     */

     public function render($arEvents)
     {
         $tr = new Renderer_HtmlTable();
         $table = $tr->render($arEvents);
         $s = <<<HTM
 <?xml version="1.0" encoding="utf-8"?>
     public function render($arEvents)
     {
         $tr = new Renderer_HtmlTable();
         $table = $tr->render($arEvents);
         $s = <<<HTM
 <?xml version="1.0" encoding="utf-8"?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
   <title>bdrem</title>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
   <title>bdrem</title>

diff --git a/src/bdrem/Renderer/HtmlTable.php b/src/bdrem/Renderer/HtmlTable.php
index 2c792f85ee77f9de9d5fbe96126416088f9883aa..892c50a74b5a5a6e095665393a282f93c3dcb0ae 100644 (file)
--- a/src/bdrem/Renderer/HtmlTable.php
+++ b/src/bdrem/Renderer/HtmlTable.php
@@ -1,10 +1,44 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * Renders events in a HTML table.
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Renderer_HtmlTable extends Renderer
 {
 class Renderer_HtmlTable extends Renderer
 {

+    /**
+     * HTTP content type
+     * @var string
+     */

     protected $httpContentType = 'text/html; charset=utf-8';
 
     protected $httpContentType = 'text/html; charset=utf-8';
 

+    /**
+     * Render the events in a HTML table
+     *
+     * @param array $arEvents Event objects to render
+     *
+     * @return string HTML table
+     */

     public function render($arEvents)
     {
         $s = <<<HTM
     public function render($arEvents)
     {
         $s = <<<HTM

diff --git a/src/bdrem/Renderer/Mail.php b/src/bdrem/Renderer/Mail.php
index 8e0e625e5cec67301b30328e41c9a08174f9e07e..bc7e2203d89b879b5c298fa93de2e0b63737d915 100644 (file)
--- a/src/bdrem/Renderer/Mail.php
+++ b/src/bdrem/Renderer/Mail.php
@@ -1,10 +1,44 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 require_once 'Mail/mime.php';
 
 namespace bdrem;
 
 require_once 'Mail/mime.php';
 

+/**
+ * Send out mails
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Renderer_Mail extends Renderer
 {
 class Renderer_Mail extends Renderer
 {

+    /**
+     * Render the events - send out mails.
+     *
+     * Uses the config's "mail_to" array as recipients.
+     * Sends out a single mail for each recipient.
+     * Config "mail_from" can also be used.
+     *
+     * @param array $arEvents Array of events to display
+     *
+     * @return void
+     */

     public function render($arEvents)
     {
         $todays = array();
     public function render($arEvents)
     {
         $todays = array();


@@ -49,6 +83,15 @@ class Renderer_Mail extends Renderer
         }
     }
 
         }
     }
 

+    /**
+     * Shorten the given string to the specified length.
+     * Adds ... when the string was too long
+     *
+     * @param string  $str String to shorten
+     * @param integer $len Maximum length of the string
+     *
+     * @return string Shortened string
+     */

     protected function shorten($str, $len)
     {
         if (mb_strlen($str) <= $len) {
     protected function shorten($str, $len)
     {
         if (mb_strlen($str) <= $len) {

diff --git a/src/bdrem/Source/Bdf.php b/src/bdrem/Source/Bdf.php
index f38e30f4b09643b6d20747f0b0d11ffe3206b993..651360a0e1fe2e042aeb28536a5b55f1710412a7 100644 (file)
--- a/src/bdrem/Source/Bdf.php
+++ b/src/bdrem/Source/Bdf.php
@@ -1,13 +1,41 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 /**
  * Reads birthday reminder 2's birthday files (.bdf).
 namespace bdrem;
 
 /**
  * Reads birthday reminder 2's birthday files (.bdf).

+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm

  */
 class Source_Bdf
 {
  */
 class Source_Bdf
 {

+    /**
+     * Full path of bdf birthday file
+     * @var string
+     */

     protected $filename;
 
     protected $filename;
 

+    /**
+     * Set the birthday file name
+     *
+     * @param string $filename Path to bdf file
+     */

     public function __construct($filename)
     {
         $this->filename = $filename;
     public function __construct($filename)
     {
         $this->filename = $filename;


@@ -19,9 +47,16 @@ class Source_Bdf
     }
 
     /**
     }
 
     /**

-     * @param string $strDate Date the events shall be found for, YYYY-MM-DD
+     * Return all events for the given date range
+     *
+     * @param string  $strDate       Date the events shall be found for,
+     *                               YYYY-MM-DD
+     * @param integer $nDaysPrevious Include number of days before $strDate
+     * @param integer $nDaysNext     Include number of days after $strDate
+     *
+     * @return Event[] Array of matching event objects

      */
      */

-    public function getEvents($strDate, $nDaysPrev, $nDaysNext)
+    public function getEvents($strDate, $nDaysPrevious, $nDaysNext)

     {
         $x = simplexml_load_file($this->filename);
 
     {
         $x = simplexml_load_file($this->filename);
 


@@ -38,7 +73,7 @@ class Source_Bdf
                 (string) $xPerson->event,
                 $date
             );
                 (string) $xPerson->event,
                 $date
             );

-            if ($event->isWithin($strDate, $nDaysPrev, $nDaysNext)) {
+            if ($event->isWithin($strDate, $nDaysPrevious, $nDaysNext)) {

                 $arEvents[] = $event;
             }
         }
                 $arEvents[] = $event;
             }
         }

diff --git a/src/bdrem/Source/Ldap.php b/src/bdrem/Source/Ldap.php
index 335be07f5db4e290b6aba3aa19509327f2de19fd..aa45b0aede89acdb8c2efe3221b66e9865a78c5e 100644 (file)
--- a/src/bdrem/Source/Ldap.php
+++ b/src/bdrem/Source/Ldap.php
@@ -1,12 +1,42 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 /**
  * Fetch data from an LDAP server.
  * Works fine with evolutionPerson schema.
 namespace bdrem;
 
 /**
  * Fetch data from an LDAP server.
  * Works fine with evolutionPerson schema.

+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm

  */
 class Source_Ldap
 {
  */
 class Source_Ldap
 {

+    /**
+     * LDAP server configuration
+     *
+     * Keys:
+     * - host   - LDAP server host name
+     * - basedn - root DN that gets searched
+     * - binddn - Username to authenticate with
+     * - bindpw - Password for username
+     *
+     * @var array
+     */

     protected $config;
 
     /**
     protected $config;
 
     /**


@@ -25,7 +55,14 @@ class Source_Ldap
     }
 
     /**
     }
 
     /**

-     * @param string $strDate Date the events shall be found for, YYYY-MM-DD
+     * Return all events for the given date range
+     *
+     * @param string  $strDate       Date the events shall be found for,
+     *                               YYYY-MM-DD
+     * @param integer $nDaysPrevious Include number of days before $strDate
+     * @param integer $nDaysNext     Include number of days after $strDate
+     *
+     * @return Event[] Array of matching event objects

      */
     public function getEvents($strDate, $nDaysPrevious, $nDaysNext)
     {
      */
     public function getEvents($strDate, $nDaysPrevious, $nDaysNext)
     {


@@ -89,6 +126,14 @@ class Source_Ldap
         return $arEvents;
     }
 
         return $arEvents;
     }
 

+    /**
+     * Extract the name from the given LDAP entry object.
+     * Uses displayName or givenName + sn
+     *
+     * @param object $entry LDAP entry
+     *
+     * @return string Name or NULL
+     */

     protected function getNameFromEntry(\Net_LDAP2_Entry $entry)
     {
         $arEntry = $entry->getValues();
     protected function getNameFromEntry(\Net_LDAP2_Entry $entry)
     {
         $arEntry = $entry->getValues();


@@ -103,6 +148,13 @@ class Source_Ldap
     }
 
     /**
     }
 
     /**

+     * Create an array of dates that are included in the given range.
+     *
+     * @param string  $strDate       Date the events shall be found for,
+     *                               YYYY-MM-DD
+     * @param integer $nDaysPrevious Include number of days before $strDate
+     * @param integer $nDaysNext     Include number of days after $strDate
+     *

      * @return array Values like "-01-24" ("-$month-$day")
      */
     protected function getDates($strDate, $nDaysPrevious, $nDaysNext)
      * @return array Values like "-01-24" ("-$month-$day")
      */
     protected function getDates($strDate, $nDaysPrevious, $nDaysNext)


@@ -117,6 +169,5 @@ class Source_Ldap
         } while (--$numDays >= 0);
         return $arDays;
     }
         } while (--$numDays >= 0);
         return $arDays;
     }

-

 }
 ?>
 }
 ?>

diff --git a/src/bdrem/Source/Sql.php b/src/bdrem/Source/Sql.php
index 57f9a800b1e0281f4eaa6d91b79ea8e599254d55..81ce5beb8ed3d772ba99443f886f9d90c274f51e 100644 (file)
--- a/src/bdrem/Source/Sql.php
+++ b/src/bdrem/Source/Sql.php
@@ -1,17 +1,73 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 /**
  * Fetch data from an SQL database
 namespace bdrem;
 
 /**
  * Fetch data from an SQL database

+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm

  */
 class Source_Sql
 {
  */
 class Source_Sql
 {

+    /**
+     * PDO data source description
+     * @var string
+     */

     protected $dsn;
     protected $dsn;

+
+    /**
+     * Database user name
+     * @var string
+     */

     protected $user;
     protected $user;

+
+    /**
+     * Database password
+     * @var string
+     */

     protected $password;
     protected $password;

+
+    /**
+     * Database table with event data
+     * @var string
+     */

     protected $table;
     protected $table;

-    protected $fields ;

 
 

+    /**
+     * Field configuration
+     * Keys:
+     * - date - array of columns with dates and their event title,
+     *          e.g. 'c_birthday' => 'Birthday'
+     * - name - array of name columns
+     * - nameFormat - sprintf-compatible name formatting instruction,
+     *                uses name columns
+     *
+     * @var array
+     */
+    protected $fields;
+
+    /**
+     * Set SQL server configuration
+     *
+     * @param array $config SQL server configuration with keys:
+     *                      dsn, user, password, table and fields
+     */

     public function __construct($config)
     {
         $this->dsn      = $config['dsn'];
     public function __construct($config)
     {
         $this->dsn      = $config['dsn'];


@@ -22,7 +78,14 @@ class Source_Sql
     }
 
     /**
     }
 
     /**

-     * @param string $strDate Date the events shall be found for, YYYY-MM-DD
+     * Return all events for the given date range
+     *
+     * @param string  $strDate       Date the events shall be found for,
+     *                               YYYY-MM-DD
+     * @param integer $nDaysPrevious Include number of days before $strDate
+     * @param integer $nDaysNext     Include number of days after $strDate
+     *
+     * @return Event[] Array of matching event objects

      */
     public function getEvents($strDate, $nDaysPrevious, $nDaysNext)
     {
      */
     public function getEvents($strDate, $nDaysPrevious, $nDaysNext)
     {


@@ -85,6 +148,13 @@ class Source_Sql
     }
 
     /**
     }
 
     /**

+     * Create an array of dates that are included in the given range.
+     *
+     * @param string  $strDate       Date the events shall be found for,
+     *                               YYYY-MM-DD
+     * @param integer $nDaysPrevious Include number of days before $strDate
+     * @param integer $nDaysNext     Include number of days after $strDate
+     *

      * @return array Key is the month, value an array of days
      */
     protected function getDates($strDate, $nDaysPrevious, $nDaysNext)
      * @return array Key is the month, value an array of days
      */
     protected function getDates($strDate, $nDaysPrevious, $nDaysNext)

diff --git a/src/bdrem/UserInterface.php b/src/bdrem/UserInterface.php
index 2ba1cfb8329a215c746352fccee184d62ce2761e..de6d3bbe922d9177318721ad73cb7dfe339fd5ad 100644 (file)
--- a/src/bdrem/UserInterface.php
+++ b/src/bdrem/UserInterface.php
@@ -1,10 +1,42 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * Generic user interface class
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 abstract class UserInterface
 {
 abstract class UserInterface
 {

+    /**
+     * Configuration
+     * @var Config
+     */

     protected $config;
 
     protected $config;
 

+    /**
+     * Start the user interface, load config, parse and render events.
+     *
+     * @return void
+     */

     public function run()
     {
         try {
     public function run()
     {
         try {


@@ -16,7 +48,7 @@ abstract class UserInterface
             if (!$this->config->cfgFileExists) {
                 throw new \Exception(
                     "No config file found. Looked at the following places:\n"
             if (!$this->config->cfgFileExists) {
                 throw new \Exception(
                     "No config file found. Looked at the following places:\n"

-                    . '- ' . implode ("\n- ", $this->config->cfgFiles)
+                    . '- ' . implode("\n- ", $this->config->cfgFiles)

                 );
             }
 
                 );
             }
 


@@ -37,6 +69,11 @@ abstract class UserInterface
         }
     }
 
         }
     }
 

+    /**
+     * Load parameters for the CLI option parser.
+     *
+     * @return \Console_CommandLine CLI option parser
+     */

     protected function loadParameters()
     {
         $parser = new \Console_CommandLine();
     protected function loadParameters()
     {
         $parser = new \Console_CommandLine();


@@ -115,7 +152,14 @@ abstract class UserInterface
         return $parser;
     }
 
         return $parser;
     }
 

-    protected function parseParameters($parser)
+    /**
+     * Let the CLI option parser parse the options.
+     *
+     * @param object $parser Option parser
+     *
+     * @return object Parsed command line parameters
+     */
+    protected function parseParameters(\Console_CommandLine $parser)

     {
         try {
             $result = $parser->parse();
     {
         try {
             $result = $parser->parse();


@@ -136,6 +180,13 @@ abstract class UserInterface
         }
     }
 
         }
     }
 

+    /**
+     * Output the events
+     *
+     * @param array $arEvents Event objects to render
+     *
+     * @return void
+     */

     protected function render($arEvents)
     {
         $r = $this->getRenderer();
     protected function render($arEvents)
     {
         $r = $this->getRenderer();


@@ -148,6 +199,11 @@ abstract class UserInterface
         $r->renderAndOutput($arEvents);
     }
 
         $r->renderAndOutput($arEvents);
     }
 

+    /**
+     * Load the configured renderer
+     *
+     * @return Renderer Renderer instance
+     */

     protected function getRenderer()
     {
         $renderer = ucfirst($this->config->renderer);
     protected function getRenderer()
     {
         $renderer = ucfirst($this->config->renderer);


@@ -158,10 +214,22 @@ abstract class UserInterface
         return new $class();
     }
 
         return new $class();
     }
 

+    /**
+     * Handle any commands given on the CLI
+     *
+     * @param object $res Command line parameters and options
+     *
+     * @return void
+     */

     protected function handleCommands($res)
     {
     }
 
     protected function handleCommands($res)
     {
     }
 

+    /**
+     * Do something before a parameter parsing error is shown
+     *
+     * @return void
+     */

     protected function preRenderParameterError()
     {
     }
     protected function preRenderParameterError()
     {
     }

diff --git a/src/bdrem/Web.php b/src/bdrem/Web.php
index 10120ec8b909af4245b26cd3c31f43ebb4ef6710..d85136a8e3809999f037afb53fd7d466641d848a 100644 (file)
--- a/src/bdrem/Web.php
+++ b/src/bdrem/Web.php
@@ -1,8 +1,37 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * HTTP user interface that renders a HTML page
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class Web extends UserInterface
 {
 class Web extends UserInterface
 {

+    /**
+     * Load parameters for the CLI option parser.
+     * Set the default renderer to "html".
+     *
+     * @return \Console_CommandLine CLI option parser
+     */

     protected function loadParameters()
     {
         $parser = parent::loadParameters();
     protected function loadParameters()
     {
         $parser = parent::loadParameters();


@@ -12,6 +41,11 @@ class Web extends UserInterface
         return $parser;
     }
 
         return $parser;
     }
 

+    /**
+     * Sends HTTP headers before a parameter error is shown
+     *
+     * @return void
+     */

     protected function preRenderParameterError()
     {
         header('Content-type: text/plain; charset=utf-8');
     protected function preRenderParameterError()
     {
         header('Content-type: text/plain; charset=utf-8');

diff --git a/src/bdrem/WebText.php b/src/bdrem/WebText.php
index 3587f702bfd9f41363499b102300206b157f093e..51d6d7bc5ca492232b4f57f0a1ca6fe8a581f9bb 100644 (file)
--- a/src/bdrem/WebText.php
+++ b/src/bdrem/WebText.php
@@ -1,8 +1,37 @@
 <?php
 <?php

+/**
+ * Part of bdrem
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 namespace bdrem;
 

+/**
+ * HTTP user interface that renders a ASCII table
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @version   Release: @package_version@
+ * @link      http://cweiske.de/bdrem.htm
+ */

 class WebText extends Web
 {
 class WebText extends Web
 {

+    /**
+     * Load parameters for the CLI option parser.
+     * Set the default renderer to "console".
+     *
+     * @return \Console_CommandLine CLI option parser
+     */

     protected function loadParameters()
     {
         $parser = parent::loadParameters();
     protected function loadParameters()
     {
         $parser = parent::loadParameters();

diff --git a/src/phar-stub.php b/src/phar-stub.php
index 58ee78e58868ec25e3e5890d5d5b4d1ad6c7033d..64c463e1b114d84418ee43a838b358822fa5add9 100644 (file)
--- a/src/phar-stub.php
+++ b/src/phar-stub.php
@@ -1,4 +1,16 @@
 <?php
 <?php

+/**
+ * Phar stub file for bdrem. Handles startup of the .phar file.
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 if (!in_array('phar', stream_get_wrappers()) || !class_exists('Phar', false)) {
     echo "Phar extension not avaiable\n";
     exit(255);
 if (!in_array('phar', stream_get_wrappers()) || !class_exists('Phar', false)) {
     echo "Phar extension not avaiable\n";
     exit(255);


@@ -7,6 +19,14 @@ if (!in_array('phar', stream_get_wrappers()) || !class_exists('Phar', false)) {
 $web = 'www/index.php';
 $cli = 'bin/phar-bdrem.php';
 
 $web = 'www/index.php';
 $cli = 'bin/phar-bdrem.php';
 

+/**
+ * Rewrite the HTTP request path to an internal file.
+ * Maps "" and "/" to "www/index.php".
+ *
+ * @param string $path Path from the browser, relative to the .phar
+ *
+ * @return string Internal path.
+ */

 function rewritePath($path)
 {
     if ($path == '' || $path == '/') {
 function rewritePath($path)
 {
     if ($path == '' || $path == '/') {


@@ -21,6 +41,6 @@ set_include_path(
     . PATH_SEPARATOR . 'phar://' . __FILE__ . '/lib/'
 );
 Phar::webPhar(null, $web, null, array(), 'rewritePath');
     . PATH_SEPARATOR . 'phar://' . __FILE__ . '/lib/'
 );
 Phar::webPhar(null, $web, null, array(), 'rewritePath');

-include 'phar://' . __FILE__ . '/' . $cli;
+require 'phar://' . __FILE__ . '/' . $cli;

 __HALT_COMPILER();
 ?>
 __HALT_COMPILER();
 ?>

diff --git a/www/index.php b/www/index.php
index 14defde1b17236e44f66cad19876a96f405ae8f4..79d572f6c4902448d6b551197d821f9624237f90 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -1,8 +1,20 @@
 <?php
 <?php

+/**
+ * Start the bdrem HTML web interface
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 if (file_exists(__DIR__ . '/../src/bdrem/Autoloader.php')) {
 namespace bdrem;
 
 if (file_exists(__DIR__ . '/../src/bdrem/Autoloader.php')) {

-    require_once __DIR__ . '/../src/bdrem/Autoloader.php';
+    include_once __DIR__ . '/../src/bdrem/Autoloader.php';

     Autoloader::register();
 }
 $web = new Web();
     Autoloader::register();
 }
 $web = new Web();

diff --git a/www/text.php b/www/text.php
index ffe530a9b1f49c60e97293839592643744428e01..d2ff095594c64b80d330b84e52873e82e4be2627 100644 (file)
--- a/www/text.php
+++ b/www/text.php
@@ -1,8 +1,20 @@
 <?php
 <?php

+/**
+ * Start the bdrem plain text web interface
+ *
+ * PHP version 5
+ *
+ * @category  Tools
+ * @package   Bdrem
+ * @author    Christian Weiske <cweiske@cweiske.de>
+ * @copyright 2014 Christian Weiske
+ * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link      http://cweiske.de/bdrem.htm
+ */

 namespace bdrem;
 
 if (file_exists(__DIR__ . '/../src/bdrem/Autoloader.php')) {
 namespace bdrem;
 
 if (file_exists(__DIR__ . '/../src/bdrem/Autoloader.php')) {

-    require_once __DIR__ . '/../src/bdrem/Autoloader.php';
+    include_once __DIR__ . '/../src/bdrem/Autoloader.php';

     Autoloader::register();
 }
 $web = new WebText();
     Autoloader::register();
 }
 $web = new WebText();