From: Roland Häder Date: Thu, 11 May 2023 23:47:39 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=commitdiff_plain;h=HEAD;hp=359cee28ee312b0267e9005025e49636b46d8a3a Continued: - updated 'core' --- diff --git a/.gitattributes b/.gitattributes index dfe0770..17cdcd5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -# Auto detect text files and perform LF normalization -* text=auto +# Use Linux/Uni* line-feed for new lines (prevents converting) +* text=lf diff --git a/Doxyfile b/Doxyfile deleted file mode 100644 index f5c45d4..0000000 --- a/Doxyfile +++ /dev/null @@ -1,1565 +0,0 @@ -# Doxyfile 1.6.2 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = Ship-Simulator - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 0.1a - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = /var/www/htdocs/ship-simu/trunk/docs/ - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class " \ - "The $name widget " \ - "The $name file " \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = YES - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = YES - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = /var/www/htdocs/ - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = YES - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = YES - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = YES - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = YES - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = YES - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = YES - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = YES - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. -# This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text " - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = /var/www/htdocs/ship-simu/trunk/docs/warn.log - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = /var/www/htdocs/ship-simu/trunk/index.php \ - /var/www/htdocs/ship-simu/trunk/inc/ \ - /var/www/htdocs/ship-simu/trunk/application/ship-simu/ - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.php \ - *.ctp - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = */docs/* \ - */ship-simu.org/* - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. -# If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. -# Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. -# The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = YES - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. -# Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = YES - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 3 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = NO - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = YES - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = YES - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = YES - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = YES - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = YES - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup -# and does not have live searching capabilities. - -SERVER_BASED_SEARCH = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = NO - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = NO - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. -# This is useful -# if you want to understand what is going on. -# On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = YES - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = NO - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = YES - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = YES - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = YES - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = YES - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff --git a/application/.htaccess b/application/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/.htaccess b/application/selector/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/admin/.htaccess b/application/selector/admin/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/admin/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php index 204800f..dd4ee5c 100644 --- a/application/selector/class_ApplicationHelper.php +++ b/application/selector/class_ApplicationHelper.php @@ -78,7 +78,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Is the instance there? if (is_null(self::$selfInstance)) { self::$selfInstance = new ApplicationHelper(); - } // END - if + } // Return the instance return self::$selfInstance; @@ -167,7 +167,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Then use it $response = strtolower($requestInstance->getRequestElement('request')); $responseType = $response; - } // END - if + } // ... and a new response object $responseClass = sprintf('%sResponse', self::convertToClassName($response)); @@ -186,7 +186,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Set it in request $requestInstance->setRequestElement('command', $commandName); - } // END - if + } // Get a controller resolver $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); @@ -238,6 +238,3 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica return 'node_main'; } } - -// [EOF] -?> diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index 8dd0648..1a7aa40 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -112,7 +112,7 @@ class ApplicationSelector extends BaseFrameworkSystem { // Add the current instance to the list $this->foundApps->append($app); - } // END - if ((is_file(... + } ((is_file(... } /** @@ -175,7 +175,7 @@ class ApplicationSelector extends BaseFrameworkSystem { // Load the application's data.php script and append the // application to the ArrayObject $this->loadApplicationData($appData, $appName); - } // END - if + } } // END - while // Close directory pointer @@ -280,6 +280,3 @@ class ApplicationSelector extends BaseFrameworkSystem { } // END - for } } - -// [EOF] -?> diff --git a/application/selector/config.php b/application/selector/config.php index 49fe491..54610f2 100644 --- a/application/selector/config.php +++ b/application/selector/config.php @@ -28,8 +28,8 @@ $cfg = FrameworkConfiguration::getSelfInstance(); // CFG: HEADER-CHARSET $cfg->setConfigEntry('header_charset', 'utf-8'); -// CFG: DEFAULT-SELECTOR-HTML-COMMAND -$cfg->setConfigEntry('default_selector_html_command', 'home'); +// CFG: DEFAULT-SELECTOR-HTTP-COMMAND +$cfg->setConfigEntry('default_selector_http_command', 'home'); // CFG: FORM-ACTION $cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&command=do_form'); @@ -54,6 +54,3 @@ $cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader'); // CFG: NEWS-HOME-LIMIT $cfg->setConfigEntry('news_home_limit', 10); - -// [EOF] -?> diff --git a/application/selector/data.php b/application/selector/data.php index 6e63348..a1f07eb 100644 --- a/application/selector/data.php +++ b/application/selector/data.php @@ -38,6 +38,3 @@ $app = call_user_func_array( $app->setAppName('Applikationsauswähler'); $app->setAppVersion('0.1a'); $app->setAppShortName($cfg->getConfigEntry('selector_name')); - -// [EOF] -?> diff --git a/application/selector/debug.php b/application/selector/debug.php index 077d378..f735e72 100644 --- a/application/selector/debug.php +++ b/application/selector/debug.php @@ -21,6 +21,3 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -// [EOF] -?> diff --git a/application/selector/exceptions.php b/application/selector/exceptions.php index 1a93fc0..510f7d5 100644 --- a/application/selector/exceptions.php +++ b/application/selector/exceptions.php @@ -63,7 +63,7 @@ function __assertHandler ($file, $line, $code) { // Empty code? if (empty($code)) { $code = 'Unknown'; - } // END - if + } // Create message $message = sprintf('File: %s, Line: %s, Code: %s', @@ -82,6 +82,3 @@ assert_options(ASSERT_WARNING, 0); assert_options(ASSERT_BAIL, 0); assert_options(ASSERT_QUIET_EVAL, 0); assert_options(ASSERT_CALLBACK, '__assertHandler'); - -// [EOF] -?> diff --git a/application/selector/exceptions/.htaccess b/application/selector/exceptions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/exceptions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/init.php b/application/selector/init.php index 9a0bd10..9aeb9b1 100644 --- a/application/selector/init.php +++ b/application/selector/init.php @@ -33,7 +33,4 @@ ApplicationHelper::createDebugInstance('ApplicationHelper'); // This application needs a database connection then we have to simply include // the inc/database.php script -require($cfg->getConfigEntry('base_path') . 'inc/database.php'); - -// [EOF] -?> +require $cfg->getConfigEntry('base_path') . 'inc/database.php'; diff --git a/application/selector/interfaces/.htaccess b/application/selector/interfaces/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/interfaces/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/language/.htaccess b/application/selector/language/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/language/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/loader.php b/application/selector/loader.php index bcb574f..6a91215 100644 --- a/application/selector/loader.php +++ b/application/selector/loader.php @@ -24,6 +24,3 @@ // Scan for application's classes, exceptions and interfaces ClassLoader::scanApplicationClasses(); - -// [EOF] -?> diff --git a/application/selector/main/.htaccess b/application/selector/main/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/main/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/starter.php b/application/selector/starter.php index b6f4c45..7ba4259 100644 --- a/application/selector/starter.php +++ b/application/selector/starter.php @@ -48,6 +48,3 @@ if ((empty($app)) || (is_null($app))) { // Call user function call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array()); - -// [EOF] -?> diff --git a/application/selector/templates/.htaccess b/application/selector/templates/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/templates/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/templates/de/.htaccess b/application/selector/templates/de/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/templates/de/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/templates/de/code/.htaccess b/application/selector/templates/de/code/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/templates/de/code/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/.htaccess b/application/shipsimu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/admin/.htaccess b/application/shipsimu/admin/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/admin/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/class_ApplicationHelper.php b/application/shipsimu/class_ApplicationHelper.php index 204800f..84d5198 100644 --- a/application/shipsimu/class_ApplicationHelper.php +++ b/application/shipsimu/class_ApplicationHelper.php @@ -1,4 +1,16 @@ * @version 0.0 - * @copyright Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2012 Ship-Simu Developer Team + * @copyright Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2022 Ship-Simu Developer Team * @license GNU GPL 3.0 or any newer version * * This program is free software: you can redistribute it and/or modify @@ -38,33 +50,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication, Registerable { - /** - * The version number of this application - */ - private $appVersion = ''; - - /** - * The human-readable name for this application - */ - private $appName = ''; - - /** - * The short uni*-like name for this application - */ - private $shortName = ''; - - /** - * An instance of this class - */ - private static $selfInstance = NULL; - +class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable { /** * Private constructor * * @return void */ - protected function __construct () { + private function __construct () { // Call parent constructor parent::__construct(__CLASS__); } @@ -76,105 +68,54 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica */ public static final function getSelfInstance () { // Is the instance there? - if (is_null(self::$selfInstance)) { - self::$selfInstance = new ApplicationHelper(); - } // END - if + if (is_null(self::getApplicationInstance())) { + self::setApplicationInstance(new ApplicationHelper()); + } // Return the instance - return self::$selfInstance; + return self::getApplicationInstance(); } /** - * Getter for the version number - * - * @return $appVersion The application's version number - */ - public final function getAppVersion () { - return $this->appVersion; - } - /** - * Setter for the version number + * 1) Setups application data * - * @param $appVersion The application's version number * @return void */ - public final function setAppVersion ($appVersion) { - // Cast and set it - $this->appVersion = (string) $appVersion; + public function setupApplicationData () { + // Set all application data + $this->setAppName('Ship-Simu Shipping Simulator'); + $this->setAppVersion('0.0.0'); + $this->setAppShortName('shipsimu'); } /** - * Getter for human-readable name + * 2) Does initial stuff before starting the application * - * @return $appName The application's human-readable name - */ - public final function getAppName () { - return $this->appName; - } - - /** - * Setter for human-readable name - * - * @param $appName The application's human-readable name * @return void */ - public final function setAppName ($appName) { - // Cast and set it - $this->appName = (string) $appName;; - } + public function initApplication () { + // Get config instance + $cfg = FrameworkBootstrap::getConfigurationInstance(); - /** - * Getter for short uni*-like name - * - * @return $shortName The application's short uni*-like name - */ - public final function getAppShortName () { - return $this->shortName; - } + // Initialize output system + ApplicationHelper::createDebugInstance('ApplicationHelper'); - /** - * Setter for short uni*-like name - * - * @param $shortName The application's short uni*-like name - * @return void - */ - public final function setAppShortName ($shortName) { - // Cast and set it - $this->shortName = (string) $shortName; + /* + * This application needs a database connection then simply call init + * method. + */ + FrameworkBootstrap::initDatabaseInstance(); } /** - * Launches the application + * 3) Launches the application * * @return void */ - public final function entryPoint () { - // Set this application in registry - Registry::getRegistry()->addInstance('app', $this); - - // Default response is console - $response = self::getResponseTypeFromSystem(); - $responseType = self::getResponseTypeFromSystem(); - - // Create a new request object - $requestInstance = ObjectFactory::createObjectByName(self::convertToClassName($response) . 'Request'); - - // Remember request instance here - $this->setRequestInstance($requestInstance); - - // Do we have another response? - if ($requestInstance->isRequestElementSet('request')) { - // Then use it - $response = strtolower($requestInstance->getRequestElement('request')); - $responseType = $response; - } // END - if - - // ... and a new response object - $responseClass = sprintf('%sResponse', self::convertToClassName($response)); - $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this)); - - // Remember response instance here - $this->setResponseInstance($responseInstance); + public function launchApplication () { + // Get request/response instances + $requestInstance = FrameworkBootstrap::getRequestInstance(); + $responseInstance = FrameworkBootstrap::getResponseInstance(); // Get the parameter from the request $commandName = $requestInstance->getRequestElement('command'); @@ -184,31 +125,55 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Get default command $commandName = $responseInstance->determineDefaultCommand(); + // Debug message + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('commandName[%s]=%s', gettype($commandName), $commandName)); + // Set it in request $requestInstance->setRequestElement('command', $commandName); - } // END - if + } - // Get a controller resolver - $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); - $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this)); + // Is the request type 'html' ? + if (FrameworkBootstrap::getRequestTypeFromSystem() == 'html') { + // The language system is needed for this + $languageInstance = ObjectFactory::createObjectByConfiguredName('language_system_class'); - // Get a controller instance as well - $this->setControllerInstance($resolverInstance->resolveController()); + // And set it here + $this->setLanguageInstance($languageInstance); + } - // Initialize language system - $languageInstance = ObjectFactory::createObjectByConfiguredName('language_system_class'); + // Configuration entry key + $configEntry = sprintf( + '%s_%s_controller_resolver_class', + $this->getAppShortName(), + FrameworkBootstrap::getRequestTypeFromSystem() + ); - // And set it here - $this->setLanguageInstance($languageInstance); + // Get a controller resolver instance + $resolverInstance = ObjectFactory::createObjectByConfiguredName($configEntry, [ + $commandName, + ]); - // Launch the main routine here + // Get a controller instance as well + $this->setControllerInstance($resolverInstance->resolveController()); + + // Launch the test suite here $this->getControllerInstance()->handleRequest($requestInstance, $responseInstance); + + // Only for console requests as this is the actual daemon + if ($requestType == 'console') { + // -------------------------- Shutdown phase -------------------------- + // Shutting down the hub by saying "good bye" to all connected peers + // and other hubs, flushing all queues and caches. + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown in progress, main loop exited.'); + $this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance); + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)'); + } } /** * Assigns extra application-depending data * - * @param $templateInstance An instance of a CompileableTemplate + * @param $templateInstance An instance of a CompileableTemplate class * @return void * @todo Nothing to add? */ @@ -226,7 +191,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Walk through all messages foreach ($messageList as $message) { exit(__METHOD__ . ':MSG:' . $message); - } // END - foreach + } } /** @@ -235,9 +200,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica * @return $masterTemplateName Name of the master template */ public function buildMasterTemplateName () { - return 'node_main'; + return 'node_daemon'; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/.htaccess b/application/shipsimu/classes/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/actions/.htaccess b/application/shipsimu/classes/actions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/actions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/actions/class_BaseShipSimuAction.php b/application/shipsimu/classes/actions/class_BaseShipSimuAction.php index 41dcce0..186c151 100644 --- a/application/shipsimu/classes/actions/class_BaseShipSimuAction.php +++ b/application/shipsimu/classes/actions/class_BaseShipSimuAction.php @@ -57,6 +57,3 @@ class BaseShipSimuAction extends BaseAction { // Unfinished method } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/ship-simu/.htaccess b/application/shipsimu/classes/actions/ship-simu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/actions/ship-simu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php index 2fbee37..962faf5 100644 --- a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php +++ b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php @@ -60,6 +60,3 @@ class ShipSimuLoginAction extends BaseShipSimuAction implements PerformableActio // Add your code here } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php index 56090bf..e1d47a2 100644 --- a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php +++ b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php @@ -60,6 +60,3 @@ class ShipSimuProfileAction extends BaseShipSimuAction implements PerformableAct // Add your code here... } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/.htaccess b/application/shipsimu/classes/actions/web/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/actions/web/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php index 842d6cb..1d51201 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginCompanyAction extends BaseShipSimuAction implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php index fa62481..bb22691 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php @@ -80,6 +80,3 @@ class WebShipSimuLoginGovernmentStartupHelpAction extends BaseShipSimuAction imp $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_startup_help_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php index fcbc711..1e414b7 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php @@ -80,6 +80,3 @@ class WebShipSimuLoginGovernmentTrainingAction extends BaseShipSimuAction implem $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_training_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php index 9b066a9..c546241 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php @@ -76,6 +76,3 @@ class WebShipSimuLoginLogoutAction extends BaseShipSimuAction implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php index 58d6745..b0f13ed 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginProfileAction extends BaseShipSimuAction implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php index 31c7337..42a2690 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php @@ -82,6 +82,3 @@ class WebShipSimuLoginRefillAction extends BaseShipSimuAction implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('payment_discovery_filter', array($this))); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php index 8b26b8f..fc0eb31 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginStatusProblemAction extends BaseShipSimuAction implements $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php index d839bd1..b363012 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php @@ -76,6 +76,3 @@ class WebShipSimuLoginWelcomeAction extends BaseShipSimuAction implements Comman // Unfinished method } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/bank/.htaccess b/application/shipsimu/classes/bank/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/bank/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/bank/class_BaseBank.php b/application/shipsimu/classes/bank/class_BaseBank.php index 21ae0d5..29bc895 100644 --- a/application/shipsimu/classes/bank/class_BaseBank.php +++ b/application/shipsimu/classes/bank/class_BaseBank.php @@ -55,6 +55,3 @@ abstract class BaseBank extends BaseFrameworkSystem { */ public abstract function ifMoneyBankHasOpened (); } - -// [EOF] -?> diff --git a/application/shipsimu/classes/bank/money/class_MoneyBank.php b/application/shipsimu/classes/bank/money/class_MoneyBank.php index 11d4d9e..67029da 100644 --- a/application/shipsimu/classes/bank/money/class_MoneyBank.php +++ b/application/shipsimu/classes/bank/money/class_MoneyBank.php @@ -55,7 +55,7 @@ class MoneyBank extends BaseBank implements Registerable { * @return $lendsMoreMoney Wether this bank lends more money to the user */ public function ifBankLendsMoreMoney () { - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); } /** @@ -64,7 +64,7 @@ class MoneyBank extends BaseBank implements Registerable { * @return $hasMaximumCredits Wether the user has maximum allowed credits */ public function ifUserHasMaxCredits () { - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); } /** @@ -83,12 +83,9 @@ class MoneyBank extends BaseBank implements Registerable { // Then we simply "ask" the opening time instance if the user asks within the opening time $hasOpened = $openingInstance->ifWithinOpeningTimes(); - } // END - if + } // Return status return $hasOpened; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_BasePersonell.php b/application/shipsimu/classes/class_BasePersonell.php index 8e08ec3..7eecf8d 100644 --- a/application/shipsimu/classes/class_BasePersonell.php +++ b/application/shipsimu/classes/class_BasePersonell.php @@ -241,6 +241,3 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer { unset($this->married); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_BaseSimulator.php b/application/shipsimu/classes/class_BaseSimulator.php index e460013..a54ae22 100644 --- a/application/shipsimu/classes/class_BaseSimulator.php +++ b/application/shipsimu/classes/class_BaseSimulator.php @@ -297,6 +297,3 @@ class BaseSimulator extends BaseFrameworkSystem { return $this->currPart; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_Merchant.php b/application/shipsimu/classes/class_Merchant.php index 648e299..25d0220 100644 --- a/application/shipsimu/classes/class_Merchant.php +++ b/application/shipsimu/classes/class_Merchant.php @@ -104,6 +104,3 @@ class Merchant extends BaseFrameworkSystem { $this->makeDeprecated(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_WorksContract.php b/application/shipsimu/classes/class_WorksContract.php index bbe2f35..d22fc75 100644 --- a/application/shipsimu/classes/class_WorksContract.php +++ b/application/shipsimu/classes/class_WorksContract.php @@ -324,6 +324,3 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { return $totalPrice; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/.htaccess b/application/shipsimu/classes/commands/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/commands/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/commands/web/.htaccess b/application/shipsimu/classes/commands/web/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/commands/web/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php index 14015a3..1b1fe8a 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php @@ -77,7 +77,7 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable { $responseInstance->redirectToConfiguredUrl('app_login'); // Exit here - exit(); + exit; } catch (FrameworkException $e) { // Something went wrong here! $responseInstance->addFatalMessage($e->getMessage()); @@ -107,6 +107,3 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php index a266f26..1a2134a 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php @@ -107,7 +107,7 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable { unset($this->allowedData); // Unfinished! - $this->partialStub("Unfinished work."); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished work.'); $this->debugBackTrace(); } @@ -148,6 +148,3 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php index 1c9bd8e..6fdf3d4 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php @@ -107,6 +107,3 @@ class WebShipsimuRefillCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName($filterName)); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php index 181ce2f..3d4ade4 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php @@ -112,6 +112,3 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('birthday_register_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php index 2a33a8f..72486ee 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php @@ -77,7 +77,7 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable { $responseInstance->redirectToConfiguredUrl('app_login'); // Exit here - exit(); + exit; } catch (FrameworkException $e) { // Something went wrong here! $responseInstance->addFatalMessage($e->getMessage()); @@ -119,6 +119,3 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/company/.htaccess b/application/shipsimu/classes/commands/web/company/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/commands/web/company/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php b/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php index 7fed46f..85d616e 100644 --- a/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php +++ b/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php @@ -83,6 +83,3 @@ class WebShipSimuCompanyCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/.htaccess b/application/shipsimu/classes/commands/web/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/commands/web/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php index 54ddb05..ccf4a3e 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php @@ -66,7 +66,7 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab if ($actionInstance instanceof PerformableAction) { // Execute the action (shall not output anything, see below why) $actionInstance->execute($requestInstance, $responseInstance); - } // END - if + } // Get the application instance $appInstance = $this->getResolverInstance()->getApplicationInstance(); @@ -141,6 +141,3 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab // Empty for now } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php index 7119196..db2afe8 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php @@ -66,7 +66,7 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda if ($actionInstance instanceof PerformableAction) { // Execute the action (shall not output anything, see below why) $actionInstance->execute($requestInstance, $responseInstance); - } // END - if + } // Get the application instance $appInstance = $this->getResolverInstance()->getApplicationInstance(); @@ -141,6 +141,3 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda // Empty for now } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php index 3153962..3715dc7 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php @@ -91,6 +91,3 @@ class WebShipsimuGovernmentStartupCommand extends BaseCommand implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_government_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php index 035e5e8..8d2eecd 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php @@ -89,6 +89,3 @@ class WebShipsimuGovernmentTrainingCommand extends BaseCommand implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_refill_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/companies/.htaccess b/application/shipsimu/classes/companies/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/companies/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/companies/class_ShippingCompany.php b/application/shipsimu/classes/companies/class_ShippingCompany.php index cee5ccc..9601126 100644 --- a/application/shipsimu/classes/companies/class_ShippingCompany.php +++ b/application/shipsimu/classes/companies/class_ShippingCompany.php @@ -92,7 +92,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner // Then do some nasty caching here but don't throw an exception // because then you will hurt our web helpers... :/ $companyInstance->partialStub("Don't throw exceptions here."); - } // END - if + } // Init all lists $companyInstance->initCompanyLists(); @@ -124,7 +124,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($resultInstance instanceof SearchableResult) { // Set the result instance $this->setResultInstance($resultInstance); - } // END - if + } // Return result return $participates; @@ -146,8 +146,8 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner // Is it set? if ($resultInstance instanceof SearchableResult) { // Result found so analyse it - $this->partialStub("Check if user is company founder."); - } // END - if + DebugMiddleware::getSelfInstance()->partialStub('Check if user is company founder.'); + } // Return result return $isFounder; @@ -169,8 +169,8 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner // Is it set? if ($resultInstance instanceof SearchableResult) { // Result found so analyse it - $this->partialStub("Check if user is company owner."); - } // END - if + DebugMiddleware::getSelfInstance()->partialStub('heck if user is company owner.'); + } // Return result return $isOwner; @@ -192,7 +192,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($resultInstance instanceof SearchableResult) { // Result found so he is employee $isEmployee = true; - } // END - if + } // Return result return $isEmployee; @@ -240,7 +240,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner $dummy = explode(" ", $this->getCompanyName()); foreach ($dummy as $part) { $this->shortName .= substr($part, 0, 1); - } // END - if + } } // Reedereien Werften bauen lassen @@ -304,7 +304,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($totalUnemployed < $amount) { // Reichte nicht aus! throw new ToMuchEmployeesException(array($amount, $personellInstance->getAllUnemployed()), self::EXCEPTION_NOT_ENOUGTH_UNEMPLOYEES); - } // END - if + } // Get list for all unemployed people $list = $personellInstance->getSpecialPersonellList(false); // Should be cached @@ -328,7 +328,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($iterator->valid() === false) { // Should normally not happen... :( throw new StructuresOutOfBoundsException($idx, self::EXCEPTION_INDEX_OUT_OF_BOUNDS); - } // END - if + } // Get current element $employee = $iterator->current(); @@ -392,7 +392,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($shipyardIter->valid() === false) { // Rewind to first position $shipyardIter->seek(0); - } // END - if + } // Get Shipyard object $shipyard = $shipyardIter->current(); @@ -603,7 +603,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($partnerInstance->isContractPartner($contractInstance) === false) { // Invalid contract partner! throw new InvalidContractPartnerException($partnerInstance, self::EXCEPTION_CONTRACT_PARTNER_INVALID); - } // END - if + } // Determine if company "signs" own contract (must be done) or with an other party if ($this->equals($partnerInstance)) { @@ -661,6 +661,3 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner $contractInstance->setMerchantInstance($merchantInstance); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/.htaccess b/application/shipsimu/classes/constructions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/berths/.htaccess b/application/shipsimu/classes/constructions/berths/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/berths/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/berths/class_Berth.php b/application/shipsimu/classes/constructions/berths/class_Berth.php index c96ba10..6535ce0 100644 --- a/application/shipsimu/classes/constructions/berths/class_Berth.php +++ b/application/shipsimu/classes/constructions/berths/class_Berth.php @@ -34,6 +34,3 @@ class Berth extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/class_BaseConstruction.php b/application/shipsimu/classes/constructions/class_BaseConstruction.php index af08a39..4e6947d 100644 --- a/application/shipsimu/classes/constructions/class_BaseConstruction.php +++ b/application/shipsimu/classes/constructions/class_BaseConstruction.php @@ -31,6 +31,3 @@ class BaseConstruction extends BaseSimulator { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/docks/.htaccess b/application/shipsimu/classes/constructions/docks/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/docks/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/docks/class_DryDock.php b/application/shipsimu/classes/constructions/docks/class_DryDock.php index c9d6f8e..c3e07fa 100644 --- a/application/shipsimu/classes/constructions/docks/class_DryDock.php +++ b/application/shipsimu/classes/constructions/docks/class_DryDock.php @@ -31,6 +31,3 @@ class DryDock extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/harbors/.htaccess b/application/shipsimu/classes/constructions/harbors/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/harbors/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/harbors/class_Harbor.php b/application/shipsimu/classes/constructions/harbors/class_Harbor.php index cf350ce..0d2af38 100644 --- a/application/shipsimu/classes/constructions/harbors/class_Harbor.php +++ b/application/shipsimu/classes/constructions/harbors/class_Harbor.php @@ -82,6 +82,3 @@ class Harbor extends BaseConstruction { $this->shipyardList->append(Shipyard::createShipyard($this, $shipyardName)); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/terminals/.htaccess b/application/shipsimu/classes/constructions/terminals/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/terminals/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/terminals/class_Terminal.php b/application/shipsimu/classes/constructions/terminals/class_Terminal.php index 9ae9985..3de0219 100644 --- a/application/shipsimu/classes/constructions/terminals/class_Terminal.php +++ b/application/shipsimu/classes/constructions/terminals/class_Terminal.php @@ -31,6 +31,3 @@ class Terminal extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/yards/.htaccess b/application/shipsimu/classes/constructions/yards/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/yards/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/yards/class_Shipyard.php b/application/shipsimu/classes/constructions/yards/class_Shipyard.php index 1959f83..630a09b 100644 --- a/application/shipsimu/classes/constructions/yards/class_Shipyard.php +++ b/application/shipsimu/classes/constructions/yards/class_Shipyard.php @@ -210,6 +210,3 @@ class Shipyard extends BaseConstruction { return $result; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/controller/.htaccess b/application/shipsimu/classes/controller/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/controller/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/controller/html/.htaccess b/application/shipsimu/classes/controller/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/controller/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php b/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php index 741cc5a..fd4b6bf 100644 --- a/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php +++ b/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php @@ -85,11 +85,11 @@ class HtmlCompanyController extends BaseController implements Controller { $responseInstance->redirectToConfiguredUrl('login_failed'); // Exit here - exit(); + exit; } // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); @@ -101,6 +101,3 @@ class HtmlCompanyController extends BaseController implements Controller { $responseInstance->flushBuffer(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php b/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php index 217b6b5..65d7865 100644 --- a/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php +++ b/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php @@ -85,11 +85,11 @@ class HtmlGovernmentFailedController extends BaseController implements Controlle $responseInstance->redirectToConfiguredUrl('login_failed'); // Exit here - exit(); + exit; } // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); @@ -101,6 +101,3 @@ class HtmlGovernmentFailedController extends BaseController implements Controlle $responseInstance->flushBuffer(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/drives/.htaccess b/application/shipsimu/classes/drives/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/drives/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/drives/class_BaseDrive.php b/application/shipsimu/classes/drives/class_BaseDrive.php index 56f9802..9968f8e 100644 --- a/application/shipsimu/classes/drives/class_BaseDrive.php +++ b/application/shipsimu/classes/drives/class_BaseDrive.php @@ -59,6 +59,3 @@ class BaseDrive extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/drives/motor/.htaccess b/application/shipsimu/classes/drives/motor/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/drives/motor/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/drives/motor/class_Motor.php b/application/shipsimu/classes/drives/motor/class_Motor.php index 2f3479e..708ab69 100644 --- a/application/shipsimu/classes/drives/motor/class_Motor.php +++ b/application/shipsimu/classes/drives/motor/class_Motor.php @@ -51,6 +51,3 @@ class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart { return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/factories/.htaccess b/application/shipsimu/classes/factories/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/factories/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php b/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php index e42b021..c60563a 100644 --- a/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php +++ b/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php @@ -55,6 +55,3 @@ class ShipSimuWebNewsFactory extends BaseFrameworkSystem { // Do some stuff here } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/.htaccess b/application/shipsimu/classes/filter/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/book/.htaccess b/application/shipsimu/classes/filter/book/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/book/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/book/refill/.htaccess b/application/shipsimu/classes/filter/book/refill/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/book/refill/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php b/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php index b7ff113..3e120ef 100644 --- a/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php +++ b/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php @@ -67,6 +67,3 @@ class RefillRequestCurrencyTestBookFilter extends BaseShipSimuFilter implements $userInstance->bookAmountDirectly($requestInstance); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php b/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php index 7a80cf2..afb6ce4 100644 --- a/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php +++ b/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php @@ -45,6 +45,3 @@ class BaseShipSimuFilter extends BaseFilter { // Add something to do on every filter } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/government/.htaccess b/application/shipsimu/classes/filter/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php index 7becf12..98e1e23 100644 --- a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php +++ b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php @@ -63,16 +63,13 @@ class ShipSimuGovernmentPaysStartupHelpFilter extends BaseShipSimuFilter impleme // Now simply check for it if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovernmentPaysStartupHelp() === false)) { // Request is invalid - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_government_startup_failed'); // Stop processing here - exit(); - } // END - if + exit; + } } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php index 75eb1cc..c6117fb 100644 --- a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php +++ b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php @@ -63,16 +63,13 @@ class ShipSimuGovernmentPaysTrainingFilter extends BaseShipSimuFilter implements // Now simply check for it if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovernmentPaysTraining() === false)) { // Request is invalid - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_government_training_failed'); // Stop processing here - exit(); - } // END - if + exit; + } } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/page/.htaccess b/application/shipsimu/classes/filter/page/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/page/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/page/class_RefillPageFilter.php b/application/shipsimu/classes/filter/page/class_RefillPageFilter.php index d4680ba..9badacd 100644 --- a/application/shipsimu/classes/filter/page/class_RefillPageFilter.php +++ b/application/shipsimu/classes/filter/page/class_RefillPageFilter.php @@ -60,16 +60,13 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable { // Is the configuration variable set? if ($this->getConfigInstance()->getConfigEntry('refill_page_active') === "N") { // Password is empty - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Add a message to the response $responseInstance->addFatalMessage('refill_page_not_active'); // Abort here throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if + } } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/validator/.htaccess b/application/shipsimu/classes/filter/validator/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/validator/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php b/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php index 3abd7ba..042fdc5 100644 --- a/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php +++ b/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php @@ -61,16 +61,13 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera // Are all required request fields set? if (($requestInstance->isRequestElementSet('type') === false) || ($requestInstance->isRequestElementSet('amount') === false)) { // Something important is missing - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Add a message to the response $responseInstance->addFatalMessage('refill_page_required_fields_missing'); // Abort here throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if + } } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php b/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php index 989e1d4..eb4315d 100644 --- a/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php +++ b/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php @@ -64,16 +64,13 @@ class ShipSimuUserStatusGuestFilter extends BaseShipSimuFilter implements Filter // Is the user account confirmed? if ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) == $this->getConfigInstance()->getConfigEntry('user_status_guest')) { // Request is invalid! - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_user_status_guest'); // Stop processing here - exit(); - } // END - if + exit; + } } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/government/.htaccess b/application/shipsimu/classes/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/government/class_SimplifiedGovernment.php b/application/shipsimu/classes/government/class_SimplifiedGovernment.php index 8999153..5e44b32 100644 --- a/application/shipsimu/classes/government/class_SimplifiedGovernment.php +++ b/application/shipsimu/classes/government/class_SimplifiedGovernment.php @@ -87,7 +87,7 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable { // Entry was found so the government can no more pay a training $alreadyPayed = true; - } // END - if + } // Return the result return $alreadyPayed; @@ -126,12 +126,9 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable { // Entry found, so lets have a look if this government wants to again... $maximumPayed = true; - } // END - if + } // Return the result return $maximumPayed; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/.htaccess b/application/shipsimu/classes/login/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/login/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php b/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php index 9725449..a30c272 100644 --- a/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php +++ b/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php @@ -72,7 +72,7 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser, R if ($userInstance->ifPasswordHashMatches($requestInstance) === false) { // Mismatching password throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH); - } // END - if + } // Now do the real login. This can be cookie- or session-based login // which depends on the admins setting then on the user's taste. @@ -120,9 +120,6 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser, R // Store the hash back in request $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword); - } // END - if + } } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/class_ShipSimuUserLogin.php b/application/shipsimu/classes/login/class_ShipSimuUserLogin.php index 0b3cf7c..a70bbaf 100644 --- a/application/shipsimu/classes/login/class_ShipSimuUserLogin.php +++ b/application/shipsimu/classes/login/class_ShipSimuUserLogin.php @@ -75,7 +75,7 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser, Re if ($userInstance->ifPasswordHashMatches($requestInstance) === false) { // Mismatching password throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH); - } // END - if + } // ToDo place @@ -125,9 +125,6 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser, Re // Store the hash back in request $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword); - } // END - if + } } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/helper/.htaccess b/application/shipsimu/classes/login/helper/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/login/helper/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php b/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php index b5c125e..26e10ed 100644 --- a/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php +++ b/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php @@ -67,7 +67,7 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin { if (!$userInstance instanceof ManageableAccount) { // Thrown an exception here throw new UserInstanceMissingException (array($helperInstance, 'user'), self::EXCEPTION_INVALID_USER_INSTANCE); - } // END - if + } // Set default login method from config $helperInstance->setDefaultAuthMethod(); @@ -109,6 +109,3 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin { Registry::getRegistry()->addInstance('login', $loginInstance); } } - -// -?> diff --git a/application/shipsimu/classes/menu/.htaccess b/application/shipsimu/classes/menu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/menu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php b/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php index 1dc56b7..a96ef03 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php @@ -45,6 +45,3 @@ class ShipSimuConfirmMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php b/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php index ef01389..93e9e49 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php @@ -45,6 +45,3 @@ class ShipSimuHomeMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php index 038b123..a4e2ce5 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginAreaMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php index 6978654..e98e8e5 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginFailedMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php index 7aa83e9..a51e7e8 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php index 76b6c68..f08884b 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php @@ -45,6 +45,3 @@ class ShipSimuLogoutMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php b/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php index d2438f2..0208c37 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php @@ -45,6 +45,3 @@ class ShipSimuRegisterMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php b/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php index fbc0434..876cf3c 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php @@ -45,6 +45,3 @@ class ShipSimuStatusMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/government/.htaccess b/application/shipsimu/classes/menu/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/menu/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php b/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php index 0d2112c..6a301af 100644 --- a/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php +++ b/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php @@ -45,6 +45,3 @@ class ShipSimuGovernmentFailedAreaMenu extends BaseMenu implements RenderableMen return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/opening/.htaccess b/application/shipsimu/classes/opening/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/opening/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/opening/bank/.htaccess b/application/shipsimu/classes/opening/bank/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/opening/bank/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php b/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php index 5136767..2bc503f 100644 --- a/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php +++ b/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php @@ -58,6 +58,3 @@ class MoneyBankRealtimeOpening extends BaseOpening { $this->partialStub(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/opening/class_BaseOpening.php b/application/shipsimu/classes/opening/class_BaseOpening.php index 78f8983..e8f886a 100644 --- a/application/shipsimu/classes/opening/class_BaseOpening.php +++ b/application/shipsimu/classes/opening/class_BaseOpening.php @@ -56,5 +56,3 @@ abstract class BaseOpening extends BaseFrameworkSystem { public abstract function ifWithinOpeningTimes (); } -// [EOF] -?> diff --git a/application/shipsimu/classes/parts/.htaccess b/application/shipsimu/classes/parts/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/parts/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/parts/class_BaseShipPart.php b/application/shipsimu/classes/parts/class_BaseShipPart.php index aca83a9..8d476bb 100644 --- a/application/shipsimu/classes/parts/class_BaseShipPart.php +++ b/application/shipsimu/classes/parts/class_BaseShipPart.php @@ -46,6 +46,3 @@ class BaseShipPart extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/parts/maschineroom/.htaccess b/application/shipsimu/classes/parts/maschineroom/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/parts/maschineroom/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php b/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php index bcd7b30..ea31cce 100644 --- a/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php +++ b/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php @@ -42,6 +42,3 @@ class MaschineRoom extends BaseShipPart { return $roomInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/personell/.htaccess b/application/shipsimu/classes/personell/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/personell/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/personell/class_SimulatorPersonell.php b/application/shipsimu/classes/personell/class_SimulatorPersonell.php index 8ff01e7..27b6202 100644 --- a/application/shipsimu/classes/personell/class_SimulatorPersonell.php +++ b/application/shipsimu/classes/personell/class_SimulatorPersonell.php @@ -129,10 +129,10 @@ class SimulatorPersonell extends BasePersonell { if ($this->personelllList instanceof FrameworkArrayObject) { // Throw an exception throw new PersonellListAlreadyCreatedException($this, self::EXCEPTION_DIMENSION_ARRAY_INVALID); - } // END - if + } // Initialize the array - $this->personellList = new FrameworkArrayObject("FakedPersonellList"); + $this->personellList = new FrameworkArrayObject('FakedPersonellList'); } // Remove the personell list @@ -171,7 +171,7 @@ class SimulatorPersonell extends BasePersonell { * * @return $cacheList A list of cached personells */ - function getSpecialPersonellList ($isEmployed = null, $isMarried = null, $hasGender = "") { + function getSpecialPersonellList ($isEmployed = null, $isMarried = null, $hasGender = '') { // Serialize the conditions for checking if we can take the cache $serialized = serialize(array($isEmployed, $isMarried, $hasGender)); @@ -295,7 +295,7 @@ class SimulatorPersonell extends BasePersonell { // Set typical family name parent::setFamily("Smith"); - } // END - if + } // Return surname return $surname; @@ -322,6 +322,3 @@ class SimulatorPersonell extends BasePersonell { $this->makeDeprecated(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/personell/company/.htaccess b/application/shipsimu/classes/personell/company/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/personell/company/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/personell/company/class_CompanyEmployee.php b/application/shipsimu/classes/personell/company/class_CompanyEmployee.php index 472692e..300c936 100644 --- a/application/shipsimu/classes/personell/company/class_CompanyEmployee.php +++ b/application/shipsimu/classes/personell/company/class_CompanyEmployee.php @@ -50,7 +50,7 @@ class CompanyEmployee extends SimulatorPersonell { if ($personellInstance->isDateValid($year, $month, $day) === false) { // Something is wrong ... throw new BirthdayInvalidException(array($year, $month, $day), self::EXCEPTION_BIRTH_DATE_IS_INVALID); - } // END - if + } // Set birthday $personellInstance->setBirthday($year, $month, $day); @@ -80,6 +80,3 @@ class CompanyEmployee extends SimulatorPersonell { unset($this->employeeList); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/registration/.htaccess b/application/shipsimu/classes/registration/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/registration/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/registration/class_ShipSimuRegistration.php b/application/shipsimu/classes/registration/class_ShipSimuRegistration.php index 674d189..aa13a2b 100644 --- a/application/shipsimu/classes/registration/class_ShipSimuRegistration.php +++ b/application/shipsimu/classes/registration/class_ShipSimuRegistration.php @@ -166,7 +166,7 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { if ($this->getConfigInstance()->getConfigEntry('confirm_email_enabled') === 'N') { // No confirmation of email needed $configEntry = 'user_status_confirmed'; - } // END - if + } // Add a lot elements to the dataset criteria foreach ($this->criteriaElements as $alias => $element) { @@ -189,7 +189,7 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { if ((($element == 'username') || ($alias == 'username')) && ($this->getRequestInstance()->getRequestElement($element) == $this->getConfigInstance()->getConfigEntry('guest_login_user'))) { // Yes, then set the config entry to guest status $configEntry = 'user_status_guest'; - } // END - if + } } // END - foreach // Mark the username as unique key @@ -202,6 +202,3 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { $criteriaInstance->addCriteria('registered', date('Y-m-d H:i:s', time())); } } - -// -?> diff --git a/application/shipsimu/classes/resolver/.htaccess b/application/shipsimu/classes/resolver/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/command/.htaccess b/application/shipsimu/classes/resolver/command/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/command/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/command/html/.htaccess b/application/shipsimu/classes/resolver/command/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/command/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php b/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php index 5b5fd9c..112ea35 100644 --- a/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php +++ b/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php @@ -72,6 +72,3 @@ class HtmlCompanyCommandResolver extends BaseCommandResolver implements CommandR return $resolverInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php b/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php index 16edb50..6aa841e 100644 --- a/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php +++ b/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php @@ -72,6 +72,3 @@ class HtmlGovernmentFailedCommandResolver extends BaseCommandResolver implements return $resolverInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/resolver/controller/.htaccess b/application/shipsimu/classes/resolver/controller/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/controller/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/controller/html/.htaccess b/application/shipsimu/classes/resolver/controller/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/controller/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php b/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php index dc57483..24a7a3b 100644 --- a/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php +++ b/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php @@ -90,7 +90,7 @@ class ShipSimuHtmlControllerResolver extends BaseControllerResolver implements C if ((!is_object($controllerInstance)) || (!$controllerInstance instanceof Controller)) { // This command has an invalid instance! throw new InvalidControllerInstanceException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER); - } // END - if + } // Set last controller $this->setResolvedInstance($controllerInstance); @@ -99,6 +99,3 @@ class ShipSimuHtmlControllerResolver extends BaseControllerResolver implements C return $controllerInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/ships/.htaccess b/application/shipsimu/classes/ships/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/ships/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/ships/class_BaseShip.php b/application/shipsimu/classes/ships/class_BaseShip.php index ae22ca3..796d9dc 100644 --- a/application/shipsimu/classes/ships/class_BaseShip.php +++ b/application/shipsimu/classes/ships/class_BaseShip.php @@ -69,7 +69,7 @@ class BaseShip extends BaseSimulator { if (!class_exists($partClass)) { // Nicht vorhanden, dann Ausnahme werfen! throw new NoClassException($partClass, self::EXCEPTION_CLASS_NOT_FOUND); - } // END - if + } // Get an instance back from our object factory $partInstance = ObjectFactory::createObjectByName($partClass); @@ -134,7 +134,7 @@ class BaseShip extends BaseSimulator { // STUB: Getter-Methode Anzahl Betten public function calcTotalBeds () { - $this->partialStub("Please implement this stub in your ship!"); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this stub in your ship!'); } // Setter-Methode fuer Schiffsnamen @@ -162,6 +162,3 @@ class BaseShip extends BaseSimulator { $this->numAnchor = (int) $numAnchor; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/ships/passenger/.htaccess b/application/shipsimu/classes/ships/passenger/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/ships/passenger/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/ships/passenger/class_PassengerShip.php b/application/shipsimu/classes/ships/passenger/class_PassengerShip.php index 70fa5ed..da9b0b6 100644 --- a/application/shipsimu/classes/ships/passenger/class_PassengerShip.php +++ b/application/shipsimu/classes/ships/passenger/class_PassengerShip.php @@ -49,7 +49,7 @@ class PassengerShip extends BaseShip implements ConstructableShip { if (is_null($struct)) { // Empty structures list! throw new EmptyStructuresListException($this, self::EXCEPTION_EMPTY_STRUCTURES_ARRAY); - } // END - if + } // Anzahl Betten auf 0 setzen $numBeds = 0; @@ -73,15 +73,12 @@ class PassengerShip extends BaseShip implements ConstructableShip { if (!is_null($cab)) { // Kabinenbeschreibung holen $cabType = $cab->getObjectDescription(); - } // END - if - } // END - if - } // END - if + } + } + } } // END - for // Anzahl zurueckliefern return $numBeds; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/.htaccess b/application/shipsimu/classes/structures/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/class_BaseStructure.php b/application/shipsimu/classes/structures/class_BaseStructure.php index 59318cb..81943ec 100644 --- a/application/shipsimu/classes/structures/class_BaseStructure.php +++ b/application/shipsimu/classes/structures/class_BaseStructure.php @@ -46,6 +46,3 @@ class BaseStructure extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/.htaccess b/application/shipsimu/classes/structures/extended/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/cabines/.htaccess b/application/shipsimu/classes/structures/extended/cabines/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/cabines/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php b/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php index b513944..5c178f6 100644 --- a/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php @@ -33,6 +33,3 @@ class BaseCabin extends BaseCabinStructure { return ($this->isClass("BaseCabin")); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/.htaccess b/application/shipsimu/classes/structures/extended/cabines/ship/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/cabines/ship/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php index beceae8..84f9091 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php @@ -53,6 +53,3 @@ class EconomyCabin extends BaseCabin implements TradeableItem, ConstructableShip return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php index 23b877c..8d8a3aa 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php @@ -53,6 +53,3 @@ class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php index 78cb9c4..fc6d8a9 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php @@ -53,6 +53,3 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php index 522e301..f57329c 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php @@ -53,6 +53,3 @@ class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShip return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php b/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php index 77a81ae..b6300f0 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php @@ -130,6 +130,3 @@ class BaseCabinStructure extends BaseStructure { return $cabinBeds; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php b/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php index 0f44a55..86b4245 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php @@ -56,6 +56,3 @@ class BaseDeckStructure extends BaseStructure { return $this->numDecks; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php b/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php index dd6934c..b6eacc7 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php @@ -32,6 +32,3 @@ class BaseUpperStructure extends BaseStructure { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/.htaccess b/application/shipsimu/classes/structures/extended/decks/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/decks/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/.htaccess b/application/shipsimu/classes/structures/extended/decks/cargo/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/decks/cargo/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php index d87dd09..b6191e9 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php @@ -51,6 +51,3 @@ class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart { return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php index 07410ea..296114e 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php @@ -51,6 +51,3 @@ class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php index 6a87d85..c435caf 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php @@ -52,6 +52,3 @@ class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php b/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php index 7b92d68..d31a40d 100644 --- a/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php @@ -32,6 +32,3 @@ class BaseDeck extends BaseDeckStructure { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/lower/.htaccess b/application/shipsimu/classes/structures/extended/lower/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/lower/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/upper/.htaccess b/application/shipsimu/classes/structures/extended/upper/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/upper/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/upper/class_Bridge.php b/application/shipsimu/classes/structures/extended/upper/class_Bridge.php index 1c3b674..43f41cd 100644 --- a/application/shipsimu/classes/structures/extended/upper/class_Bridge.php +++ b/application/shipsimu/classes/structures/extended/upper/class_Bridge.php @@ -50,6 +50,3 @@ class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableS return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/.htaccess b/application/shipsimu/classes/user/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/user/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/user/class_ShipSimuBaseUser.php b/application/shipsimu/classes/user/class_ShipSimuBaseUser.php index 75de2c7..d6764ee 100644 --- a/application/shipsimu/classes/user/class_ShipSimuBaseUser.php +++ b/application/shipsimu/classes/user/class_ShipSimuBaseUser.php @@ -57,7 +57,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // Store it in registry Registry::getRegistry()->addInstance('money_bank', $bankInstance); - } // END - if + } // Return the instance return $bankInstance; @@ -87,7 +87,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // Store it in registry Registry::getRegistry()->addInstance('government', $governmentInstance); - } // END - if + } // Return the prepared instance return $governmentInstance; @@ -148,7 +148,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // And store it in registry Registry::getRegistry()->addInstance('points', $pointsInstance); - } // END - if + } // Just forward this request to the user points class $hasRequired = $pointsInstance->ifUserHasRequiredPoints($action); @@ -256,6 +256,3 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { return $hasOpened; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/extended/.htaccess b/application/shipsimu/classes/user/extended/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/user/extended/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php b/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php index a66de18..dc09b0a 100644 --- a/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php +++ b/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php @@ -58,7 +58,7 @@ class ShipSimuGuest extends ShipSimuBaseUser implements ManageableGuest { if ($userInstance->ifUsernameExists() === false) { // Throw an exception here throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND); - } // END - if + } // Return the instance return $userInstance; @@ -103,6 +103,3 @@ class ShipSimuGuest extends ShipSimuBaseUser implements ManageableGuest { // No updates will be flushed to database! } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/extended/class_ShipSimuMember.php b/application/shipsimu/classes/user/extended/class_ShipSimuMember.php index a37ef16..64a5afa 100644 --- a/application/shipsimu/classes/user/extended/class_ShipSimuMember.php +++ b/application/shipsimu/classes/user/extended/class_ShipSimuMember.php @@ -66,7 +66,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka if ($userInstance->ifUsernameExists() === false) { // Throw an exception here throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND); - } // END - if + } // Return the instance return $userInstance; @@ -110,7 +110,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka $userInstance = new ShipSimuMember(); $userInstance->partialStub("We need to add more ways of creating user classes here."); $userInstance->debugBackTrace(); - exit(); + exit; } // Return the prepared instance @@ -132,7 +132,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka // If there is no action use the default on if (is_null($lastAction)) { $lastAction = $this->getConfigInstance()->getConfigEntry('login_default_action'); - } // END - if + } // Get a critieria instance $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); @@ -184,7 +184,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka // And store it in registry Registry::getRegistry()->addInstance('points', $pointsInstance); - } // END - if + } // Get the amount $amount = $requestInstance->getRequestElement('amount'); @@ -203,7 +203,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka if (!$this->getResultInstance() instanceof SearchableResult) { // Abort here return; - } // END - if + } // Do we have data to update? if ($this->getResultInstance()->ifDataNeedsFlush()) { @@ -212,9 +212,6 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka // Yes, then send the whole result to the database layer $wrapperInstance->doUpdateByResult($this->getResultInstance()); - } // END - if + } } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/wrapper/.htaccess b/application/shipsimu/classes/wrapper/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/wrapper/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php b/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php index 1552e67..a9f9065 100644 --- a/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php +++ b/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php @@ -61,7 +61,7 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper { // Set the company instance if not null if (!is_null($companyInstance)) { $wrapperInstance->setCompanyInstance($companyInstance); - } // END - if + } // Return the instance return $wrapperInstance; @@ -97,7 +97,7 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper { // Entry found for further analysis/processing $participates = true; - } // END - if + } // Return the result return $participates; @@ -124,6 +124,3 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper { return $this->companyInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php b/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php index 6392d6b..294ebc3 100644 --- a/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php +++ b/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php @@ -65,6 +65,3 @@ class UserGovernmentDatabaseWrapper extends BaseDatabaseWrapper { $requestInstance->debugInstance(); } } - -// [EOF] -?> diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php index 948efec..60a4e37 100644 --- a/application/shipsimu/config.php +++ b/application/shipsimu/config.php @@ -1,4 +1,7 @@ setConfigEntry('header_charset', 'utf-8'); -// CFG: DEFAULT-SHIP-SIMU-HTML-COMMAND -$cfg->setConfigEntry('default_ship_simu_html_command', 'home'); +// CFG: DEFAULT-SHIPSIMU-HTTP-COMMAND +$cfg->setConfigEntry('default_shipsimu_http_command', 'home'); -// CFG: DEFAULT-HTML-COMMAND -$cfg->setConfigEntry('default_html_command', 'home'); +// CFG: DEFAULT-HTTP-COMMAND +$cfg->setConfigEntry('default_http_command', 'home'); // CFG: FORM-ACTION $cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&command=do_form'); @@ -445,8 +448,8 @@ $cfg->setConfigEntry('refill_page_active', 'Y'); // CFG: REFILL-PAGE-MIN-CURRENCY-AMOUNT $cfg->setConfigEntry('refill_page_min_currency_amount', 1000); -// CFG: SHIP-SIMU-LOGIN-FILL-PAYMENT-DISCOVERY -$cfg->setConfigEntry('ship_simu_login_refill_payment_discovery', 'LocalPaymentDiscovery'); +// CFG: SHIPSIMU-LOGIN-FILL-PAYMENT-DISCOVERY +$cfg->setConfigEntry('shipsimu_login_refill_payment_discovery', 'LocalPaymentDiscovery'); // CFG: GOVERNMENT-STARTUP-HELP-LIMIT $cfg->setConfigEntry('government_startup_help_limit', 3); @@ -534,6 +537,3 @@ $cfg->setConfigEntry('moneybank_activated', 'Y'); // CFG: MONEYBANK-OPENING-CLASS $cfg->setConfigEntry('moneybank_opening_class', 'MoneyBankRealtimeOpening'); - -// [EOF] -?> diff --git a/application/shipsimu/data.php b/application/shipsimu/data.php deleted file mode 100644 index 7b380c2..0000000 --- a/application/shipsimu/data.php +++ /dev/null @@ -1,51 +0,0 @@ -isClass("ApplicationSelector"))) { return; } - * - * isset() is required to prevent a warning and is_object() is highly required - * when the application itself is requested in URL (hint: index.php?app=your_app) - * - * @author Roland Haeder - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Get config instance -$cfg = FrameworkConfiguration::getSelfInstance(); - -// Get an instance of the helper -$app = call_user_func_array( - array($cfg->getConfigEntry('app_helper_class'), 'getSelfInstance'), - array() -); - -// Set application name and version -$app->setAppName('Ship-Simu Shipping Simulator'); -$app->setAppVersion('0.0.0'); -$app->setAppShortName('ship_simu'); - -// [EOF] -?> diff --git a/application/shipsimu/debug.php b/application/shipsimu/debug.php index 11bf631..832b744 100644 --- a/application/shipsimu/debug.php +++ b/application/shipsimu/debug.php @@ -56,6 +56,3 @@ //define('DEBUG_CONTRACT', true); // Haendler debuggen //define('DEBUG_MERCHANT', true); - -// [EOF] -?> diff --git a/application/shipsimu/exceptions.php b/application/shipsimu/exceptions.php index 8e4e14f..b8d33d8 100644 --- a/application/shipsimu/exceptions.php +++ b/application/shipsimu/exceptions.php @@ -1,12 +1,17 @@ * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2022 Ship-Simu Developer Team * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,32 +24,99 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ -// Our own exception handler -function __exceptionHandler (FrameworkException $e) { - // Call the app_exit() method - ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s (%s) has terminated due to an uncaught exception: %s [%s]: %s Backtrace:
%s
", - ApplicationHelper::getSelfInstance()->getAppName(), - ApplicationHelper::getSelfInstance()->getAppShortName(), - $e->__toString(), - $e->getHexCode(), - $e->getMessage(), - $e->getPrintableBackTrace() - ), - $e->getHexCode(), - $e->getExtraData() - ); -} // END - function +// The node's own exception handler +function shipsimu_exception_handler ($exceptionInstance) { + // Is it an object and a valid instance? + if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof Exception)) { + // Init variable + $backTrace = ''; -// Set the new handler -set_exception_handler('__exceptionHandler'); + // Generate exception code + $exceptionCode = ($exceptionInstance instanceof FrameworkException ? $exceptionInstance->getHexCode() : '0x' . bin2hex($exceptionInstance->getCode())); + + // Get all call levels from backtrace + foreach ($exceptionInstance->getTrace() as $idx => $traceArray) { + // Init argument string + $argsString = ''; + + // Arguments given? + if (isset($traceArray['args'])) { + // Convert arguments type into human-readable + foreach ($traceArray['args'] as $arg) { + $argsString .= ', ' . gettype($arg); + } + $argsString = substr($argsString, 2); + } + + // Set missing file/line + if (!isset($traceArray['file'])) $traceArray['file'] = 'unknown'; + if (!isset($traceArray['line'])) $traceArray['line'] = '0'; + if (!isset($traceArray['class'])) $traceArray['class'] = 'UnknownObject'; + if (!isset($traceArray['type'])) $traceArray['type'] = '->'; + + $backTrace .= sprintf("---------- Pos %d: ---------- +Method : %s%s%s(%s) +----- Caller: ----- +File : %s +Line : %d\n", + ($idx + 1), + $traceArray['class'], + $traceArray['type'], + $traceArray['function'], + $argsString, + basename($traceArray['file']), + $traceArray['line'] + ); + } + + // Construct the message + $message = sprintf("-------------------------------------------------------------------------------- +Uncaught Exception : %s +-------------------------------------------------------------------------------- +Message : %s +Code : %s +File : %s +Line : %d +-------------------------------------------------------------------------------- +Backtrace: +-------------------------------------------------------------------------------- +%s +--------------------------------------------------------------------------------\n", + trim(html_entity_decode(strip_tags(get_class($exceptionInstance)))), + trim(html_entity_decode(strip_tags($exceptionInstance->getMessage()))), + $exceptionCode, + $exceptionInstance->getFile(), + $exceptionInstance->getLine(), + trim($backTrace) + ); + + // Output the message + print($message); + + // Exit with code + exit(hexdec($exceptionCode)); + } elseif (is_object($exceptionInstance)) { + // Output more details + printf('exceptionInstance=%s', print_r($exceptionInstance, true)); + exit(255); + } else { + /* + * Invalid exception instance detected! Do *only* throw exceptions that + * extends our own exception 'FrameworkException' to get such nice + * outputs like above. + */ + printf('exceptionInstance[]=%s is invalid! Please inform the shipsimu developer team.' . PHP_EOL, gettype($exceptionInstance)); + exit(255); + } +} // Error handler -function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) { +function shipsimu_error_handler (int $errno, string $errstr, string $errfile, int $errline, array $errcontext) { // Construct the message - $message = sprintf("File: %s, Line: %s, Code: %s, Message: %s", + $message = sprintf('File: %s, Line: %d, Code: %d, Message: %s', basename($errfile), $errline, $errno, @@ -53,33 +125,38 @@ function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) // Throw an exception here throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR); -} // END - function - -// Set error handler -set_error_handler('__errorHandler'); +} // Assertion handler -function __assertHandler ($file, $line, $code) { +function shipsimu_assert_handler (string $file, int $line, int $code) { // Empty code? - if ($code === "") $code = "Unknown"; + if (empty($code)) { + $code = 'Unknown'; + } // Create message - $message = sprintf("File: %s, Line: %s, Code: %s", + $message = sprintf('File: %s, Line: %s, Code: %s', basename($file), $line, $code ); + // Log assert + syslog(LOG_WARNING, $message); + // Throw an exception here throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED); -} // END - function +} + +// Set error handler +//set_error_handler('shipsimu_error_handler'); + +// Set the new handler +set_exception_handler('shipsimu_exception_handler'); // Init assert handling -assert_options(ASSERT_ACTIVE, 1); -assert_options(ASSERT_WARNING, 0); -assert_options(ASSERT_BAIL, 0); -assert_options(ASSERT_QUIET_EVAL, 0); -assert_options(ASSERT_CALLBACK, '__assertHandler'); - -// [EOF] -?> +assert_options(ASSERT_ACTIVE , true); +assert_options(ASSERT_WARNING , true); +assert_options(ASSERT_BAIL , true); +assert_options(ASSERT_QUIET_EVAL, false); +assert_options(ASSERT_CALLBACK , 'shipsimu_assert_handler'); diff --git a/application/shipsimu/exceptions/.htaccess b/application/shipsimu/exceptions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/exceptions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/exceptions/class_BirthdayInvalidException.php b/application/shipsimu/exceptions/class_BirthdayInvalidException.php index ed8e189..76f9a7b 100644 --- a/application/shipsimu/exceptions/class_BirthdayInvalidException.php +++ b/application/shipsimu/exceptions/class_BirthdayInvalidException.php @@ -37,6 +37,3 @@ class BirthdayInvalidException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_CabinShipMismatchException.php b/application/shipsimu/exceptions/class_CabinShipMismatchException.php index 6b9120b..870a815 100644 --- a/application/shipsimu/exceptions/class_CabinShipMismatchException.php +++ b/application/shipsimu/exceptions/class_CabinShipMismatchException.php @@ -23,6 +23,3 @@ */ class CabinShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ContractAllreadySignedException.php b/application/shipsimu/exceptions/class_ContractAllreadySignedException.php index fc17f64..ab4b9c8 100644 --- a/application/shipsimu/exceptions/class_ContractAllreadySignedException.php +++ b/application/shipsimu/exceptions/class_ContractAllreadySignedException.php @@ -34,6 +34,3 @@ class ContractAllreadySignedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php b/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php index fce9748..f0c9b2a 100644 --- a/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php +++ b/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php @@ -34,6 +34,3 @@ class ContractPartnerMismatchException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_DeckShipMismatchException.php b/application/shipsimu/exceptions/class_DeckShipMismatchException.php index 937cd6e..998cb60 100644 --- a/application/shipsimu/exceptions/class_DeckShipMismatchException.php +++ b/application/shipsimu/exceptions/class_DeckShipMismatchException.php @@ -23,6 +23,3 @@ */ class DeckShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_EmptyStructuresListException.php b/application/shipsimu/exceptions/class_EmptyStructuresListException.php index 9c1eee2..805bd00 100644 --- a/application/shipsimu/exceptions/class_EmptyStructuresListException.php +++ b/application/shipsimu/exceptions/class_EmptyStructuresListException.php @@ -32,6 +32,3 @@ class EmptyStructuresListException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_InvalidContractPartnerException.php b/application/shipsimu/exceptions/class_InvalidContractPartnerException.php index 8f4823e..b298119 100644 --- a/application/shipsimu/exceptions/class_InvalidContractPartnerException.php +++ b/application/shipsimu/exceptions/class_InvalidContractPartnerException.php @@ -32,6 +32,3 @@ class InvalidContractPartnerException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_InvalidIDFormatException.php b/application/shipsimu/exceptions/class_InvalidIDFormatException.php index 78e2e00..f6265fc 100644 --- a/application/shipsimu/exceptions/class_InvalidIDFormatException.php +++ b/application/shipsimu/exceptions/class_InvalidIDFormatException.php @@ -32,6 +32,3 @@ class InvalidIDFormatException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ItemNotInPriceListException.php b/application/shipsimu/exceptions/class_ItemNotInPriceListException.php index 0013e92..6ed0bae 100644 --- a/application/shipsimu/exceptions/class_ItemNotInPriceListException.php +++ b/application/shipsimu/exceptions/class_ItemNotInPriceListException.php @@ -32,6 +32,3 @@ class ItemNotInPriceListException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ItemNotTradeableException.php b/application/shipsimu/exceptions/class_ItemNotTradeableException.php index 074f17e..11d3484 100644 --- a/application/shipsimu/exceptions/class_ItemNotTradeableException.php +++ b/application/shipsimu/exceptions/class_ItemNotTradeableException.php @@ -32,6 +32,3 @@ class ItemNotTradeableException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_MissingSimulatorIdException.php b/application/shipsimu/exceptions/class_MissingSimulatorIdException.php index 09a55f3..6fd3d32 100644 --- a/application/shipsimu/exceptions/class_MissingSimulatorIdException.php +++ b/application/shipsimu/exceptions/class_MissingSimulatorIdException.php @@ -33,6 +33,3 @@ class MissingSimulatorIdException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_MotorShipMismatchException.php b/application/shipsimu/exceptions/class_MotorShipMismatchException.php index 7e688c2..601857e 100644 --- a/application/shipsimu/exceptions/class_MotorShipMismatchException.php +++ b/application/shipsimu/exceptions/class_MotorShipMismatchException.php @@ -23,6 +23,3 @@ */ class MotorShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php b/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php index 848362e..fcd3581 100644 --- a/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php +++ b/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php @@ -41,6 +41,3 @@ class NoShippingCompanyOwnedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php b/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php index 52cf913..0449ea6 100644 --- a/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php +++ b/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php @@ -30,12 +30,9 @@ class NoShipyardsConstructedException extends FrameworkException { $message = sprintf("[%s:] Keine Werften gefunden!", $class->__toString() ); - } // END - if + } // Call parent constructor parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php b/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php index c89dc44..7a37133 100644 --- a/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php +++ b/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php @@ -32,6 +32,3 @@ class PersonellListAlreadyCreatedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_RoomShipMismatchException.php b/application/shipsimu/exceptions/class_RoomShipMismatchException.php index d84528c..6870871 100644 --- a/application/shipsimu/exceptions/class_RoomShipMismatchException.php +++ b/application/shipsimu/exceptions/class_RoomShipMismatchException.php @@ -23,6 +23,3 @@ */ class RoomShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ShipNotConstructedException.php b/application/shipsimu/exceptions/class_ShipNotConstructedException.php index 3313c36..7f7905a 100644 --- a/application/shipsimu/exceptions/class_ShipNotConstructedException.php +++ b/application/shipsimu/exceptions/class_ShipNotConstructedException.php @@ -23,6 +23,3 @@ */ class ShipNotConstructedException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php b/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php index 48b4fe7..3d42ff4 100644 --- a/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php +++ b/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php @@ -32,6 +32,3 @@ class ShipPartNotConstructableException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_StructureShipMismatchException.php b/application/shipsimu/exceptions/class_StructureShipMismatchException.php index 62152e8..5495c75 100644 --- a/application/shipsimu/exceptions/class_StructureShipMismatchException.php +++ b/application/shipsimu/exceptions/class_StructureShipMismatchException.php @@ -23,6 +23,3 @@ */ class StructureShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php b/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php index 916207f..56fcb78 100644 --- a/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php +++ b/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php @@ -30,6 +30,3 @@ class StructuresOutOfBoundsException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ToMuchEmployeesException.php b/application/shipsimu/exceptions/class_ToMuchEmployeesException.php index a6bffb0..0c95176 100644 --- a/application/shipsimu/exceptions/class_ToMuchEmployeesException.php +++ b/application/shipsimu/exceptions/class_ToMuchEmployeesException.php @@ -33,6 +33,3 @@ class ToMuchEmployeesException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php b/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php index 7aa57ae..218633a 100644 --- a/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php +++ b/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php @@ -32,6 +32,3 @@ class TotalPriceNotCalculatedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php b/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php index ee7aa5a..217aa89 100644 --- a/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php +++ b/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php @@ -30,6 +30,3 @@ class UnsupportedLimitationPartException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php b/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php index 306a680..cab603e 100644 --- a/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php +++ b/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php @@ -30,6 +30,3 @@ class WrongGenderSpecifiedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/init.php b/application/shipsimu/init.php deleted file mode 100644 index 943eb79..0000000 --- a/application/shipsimu/init.php +++ /dev/null @@ -1,47 +0,0 @@ -isClass("ApplicationSelector"))) { return; } - * - * isset() is required to prevent a warning and is_object() is highly required - * when the application itself is requested in URL (hint: index.php?app=your_app) - * - * @author Roland Haeder - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Get config instance -$cfg = FrameworkConfiguration::getSelfInstance(); - -// Initialize output system -ApplicationHelper::createDebugInstance('ApplicationHelper'); - -// This application needs a database connection then we have to simply include -// the inc/database.php script -require($cfg->getConfigEntry('base_path') . 'inc/database.php'); - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/.htaccess b/application/shipsimu/interfaces/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/interfaces/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/interfaces/class_BookableAccount.php b/application/shipsimu/interfaces/class_BookableAccount.php index 3f3a575..b794268 100644 --- a/application/shipsimu/interfaces/class_BookableAccount.php +++ b/application/shipsimu/interfaces/class_BookableAccount.php @@ -31,6 +31,3 @@ interface BookableAccount extends FrameworkInterface { */ function bookAmountDirectly (Requestable $requestInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ConstructableShip.php b/application/shipsimu/interfaces/class_ConstructableShip.php index db76fd5..58aca0c 100644 --- a/application/shipsimu/interfaces/class_ConstructableShip.php +++ b/application/shipsimu/interfaces/class_ConstructableShip.php @@ -23,6 +23,3 @@ */ interface ConstructableShip extends FrameworkInterface { } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ConstructableShipPart.php b/application/shipsimu/interfaces/class_ConstructableShipPart.php index 8135bc3..6797a52 100644 --- a/application/shipsimu/interfaces/class_ConstructableShipPart.php +++ b/application/shipsimu/interfaces/class_ConstructableShipPart.php @@ -23,6 +23,3 @@ */ interface ConstructableShipPart extends FrameworkInterface { } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ContractPartner.php b/application/shipsimu/interfaces/class_ContractPartner.php index 35b4b6d..2f8053c 100644 --- a/application/shipsimu/interfaces/class_ContractPartner.php +++ b/application/shipsimu/interfaces/class_ContractPartner.php @@ -31,6 +31,3 @@ interface ContractPartner extends FrameworkInterface { */ function isContractPartner (SignableContract $contractInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_Customer.php b/application/shipsimu/interfaces/class_Customer.php index 5de5210..82093e5 100644 --- a/application/shipsimu/interfaces/class_Customer.php +++ b/application/shipsimu/interfaces/class_Customer.php @@ -50,6 +50,3 @@ interface Customer extends FrameworkInterface { */ function withdrawFromContract (SignableContract $contractInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_Personellizer.php b/application/shipsimu/interfaces/class_Personellizer.php index b56df14..e1a7846 100644 --- a/application/shipsimu/interfaces/class_Personellizer.php +++ b/application/shipsimu/interfaces/class_Personellizer.php @@ -195,6 +195,3 @@ interface Personellizer extends FrameworkInterface { */ function decreaseSalary ($sub); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_SignableContract.php b/application/shipsimu/interfaces/class_SignableContract.php index a8f62ce..8bf4d9c 100644 --- a/application/shipsimu/interfaces/class_SignableContract.php +++ b/application/shipsimu/interfaces/class_SignableContract.php @@ -25,6 +25,3 @@ interface SignableContract extends FrameworkInterface { // Sign the contract function signContract (ContractPartner $partnerInstance, ContractPartner $partyInstance); } - -// [EOF] -?> \ No newline at end of file diff --git a/application/shipsimu/interfaces/class_TradeableItem.php b/application/shipsimu/interfaces/class_TradeableItem.php index f850be2..66756c4 100644 --- a/application/shipsimu/interfaces/class_TradeableItem.php +++ b/application/shipsimu/interfaces/class_TradeableItem.php @@ -30,6 +30,3 @@ interface TradeableItem extends FrameworkInterface { */ function isTradeable (); } - -// [EOF] -?> diff --git a/application/shipsimu/language/.gitkeep b/application/shipsimu/language/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/application/shipsimu/language/.htaccess b/application/shipsimu/language/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/language/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/loader.php b/application/shipsimu/loader.php deleted file mode 100644 index bcb574f..0000000 --- a/application/shipsimu/loader.php +++ /dev/null @@ -1,29 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Scan for application's classes, exceptions and interfaces -ClassLoader::scanApplicationClasses(); - -// [EOF] -?> diff --git a/application/shipsimu/starter.php b/application/shipsimu/starter.php deleted file mode 100644 index b6f4c45..0000000 --- a/application/shipsimu/starter.php +++ /dev/null @@ -1,53 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Is there an application helper instance? We need the method main() for -// maining the application -$app = call_user_func_array(array(FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), 'getSelfInstance'), array()); - -// Some sanity checks -if ((empty($app)) || (is_null($app))) { - // Something went wrong! - ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because the helper class %s is not loaded.", - $application, - FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class') - )); -} elseif (!is_object($app)) { - // No object! - ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because 'app' is not an object.", - $application - )); -} elseif (!method_exists($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method'))) { - // Method not found! - ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because the method %s is missing.", - $application, - FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method') - )); -} - -// Call user function -call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array()); - -// [EOF] -?> diff --git a/application/shipsimu/templates/.htaccess b/application/shipsimu/templates/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/de/.htaccess b/application/shipsimu/templates/de/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/de/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp index ebe2fbd..c907595 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp @@ -34,7 +34,7 @@ if ($linkInstance->getValueInstance()->ifUserHasRequiredPoints('write_applicatio // Display link to government for startup help $linkInstance->addActionLinkById('government_startup_help', 'apply_startup_help_government'); - } // END - if + } } elseif ($linkInstance->getValueInstance()->ifGovernmentPaysStartupHelp()) { // Display link to government for startup help $linkInstance->addActionLinkById('government_startup_help', 'apply_startup_help_government'); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp index 99c68f7..2f77d1a 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp @@ -29,7 +29,7 @@ $helperInstance->addInputPasswordField('password'); if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung von Starthilfe ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, damit du die Starthilfe beantragen kannst."); $helperInstance->addCaptcha(); -} // END - if +} // Final notices $helperInstance->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!"); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp index 555c036..9c41efd 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp @@ -29,7 +29,7 @@ $helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_prof if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung eines Trainingkursus ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, um den Trainingskursus zu beantragen."); $helperInstance->addCaptcha(); -} // END - if +} // Final notices $helperInstance->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!"); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp index e4ec93c..083dd30 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp @@ -29,12 +29,12 @@ if ($helperInstance->ifEmailChangeAllowed()) { if ($helperInstance->ifEmailMustBeUnique()) { $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein."); - } // END - if + } if ($helperInstance->ifEmailChangeRequireConfirmation()) { $helperInstance->addFormNote('confirm', "Es wird ein Bestätigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann möglichst schnell an."); - } // END - if -} // END - if + } +} // Add form group for user profile $helperInstance->addFormGroup('profile', "Hier kannst du deine Profildaten ändern."); @@ -59,8 +59,8 @@ if ($helperInstance->ifRegisterIncludesPersonaData()) { $helperInstance->addInputTextField('birth_month'); $helperInstance->addFieldText('birth_day', "."); $helperInstance->addInputTextField('birth_year'); - } // END - if -} // END - if + } +} // Add sub group for zip code $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?"); @@ -74,35 +74,35 @@ $helperInstance->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern if ($helperInstance->ifChatEnabled('icq')) { $helperInstance->addFieldText('icq', "ICQ-Nummer:"); $helperInstance->addInputTextFieldWithDefault('icq'); -} // END - if +} // Add Jabber chat? if ($helperInstance->ifChatEnabled('jabber')) { $helperInstance->addFieldText('jabber', "Jabber:"); $helperInstance->addInputTextFieldWithDefault('jabber'); -} // END - if +} // Add Yahoo! chat? if ($helperInstance->ifChatEnabled('yahoo')) { $helperInstance->addFieldText('yahoo', "Yahoo!:"); $helperInstance->addInputTextFieldWithDefault('yahoo'); -} // END - if +} // Add AOL chat? if ($helperInstance->ifChatEnabled('aol')) { $helperInstance->addFieldText('aol', "AOL-Screenname:"); $helperInstance->addInputTextFieldWithDefault('aol'); -} // END - if +} // Add MSN chat? if ($helperInstance->ifChatEnabled('msn')) { $helperInstance->addFieldText('msn', "MSN:"); $helperInstance->addInputTextFieldWithDefault('msn'); -} // END - if +} if (!$helperInstance->ifRegisterRequiresEmailVerification()) { $helperInstance->addFormExtraNote(1, "Die Benachrichtigungen per Email sind im Loginbereich verfeinerbar, welche du genau haben willst."); -} // END - if +} // Rules already accepted? if ($helperInstance->ifRulesHaveChanged()) { @@ -118,7 +118,7 @@ if ($helperInstance->ifRulesHaveChanged()) { if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_user', "Das Ändern von Profildaten ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, damit deine Änderungen gespeichert werden können."); $helperInstance->addCaptcha(); -} // END - if +} // Ask again for current account password $helperInstance->addFormGroup('pass_old', "Bitte gebe zur Bestätigung der Änderungen dein derzeitiges Passwort ein."); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp index 0481264..3dd4548 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp @@ -40,7 +40,7 @@ $helperInstance->addInputPasswordField('pass_old'); if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_refill', "Bitte wiederhole den angezeigten Code:"); $helperInstance->addCaptcha(); -} // END - if +} // Submit button $helperInstance->addFormGroup('buttons_refill', "Mit Absenden des Formulars wird deine Nachbestellung verbindlich!"); diff --git a/application/shipsimu/templates/de/code/government_failed_main.ctp b/application/shipsimu/templates/de/code/government_failed_main.ctp index 6411bfb..078f035 100644 --- a/application/shipsimu/templates/de/code/government_failed_main.ctp +++ b/application/shipsimu/templates/de/code/government_failed_main.ctp @@ -17,7 +17,7 @@ $blockInstance->assignFieldWithFilter('user_status', "user_status_translator"); if ($blockInstance->ifIncludeRegistrationStamp()) { // Then assign it as well! $blockInstance->assignFieldWithFilter('registered', 'formatTimestamp'); -} // END - if +} // Flush the content out to a template variable $blockInstance->flushContent(); diff --git a/application/shipsimu/templates/de/code/login_form.ctp b/application/shipsimu/templates/de/code/login_form.ctp index b8a52e2..4f48dbd 100644 --- a/application/shipsimu/templates/de/code/login_form.ctp +++ b/application/shipsimu/templates/de/code/login_form.ctp @@ -36,7 +36,7 @@ if ($helperInstance->ifLoginIsEnabled()) { if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst."); $helperInstance->addCaptcha(); - } // END - if + } // Submit buttons $helperInstance->addFormGroup('buttons_user', "Alles richtig eingegeben?"); @@ -62,7 +62,7 @@ if ($helperInstance->ifGuestLoginAllowed()) { if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_guest', "Unser Gast-Login ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst."); $helperInstance->addCaptcha(); - } // END - if + } // Submit button $helperInstance->addFormGroup('buttons_guest', "Gastlogins sind in der Funkionsweise eingeschränkt. Mehr dazu unter "Gastlogin"."); diff --git a/application/shipsimu/templates/de/code/login_main.ctp b/application/shipsimu/templates/de/code/login_main.ctp index 8c17459..efff9d9 100644 --- a/application/shipsimu/templates/de/code/login_main.ctp +++ b/application/shipsimu/templates/de/code/login_main.ctp @@ -18,7 +18,7 @@ $blockInstance->assignFieldWithFilter('points', 'format_number'); if ($blockInstance->ifIncludeRegistrationStamp()) { // Then assign it as well! $blockInstance->assignFieldWithFilter('registered', 'format_timestamp'); -} // END - if +} // Flush the content out to a template variable $blockInstance->flushContent(); diff --git a/application/shipsimu/templates/de/code/register_form.ctp b/application/shipsimu/templates/de/code/register_form.ctp index 738b3b8..86812b8 100644 --- a/application/shipsimu/templates/de/code/register_form.ctp +++ b/application/shipsimu/templates/de/code/register_form.ctp @@ -26,8 +26,8 @@ if ($helperInstance->ifRegisterRequiresEmailVerification()) { // Must the email address be unique in this system? if ($helperInstance->ifEmailMustBeUnique()) { $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein."); - } // END - if -} // END - if + } +} // Shall we also ask some personal data to complete the profile? if ($helperInstance->ifRegisterIncludesProfile()) { @@ -41,8 +41,8 @@ if ($helperInstance->ifRegisterIncludesProfile()) { // Must the email address be unique in this system? if ($helperInstance->ifEmailMustBeUnique()) { $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein."); - } // END - if - } // END - if + } + } // Persoenliche Daten mit in der Anmeldung abfragen? if ($helperInstance->ifRegisterIncludesPersonaData()) { @@ -64,8 +64,8 @@ if ($helperInstance->ifRegisterIncludesProfile()) { $helperInstance->addInputTextField('birth_month'); $helperInstance->addFieldText('birth_day', "."); $helperInstance->addInputTextField('birth_year'); - } // END - if - } // END - if + } + } $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?"); $helperInstance->addFieldText('zip', "Postleitzahl:"); @@ -76,27 +76,27 @@ if ($helperInstance->ifRegisterIncludesProfile()) { if ($helperInstance->ifChatEnabled('icq')) { $helperInstance->addFieldText('icq', "ICQ-Nummer:"); $helperInstance->addInputTextField('icq'); - } // END - if + } if ($helperInstance->ifChatEnabled('jabber')) { $helperInstance->addFieldText('jabber', "Jabber:"); $helperInstance->addInputTextField('jabber'); - } // END - if + } if ($helperInstance->ifChatEnabled('yahoo')) { $helperInstance->addFieldText('yahoo', "Yahoo!:"); $helperInstance->addInputTextField('yahoo'); - } // END - if + } if ($helperInstance->ifChatEnabled('aol')) { $helperInstance->addFieldText('aol', "AOL-Screenname:"); $helperInstance->addInputTextField('aol'); - } // END - if + } if ($helperInstance->ifChatEnabled('msn')) { $helperInstance->addFieldText('msn', "MSN:"); $helperInstance->addInputTextField('msn'); - } // END - if + } if (!$helperInstance->ifRegisterRequiresEmailVerification()) { $helperInstance->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst."); @@ -113,7 +113,7 @@ $helperInstance->addInputCheckboxField('rules', false); if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha', "Bitte wiederhole den angezeigten Code damit die Anmeldung abgeschlossen werden kann."); $helperInstance->addCaptcha(); -} // END - if +} // Final note and submit buttons $helperInstance->addFormGroup('buttons', "Wenn du alle benötigten Felder korrekt ausgefüt hast, kannst du die Anmeldung abschliessen."); diff --git a/application/shipsimu/templates/de/emails/.htaccess b/application/shipsimu/templates/de/emails/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/de/emails/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/de/html/.htaccess b/application/shipsimu/templates/de/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/de/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/de/menu/.htaccess b/application/shipsimu/templates/de/menu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/de/menu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/.htaccess b/application/shipsimu/templates/game/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/building/.htaccess b/application/shipsimu/templates/game/building/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/building/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/chemicals/.htaccess b/application/shipsimu/templates/game/chemicals/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/chemicals/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/company/.htaccess b/application/shipsimu/templates/game/company/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/company/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/container/.htaccess b/application/shipsimu/templates/game/container/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/container/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/contract/.htaccess b/application/shipsimu/templates/game/contract/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/contract/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/drink/.htaccess b/application/shipsimu/templates/game/drink/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/drink/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/electronic/.htaccess b/application/shipsimu/templates/game/electronic/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/electronic/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/engine/.htaccess b/application/shipsimu/templates/game/engine/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/engine/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/farmer/.htaccess b/application/shipsimu/templates/game/farmer/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/farmer/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/fruit/.htaccess b/application/shipsimu/templates/game/fruit/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/fruit/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/fuel/.htaccess b/application/shipsimu/templates/game/fuel/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/fuel/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/grain/.htaccess b/application/shipsimu/templates/game/grain/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/grain/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/lifestock/.htaccess b/application/shipsimu/templates/game/lifestock/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/lifestock/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/merchant/.htaccess b/application/shipsimu/templates/game/merchant/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/merchant/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/mineral/.htaccess b/application/shipsimu/templates/game/mineral/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/mineral/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/produce/.htaccess b/application/shipsimu/templates/game/produce/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/produce/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/research/.htaccess b/application/shipsimu/templates/game/research/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/research/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/resource/.htaccess b/application/shipsimu/templates/game/resource/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/resource/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/ship/.htaccess b/application/shipsimu/templates/game/ship/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/ship/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/tank/.htaccess b/application/shipsimu/templates/game/tank/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/tank/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/technology/.htaccess b/application/shipsimu/templates/game/technology/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/technology/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/types/.htaccess b/application/shipsimu/templates/game/types/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/types/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/vegetable/.htaccess b/application/shipsimu/templates/game/vegetable/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/vegetable/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/clear-cache.sh b/clear-cache.sh deleted file mode 100755 index 54edf12..0000000 --- a/clear-cache.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -echo "$0: Cleaning up..." -rm -f templates/images/_cache/*.png application/*/templates/images/_cache/*.png - -echo "$0: All done." diff --git a/contrib/Doxyfile b/contrib/Doxyfile new file mode 100644 index 0000000..f5c45d4 --- /dev/null +++ b/contrib/Doxyfile @@ -0,0 +1,1565 @@ +# Doxyfile 1.6.2 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = Ship-Simulator + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 0.1a + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = /var/www/htdocs/ship-simu/trunk/docs/ + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = "The $name class " \ + "The $name widget " \ + "The $name file " \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = YES + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = YES + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = /var/www/htdocs/ + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = YES + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = YES + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = YES + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = YES + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = YES + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = YES + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = YES + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text " + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = /var/www/htdocs/ship-simu/trunk/docs/warn.log + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = /var/www/htdocs/ship-simu/trunk/index.php \ + /var/www/htdocs/ship-simu/trunk/inc/ \ + /var/www/htdocs/ship-simu/trunk/application/ship-simu/ + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = *.php \ + *.ctp + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = */docs/* \ + */ship-simu.org/* + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = YES + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 3 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = NO + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = YES + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = YES + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = YES + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = YES + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = YES + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = NO + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = YES + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = YES + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = YES + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = YES + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/contrib/clear-cache.sh b/contrib/clear-cache.sh new file mode 100755 index 0000000..54edf12 --- /dev/null +++ b/contrib/clear-cache.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +echo "$0: Cleaning up..." +rm -f templates/images/_cache/*.png application/*/templates/images/_cache/*.png + +echo "$0: All done." diff --git a/contrib/find-bad-php.sh b/contrib/find-bad-php.sh new file mode 100755 index 0000000..2fdfecf --- /dev/null +++ b/contrib/find-bad-php.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +echo "$0: Searching for PHP scripts (except 3rd party) ..." +PHP=`find -type f -name "*.php" | grep -v "third_party"` + +for SCRIPT in ${PHP}; +do + HEADER=`cat ${SCRIPT} | head -n 1 | grep -v ""` + + if [ -n "${HEADER}" ]; + then + echo "$0: Script '${SCRIPT}' has non-typical header." + fi + + if [ -n "${FOOTER}" ]; + then + echo "$0: Script '${SCRIPT}' has non-typical footer." + fi + + LINT=`php -l "${SCRIPT}" 2>&1 | grep -v "No syntax errors detected in"` + + if [ -n "${LINT}" ] + then + echo "$0: ${LINT}" + fi +done + +echo "$0: All done." +exit 0 diff --git a/contrib/package.sh b/contrib/package.sh new file mode 100755 index 0000000..639837e --- /dev/null +++ b/contrib/package.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +NAME=shipsimu_dev_`date +%Y%m%d_%H%M%S`.zip + +sh ./clear-cache.sh + +echo -n "$0: Packaging... " +zip -9 $NAME docs/* Doxyfile *.php *.sh > /dev/null 2>&1 +echo -n "." +zip -9r $NAME application/ db/ devel/ Doxyfile inc/ templates/ tests/ > /dev/null 2>&1 +echo -n "." +zip -d $NAME docs/warn.log db/*/*.serialized > /dev/null 2>&1 +echo ". done" +echo "$0: All done." diff --git a/contrib/pdepend.sh b/contrib/pdepend.sh new file mode 100755 index 0000000..9185237 --- /dev/null +++ b/contrib/pdepend.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if ! test -e `which pdepend`; then + echo "$0: This script needs PHP_Depend. See URL" + echo "$0: http://www.manuel-pichler.de/pages/pdepend.html for details." +fi + +pdepend --bad-documentation --ignore=db,docs,ship-simu.org \ + --jdepend-chart=test.png --overview-pyramid=pyramid.png \ + --summary-xml=summary.xml --jdepend-xml=jdepend.xml . diff --git a/contrib/rebuild_doc.sh b/contrib/rebuild_doc.sh new file mode 100755 index 0000000..697ed08 --- /dev/null +++ b/contrib/rebuild_doc.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +echo "$0: Cleaning up..." +find docs/html/ -type f -exec rm -f {} \; +rm -f docs/*.log +echo "$0: Done." + +doxygen Doxyfile diff --git a/contrib/todo-builder.sh b/contrib/todo-builder.sh new file mode 100755 index 0000000..360b888 --- /dev/null +++ b/contrib/todo-builder.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# This script helps building the file docs/TODOs.txt and should be executed by +# developers with SVN write-access + +TYPES="php ctp xml" + +if ! test -e "index.php"; then + echo "$0: Please execute this script from root directory." + exit 1 +fi + +echo "$0: Generating TODOs.txt..." +echo "### WARNING: THIS FILE IS AUTO-GENERATED BY $0 ###" > docs/TODOs.txt +echo "### DO NOT EDIT THIS FILE. ###" >> docs/TODOs.txt +for type in $TYPES; do + find -type f -name "*.$type" -exec grep -Hin "@TODO" {} \; | sort >> docs/TODOs.txt +done +echo "### ### DEPRECATION FOLLOWS: ### ###" >> docs/TODOs.txt +for type in $TYPES; do + find -type f -name "*.$type" -exec grep -Hin "@DEPRECATED" {} \; | sort >> docs/TODOs.txt +done +echo "$0: Done." +exit 0 diff --git a/core b/core index 1893995..c3f1d30 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 1893995b39b02c07012c5f3795654fb9251b5ebd +Subproject commit c3f1d30c20e25c1ddadd8aeba8f2636713b6cd63 diff --git a/db/.htaccess b/db/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/company/.gitkeep b/db/company/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/company/.htaccess b/db/company/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/company/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/company_user/.htaccess b/db/company_user/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/company_user/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/gov_user/.gitkeep b/db/gov_user/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/gov_user/.htaccess b/db/gov_user/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/gov_user/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/news/.gitkeep b/db/news/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/news/.htaccess b/db/news/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/news/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/payments/.gitkeep b/db/payments/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/payments/.htaccess b/db/payments/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/payments/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/user/.gitkeep b/db/user/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/user/.htaccess b/db/user/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/user/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/user_points/.gitkeep b/db/user_points/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/user_points/.htaccess b/db/user_points/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/user_points/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/find-bad-php.sh b/find-bad-php.sh deleted file mode 100755 index 2fdfecf..0000000 --- a/find-bad-php.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -echo "$0: Searching for PHP scripts (except 3rd party) ..." -PHP=`find -type f -name "*.php" | grep -v "third_party"` - -for SCRIPT in ${PHP}; -do - HEADER=`cat ${SCRIPT} | head -n 1 | grep -v ""` - - if [ -n "${HEADER}" ]; - then - echo "$0: Script '${SCRIPT}' has non-typical header." - fi - - if [ -n "${FOOTER}" ]; - then - echo "$0: Script '${SCRIPT}' has non-typical footer." - fi - - LINT=`php -l "${SCRIPT}" 2>&1 | grep -v "No syntax errors detected in"` - - if [ -n "${LINT}" ] - then - echo "$0: ${LINT}" - fi -done - -echo "$0: All done." -exit 0 diff --git a/inc b/inc deleted file mode 120000 index 1f8dea2..0000000 --- a/inc +++ /dev/null @@ -1 +0,0 @@ -core/inc \ No newline at end of file diff --git a/index.php b/index.php index 51eb50e..37fa261 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,20 @@ * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -28,9 +44,9 @@ */ final class ApplicationEntryPoint { /** - * Core path + * Framework path */ - private static $corePath = ''; + private static $frameworkPath = ''; /** * The application's emergency exit @@ -42,99 +58,107 @@ final class ApplicationEntryPoint { * @return void * @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper */ - public static final function app_exit ($message = '', $code = FALSE, $extraData = '', $silentMode = FALSE) { + public static final function exitApplication (string $message = '', int $code = -1, string $extraData = '', bool $silentMode = false) { // Is this method already called? + //* NOISY-DEBUG: */ printf('[%s:%d]: message=%s,code=%d,extraData=%s,silentMode=%d - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $message, $code, $extraData, intval($silentMode)); if (isset($GLOBALS['app_die_called'])) { // Then output the text directly - exit($message); - } // END - if + print $message . PHP_EOL; + exit(255); + } // This method shall not be called twice - $GLOBALS['app_die_called'] = TRUE; + $GLOBALS['app_die_called'] = true; // Is a message set? if (empty($message)) { // No message provided $message = 'No message provided.'; - } // END - if + } // Get config instance - $configInstance = FrameworkConfiguration::getSelfInstance(); + $configInstance = FrameworkBootstrap::getConfigurationInstance(); // Do we have debug installation? - if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === TRUE)) { + if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) { // Abort here - exit(); - } // END - if + //* NOISY-DEBUG: */ printf('[%s:%d]: product_install_mode=%d,silentMode=%d - EXIT!' . PHP_EOL, __METHOD__, __LINE__, $configInstance->getConfigEntry('product_install_mode'), intval($silentMode)); + exit(255); + } // Get some instances - $tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('html_template_class'); + $templateClassName = $configInstance->getConfigEntry('html_template_class'); $languageInstance = LanguageSystem::getSelfInstance(); // Initialize template instance here to avoid warnings in IDE $templateInstance = NULL; // Get response instance - $responseInstance = ApplicationHelper::getSelfInstance()->getResponseInstance(); + $responseInstance = FrameworkBootstrap::getResponseInstance(); // Is the template engine loaded? - if ((class_exists($tpl)) && (is_object($languageInstance))) { + if ((class_exists($templateClassName)) && ($languageInstance instanceof ManageableLanguage)) { // Use the template engine for putting out (nicer look) the message try { // Get the template instance from our object factory - $templateInstance = ObjectFactory::createObjectByName($tpl); + $templateInstance = ObjectFactory::createObjectByName($templateClassName); } catch (FrameworkException $e) { - exit(sprintf("[Main:] Could not initialize template engine for reason: %s", + exit(sprintf('[Main:] Could not initialize template engine for reason: %s', $e->getMessage() )); } // Get and prepare backtrace for output - $backtraceArray = debug_backtrace(); $backtrace = ''; - foreach ($backtraceArray as $key => $trace) { + foreach (debug_backtrace() as $key => $trace) { // Set missing array elements if (!isset($trace['file'])) { $trace['file'] = __FILE__; - } // END - if + } if (!isset($trace['line'])) { $trace['line'] = __LINE__; - } // END - if + } if (!isset($trace['args'])) { $trace['args'] = array(); - } // END - if + } // Add the traceback path to the final output - $backtrace .= sprintf("%s:%d, %s(%d)
\n", + $backtrace .= sprintf('%s:%d, %s(%d)
' . PHP_EOL, basename($trace['file']), $trace['line'], $trace['function'], count($trace['args']) ); - } // END - foreach + } // Init application instance $applicationInstance = NULL; - // Is the class there? - if (class_exists('ApplicationHelper')) { + /* + * The following class may NOT be loaded at all times. For example, + * it might be the (rare) case that an error has happened BEFORE + * that class had been loaded and cannot be loaded or else an + * infinte loop in invoking this method will take place resulting in + * a stack-overflow error. + */ + if (class_exists('Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper')) { // Get application instance $applicationInstance = ApplicationHelper::getSelfInstance(); // Assign application data - $templateInstance->assignApplicationData($applicationInstance); - } // END - if + $templateInstance->assignApplicationData(); + } // We only try this try { // Assign variables - $templateInstance->assignVariable('message', $message); - $templateInstance->assignVariable('code', $code); - $templateInstance->assignVariable('extra', $extraData); - $templateInstance->assignVariable('backtrace', $backtrace); + $templateInstance->assignVariable('message' , $message); + $templateInstance->assignVariable('code' , $code); + $templateInstance->assignVariable('extra' , $extraData); + $templateInstance->assignVariable('backtrace' , $backtrace); $templateInstance->assignVariable('total_includes', ClassLoader::getSelfInstance()->getTotal()); - $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal()); - $templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title')); + $templateInstance->assignVariable('total_objects' , ObjectFactory::getTotal()); + $templateInstance->assignVariable('title' , $languageInstance->getMessage('emergency_exit_title')); // Load the template $templateInstance->loadCodeTemplate('emergency_exit'); @@ -150,68 +174,127 @@ final class ApplicationEntryPoint { // Flush the response $responseInstance->flushBuffer(); - } catch (FileIoException $e) { + } catch (FileNotFoundException $e) { // Even the template 'emergency_exit' wasn't found so output both message - exit($message . ', exception: ' . $e->getMessage()); + print ($message . ', exception: ' . $e->getMessage() . PHP_EOL); + exit($e->getCode()); } // Good bye... - exit(); + exit(255); } else { // Output message and die - exit(sprintf('[Main:] Emergency exit reached: %s', - $message - )); + printf('[Main:] Emergency exit reached: %s', $message); + exit(255); } + + // Trace message + //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__); } /** - * Determines the correct absolute path for all includes only once per run. - * Other calls of this method are being "cached". + * Determines the correct absolute path for the framework. A set of common + * paths is being tested (first most common for applications, second when + * core tests are being executed and third/forth if the framework has been + * cloned there). * - * @return $corePath Base path (core) for all includes + * @return $frameworkPath Path for framework */ - protected static final function detectCorePath () { + public static final function detectFrameworkPath () { // Is it not set? - if (empty(self::$corePath)) { - // Auto-detect our core path - self::$corePath = str_replace("\\", '/', dirname(__FILE__)); - } // END - if + //* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath); + if (empty(self::$frameworkPath)) { + // Auto-detect core path (first application-common) + foreach (['core', self::getRootPath(), '/usr/local/share/php/core', '/usr/share/php/core'] as $possiblePath) { + // Create full path for testing + //* NOISY-DEBUG: */ printf('[%s:%d]: possiblePath=%s' . PHP_EOL, __METHOD__, __LINE__, $possiblePath); + $realPath = realpath($possiblePath); + + // Is it false? + //* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath); + if ($realPath === false) { + // Then, not found. + //* NOISY-DEBUG: */ printf('[%s:%d]: possiblePath=%s was not found. - SKIPPED!' . PHP_EOL, __METHOD__, __LINE__, $possiblePath); + continue; + } + + // Append framework path + $frameworkPath = sprintf('%s%sframework%s', $realPath, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR); + + // First create full-qualified file name (FQFN) to framework/config-global.php + //* NOISY-DEBUG: */ printf('[%s:%d]: frameworkPath=%s' . PHP_EOL, __METHOD__, __LINE__, $frameworkPath); + $configFile = $frameworkPath . 'config-global.php'; + + // Is it readable? + //* NOISY-DEBUG: */ printf('[%s:%d]: configFile=%s' . PHP_EOL, __METHOD__, __LINE__, $configFile); + if (is_readable($configFile)) { + // Found one + self::$frameworkPath = $frameworkPath; + + // Abort here + //* NOISY-DEBUG: */ printf('[%s:%d]: Setting self::frameworkPath=%s - BREAK!' . PHP_EOL, __METHOD__, __LINE__, $frameworkPath); + break; + } + } + + // Able to find? + //* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - Checking ...' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath); + if (!is_dir(self::$frameworkPath)) { + // Is no directory + throw new Exception('Cannot find framework.'); + } + } // Return it - return self::$corePath; + //* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - EXIT!' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath); + return self::$frameworkPath; } /** - * The application's main entry point. This class isolates some local + * Getter for root path + * + * @return $rootPath Root path + */ + public static function getRootPath () { + // Get __DIR__, really simple and no detection + return __DIR__; + } + + /** + * The framework's main entry point. This class isolates some local * variables which shall not become visible to outside because of security - * concerns. We are doing this here to "emulate" the well-known entry - * point in Java. + * concerns. This is done here to "emulate" the well-known entry point in + * Java. * * @return void */ public static final function main () { - // Load config file - require(self::detectCorePath() . '/inc/config.php'); + // Load bootstrap file + //* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__); + require sprintf('%sbootstrap%sbootstrap.inc.php', self::detectFrameworkPath(), DIRECTORY_SEPARATOR); - // Load all include files - require($cfg->getConfigEntry('base_path') . 'inc/includes.php'); + /* + * Initial bootstrap is done, continue with initialization of + * framework. + */ + FrameworkBootstrap::initFramework(); - // Include the application selector - require($cfg->getConfigEntry('base_path') . 'inc/selector.php'); - } // END - main() -} // END - class + // Next initialize the detected application + FrameworkBootstrap::prepareApplication(); -// Developer mode active? Comment out if no dev! -define('DEVELOPER', TRUE); + /* + * Last step is to start the application, this will also initialize and + * register the application instance in registry. + */ + FrameworkBootstrap::startApplication(); -// Log all exceptions (only debug! This option can create large error logs) -//define('LOG_EXCEPTIONS', TRUE); + // Trace message + //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__); + } +} -//xdebug_start_trace(); +// Log all exceptions (only debug! This option can create large error logs) +//define('LOG_EXCEPTIONS', true); -// Do not remove the following line: +// Call above main() method ApplicationEntryPoint::main(); - -// [EOF] -?> diff --git a/package.sh b/package.sh deleted file mode 100755 index 639837e..0000000 --- a/package.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -NAME=shipsimu_dev_`date +%Y%m%d_%H%M%S`.zip - -sh ./clear-cache.sh - -echo -n "$0: Packaging... " -zip -9 $NAME docs/* Doxyfile *.php *.sh > /dev/null 2>&1 -echo -n "." -zip -9r $NAME application/ db/ devel/ Doxyfile inc/ templates/ tests/ > /dev/null 2>&1 -echo -n "." -zip -d $NAME docs/warn.log db/*/*.serialized > /dev/null 2>&1 -echo ". done" -echo "$0: All done." diff --git a/pdepend.sh b/pdepend.sh deleted file mode 100755 index 9185237..0000000 --- a/pdepend.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if ! test -e `which pdepend`; then - echo "$0: This script needs PHP_Depend. See URL" - echo "$0: http://www.manuel-pichler.de/pages/pdepend.html for details." -fi - -pdepend --bad-documentation --ignore=db,docs,ship-simu.org \ - --jdepend-chart=test.png --overview-pyramid=pyramid.png \ - --summary-xml=summary.xml --jdepend-xml=jdepend.xml . diff --git a/rebuild_doc.sh b/rebuild_doc.sh deleted file mode 100755 index 697ed08..0000000 --- a/rebuild_doc.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo "$0: Cleaning up..." -find docs/html/ -type f -exec rm -f {} \; -rm -f docs/*.log -echo "$0: Done." - -doxygen Doxyfile diff --git a/todo-builder.sh b/todo-builder.sh deleted file mode 100755 index 360b888..0000000 --- a/todo-builder.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# This script helps building the file docs/TODOs.txt and should be executed by -# developers with SVN write-access - -TYPES="php ctp xml" - -if ! test -e "index.php"; then - echo "$0: Please execute this script from root directory." - exit 1 -fi - -echo "$0: Generating TODOs.txt..." -echo "### WARNING: THIS FILE IS AUTO-GENERATED BY $0 ###" > docs/TODOs.txt -echo "### DO NOT EDIT THIS FILE. ###" >> docs/TODOs.txt -for type in $TYPES; do - find -type f -name "*.$type" -exec grep -Hin "@TODO" {} \; | sort >> docs/TODOs.txt -done -echo "### ### DEPRECATION FOLLOWS: ### ###" >> docs/TODOs.txt -for type in $TYPES; do - find -type f -name "*.$type" -exec grep -Hin "@DEPRECATED" {} \; | sort >> docs/TODOs.txt -done -echo "$0: Done." -exit 0