Update Smarty test, Base class email comment update
- smarty test with optgroup - ignore file update for log folder - email regex comment update
This commit is contained in:
@@ -167,14 +167,14 @@ print "DB Version bigger than $to_db_version: ".$basic->dbCompareVersion('>='.$t
|
|||||||
print "DB Version bigger $to_db_version: ".$basic->dbCompareVersion('>'.$to_db_version)."<br>";
|
print "DB Version bigger $to_db_version: ".$basic->dbCompareVersion('>'.$to_db_version)."<br>";
|
||||||
|
|
||||||
/* $q = "SELECT FOO FRO BAR";
|
/* $q = "SELECT FOO FRO BAR";
|
||||||
// $q = "Select * from foo";
|
// $q = "Select * from foo";
|
||||||
$foo = $basic->dbExecAsync($q);
|
$foo = $basic->dbExecAsync($q);
|
||||||
print "[ERR] Query: ".$q."<br>";
|
print "[ERR] Query: ".$q."<br>";
|
||||||
print "[ERR] RESOURCE: $foo<br>";
|
print "[ERR] RESOURCE: $foo<br>";
|
||||||
while (($ret = $basic->dbCheckAsync()) === true)
|
while (($ret = $basic->dbCheckAsync()) === true)
|
||||||
{
|
{
|
||||||
print "[ERR]: $ret<br>";
|
print "[ERR]: $ret<br>";
|
||||||
// sleep(5);
|
sleep(5);
|
||||||
} */
|
} */
|
||||||
|
|
||||||
// search path check
|
// search path check
|
||||||
|
|||||||
@@ -18,5 +18,24 @@ require BASE.INCLUDES.'admin_set_paths.inc';
|
|||||||
// smarty test
|
// smarty test
|
||||||
$cms->DATA['SMARTY_TEST'] = 'Test Data';
|
$cms->DATA['SMARTY_TEST'] = 'Test Data';
|
||||||
|
|
||||||
|
// drop down test with optgroups
|
||||||
|
$options = array (
|
||||||
|
'' => '選択してください',
|
||||||
|
'4/25(木)' => array (
|
||||||
|
'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
|
||||||
|
'4/25(木) 12:20-13:00' => '4/25(木) 12:20-13:00'
|
||||||
|
),
|
||||||
|
'4/26(金)' => array (
|
||||||
|
'4/26(金) 11:00-11:50' => '4/26(金) 11:00-11:50',
|
||||||
|
'4/26(金) 12:20-13:00' => '4/26(金) 12:20-13:00'
|
||||||
|
),
|
||||||
|
'4/27(土)' => array (
|
||||||
|
'4/27(土) 11:00-11:50' => '4/27(土) 11:00-11:50',
|
||||||
|
'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
$cms->DATA['drop_down_test'] = $options;
|
||||||
|
|
||||||
require BASE.INCLUDES.'admin_smarty.inc';
|
require BASE.INCLUDES.'admin_smarty.inc';
|
||||||
require BASE.INCLUDES.'admin_footer.inc';
|
require BASE.INCLUDES.'admin_footer.inc';
|
||||||
|
|||||||
5
www/layout/admin/default/templates/smarty_test.tpl
Normal file → Executable file
5
www/layout/admin/default/templates/smarty_test.tpl
Normal file → Executable file
@@ -1,3 +1,8 @@
|
|||||||
<div>
|
<div>
|
||||||
{$SMARTY_TEST}
|
{$SMARTY_TEST}
|
||||||
</div>
|
</div>
|
||||||
|
<div>
|
||||||
|
<select id="drop_down_test" name="drop_down_test">
|
||||||
|
{html_options options=$drop_down_test selected=$drop_down_test_selected}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -307,8 +307,8 @@ class Basic
|
|||||||
'.*@bandai\.jp$' => 'keitai_willcom_bandai', # willcom paipo! (kids)
|
'.*@bandai\.jp$' => 'keitai_willcom_bandai', # willcom paipo! (kids)
|
||||||
'.*@pipopa\.ne\.jp$' => 'keitai_willcom_pipopa', # willcom paipo! (kids)
|
'.*@pipopa\.ne\.jp$' => 'keitai_willcom_pipopa', # willcom paipo! (kids)
|
||||||
'.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'keitai_willcom_pdx', # actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
|
'.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'keitai_willcom_pdx', # actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
|
||||||
'.*@ymobile([1]{1})?\.ne\.jp$' => 'keitai_willcom_ymobile', # ymobile, ymobile1 techincally not willcom, but I group them there
|
'.*@ymobile([1]{1})?\.ne\.jp$' => 'keitai_willcom_ymobile', # ymobile, ymobile1 techincally not willcom, but I group them there (softbank sub)
|
||||||
'.*@y-mobile\.ne\.jp$' => 'keitai_willcom_ymobile', # y-mobile techincally not willcom, but I group them there
|
'.*@y-mobile\.ne\.jp$' => 'keitai_willcom_ymobile', # y-mobile techincally not willcom, but I group them there (softbank sub)
|
||||||
'.*@emnet\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
|
'.*@emnet\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
|
||||||
'.*@emobile\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
|
'.*@emobile\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
|
||||||
'.*@emobile-s\.ne\.jp$' => 'keitai_willcom_emnet' # e-mobile, group will willcom
|
'.*@emobile-s\.ne\.jp$' => 'keitai_willcom_emnet' # e-mobile, group will willcom
|
||||||
@@ -484,7 +484,8 @@ class Basic
|
|||||||
if ($set_microtime == -1) {
|
if ($set_microtime == -1) {
|
||||||
$string .= substr($microtime, 1);
|
$string .= substr($microtime, 1);
|
||||||
} elseif ($set_microtime >= 1) {
|
} elseif ($set_microtime >= 1) {
|
||||||
$string .= substr(round($microtime, $set_microtime), 1);
|
// in round case we run this through number format to always get the same amount of digits
|
||||||
|
$string .= substr(number_format(round($microtime, $set_microtime), $set_microtime), 1);
|
||||||
}
|
}
|
||||||
return $string;
|
return $string;
|
||||||
}
|
}
|
||||||
|
|||||||
1
www/log/.gitignore
vendored
1
www/log/.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
*log
|
*log
|
||||||
|
*LOG
|
||||||
!.gitignore
|
!.gitignore
|
||||||
|
|||||||
Reference in New Issue
Block a user