diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | DB_SCRIBBLE | 9 | ||||
| -rw-r--r-- | config.php.example (renamed from config.php) | 5 | ||||
| -rw-r--r-- | modules/news.inc.php | 4 |
4 files changed, 12 insertions, 7 deletions
@@ -3,4 +3,5 @@ *.tmp *.swp nbproject/ +/config.php diff --git a/DB_SCRIBBLE b/DB_SCRIBBLE index 5b5befa2..1dd81685 100644 --- a/DB_SCRIBBLE +++ b/DB_SCRIBBLE @@ -1,7 +1,8 @@ -CREATE DATABASE openslx; -CREATE USER openslx@localhost; -SET PASSWORD FOR openslx@localhost = Password('geheim'); -GRANT ALL ON openslx.* TO openslx@localhost; +-- Entries commented out: satellite_install script won't like them +-- CREATE DATABASE openslx; +-- CREATE USER openslx@localhost; +-- SET PASSWORD FOR openslx@localhost = Password('geheim'); +-- GRANT ALL ON openslx.* TO openslx@localhost; diff --git a/config.php b/config.php.example index 43cc140c..daea919b 100644 --- a/config.php +++ b/config.php.example @@ -10,7 +10,10 @@ define('CONFIG_SESSION_TIMEOUT', 86400 * 3); //define('CONFIG_SQL_HOST', 'localhost'); define('CONFIG_SQL_DSN', 'mysql:dbname=openslx;host=localhost'); define('CONFIG_SQL_USER', 'openslx'); -define('CONFIG_SQL_PASS', 'geheim'); +// This marker %MYSQL_OPENSLX_PASS% is meant for automated patching +// via SSPS (satellite server preparation script) - do not change it +// if you plan to run this script afterwards. +define('CONFIG_SQL_PASS', '%MYSQL_OPENSLX_PASS%'); define('CONFIG_SQL_FORCE_UTF8', false); //define('CONFIG_SQL_DB', 'openslx'); diff --git a/modules/news.inc.php b/modules/news.inc.php index fc5c1892..d0aa32ea 100644 --- a/modules/news.inc.php +++ b/modules/news.inc.php @@ -5,8 +5,8 @@ class Page_News extends Page /** * Member variables needed to represent a news entry. * - * $newsId int ID of the news entry attributed by the database. - * $newsTitle string Title of the entry. + * @var newsId int ID of the news entry attributed by the database. + * @var string Title of the entry. * $newsContent string Content as text. (TODO: html-Support?) * $newsDate string Unix epoch date of the news' creation. */ |