Commit 6bb87874 authored by pedro_morgan's avatar pedro_morgan
Browse files

* Silenced some warning with E_STRICT

* replaces " with ' where applicable
parent 4a6dba5e
......@@ -28,6 +28,8 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
error_reporting(E_ALL|E_STRICT);
require_once('../lib/config.inc.php');
require_once('../lib/app.inc.php');
......
......@@ -35,55 +35,57 @@ $app->uses('tpl');
//die('HHH');
if($_GET["nav"] == 'top') {
//** Top Naviation
if(isset($_GET['nav']) && $_GET['nav'] == 'top') {
$app->tpl->newTemplate("topnav.tpl.htm");
$app->tpl->newTemplate('topnav.tpl.htm');
// Checke User Login and current module
if(!is_array($_SESSION["s"]['user']) or !is_array($_SESSION["s"]["module"])) {
// Loading Login Module
//* Check User Login and current module
if(!isset($_SESSION['s']['user']) or !is_array($_SESSION['s']['user']) or !is_array($_SESSION['s']['module'])) {
//* Loading Login Module
include_once('login/lib/module.conf.php');
$_SESSION["s"]['module'] = $module;
$topnav[] = array( 'title' => "Login",
$_SESSION['s']['module'] = $module;
$topnav[] = array( 'title' => 'Login',
'active' => 1);
$module = null;
unset($module);
} else {
// Loading modules of the user and building top navigation
$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
//* Loading modules of the user and building top navigation
$modules = explode(',', $_SESSION['s']['user']['modules']);
if(is_array($modules)) {
foreach($modules as $mt) {
if(is_file($mt."/lib/module.conf.php")) {
include_once($mt."/lib/module.conf.php");
$active = ($module["name"] == $_SESSION["s"]["module"]["name"])?1:0;
$topnav[] = array( 'title' => $app->lng($module["title"]),
'active' => $active,
'module' => $module["name"]);
if(is_file($mt.'/lib/module.conf.php')) {
include_once($mt.'/lib/module.conf.php');
$active = ($module['name'] == $_SESSION['s']['module']['name']) ? 1 : 0;
$topnav[] = array( 'title' => $app->lng($module['title']),
'active' => $active,
'module' => $module['name']);
}
}
}
}
// Topnavigation
//* Topnavigation
$app->tpl->setLoop('nav_top',$topnav);
}
if($_GET["nav"] == 'side') {
//** Side Naviation
if(isset($_GET['nav']) && $_GET['nav'] == 'side') {
$app->tpl->newTemplate("sidenav.tpl.htm");
$app->tpl->newTemplate('sidenav.tpl.htm');
// translating module navigation
//* translating module navigation
$nav_translated = array();
if(is_array($_SESSION["s"]["module"]["nav"])) {
foreach($_SESSION["s"]["module"]["nav"] as $nav) {
if(isset($_SESSION['s']['module']['nav']) && is_array($_SESSION['s']['module']['nav'])) {
foreach($_SESSION['s']['module']['nav'] as $nav) {
$tmp_items = array();
foreach($nav["items"] as $item) {
$item["title"] = $app->lng($item["title"]);
foreach($nav['items'] as $item) {
$item['title'] = $app->lng($item['title']);
$tmp_items[] = $item;
}
$nav["title"] = $app->lng($nav["title"]);
$nav["items"] = $tmp_items;
$nav['title'] = $app->lng($nav['title']);
$nav['items'] = $tmp_items;
$nav_translated[] = $nav;
}
} else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment