Changeset 13

Show
Ignore:
Timestamp:
07/18/08 18:48:17 (4 months ago)
Author:
gevik
Message:

-- UPD CAdminPageBase.php to check permission
-- UPD english texts
-- CHG CTApplication.php, CDatabase.php for SystemConfig?
-- DEL Helper.php, admin constant
-- CGH test index.php to include correct common classes
-- ADD CMasterLayout.php, CMasterLayout.tpl, ctlayout.css as common css xhtml fullpage template (BTEA)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/shop/admin/protected/Engine/CAdminPageBase.php

    r12 r13  
    55        public function IsUserAuthorized() 
    66        { 
    7                 return $this->User->UserType = Helper::ADMINISTRATOR; 
     7                /* A for administrator */ 
     8                return $this->User->UserType == 'A'; 
    89        } 
    910} 
    10  
    1111?> 

  • trunk/shop/admin/protected/Messages/en/messages.xml

    r12 r13  
    11<?xml version="1.0"?> 
    22<xliff version="1.0"> 
    3  <file source-language="EN" target-language="en" datatype="plaintext" original="messages" date="2008-07-29T15:05:25Z" product-name="messages"> 
     3 <file source-language="EN" target-language="en" datatype="plaintext" original="messages" date="2008-07-29T20:35:23Z" product-name="messages"> 
    44  <body> 
    55   
    …… 
    3838<target>Remember me.</target> 
    3939</trans-unit> 
     40 
     41<trans-unit id="8"> 
     42<source>btnlogout_caption</source> 
     43<target>logout</target> 
     44</trans-unit> 
    4045</body> 
    4146 </file> 

  • trunk/shop/admin/protected/Pages/Home.page

    r3 r13  
     1<%@ MasterClass="Common.Web.CMasterLayout"%> 
     2<com:TContent ID="MainContent"> 
     3Home 
     4</com:TContent> 

  • trunk/shop/common/CTApplication.php

    r12 r13  
    1212        $db = $this->GetModule("database"); 
    1313        if($this->Session["__sys_config"] == "") 
    14                 $this->Session["__sys_config"] = $db->getConfig(); 
     14                $this->Session["__sys_config"] = $db->getSystemConfig(); 
    1515                 
    1616        return $this->Session["__sys_config"]; 

  • trunk/shop/common/Data/CDatabase.php

    r12 r13  
    1212class CDatabase extends CDatabaseBase 
    1313{ 
    14         public function GetUserByUserName($username) 
     14        public function getUserByUserName($username) 
    1515        { 
    1616                $sql = "SELECT * FROM tbluser where username = $1"; 
    1717                return $this->queryRow($sql,array($username)); 
    1818        } 
     19         
     20        public function getSystemConfig() 
     21        { 
     22                $sql = "SELECT * FROM tblconfig"; 
     23                return $this->queryAll($sql); 
     24        } 
    1925} 
    2026 

  • trunk/shop/common/Helper.php

    r12 r13  
    1212  
    1313 class Helper 
    14  { 
    15         public $ADMINISTRATOR = 'A'; 
    16           
     14 {        
    1715    function ToArgString($str,$args=null) 
    1816    { 

  • trunk/shop/schema/postgresql/core.sql

    r12 r13  
    5454insert into tblconfig(keyname,keyvalue) values('system_mail_from',''); 
    5555insert into tblconfig(keyname,keyvalue) values('system_mail_server',''); 
     56insert into tblconfig(keyname,keyvalue) values('application_name',''); 

  • trunk/shop/tests/UnitTests/index.php

    r11 r13  
    33include_once '../test_tools/unit_tests.php'; 
    44require_once('../../common/Helper.php'); 
    5 require_once('../../common/CDatabaseBase.php'); 
    6 require_once('../../common/CDatabase.php'); 
    7 require_once('../../common/CUserManager.php'); 
    8 require_once('../../common/CUser.php'); 
     5require_once('../../common/Data/CDatabaseBase.php'); 
     6require_once('../../common/Data/CDatabase.php'); 
     7require_once('../../common/Security/CUserManager.php'); 
     8require_once('../../common/Security/CUser.php'); 
    99 
    1010