[Byfly-cvs] byfly-0.6.0b/classes class.DB.php,1.2,1.3 class.common.php,1.10,1.11 class.main.php,1.13
Status: Inactive
Brought to you by:
flydesign
Menu
▾
▴
[Byfly-cvs] byfly-0.6.0b/classes class.DB.php,1.2,1.3 class.common.php,1.10,1.11 class.main.php,1.13,1.14 class.object.php,1.1,1.2 class.output.php,1.7,1.8 class.page.php,1.7,1.8 class.template.php,1.8,1.9
Update of /cvsroot/byfly/byfly-0.6.0b/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv31123/classes
Modified Files:
class.DB.php class.common.php class.main.php class.object.php
class.output.php class.page.php class.template.php
Log Message:
Small updates:
- config bug fixed
- menu module improved
Index: class.DB.php
===================================================================
RCS file: /cvsroot/byfly/byfly-0.6.0b/classes/class.DB.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.DB.php 19 Oct 2003 08:43:46 -0000 1.2
--- class.DB.php 8 Nov 2003 19:35:53 -0000 1.3
***************
*** 16,20 ****
/*********************************************
! * DB.php: database connections
* Author: Edwin Vlieg
*********************************************/
--- 16,20 ----
/*********************************************
! * class.DB.php: database connections
* Author: Edwin Vlieg
*********************************************/
***************
*** 62,76 ****
$this->connection = @mysql_connect($this->mysql_server,
$this->mysql_login,
! $this->mysql_password) or exit('Can\'t connect to database: '.mysql_error());
! @mysql_select_db($this->mysql_database,$this->connection) or exit('Database error: '.mysql_error());
}
! function query($sql = ""){
if(is_null($this->connection)){
$this->connect();
}
! $data = @mysql_query($sql,$this->connection) or die('Query error: '.mysql_error());
! if(!$data){
! return false;
} else {
return $data;
--- 62,97 ----
$this->connection = @mysql_connect($this->mysql_server,
$this->mysql_login,
! $this->mysql_password);
! if(mysql_error()){
! exit('Can\'t connect to MySQL server: '.mysql_error());
! }
! mysql_select_db($this->mysql_database,$this->connection);
! if(mysql_error()){
! exit('Can\'t connect to database: '.mysql_error());
! }
!
}
! function query($sql = "", $clean = 0){
if(is_null($this->connection)){
$this->connect();
}
! $data = mysql_query($sql,$this->connection);
! if(mysql_error()){
! echo 'Query error: '.mysql_error();
! return false;
! }
! if($clean){
! if(mysql_num_rows($data) == 1){
! return mysql_fetch_array($data);
! } elseif(mysql_num_rows($data) > 0){
! $arr = array();
! while($line = mysql_fetch_array($data)){
! $arr[] = $line;
! }
! return $arr;
! } else {
! return false;
! }
} else {
return $data;
Index: class.common.php
===================================================================
RCS file: /cvsroot/byfly/byfly-0.6.0b/classes/class.common.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class.common.php 22 Oct 2003 08:04:58 -0000 1.10
--- class.common.php 8 Nov 2003 19:35:53 -0000 1.11
***************
*** 167,170 ****
--- 167,188 ----
if(preg_match_all('/<'.$name.'(.*?)>(.*?)<\/'.$name.'>/s',$str,$match)){
+ if(count($match[0]) > 1){
+ foreach($match[1] as $id => $item){
+
+ if($item != ''){
+ if(preg_match_all('/(.+?)="(.+?)"/i',$item,$data)){
+ foreach($data[1] as $nr => $value){
+ $ret[$name][$id]['_ATTR'][trim($value)] = trim($data[2][$nr]);
+ }
+ }
+
+ if($sub_items){
+ $ret[$name] = $this->xml2array($match[2][$id], $row);
+ } else {
+ $ret[$name][$id]['_VALUE'] = $match[2][$id];
+ }
+ }
+ }
+ } else {
if($match[1][0] != ''){
if(preg_match_all('/(.+?)="(.+?)"/i',$match[1][0],$data)){
***************
*** 179,182 ****
--- 197,201 ----
$ret[$name]['_VALUE'] = $match[2][0];
}
+ }
}
}
Index: class.main.php
===================================================================
RCS file: /cvsroot/byfly/byfly-0.6.0b/classes/class.main.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.main.php 22 Oct 2003 08:04:58 -0000 1.13
--- class.main.php 8 Nov 2003 19:35:53 -0000 1.14
***************
*** 16,26 ****
/*********************************************
! * main.php: main class for system
* Author: Edwin Vlieg
*********************************************/
- /*************
- * First set some information
- **************/
/**
--- 16,23 ----
/*********************************************
! * class.main.php: main class for system
* Author: Edwin Vlieg
*********************************************/
/**
***************
*** 31,35 ****
// main function
function init(){
!
// connect to database
$_SESSION['DB']->connect();
--- 28,32 ----
// main function
function init(){
! #session_destroy();
// connect to database
$_SESSION['DB']->connect();
***************
*** 55,62 ****
$GLOBALS['pid'] = $pid;
}
! }
}
}
! $_SESSION['DATA']->dirStructure = $dirStruc;
}
--- 52,65 ----
$GLOBALS['pid'] = $pid;
}
! }
}
}
! $_SESSION['DATA']['dirStructure'] = $dirStruc;
! foreach($dirStruc as $key => $val){
! if($key % 2 == FALSE){
! $_SESSION['DATA']['dir'][$val] = (isset($dirStruc[$key+1]))? $dirStruc[$key+1] : '';
! }
! }
! #print_r($_SESSION['DATA']['dir']);
}
***************
*** 93,96 ****
--- 96,104 ----
}
$_SESSION['output']->send2screen($_SESSION['output']->parse_site());
+
+ $parseTime = round($_SESSION['common']->stopTiming(), 5);
+ $fp = fopen ("parsetimes.txt", "a+");
+ fwrite ($fp, $parseTime."\n");
+ fclose ($fp);
}
***************
*** 477,485 ****
if(!$object){
$object['type'] = $_SESSION['main']->lang('NO_OBJECT');
}
if((isset($_SESSION[$object['type']])) && (class_exists($object['type'])) && in_array(strtolower('edit'), get_class_methods($object['type']))){
! $editor = '<a href="index.php?module='.$object['type'].'&function=edit&media=page&vid='.$val['ID'].'">'.$_SESSION['main']->lang('OPEN_EDITOR').'</a>';
} else {
! $editor = $_SESSION['main']->lang('ERROR_LOADING_EDITOR');
}
$varsettings = '<a href="index.php?action=var_settings&media=page&vid='.$val['ID'].'">'.$_SESSION['main']->lang('SETTINGS').'</a>';
--- 485,494 ----
if(!$object){
$object['type'] = $_SESSION['main']->lang('NO_OBJECT');
+ $object['ID'] = 0;
}
if((isset($_SESSION[$object['type']])) && (class_exists($object['type'])) && in_array(strtolower('edit'), get_class_methods($object['type']))){
! $editor = '<a href="index.php?module='.$object['type'].'&function=edit&media=page&vid='.$val['ID'].'">'.$_SESSION['main']->lang('EDIT').'</a>';
} else {
! $editor = ' ';
}
$varsettings = '<a href="index.php?action=var_settings&media=page&vid='.$val['ID'].'">'.$_SESSION['main']->lang('SETTINGS').'</a>';
***************
*** 488,492 ****
'editor' => $editor,
'link' => $varsettings,
! 'type' => $object['type']
));
--- 497,502 ----
'editor' => $editor,
'link' => $varsettings,
! 'type' => $_SESSION['object']->dynamicSelectBox($val['ID'],$page_info['site_id'],$val['object_id'],$val['template'])
!
));
Index: class.object.php
===================================================================
RCS file: /cvsroot/byfly/byfly-0.6.0b/classes/class.object.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.object.php 22 Oct 2003 08:06:40 -0000 1.1
--- class.object.php 8 Nov 2003 19:35:53 -0000 1.2
***************
*** 79,82 ****
--- 79,190 ----
}
+ function dynamicSelectBox($ID, $sid, $object_id, $template){
+ $str = '';
+ $objects = $this->getObjects($sid, 1);
+ $type = '';
+ if($objects){
+ $str .= "<select name=\"edit[".$ID."][object_id]\" id=\"object_id\" onChange=\"swap_object_".$ID."(this.options[this.selectedIndex].value)\">";
+ $str .= '<option value="0"><'.$_SESSION['main']->lang('NO_OBJECT').'></option>';
+ $current_type = '';
+ foreach($objects as $line){
+ if($current_type != $line['type']){
+ $str .= '<option value="0" class="marked_option">'.$line['type'].'</option>';
+ $current_type = $line['type'];
+ }
+ $check = '';
+ if($line['ID'] == $object_id){ $check = ' selected="selected"'; $type = $line['type'];}
+ $str .= '<option value="'.$line['ID'].'"'.$check.'> '.$line['name'].'</option>';
+ }
+ $str .= "</select>";
+ $str .= "
+ <script>
+ object_".$ID." = Array();
+ ";
+ foreach($objects as $object){
+ $action = 0;
+ $need_template = 0;
+ $need_template = $_SESSION[$object['type']]->settings['need_template'];
+ if(isset($_SESSION[$object['type']]->settings['actions'])){
+ $action = 1;
+ }
+ $str .= "
+ object_".$ID."[".$object['ID']."] = Array('".$need_template."','".$action."');
+ ";
+ }
+
+ $str .= "
+ function swap_object_".$ID."(a){
+ if(a != 0){
+ if(object_".$ID."[a][0] == 1){
+ obj = el('template_".$ID."');
+ obj.style.display = 'inline';
+ } else {
+ obj = el('template_".$ID."');
+ obj.style.display = 'none';
+ obj.options[0].selected = 1;
+ }
+ } else {
+ obj = el('template_".$ID."');
+ obj.style.display = 'none';
+ obj.options[0].selected = 1;
+ }
+ }
+ </script>
+ ";
+ } else {
+ $str .= $_SESSION['main']->lang('NO_OBJECT_FOUND');
+ }
+ $styles = $_SESSION['DB']->query("SELECT * FROM `".$_SESSION['DB']->table['styles']."` WHERE `users` = 'all' OR `users` LIKE '%".$_SESSION['security']->getData('usercode')."%' OR `users` LIKE '%".$_SESSION['security']->getData('usergroup')."%'");
+ if(mysql_num_rows($styles)){
+ $str .= "<select name=\"edit[".$ID."][template]\" id=\"template_".$ID."\" style=\"display: ";
+ if((isset($_SESSION[$type]->settings['need_template'])) AND ($_SESSION[$type]->settings['need_template'])){
+ $str .= 'inline';
+ } else {
+ $str .= 'none';
+ }
+ $str .= ";\">";
+ $str .= '<option value="0"><'.$_SESSION['main']->lang('NO_TEMPLATE').'></option>';
+ while($line = mysql_fetch_array($styles)){
+ $str .= "<option class=\"marked_option\" value=\"0\">".$line['name']."</option>";
+ $templates = $_SESSION['DB']->query("SELECT * FROM `".$_SESSION['DB']->table['templates']."` WHERE style_id = '$line[ID]'");
+ while($lines = mysql_fetch_array($templates)){
+ $name = $line['ID'].'.'.$lines['ID'];
+ $check = '';
+ if($name == $template){ $check = ' selected="selected"'; }
+ $str .= '<option value="'.$name.'"'.$check.'> '.$lines['name'].'</option>';
+ }
+ }
+ $str .= "</select>";
+ } else {
+ $str .= $_SESSION['main']->lang('NO_TEMPLATES');
+ }
+
+ return $str;
+ }
+
+ function moduleTemplateSelectBox($usercode, $value = ""){
+
+ $str = '';
+ $styles = $_SESSION['DB']->query("SELECT * FROM `".$_SESSION['DB']->table['styles']."` WHERE `users` = 'all' OR `users` LIKE '%".$_SESSION['security']->getData('usercode')."%' OR `users` LIKE '%".$_SESSION['security']->getData('usergroup')."%'");
+ if(mysql_num_rows($styles)){
+ $str .= "<select name=\"edit[template]\" id=\"template\">";
+ $str .= '<option value="0"><'.$_SESSION['main']->lang('NO_TEMPLATE').'></option>';
+ while($line = mysql_fetch_array($styles)){
+ $str .= "<option class=\"marked_option\" value=\"0\">".$line['name']."</option>";
+ $templates = $_SESSION['DB']->query("SELECT * FROM `".$_SESSION['DB']->table['templates']."` WHERE style_id = '$line[ID]'");
+ while($lines = mysql_fetch_array($templates)){
+ $name = $line['ID'].'.'.$lines['ID'];
+ $check = '';
+ if($name == $value){ $check = ' selected="selected"'; }
+ $str .= '<option value="'.$name.'"'.$check.'> '.$lines['name'].'</option>';
+ }
+ }
+ $str .= "</select>";
+ return $str;
+ } else {
+ return $_SESSION['main']->lang('NO_TEMPLATES');
+ }
+ }
+
function getObjects($sid, $sort = FALSE, $show = FALSE){
if($sort){
Index: class.output.php
===================================================================
RCS file: /cvsroot/byfly/byfly-0.6.0b/classes/class.output.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** class.output.php 19 Oct 2003 08:43:46 -0000 1.7
--- class.output.php 8 Nov 2003 19:35:53 -0000 1.8
***************
*** 125,130 ****
*/
! if(!$site){ $_SESSION['error']->make_error($_SESSION['main']->lang('SITE_NOT_FOUND')); exit(); }
! if(!$page){ $_SESSION['error']->make_error($_SESSION['main']->lang('PAGE_NOT_FOUND')); exit(); }
# $_SESSION['DATA']['pid'] = $sid;
--- 125,130 ----
*/
! if(!$site){ $_SESSION['error']->make_error($_SESSION['main']->lang('SITE_NOT_FOUND').": ".$sid); exit(); }
! if(!$page){ $_SESSION['error']->make_error($_SESSION['main']->lang('PAGE_NOT_FOUND').": ".$pid); exit(); }
# $_SESSION['DATA']['pid'] = $sid;
Index: class.page.php
===================================================================
RCS file: /cvsroot/byfly/byfly-0.6.0b/classes/class.page.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** class.page.php 22 Oct 2003 08:04:58 -0000 1.7
--- class.page.php 8 Nov 2003 19:35:53 -0000 1.8
***************
*** 156,163 ****
--- 156,169 ----
foreach($data as $key => $val){
+ if((is_int($key)) AND (is_array($val))){
+ foreach($val as $item => $value){
+ $_SESSION['DB']->query("UPDATE `".$_SESSION['DB']->table['vars']."` SET `".$item."` = '".$value."' WHERE `ID` = ".$key."");
+ }
+ } else {
if($key == 'url_name'){
$val = $_SESSION['common']->urlName($val, 'page', $_GET['sid']);
}
$_SESSION['DB']->query("UPDATE `".$_SESSION['DB']->table['page']."` SET `".$key."` = '".$val."' WHERE `ID` = ".$pid);
+ }
}
}
Index: class.template.php
===================================================================
RCS file: /cvsroot/byfly/byfly-0.6.0b/classes/class.template.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.template.php 19 Oct 2003 08:43:46 -0000 1.8
--- class.template.php 8 Nov 2003 19:35:53 -0000 1.9
***************
*** 312,331 ****
}
! function parseActions($str, $object){
preg_match_all('/<byfly-action name="(.+?)">(.*?)<\/byfly-action>/s',$str,$match);
! #print_r($match);
while(list($id, $action) = each($match[1])){
if((in_array(strtolower('_'.$action), get_class_methods($object)))){
! if(((isset($GLOBALS['page_action'])) AND ($GLOBALS['page_action'] == $action))){
$str = str_replace('<byfly-action name="'.$action.'">'.$match[2][$id].'</byfly-action>',
$object->{'_'.$action}($match[2][$id]),
$str);
} else {
! if(($object->settings['default_action'] == $action) AND (!isset($GLOBALS['page_action']))) {
$str = str_replace('<byfly-action name="'.$action.'">'.$match[2][$id].'</byfly-action>',
$object->{'_'.$action}($match[2][$id]),
$str);
} else {
$str = str_replace('<byfly-action name="'.$action.'">'.$match[2][$id].'</byfly-action>',
'',
--- 312,337 ----
}
! function parseActions($str, $object, $name = 'page'){
!
!
!
preg_match_all('/<byfly-action name="(.+?)">(.*?)<\/byfly-action>/s',$str,$match);
!
while(list($id, $action) = each($match[1])){
if((in_array(strtolower('_'.$action), get_class_methods($object)))){
! if(((isset($GLOBALS[$name.'_action'])) AND ($GLOBALS[$name.'_action'] == $action))){
!
$str = str_replace('<byfly-action name="'.$action.'">'.$match[2][$id].'</byfly-action>',
$object->{'_'.$action}($match[2][$id]),
$str);
} else {
! if(($object->settings['default_action'] == $action) AND (!isset($GLOBALS[$name.'_action']))) {
!
$str = str_replace('<byfly-action name="'.$action.'">'.$match[2][$id].'</byfly-action>',
$object->{'_'.$action}($match[2][$id]),
$str);
} else {
+
$str = str_replace('<byfly-action name="'.$action.'">'.$match[2][$id].'</byfly-action>',
'',
|