Merge branch 'master' of mojotrollz.eu:system

This commit is contained in:
Naeltard 2015-04-23 20:44:53 +02:00
commit 3e84cb321f
37 changed files with 1291 additions and 140 deletions

24
autoload.inc Normal file
View File

@ -0,0 +1,24 @@
<?php
//include autoload class
require_once dirname(__FILE__).'/system/path.php';
require_once dirname(__FILE__).'/system/autoload.php';
//Register autoload
\SYSTEM\autoload::register_autoload();
//Autoload submodules
require_once dirname(__FILE__).'/system/autoload.inc';
require_once dirname(__FILE__).'/log/autoload.inc';
require_once dirname(__FILE__).'/api/autoload.inc';
require_once dirname(__FILE__).'/page/autoload.inc';
require_once dirname(__FILE__).'/dbd/autoload.inc';
require_once dirname(__FILE__).'/db/autoload.inc';
require_once dirname(__FILE__).'/security/autoload.inc';
require_once dirname(__FILE__).'/config/autoload.inc';
require_once dirname(__FILE__).'/cache/autoload.inc';
require_once dirname(__FILE__).'/docu/autoload.inc';
require_once dirname(__FILE__).'/files/autoload.inc';
require_once dirname(__FILE__).'/cron/autoload.inc';
require_once dirname(__FILE__).'/sai/autoload.inc';
require_once dirname(__FILE__).'/lib/autoload.inc';
require_once dirname(__FILE__).'/git/autoload.inc';

View File

@ -1,23 +0,0 @@
<?php
//include autoload class
require_once dirname(__FILE__).'/system/path.php';
require_once dirname(__FILE__).'/system/autoload.php';
//Register autoload
\SYSTEM\autoload::register_autoload();
//Autoload submodules
require_once dirname(__FILE__).'/system/autoload.inc.php';
require_once dirname(__FILE__).'/log/autoload.inc.php';
require_once dirname(__FILE__).'/api/autoload.inc.php';
require_once dirname(__FILE__).'/page/autoload.inc.php';
require_once dirname(__FILE__).'/dbd/autoload.inc.php';
require_once dirname(__FILE__).'/db/autoload.inc.php';
require_once dirname(__FILE__).'/security/autoload.inc.php';
require_once dirname(__FILE__).'/config/autoload.inc.php';
require_once dirname(__FILE__).'/cache/autoload.inc.php';
require_once dirname(__FILE__).'/docu/autoload.inc.php';
require_once dirname(__FILE__).'/files/autoload.inc.php';
require_once dirname(__FILE__).'/cron/autoload.inc.php';
require_once dirname(__FILE__).'/sai/autoload.inc.php';
require_once dirname(__FILE__).'/lib/autoload.inc.php';

View File

@ -23,7 +23,7 @@ class ConnectionMYS extends ConnectionAbstr {
public function prepare($stmtName, $stmt, $values){
$prepStmt = \mysqli_prepare($this->connection, $stmt);
if(!$prepStmt){
throw new \SYSTEM\LOG\ERROR('Prepared Statement prepare fail: '. \mysqli_error($this->connection));}
throw new \Exception('Prepared Statement prepare fail: '. \mysqli_error($this->connection));}
$types = '';
$binds = array($prepStmt,null);
@ -45,7 +45,7 @@ class ConnectionMYS extends ConnectionAbstr {
public function query($query){
$result = mysqli_query($this->connection, $query);
if(!$result){
throw new \SYSTEM\LOG\ERROR('Could not query Database. Check ur Query Syntax or required Rights: '.mysqli_error($this->connection));}
throw new \Exception('Could not query Database. Check ur Query Syntax or required Rights: '.mysqli_error($this->connection));}
if($result === TRUE){
return TRUE;}

View File

@ -1,10 +0,0 @@
//TODO convert
DELETE FROM system_locale_string WHERE category = 43;
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_username_short', 43, 'Username is too short', 'Nutzername ist zu kurz');
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_username_long', 43, 'Username is too long', 'Nutzername ist zu lang');
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_username_miss', 43, 'Username required', 'Nutzername erfoderlich');
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_password_miss', 43, 'Password required', 'Passwort erforderlich');
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_password_long', 43, 'Password too long', 'Passwort zu lang');
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_password_short', 43, 'Password too short', 'Passwort zu kurz');
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_password_match', 43, 'Passwords do not match!', 'Passwords do not match!');
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_email_wrong', 43, 'Invalid EMail!', 'Invalid EMail!');

View File

@ -1,3 +0,0 @@
//TODO convert
DELETE FROM system_locale_string WHERE category = 42;
INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_mod_login_text', 42, 'Please login for developer access (if you are a developer).', 'Please login for developer access (if you are a developer).');

View File

@ -13,7 +13,7 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (27, 0, 2, 11, 'create', 'locale', 'LANG');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (30, 0, 2, 10, 'files', 'cat', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 0, 3, 30, 'files', 'id', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 0, 3, 10, 'files', 'id', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 0, 2, 10, 'text', 'request', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 0, 2, 10, 'text', 'lang', 'LANG');

View File

@ -55,3 +55,5 @@ INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`,
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (131, 42, 'all', 'page', 130, 0, 0, '#tab_page', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_page&action=list&group=${group}', 'init_saimod_sys_page_list', '\\SYSTEM\\SAI\\saimod_sys_page');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (132, 42, 'delete', 'page', 130, 0, 1, '#tab_page', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_page&action=deletedialog&group=${group}&ID=${id}', 'init_saimod_sys_page_delete', '\\SYSTEM\\SAI\\saimod_sys_page');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (133, 42, 'new', 'page', 130, 0, 1, '#tab_page', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_page&action=newdialog', 'init_saimod_sys_page_new', '\\SYSTEM\\SAI\\saimod_sys_page');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (140, 42, 'git', 'git', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_git', 'init_saimod_sys_git', '\\SYSTEM\\SAI\\saimod_sys_git');

View File

@ -18,7 +18,7 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (26, 42, 2, 11, 'create', 'email', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (27, 42, 2, 11, 'create', 'locale', 'LANG');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (30, 42, 2, 10, 'files', 'cat', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 42, 3, 30, 'files', 'id', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 42, 3, 10, 'files', 'id', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 42, 2, 10, 'text', 'request', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 42, 2, 40, 'text', 'lang', 'LANG');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (50, 42, 2, 10, 'pages', 'group', 'UINT');

File diff suppressed because one or more lines are too long

View File

@ -1,89 +0,0 @@
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_admin_rights', 'deDE', 'Admin Rechte', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_admin_rights', 'enUS', 'Admin Rights', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_admin_rights', 'jaJA', '管理者権限', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_cancel', 'deDE', 'Abbrechen', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_cancel', 'enUS', 'Cancel', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_cancel', 'jaJA', 'キャンシル', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_close', 'deDE', 'Schlie&szlig;en', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_close', 'enUS', 'Close', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_close', 'jaJA', '閉める', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_email', 'deDE', 'E-Mail', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_email', 'enUS', 'EMail', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_email', 'jaJA', 'メール', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_example', 'deDE', '<h1><img style="float: right;" title="TinyMCE Logo" src="http://www.tinymce.com/tryit/img/tlogo.png" alt="TinyMCE Logo" width="92" height="80" />Welcome to the TinyMCE editor demo!</h1>\n<p>Feel free to try out the different features that are provided, please note that the <strong>MoxieManager</strong> specific functionality is part of our commercial offering. The demo is to show the integration.</p>\n<h2>Got questions or need help?</h2>\n<p>If you have questions or need help, feel free to visit our <a href="forum/index.php">community forum</a>! We also offer Enterprise <a href="enterprise/support.php">support</a> solutions. Also do not miss out on the <a href="wiki.php">documentation</a>, its a great resource wiki for understanding how TinyMCE works and integrates.</p>\n<h2>Found a bug?</h2>\n<p>If you think you have found a bug, you can use the <a href="develop/bugtracker.php">Bug Tracker</a> to report bugs to the developers.</p>\n<p>And here is a simple table for you to play with.</p>\n<table border="0">\n<tbody>\n<tr>\n<td><strong>Product</strong></td>\n<td><strong>Cost</strong></td>\n<td><strong>Really?</strong></td>\n</tr>\n<tr>\n<td>TinyMCE</td>\n<td>Free</td>\n<td>YES!</td>\n</tr>\n<tr>\n<td>Plupload</td>\n<td>Free</td>\n<td>YES!</td>\n</tr>\n</tbody>\n</table>\n<p>Enjoy our software and create great content!</p>\n<p>Oh, and by the way, don\'t forget to check out our other product called <a href="http://www.plupload.com" target="_blank">Plupload</a>, your ultimate upload solution with HTML5 upload support!</p>', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_example', 'enUS', '<h1><img style="float: right;" title="TinyMCE Logo" src="http://www.tinymce.com/tryit/img/tlogo.png" alt="TinyMCE Logo" width="92" height="80" />Welcome to the TinyMCE editor demo!</h1>\n<p>Feel free to try out the different features that are provided, please note that the <strong>MoxieManager</strong> specific functionality is part of our commercial offering. The demo is to show the integration.</p>\n<h2>Got questions or need help?</h2>\n<p>If you have questions or need help, feel free to visit our <a href="forum/index.php">community forum</a>! We also offer Enterprise <a href="enterprise/support.php">support</a> solutions. Also do not miss out on the <a href="wiki.php">documentation</a>, its a great resource wiki for understanding how TinyMCE works and integrates.</p>\n<h2>Found a bug?</h2>\n<p>If you think you have found a bug, you can use the <a href="develop/bugtracker.php">Bug Tracker</a> to report bugs to the developers.</p>\n<p>And here is a simple table for you to play with.</p>\n<table border="0">\n<tbody>\n<tr>\n<td><strong>Product</strong></td>\n<td><strong>Cost</strong></td>\n<td><strong>Really?</strong></td>\n</tr>\n<tr>\n<td>TinyMCE</td>\n<td>Free</td>\n<td>YES!</td>\n</tr>\n<tr>\n<td>Plupload</td>\n<td>Free</td>\n<td>YES!</td>\n</tr>\n</tbody>\n</table>\n<p>Enjoy our software and create great content!</p>\n<p>Oh, and by the way, don\'t forget to check out our other product called <a href="http://www.plupload.com" target="_blank">Plupload</a>, your ultimate upload solution with HTML5 upload support!</p>', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_join_date', 'deDE', 'Beitrittsdatum', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_join_date', 'enUS', 'Joindate', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_join_date', 'jaJA', 'メンバになりましたの日', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_last_active', 'deDE', 'Zuletzt aktiv', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_last_active', 'enUS', 'Last active', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_last_active', 'jaJA', '前のログイン', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_locale', 'deDE', 'Sprache', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_locale', 'enUS', 'Locale', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_locale', 'jaJA', '言葉', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_login', 'deDE', 'Einloggen', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_login', 'enUS', 'Login', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_login', 'jaJA', 'ログイン', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_logout', 'deDE', 'Ausloggen', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_logout', 'enUS', 'Logout', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_logout', 'jaJA', 'ログアウト', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password', 'deDE', 'Passwort', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password', 'enUS', 'Password', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_password', 'jaJA', 'パスワード', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_email', 'deDE', 'peter@world.org', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_email', 'enUS', 'peter@world.org', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_email', 'esES', 'peter@world.org', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_email', 'frFR', 'peter@world.org', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_email', 'jaJA', 'peter@world.org', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_email', 'trTR', 'peter@world.org', 0, 0, '2015-04-15 18:29:17', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_password', 'deDE', 'geheim567', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_password', 'enUS', 'my secret123', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_password', 'jaJA', '丸秘のパスワード', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'deDE', 'peter / peter@world.org', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'enUS', 'peter / peter@world.org', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'esES', 'peter@world.org', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'frFR', 'peter@world.org', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'jaJA', 'peter / peter@world.org', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_placeholder_username', 'trTR', 'peter@world.org', 0, 0, '2015-04-15 18:29:17', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_register', 'deDE', 'Registrieren', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_register', 'enUS', 'Register', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_register', 'jaJA', 'サインオン', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_state_login', 'deDE', 'You are logged in.', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_state_login', 'enUS', 'You are logged in.', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_login', 'deDE', 'Loggen Sie sich in ihre Website ein.', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_login', 'enUS', 'Login to your Website.', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_login', 'jaJA', 'ログインする', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_logout', 'deDE', 'Loggen Sie sie sich aus bevor Sie gehen!', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_logout', 'enUS', 'Logout before you leave!', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_logout', 'jaJA', '出ててから、ログアウトしてください', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_password_miss', 'deDE', 'Can\'t really remember your Password?', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_password_miss', 'enUS', 'Can\'t really remember your Password?', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_password_miss', 'jaJA', 'パスワードを忘れた', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_register', 'deDE', 'Register an Account', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_register', 'enUS', 'Register an Account', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_text_register', 'jaJA', 'サインオン', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username', 'deDE', 'Username', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username', 'enUS', 'Username', 0, 0, '2015-04-15 18:29:16', '0000-00-00 00:00:00');
INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('basic_username', 'jaJA', '名前', 0, 0, '2015-04-15 18:41:22', '0000-00-00 00:00:00');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_email', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_register', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_state_login', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_login', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_logout', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_password_miss', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_register', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_logout', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_login', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_admin_rights', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_cancel', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_close', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_email', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_example', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_join_date', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_last_active', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_locale', 'basic');

View File

@ -0,0 +1,264 @@
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_URL', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_status', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_name', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_login', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_month', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_match', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_logout', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_login', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_password_miss', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_log', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_register', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_locale', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_no_tag', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_rows', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_register', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_save', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_project', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_progress', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_username', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_password', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_placeholder_email', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_short', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_miss', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_show_all', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password_long', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_state_login', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_log_page_value', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_last_active', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_today', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_close', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_cancel', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_back', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_long', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_miss', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_analytics', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username_short', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_users', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_all', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_week', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_admin_rights', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_add', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_error', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_delete', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_logout', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_todo', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_email_wrong', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_join_date', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_email', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_ips', 'basic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_example', 'example');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_cache_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_files_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_docu', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_cron', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_log_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_config_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_api_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_api', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_docu_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_cron_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_copyright', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_cache', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_config', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_mod_login_text', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_start_welcome', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_page', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_security_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_security', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_page_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_start', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_mod_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_text', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_todo', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_start_welcome_description', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_logout', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_text_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_files', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_todo_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_mod', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_log', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_login', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_title', 'sai');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_api_title', 'sai_api');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_cache_title', 'sai_cache');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_config_title', 'sai_config');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_cron_title', 'sai_cron');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_title', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_copyright', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_cron', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_text', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_docu', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_files', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_config', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_log', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_cache', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_login', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_logout', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_mod', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_page', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_security', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_start', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_api', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_menu_todo', 'sai_default');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_docu_title', 'sai_docu');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_files_title', 'sai_files');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_second', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_url', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_trace', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_analytics', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_id', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_rows', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_ip', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_class', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_log', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_hour', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_minute', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_error', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_day', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_value', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_month', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_time', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_thrown', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_log_title', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_code', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_post', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_property', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_querytime', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_file', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_year', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_request_uri', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_user', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_all', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_http_user_agent', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_http_referer', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_message', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_line', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_server_port', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_server_name', 'sai_log');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_mod_login_text', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_admin_rights', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_last_active', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_locale', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_email', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_password_miss', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_login', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_state_login', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_register', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_register', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_password', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_login', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_join_date', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_logout', 'sai_login');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_mod_title', 'sai_mod');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_page_title', 'sai_page');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_class', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_ip', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_year', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_message', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_file', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_querytime', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_line', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_security_title', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_hour', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_day', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_rows', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_minute', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_user', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_month', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_url', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_second', 'sai_security');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_locale', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_start_welcome', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_log_page_value', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_analytics', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_users', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_todo', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_log_latest_entries', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_name', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_URL', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_ips', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_month', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_log', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_login', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_username', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_week', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_logout', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_today', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_status', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_login', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_text_logout', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_admin_rights', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_start_welcome_description', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_project', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_progress', 'sai_start');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_text', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_save', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_show_all', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_time_create', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_time_edit', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_no_tag', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_author_edit', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_text_title', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_id', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_all', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_back', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_author', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_delete', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_lang', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('basic_add', 'sai_text');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_second', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_year', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('sai_todo_title', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_day', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_minute', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_month', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_hour', 'sai_todo');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('about', 'slingit');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('about_btn', 'slingit');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('tipps', 'slingit');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('getfile', 'slingit');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('center_text', 'slingit');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('impressum_btn', 'slingit');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('Description', 'slingit');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('via', 'slingit');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_author', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_author_edit', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_message', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_time_edit', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_line', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_class', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_lang', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_ip', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_id', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_http_referer', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_file', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_code', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_http_user_agent', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_post', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_time', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_user', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_url', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_server_port', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_value', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_server_name', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_thrown', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_request_uri', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_trace', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_time_create', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_querytime', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_property', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('table_text', 'table');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_year', 'time');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_second', 'time');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_month', 'time');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_minute', 'time');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago', 'time');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_hour', 'time');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('time_ago_day', 'time');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('impressum', 'webcraft');

View File

@ -27,5 +27,6 @@ class system_text {
const TAG_SAI_SECURITY = 'sai_security';
const TAG_SAI_TEXT = 'sai_text';
const TAG_SAI_TODO = 'sai_todo';
const TAG_SAI_GIT = 'sai_git';
}

View File

@ -114,6 +114,9 @@ SYSTEM.prototype.handle_call_pages = function (data,id,forced,cached) {
//state not found?
if(data['result'].length === 0){
this.log_error('load pages: '+this.endpoint+'?call=pages&group='+this.group+'&state='+id+' - state not found - redirecting to start state: '+this.start_state);
if(id === this.start_state){
this.log_error('load pages: '+this.endpoint+'?call=pages&group='+this.group+'&state='+id+' - start state not found - stop!');
return;}
this.load(this.start_state);
return;}
//cache state info data

113
git/Git.php Normal file
View File

@ -0,0 +1,113 @@
<?php
/*
* Git.php
*
* A PHP git library
*
* @package Git.php
* @version 0.1.4
* @author James Brumond
* @copyright Copyright 2013 James Brumond
* @repo http://github.com/kbjr/Git.php
*/
namespace SYSTEM\GIT;
/**
* Git Interface Class
*
* This class enables the creating, reading, and manipulation
* of git repositories.
*
* @class Git
*/
class Git {
/**
* Git executable location
*
* @var string
*/
protected static $bin = '/usr/bin/git';
/**
* Sets git executable path
*
* @param string $path executable location
*/
public static function set_bin($path) {
self::$bin = $path;
}
/**
* Gets git executable path
*/
public static function get_bin() {
return self::$bin;
}
/**
* Sets up library for use in a default Windows environment
*/
public static function windows_mode() {
self::set_bin('git');
}
/**
* Create a new git repository
*
* Accepts a creation path, and, optionally, a source path
*
* @access public
* @param string repository path
* @param string directory to source
* @return GitRepo
*/
public static function &create($repo_path, $source = null) {
return GitRepo::create_new($repo_path, $source);
}
/**
* Open an existing git repository
*
* Accepts a repository path
*
* @access public
* @param string repository path
* @return GitRepo
*/
public static function open($repo_path) {
return new GitRepo($repo_path);
}
/**
* Clones a remote repo into a directory and then returns a GitRepo object
* for the newly created local repo
*
* Accepts a creation path and a remote to clone from
*
* @access public
* @param string repository path
* @param string remote source
* @param string reference path
* @return GitRepo
**/
public static function &clone_remote($repo_path, $remote, $reference = null) {
return GitRepo::create_new($repo_path, $remote, true, $reference);
}
/**
* Checks if a variable is an instance of GitRepo
*
* Accepts a variable
*
* @access public
* @param mixed variable
* @return bool
*/
public static function is_repo($var) {
return (get_class($var) == 'GitRepo');
}
}

572
git/GitRepo.php Normal file
View File

@ -0,0 +1,572 @@
<?php
namespace SYSTEM\GIT;
/**
* Git Repository Interface Class
*
* This class enables the creating, reading, and manipulation
* of a git repository
*
* @class GitRepo
*/
class GitRepo {
protected $repo_path = null;
protected $bare = false;
protected $envopts = array();
/**
* Create a new git repository
*
* Accepts a creation path, and, optionally, a source path
*
* @access public
* @param string repository path
* @param string directory to source
* @param string reference path
* @return GitRepo
*/
public static function &create_new($repo_path, $source = null, $remote_source = false, $reference = null) {
if (is_dir($repo_path) && file_exists($repo_path."/.git") && is_dir($repo_path."/.git")) {
throw new \Exception('"'.$repo_path.'" is already a git repository');
} else {
$repo = new self($repo_path, true, false);
if (is_string($source)) {
if ($remote_source) {
if (!is_dir($reference) || !is_dir($reference.'/.git')) {
throw new \Exception('"'.$reference.'" is not a git repository. Cannot use as reference.');
} else if (strlen($reference)) {
$reference = realpath($reference);
$reference = "--reference $reference";
}
$repo->clone_remote($source, $reference);
} else {
$repo->clone_from($source);
}
} else {
$repo->run('init');
}
return $repo;
}
}
/**
* Constructor
*
* Accepts a repository path
*
* @access public
* @param string repository path
* @param bool create if not exists?
* @return void
*/
public function __construct($repo_path = null, $create_new = false, $_init = true) {
if (is_string($repo_path)) {
$this->set_repo_path($repo_path, $create_new, $_init);
}
}
/**
* Set the repository's path
*
* Accepts the repository path
*
* @access public
* @param string repository path
* @param bool create if not exists?
* @param bool initialize new Git repo if not exists?
* @return void
*/
public function set_repo_path($repo_path, $create_new = false, $_init = true) {
if (is_string($repo_path)) {
if ($new_path = realpath($repo_path)) {
$repo_path = $new_path;
if (is_dir($repo_path)) {
// Is this a work tree?
if (file_exists($repo_path."/.git") && is_dir($repo_path."/.git")) {
$this->repo_path = $repo_path;
$this->bare = false;
// Is this a bare repo?
} else if (is_file($repo_path."/config")) {
$parse_ini = parse_ini_file($repo_path."/config");
if ($parse_ini['bare']) {
$this->repo_path = $repo_path;
$this->bare = true;
}
} else {
if ($create_new) {
$this->repo_path = $repo_path;
if ($_init) {
$this->run('init');
}
} else {
throw new \Exception('"'.$repo_path.'" is not a git repository');
}
}
} else {
throw new \Exception('"'.$repo_path.'" is not a directory');
}
} else {
if ($create_new) {
if ($parent = realpath(dirname($repo_path))) {
mkdir($repo_path);
$this->repo_path = $repo_path;
if ($_init) $this->run('init');
} else {
throw new \Exception('cannot create repository in non-existent directory');
}
} else {
throw new \Exception('"'.$repo_path.'" does not exist');
}
}
}
}
/**
* Get the path to the git repo directory (eg. the ".git" directory)
*
* @access public
* @return string
*/
public function git_directory_path() {
return ($this->bare) ? $this->repo_path : $this->repo_path."/.git";
}
/**
* Tests if git is installed
*
* @access public
* @return bool
*/
public function test_git() {
$descriptorspec = array(
1 => array('pipe', 'w'),
2 => array('pipe', 'w'),
);
$pipes = array();
$resource = proc_open(Git::get_bin(), $descriptorspec, $pipes);
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
foreach ($pipes as $pipe) {
fclose($pipe);
}
$status = trim(proc_close($resource));
return ($status != 127);
}
/**
* Run a command in the git repository
*
* Accepts a shell command to run
*
* @access protected
* @param string command to run
* @return string
*/
protected function run_command($command) {
$descriptorspec = array(
1 => array('pipe', 'w'),
2 => array('pipe', 'w'),
);
$pipes = array();
/* Depending on the value of variables_order, $_ENV may be empty.
* In that case, we have to explicitly set the new variables with
* putenv, and call proc_open with env=null to inherit the reset
* of the system.
*
* This is kind of crappy because we cannot easily restore just those
* variables afterwards.
*
* If $_ENV is not empty, then we can just copy it and be done with it.
*/
if(count($_ENV) === 0) {
$env = NULL;
foreach($this->envopts as $k => $v) {
putenv(sprintf("%s=%s",$k,$v));
}
} else {
$env = array_merge($_ENV, $this->envopts);
}
$cwd = $this->repo_path;
$resource = proc_open($command, $descriptorspec, $pipes, $cwd, $env);
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
foreach ($pipes as $pipe) {
fclose($pipe);
}
$status = trim(proc_close($resource));
if ($status) throw new \Exception($stderr);
return $stdout;
}
/**
* Run a git command in the git repository
*
* Accepts a git command to run
*
* @access public
* @param string command to run
* @return string
*/
public function run($command) {
return $this->run_command(Git::get_bin()." ".$command);
}
/**
* Runs a 'git status' call
*
* Accept a convert to HTML bool
*
* @access public
* @param bool return string with <br />
* @return string
*/
public function status($html = false) {
$msg = $this->run("status");
if ($html == true) {
$msg = str_replace("\n", "<br />", $msg);
}
return $msg;
}
/**
* Runs a `git add` call
*
* Accepts a list of files to add
*
* @access public
* @param mixed files to add
* @return string
*/
public function add($files = "*") {
if (is_array($files)) {
$files = '"'.implode('" "', $files).'"';
}
return $this->run("add $files -v");
}
/**
* Runs a `git rm` call
*
* Accepts a list of files to remove
*
* @access public
* @param mixed files to remove
* @param Boolean use the --cached flag?
* @return string
*/
public function rm($files = "*", $cached = false) {
if (is_array($files)) {
$files = '"'.implode('" "', $files).'"';
}
return $this->run("rm ".($cached ? '--cached ' : '').$files);
}
/**
* Runs a `git commit` call
*
* Accepts a commit message string
*
* @access public
* @param string commit message
* @param boolean should all files be committed automatically (-a flag)
* @return string
*/
public function commit($message = "", $commit_all = true) {
$flags = $commit_all ? '-av' : '-v';
return $this->run("commit ".$flags." -m ".escapeshellarg($message));
}
/**
* Runs a `git clone` call to clone the current repository
* into a different directory
*
* Accepts a target directory
*
* @access public
* @param string target directory
* @return string
*/
public function clone_to($target) {
return $this->run("clone --local ".$this->repo_path." $target");
}
/**
* Runs a `git clone` call to clone a different repository
* into the current repository
*
* Accepts a source directory
*
* @access public
* @param string source directory
* @return string
*/
public function clone_from($source) {
return $this->run("clone --local $source ".$this->repo_path);
}
/**
* Runs a `git clone` call to clone a remote repository
* into the current repository
*
* Accepts a source url
*
* @access public
* @param string source url
* @param string reference path
* @return string
*/
public function clone_remote($source, $reference) {
return $this->run("clone $reference $source ".$this->repo_path);
}
/**
* Runs a `git clean` call
*
* Accepts a remove directories flag
*
* @access public
* @param bool delete directories?
* @param bool force clean?
* @return string
*/
public function clean($dirs = false, $force = false) {
return $this->run("clean".(($force) ? " -f" : "").(($dirs) ? " -d" : ""));
}
/**
* Runs a `git branch` call
*
* Accepts a name for the branch
*
* @access public
* @param string branch name
* @return string
*/
public function create_branch($branch) {
return $this->run("branch $branch");
}
/**
* Runs a `git branch -[d|D]` call
*
* Accepts a name for the branch
*
* @access public
* @param string branch name
* @return string
*/
public function delete_branch($branch, $force = false) {
return $this->run("branch ".(($force) ? '-D' : '-d')." $branch");
}
/**
* Runs a `git branch` call
*
* @access public
* @param bool keep asterisk mark on active branch
* @return array
*/
public function list_branches($keep_asterisk = false) {
$branchArray = explode("\n", $this->run("branch"));
foreach($branchArray as $i => &$branch) {
$branch = trim($branch);
if (! $keep_asterisk) {
$branch = str_replace("* ", "", $branch);
}
if ($branch == "") {
unset($branchArray[$i]);
}
}
return $branchArray;
}
/**
* Lists remote branches (using `git branch -r`).
*
* Also strips out the HEAD reference (e.g. "origin/HEAD -> origin/master").
*
* @access public
* @return array
*/
public function list_remote_branches() {
$branchArray = explode("\n", $this->run("branch -r"));
foreach($branchArray as $i => &$branch) {
$branch = trim($branch);
if ($branch == "" || strpos($branch, 'HEAD -> ') !== false) {
unset($branchArray[$i]);
}
}
return $branchArray;
}
/**
* Returns name of active branch
*
* @access public
* @param bool keep asterisk mark on branch name
* @return string
*/
public function active_branch($keep_asterisk = false) {
$branchArray = $this->list_branches(true);
$active_branch = preg_grep("/^\*/", $branchArray);
reset($active_branch);
if ($keep_asterisk) {
return current($active_branch);
} else {
return str_replace("* ", "", current($active_branch));
}
}
/**
* Runs a `git checkout` call
*
* Accepts a name for the branch
*
* @access public
* @param string branch name
* @return string
*/
public function checkout($branch) {
return $this->run("checkout $branch");
}
/**
* Runs a `git merge` call
*
* Accepts a name for the branch to be merged
*
* @access public
* @param string $branch
* @return string
*/
public function merge($branch) {
return $this->run("merge $branch --no-ff");
}
/**
* Runs a git fetch on the current branch
*
* @access public
* @return string
*/
public function fetch() {
return $this->run("fetch");
}
/**
* Add a new tag on the current position
*
* Accepts the name for the tag and the message
*
* @param string $tag
* @param string $message
* @return string
*/
public function add_tag($tag, $message = null) {
if ($message === null) {
$message = $tag;
}
return $this->run("tag -a $tag -m " . escapeshellarg($message));
}
/**
* List all the available repository tags.
*
* Optionally, accept a shell wildcard pattern and return only tags matching it.
*
* @access public
* @param string $pattern Shell wildcard pattern to match tags against.
* @return array Available repository tags.
*/
public function list_tags($pattern = null) {
$tagArray = explode("\n", $this->run("tag -l $pattern"));
foreach ($tagArray as $i => &$tag) {
$tag = trim($tag);
if ($tag == '') {
unset($tagArray[$i]);
}
}
return $tagArray;
}
/**
* Push specific branch to a remote
*
* Accepts the name of the remote and local branch
*
* @param string $remote
* @param string $branch
* @return string
*/
public function push($remote, $branch) {
return $this->run("push --tags $remote $branch");
}
/**
* Pull specific branch from remote
*
* Accepts the name of the remote and local branch
*
* @param string $remote
* @param string $branch
* @return string
*/
public function pull($remote, $branch) {
return $this->run("pull $remote $branch");
}
/**
* List log entries.
*
* @param strgin $format
* @return string
*/
public function log($format = null) {
if ($format === null)
return $this->run('log');
else
return $this->run('log --pretty=format:"' . $format . '"');
}
/**
* Sets the project description.
*
* @param string $new
*/
public function set_description($new) {
$path = $this->git_directory_path();
file_put_contents($path."/description", $new);
}
/**
* Gets the project description.
*
* @return string
*/
public function get_description() {
$path = $this->git_directory_path();
return file_get_contents($path."/description");
}
/**
* Sets custom environment options for calling Git
*
* @param string key
* @param string value
*/
public function setenv($key, $value) {
$this->envopts[$key] = $value;
}
}
/* End of file */

2
git/autoload.inc Normal file
View File

@ -0,0 +1,2 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\GIT');

View File

@ -1,7 +1,8 @@
<?php
SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI');
//System Start Mod
require_once dirname(__FILE__).'/saistart_sys_sai/autoload.inc';
//System Mod
require_once dirname(__FILE__).'/saimod_sys_log/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_security/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_mod/autoload.inc';
@ -13,6 +14,8 @@ require_once dirname(__FILE__).'/saimod_sys_files/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_cache/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_cron/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_todo/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_git/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_docu/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_langswitcher/autoload.inc';
require_once dirname(__FILE__).'/saimod_sys_login/autoload.inc';
//Project Mod
require_once dirname(__FILE__).'/saimod_sys_langswitcher/autoload.inc';

View File

@ -0,0 +1,5 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','SYSTEM\DBD');
\SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_git');

View File

View File

@ -0,0 +1,40 @@
<?php
namespace SYSTEM\SAI;
class saimod_sys_git extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_git(){
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_GIT);
$vars = array_merge($vars,self::getGitInfo());
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_git/tpl/saimod_sys_git.tpl'), $vars);
}
public static function getGitInfo(){
$result = array('git_project' => '', 'git_system' => '');
try{
$repo = \SYSTEM\GIT\Git::open(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH));
} catch (\Exception $ex) {
$result['git_project'] = $ex->getMessage();
}
try{
$repo = \SYSTEM\GIT\Git::open(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH).\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL));
} catch (\Exception $ex) {
$result['git_system'] = $ex->getMessage();
}
return $result;
}
private static function tablerow_class($cacheID){
if($cacheID == 1){
return 'info';}
return 'success';
}
public static function html_li_menu(){return '<li><a id="menu_git" href="#!git">${sai_menu_git}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
//public static function css(){}
//public static function js(){}
}

View File

@ -0,0 +1,5 @@
<h4>${sai_git_title}</h4>
<hr>
<b>${sai_git_project_version}:</b> ${git_project}
<br>
<b>${sai_git_system_version}:</b> ${git_system}

View File

@ -20,10 +20,8 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
}
protected static function html_content(){
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
$vars = array();
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'),$vars);
}
if(!\SYSTEM\SECURITY\Security::isLoggedIn() || !\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI)){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'));}
$vars = array();
$vars['project_name'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT);
$vars['project_url'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL);
@ -34,7 +32,8 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
$vars['isadmin'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no";
$vars = array_merge( $vars,
\SYSTEM\SAI\saimod_sys_todo::statistics(),
\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START));
\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START),
\SYSTEM\SAI\saimod_sys_git::getGitInfo());
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content_loggedin.tpl'), $vars);
}
}

View File

@ -15,8 +15,8 @@
</div>
<div class="well" id="git">
<h2 class="muted">Git</h2>
<b>Current Project Version:</b> ${git_project}<br/>
<b>Current SYSTEM Version:</b> ${git_system}
<b>${sai_git_project_version}:</b> ${git_project}<br>
<b>${sai_git_system_version}:</b> ${git_system}
</div>
<div class="well" id="logout">
<h2 class="muted"><a href="#!login">${basic_logout}</a></h2>