------------------------------------------------------------
revno: 911
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Tue 2011-10-11 11:08:10 +0200
message:
Add missing files in instalation process and one curly brace
modified:
src/assets/apps/admin/control_panel.js
src/index.php
src/libs/Makefile.am
src/libs/aiki.php
src/libs/config.php
src/libs/security.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'src/assets/apps/admin/control_panel.js'
--- src/assets/apps/admin/control_panel.js 2011-08-20 21:29:58 +0000
+++ src/assets/apps/admin/control_panel.js 2011-10-11 09:08:10 +0000
@@ -671,7 +671,7 @@
});
// The following line is autoconf generated
- // @AIKI_UPDATE_JS@
+ //
// append the log button to the main navigation
$("<li><a href='#' id='log-button'>Log</a></li>").appendTo("#main-navigation");
=== modified file 'src/index.php'
--- src/index.php 2011-10-10 21:46:15 +0000
+++ src/index.php 2011-10-11 09:08:10 +0000
@@ -17,7 +17,6 @@
* @filesource
*/
-error_reporting(E_STRICT | E_ALL);
/**
* Starts the clock so we can measure loading time of the site
=== modified file 'src/libs/Makefile.am'
--- src/libs/Makefile.am 2011-09-01 17:28:52 +0000
+++ src/libs/Makefile.am 2011-10-11 09:08:10 +0000
@@ -21,36 +21,41 @@
aiki_src_files = \
aiki_array.php \
aiki_curl.php \
+ AikiException.php \
+ aiki.php \
+ AikiSession.php \
+ Archive.php \
+ Backup.php \
bot.php \
+ config.php \
+ css_parser.php \
dictionary.php \
errors.php \
+ File.php \
forms.php \
image.php \
input.php \
installer.php \
languages.php \
+ Log.php \
membership.php \
message.php \
output.php \
parser.php \
php.php \
+ plugins.php \
records.php \
security.php \
site.php \
sql_markup.php \
text.php \
+ Updater.php \
+ Upgrade.php \
url.php \
- wiki.php \
- aiki.php \
+ view_parser.php \
widgets.php \
- Log.php \
- Archive.php \
- Backup.php \
- File.php \
- Updater.php \
- Upgrade.php \
- AikiException.php \
- AikiSession.php
+ wiki.php
+
# Subdirectories to be built
SUBDIRS = \
=== modified file 'src/libs/aiki.php'
--- src/libs/aiki.php 2011-10-10 21:46:15 +0000
+++ src/libs/aiki.php 2011-10-11 09:08:10 +0000
@@ -78,32 +78,32 @@
} else {
// filter extensions..
- $allowed = "," . $this->config->get("extensions_allowed","ALL") . ",";
+ $allowed = "," . $this->config->get("extensions_allowed", "ALL") . ",";
// a tip..be sure "web" doesn't match "web2date".
if ( $allowed != ",ALL," ) {
- if ( $allowed == ",NONE," or strpos($allowed,$class)===false ) {
+ if ( $allowed == ",NONE," or strpos($allowed, $class)===false ) {
return false;
}
}
// search in dirs
- $SearchIn = $this->config->get("extensions_dir","assets/extensions");
+ $SearchIn = $this->config->get("extensions_dir", "assets/extensions");
$loaded = false;
foreach (explode(",", $SearchIn) as $dir) {
- if(file_exists($AIKI_ROOT_DIR. "/$dir/$class.php")) {
+ if (file_exists($AIKI_ROOT_DIR . "/$dir/$class.php")) {
require_once($AIKI_ROOT_DIR . "/$dir/$class.php");
$loaded= true;
break;
}
- if(file_exists($AIKI_ROOT_DIR . "/$dir/$class/$class.php")) {
+ if (file_exists($AIKI_ROOT_DIR . "/$dir/$class/$class.php")) {
require_once($AIKI_ROOT_DIR . "/$dir/$class/$class.php");
$loaded= true;
break;
}
}
- if (!$loaded){
+ if (!$loaded) {
return false;
}
}
=== modified file 'src/libs/config.php'
--- src/libs/config.php 2011-10-10 21:46:15 +0000
+++ src/libs/config.php 2011-10-11 09:08:10 +0000
@@ -20,7 +20,7 @@
*
*/
-if(!defined('IN_AIKI')) {
+if (!defined('IN_AIKI')) {
die('No direct script access allowed');
}
@@ -383,7 +383,7 @@
$oldLevel = error_reporting( E_ALL | E_STRICT );
} else {
if ( $newLevel === false ) {
- $newLevel = $aiki->config->get("error_level", E_ALL | E_STRICT);
+ $newLevel = $aiki->config->get("error_level", E_ALL | E_STRICT );
}
$oldLevel = error_reporting($newLevel);
}
=== modified file 'src/libs/security.php'
--- src/libs/security.php 2011-10-10 21:46:15 +0000
+++ src/libs/security.php 2011-10-11 09:08:10 +0000
@@ -8,12 +8,12 @@
* This source file is subject to the AGPL-3.0 license that is bundled
* with this package in the file LICENSE.
*
- * @author Aikilab http://www.aikilab.com
+ * @author Aikilab http://www.aikilab.com
* @copyright (c) 2008-2011 Aiki Lab Pte Ltd
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
- * @link http://www.aikiframework.org
- * @category Aiki
- * @package Library
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @link http://www.aikiframework.org
+ * @category Aiki
+ * @package Library
* @filesource
*/
@@ -59,7 +59,7 @@
* @global aiki $aiki
* @global array $db
*/
- public function inlinePermissions($text)
+ public function inlinePermissions($text) {
global $aiki, $db;
if (preg_match_all('/\(\#\(permissions\:(.*)\)\#\)/Us', $text, $matchs)){
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
